Added patch to re-add support for alsasink with gstreamer engine. Thanks to Mark Kretschmann for submitting it.

Package-Manager: portage-2.0.52-r1

5 files changed, 144 insertions, 5 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 9719d9f5af6b..c78bfda83cd9 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # 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.71 2005/09/08 23:06:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.72 2005/09/11 12:12:17 flameeyes Exp $
+
+*amarok-1.3.1-r2 (11 Sep 2005)
+
+  11 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.1-gst-alsaagain.patch, +amarok-1.3.1-r2.ebuild:
+  Added patch to re-add support for alsasink with gstreamer engine. Thanks to
+  Mark Kretschmann for submitting it.
 
   08 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.1-r1.ebuild:
   Don't force using gst-plugins-oss, let the uesrs select what they want.
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 0ae9a0ec0a08..6fbf72486915 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d3b9275e6158865a8077dde0f40b4e0a ChangeLog 11069
+MD5 9406dd67e0250ce9756741d9fd9d9548 ChangeLog 11339
+MD5 11c3b972de9d74ea5130cf00cda9136d amarok-1.3.1-r2.ebuild 2991
 MD5 81f00c356bf82789fc54bdd49f627547 amarok-1.3.1-r1.ebuild 3225
 MD5 91f47828b3a009ecbaa2ef170520aa5f amarok-1.3.ebuild 3001
 MD5 a62708867dd0a86debc654ed4ab63800 amarok-1.2.3.ebuild 2331
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 MD5 25af04c1ed653efd29b66d9a0f2fc564 amarok-1.2.4.ebuild 2400
+MD5 2f8b18e60aedeb3c67252be88d60034d files/digest-amarok-1.3.1-r2 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 83cd9605e8b745fee6ec51bded1eed2c files/amarok-1.3.1-gst-alsaagain.patch 1511
 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)
 
-iD8DBQFDIMQZj5H05b2HAEkRAvm/AKCPRu/mJ1v4bXWTMS58WUGdgdEqMACfS4uX
-6JUalUVvk3MDccqURfMTC7g=
-=k7/9
+iD8DBQFDJB/1j5H05b2HAEkRAsmgAJ45kR17TQHiH4zOY8tkshwT5EEHSwCaAowT
+/CHnVyfLvXC0jy3ZwDyXoX4=
+=Je1o
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.3.1-r2.ebuild b/media-sound/amarok/amarok-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..89474e5cf896
--- /dev/null
+++ b/media-sound/amarok/amarok-1.3.1-r2.ebuild
@@ -0,0 +1,92 @@
+# 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-r2.ebuild,v 1.1 2005/09/11 12:12:17 flameeyes Exp $
+
+inherit kde eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="amaroK - the audio player for KDE."
+HOMEPAGE="http://amarok.kde.org/"
+SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="arts flac gstreamer kde mp3 mysql noamazon opengl postgres xine xmms
+visualization vorbis musicbrainz"
+# kde: enables compilation of the konqueror sidebar plugin
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+	 arts? ( kde-base/arts
+		 || ( ( kde-base/kdemultimedia-arts kde-base/akode )
+		 	kde-base/kdemultimedia ) )
+	 xine? ( >=media-libs/xine-lib-1_rc4 )
+	 gstreamer? ( >=media-libs/gstreamer-0.8.8
+	              >=media-libs/gst-plugins-0.8.6 )
+	 musicbrainz? ( >=media-libs/tunepimp-0.3.0 )
+	 >=media-libs/taglib-1.4
+	 mysql? ( >=dev-db/mysql-4.0.16 )
+	 postgres? ( dev-db/postgresql )
+	 opengl? ( virtual/opengl )
+	 xmms? ( >=media-sound/xmms-1.2 )
+	 visualization? ( media-libs/libsdl
+			  >=media-plugins/libvisual-plugins-0.2 )"
+
+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 ) )"
+
+DEPEND="${DEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+need-kde 3.3
+
+PATCHES="${FILESDIR}/${P}-gst-alsaagain.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 (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 (preferred) or GStreamer to work,"
+		eerror "please try again with USE=\"arts\", USE=\"xine\" or USE=\"gstreamer\"."
+		die
+	fi
+
+	# check whether kdelibs was compiled with arts support
+	kde_pkg_setup
+}
+
+src_compile() {
+	# amarok does not respect kde coding standards, and makes a lot of
+	# assuptions regarding its installation directory. For this reason,
+	# it must be installed in the KDE install directory.
+	PREFIX="${KDEDIR}"
+
+	local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer)
+	              $(use_enable mysql) $(use_enable postgres postgresql)
+	              $(use_with opengl) $(use_with xmms)
+	              $(use_with visualization libvisual)
+	              $(use_enable !noamazon amazon)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# move the desktop file in /usr/share
+	dodir /usr/share/applications/kde
+	mv ${D}${KDEDIR}/share/applications/kde/amarok.desktop \
+		${D}/usr/share/applications/kde/amarok.desktop || die
+}
+
diff --git a/media-sound/amarok/files/amarok-1.3.1-gst-alsaagain.patch b/media-sound/amarok/files/amarok-1.3.1-gst-alsaagain.patch
new file mode 100644
index 000000000000..8b52d7cc7706
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.3.1-gst-alsaagain.patch
@@ -0,0 +1,36 @@
+diff -ur amarok-1.3.1/amarok/src/engine/gst/gstengine.cpp amarok-1.3.1-alsa/amarok/src/engine/gst/gstengine.cpp
+--- amarok-1.3.1/amarok/src/engine/gst/gstengine.cpp	2005-09-04 22:47:19.000000000 +0200
++++ amarok-1.3.1-alsa/amarok/src/engine/gst/gstengine.cpp	2005-09-11 14:02:18.000000000 +0200
+@@ -806,7 +806,6 @@
+ 
+                     if ( g_strrstr ( factory->details.klass, classname ) ) {
+                         name = g_strdup ( GST_OBJECT_NAME ( factory ) );
+-                        if ( name != "alsasink" )
+                         results << name;
+                     }
+                 }
+@@ -830,7 +829,7 @@
+ 
+     destroyPipeline();
+ 
+-    if ( GstConfig::soundOutput().isEmpty() || GstConfig::soundOutput() == "alsasink" ) {
++    if ( GstConfig::soundOutput().isEmpty()) {
+         QTimer::singleShot( 0, this, SLOT( errorNoOutput() ) );
+         return false;
+     }
+@@ -853,7 +852,6 @@
+     }
+ 
+     m_gst_audiobin = gst_bin_new( "audiobin" );
+-    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
+ 
+     /* setting device property for AudioSink*/
+     if ( GstConfig::useCustomSoundDevice() && !GstConfig::soundDevice().isEmpty() )
+@@ -872,6 +870,7 @@
+     gst_element_link_many( m_gst_audioconvert, m_gst_equalizer, m_gst_identity,
+                            m_gst_volume, m_gst_audioscale, m_gst_audiosink, NULL );
+ 
++    gst_bin_add( GST_BIN( m_gst_audiobin ), m_gst_audiosink );
+     gst_element_set_state( m_gst_audiobin, GST_STATE_PAUSED );
+ 
+     m_pipelineFilled = true;
diff --git a/media-sound/amarok/files/digest-amarok-1.3.1-r2 b/media-sound/amarok/files/digest-amarok-1.3.1-r2
new file mode 100644
index 000000000000..b2089fc7ba53
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.3.1-r2
@@ -0,0 +1 @@
+MD5 31f504e5fe985bbdb3c99f0e72d08fa1 amarok-1.3.1.tar.bz2 6806647