[kdemultimedia/f15] 0100-kmixctrl-running-with-PulseAudio.patch from mageia (#657373)

[Rex Dieter]

commit 1780524ed3a9da519db5bda9db336d563dd7ce6a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Apr 25 22:41:20 2012 -0500

    0100-kmixctrl-running-with-PulseAudio.patch from mageia (#657373)

 ...-Prevent-kmixctrl-running-with-PulseAudio.patch |   32 ++++++++++++++++++++
 kdemultimedia.spec                                 |   10 +++++-
 2 files changed, 41 insertions(+), 1 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 e4344ae..9875e7e 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -10,7 +10,7 @@
 Name:    kdemultimedia
 Epoch:   6
 Version: 4.6.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
@@ -26,6 +26,10 @@ Patch1: kdemultimedia-4.6.2-no_thumbs.patch
 # http://websvn.kde.org/?revision=1241346&view=revision
 Patch100: kdemultimedia-4.6.95-kmix_pulse_memleak.patch
 
+## upstream patches
+# http://svnweb.mageia.org/packages/cauldron/kdemultimedia4/current/SOURCES/0100-Prevent-kmixctrl-running-with-PulseAudio.patch
+Patch101: 0100-Prevent-kmixctrl-running-with-PulseAudio.patch
+
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
 # FLAC_OGG_LIBRARY:FILEPATH=FLAC_OGG_LIBRARY-NOTFOUND
 
@@ -166,6 +170,7 @@ Requires: %{name}-kio_audiocd = %{?epoch:%{epoch}:}%{version}-%{release}
 %setup -q -n kdemultimedia-%{version}%{?alphatag}
 
 %patch100 -p3 -b .kmix_pulse_memleak
+%patch101 -p1 -b .kmixctrl-running-with-PulseAudio
 
 # no mplayerthumbs/ffmpegthumbs
 %patch1 -p1 -b .no_thumbs
@@ -389,6 +394,9 @@ fi
 
 
 %changelog
+* Wed Apr 25 2012 Rex Dieter <rdieter at fedoraproject.org> 6:4.6.5-3
+- 0100-kmixctrl-running-with-PulseAudio.patch from mageia (#657373)
+
 * Tue Jul 12 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.6.5-2
 - more kmix_pulse_memleak work (kde#264089)