[kdemultimedia] 0100-kmixctrl-running-with-PulseAudio.patch from mageia

[Rex Dieter]

commit 0473029b395740f7c9a12500c26db50e0c1ffc70
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Apr 7 08:15:16 2012 -0500

    0100-kmixctrl-running-with-PulseAudio.patch from mageia

 ...-Prevent-kmixctrl-running-with-PulseAudio.patch |   32 ++++++++++++++++++++
 kdemultimedia.spec                                 |    7 ++++
 2 files changed, 39 insertions(+), 0 deletions(-)
---
diff --git a/0100-Prevent-kmixctrl-running-with-PulseAudio.patch b/0100-Prevent-kmixctrl-running-with-PulseAudio.patch
new file mode 100644
index 0000000..9db7860
--- /dev/null
+++ b/0100-Prevent-kmixctrl-running-with-PulseAudio.patch
@@ -0,0 +1,32 @@
+From a1a3e2f013e06a3847b014292ca6fb52f8d20ba5 Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <colin at mageia.org>
+Date: Fri, 6 Apr 2012 21:30:12 +0100
+Subject: [PATCH 100/101] Prevent kmixctrl running with PulseAudio.
+
+kmixctrl should not save/restore volumes when PulseAudio is used, but
+our event loop detection was such that the PulseAudio mixer would refuse
+to run as kmixctrl was marked as a non-GUI program
+---
+ kmix/backends/mixer_pulse.cpp |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backends/mixer_pulse.cpp b/backends/mixer_pulse.cpp
+index d8732f3..3b2658e 100644
+--- a/kmix/backends/mixer_pulse.cpp
++++ b/kmix/backends/mixer_pulse.cpp
+@@ -891,9 +891,9 @@ Mixer_PULSE::Mixer_PULSE(Mixer *mixer, int devnum) : Mixer_Backend(mixer, devnum
+         s_pulseActive = INACTIVE;
+ 
+     // We require a glib event loop
+-    if (QLatin1String(QAbstractEventDispatcher::instance()->metaObject()->className())
+-            != "QGuiEventDispatcherGlib") {
+-        kDebug(67100) << "Disabling PulseAudio integration for lack of GLib event loop.";
++    QLatin1String dispatcher = QLatin1String(QAbstractEventDispatcher::instance()->metaObject()->className());
++    if ("QGuiEventDispatcherGlib" != dispatcher && "QEventDispatcherGlib" != dispatcher) {
++        kDebug(67100) << "Disabling PulseAudio integration for lack of GLib event loop: " << dispatcher;
+         s_pulseActive = INACTIVE;
+     }
+ 
+-- 
+1.7.9.3
+
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 2751b55..c53a71f 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -24,6 +24,8 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 Patch1: kdemultimedia-4.6.2-no_thumbs.patch 
 
 ## upstream patches
+# http://svnweb.mageia.org/packages/cauldron/kdemultimedia4/current/SOURCES/0100-Prevent-kmixctrl-running-with-PulseAudio.patch
+Patch100: 0100-Prevent-kmixctrl-running-with-PulseAudio.patch
 
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -138,6 +140,8 @@ Requires: %{name}-kio_audiocd = %{?epoch:%{epoch}:}%{version}-%{release}
 # no mplayerthumbs/ffmpegthumbs
 %patch1 -p1 -b .no_thumbs
 
+%patch100 -p1 -b .kmixctrl-running-with-PulseAudio
+
 
 %build
 
@@ -328,6 +332,9 @@ fi
 
 
 %changelog
+* Sat Apr 07 2012 Rex Dieter <rdieter at fedoraproject.org> 6:4.8.2-2
+- 0100-kmixctrl-running-with-PulseAudio.patch from mageia
+
 * Fri Mar 30 2012 Rex Dieter <rdieter at fedoraproject.org> - 6:4.8.2-1
 - 4.8.2