Sun Dec 15 20:14:16 2013 UTC ()
FreeBSD 9 uses sys/soundcard.h


(asau)
diff -r1.12 -r1.13 pkgsrc/audio/portaudio/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/portaudio/patches/patch-af
cvs diff -r1.12 -r1.13 pkgsrc/audio/portaudio/distinfo (switch to unified diff)

--- pkgsrc/audio/portaudio/distinfo 2012/01/11 20:14:10 1.12
+++ pkgsrc/audio/portaudio/distinfo 2013/12/15 20:14:16 1.13
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.12 2012/01/11 20:14:10 hans Exp $ 1$NetBSD: distinfo,v 1.13 2013/12/15 20:14:16 asau Exp $
2 2
3SHA1 (portaudio_v18_1.zip) = a460ac5484137d77df17a95ce844ff7f178305b1 3SHA1 (portaudio_v18_1.zip) = a460ac5484137d77df17a95ce844ff7f178305b1
4RMD160 (portaudio_v18_1.zip) = 3352d70225a81aae80eefabc3701658da0c750c2 4RMD160 (portaudio_v18_1.zip) = 3352d70225a81aae80eefabc3701658da0c750c2
5Size (portaudio_v18_1.zip) = 550130 bytes 5Size (portaudio_v18_1.zip) = 550130 bytes
6SHA1 (patch-aa) = e522bfbf7f69d6f15fd0a32e01a480db922acc56 6SHA1 (patch-aa) = e522bfbf7f69d6f15fd0a32e01a480db922acc56
7SHA1 (patch-ac) = 08740265e8957d2ce655b54dba40e8d90407f4f6 7SHA1 (patch-ac) = 08740265e8957d2ce655b54dba40e8d90407f4f6
8SHA1 (patch-ad) = 5a343e721ae183facc58195026c7e5c49536632a 8SHA1 (patch-ad) = 5a343e721ae183facc58195026c7e5c49536632a
9SHA1 (patch-ae) = c2744f10d80a478ad571fcce82bf301d6c50cb59 9SHA1 (patch-ae) = c2744f10d80a478ad571fcce82bf301d6c50cb59
10SHA1 (patch-af) = 89be73767984ffb9df0e065c493194a0cfdaeb8c 10SHA1 (patch-af) = fb0c8c9c78b4726d86281edcc57718952107a7a7
11SHA1 (patch-ag) = 8aadcd18189dd1c8ae64885dbd209e5d7eae63a1 11SHA1 (patch-ag) = 8aadcd18189dd1c8ae64885dbd209e5d7eae63a1
cvs diff -r1.2 -r1.3 pkgsrc/audio/portaudio/patches/Attic/patch-af (switch to unified diff)

--- pkgsrc/audio/portaudio/patches/Attic/patch-af 2012/01/11 20:14:10 1.2
+++ pkgsrc/audio/portaudio/patches/Attic/patch-af 2013/12/15 20:14:16 1.3
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-af,v 1.2 2012/01/11 20:14:10 hans Exp $ 1$NetBSD: patch-af,v 1.3 2013/12/15 20:14:16 asau Exp $
2 2
3--- pa_unix_oss/pa_unix_oss.c~ Mon Jun 30 11:05:50 2003 3--- pa_unix_oss/pa_unix_oss.c~ Mon Jun 30 11:05:50 2003
4+++ pa_unix_oss/pa_unix_oss.c Wed Nov 26 02:40:25 2003 4+++ pa_unix_oss/pa_unix_oss.c Wed Nov 26 02:40:25 2003
5@@ -43,10 +43,15 @@ 5@@ -43,10 +43,15 @@
6  6
7 #ifdef __linux__ 7 #ifdef __linux__
8 #include <linux/soundcard.h> 8 #include <linux/soundcard.h>
9+#elif defined(__sun) 9+#elif defined(__sun) || defined(__FreeBSD__)
10+#include <sys/soundcard.h> 10+#include <sys/soundcard.h>
11 #else 11 #else
12 #include <machine/soundcard.h> /* JH20010905 */ 12 #include <machine/soundcard.h> /* JH20010905 */
13 #endif 13 #endif
14  14
15+#ifdef __NetBSD__ 15+#ifdef __NetBSD__
16+#include <sys/audioio.h> 16+#include <sys/audioio.h>
17+#endif 17+#endif
18  18
19 #ifndef AFMT_S16_NE 19 #ifndef AFMT_S16_NE
20 #define AFMT_S16_NE Get_AFMT_S16_NE() 20 #define AFMT_S16_NE Get_AFMT_S16_NE()
21@@ -236,7 +241,11 @@ PaError Pa_SetupDeviceFormat( int devHan 21@@ -236,7 +241,11 @@ PaError Pa_SetupDeviceFormat( int devHan
22 ERR_RPT(("Pa_SetupDeviceFormat: HW does not support AFMT_S16_NE\n" )); 22 ERR_RPT(("Pa_SetupDeviceFormat: HW does not support AFMT_S16_NE\n" ));
23 return paHostError; 23 return paHostError;
24 } 24 }
25- 25-
26+#ifdef __NetBSD__ 26+#ifdef __NetBSD__
27+ tmp = 1; 27+ tmp = 1;
28+ ioctl(devHandle, AUDIO_SETFD, &tmp); /* set full-duplex operations,  28+ ioctl(devHandle, AUDIO_SETFD, &tmp); /* set full-duplex operations,
29+ * ignore the output on non-fd cards */ 29+ * ignore the output on non-fd cards */
30+#endif 30+#endif
31  31
32 /* Set number of channels. */ 32 /* Set number of channels. */
33 tmp = numChannels; 33 tmp = numChannels;