[pulseaudio-commits] src/daemon

[Tanu Kaskinen]

 src/daemon/main.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 69fae3e33ad024be39fb3da0643314abf4e59980
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Sun Apr 13 19:15:28 2014 +0200

    daemon: Don't try to lock and synchronise threads on (k)FreeBSD
    
    Credits: Steven Chamberlain <steven at pyro.eu.org> is also a co-author
    BugLink: http://bugs.debian.org/705435
    Origin: http://svnweb.freebsd.org/ports/head/audio/pulseaudio/files/patch-src_daemon_main.c?revision=231972&view=markup&pathrev=231972

diff --git a/src/daemon/main.c b/src/daemon/main.c
index f381e8a..150ce6d 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -711,6 +711,10 @@ int main(int argc, char *argv[]) {
          * first take the autospawn lock to make things
          * synchronous. */
 
+        /* This locking and thread synchronisation code doesn't work reliably
+         * on kFreeBSD (Debian bug #705435), or in upstream FreeBSD ports
+         * (bug reference: ports/128947, patched in SVN r231972). */
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
         if ((autospawn_fd = pa_autospawn_lock_init()) < 0) {
             pa_log("Failed to initialize autospawn lock");
             goto finish;
@@ -722,6 +726,7 @@ int main(int argc, char *argv[]) {
         }
 
         autospawn_locked = true;
+#endif
     }
 
     if (conf->daemonize) {