Added a patch to fix a problem with the XF86Audio* key handlers not working when there's no master channel (e. g. you have a mute key that stopped working in KDE). Fixes bug 198015. Thanks to Kelvie Wong for creating and submitting said patch.

(Portage version: 2.1.3.19)

4 files changed, 93 insertions, 1 deletions

diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog
index e5c1d1e36681..4c79071c7f1f 100644
--- a/kde-base/kmix/ChangeLog
+++ b/kde-base/kmix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kmix
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.74 2007/10/19 23:08:48 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.75 2007/11/20 12:46:27 philantrop Exp $
+
+*kmix-3.5.8-r1 (20 Nov 2007)
+
+  20 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kmix-3.5.8-198015_XF86Audio.patch, +kmix-3.5.8-r1.ebuild:
+  Added a patch to fix a problem with the XF86Audio* key handlers not working
+  when there's no master channel (e. g. you have a mute key that stopped
+  working in KDE). Fixes bug 198015. Thanks to Kelvie Wong for creating and
+  submitting said patch.
 
 *kmix-3.5.8 (19 Oct 2007)
 
diff --git a/kde-base/kmix/files/digest-kmix-3.5.8-r1 b/kde-base/kmix/files/digest-kmix-3.5.8-r1
new file mode 100644
index 000000000000..8038f4ee451d
--- /dev/null
+++ b/kde-base/kmix/files/digest-kmix-3.5.8-r1
@@ -0,0 +1,3 @@
+MD5 9f3c95231ea265b09f3010adb954ae30 kdemultimedia-3.5.8.tar.bz2 6316739
+RMD160 5fcb8d282e2d49baca4daa9fb4e24b5216df92ee kdemultimedia-3.5.8.tar.bz2 6316739
+SHA256 07fc79e38bd7d50a8e2b9910a5d78ef565557b2a746b31d5d440829e9f05b0c1 kdemultimedia-3.5.8.tar.bz2 6316739
diff --git a/kde-base/kmix/files/kmix-3.5.8-198015_XF86Audio.patch b/kde-base/kmix/files/kmix-3.5.8-198015_XF86Audio.patch
new file mode 100644
index 000000000000..1190e717ee01
--- /dev/null
+++ b/kde-base/kmix/files/kmix-3.5.8-198015_XF86Audio.patch
@@ -0,0 +1,58 @@
+From efbae8873fc7b2ffe366353a1bcd9623cf4975a3 Mon Sep 17 00:00:00 2001
+From: Kelvie Wong <kelvie@ieee.org>
+Date: Sat, 3 Nov 2007 21:39:49 -0700
+Subject: [PATCH] Added a masterDeviceIndex dcop call that returns the device index of the master channel
+
+---
+ kmix/mixer.cpp    |    5 +++++
+ kmix/mixer.h      |    1 +
+ kmix/mixerIface.h |    5 +++++
+ 3 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
+index 2adb300..316625e 100644
+--- a/kmix/mixer.cpp
++++ b/kmix/mixer.cpp
+@@ -730,6 +730,11 @@ bool Mixer::masterMute()
+   return true;
+ }
+ 
++// @dcop only
++int Mixer::masterDeviceIndex()
++{
++  return masterDevice()->num();
++}
+ 
+ bool Mixer::isRecordSource( int deviceidx )
+ {
+diff --git a/kmix/mixer.h b/kmix/mixer.h
+index 14c8a65..b6d0917 100644
+--- a/kmix/mixer.h
++++ b/kmix/mixer.h
+@@ -123,6 +123,7 @@ class Mixer : public QObject, virtual public MixerIface
+       virtual long absoluteVolumeMax( int deviceidx );
+       virtual int volume( int deviceidx );
+       virtual int masterVolume();
++      virtual int masterDeviceIndex();
+ 
+       virtual void setMute( int deviceidx, bool on );
+       virtual void setMasterMute( bool on );
+diff --git a/kmix/mixerIface.h b/kmix/mixerIface.h
+index b2aafb2..6c8da9f 100644
+--- a/kmix/mixerIface.h
++++ b/kmix/mixerIface.h
+@@ -85,6 +85,11 @@ k_dcop:
+    virtual bool masterMute()=0;
+    
+    /**
++    Returns the index of the master device
++    */
++   virtual int masterDeviceIndex()=0;
++
++   /**
+     Makes the given device a record source.
+     */
+    virtual void setRecordSource( int deviceidx, bool on )=0;
+-- 
+1.5.3.4
+
diff --git a/kde-base/kmix/kmix-3.5.8-r1.ebuild b/kde-base/kmix/kmix-3.5.8-r1.ebuild
new file mode 100644
index 000000000000..dfbb9770b5e5
--- /dev/null
+++ b/kde-base/kmix/kmix-3.5.8-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.5.8-r1.ebuild,v 1.1 2007/11/20 12:46:27 philantrop Exp $
+
+KMNAME=kdemultimedia
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="aRts mixer gui"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa"
+DEPEND="alsa? ( media-libs/alsa-lib )"
+RDEPEND="${DEPEND}"
+
+PATCHES="${FILESDIR}/kmix-3.5.6-alsa-tests.patch
+		${FILESDIR}/${P}-198015_XF86Audio.patch"
+
+src_compile() {
+	local myconf="$(use_with alsa)"
+	kde-meta_src_compile
+}