From 62349a0b6be7c7b057e7dfb0cd5fa34e7ddf1cea Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 11 Nov 2013 09:20:38 -0600
Subject: [PATCH] Ensure-the-PulseAudio-envrionment-is-set-up (kde#327279)

---
 0003-fix-rpath-handling.patch                 |  2 +-
 ...Audio-envrionment-is-set-up-when-run.patch | 31 +++++++++++++++++++
 phonon.spec                                   |  7 ++++-
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch

diff --git a/0003-fix-rpath-handling.patch b/0003-fix-rpath-handling.patch
index 0fb25d6..2b8f40a 100644
--- a/0003-fix-rpath-handling.patch
+++ b/0003-fix-rpath-handling.patch
@@ -1,7 +1,7 @@
 From cf441af677beade70036453a6480d77d7e702346 Mon Sep 17 00:00:00 2001
 From: Rex Dieter <rdieter@math.unl.edu>
 Date: Tue, 5 Nov 2013 20:15:03 -0600
-Subject: [PATCH 3/3] fix rpath handling
+Subject: [PATCH 3/4] fix rpath handling
 
 REVIEW: 113649
 ---
diff --git a/0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch b/0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch
new file mode 100644
index 0000000..c058b40
--- /dev/null
+++ b/0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch
@@ -0,0 +1,31 @@
+From f278a93493ac04ce04d48e8e5b5158caa0621ce3 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Thu, 7 Nov 2013 16:16:59 +0100
+Subject: [PATCH 4/4] Ensure the PulseAudio envrionment is set up when running
+ older backends
+
+This ensures that pre-4.7 backends (expecting the environment to be
+set up by libphonon) retain working volume control.
+
+CCBUG: 327279
+FIXED-IN: 4.7.1
+---
+ phonon/audiooutput.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/phonon/audiooutput.cpp b/phonon/audiooutput.cpp
+index f40199e..dd33364 100644
+--- a/phonon/audiooutput.cpp
++++ b/phonon/audiooutput.cpp
+@@ -108,6 +108,8 @@ void AudioOutputPrivate::init(Phonon::Category c)
+             AudioOutputInterface47 *iface = Iface<AudioOutputInterface47>::cast(this);
+             if (iface)
+                 iface->setStreamUuid(streamUuid);
++            else
++                pulse->setupStreamEnvironment(streamUuid);
+         }
+     }
+ #endif
+-- 
+1.8.4.2
+
diff --git a/phonon.spec b/phonon.spec
index 807a20c..261de31 100644
--- a/phonon.spec
+++ b/phonon.spec
@@ -11,7 +11,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.7.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 %if 0%{?snap}
@@ -23,6 +23,7 @@ Source0: http://download.kde.org/stable/phonon/%{version}/phonon-%{version}.tar.
 Patch0: phonon-4.7.0-really-fix-rpath-handling.patch
 ## upstream patches
 Patch0003: 0003-fix-rpath-handling.patch
+Patch0004: 0004-Ensure-the-PulseAudio-envrionment-is-set-up-when-run.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.9
@@ -86,6 +87,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
 %setup -q 
 
 %patch0003 -p1 -b .0003
+%patch0004 -p1 -b .0004
 %patch0 -p1 -b .fix-rpath
 
 
@@ -193,6 +195,9 @@ test "$(pkg-config --modversion phonon4qt5)" = "%{version}"
 
 
 %changelog
+* Mon Nov 11 2013 Rex Dieter <rdieter@fedoraproject.org> 4.7.0-6
+- Ensure-the-PulseAudio-envrionment-is-set-up (kde#327279)
+
 * Mon Nov 11 2013 Rex Dieter <rdieter@fedoraproject.org> 4.7.0-5
 - rebuild (qt5 qreal/arm)