Added patch to avoid using autodetection with gstreamer (crashes when using alsa). Added a note for gstreamer users and a dependency over oss plugin. Consider using xine backend if you want alsa output.

Package-Manager: portage-2.0.51.22

5 files changed, 58 insertions, 11 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 62a53c10c72a..227670376ea0 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.69 2005/09/06 21:40:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.70 2005/09/08 16:38:19 flameeyes Exp $
+
+*amarok-1.3.1-r1 (08 Sep 2005)
+
+  08 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.1-gst-onlyoss.patch, -amarok-1.3.1.ebuild,
+  +amarok-1.3.1-r1.ebuild:
+  Added patch to avoid using autodetection with gstreamer (crashes when using
+  alsa). Added a note for gstreamer users and a dependency over oss plugin.
+  Consider using xine backend if you want alsa output.
 
 *amarok-1.3.1 (06 Sep 2005)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 271103c561b7..b6f8d8f27c67 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 385f6426494905256abafc2c79536825 ChangeLog 10406
+MD5 6a300943d07d5c904c72f6747b131b6e ChangeLog 10791
+MD5 eff20abea92993991b36facb5714fd0d amarok-1.3.1-r1.ebuild 3356
 MD5 91f47828b3a009ecbaa2ef170520aa5f amarok-1.3.ebuild 3001
 MD5 a62708867dd0a86debc654ed4ab63800 amarok-1.2.3.ebuild 2331
-MD5 4c05144640fbbdd36338c9580a39d7cb amarok-1.3.1.ebuild 3003
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 MD5 25af04c1ed653efd29b66d9a0f2fc564 amarok-1.2.4.ebuild 2400
-MD5 2f8b18e60aedeb3c67252be88d60034d files/digest-amarok-1.3.1 66
 MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
 MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
+MD5 ec2d8b44a6a36ca4c78da27e9c09175e files/amarok-1.3.1-gst-onlyoss.patch 1083
+MD5 2f8b18e60aedeb3c67252be88d60034d files/digest-amarok-1.3.1-r1 66
 MD5 4f4eae9cff4ef39fb98bf5109faf8113 files/digest-amarok-1.3 64
 MD5 55c15fa0003bd71db5f7e23d750c0b16 files/digest-amarok-1.2.3 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDHgzpj5H05b2HAEkRAvTuAJ99vMU5xflE+XxiTEvL7SU++ie+7QCgpmaF
-irW3zIIX9VKdajUCoRLTDZc=
-=Vzbh
+iD8DBQFDIGkaj5H05b2HAEkRAl05AJ4m5iEy9S6BRuNKBXWe8IeZucvsXQCdF+Tj
+w2zc0JnPe2gRjmuzx+Rdfc4=
+=z9Y9
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.3.1.ebuild b/media-sound/amarok/amarok-1.3.1-r1.ebuild
index 1c4a5aad8829..7daae02ca5c1 100644
--- a/media-sound/amarok/amarok-1.3.1.ebuild
+++ b/media-sound/amarok/amarok-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.1.ebuild,v 1.1 2005/09/06 21:40:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.1-r1.ebuild,v 1.1 2005/09/08 16:38:19 flameeyes Exp $
 
 inherit kde eutils
 
@@ -38,23 +38,26 @@ RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8.6 )
 	             vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.6
 	                       >=media-plugins/gst-plugins-vorbis-0.8.6 )
-	             flac? ( >=media-plugins/gst-plugins-flac-0.8.6 ) )"
+	             flac? ( >=media-plugins/gst-plugins-flac-0.8.6 )
+				 >=media-plugins/gst-plugins-oss-0.8.6 )"
 
 DEPEND="${DEPEND}
 	>=dev-util/pkgconfig-0.9.0"
 
 need-kde 3.3
 
+PATCHES="${FILESDIR}/${P}-gst-onlyoss.patch"
+
 pkg_setup() {
 	if use arts && ! use xine && ! use gstreamer; then
 		ewarn "aRts support is deprecated, if you have problems please consider"
-		ewarn "enabling support for Xine or GStreamer"
+		ewarn "enabling support for Xine (preferred) or GStreamer"
 		ewarn "(emerge amarok again with USE=\"xine\" or USE=\"gstreamer\")."
 		ebeep 2
 	fi
 
 	if ! use arts && ! use xine && ! use gstreamer; then
-		eerror "amaroK needs either aRts (deprecated), Xine or GStreamer to work,"
+		eerror "amaroK needs either aRts (deprecated), Xine (preferred) or GStreamer to work,"
 		eerror "please try again with USE=\"arts\", USE=\"xine\" or USE=\"gstreamer\"."
 		die
 	fi
@@ -91,3 +94,12 @@ src_install() {
 	mv ${D}${KDEDIR}/share/applications/kde/amarok.desktop \
 		${D}/usr/share/applications/kde/amarok.desktop || die
 }
+
+pkg_postinst() {
+	if use gstreamer; then
+		einfo "From version 1.3.1, amaroK doesn't support anymore alsa output with"
+		einfo "gstreamer engine."
+		einfo "If you want to use alsa output, consider moving to xine engine instead."
+	fi
+}
+
diff --git a/media-sound/amarok/files/amarok-1.3.1-gst-onlyoss.patch b/media-sound/amarok/files/amarok-1.3.1-gst-onlyoss.patch
new file mode 100644
index 000000000000..32afd7453d18
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.3.1-gst-onlyoss.patch
@@ -0,0 +1,25 @@
+Index: gstengine.cpp
+===================================================================
+--- amarok/src/engine/gst/gstengine.cpp       (revision 458592)
++++ amarok/src/engine/gst/gstengine.cpp       (revision 458593)
+@@ -806,7 +806,7 @@
+ 
+                     if ( g_strrstr ( factory->details.klass, classname ) ) {
+                         name = g_strdup ( GST_OBJECT_NAME ( factory ) );
+-                        if ( name != "alsasink" )
++                        if ( name != "alsasink" && name != "autoaudiosink" && name != "gconfaudiosink")
+                         results << name;
+                     }
+                 }
+@@ -830,7 +830,10 @@
+ 
+     destroyPipeline();
+ 
+-    if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
++    if ( GstConfig::soundOutput().isEmpty() 
++        || GstConfig::soundOutput() == "alsasink" 
++        || GstConfig::soundOutput() ==  "autoaudiosink" 
++        || GstConfig::soundOutput() ==  "gconfaudiosink") {
+         QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
+         return false;
+     }
diff --git a/media-sound/amarok/files/digest-amarok-1.3.1 b/media-sound/amarok/files/digest-amarok-1.3.1-r1
index b2089fc7ba53..b2089fc7ba53 100644
--- a/media-sound/amarok/files/digest-amarok-1.3.1
+++ b/media-sound/amarok/files/digest-amarok-1.3.1-r1