Mon Jun 16 13:26:25 2014 UTC ()
Exclude more unimplemented SOUND_PCM_* ioctls on SunOS.


(jperkin)
diff -r1.42 -r1.43 pkgsrc/audio/pulseaudio/distinfo
diff -r1.15 -r1.16 pkgsrc/audio/pulseaudio/patches/patch-aa
cvs diff -r1.42 -r1.43 pkgsrc/audio/pulseaudio/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/distinfo 2014/06/11 01:33:59 1.42
+++ pkgsrc/audio/pulseaudio/distinfo 2014/06/16 13:26:25 1.43
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.42 2014/06/11 01:33:59 dsainty Exp $ 1$NetBSD: distinfo,v 1.43 2014/06/16 13:26:25 jperkin Exp $
2 2
3SHA1 (pulseaudio-5.0.tar.xz) = e420931a0b9cf37331cd06e30ba415046317ab85 3SHA1 (pulseaudio-5.0.tar.xz) = e420931a0b9cf37331cd06e30ba415046317ab85
4RMD160 (pulseaudio-5.0.tar.xz) = 4ba13e92c58f8ada4542d521131094a55e3b6991 4RMD160 (pulseaudio-5.0.tar.xz) = 4ba13e92c58f8ada4542d521131094a55e3b6991
5Size (pulseaudio-5.0.tar.xz) = 1455428 bytes 5Size (pulseaudio-5.0.tar.xz) = 1455428 bytes
6SHA1 (patch-aa) = c8bd0e5b6e4c4068d8706aea62ce248bb79184d7 6SHA1 (patch-aa) = 4e8a38810453d0efad287528b7f18c056a5cdd8b
7SHA1 (patch-configure.ac) = f7c54eca4613c6f14732683f2f24ca81f723320d 7SHA1 (patch-configure.ac) = f7c54eca4613c6f14732683f2f24ca81f723320d
8SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02 8SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02
9SHA1 (patch-src_Makefile.in) = 21daf6069ae067dd235de6d43a013e4e70bbca78 9SHA1 (patch-src_Makefile.in) = 21daf6069ae067dd235de6d43a013e4e70bbca78
10SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a 10SHA1 (patch-src_daemon_caps.c) = e819c26cd3d91d93ae5877725ed6a1b59183d89a
11SHA1 (patch-src_daemon_main.c) = e87f764d18345056210427bea52bf27f3f2999b6 11SHA1 (patch-src_daemon_main.c) = e87f764d18345056210427bea52bf27f3f2999b6
12SHA1 (patch-src_modules_module-detect.c) = 1679519bc8a46a85790babe9c729850d10b9da6c 12SHA1 (patch-src_modules_module-detect.c) = 1679519bc8a46a85790babe9c729850d10b9da6c
13SHA1 (patch-src_modules_oss_module-oss.c) = 43a0c2eeb5a9a37c7a231a531caa3658fe8d49b0 13SHA1 (patch-src_modules_oss_module-oss.c) = 43a0c2eeb5a9a37c7a231a531caa3658fe8d49b0
14SHA1 (patch-src_pulsecore_sample-util.h) = b6bd83cfdc1c337453d9a728f07205a2cf0af831 14SHA1 (patch-src_pulsecore_sample-util.h) = b6bd83cfdc1c337453d9a728f07205a2cf0af831
15SHA1 (patch-src_pulsecore_svolume__mmx.c) = b500530bcc9792b97050c7fa6e47639ac8e261a2 15SHA1 (patch-src_pulsecore_svolume__mmx.c) = b500530bcc9792b97050c7fa6e47639ac8e261a2
16SHA1 (patch-src_pulsecore_svolume__sse.c) = 07da6faa8529d7308d8a6a9f11958ef9faf46409 16SHA1 (patch-src_pulsecore_svolume__sse.c) = 07da6faa8529d7308d8a6a9f11958ef9faf46409
17SHA1 (patch-src_tests_mult-s16-test.c) = 3a0fbec804ebefbd88688e84b8d45e0aca597b84 17SHA1 (patch-src_tests_mult-s16-test.c) = 3a0fbec804ebefbd88688e84b8d45e0aca597b84
18SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae 18SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae
cvs diff -r1.15 -r1.16 pkgsrc/audio/pulseaudio/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-aa 2014/06/09 13:08:19 1.15
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-aa 2014/06/16 13:26:25 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.15 2014/06/09 13:08:19 ryoon Exp $ 1$NetBSD: patch-aa,v 1.16 2014/06/16 13:26:25 jperkin Exp $
2 2
3ioctl() takes u_long argument on NetBSD. 3ioctl() takes u_long argument on NetBSD.
4On NetBSD<6 and 6.99.0-6.99.7, use third parameter in ioctl instead of varargs. 4On NetBSD<6 and 6.99.0-6.99.7, use third parameter in ioctl instead of varargs.
5stat() system call has been versioned, use latest version when dlopen()ing. 5stat() system call has been versioned, use latest version when dlopen()ing.
6Try more typical device names. 6Try more typical device names.
7SOUND_PCM_* is not available on SunOS. 7SOUND_PCM_* is not available on SunOS.
8 8
9--- src/utils/padsp.c.orig 2014-01-23 18:57:55.000000000 +0000 9--- src/utils/padsp.c.orig 2014-01-23 18:57:55.000000000 +0000
10+++ src/utils/padsp.c 10+++ src/utils/padsp.c
11@@ -49,6 +49,9 @@ 11@@ -49,6 +49,9 @@
12 #ifdef __linux__ 12 #ifdef __linux__
13 #include <linux/sockios.h> 13 #include <linux/sockios.h>
14 #endif 14 #endif
@@ -74,34 +74,34 @@ SOUND_PCM_* is not available on SunOS. @@ -74,34 +74,34 @@ SOUND_PCM_* is not available on SunOS.
74- _stat = (int (*)(const char *, struct stat *)) dlsym_fn(RTLD_NEXT, "stat"); \ 74- _stat = (int (*)(const char *, struct stat *)) dlsym_fn(RTLD_NEXT, "stat"); \
75+ _stat = (int (*)(const char *, struct stat *)) dlsym_fn(RTLD_NEXT, STAT_FUNC); \ 75+ _stat = (int (*)(const char *, struct stat *)) dlsym_fn(RTLD_NEXT, STAT_FUNC); \
76 pthread_mutex_unlock(&func_mutex); \ 76 pthread_mutex_unlock(&func_mutex); \
77 } while(0) 77 } while(0)
78  78
79@@ -2277,6 +2303,7 @@ static int dsp_ioctl(fd_info *i, unsigne 79@@ -2277,6 +2303,7 @@ static int dsp_ioctl(fd_info *i, unsigne
80 break; 80 break;
81 } 81 }
82  82
83+#ifndef __sun 83+#ifndef __sun
84 case SOUND_PCM_READ_RATE: 84 case SOUND_PCM_READ_RATE:
85 debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n"); 85 debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");
86  86
87@@ -2284,6 +2311,7 @@ static int dsp_ioctl(fd_info *i, unsigne 87@@ -2300,6 +2327,7 @@ static int dsp_ioctl(fd_info *i, unsigne
88 *(int*) argp = i->sample_spec.rate; 88 *(int*) argp = pa_sample_size(&i->sample_spec)*8;
89 pa_threaded_mainloop_unlock(i->mainloop); 89 pa_threaded_mainloop_unlock(i->mainloop);
90 break; 90 break;
91+#endif 91+#endif
92  92
93 case SOUND_PCM_READ_CHANNELS: 93 case SNDCTL_DSP_GETOPTR: {
94 debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_CHANNELS\n"); 94 count_info *info;
95@@ -2370,21 +2398,35 @@ fail: 95@@ -2370,21 +2398,35 @@ fail:
96 return ret; 96 return ret;
97 } 97 }
98  98
99+/* NetBSD < 6 and 6.99.0 - 6.99.6 used a different ioctl() definition */ 99+/* NetBSD < 6 and 6.99.0 - 6.99.6 used a different ioctl() definition */
100+#if defined(__NetBSD__) && (__NetBSD_Version__ < 600000000 || \ 100+#if defined(__NetBSD__) && (__NetBSD_Version__ < 600000000 || \
101+ (__NetBSD_Version__ > 699000000 && __NetBSD_Version__ < 699000700) ) 101+ (__NetBSD_Version__ > 699000000 && __NetBSD_Version__ < 699000700) )
102+# define OLD_NETBSD_IOCTL_CALL 102+# define OLD_NETBSD_IOCTL_CALL
103+#endif 103+#endif
104+ 104+
105 #ifdef sun 105 #ifdef sun
106 int ioctl(int fd, int request, ...) { 106 int ioctl(int fd, int request, ...) {
107+#elif defined(OLD_NETBSD_IOCTL_CALL) 107+#elif defined(OLD_NETBSD_IOCTL_CALL)