Subject: pkg/18684: update audio/nas to 1.5
To: None <gnats-bugs@gnats.netbsd.org>
From: Greg A. Woods <woods@weird.com>
List: netbsd-bugs
Date: 10/17/2002 16:35:39
>Number: 18684
>Category: pkg
>Synopsis: update audio/nas to 1.5
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Thu Oct 17 13:36:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Greg A. Woods
>Release: pkgsrc-current 2002/10/15
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
System: NetBSD
Architecture: i386
Machine: i386
>Description:
update audio/nas to 1.5
this probably still doesn't work on sparc (it builds and
installs fine, and all the client-side utilities work perfectly,
but last I tried when my desktop was still an SS1 the nasd
server wouldn't work properly, and it might be a driver
issue....). So, I'm not going to bother trying very hard again
until (a) I have the sparc-5 which is in transit on my desktop,
and (b) until the next release shows up (which is apparently
going to be "soon")
>How-To-Repeat:
>Fix:
cvs diff: Diffing audio/nas
Index: audio/nas/Makefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/nas/Makefile,v
retrieving revision 1.18
diff -c -r1.18 Makefile
*** audio/nas/Makefile 28 Aug 2002 06:16:07 -0000 1.18
--- audio/nas/Makefile 13 Sep 2002 18:57:09 -0000
***************
*** 2,8 ****
# FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
#
! DISTNAME= nas-1.4.2.src
PKGNAME= ${DISTNAME:S/.src//}
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= audio
--- 2,8 ----
# FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
#
! DISTNAME= nas-1.5.src
PKGNAME= ${DISTNAME:S/.src//}
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= audio
***************
*** 18,24 ****
USE_X11BASE= # defined
PLIST_SRC= ${PKGDIR}/PLIST.clients
! .if ${MACHINE_ARCH} == "i386"
PLIST_SRC+= ${PKGDIR}/PLIST.voxware
.endif
--- 18,24 ----
USE_X11BASE= # defined
PLIST_SRC= ${PKGDIR}/PLIST.clients
! .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc"
PLIST_SRC+= ${PKGDIR}/PLIST.voxware
.endif
Index: audio/nas/PLIST.clients
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/nas/PLIST.clients,v
retrieving revision 1.1
diff -c -r1.1 PLIST.clients
*** audio/nas/PLIST.clients 1 Nov 2001 00:20:13 -0000 1.1
--- audio/nas/PLIST.clients 22 Mar 2002 01:46:07 -0000
***************
*** 41,47 ****
lib/libaudio.a
lib/libaudio.so
lib/libaudio.so.2
! lib/libaudio.so.2.1
man/cat1/auconvert.0
man/cat1/auctl.0
man/cat1/audemo.0
--- 41,47 ----
lib/libaudio.a
lib/libaudio.so
lib/libaudio.so.2
! lib/libaudio.so.2.2
man/cat1/auconvert.0
man/cat1/auctl.0
man/cat1/audemo.0
Index: audio/nas/distinfo
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/nas/distinfo,v
retrieving revision 1.3
diff -c -r1.3 distinfo
*** audio/nas/distinfo 14 Jul 2001 13:35:12 -0000 1.3
--- audio/nas/distinfo 20 Jan 2002 07:12:10 -0000
***************
*** 1,8 ****
$NetBSD: distinfo,v 1.3 2001/07/14 13:35:12 jlam Exp $
! SHA1 (nas-1.4.2.src.tar.gz) = 39634818e5719a850eecf751bbccd98758721e4b
! Size (nas-1.4.2.src.tar.gz) = 816938 bytes
! SHA1 (patch-aa) = 344776f3bd3e24664c5cb675aea047b7de645f00
! SHA1 (patch-ab) = b6ab1bc67bb46e5ef483a3da6010097b6349745b
! SHA1 (patch-ac) = 5fe9a1fa688d95a3b201c50e1b309224a8429797
! SHA1 (patch-ad) = b0d5bfac931ce859734006ce9642cd251af6ba88
--- 1,8 ----
$NetBSD: distinfo,v 1.3 2001/07/14 13:35:12 jlam Exp $
! SHA1 (nas-1.5.src.tar.gz) = c9ad3243a5f5d1991872db00723985b83ccd9922
! Size (nas-1.5.src.tar.gz) = 829167 bytes
! SHA1 (patch-aa) = 7b74c7e3daa4177cfc78375dfa0be45678a0f5b2
! SHA1 (patch-ab) = 72ff108ee63839eef6e8a69bdf70c54e1ffa1f6f
! SHA1 (patch-ac) = a3672f4d6c5fe15e29c02b3a1e439d31a54db63c
! SHA1 (patch-ad) = 9f1eba59ddd7adf77679766f597d1649e91b5175
cvs diff: Diffing audio/nas/patches
Index: audio/nas/patches/patch-aa
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/nas/patches/patch-aa,v
retrieving revision 1.5
diff -c -r1.5 patch-aa
*** audio/nas/patches/patch-aa 14 Jul 2001 13:35:13 -0000 1.5
--- audio/nas/patches/patch-aa 15 Jan 2002 21:17:12 -0000
***************
*** 1,8 ****
$NetBSD: patch-aa,v 1.5 2001/07/14 13:35:13 jlam Exp $
--- config/NetAudio.tmpl.orig Sun Mar 18 15:36:39 2001
! +++ config/NetAudio.tmpl
! @@ -222,7 +222,7 @@
#define AuInstallManPage(file,destdir) AuInstallManPageLong(file,destdir,file)
#define AuInstallManPageLong(file,destdir,dest) @@\
--- 1,21 ----
$NetBSD: patch-aa,v 1.5 2001/07/14 13:35:13 jlam Exp $
--- config/NetAudio.tmpl.orig Sun Mar 18 15:36:39 2001
! +++ config/NetAudio.tmpl Tue Jan 15 16:16:38 2002
! @@ -157,11 +157,7 @@
! #endif /* SharedLibAudio */
!
! AUDIODEPLIBS = $(DEPAULIB) $(DEPXTOOLLIB) $(DEPXLIB)
! -#ifndef WIN32
! - AUDIOLIBS = $(AULIB) $(XTOOLLIB) $(XLIB) -lm
! -#else /* WIN32 */
! - AUDIOLIBS = $(AULIB)
! -#endif /* WIN32 */
! + AUDIOLIBS = $(AULIB) -lXau -lm
! BUILDINCROOT = $(TOP)/include
! BUILDINCDIR = $(BUILDINCROOT)
! BUILDINCTOP = ..
! @@ -222,7 +218,7 @@
#define AuInstallManPage(file,destdir) AuInstallManPageLong(file,destdir,file)
#define AuInstallManPageLong(file,destdir,dest) @@\
Index: audio/nas/patches/patch-ab
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/nas/patches/patch-ab,v
retrieving revision 1.6
diff -c -r1.6 patch-ab
*** audio/nas/patches/patch-ab 14 Jul 2001 13:35:13 -0000 1.6
--- audio/nas/patches/patch-ab 20 Jan 2002 06:18:08 -0000
***************
*** 1,15 ****
$NetBSD: patch-ab,v 1.6 2001/07/14 13:35:13 jlam Exp $
! --- server/Imakefile.orig Tue Dec 12 23:45:48 2000
! +++ server/Imakefile
! @@ -217,10 +217,11 @@
$(RM) $(ALL)
! ETCDIR = NasConfigSearchPath
+ EGDIR = ${PREFIX}/share/examples/nas
InstallManPage(nasd,$(MANDIR))
InstallManPage(nasd.conf,$(RCMANDIR))
-InstallNonExecFile(nasd.conf.eg,$(ETCDIR))
+InstallNonExecFile(nasd.conf.eg,$(EGDIR))
--- 1,41 ----
$NetBSD: patch-ab,v 1.6 2001/07/14 13:35:13 jlam Exp $
! --- server/Imakefile.orig Sun Dec 2 01:57:38 2001
! +++ server/Imakefile Sun Jan 20 01:17:26 2002
! @@ -60,7 +60,7 @@
! SYSLIBS =
! #endif
!
! -#ifdef NetBSDArchitecture
! +#if defined(NetBSDArchitecture) || defined(__NetBSD__)
! SYSLIBS = -lossaudio
! #endif
!
! @@ -99,7 +99,10 @@
! #endif
!
!
! -#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture)
! +#if defined(i386SVR4Architecture) || \
! + defined(__NetBSD__) || defined(NetBSDArchitecture) || \
! + defined(__FreeBSD__) || defined(FreeBSDArchitecture) || \
! + defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture)
! # define CanBuildAuServer YES
!
! # if defined(LinuxArchitecture)
! @@ -218,7 +221,7 @@
! clean::
$(RM) $(ALL)
! - ETCDIR = NasConfigSearchPath
+ EGDIR = ${PREFIX}/share/examples/nas
InstallManPage(nasd,$(MANDIR))
+ #ifdef InstallGenManPage
+ @@ -226,7 +229,7 @@
+ #else
InstallManPage(nasd.conf,$(RCMANDIR))
+ #endif
-InstallNonExecFile(nasd.conf.eg,$(ETCDIR))
+InstallNonExecFile(nasd.conf.eg,$(EGDIR))
Index: audio/nas/patches/patch-ac
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/nas/patches/patch-ac,v
retrieving revision 1.4
diff -c -r1.4 patch-ac
*** audio/nas/patches/patch-ac 4 Aug 2000 01:31:56 -0000 1.4
--- audio/nas/patches/patch-ac 20 Jan 2002 05:53:09 -0000
***************
*** 1,26 ****
$NetBSD: patch-ac,v 1.4 2000/08/04 01:31:56 jlam Exp $
! --- server/nasd.conf.eg.orig Sat Jan 1 22:03:50 2000
! +++ server/nasd.conf.eg Thu Aug 3 21:11:29 2000
! @@ -29,7 +29,7 @@
inputsection
- device "/dev/dsp1" # the SB emulation on my PAS16
! + device "/dev/audio"
maxrate 11025
minrate 4000 # Kind of redundant
maxfrags 3 # We want really low latency
! @@ -41,7 +41,7 @@
# These are used by voxware only for now.
outputsection
- device "/dev/dsp" # the full 16 bit interface!
! + device "/dev/audio"
! maxrate 33000 # is flakey on my OPTi mb at 44
minrate 5000 # Redundant again
maxfrags 3 # Low latency (for doom!)
! @@ -57,7 +57,7 @@
# was an 8 bit SB and the PC speaker with the voxware server.
#
#outputsection
--- 1,31 ----
$NetBSD: patch-ac,v 1.4 2000/08/04 01:31:56 jlam Exp $
! --- server/nasd.conf.eg.orig Sun Apr 29 20:11:07 2001
! +++ server/nasd.conf.eg Sun Jan 20 00:52:16 2002
! @@ -29,8 +29,8 @@
inputsection
- device "/dev/dsp1" # the SB emulation on my PAS16
! - mixer "/dev/mixer1" # mixer device
! + device "/dev/audio" # the SB emulation on my PAS16
! + mixer "/dev/mixer" # mixer device
maxrate 11025
minrate 4000 # Kind of redundant
maxfrags 3 # We want really low latency
! @@ -46,9 +46,9 @@
# These are used by voxware only for now.
outputsection
- device "/dev/dsp" # the full 16 bit interface!
! + device "/dev/audio" # the full 16 bit interface!
! mixer "/dev/mixer" # mixer device
! - maxrate 33000 # is flakey on my OPTi mb at 44
! + maxrate 44100 # is flakey on my OPTi mb at 44
minrate 5000 # Redundant again
maxfrags 3 # Low latency (for doom!)
! minfrags 2 # redundant really.
! @@ -67,7 +67,7 @@
# was an 8 bit SB and the PC speaker with the voxware server.
#
#outputsection
Index: audio/nas/patches/patch-ad
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/nas/patches/patch-ad,v
retrieving revision 1.7
diff -c -r1.7 patch-ad
*** audio/nas/patches/patch-ad 14 Jul 2001 13:35:13 -0000 1.7
--- audio/nas/patches/patch-ad 20 Jan 2002 07:12:06 -0000
***************
*** 1,28 ****
$NetBSD: patch-ad,v 1.7 2001/07/14 13:35:13 jlam Exp $
! --- server/dda/voxware/auvoxware.c.orig Thu Oct 5 20:39:16 2000
! +++ server/dda/voxware/auvoxware.c
! @@ -224,7 +224,11 @@
256, /* fragSize */
3, /* minFrags */
32, /* maxFrags */
! +#if defined(__NetBSD__)
+ "/dev/audio", /* device */
! +#else
! "/dev/dsp1", /* device */
! +#endif
! 0 /* isPCSpeaker */
}, sndStatOut =
{
! @@ -237,7 +241,11 @@
256, /* fragSize */
3, /* minFrags */
32, /* maxFrags */
! +#if defined(__NetBSD__)
+ "/dev/audio", /* device */
! +#else
! "/dev/dsp", /* device */
! +#endif
! 0 /* isPCSpeaker */
! };
!
--- 1,55 ----
$NetBSD: patch-ad,v 1.7 2001/07/14 13:35:13 jlam Exp $
! --- server/dda/voxware/auvoxware.c.orig Sun Apr 29 20:11:08 2001
! +++ server/dda/voxware/auvoxware.c Sun Jan 20 01:21:05 2002
! @@ -216,7 +216,7 @@
! SndStat sndStatIn =
! {
! -1, /* fd */
! - 16, /* wordSize */
! + 8, /* wordSize */
! 1, /* isStereo */
! 0, /* curSampleRate */
! 4000, /* minSampleRate */
! @@ -224,8 +224,8 @@
256, /* fragSize */
3, /* minFrags */
32, /* maxFrags */
! - "/dev/dsp1", /* device */
! - "/dev/mixer1", /* mixer */
+ "/dev/audio", /* device */
! + "/dev/mixer", /* mixer */
! O_RDONLY, /* howToOpen */
! 1, /* autoOpen */
! 0, /* forceRate */
! @@ -233,7 +233,7 @@
}, sndStatOut =
{
! -1, /* fd */
! - 16, /* wordSize */
! + 8, /* wordSize */
! 1, /* isStereo */
! 0, /* curSampleRate */
! 4000, /* minSampleRate */
! @@ -241,7 +241,7 @@
256, /* fragSize */
3, /* minFrags */
32, /* maxFrags */
! - "/dev/dsp", /* device */
+ "/dev/audio", /* device */
! "/dev/mixer", /* mixer */
! O_RDWR, /* howToOpen */
! 1, /* autoOpen */
! @@ -1309,6 +1309,12 @@
! }
! if (NasConfig.DoVerbose)
! osLogMsg("got %d\n", sndStatPtr->wordSize);
! +
! + if (sndStatPtr->wordSize < 8) {
! + sndStatPtr->wordSize = 8;
! + if (NasConfig.DoVerbose)
! + osLogMsg("+++ adjusted internal wordsize back to %d\n", sndStatPtr->wordSize);
! + }
!
! if (NasConfig.DoVerbose)
! osLogMsg("+++ requesting %d channel(s), ", sndStatPtr->isStereo + 1);
>Release-Note:
>Audit-Trail:
>Unformatted: