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.

Package-Manager: portage-2.1.3.19

5 files changed, 185 insertions, 5 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 645a02ece93c..288e4e50a81c 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.257 2007/11/03 20:10:20 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.258 2007/11/20 14:13:16 philantrop Exp $
+
+*kdemultimedia-3.5.8-r1 (20 Nov 2007)
+
+  20 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kmix-3.5.8-198015_XF86Audio.patch, +kdemultimedia-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.
 
   03 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
   +files/kdemultimedia-kioslaves-3.5.8-freebsd.patch,
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 3a3fb78cfcb2..33df9f743f7a 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -10,6 +10,10 @@ AUX kdemultimedia-kioslaves-3.5.8-freebsd.patch 894 RMD160 054c2d7b1e037ac130728
 MD5 d28b6a014b02549db3d74ff182a21d11 files/kdemultimedia-kioslaves-3.5.8-freebsd.patch 894
 RMD160 054c2d7b1e037ac1307281183f0a2ebc753ff26b files/kdemultimedia-kioslaves-3.5.8-freebsd.patch 894
 SHA256 da6dbdf3939534e5efc6019244321113814de93f4e709f9831a51d57d8902abf files/kdemultimedia-kioslaves-3.5.8-freebsd.patch 894
+AUX kmix-3.5.8-198015_XF86Audio.patch 1612 RMD160 c985f996766a4543afb502b6a721142e39ea974a SHA1 2ee82546ebc0885fde05682b145712513aacdab9 SHA256 f2ce302e9b8ba27bd1d70997db94dd51fac5f952a18d75e45355e710c762712c
+MD5 4867b5a19124eb118e4ef379ecfd72a4 files/kmix-3.5.8-198015_XF86Audio.patch 1612
+RMD160 c985f996766a4543afb502b6a721142e39ea974a files/kmix-3.5.8-198015_XF86Audio.patch 1612
+SHA256 f2ce302e9b8ba27bd1d70997db94dd51fac5f952a18d75e45355e710c762712c files/kmix-3.5.8-198015_XF86Audio.patch 1612
 DIST kdemultimedia-3.5.5.tar.bz2 6287234 RMD160 c31d81efeb02cea29048fbdefcb8c4f13726fded SHA1 8ddc3174d400827e58e2e5cf87a5bd279a6bfdc1 SHA256 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c
 DIST kdemultimedia-3.5.6.tar.bz2 6291692 RMD160 7411019e2765f740ad0f3fd592e74f62e04b8387 SHA1 030ca0b5e79f04c6baa99108f1c871f194effee7 SHA256 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719
 DIST kdemultimedia-3.5.7.tar.bz2 6347766 RMD160 23354d5b5b527c0c5bb1a123b018b130a0734906 SHA1 4b3d45403aed404c5c06d03fdb095400aed75f2c SHA256 7fda798eed8ad5c2b3a2f729f9790aba24ff23f5e40c0fc4aca77c40d5d6f6a5
@@ -26,14 +30,18 @@ EBUILD kdemultimedia-3.5.7.ebuild 2766 RMD160 b6bbfa8a6bef287e9ad24151bfac626492
 MD5 e481b255d414bfad56103738e9016226 kdemultimedia-3.5.7.ebuild 2766
 RMD160 b6bbfa8a6bef287e9ad24151bfac62649227f312 kdemultimedia-3.5.7.ebuild 2766
 SHA256 d01541789f83c75fe47cb631ed71ee35588b49621e791c2eba1969005de5c9f3 kdemultimedia-3.5.7.ebuild 2766
