summaryrefslogtreecommitdiff
path: root/audio/pulseaudio/files/patch-src_daemon_main.c
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-04-10 05:56:28 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-04-10 05:56:28 +0000
commitae52bc80895a23ddbe33b86e75a9cf331ae32ba9 (patch)
tree5538a7d3541f6d56e4bbab9c6329f5b9db64dafb /audio/pulseaudio/files/patch-src_daemon_main.c
parent- Update to 0.6.3 (diff)
Presenting GNOME 2.26 for FreeBSD. See
http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new. On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative for Firefox 2.0 as a Gecko provider. Almost all of the Gecko consumers can make use of this provider by setting: WITH_GECKO=libxul The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen, Martin Matuska, Craig Butler, and Pawel Worach.
Notes
Notes: svn path=/head/; revision=231972
Diffstat (limited to 'audio/pulseaudio/files/patch-src_daemon_main.c')
-rw-r--r--audio/pulseaudio/files/patch-src_daemon_main.c24
1 files changed, 21 insertions, 3 deletions
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) {