Wed Sep 14 15:53:35 2011 UTC ()
Fix build on SunOS.


(hans)
diff -r1.48 -r1.49 pkgsrc/audio/pulseaudio/Makefile
diff -r1.7 -r1.8 pkgsrc/audio/pulseaudio/PLIST
diff -r1.26 -r1.27 pkgsrc/audio/pulseaudio/distinfo
diff -r1.7 -r1.8 pkgsrc/audio/pulseaudio/patches/patch-aa
diff -r0 -r1.1 pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_macro.h
cvs diff -r1.48 -r1.49 pkgsrc/audio/pulseaudio/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/Makefile 2011/09/14 15:49:47 1.48
+++ pkgsrc/audio/pulseaudio/Makefile 2011/09/14 15:53:35 1.49
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.48 2011/09/14 15:49:47 hans Exp $ 1# $NetBSD: Makefile,v 1.49 2011/09/14 15:53:35 hans Exp $
2 2
3# NOTE: Please send a copy of any patches that are not pkgsrc-specific 3# NOTE: Please send a copy of any patches that are not pkgsrc-specific
4# to <pulseaudio-discuss@mail.0pointer.de> 4# to <pulseaudio-discuss@mail.0pointer.de>
5 5
6PULSEAUDIO_VER= 0.9.21 6PULSEAUDIO_VER= 0.9.21
7PKGREVISION= 10 7PKGREVISION= 10
8DISTNAME= pulseaudio-${PULSEAUDIO_VER} 8DISTNAME= pulseaudio-${PULSEAUDIO_VER}
9CATEGORIES= audio 9CATEGORIES= audio
10MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ 10MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.pulseaudio.org/ 13HOMEPAGE= http://www.pulseaudio.org/
14COMMENT= Sound server for POSIX and Win32 systems 14COMMENT= Sound server for POSIX and Win32 systems
@@ -61,38 +61,44 @@ SUBST_STAGE.padsp= post-build @@ -61,38 +61,44 @@ SUBST_STAGE.padsp= post-build
61SUBST_FILES.padsp= src/utils/padsp 61SUBST_FILES.padsp= src/utils/padsp
62SUBST_SED.padsp= -e 's@libpulsedsp\.so@${PREFIX}/lib/&@' 62SUBST_SED.padsp= -e 's@libpulsedsp\.so@${PREFIX}/lib/&@'
63 63
64.include "../../mk/bsd.prefs.mk" 64.include "../../mk/bsd.prefs.mk"
65.if ${OPSYS} == "NetBSD" 65.if ${OPSYS} == "NetBSD"
66# broken test for TLS 66# broken test for TLS
67CONFIGURE_ENV+= cc_cv_tls___thread=no 67CONFIGURE_ENV+= cc_cv_tls___thread=no
68.endif 68.endif
69# see PR 42820 69# see PR 42820
70.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M4.*} != "" 70.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M4.*} != ""
71BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined 71BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined
72.endif 72.endif
73 73
74PLIST_VARS+= evdev hal oss 74PLIST_VARS+= evdev hal oss sun
75PLIST_SUBST+= PULSEAUDIO_VER=${PULSEAUDIO_VER:Q} 75PLIST_SUBST+= PULSEAUDIO_VER=${PULSEAUDIO_VER:Q}
76 76
77.if ${OPSYS} == "Darwin" 77.if ${OPSYS} == "Darwin"
78BUILDLINK_TRANSFORM+= rm:-Wl,-version-script=./map-file 78BUILDLINK_TRANSFORM+= rm:-Wl,-version-script=./map-file
79BUILDLINK_TRANSFORM+= rm:-Wl,-no-undefined 79BUILDLINK_TRANSFORM+= rm:-Wl,-no-undefined
80BUILDLINK_TRANSFORM+= rm:-Wl,-z rm:-Wl,nodelete 80BUILDLINK_TRANSFORM+= rm:-Wl,-z rm:-Wl,nodelete
81.else 81.else
82PLIST.hal= yes 82PLIST.hal= yes
83PLIST.oss= yes 83PLIST.oss= yes
84.endif 84.endif
85 85
 86.if ${OPSYS} == "SunOS"
 87PLIST.sun= yes
 88.endif
 89
 90CFLAGS.SunOS+= -std=c99
 91