+EBUILD kdemultimedia-3.5.8-r1.ebuild 2864 RMD160 06875d5a9a9544d20ef37189928fb3012bde2109 SHA1 3fcfa6a5f8589e0816b34522a5dc727a7ce7f001 SHA256 69ba7f0c1a52b0f0269410d3ca68c703991f864b5434a173390ce2fa100f3853
+MD5 7da1412aa51cc78c1e5b85458ff0e985 kdemultimedia-3.5.8-r1.ebuild 2864
+RMD160 06875d5a9a9544d20ef37189928fb3012bde2109 kdemultimedia-3.5.8-r1.ebuild 2864
+SHA256 69ba7f0c1a52b0f0269410d3ca68c703991f864b5434a173390ce2fa100f3853 kdemultimedia-3.5.8-r1.ebuild 2864
 EBUILD kdemultimedia-3.5.8.ebuild 2818 RMD160 3c8bdc5e960aeda12f423f51c7d54c9fb8cc5325 SHA1 b57c256c73ff3c626ea933d2eb68f41b0efcf86e SHA256 0dafa2a8567cf38158972b4a85271115f8bdf36b506a432ffc3d205934d768b8
 MD5 ba288ca50f8555de3464bc354a847753 kdemultimedia-3.5.8.ebuild 2818
 RMD160 3c8bdc5e960aeda12f423f51c7d54c9fb8cc5325 kdemultimedia-3.5.8.ebuild 2818
 SHA256 0dafa2a8567cf38158972b4a85271115f8bdf36b506a432ffc3d205934d768b8 kdemultimedia-3.5.8.ebuild 2818
-MISC ChangeLog 36708 RMD160 f36b1b34fb79376af68e3b080fcb857bbb10e80d SHA1 ca677450acf4aac3aef0ff81338ebd3178057e37 SHA256 46a8045ab96101dfb33510f8af7e437afea38ab439088d4c10a9a5fd314b3d61
-MD5 f2f1b1322b2e8a0f9996a8128fef3c73 ChangeLog 36708
-RMD160 f36b1b34fb79376af68e3b080fcb857bbb10e80d ChangeLog 36708
-SHA256 46a8045ab96101dfb33510f8af7e437afea38ab439088d4c10a9a5fd314b3d61 ChangeLog 36708
+MISC ChangeLog 37131 RMD160 30ba9e8a7eb3522fe5fc7e3bb6ae8a7c10cf6c47 SHA1 f56c3abf9e0f3414bf6f407cb0395798e54b9fa3 SHA256 2c048464043d037d78c5c7ca68ecc7142bb8b86fee9371636e3a296b21a96a9c
+MD5 e6f31b6879ad3294e3c749e16ccf1ae6 ChangeLog 37131
+RMD160 30ba9e8a7eb3522fe5fc7e3bb6ae8a7c10cf6c47 ChangeLog 37131
+SHA256 2c048464043d037d78c5c7ca68ecc7142bb8b86fee9371636e3a296b21a96a9c ChangeLog 37131
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -50,3 +58,6 @@ SHA256 0da34e9a548299a606ef0fc4a7e23d98b53d3aa5ad01db2831b99b84b859ea5b files/di
 MD5 21457610efb171320a91b835e6828f86 files/digest-kdemultimedia-3.5.8 265
 RMD160 4a266e50b00720b36702d36074f5a2e8a9ca2efb files/digest-kdemultimedia-3.5.8 265
 SHA256 74fc4bdf05515e27c8df29337b0948e9e6c900e4b44010ce065eae5d7fa4ef6c files/digest-kdemultimedia-3.5.8 265
