Dear maintainer,

I've uploaded an NMU for pulseaudio (versioned as 2.0-6.1). The diff
is attached to this message.

Regards.
diff -Nru pulseaudio-2.0/debian/changelog pulseaudio-2.0/debian/changelog
--- pulseaudio-2.0/debian/changelog	2012-08-11 16:44:29.000000000 +0200
+++ pulseaudio-2.0/debian/changelog	2013-04-24 21:46:38.000000000 +0200
@@ -1,3 +1,14 @@
+pulseaudio (2.0-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+
+  [ Steven Chamberlain ]
+  * Import patch from FreeBSD to disable threads locking and
+    synchronisation on kFreeBSD. This fixes the opening of Gnome 3
+    sessions on these architectures. Closes: #705435
+
+ -- Didier Raboud <o...@debian.org>  Wed, 24 Apr 2013 21:29:43 +0200
+
 pulseaudio (2.0-6) unstable; urgency=low
 
   * debian/rules: use xz compression for binary packages. (Patch by Ansgar
diff -Nru pulseaudio-2.0/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch pulseaudio-2.0/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch
--- pulseaudio-2.0/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch	1970-01-01 01:00:00.000000000 +0100
+++ pulseaudio-2.0/debian/patches/kfreebsd_no_lock_and_threads_synchro.patch	2013-04-24 21:46:39.000000000 +0200
@@ -0,0 +1,30 @@
+Description: Don't try to lock and synchronise threads on kFreeBSD.
+Bug-Debian: 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
+Author: Joe Marcus Clarke <mar...@freebsd.org>
+Author: Steven Chamberlain <ste...@pyro.eu.org>
+Last-Update: 2013-04-24
+
+Index: pulseaudio-2.0/src/daemon/main.c
+===================================================================
+--- pulseaudio-2.0.orig/src/daemon/main.c	2012-05-13 14:26:37.000000000 +0100
++++ pulseaudio-2.0/src/daemon/main.c	2013-04-16 00:25:32.164872810 +0100
+@@ -735,6 +735,10 @@
+          * 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;
+@@ -746,6 +750,7 @@
+         }
+ 
+         autospawn_locked = TRUE;
++#endif
+     }
+ 
+     if (conf->daemonize) {
diff -Nru pulseaudio-2.0/debian/patches/series pulseaudio-2.0/debian/patches/series
--- pulseaudio-2.0/debian/patches/series	2012-08-11 16:44:29.000000000 +0200
+++ pulseaudio-2.0/debian/patches/series	2013-04-24 21:46:39.000000000 +0200
@@ -1,2 +1,3 @@
 0001_man_page_typos.patch
 remove-analog-mono.patch
+kfreebsd_no_lock_and_threads_synchro.patch

Reply via email to