86PKG_GROUPS= ${PULSE_GROUP} 92PKG_GROUPS= ${PULSE_GROUP}
87PKG_GROUPS+= ${PULSE_GROUP_REALTIME} 93PKG_GROUPS+= ${PULSE_GROUP_REALTIME}
88PKG_GROUPS+= ${PULSE_GROUP_ACCESS} 94PKG_GROUPS+= ${PULSE_GROUP_ACCESS}
89PKG_USERS= ${PULSE_USER}:${PULSE_GROUP} 95PKG_USERS= ${PULSE_USER}:${PULSE_GROUP}
90 96
91BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections 97BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
92 98
93# Use native atomic ops on NetBSD >= 5.0, otherwise 99# Use native atomic ops on NetBSD >= 5.0, otherwise
94# fallback to libatomic_ops 100# fallback to libatomic_ops
95.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h) 101.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h)
96CONFIGURE_ARGS+= --enable-netbsd-atomic-ops 102CONFIGURE_ARGS+= --enable-netbsd-atomic-ops
97.else 103.else
98CONFIGURE_ARGS+= --disable-netbsd-atomic-ops 104CONFIGURE_ARGS+= --disable-netbsd-atomic-ops
cvs diff -r1.7 -r1.8 pkgsrc/audio/pulseaudio/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/PLIST 2010/02/02 11:35:11 1.7
+++ pkgsrc/audio/pulseaudio/PLIST 2011/09/14 15:53:35 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.7 2010/02/02 11:35:11 tron Exp $ 1@comment $NetBSD: PLIST,v 1.8 2011/09/14 15:53:35 hans Exp $
2bin/esdcompat 2bin/esdcompat
3bin/pacat 3bin/pacat
4bin/pacmd 4bin/pacmd
5bin/pactl 5bin/pactl
6${PLIST.oss}bin/padsp 6${PLIST.oss}bin/padsp
7bin/pamon 7bin/pamon
8bin/paplay 8bin/paplay
9bin/parec 9bin/parec
10bin/parecord 10bin/parecord
11bin/pasuspender 11bin/pasuspender
12bin/pax11publish 12bin/pax11publish
13bin/pulseaudio 13bin/pulseaudio
14bin/start-pulseaudio-kde 14bin/start-pulseaudio-kde
@@ -150,26 +150,28 @@ lib/pulse-${PULSEAUDIO_VER}/modules/modu @@ -150,26 +150,28 @@ lib/pulse-${PULSEAUDIO_VER}/modules/modu
150lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-recv.so 150lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-recv.so
151lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-send.a 151lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-send.a
152lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-send.so 152lib/pulse-${PULSEAUDIO_VER}/modules/module-rtp-send.so
153lib/pulse-${PULSEAUDIO_VER}/modules/module-rygel-media-server.a 153lib/pulse-${PULSEAUDIO_VER}/modules/module-rygel-media-server.a
154lib/pulse-${PULSEAUDIO_VER}/modules/module-rygel-media-server.so 154lib/pulse-${PULSEAUDIO_VER}/modules/module-rygel-media-server.so
155lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-tcp.a 155lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-tcp.a
156lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-tcp.so 156lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-tcp.so
157lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-unix.a 157lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-unix.a
158lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-unix.so 158lib/pulse-${PULSEAUDIO_VER}/modules/module-simple-protocol-unix.so
159lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.a 159lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.a
160lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.so 160lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.so
161lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.a 161lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.a
162lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.so 162lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.so
 163${PLIST.sun}lib/pulse-${PULSEAUDIO_VER}/modules/module-solaris.a
 164${PLIST.sun}lib/pulse-${PULSEAUDIO_VER}/modules/module-solaris.so
163lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.a 165lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.a
164lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.so 166lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.so
165lib/pulse-${PULSEAUDIO_VER}/modules/module-suspend-on-idle.a 167lib/pulse-${PULSEAUDIO_VER}/modules/module-suspend-on-idle.a
166lib/pulse-${PULSEAUDIO_VER}/modules/module-suspend-on-idle.so 168lib/pulse-${PULSEAUDIO_VER}/modules/module-suspend-on-idle.so
167lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-sink.a 169lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-sink.a
168lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-sink.so 170lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-sink.so
169lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-source.a 171lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-source.a
170lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-source.so 172lib/pulse-${PULSEAUDIO_VER}/modules/module-tunnel-source.so
171lib/pulse-${PULSEAUDIO_VER}/modules/module-volume-restore.a 173lib/pulse-${PULSEAUDIO_VER}/modules/module-volume-restore.a
172lib/pulse-${PULSEAUDIO_VER}/modules/module-volume-restore.so 174lib/pulse-${PULSEAUDIO_VER}/modules/module-volume-restore.so
173lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-bell.a 175lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-bell.a
174lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-bell.so 176lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-bell.so
175lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-cork-request.a 177lib/pulse-${PULSEAUDIO_VER}/modules/module-x11-cork-request.a
cvs diff -r1.26 -r1.27 pkgsrc/audio/pulseaudio/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/distinfo 2011/07/21 15:10:11 1.26
+++ pkgsrc/audio/pulseaudio/distinfo 2011/09/14 15:53:35 1.27
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1$NetBSD: distinfo,v 1.26 2011/07/21 15:10:11 joerg Exp $ 1$NetBSD: distinfo,v 1.27 2011/09/14 15:53:35 hans Exp $
2 2
3SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22 3SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22
4RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed 4RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed
5Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes 5Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes
6SHA1 (patch-aa) = b8d6bf8ce8642bc987a7dce5d14df51a2a92d2ae 6SHA1 (patch-aa) = 3d1afdd56929be01013cdd38b970007bbb1d7242
7SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f 7SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f
8SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0 8SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0
9SHA1 (patch-ad) = 5ae0e5d8b0b7622c35cb2fabba4a33b673cbd442 9SHA1 (patch-ad) = 5ae0e5d8b0b7622c35cb2fabba4a33b673cbd442
10SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30 10SHA1 (patch-ae) = 5e6957e73ffd96d2e63e5ea4eb9b0ca9ea016b30
11SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e 11SHA1 (patch-af) = e11fb419787e3cd1f305b66c995915f11276770e
12SHA1 (patch-ag) = 64c93717f864605ba66cc6c4be84a594aeda943c 12SHA1 (patch-ag) = 64c93717f864605ba66cc6c4be84a594aeda943c
13SHA1 (patch-ah) = b4ce6535ca9dfc695bd04c5fae0a5bc614bec2eb 13SHA1 (patch-ah) = b4ce6535ca9dfc695bd04c5fae0a5bc614bec2eb
14SHA1 (patch-ba) = 7a57cbd68026c72804bb705d2a23e562c59b86a7 14SHA1 (patch-ba) = 7a57cbd68026c72804bb705d2a23e562c59b86a7
15SHA1 (patch-bb) = e6f4095eb460c605b8dcc02980c5cff0cd0715a8 15SHA1 (patch-bb) = e6f4095eb460c605b8dcc02980c5cff0cd0715a8
16SHA1 (patch-ca) = 14ea426afebad99b53e6f8d594ff2f5adac07e30 16SHA1 (patch-ca) = 14ea426afebad99b53e6f8d594ff2f5adac07e30
17SHA1 (patch-da) = 3d63c7a2e76e41b9400869badda0d0e008c4b9bc 17SHA1 (patch-da) = 3d63c7a2e76e41b9400869badda0d0e008c4b9bc
18SHA1 (patch-db) = 1bd6b5c35a38476de4bfdb606b5ecf8243ddf91f 18SHA1 (patch-db) = 1bd6b5c35a38476de4bfdb606b5ecf8243ddf91f
19SHA1 (patch-dc) = fe5f8e6eec89ec832d9d161fa0a201e64a841a0c 19SHA1 (patch-dc) = fe5f8e6eec89ec832d9d161fa0a201e64a841a0c
20SHA1 (patch-dd) = bfccd97ecf3be1ae9ac41a642b356743e055550f 20SHA1 (patch-dd) = bfccd97ecf3be1ae9ac41a642b356743e055550f
21SHA1 (patch-de) = 3b8423a5936b8434de22fdd04ff2057dde09a2b8 21SHA1 (patch-de) = 3b8423a5936b8434de22fdd04ff2057dde09a2b8
22SHA1 (patch-poll_c-build-fix) = f9a2e86275431c53257c596974a6973c8034b1f0 22SHA1 (patch-poll_c-build-fix) = f9a2e86275431c53257c596974a6973c8034b1f0
 23SHA1 (patch-src_pulsecore_macro.h) = 635629d334529021d0dca2defe9c757c4cd20c5b
23SHA1 (patch-src_pulsecore_svolume_mmx.c) = ad1a1be7c1acf52c41447b2fb7d7dcd4c2da204b 24SHA1 (patch-src_pulsecore_svolume_mmx.c) = ad1a1be7c1acf52c41447b2fb7d7dcd4c2da204b
cvs diff -r1.7 -r1.8 pkgsrc/audio/pulseaudio/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/patches/Attic/patch-aa 2011/05/21 15:32:59 1.7
+++ pkgsrc/audio/pulseaudio/patches/Attic/patch-aa 2011/09/14 15:53:35 1.8
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: patch-aa,v 1.7 2011/05/21 15:32:59 wiz Exp $ 1$NetBSD: patch-aa,v 1.8 2011/09/14 15:53:35 hans Exp $
2 2
3SNDDSP_GETODELAY isn't defined on NetBSD-4.x. 3SNDDSP_GETODELAY isn't defined on NetBSD-4.x.
4ioctl() takes u_long argument on NetBSD. 4ioctl() takes u_long argument on NetBSD.
5On NetBSD, use third parameter in ioctl instead of varargs. 5On NetBSD, use third parameter in ioctl instead of varargs.
6stat() system call has been versioned, use latest version when dlopen()ing. 6stat() system call has been versioned, use latest version when dlopen()ing.
7Try more typical device names. 7Try more typical device names.
 8SOUND_PCM_* is not available on SunOS.