+MD5 21457610efb171320a91b835e6828f86 files/digest-kdemultimedia-3.5.8-r1 265
+RMD160 4a266e50b00720b36702d36074f5a2e8a9ca2efb files/digest-kdemultimedia-3.5.8-r1 265
+SHA256 74fc4bdf05515e27c8df29337b0948e9e6c900e4b44010ce065eae5d7fa4ef6c files/digest-kdemultimedia-3.5.8-r1 265
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.8-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.8-r1
new file mode 100644
index 000000000000..8038f4ee451d
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-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/kdemultimedia/files/kmix-3.5.8-198015_XF86Audio.patch b/kde-base/kdemultimedia/files/kmix-3.5.8-198015_XF86Audio.patch
new file mode 100644
index 000000000000..1190e717ee01
--- /dev/null
+++ b/kde-base/kdemultimedia/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/kdemultimedia/kdemultimedia-3.5.8-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.8-r1.ebuild
new file mode 100644
index 000000000000..dd424a2aba0d
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.8-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.8-r1.ebuild,v 1.1 2007/11/20 14:13:16 philantrop Exp $
+
+inherit kde-dist flag-o-matic
+
+DESCRIPTION="KDE multimedia apps: Noatun, KsCD, Juk..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="akode alsa audiofile encode flac gstreamer mp3 theora vorbis xine"
+
+DEPEND="media-sound/cdparanoia
+	akode? ( media-libs/akode )
+	>=media-libs/taglib-1.2
+	audiofile? ( media-libs/audiofile )
+	xine? ( >=media-libs/xine-lib-1.0 )
+	alsa? ( media-libs/alsa-lib )
+	theora? (
+		media-libs/libvorbis
+		media-libs/libtheora )
+	gstreamer? ( =media-libs/gstreamer-0.10*
+				=media-libs/gst-plugins-base-0.10* )
+	encode? ( mp3? ( media-sound/lame )
+			vorbis? ( media-sound/vorbis-tools )
+			flac? ( >=media-libs/flac-1.1.2 ) )
+	!arts? ( !gstreamer? ( media-libs/akode ) )"
+
+RDEPEND="${DEPEND}
+	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.10* )
+			 vorbis? ( =media-plugins/gst-plugins-ogg-0.10*
+					   =media-plugins/gst-plugins-vorbis-0.10* )
+			 flac? ( =media-plugins/gst-plugins-flac-0.10* ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/kdemultimedia-3.5.5+flac-1.1.3.patch
+		${FILESDIR}/kdemultimedia-kioslaves-3.5.8-freebsd.patch
+		${FILESDIR}/kmix-3.5.8-198015_XF86Audio.patch"
+
+pkg_setup() {
+	kde_pkg_setup
+	if ! use arts && ! use gstreamer && ! use akode ; then
+		ewarn "No audio backend chosen. Defaulting to media-libs/akode."
+	fi
+}
+
+src_compile() {
+	local myconf="--with-cdparanoia
+				--with-taglib
+				--with-akode
+				$(use_with alsa)
+				$(use_with audiofile)
+				$(use_with gstreamer)
+				$(use_with xine)
+				$(use_with theora)
+				--without-musicbrainz"
+
+	# encoding can happen through:
+	# - kio_audiocd (based on libflac for flac,
+	#	on libvorbis for vorbis, on the lame binary for mp3)
+	# - kaudiocreator (based on the flac binary for flac,
+	#	on the lame binary for mp3, on the oggenc binary for vorbis)
+	# - krec (based on libvorbis for vorbis,
+	#	on libmp3lame for mp3)
+	if use encode; then
+		myconf="${myconf}
+				$(use_with mp3 lame)
+				$(use_with vorbis)
+				$(use_with flac)"
+	else
+		myconf="${myconf}
+				--without-lame
+				--without-vorbis
+				--without-flac"
+	fi
+
+	if ! use arts && ! use gstreamer ; then
+		myconf="${myconf} --with-akokde"
+	else
+		if ! use akode ; then
+			# work around broken configure
+			export include_akode_ffmpeg_FALSE='#'
+			export include_akode_mpc_FALSE='#'
+			export include_akode_mpeg_FALSE='#'
+			export include_akode_xiph_FALSE='#'
+		fi
+		myconf="${myconf} $(use_with akode)"
+	fi
+
+	# fix bug 128884
+	filter-flags -fomit-frame-pointer
+
+	# Not used anymore and scheduled for removal.
+	export DO_NOT_COMPILE="${DO_NOT_COMPILE} mpeglib mpeglib_artsplug"
+
+	rm configure
+	kde_src_compile
+}