head 1.14; access; symbols pkgsrc-2026Q1:1.14.0.106 pkgsrc-2026Q1-base:1.14 pkgsrc-2025Q4:1.14.0.104 pkgsrc-2025Q4-base:1.14 pkgsrc-2025Q3:1.14.0.102 pkgsrc-2025Q3-base:1.14 pkgsrc-2025Q2:1.14.0.100 pkgsrc-2025Q2-base:1.14 pkgsrc-2025Q1:1.14.0.98 pkgsrc-2025Q1-base:1.14 pkgsrc-2024Q4:1.14.0.96 pkgsrc-2024Q4-base:1.14 pkgsrc-2024Q3:1.14.0.94 pkgsrc-2024Q3-base:1.14 pkgsrc-2024Q2:1.14.0.92 pkgsrc-2024Q2-base:1.14 pkgsrc-2024Q1:1.14.0.90 pkgsrc-2024Q1-base:1.14 pkgsrc-2023Q4:1.14.0.88 pkgsrc-2023Q4-base:1.14 pkgsrc-2023Q3:1.14.0.86 pkgsrc-2023Q3-base:1.14 pkgsrc-2023Q2:1.14.0.84 pkgsrc-2023Q2-base:1.14 pkgsrc-2023Q1:1.14.0.82 pkgsrc-2023Q1-base:1.14 pkgsrc-2022Q4:1.14.0.80 pkgsrc-2022Q4-base:1.14 pkgsrc-2022Q3:1.14.0.78 pkgsrc-2022Q3-base:1.14 pkgsrc-2022Q2:1.14.0.76 pkgsrc-2022Q2-base:1.14 pkgsrc-2022Q1:1.14.0.74 pkgsrc-2022Q1-base:1.14 pkgsrc-2021Q4:1.14.0.72 pkgsrc-2021Q4-base:1.14 pkgsrc-2021Q3:1.14.0.70 pkgsrc-2021Q3-base:1.14 pkgsrc-2021Q2:1.14.0.68 pkgsrc-2021Q2-base:1.14 pkgsrc-2021Q1:1.14.0.66 pkgsrc-2021Q1-base:1.14 pkgsrc-2020Q4:1.14.0.64 pkgsrc-2020Q4-base:1.14 pkgsrc-2020Q3:1.14.0.62 pkgsrc-2020Q3-base:1.14 pkgsrc-2020Q2:1.14.0.58 pkgsrc-2020Q2-base:1.14 pkgsrc-2020Q1:1.14.0.38 pkgsrc-2020Q1-base:1.14 pkgsrc-2019Q4:1.14.0.60 pkgsrc-2019Q4-base:1.14 pkgsrc-2019Q3:1.14.0.56 pkgsrc-2019Q3-base:1.14 pkgsrc-2019Q2:1.14.0.54 pkgsrc-2019Q2-base:1.14 pkgsrc-2019Q1:1.14.0.52 pkgsrc-2019Q1-base:1.14 pkgsrc-2018Q4:1.14.0.50 pkgsrc-2018Q4-base:1.14 pkgsrc-2018Q3:1.14.0.48 pkgsrc-2018Q3-base:1.14 pkgsrc-2018Q2:1.14.0.46 pkgsrc-2018Q2-base:1.14 pkgsrc-2018Q1:1.14.0.44 pkgsrc-2018Q1-base:1.14 pkgsrc-2017Q4:1.14.0.42 pkgsrc-2017Q4-base:1.14 pkgsrc-2017Q3:1.14.0.40 pkgsrc-2017Q3-base:1.14 pkgsrc-2017Q2:1.14.0.36 pkgsrc-2017Q2-base:1.14 pkgsrc-2017Q1:1.14.0.34 pkgsrc-2017Q1-base:1.14 pkgsrc-2016Q4:1.14.0.32 pkgsrc-2016Q4-base:1.14 pkgsrc-2016Q3:1.14.0.30 pkgsrc-2016Q3-base:1.14 pkgsrc-2016Q2:1.14.0.28 pkgsrc-2016Q2-base:1.14 pkgsrc-2016Q1:1.14.0.26 pkgsrc-2016Q1-base:1.14 pkgsrc-2015Q4:1.14.0.24 pkgsrc-2015Q4-base:1.14 pkgsrc-2015Q3:1.14.0.22 pkgsrc-2015Q3-base:1.14 pkgsrc-2015Q2:1.14.0.20 pkgsrc-2015Q2-base:1.14 pkgsrc-2015Q1:1.14.0.18 pkgsrc-2015Q1-base:1.14 pkgsrc-2014Q4:1.14.0.16 pkgsrc-2014Q4-base:1.14 pkgsrc-2014Q3:1.14.0.14 pkgsrc-2014Q3-base:1.14 pkgsrc-2014Q2:1.14.0.12 pkgsrc-2014Q2-base:1.14 pkgsrc-2014Q1:1.14.0.10 pkgsrc-2014Q1-base:1.14 pkgsrc-2013Q4:1.14.0.8 pkgsrc-2013Q4-base:1.14 pkgsrc-2013Q3:1.14.0.6 pkgsrc-2013Q3-base:1.14 pkgsrc-2013Q2:1.14.0.4 pkgsrc-2013Q2-base:1.14 pkgsrc-2013Q1:1.14.0.2 pkgsrc-2013Q1-base:1.14 pkgsrc-2012Q4:1.12.0.28 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.26 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.24 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.12.0.22 pkgsrc-2012Q1-base:1.12 pkgsrc-2011Q4:1.12.0.20 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.12.0.18 pkgsrc-2011Q3-base:1.12 pkgsrc-2011Q2:1.12.0.16 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.14 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.12 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.10 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.8 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.6 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.4 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.2 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.11.0.14 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.12 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.11.0.10 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.8 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.6 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.4 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.2 pkgsrc-2008Q1:1.10.0.4 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.2 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.9.0.10 pkgsrc-2007Q3-base:1.9 pkgsrc-2007Q2:1.9.0.8 pkgsrc-2007Q2-base:1.9 pkgsrc-2007Q1:1.9.0.6 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.4 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.9.0.2 pkgsrc-2006Q3-base:1.9 pkgsrc-2006Q2:1.8.0.22 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.20 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.18 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.16 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.14 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.12 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.10 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.8 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.6 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.4 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.2 pkgsrc-2003Q4-base:1.8 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.3; locks; strict; comment @# @; 1.14 date 2013.01.06.03.21.47; author ryoon; state Exp; branches; next 1.13; 1.13 date 2013.01.05.12.57.22; author mef; state Exp; branches; next 1.12; 1.12 date 2009.07.09.19.10.25; author hasso; state Exp; branches; next 1.11; 1.11 date 2008.05.31.13.32.04; author tnn; state Exp; branches; next 1.10; 1.10 date 2007.11.10.02.41.34; author wiz; state Exp; branches; next 1.9; 1.9 date 2006.07.08.00.27.56; author minskim; state Exp; branches; next 1.8; 1.8 date 2003.10.28.00.49.48; author grant; state dead; branches 1.8.22.1; next 1.7; 1.7 date 2003.10.25.14.29.12; author fredb; state Exp; branches; next 1.6; 1.6 date 2002.11.28.11.40.46; author markd; state dead; branches; next 1.5; 1.5 date 2001.07.14.13.35.13; author jlam; state Exp; branches; next 1.4; 1.4 date 2000.08.04.01.31.56; author jlam; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.36.04; author agc; state Exp; branches; next 1.2; 1.2 date 98.05.18.11.09.00; author agc; state Exp; branches; next 1.1; 1.1 date 98.05.18.09.18.28; author agc; state Exp; branches; next ; 1.8.22.1 date 2006.07.09.21.30.57; author salo; state Exp; branches; next ; desc @@ 1.14 log @Fix build on OpenBSD/amd64 5.2. * Add OpenBSD conditionals * Add workaround for library link @ text @$NetBSD: patch-aa,v 1.13 2013/01/05 12:57:22 mef Exp $ (1) Add NetBSDArchitecture and DragonFlyArchitecture --- lib/audio/Imakefile.orig Wed Jan 26 16:10:17 2011 +++ lib/audio/Imakefile @@@@ -59,7 +59,7 @@@@ #endif XCOMM JET - hmmm. -#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(BSDArchitecture)) && defined(HasBSD44Sockets) +#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(BSDArchitecture) || defined(OpenBSDArchitecture)) && defined(HasBSD44Sockets) EXTRA_DEFINES = -DBSD44SOCKETS #endif @@@@ -150,14 +150,16 @@@@ XAULIB = XAULIB = -lXau #endif -#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) || defined(OpenBSDArchitecture) REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm -#endif -#if defined(cygwinArchitecture) + +#elif defined(cygwinArchitecture) REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $(XTOOLLIB) $(XONLYLIB) STD_INCLUDES = -I/usr/include -#endif +#else +REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) +#endif #if DoSharedLib @ 1.13 log @(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. ----- @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.12 2009/07/09 19:10:25 hasso Exp $ d5 1 a5 1 --- lib/audio/Imakefile.orig 2006-08-14 03:10:05.000000000 +0200 d7 10 a16 1 @@@@ -150,14 +150,16 @@@@ d21 1 a21 1 +#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture) || defined(NetBSDArchitecture) || defined(DragonFlyArchitecture) @ 1.12 log @Libm is needed on DragonFly as well. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.11 2008/05/31 13:32:04 tnn Exp $ d3 3 a5 1 --- lib/audio/Imakefile.orig 2006-08-14 03:10:05.000000000 +0200 d7 1 a7 1 @@@@ -150,14 +150,14 @@@@ XAULIB = d11 2 a12 2 -#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) +#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) || defined(NetBSDArchitecture) || defined(DragonFlyArchitecture) d15 1 a15 1 - d17 1 @ 1.11 log @Assume that we need to link with -lXt -lXau if we're not on any of the platforms explicitly defined. Should fix build on SunOS. @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 +#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) || defined(NetBSDArchitecture) @ 1.10 log @Link libaudio against the libraries it needs (previously on Linux, Darwin, and FreeBSD; now on NetBSD too). Bump PKGREVISION. Noted broken by hira@@ @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2006/07/08 00:27:56 minskim Exp $ d3 1 a3 1 --- lib/audio/Imakefile.orig 2006-08-14 01:10:05.000000000 +0000 d5 1 a5 1 @@@@ -150,7 +150,7 @@@@ XAULIB = d12 5 a16 3 #endif @@@@ -159,6 +159,10 @@@@ REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $ d18 4 a21 1 #endif a22 4 +#if defined(DarwinArchitecture) +REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) +#endif + a24 1 #if DoNormalLib @ 1.9 log @Add required link options for Darwin. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- lib/audio/Imakefile.orig 2005-06-04 13:08:54.000000000 -0700 d5 9 @ 1.8 log @backout unnecessary patch. this patch was unnecessarily causing the resulting binaries to be linked against libaudio, which couldn't be found at runtime, and contrary to the log message it had no effect on PR pkg/23081. fixes my PR pkg/23288. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 2003/10/25 14:29:12 fredb Exp $ d3 5 a7 5 --- config/NetAudio.tmpl.orig 2002-07-20 20:40:34.000000000 -0500 +++ config/NetAudio.tmpl @@@@ -28,6 +28,10 @@@@ #define DoSharedLib HasSharedLibraries #define DoNormalLib YES d9 2 a10 2 +#ifndef SharedLibX +# define SharedLibX HasSharedLibraries d13 3 a15 3 #ifndef WIN32 #define Date @@date #define RmTree(dir) $(RM) -r dir @ 1.8.22.1 log @Pullup ticket 1733 - requested by minskim portability fixes for nas Revisions pulled up: - pkgsrc/audio/nas/Makefile 1.62, 1.63 - pkgsrc/audio/nas/distinfo 1.18 - pkgsrc/audio/nas/patches/patch-aa 1.9 Module Name: pkgsrc Committed By: jlam Date: Fri Jul 7 22:10:07 UTC 2006 Modified Files: pkgsrc/audio/nas: Makefile Log Message: Add an explicit run-time dependency on perl because these packages install perl scripts. Bump the PKGREVISION for the dependency change. --- Module Name: pkgsrc Committed By: minskim Date: Fri Jul 7 23:20:20 UTC 2006 Modified Files: pkgsrc/audio/nas: Makefile Log Message: Run configure with env variables set by pkgsrc. Previously, it was imake that ran configure, which failed on Darwin because imake didn't pass all variables in CONFIGURE_ENV. This fixes PR 33812. The package still does not build on Darwin due to link errors. --- Module Name: pkgsrc Committed By: minskim Date: Sat Jul 8 00:27:56 UTC 2006 Modified Files: pkgsrc/audio/nas: distinfo Added Files: pkgsrc/audio/nas/patches: patch-aa Log Message: Add required link options for Darwin. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2006/07/08 00:27:56 minskim Exp $ d3 5 a7 5 --- lib/audio/Imakefile.orig 2005-06-04 13:08:54.000000000 -0700 +++ lib/audio/Imakefile @@@@ -159,6 +159,10 @@@@ REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $ STD_INCLUDES = -I/usr/include #endif d9 2 a10 2 +#if defined(DarwinArchitecture) +REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) d13 3 a15 3 #if DoSharedLib #if DoNormalLib @ 1.7 log @Fix a warning, that may or may not be related to PR pkg/23081. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update of nas to 1.6. pkgsrc changes: PKG_SYSCONFised. changes: bug fixes and ... 1.5h 10/12/2002 - Added SoundFileGetProc() to get access to the toSound and fromSound Procs in _SoundFileInfo[]. Needed for xemacs. - Added AudioLibraryVersionMajor, AudioLibraryVersionMinor, and AudioLibraryVersionTeeny to audiolib.h. Somewhat more informative than just the old AudioLibraryVersion which was set a '2'. The older AudioLibraryVersion define is still there however. 1.5g 10/7/2002 - changed inputsection defaults in nasd.conf.eg to 44.1Khz, 2 channel 16b sound. outputsection also defaults to 44.1Khz now, instead of 33Khz. - began some CC ANSI'fication of libaudio. 1.5f 8/26/2002 7/20/2002 - added cygwinArchitecture to the server Imakefile so auvoxware will be built on cygwin systems. - Removed the SoundFileInfo[] array in sound.h so cygwin would be happy. Apps should not have been accessing that array directly anyways. Added the following new functions to sound.c (that used to be macros in sound.h): SoundFileFormatString, SoundValidDataFormat, SoundFileFormatToString, SoundFileFormatToAbbrev, SoundFileFormatToSuffixes Assuming your code did not attempt to directly access SoundFileInfo[], no changes should be required. libaudio.so revision bumped to 2.3 - re-added back the Xtutils stuff, as some of the demos did in fact require it. cygwin has a problem with implicitly defined functions anyway. 7/9/2002 - rename dia/nasconfig.* to dia/nasconf.* to avoid name collision with NasConfig.h on windows systems. 1.5e 7/7/2002 - added patch from Nicolas Escuder that adds support for Windows operating systems using Cygwin. Even the NAS server is now supported. There are still issues with building regarding Imake, but once I can get more information, I'll fix those up. Read the README.CYGWIN file in the nas/ directory for instructions. I will provide a link on the nas-links page to precompiled windows binaries for libaudio.dll, nasd, and some clients - provided by Nicolas. - based on idea from Nicolas, added background (-b) mode to nasd, to force it to run in the background. Actually, he supplied a patch, but I just redid it to work properly with unix systems. - added NAS_AUDIOMSGFILE in config/NasConfig.h to specify where audio messages are stored (ADMPATH in os/osinit.c). 1.5d 6/1/2002 - added .ps -> .pdf conversions in doc/pdf/ - added html versions of man pages in doc/html/ 1.5c 3/27/2002 - removed Xtutil[hc] from libaudio and removed references to Xtutil.h in the clients. Suggestion by Paul Fox. 1.5b 3/16/2002 - added patch from Marco Molteni to add a '-local' option to nasd. Specifying this option allows only local clients to connect. - moved allow_any_host into the NasConfig struct. Along with the new '-local' option. 1.5a 2/23/2002 - more STARTSERVER fixes - there was still one case where when STARTSERVER was defined, nasd could be called with the wrong display number due to a bug in _AuConnectServer. - changed LEX/YACC DEBUG token to CDEBUG to avoid conflicts when building nas with '-DDEBUG' - DEFAULT_AUSERVER is now ":0" rather than "tcp/localhost:8000". A local socket connection will startup faster than a tcp connection. - mutex.h - corrected unixware 7.x build problem (XMUTEX_INITIALIZER) in mutex.h - added same check for sun/solaris boxes - got rid of XUSE_MTSAFE_API - now controlled by NAS_USEMTSAFEAPI defined in config/NasConfig.h If you think you are having mutex problems, you can edit config/NasConfig.h and '#undef' NAS_USEMTSAFEAPI, then rebuild everthing. This will turn off threadsafety in libaudio. - added new option, 'gain', to config file in the input/output sections. This sets the default gains when nasd starts up (if MixerInit is enabled). Only in voxware for now. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2001/07/14 13:35:13 jlam Exp $ d3 1 a3 1 --- config/NetAudio.tmpl.orig Sun Mar 18 15:36:39 2001 d5 3 a7 2 @@@@ -222,7 +222,7 @@@@ #define AuInstallManPage(file,destdir) AuInstallManPageLong(file,destdir,file) d9 7 a15 6 #define AuInstallManPageLong(file,destdir,dest) @@@@\ -install.man:: file.man @@@@\ +tmp.man:: file.man @@@@\ @@(rel=`cat $(TOP)/RELEASE | \ @@@@\ sed 's/Network Audio System Release //'`; \ @@@@\ sed -f $(TOP)/config/mungeman \ @@@@\ @ 1.5 log @Update nas to the latest stable release 1.4.2. Changes from 1.4 include major bugfixes in the clients and bumping the major version of the library. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update nas from 1.2.5 to 1.4. Relevant changes from version 1.2.5: - corrected a problem in the voxware server where when ReleaseDevice was enabled, the device would be held open when nasd was first started until the first connection was made. - changed documentation regarding the new location of the web site (http://radscan.com/nas.html) - integrated config handling in all servers, based on a lex/yacc parser from Stephen Hocking that was in the voxware server. - config file is /etc/nas/nasd.conf an example config file is installed. - parser errors are a bit more informative ;-) - each server now has a config.c and config.h file that provides the ddaSetConfig() functionality required of each server by dia/. In the SGI case, it's just a stub. ddaSetConfig() ignores options it doesn't understand (required behavior). - server cmdline options '-v' (verbose) and '-d ' (debug messages) added. These override nasd.conf settings. - hooks added to all servers in config.c - ddaProcessArg() and ddaUseMsg() for integrated arg handling. - voxware server: - release device functionality now controlled by nasd.conf - mixer init policy now controlled by nasd.conf - sun server: - added integrated sun (ausuni) module (now built by default) into the distribution. - release device functionality now controlled by nasd.conf - hpux server: - added device release (ReleaseDevice) capability to hpux server. All servers except for sgi now support this functionality. - fixed sample rate change problem in hpux server - separated hardware init code for ReleaseDevice functionality - added new option in nasd.conf to select either the EXT (external - headphones/speakers) or INT (internal speaker) output device by default - renamed generated server binary from au* to nasd for all servers - man pages updated (auserver.man and AUVoxConfig.man respectively). - Added patches from Mark Davies for NetBSD. @ text @d3 3 a5 3 --- config/NetAudio.tmpl.orig Sat Mar 4 21:40:50 2000 +++ config/NetAudio.tmpl Thu Aug 3 21:03:54 2000 @@@@ -207,7 +207,7 @@@@ @ 1.3 log @Add NetBSD RCS Ids. @ text @d3 4 a6 36 --- ./clients/audio/audial/audial.c.orig Sun May 17 19:29:08 1998 +++ ./clients/audio/audial/audial.c Sun May 17 19:31:30 1998 @@@@ -133,6 +133,7 @@@@ signal(SIGALRM, SIG_DFL); } +#if (!defined(__FreeBSD__) || (__FreeBSD__ < 3)) && !defined(__NetBSD__) static void usleep(usecs) unsigned int usecs; @@@@ -149,6 +150,7 @@@@ setitimer(ITIMER_REAL, &ntval, &otval); pause(); } +#endif /* !__FreeBSD__ && !__NetBSD__ */ #endif /* SYSV else not */ #endif /* VMS else not */ --- ./clients/audio/auedit/Graph.c.orig Sun May 17 17:22:27 1998 +++ ./clients/audio/auedit/Graph.c Sun May 17 19:40:41 1998 @@@@ -28,7 +28,12 @@@@ */ #ifndef WIN32 +#if defined(__FreeBSD__) || defined(__NetBSD__) +#include +#define MAXSHORT SHRT_MAX +#else /* !__FreeBSD__ && !__NetBSD__ */ #include +#endif /* __FreeBSD__ || __NetBSD__ */ #else /* WIN32 */ #define MAXSHORT 0x7fff #endif /* WIN32 */ --- ./config/NetAudio.tmpl.orig Sun May 17 15:49:55 1998 +++ ./config/NetAudio.tmpl Sun May 17 18:29:27 1998 @@@@ -193,12 +193,14 @@@@ d9 2 a10 4 install.man:: file.man @@@@\ + @@if [ ! -f file.man.orig ]; then \ @@@@\ + cp file.man file.man.orig; \ @@@@\ + fi @@@@\ a13 179 - -e "s/_RELEASE_/$$rel/" < file.man > tmp.man) @@@@\ - InstallManPageLong(tmp,destdir,dest) @@@@\ - @@$(RM) tmp.man + -e "s/_RELEASE_/$$rel/" < file.man.orig > file.man) @@@@\ + InstallManPageLong(file,destdir,dest) #define SingleAudioProgram(program) @@@@\ InstallProgram(program,$(BINDIR)) @@@@\ --- ./include/audio/Imakefile.orig Sun May 17 17:03:45 1998 +++ ./include/audio/Imakefile Sun May 17 20:33:52 1998 @@@@ -24,7 +24,11 @@@@ #include "../../config/NetAudio.tmpl" -INSTALLFLAGS = $(INSTINCFLAGS) +#if HasBsdMake +INSTALLFLAGS += $(INSTINCFLAGS) +#else +INSTALLFLAGS = $(INSTALLFLAGS) $(INSTINCFLAGS) +#endif HEADERS = Afuncproto.h Afuncs.h Amd.h Aos.h Aosdefs.h Aproto.h audio.h FILES = $(HEADERS) @@@@ -37,7 +41,7 @@@@ MakeDir($(BUILDINCDIR:/=\)) #endif /* WIN32 */ -BuildIncludes($(HEADERS),audio,..) +BuildIncludes($(HEADERS),audio,.) #if ProjectX < 5 /* X11R4 doesn't make dir explicitly */ #ifndef MakeDir --- ./lib/audio/Alibint.c.orig Sun May 17 15:02:27 1998 +++ ./lib/audio/Alibint.c Sun May 17 17:10:44 1998 @@@@ -1324,11 +1324,12 @@@@ static char *_SysErrorMsg (n) int n; { -#if !defined(__FreeBSD__) +#if !defined(__FreeBSD__) && !defined(__NetBSD__) extern char *sys_errlist[]; #endif extern int sys_nerr; - char *s = ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error"); + char *s; + s = ((n >= 0 && n < sys_nerr) ? (char *) sys_errlist[n] : "unknown error"); return (s ? s : "no such error"); } --- ./lib/audio/ConnSvr.c.orig Sun May 17 15:03:00 1998 +++ ./lib/audio/ConnSvr.c Sun May 17 15:03:32 1998 @@@@ -54,9 +54,9 @@@@ #define FIOSNBIO FIONBIO #endif /* WIN32 */ -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__) #include -#endif /* __FreeBSD__ */ +#endif /* __FreeBSD__ || __NetBSD__ */ #include #include