diff options
author | hans <hans@pkgsrc.org> | 2011-09-14 15:53:35 +0000 |
---|---|---|
committer | hans <hans@pkgsrc.org> | 2011-09-14 15:53:35 +0000 |
commit | 31ea5b5738f0a1176aae11ad6fc53fdcf4e5a080 (patch) | |
tree | d1794a272a07cb2033b8f2f7978868439619a3ff /audio/pulseaudio | |
parent | f20a577e10698e5927f3668156a2b621f411216e (diff) | |
download | pkgsrc-31ea5b5738f0a1176aae11ad6fc53fdcf4e5a080.tar.gz |
Fix build on SunOS.
Diffstat (limited to 'audio/pulseaudio')
-rw-r--r-- | audio/pulseaudio/Makefile | 10 | ||||
-rw-r--r-- | audio/pulseaudio/PLIST | 4 | ||||
-rw-r--r-- | audio/pulseaudio/distinfo | 5 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-aa | 27 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-src_pulsecore_macro.h | 15 |
5 files changed, 53 insertions, 8 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index e32535fa738..b655bcc60c8 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2011/09/14 15:49:47 hans Exp $ +# $NetBSD: Makefile,v 1.49 2011/09/14 15:53:35 hans Exp $ # NOTE: Please send a copy of any patches that are not pkgsrc-specific # to <pulseaudio-discuss@mail.0pointer.de> @@ -71,7 +71,7 @@ CONFIGURE_ENV+= cc_cv_tls___thread=no BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined .endif -PLIST_VARS+= evdev hal oss +PLIST_VARS+= evdev hal oss sun PLIST_SUBST+= PULSEAUDIO_VER=${PULSEAUDIO_VER:Q} .if ${OPSYS} == "Darwin" @@ -83,6 +83,12 @@ PLIST.hal= yes PLIST.oss= yes .endif +.if ${OPSYS} == "SunOS" +PLIST.sun= yes +.endif + +CFLAGS.SunOS+= -std=c99 + PKG_GROUPS= ${PULSE_GROUP} PKG_GROUPS+= ${PULSE_GROUP_REALTIME} PKG_GROUPS+= ${PULSE_GROUP_ACCESS} diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST index 352c01a307d..faee8b7ec1c 100644 --- a/audio/pulseaudio/PLIST +++ b/audio/pulseaudio/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2010/02/02 11:35:11 tron Exp $ +@comment $NetBSD: PLIST,v 1.8 2011/09/14 15:53:35 hans Exp $ bin/esdcompat bin/pacat bin/pacmd @@ -160,6 +160,8 @@ lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.a lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.so lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.a lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.so +${PLIST.sun}lib/pulse-${PULSEAUDIO_VER}/modules/module-solaris.a +${PLIST.sun}lib/pulse-${PULSEAUDIO_VER}/modules/module-solaris.so lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.a lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.so lib/pulse-${PULSEAUDIO_VER}/modules/module-suspend-on-idle.a diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index ab1db524fbc..24e77eb3f67 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.26 2011/07/21 15:10:11 joerg Exp $ +$NetBSD: distinfo,v 1.27 2011/09/14 15:53:35 hans Exp $ SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22 RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes -SHA1 (patch-aa) = b8d6bf8ce8642bc987a7dce5d14df51a2a92d2ae +SHA1 (patch-aa) = 3d1afdd56929be01013cdd38b970007bbb1d7242 SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0 SHA1 (patch-ad) = 5ae0e5d8b0b7622c35cb2fabba4a33b673cbd442 @@ -20,4 +20,5 @@ SHA1 (patch-dc) = fe5f8e6eec89ec832d9d161fa0a201e64a841a0c SHA1 (patch-dd) = bfccd97ecf3be1ae9ac41a642b356743e055550f SHA1 (patch-de) = 3b8423a5936b8434de22fdd04ff2057dde09a2b8 SHA1 (patch-poll_c-build-fix) = f9a2e86275431c53257c596974a6973c8034b1f0 +SHA1 (patch-src_pulsecore_macro.h) = 635629d334529021d0dca2defe9c757c4cd20c5b SHA1 (patch-src_pulsecore_svolume_mmx.c) = ad1a1be7c1acf52c41447b2fb7d7dcd4c2da204b diff --git a/audio/pulseaudio/patches/patch-aa b/audio/pulseaudio/patches/patch-aa index d8916be0222..ea68b6c691f 100644 --- a/audio/pulseaudio/patches/patch-aa +++ b/audio/pulseaudio/patches/patch-aa @@ -1,10 +1,11 @@ -$NetBSD: patch-aa,v 1.7 2011/05/21 15:32:59 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2011/09/14 15:53:35 hans Exp $ SNDDSP_GETODELAY isn't defined on NetBSD-4.x. ioctl() takes u_long argument on NetBSD. On NetBSD, use third parameter in ioctl instead of varargs. stat() system call has been versioned, use latest version when dlopen()ing. Try more typical device names. +SOUND_PCM_* is not available on SunOS. --- src/utils/padsp.c.orig 2009-09-18 20:21:44.000000000 +0000 +++ src/utils/padsp.c @@ -83,9 +84,29 @@ Try more typical device names. r = dsp_open(flags, &_errno); else if (filename && mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0) r = mixer_open(flags, &_errno); -@@ -2319,19 +2343,27 @@ fail: +@@ -2224,6 +2248,7 @@ static int dsp_ioctl(fd_info *i, unsigne + break; + } - #ifdef sun ++#ifndef __sun + case SOUND_PCM_READ_RATE: + debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n"); + +@@ -2247,7 +2272,7 @@ static int dsp_ioctl(fd_info *i, unsigne + *(int*) argp = pa_sample_size(&i->sample_spec)*8; + pa_threaded_mainloop_unlock(i->mainloop); + break; +- ++#endif + case SNDCTL_DSP_GETOPTR: { + count_info *info; + +@@ -2317,21 +2342,29 @@ fail: + return ret; + } + +-#ifdef sun ++#ifdef __sun int ioctl(int fd, int request, ...) { +#elif defined(__NetBSD__) +int ioctl(int fd, u_long request, void *_argp) { diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_macro.h b/audio/pulseaudio/patches/patch-src_pulsecore_macro.h new file mode 100644 index 00000000000..48accc7e83b --- /dev/null +++ b/audio/pulseaudio/patches/patch-src_pulsecore_macro.h @@ -0,0 +1,15 @@ +$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)) |