kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/audio/nas/patches/patch-ad

91 lines
3.4 KiB
Text
Raw Normal View History

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.
2008-10-14 14:47:11 +02:00
$NetBSD: patch-ad,v 1.13 2008/10/14 12:47:11 markd Exp $
Make this work on NetBSD without installing a config file.
2000-09-12 18:49:22 +02:00
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.
2008-10-14 14:47:11 +02:00
--- server/dda/voxware/auvoxware.c.orig 2007-11-11 12:40:47.000000000 +1300
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.
2001-07-14 15:35:12 +02:00
+++ server/dda/voxware/auvoxware.c
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.
2008-10-14 14:47:11 +02:00
@@ -245,8 +245,13 @@ SndStat sndStatIn = {
Update nas to 1.9 Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
2007-05-05 23:31:09 +02:00
256, /* fragSize */
3, /* minFrags */
32, /* maxFrags */
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.
2001-07-14 15:35:12 +02:00
+#if defined(__NetBSD__)
Update nas to 1.9 Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
2007-05-05 23:31:09 +02:00
+ "@DEVOSSAUDIO@", /* device */
+ "/dev/mixer", /* mixer */
Make this work on NetBSD without installing a config file.
2000-09-12 18:49:22 +02:00
+#else
Update nas to 1.9 Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
2007-05-05 23:31:09 +02:00
"/dev/dsp1", /* device */
"/dev/mixer1", /* mixer */
Make this work on NetBSD without installing a config file.
2000-09-12 18:49:22 +02:00
+#endif
Update nas to 1.9 Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
2007-05-05 23:31:09 +02:00
O_RDONLY, /* howToOpen */
1, /* autoOpen */
0, /* forceRate */
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.
2008-10-14 14:47:11 +02:00
@@ -266,7 +271,11 @@ SndStat sndStatOut = {
Update nas to 1.9 Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
2007-05-05 23:31:09 +02:00
256, /* fragSize */
3, /* minFrags */
32, /* maxFrags */
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.
2001-07-14 15:35:12 +02:00
+#if defined(__NetBSD__)
Update nas to 1.9 Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
2007-05-05 23:31:09 +02:00
+ "@DEVOSSAUDIO@", /* device */
Make this work on NetBSD without installing a config file.
2000-09-12 18:49:22 +02:00
+#else
Update nas to 1.9 Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
2007-05-05 23:31:09 +02:00
"/dev/dsp", /* device */
Make this work on NetBSD without installing a config file.
2000-09-12 18:49:22 +02:00
+#endif
Update nas to 1.9 Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
2007-05-05 23:31:09 +02:00
"/dev/mixer", /* mixer */
O_WRONLY, /* howToOpen */
1, /* autoOpen */
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.
2008-10-14 14:47:11 +02:00
@@ -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)
Fix build problem on NetBSD/powerpc as seen in Havard Eidnes' bulk build.
2007-12-25 20:48:42 +01:00
}
-#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__)
+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
inline
#endif
static void
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.
2008-10-14 14:47:11 +02:00
@@ -1387,7 +1400,7 @@ monoToStereoLinearSigned16LSB(AuUint32 n
Fix build problem on NetBSD/powerpc as seen in Havard Eidnes' bulk build.
2007-12-25 20:48:42 +01:00
}
}
-#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__)
+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
inline
#endif
static void
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.
2008-10-14 14:47:11 +02:00
@@ -1450,7 +1463,7 @@ writePhysicalOutputsMono(void)
Fix build problem on NetBSD/powerpc as seen in Havard Eidnes' bulk build.
2007-12-25 20:48:42 +01:00
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
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.
2008-10-14 14:47:11 +02:00
@@ -1465,7 +1478,7 @@ stereoToMonoLinearSigned16LSB(AuUint32 n
Fix build problem on NetBSD/powerpc as seen in Havard Eidnes' bulk build.
2007-12-25 20:48:42 +01:00
}
}
-#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__)
+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
inline
#endif
static void
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.
2008-10-14 14:47:11 +02:00
@@ -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",
Reference in a new issue Copy permalink