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, 170 insertions, 1 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/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
+}