Fix regression: juk hangs with akode engine (#95022).

Package-Manager: portage-2.0.51.19

8 files changed, 150 insertions, 2 deletions

diff --git a/kde-base/akode/ChangeLog b/kde-base/akode/ChangeLog
index 9457ae9a9de7..ecc12e79ef86 100644
--- a/kde-base/akode/ChangeLog
+++ b/kde-base/akode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/akode
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akode/ChangeLog,v 1.11 2005/05/26 08:47:36 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akode/ChangeLog,v 1.12 2005/06/10 14:55:25 greg_g Exp $
+
+*akode-3.4.1-r1 (10 Jun 2005)
+
+  10 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdemultimedia-3.4.1-akode-hang.patch, +akode-3.4.1-r1.ebuild:
+  Fix regression: juk hangs with akode engine (#95022).
 
   26 May 2005; Gregorio Guidi <greg_g@gentoo.org> akode-3.4.1.ebuild:
   Change flag 'oggvorbis' into 'vorbis' (#89592), 'mad' into 'mp3' (#94045).
diff --git a/kde-base/akode/akode-3.4.1-r1.ebuild b/kde-base/akode/akode-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..1f0e74ecbcee
--- /dev/null
+++ b/kde-base/akode/akode-3.4.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akode/akode-3.4.1-r1.ebuild,v 1.1 2005/06/10 14:55:25 greg_g Exp $
+
+KMNAME=kdemultimedia
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta
+
+DESCRIPTION="aRts plugins for various formats"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+IUSE="alsa arts flac jack mp3 speex vorbis"
+DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
+	flac? ( media-libs/flac )
+	vorbis? ( media-sound/vorbis-tools )
+	speex? ( media-libs/speex )
+	!=media-libs/speex-1.1.4
+	media-libs/libsamplerate
+	mp3? ( media-libs/libmad )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+
+# MISSING: polypaudio - no gentoo ebuild as yet
+# TODO: configure needs a pkg-config file for media-sound/jack to detect it
+
+# Fix regression: juk hangs (kde bug 105342). Applied for 3.4.2.
+PATCHES1="${FILESDIR}/kdemultimedia-3.4.1-akode-hang.patch"
+
+src_compile() {
+	use speex && myconf="$myconf --with-extra-includes=/usr/include/speex"
+	myconf="$myconf $(use_with mp3 libmad) $(use_with flac) $(use_with speex)
+			$(use_with alsa) $(use_with jack) $(use_with vorbis)"
+
+	kde-meta_src_compile
+}
diff --git a/kde-base/akode/files/digest-akode-3.4.1-r1 b/kde-base/akode/files/digest-akode-3.4.1-r1
new file mode 100644
index 000000000000..a679af956640
--- /dev/null
+++ b/kde-base/akode/files/digest-akode-3.4.1-r1
@@ -0,0 +1,3 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/akode/files/kdemultimedia-3.4.1-akode-hang.patch b/kde-base/akode/files/kdemultimedia-3.4.1-akode-hang.patch
new file mode 100644
index 000000000000..33aeab8abf96
--- /dev/null
+++ b/kde-base/akode/files/kdemultimedia-3.4.1-akode-hang.patch
@@ -0,0 +1,19 @@
+diff -Nur juk-3.4.1.orig/akode/lib/player.cpp juk-3.4.1/akode/lib/player.cpp
+--- juk-3.4.1.orig/akode/lib/player.cpp	2005-06-04 07:47:43.471249680 -0600
++++ juk-3.4.1/akode/lib/player.cpp	2005-06-04 07:48:11.235028944 -0600
+@@ -360,6 +360,7 @@ void Player::play() {
+         m_data->in_decoder = 0;
+         m_data->decoder    = 0;
+         m_data->buffer     = 0;
++    	setState(Loaded);
+     }
+ }
+ 
+@@ -369,6 +370,7 @@ void Player::stop() {
+     if (state() == Paused) resume();
+ 
+     if (m_data->running) {
++	m_data->buffer->release();
+         m_data->halt = true;
+         pthread_join(m_data->player_thread, 0);
+         m_data->running = false;
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 88279ec3acc2..3311b1b5fd9c 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.159 2005/05/27 08:45:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.160 2005/06/10 14:54:14 greg_g Exp $
+
+*kdemultimedia-3.4.1-r1 (10 Jun 2005)
+
+  10 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdemultimedia-3.4.1-akode-hang.patch,
+  +kdemultimedia-3.4.1-r1.ebuild:
+  Fix regression: juk hangs with akode engine (#95022).
 
 *kdemultimedia-3.4.1 (27 May 2005)
 
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.4.1-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.4.1-r1
new file mode 100644
index 000000000000..d732c5248a63
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.4.1-r1
@@ -0,0 +1 @@
+MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.4.1-akode-hang.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.4.1-akode-hang.patch
new file mode 100644
index 000000000000..33aeab8abf96
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.4.1-akode-hang.patch
@@ -0,0 +1,19 @@
+diff -Nur juk-3.4.1.orig/akode/lib/player.cpp juk-3.4.1/akode/lib/player.cpp
+--- juk-3.4.1.orig/akode/lib/player.cpp	2005-06-04 07:47:43.471249680 -0600
++++ juk-3.4.1/akode/lib/player.cpp	2005-06-04 07:48:11.235028944 -0600
+@@ -360,6 +360,7 @@ void Player::play() {
+         m_data->in_decoder = 0;
+         m_data->decoder    = 0;
+         m_data->buffer     = 0;
++    	setState(Loaded);
+     }
+ }
+ 
+@@ -369,6 +370,7 @@ void Player::stop() {
+     if (state() == Paused) resume();
+ 
+     if (m_data->running) {
++	m_data->buffer->release();
+         m_data->halt = true;
+         pthread_join(m_data->player_thread, 0);
+         m_data->running = false;
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..c562c0f98909
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.ebuild,v 1.1 2005/06/10 14:54:14 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
+
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+IUSE="alsa audiofile encode flac gstreamer jack mp3 speex theora vorbis xine"
+
+DEPEND="~kde-base/kdebase-${PV}
+	media-sound/cdparanoia
+	media-libs/libsamplerate
+	audiofile? ( media-libs/audiofile )
+	mp3? ( media-libs/libmad )
+	jack? ( media-sound/jack-audio-connection-kit )
+	flac? ( media-libs/flac )
+	encode? ( media-sound/lame )
+	vorbis? ( media-sound/vorbis-tools )
+	xine? ( >=media-libs/xine-lib-1.0 )
+	alsa? ( media-libs/alsa-lib )
+	speex? ( media-libs/speex )
+	theora? ( media-libs/libtheora )
+	gstreamer? ( >=media-libs/gstreamer-0.8 )
+	>=media-libs/taglib-1.2
+	media-libs/tunepimp"
+
+RDEPEND="${DEPEND}
+	gstreamer? ( >=media-libs/gst-plugins-0.8
+		     mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
+		     vorbis? ( >=media-plugins/gst-plugins-ogg-0.8
+		                  >=media-plugins/gst-plugins-vorbis-0.8 )
+		     flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${FILESDIR}/kdemultimedia-3.4.0-amd64.patch"
+
+	# Fix regression: juk hangs with akode engine (kde bug 105342). Applied for 3.4.2.
+	epatch "${FILESDIR}/${P}-akode-hang.patch"
+}
+
+src_compile() {
+	use speex && myconf="--with-extra-includes=/usr/include/speex"
+
+	use xine && myconf="${myconf} --with-xine-prefix=/usr"
+	use xine || DO_NOT_COMPILE="${DO_NOT_COMPILE} xine_artsplugin"
+
+	myconf="${myconf} --with-cdparanoia --enable-cdparanoia
+		$(use_with alsa arts-alsa) $(use_with alsa)
+		$(use_with vorbis) $(use_with encode lame)
+		$(use_with flac) $(use_with speex)
+		$(use_with mp3 libmad) $(use_with jack)"
+
+	kde_src_compile
+}