diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-27 18:56:46 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-27 18:56:46 +0000 |
| commit | 023c19a21af79139839de8e3852a286956714c31 (patch) | |
| tree | 521117750bffbe8024cb304ab1aeaca4e51b1b64 /audio/pulseaudio/files | |
| parent | e5a815d9aee1ed65e890c826d3be05f5ae15699c (diff) | |
| download | ports-023c19a21af79139839de8e3852a286956714c31.tar.gz ports-023c19a21af79139839de8e3852a286956714c31.zip | |
Re-add some patches as extra patches for older versions of FreeBSD to fix
a deadlock in pulseaudio.
Notes
Notes:
svn path=/head/; revision=232873
Diffstat (limited to 'audio/pulseaudio/files')
3 files changed, 42 insertions, 0 deletions
diff --git a/audio/pulseaudio/files/extra-patch-src_daemon_main.c b/audio/pulseaudio/files/extra-patch-src_daemon_main.c new file mode 100644 index 000000000000..8c6ae410f238 --- /dev/null +++ b/audio/pulseaudio/files/extra-patch-src_daemon_main.c @@ -0,0 +1,20 @@ +--- 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 +@@ -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/extra-patch-src_daemon_start-pulseaudio-x11.in b/audio/pulseaudio/files/extra-patch-src_daemon_start-pulseaudio-x11.in new file mode 100644 index 000000000000..65001b57236c --- /dev/null +++ b/audio/pulseaudio/files/extra-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/extra-patch-src_pulse_context.c b/audio/pulseaudio/files/extra-patch-src_pulse_context.c new file mode 100644 index 000000000000..fda93a2a65c7 --- /dev/null +++ b/audio/pulseaudio/files/extra-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; |