diff options
| author | ahoka <ahoka> | 2011-01-20 13:08:59 +0000 |
|---|---|---|
| committer | ahoka <ahoka> | 2011-01-20 13:08:59 +0000 |
| commit | 8fc723e50d6327e510fd792e38454b3589040ea0 (patch) | |
| tree | bb517f94de68ec5e469529b514517bdf031adcd5 /audio | |
| parent | 1d72b10d58e57ef564dddda132b1551ea9986959 (diff) | |
| download | pkgsrc-8fc723e50d6327e510fd792e38454b3589040ea0.tar.gz | |
use pulse's poll wrapper on 5.99.* to workaround an assertion
triggered on netbsd current systems possibly a bug in poll, but could be
just some linuxism in the code
this should be further investigated
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/pulseaudio/Makefile | 9 | ||||
| -rw-r--r-- | audio/pulseaudio/distinfo | 3 | ||||
| -rw-r--r-- | audio/pulseaudio/patches/patch-poll_c-build-fix | 21 |
3 files changed, 30 insertions, 3 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index bddb088397a..3a21c5e47b8 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.42 2011/01/13 13:53:23 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2011/01/20 13:08:59 ahoka Exp $ # NOTE: Please send a copy of any patches that are not pkgsrc-specific # to <pulseaudio-discuss@mail.0pointer.de> PULSEAUDIO_VER= 0.9.21 -PKGREVISION= 7 +PKGREVISION= 8 DISTNAME= pulseaudio-${PULSEAUDIO_VER} CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ @@ -66,6 +66,11 @@ SUBST_SED.padsp= -e 's@libpulsedsp\.so@${PREFIX}/lib/&@' # broken test for TLS CONFIGURE_ENV+= cc_cv_tls___thread=no .endif +# try to avoid an assertion in rtpoll.c (could be caused by a possible +# bug in NetBSD-current's poll) by using the select(2) wrapper +.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M5.99.*) +CONFIGURE_ENV+= ac_cv_header_poll_h=no +.endif # see PR 42820 .if ${OPSYS} == "NetBSD" && ${OS_VERSION:M4.*} != "" BUILDLINK_TRANSFORM+= rm:-Wl,--no-undefined diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index dc0bc589cc4..e33d7a16264 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2010/12/02 21:17:43 wiz Exp $ +$NetBSD: distinfo,v 1.24 2011/01/20 13:08:59 ahoka Exp $ SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22 RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed @@ -18,3 +18,4 @@ SHA1 (patch-da) = d56957d37bec15bd41d77b99ce60bcdea0ef4f20 SHA1 (patch-db) = e1e48577618b4eb2586d8b37953b2474e2dcc864 SHA1 (patch-dc) = d814e1a1d5aed3e3604d6df44621fe789c625982 SHA1 (patch-dd) = 83e51035ff871cef9c39bf670173e30705df8fe5 +SHA1 (patch-poll_c-build-fix) = 4250be8c4a1f2dbe6ca3621b285d11258b34a62b diff --git a/audio/pulseaudio/patches/patch-poll_c-build-fix b/audio/pulseaudio/patches/patch-poll_c-build-fix new file mode 100644 index 00000000000..17b7441da52 --- /dev/null +++ b/audio/pulseaudio/patches/patch-poll_c-build-fix @@ -0,0 +1,21 @@ +$NetBSD: patch-poll_c-build-fix,v 1.1 2011/01/20 13:08:59 ahoka Exp $ + +--- src/pulsecore/poll.c.orig 2009-03-05 11:28:10.000000000 +0000 ++++ src/pulsecore/poll.c +@@ -41,11 +41,16 @@ + #include <sys/select.h> + #endif + ++#ifdef HAVE_SYS_SOCKET_H ++#include <sys/socket.h> ++#endif ++ + #include "winsock.h" + + #ifndef HAVE_POLL_H + + #include <pulsecore/core-util.h> ++#include <pulse/util.h> + + #include "poll.h" + |