From 87e9978739c0f6e75af9588ec101bab80e34646a Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 3 Dec 2013 10:53:38 +0100
Subject: [PATCH] pulseaudio: misc tweaks from Arch.

---
 srcpkgs/pulseaudio/INSTALL  | 20 ++------------------
 srcpkgs/pulseaudio/template | 21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/srcpkgs/pulseaudio/INSTALL b/srcpkgs/pulseaudio/INSTALL
index 53505c79d2..a756039f07 100644
--- a/srcpkgs/pulseaudio/INSTALL
+++ b/srcpkgs/pulseaudio/INSTALL
@@ -3,24 +3,8 @@ post)
 	cat <<_EOF
 =====================================================================
 
-To make ALSA use PulseAudio globally in your system you'd have to
-create /etc/asound.conf with the following contents:
-
-pcm.!default {
-	type pulse
-}
-
-ctl.!default {
-	type pulse
-}
-
-pcm.pulse {
-	type pulse
-}
-
-ctl.pulse {
-	type pulse
-}
+To make ALSA use PulseAudio globally in your system install the
+`alsa-plugins` package.
 
 =====================================================================a
 _EOF
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 3d225d251c..1d1135dea4 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=4.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc
@@ -32,12 +32,24 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_install() {
-	vinstall ${FILESDIR}/pulseaudio.xinit 755 \
-		etc/X11/xinit/xinitrc.d pulseaudio
+	vinstall ${FILESDIR}/pulseaudio.xinit 755 etc/X11/xinit/xinitrc.d pulseaudio
 	rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
+
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/pulseaudio-bash-completion.sh \
 		${DESTDIR}/usr/share/bash-completion/completions/pulseaudio
+
+	# Disable autospawn by default
+	sed -e '/autospawn/iautospawn=no' -i ${DESTDIR}/etc/pulse/client.conf
+
+	# Speed up pulseaudio shutdown so that it exits immediately with
+	# the last user session (module-systemd-login keeps it alive)
+	sed -e '/exit-idle-time/iexit-idle-time=0' -i ${DESTDIR}/etc/pulse/daemon.conf
+
+	# Disable cork-request module, can result in e.g. media players unpausing
+	# when there's a Skype call incoming
+	sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
+		-i ${DESTDIR}/usr/bin/start-pulseaudio-x11
 }
 
 libpulseaudio_package() {
@@ -51,8 +63,7 @@ libpulseaudio_package() {
 }
 
 pulseaudio-devel_package() {
-	depends="libasyncns-devel dbus-devel libXtst-devel
-		libpulseaudio-${version}_${revision}"
+	depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include