summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authormef <mef>2013-01-05 12:57:21 +0000
committermef <mef>2013-01-05 12:57:21 +0000
commitc7c04f478fca67914de27a82b5700571f8b55059 (patch)
treee051d389cee19b9e0290cd168e239ca4b9a08523 /audio
parent82f27511d46c95b14b12e489d88f022b11bd9e1b (diff)
downloadpkgsrc-c7c04f478fca67914de27a82b5700571f8b55059.tar.gz
(1) Bump version 1.9.1 to 1.9.3 based on PR pkg/45449
ChangeLog attached at the bottom of this Log. (2) patches/patch-ag Delete the first chunk, upstream included the first one. Comments added from cvs log (1.4) (3) patches/patch-ah # fix for "libpthread: Unlocking unlocked mutex" seen on NetBSD-4 removed (upstream included). (4) Comments added for patches/patch-aa -- Add NetBSDArchitecture and DragonFlyArchitecture patches/patch-ab -- (1.9) Convert -lossaudio to portable $(LIBOSSAUDIO) Make this work with audio/oss again. -- (1.13) Add NetBSDArchitecture -- (1.14) In server/Imakefile add a target for $(VOXWARELIBS) that call make for the targets directory. This should fix the occasional problem were make complains with "don't know how to make dda/voxware/libvoxware.a" -- (1.5) Taking care nasd.conf (etc) patches/patch-ae -- Honor ${PKG_SYSCONFDIR}, see SUBST in Makefile. patches/patch-af -- Don't build/install auscope. (5) PLIST.client PLIST.server Convert IMAKE_MANNEWSUFFIX to IMAKE_MAN_SUFFIX which pkglint flagged and by reading the thread starting with http://mail-index.netbsd.org/tech-pkg/2005/12/06/0034.html (Please correct this part if some OS'en get problems.) ----- Version 1.9.3 (stable) 05/13/2011 - overdue 1.9.3 maint release - Older X11 systems used to define SharedLibX and friends if the installed X11 system was built with shared lib support. Newer X11's use SharedLibX11 instead. Same for {Normal|Debug|Profile}LibX. So check for these and set appropriately in NetAudio.tmpl. Shared lib installations should deal with libXau dependancies correctly now. - auerswald: Added MacOS X aka Darwin to list of systems that need to explicitely link libaudio.so against libXau. This enables building of the shared library libaudio.so on MacOS X. There is currently no NAS server for MacOS X. Version 1.9.2 (stable) 03/07/2009 - overdue 1.9.2 release. - patch from Aleksey Cheusov: "fix for "libpthread: Unlocking unlocked mutex" seen on NetBSD-4" libaudio: OpenSvr.c: The server mutex was being unlocked, even though it was never locked in the first place. - Hugo Vanwoerkom reported thousands of diagnostics in his syslog: "doSetup: elementRate == 0! Forcing to 5000". Fix doSetup to only warn about this when the debug level is above 10. - auerswald: document syslog usage use syslog if running as a daemon, stderr otherwise add syslog-usage-change to HISTORY file - steve_mcintyre: Minor man page fix ported from the Debian packages. Multiple minor portability changes ported over from the Debian packages. Cope with Hurd and GNU/KFreeBSD and other systems using glibc - apply patch from sourceforge user moinakg: Libaudio is built with missing linker flags on OpenSolaris like missing lXt, so it results in symbol not found errors at runtime. I am including an Imakefile patch below that fixed this. -----
Diffstat (limited to 'audio')
-rw-r--r--audio/nas/Makefile5
-rw-r--r--audio/nas/PLIST.clients36
-rw-r--r--audio/nas/PLIST.server4
-rw-r--r--audio/nas/distinfo21
-rw-r--r--audio/nas/patches/patch-aa15
-rw-r--r--audio/nas/patches/patch-ab23
-rw-r--r--audio/nas/patches/patch-ad23
-rw-r--r--audio/nas/patches/patch-ae4
-rw-r--r--audio/nas/patches/patch-af4
-rw-r--r--audio/nas/patches/patch-ag19
-rw-r--r--audio/nas/patches/patch-ah14
11 files changed, 80 insertions, 88 deletions
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 86f62f5799a..0386b83bb33 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2012/10/02 23:48:01 asau Exp $
+# $NetBSD: Makefile,v 1.90 2013/01/05 12:57:21 mef Exp $
-DISTNAME= nas-1.9.1.src
+DISTNAME= nas-1.9.3.src
PKGNAME= ${DISTNAME:S/.src//}
-PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nas/}
diff --git a/audio/nas/PLIST.clients b/audio/nas/PLIST.clients
index 2057216b278..2f7f4f2c9fe 100644
--- a/audio/nas/PLIST.clients
+++ b/audio/nas/PLIST.clients
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.clients,v 1.9 2009/06/14 17:32:19 joerg Exp $
+@comment $NetBSD: PLIST.clients,v 1.10 2013/01/05 12:57:21 mef Exp $
bin/auconvert
bin/auctl
bin/audemo
@@ -43,23 +43,23 @@ lib/libaudio.a
lib/libaudio.so
lib/libaudio.so.2
lib/libaudio.so.2.4
-${IMAKE_MAN_DIR}/auconvert.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auctl.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/audemo.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/audial.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auedit.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auinfo.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/aupanel.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auphone.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auplay.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/aurecord.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/autool.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/auwave.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/checkmail.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/issndfile.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/nas.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/playbucket.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/soundtoh.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/auconvert.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/auctl.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/audemo.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/audial.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/auedit.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/auinfo.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/aupanel.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/auphone.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/auplay.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/aurecord.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/autool.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/auwave.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/checkmail.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/issndfile.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/nas.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/playbucket.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/soundtoh.${IMAKE_MAN_SUFFIX}
${IMAKE_LIBMAN_DIR}/AuAnyEvent.${IMAKE_LIBMAN_SUFFIX}
${IMAKE_LIBMAN_DIR}/AuBucketAttributes.${IMAKE_LIBMAN_SUFFIX}
${IMAKE_LIBMAN_DIR}/AuCloseServer.${IMAKE_LIBMAN_SUFFIX}
diff --git a/audio/nas/PLIST.server b/audio/nas/PLIST.server
index 0170fe6e9f6..f15ca63d945 100644
--- a/audio/nas/PLIST.server
+++ b/audio/nas/PLIST.server
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST.server,v 1.3 2009/06/14 17:32:19 joerg Exp $
+@comment $NetBSD: PLIST.server,v 1.4 2013/01/05 12:57:21 mef Exp $
bin/nasd
-${IMAKE_MAN_DIR}/nasd.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/nasd.${IMAKE_MAN_SUFFIX}
${IMAKE_FILEMAN_DIR}/nasd.conf.${IMAKE_FILEMAN_SUFFIX}
share/examples/nas/nasd.conf.eg
share/examples/rc.d/nasd
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index 77c05f5a98b..796609db388 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.28 2012/01/30 01:34:38 sbd Exp $
+$NetBSD: distinfo,v 1.29 2013/01/05 12:57:22 mef Exp $
-SHA1 (nas-1.9.1.src.tar.gz) = 1207a821676ca1b763a47e3c278262a64a626ba3
-RMD160 (nas-1.9.1.src.tar.gz) = 6d6aa05ae2376fbc8ff3145b73da1d28b190a856
-Size (nas-1.9.1.src.tar.gz) = 1454523 bytes
-SHA1 (patch-aa) = f407891f0207d789c0e5bf7a455fd7798ce01fde
-SHA1 (patch-ab) = 2929b5477f21cd82ef8b5f0fb3039ea9a6e7b2c0
+SHA1 (nas-1.9.3.src.tar.gz) = dca770ddd10936ad1f19bf3c51f941c10d7bf84b
+RMD160 (nas-1.9.3.src.tar.gz) = 693c97658885a9bea02b27376c3a5a142b49e57a
+Size (nas-1.9.3.src.tar.gz) = 1485222 bytes
+SHA1 (patch-aa) = 9389ce078ed15019d82e79683dd184b61ca1be5c
+SHA1 (patch-ab) = 1c2ec778589a6818336b74e134268d0d269b143c
SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781
-SHA1 (patch-ad) = b889775d66e1de80fc9bc2563f9cc0ebf720ad71
-SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543
-SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a
-SHA1 (patch-ag) = 73959e05169d6b1ed658228cddbca86e62e142be
-SHA1 (patch-ah) = 62e0538441f4375b93169906e1cdc82ab045e5c5
+SHA1 (patch-ad) = 0a0887b87a9690e9a2a156ed840e9dfccc1f8c6c
+SHA1 (patch-ae) = 2e88c42f849ec2e3eb942f79d05065ec8ddd1a9e
+SHA1 (patch-af) = 9e387f88504d6ef18ad4210af24702de61efbf1a
+SHA1 (patch-ag) = c43bab8c87efa5c770dd084d67ffa9897350810f
diff --git a/audio/nas/patches/patch-aa b/audio/nas/patches/patch-aa
index be7d828d54f..18d3b84e168 100644
--- a/audio/nas/patches/patch-aa
+++ b/audio/nas/patches/patch-aa
@@ -1,17 +1,20 @@
-$NetBSD: patch-aa,v 1.12 2009/07/09 19:10:25 hasso Exp $
+$NetBSD: patch-aa,v 1.13 2013/01/05 12:57:22 mef Exp $
---- lib/audio/Imakefile.orig 2006-08-14 03:10:05.000000000 +0200
+(1) Add NetBSDArchitecture and DragonFlyArchitecture
+
+--- lib/audio/Imakefile.orig 2006-08-14 03:10:05.000000000 +0200
+++ lib/audio/Imakefile
-@@ -150,14 +150,14 @@ XAULIB =
+@@ -150,14 +150,16 @@
XAULIB = -lXau
#endif
--#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__)
-+#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) || defined(NetBSDArchitecture) || defined(DragonFlyArchitecture)
+-#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture)
++#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture) || defined(NetBSDArchitecture) || defined(DragonFlyArchitecture)
REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm
-#endif
--
+
-#if defined(cygwinArchitecture)
++
+#elif defined(cygwinArchitecture)
REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $(XTOOLLIB) $(XONLYLIB)
STD_INCLUDES = -I/usr/include
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab
index 81d735db034..87211bb4c27 100644
--- a/audio/nas/patches/patch-ab
+++ b/audio/nas/patches/patch-ab
@@ -1,8 +1,21 @@
-$NetBSD: patch-ab,v 1.14 2012/01/30 01:34:38 sbd Exp $
+$NetBSD: patch-ab,v 1.15 2013/01/05 12:57:22 mef Exp $
+
+(1.9) Convert -lossaudio to portable $(LIBOSSAUDIO)
+ Make this work with audio/oss again.
+
+(1.13) Add NetBSDArchitecture
+
+(1.14) In server/Imakefile add a target for $(VOXWARELIBS) that call make for
+the targets directory.
+
+This should fix the occasional problem were make complains with
+"don't know how to make dda/voxware/libvoxware.a"
+
+(1.5) Taking care nasd.conf (etc)
--- server/Imakefile.orig 2007-06-16 19:03:22.000000000 +0000
+++ server/Imakefile
-@@ -61,7 +61,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
+@@ -61,7 +61,7 @@
#endif
#ifdef NetBSDArchitecture
@@ -11,7 +24,7 @@ $NetBSD: patch-ab,v 1.14 2012/01/30 01:34:38 sbd Exp $
#endif
CBRT =
-@@ -96,7 +96,7 @@ ALL1 = nasd
+@@ -96,7 +96,7 @@
#endif
@@ -19,8 +32,8 @@ $NetBSD: patch-ab,v 1.14 2012/01/30 01:34:38 sbd Exp $
+#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
# define CanBuildAuServer YES
- # if defined(cygwinArchitecture)
-@@ -204,23 +204,34 @@ dirs: FRC @@\
+ #if !defined(GNUMachArchitecture)
+@@ -206,23 +206,34 @@
$(MAKE) $(MFLAGS) PassCDebugFlags all @@\
@@\
FRC:
diff --git a/audio/nas/patches/patch-ad b/audio/nas/patches/patch-ad
index d663646db40..064d05c2ba6 100644
--- a/audio/nas/patches/patch-ad
+++ b/audio/nas/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.13 2008/10/14 12:47:11 markd Exp $
+$NetBSD: patch-ad,v 1.14 2013/01/05 12:57:22 mef Exp $
--- server/dda/voxware/auvoxware.c.orig 2007-11-11 12:40:47.000000000 +1300
+++ server/dda/voxware/auvoxware.c
@@ -44,8 +44,8 @@ $NetBSD: patch-ad,v 1.13 2008/10/14 12:47:11 markd Exp $
}
--#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__)
-+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
+-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__)
++#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
inline
#endif
static void
@@ -53,8 +53,8 @@ $NetBSD: patch-ad,v 1.13 2008/10/14 12:47:11 markd Exp $
}
}
--#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__)
-+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
+-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__)
++#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
inline
#endif
static void
@@ -62,17 +62,8 @@ $NetBSD: patch-ad,v 1.13 2008/10/14 12:47:11 markd Exp $
AuUnBlockAudio(l);
}
--#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__)
-+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
- inline
- #endif
- static void
-@@ -1465,7 +1478,7 @@ stereoToMonoLinearSigned16LSB(AuUint32 n
- }
- }
-
--#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__)
-+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
+-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__)
++#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
inline
#endif
static void
diff --git a/audio/nas/patches/patch-ae b/audio/nas/patches/patch-ae
index 9fe58616703..ee16e374a1a 100644
--- a/audio/nas/patches/patch-ae
+++ b/audio/nas/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.3 2002/11/28 11:40:46 markd Exp $
+$NetBSD: patch-ae,v 1.4 2013/01/05 12:57:22 mef Exp $
+
+Honor ${PKG_SYSCONFDIR}, see SUBST in Makefile.
--- config/NetAudio.def.orig Sun Feb 24 17:39:08 2002
+++ config/NetAudio.def
diff --git a/audio/nas/patches/patch-af b/audio/nas/patches/patch-af
index 74e3c3c56cf..4a0b20f24a3 100644
--- a/audio/nas/patches/patch-af
+++ b/audio/nas/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.2 2007/03/24 13:45:05 markd Exp $
+$NetBSD: patch-af,v 1.3 2013/01/05 12:57:22 mef Exp $
+
+Don't build/install auscope.
--- clients/audio/Imakefile.orig 2007-03-25 00:47:25.000000000 +1200
+++ clients/audio/Imakefile
diff --git a/audio/nas/patches/patch-ag b/audio/nas/patches/patch-ag
index e453160ead9..39d16c883a5 100644
--- a/audio/nas/patches/patch-ag
+++ b/audio/nas/patches/patch-ag
@@ -1,17 +1,14 @@
-$NetBSD: patch-ag,v 1.7 2009/02/03 09:39:16 dbj Exp $
+$NetBSD: patch-ag,v 1.8 2013/01/05 12:57:22 mef Exp $
+
+(from cvs log for 1.4)
+date: 2006/01/11 11:32:38; author: markd; state: Exp; lines: +12 -14
+Some makedepend's object if a referenced header file is a dangling
+symlink, so create the actual release.h file at the includes stage as
+the depends stage is too late (server/os is before lib/audio).
+Fixes PR pkg/32098 from Gilles Dauphin.
--- config/NetAudio.tmpl.orig 2007-06-16 12:03:20.000000000 -0700
+++ config/NetAudio.tmpl 2009-02-03 00:57:54.000000000 -0800
-@@ -55,6 +55,9 @@ EXTRA_LOAD_FLAGS=/link /nodefaultlib:lib
-
- #define DebugLibX NO
- #define ProfileLibX NO
-+#ifndef SharedLibX
-+#define SharedLibX YES
-+#endif
-
- #if HasSharedLibraries
- #define NormalLibAudio NormalLibX
@@ -287,6 +290,8 @@ AuComplexProgramTarget(program)
release.h: $(TOP)/RELEASE @@\
@echo "static const char *release = \"`cat $(TOP)/RELEASE`\";" > $@ @@\
diff --git a/audio/nas/patches/patch-ah b/audio/nas/patches/patch-ah
deleted file mode 100644
index 1971f427404..00000000000
--- a/audio/nas/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/10/14 12:47:11 markd Exp $
-
-# fix for "libpthread: Unlocking unlocked mutex" seen on NetBSD-4
-
---- lib/audio/OpenSvr.c.orig 2008-10-15 01:31:46.000000000 +1300
-+++ lib/audio/OpenSvr.c
-@@ -327,7 +327,6 @@ server is %d.%d!\r\n",
- /*
- * and done mucking with the server
- */
-- _AuUnlockServer(); /* didn't exist, so didn't lock */
- _AuUnlockMutex(_init_mutex);
-
- /*