From a96c1fe3df0a9c8f2b7bbe68cb94ec6dd9a689c2 Mon Sep 17 00:00:00 2001 From: markd Date: Tue, 14 Oct 2008 12:47:11 +0000 Subject: Update nas to version 1.9.1. This version adds some enhancements to aupanel, and reworks signal handling in the voxware server to avoid races, hangs and other issues seen with linux 2.6.21+ kernels. Other changes relating to the default value of the 'MixerInit' option and the new location of the local unix socket on Linux systems were also made. Also include a patch from Aleksey Cheusov for a "libpthread: Unlocking unlocked mutex" bug. --- audio/nas/Makefile | 6 ++---- audio/nas/PLIST.voxware | 2 -- audio/nas/distinfo | 13 +++++++------ audio/nas/patches/patch-ac | 6 +++--- audio/nas/patches/patch-ad | 40 ++++++++++++++++++++++++++++++++-------- audio/nas/patches/patch-ah | 14 ++++++++++++++ 6 files changed, 58 insertions(+), 23 deletions(-) delete mode 100644 audio/nas/PLIST.voxware create mode 100644 audio/nas/patches/patch-ah (limited to 'audio/nas') diff --git a/audio/nas/Makefile b/audio/nas/Makefile index 21719a07fd2..4d7174e776f 100644 --- a/audio/nas/Makefile +++ b/audio/nas/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.80 2008/10/11 21:00:53 markd Exp $ +# $NetBSD: Makefile,v 1.81 2008/10/14 12:47:11 markd Exp $ -DISTNAME= nas-1.9.src +DISTNAME= nas-1.9.1.src PKGNAME= ${DISTNAME:S/.src//} -PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nas/} @@ -84,7 +83,6 @@ CONF_FILES= ${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf . if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \ ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || ${OPSYS} == "UnixWare" . include "../../mk/oss.buildlink3.mk" -PLIST_SRC+= ${PKGDIR}/PLIST.voxware . endif .endif diff --git a/audio/nas/PLIST.voxware b/audio/nas/PLIST.voxware deleted file mode 100644 index 674939779a4..00000000000 --- a/audio/nas/PLIST.voxware +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.voxware,v 1.3 2005/06/04 23:43:51 markd Exp $ -${IMAKE_MAN_DIR}/auvoxware.${IMAKE_MANNEWSUFFIX} diff --git a/audio/nas/distinfo b/audio/nas/distinfo index c7cbaa922b3..080c420f020 100644 --- a/audio/nas/distinfo +++ b/audio/nas/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.23 2008/05/31 13:32:04 tnn Exp $ +$NetBSD: distinfo,v 1.24 2008/10/14 12:47:11 markd Exp $ -SHA1 (nas-1.9.src.tar.gz) = 2ee3151c71a6667bd996a0f1cda18a8b9d7cb0c7 -RMD160 (nas-1.9.src.tar.gz) = a691f10d557bd676bbc2e9f0db949169815446aa -Size (nas-1.9.src.tar.gz) = 1471635 bytes +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) = d5dbebf1f718a905df07f76473058699c8f58604 SHA1 (patch-ab) = d424b0970bd23584629f6a9bebea8b8c014462b5 -SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d -SHA1 (patch-ad) = 43e71c079c79560172fce434e3a6f2b12ce3f596 +SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781 +SHA1 (patch-ad) = b889775d66e1de80fc9bc2563f9cc0ebf720ad71 SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543 SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a SHA1 (patch-ag) = 99a8c9af8385d0ce9c4c08f09b4ae41a2ba268ab +SHA1 (patch-ah) = 62e0538441f4375b93169906e1cdc82ab045e5c5 diff --git a/audio/nas/patches/patch-ac b/audio/nas/patches/patch-ac index 8db4843c54f..86bcc53d8c6 100644 --- a/audio/nas/patches/patch-ac +++ b/audio/nas/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.6 2002/11/28 11:40:46 markd Exp $ +$NetBSD: patch-ac,v 1.7 2008/10/14 12:47:11 markd Exp $ --- server/nasd.conf.eg.orig Tue Oct 8 16:08:02 2002 +++ server/nasd.conf.eg @@ -8,8 +8,8 @@ $NetBSD: patch-ac,v 1.6 2002/11/28 11:40:46 markd Exp $ - device "/dev/dsp1" # The input device, usually - mixer "/dev/mixer1" # mixer device -+ device "@DEVOSSAUDIO@" # The input device, usually -+ mixer "/dev/mixer" # mixer device ++ device "@DEVOSSAUDIO@1" # The input device, usually ++ mixer "/dev/mixer1" # mixer device gain 50 # default input gain (0-100) maxrate 44100 minrate 4000 # Kind of redundant diff --git a/audio/nas/patches/patch-ad b/audio/nas/patches/patch-ad index 86787696725..d663646db40 100644 --- a/audio/nas/patches/patch-ad +++ b/audio/nas/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.12 2007/12/25 19:48:43 markd Exp $ +$NetBSD: patch-ad,v 1.13 2008/10/14 12:47:11 markd Exp $ ---- server/dda/voxware/auvoxware.c.orig 2007-03-18 17:05:55.000000000 +1200 +--- server/dda/voxware/auvoxware.c.orig 2007-11-11 12:40:47.000000000 +1300 +++ server/dda/voxware/auvoxware.c -@@ -249,8 +249,13 @@ SndStat sndStatIn = { +@@ -245,8 +245,13 @@ SndStat sndStatIn = { 256, /* fragSize */ 3, /* minFrags */ 32, /* maxFrags */ @@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.12 2007/12/25 19:48:43 markd Exp $ O_RDONLY, /* howToOpen */ 1, /* autoOpen */ 0, /* forceRate */ -@@ -270,7 +275,11 @@ SndStat sndStatOut = { +@@ -266,7 +271,11 @@ SndStat sndStatOut = { 256, /* fragSize */ 3, /* minFrags */ 32, /* maxFrags */ @@ -28,7 +28,19 @@ $NetBSD: patch-ad,v 1.12 2007/12/25 19:48:43 markd Exp $ "/dev/mixer", /* mixer */ O_WRONLY, /* howToOpen */ 1, /* autoOpen */ -@@ -1335,7 +1344,7 @@ disableProcessFlow(void) +@@ -875,7 +884,11 @@ openDevice(AuBool wait) + if (sndStatOut.fd == -1) { + while ((sndStatOut.fd = open(sndStatOut.device, + sndStatOut. ++#if defined(__FreeBSD__) || defined(__NetBSD__) ++ howToOpen | extramode, ++#else + howToOpen | O_SYNC | extramode, ++#endif + 0666)) == -1 && wait) { + osLogMsg("openDevice: waiting on output device\n"); + sleep(1); +@@ -1372,7 +1385,7 @@ disableProcessFlow(void) } @@ -37,7 +49,7 @@ $NetBSD: patch-ad,v 1.12 2007/12/25 19:48:43 markd Exp $ inline #endif static void -@@ -1350,7 +1359,7 @@ monoToStereoLinearSigned16LSB(AuUint32 n +@@ -1387,7 +1400,7 @@ monoToStereoLinearSigned16LSB(AuUint32 n } } @@ -46,7 +58,7 @@ $NetBSD: patch-ad,v 1.12 2007/12/25 19:48:43 markd Exp $ inline #endif static void -@@ -1413,7 +1422,7 @@ writePhysicalOutputsMono(void) +@@ -1450,7 +1463,7 @@ writePhysicalOutputsMono(void) AuUnBlockAudio(l); } @@ -55,7 +67,7 @@ $NetBSD: patch-ad,v 1.12 2007/12/25 19:48:43 markd Exp $ inline #endif static void -@@ -1428,7 +1437,7 @@ stereoToMonoLinearSigned16LSB(AuUint32 n +@@ -1465,7 +1478,7 @@ stereoToMonoLinearSigned16LSB(AuUint32 n } } @@ -64,3 +76,15 @@ $NetBSD: patch-ad,v 1.12 2007/12/25 19:48:43 markd Exp $ inline #endif static void +@@ -1880,7 +1893,11 @@ AuInitPhysicalDevices(void) + sndStatOut.device, sndStatOut.howToOpen); + + if ((fd = open(sndStatOut.device, ++#if defined(__FreeBSD__) || defined(__NetBSD__) ++ sndStatOut.howToOpen | extramode, ++#else + sndStatOut.howToOpen | O_SYNC | extramode, ++#endif + 0)) == -1) { + UNIDENTMSG; + osLogMsg("Init: Output open(%s) failed: %s\n", diff --git a/audio/nas/patches/patch-ah b/audio/nas/patches/patch-ah new file mode 100644 index 00000000000..1971f427404 --- /dev/null +++ b/audio/nas/patches/patch-ah @@ -0,0 +1,14 @@ +$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); + + /* -- cgit v1.2.3