rdieter pushed to pulseaudio (f21). "PulseAudio 6 update breaks autostart (#1206764)"

[notifications at fedoraproject.org]

>From bc60ba4f05795d978c5cc65536d85c798e6699da Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 4 Apr 2015 20:07:15 -0500
Subject: PulseAudio 6 update breaks autostart (#1206764)


diff --git a/pulseaudio-autostart.patch b/pulseaudio-autostart.patch
new file mode 100644
index 0000000..c535392
--- /dev/null
+++ b/pulseaudio-autostart.patch
@@ -0,0 +1,31 @@
+commit 42156d2b5ac797e5f28f8d0d38b691053f3f6fc7
+Author: Colin Guthrie <colin at mageia.org>
+Date:   Fri Oct 17 14:43:18 2014 +0200
+
+    launch: Avoid specifically starting PA and rely on autospawn/socket activation
+    
+    This --start is patched out in several downstreams to allow users to easily
+    disable PA by simply disabling autospawn.
+    
+    If autospawn is enabled, then the first pactl command will start it and if not
+    it will fail and the script will exit.
+    
+    When switching to systemd socket activation, we very much do not want to
+    start PA manually here. We could replace it with a
+      systemctl --user start pulseaudio
+    but really it just makes sense to rely on the socket activation as this
+    should apply equally to non-systemd setups which use PA's own autospawn.
+
+diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
+index 620e50f..63ed740 100755
+--- a/src/daemon/start-pulseaudio-x11.in
++++ b/src/daemon/start-pulseaudio-x11.in
+@@ -19,8 +19,6 @@
+ 
+ set -e
+ 
+- at PA_BINARY@ --start "$@"
+-
+ if [ x"$DISPLAY" != x ] ; then
+ 
+     @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
diff --git a/pulseaudio.spec b/pulseaudio.spec
index e2fc768..df7345c 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -19,7 +19,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        2%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release:        2%{?snap:.%{snap}git%{shortcommit}}%{?dist}.1
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 %if 0%{?gitrel}
@@ -34,6 +34,10 @@ Source2:        http://freedesktop.org/software/pulseaudio/releases/pulseaudio-%
 
 Source5:        default.pa-for-gdm
 
+# revert upstream commit to rely solely on autospawn for autostart
+# see also https://bugzilla.redhat.com/show_bug.cgi?id=1206764
+Patch1: pulseaudio-autostart.patch
+
 ## upstream patches
 
 ## upstreamable patches
@@ -221,6 +225,10 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 %prep
 %setup -q -T -b0 -n %{name}-%{version}%{?gitrel:-%{gitrel}-g%{shortcommit}}
 
+%if 0%{?fedora} < 22
+%patch1 -p1 -R -b .autostart
+%endif
+
 sed -i.no_consolekit -e \
   's/^load-module module-console-kit/#load-module module-console-kit/' \
   src/daemon/default.pa.in
@@ -561,6 +569,9 @@ exit 0
 %attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa
 
 %changelog
+* Sat Apr 04 2015 Rex Dieter <rdieter at fedoraproject.org> 6.0-2.1
+- PulseAudio 6 update breaks autostart (#1206764)
+
 * Thu Mar 19 2015 Richard Hughes <rhughes at redhat.com> 6.0-2
 - pulseaudio-6.0 (#1192384)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/pulseaudio.git/commit/?h=f21&id=bc60ba4f05795d978c5cc65536d85c798e6699da