8 9
9--- src/utils/padsp.c.orig 2009-09-18 20:21:44.000000000 +0000 10--- src/utils/padsp.c.orig 2009-09-18 20:21:44.000000000 +0000
10+++ src/utils/padsp.c 11+++ src/utils/padsp.c
11@@ -60,6 +60,10 @@ 12@@ -60,6 +60,10 @@
12 # define SIOCINQ FIONREAD 13 # define SIOCINQ FIONREAD
13 #endif 14 #endif
14  15
15+#if !defined(SNDCTL_DSP_GETODELAY) 16+#if !defined(SNDCTL_DSP_GETODELAY)
16+# define SNDCTL_DSP_GETODELAY _IOR ('P', 23, int) 17+# define SNDCTL_DSP_GETODELAY _IOR ('P', 23, int)
17+#endif 18+#endif
18+ 19+
19 /* make sure gcc doesn't redefine open and friends as macros */ 20 /* make sure gcc doesn't redefine open and friends as macros */
20 #undef open 21 #undef open
@@ -73,29 +74,49 @@ Try more typical device names. @@ -73,29 +74,49 @@ Try more typical device names.
73 pthread_mutex_unlock(&func_mutex); \ 74 pthread_mutex_unlock(&func_mutex); \
74 } while(0) 75 } while(0)
75  76
76@@ -1458,7 +1481,8 @@ static int real_open(const char *filenam 77@@ -1458,7 +1481,8 @@ static int real_open(const char *filenam
77 return _open(filename, flags, mode); 78 return _open(filename, flags, mode);
78 } 79 }
79  80
80- if (filename && dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0)) 81- if (filename && dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0))
81+ if (filename && dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0 || 82+ if (filename && dsp_cloak_enable() && (strcmp(filename, "/dev/dsp") == 0 || strcmp(filename, "/dev/adsp") == 0 ||
82+ strcmp(filename, "/dev/sound") == 0 || strcmp(filename, "/dev/audio") == 0)) 83+ strcmp(filename, "/dev/sound") == 0 || strcmp(filename, "/dev/audio") == 0))
83 r = dsp_open(flags, &_errno); 84 r = dsp_open(flags, &_errno);
84 else if (filename && mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0) 85 else if (filename && mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0)
85 r = mixer_open(flags, &_errno); 86 r = mixer_open(flags, &_errno);
86@@ -2319,19 +2343,27 @@ fail: 87@@ -2224,6 +2248,7 @@ static int dsp_ioctl(fd_info *i, unsigne
 88 break;
 89 }
 90
 91+#ifndef __sun
 92 case SOUND_PCM_READ_RATE:
 93 debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");
 94
 95@@ -2247,7 +2272,7 @@ static int dsp_ioctl(fd_info *i, unsigne
 96 *(int*) argp = pa_sample_size(&i->sample_spec)*8;
 97 pa_threaded_mainloop_unlock(i->mainloop);
 98 break;
 99-
 100+#endif
 101 case SNDCTL_DSP_GETOPTR: {
 102 count_info *info;
 103
 104@@ -2317,21 +2342,29 @@ fail:
 105 return ret;
 106 }
87  107
88 #ifdef sun 108-#ifdef sun
 109+#ifdef __sun
89 int ioctl(int fd, int request, ...) { 110 int ioctl(int fd, int request, ...) {
90+#elif defined(__NetBSD__) 111+#elif defined(__NetBSD__)
91+int ioctl(int fd, u_long request, void *_argp) { 112+int ioctl(int fd, u_long request, void *_argp) {
92 #else 113 #else
93 int ioctl(int fd, unsigned long request, ...) { 114 int ioctl(int fd, unsigned long request, ...) {
94 #endif 115 #endif
95 fd_info *i; 116 fd_info *i;
96+#ifndef __NetBSD__ 117+#ifndef __NetBSD__
97 va_list args; 118 va_list args;
98+#endif 119+#endif
99 void *argp; 120 void *argp;
100 int r, _errno = 0; 121 int r, _errno = 0;
101  122
File Added: pkgsrc/audio/pulseaudio/patches/Attic/patch-src_pulsecore_macro.h
$NetBSD: patch-src_pulsecore_macro.h,v 1.1 2011/09/14 15:53:35 hans Exp $

--- src/pulsecore/macro.h.orig	2009-09-18 22:21:44.000000000 +0200
+++ src/pulsecore/macro.h	2011-09-08 12:44:25.798236549 +0200
@@ -37,6 +37,10 @@
 #error "Please include config.h before including this file!"
 #endif
 
+#ifdef __sun
+#define typeof	__typeof__
+#endif
+
 #ifndef PA_LIKELY
 #ifdef __GNUC__
 #define PA_LIKELY(x) (__builtin_expect(!!(x),1))