diff options
Diffstat (limited to 'audio/pulseaudio')
| -rw-r--r-- | audio/pulseaudio/Makefile | 10 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_daemon_main.c | 24 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in | 11 | ||||
| -rw-r--r-- | audio/pulseaudio/files/patch-src_pulse_context.c | 11 | ||||
| -rw-r--r-- | audio/pulseaudio/pkg-plist | 2 |
5 files changed, 49 insertions, 9 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 7921d53290eb..b1d1c031fd7a 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/pulseaudio/Makefile,v 1.10 2008/03/20 16:07:21 mezz Exp $ +# $MCom: ports/audio/pulseaudio/Makefile,v 1.16 2009/04/09 04:36:26 marcus Exp $ # PORTNAME= pulseaudio PORTVERSION= 0.9.14 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ @@ -23,6 +24,7 @@ LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \ USE_GNOME= gnometarget gnomehack glib20 intltool ltverhack USE_XORG= x11 sm USE_LDCONFIG= yes +USE_GETTEXT= yes GNU_CONFIGURE= yes USE_AUTOTOOLS= libltdl:15 libtool:15 USE_GMAKE= yes @@ -49,9 +51,9 @@ MAN5= default.pa.5 pulse-client.conf.5 pulse-daemon.conf.5 .include <bsd.port.pre.mk> -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.endif +#.if ${ARCH} == "sparc64" +#BROKEN= Does not compile on sparc64 +#.endif .if defined(WITH_JACK) LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack diff --git a/audio/pulseaudio/files/patch-src_daemon_main.c b/audio/pulseaudio/files/patch-src_daemon_main.c index 1b96327a872d..27b2c4f1a6a8 100644 --- a/audio/pulseaudio/files/patch-src_daemon_main.c +++ b/audio/pulseaudio/files/patch-src_daemon_main.c @@ -1,6 +1,6 @@ ---- src/daemon/main.c.orig Thu Jul 12 00:04:22 2007 -+++ src/daemon/main.c Thu Jul 12 00:04:40 2007 -@@ -40,6 +40,7 @@ +--- src/daemon/main.c.orig 2009-01-12 18:11:38.000000000 -0500 ++++ src/daemon/main.c 2009-03-07 19:56:16.000000000 -0500 +@@ -37,6 +37,7 @@ #include <unistd.h> #include <locale.h> #include <sys/types.h> @@ -8,3 +8,21 @@ #include <liboil/liboil.h> +@@ -689,7 +690,7 @@ int main(int argc, char *argv[]) { + * first take the autospawn lock to make things + * synchronous. */ + +- if ((autospawn_fd = pa_autospawn_lock_init()) < 0) { ++ /*if ((autospawn_fd = pa_autospawn_lock_init()) < 0) { + pa_log("Failed to initialize autospawn lock"); + goto finish; + } +@@ -699,7 +700,7 @@ int main(int argc, char *argv[]) { + goto finish; + } + +- autospawn_locked = TRUE; ++ autospawn_locked = TRUE;*/ + } + + if (conf->daemonize) { diff --git a/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in b/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in new file mode 100644 index 000000000000..65001b57236c --- /dev/null +++ b/audio/pulseaudio/files/patch-src_daemon_start-pulseaudio-x11.in @@ -0,0 +1,11 @@ +--- src/daemon/start-pulseaudio-x11.in.orig 2009-03-07 19:48:47.000000000 -0500 ++++ src/daemon/start-pulseaudio-x11.in 2009-03-07 19:48:56.000000000 -0500 +@@ -19,7 +19,7 @@ + + set -e + +-@PA_BINARY@ --start "$@" ++@PA_BINARY@ -D "$@" + + if [ x"$DISPLAY" != x ] ; then + diff --git a/audio/pulseaudio/files/patch-src_pulse_context.c b/audio/pulseaudio/files/patch-src_pulse_context.c new file mode 100644 index 000000000000..fda93a2a65c7 --- /dev/null +++ b/audio/pulseaudio/files/patch-src_pulse_context.c @@ -0,0 +1,11 @@ +--- src/pulse/context.c.orig 2009-03-08 14:33:36.000000000 -0400 ++++ src/pulse/context.c 2009-03-08 14:33:42.000000000 -0400 +@@ -664,7 +664,7 @@ static int context_autospawn(pa_context + n = 0; + + argv[n++] = c->conf->daemon_binary; +- argv[n++] = "--start"; ++ argv[n++] = "-D"; + + while (n < MAX_ARGS) { + char *a; diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist index cc1f9da74da7..71937789252e 100644 --- a/audio/pulseaudio/pkg-plist +++ b/audio/pulseaudio/pkg-plist @@ -156,6 +156,4 @@ share/locale/sv/LC_MESSAGES/pulseaudio.mo @dirrm lib/pulse-%%PULSE_VERSION%%/modules @dirrm lib/pulse-%%PULSE_VERSION%% @dirrm include/pulse -@dirrmtry etc/xdg/autostart -@dirrmtry etc/xdg @dirrm etc/pulse |