Fix muine's wrong use of libgstplay

Package-Manager: portage-2.0.51.19

5 files changed, 121 insertions, 2 deletions

diff --git a/media-sound/muine/ChangeLog b/media-sound/muine/ChangeLog
index 18e5f5be9ce5..82626feadd93 100644
--- a/media-sound/muine/ChangeLog
+++ b/media-sound/muine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/muine
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.11 2005/03/15 01:51:49 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/ChangeLog,v 1.12 2005/03/16 15:36:09 zaheerm Exp $
+
+*muine-0.6.3-r3 (16 Mar 2005)
+
+  16 Mar 2005; <zaheerm@gentoo.org> +files/muine-0.6.3-libgstplay.diff,
+  +muine-0.6.3-r3.ebuild:
+  Fix bug in muine's gst engine that causes it not to work with recent 
+  gst-plugins (#85017)
 
   14 Mar 2005; Peter Johanson <latexer@gentoo.org>
   +files/muine-0.6.3-gnome-2.10-compat.diff, -muine-0.6.3-r1.ebuild,
diff --git a/media-sound/muine/Manifest b/media-sound/muine/Manifest
index b410a05a792d..c53994cc7e2e 100644
--- a/media-sound/muine/Manifest
+++ b/media-sound/muine/Manifest
@@ -1,6 +1,9 @@
 MD5 fe5440ed19aee80b9b2a6464e736660a muine-0.6.3-r2.ebuild 1581
-MD5 72126e1c6b96d8d1737b47e87536e3c2 ChangeLog 1674
+MD5 c80dcebce3d27681090dbe169f8fc1c4 muine-0.6.3-r3.ebuild 1690
+MD5 eee51c5cca32bffbcd61e4ff6fc025ce ChangeLog 1899
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 23905e3a18ad036ce42ccb76c81f1096 files/muine-0.6.3-mono-1.1.1-compat.diff 3384
 MD5 e8f743f78010f9e787d738c4dc2c3afa files/muine-0.6.3-gnome-2.10-compat.diff 846
+MD5 005546051d7ebbbbc94daf145d59b104 files/muine-0.6.3-libgstplay.diff 1412
 MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r2 63
+MD5 94649610e3e4a64b74b8e868c0b7d2ca files/digest-muine-0.6.3-r3 63
diff --git a/media-sound/muine/files/digest-muine-0.6.3-r3 b/media-sound/muine/files/digest-muine-0.6.3-r3
new file mode 100644
index 000000000000..9de74a90ae39
--- /dev/null
+++ b/media-sound/muine/files/digest-muine-0.6.3-r3
@@ -0,0 +1 @@
+MD5 dc7923e1e0ba87f0303bc30f14f604e3 muine-0.6.3.tar.gz 624566
diff --git a/media-sound/muine/files/muine-0.6.3-libgstplay.diff b/media-sound/muine/files/muine-0.6.3-libgstplay.diff
new file mode 100644
index 000000000000..3fe82b0e07ca
--- /dev/null
+++ b/media-sound/muine/files/muine-0.6.3-libgstplay.diff
@@ -0,0 +1,48 @@
+--- player-gst.c	2004-04-20 20:25:44.000000000 +0100
++++ /home/zaheer/player-gst.c	2005-03-15 14:14:10.312438632 +0000
+@@ -144,6 +144,7 @@
+ player_construct (Player *player, char **error)
+ {
+ 	PlayerPriv *priv;
++	GstElement* tempsink;
+ 
+ 	gst_init (NULL, NULL);
+ 
+@@ -168,22 +169,33 @@
+ 
+ 	gst_play_set_data_src (priv->play, priv->source);
+ 
+-	priv->sink = gst_gconf_get_default_audio_sink ();
+-	if (!priv->sink) {
++	tempsink = gst_gconf_get_default_audio_sink ();
++	if (!tempsink) {
+ 		*error = g_strdup (_("Could not render default GStreamer audio output sink"));
+ 
+ 		return;
+ 	}
+ 
+-	gst_play_set_audio_sink (priv->play, priv->sink);
++	
++
++	/* gst_play_set_audio_sink (priv->play, priv->sink); */
+ 
+-	priv->volume = gst_bin_get_by_name (GST_BIN (priv->play), "volume");
++	priv->volume = gst_element_factory_make ("volume", "muinevol");
+ 	if (!priv->volume) {
+ 		*error = g_strdup (_("Could not find the volume element in the GstPlay pipeline"));
+ 
+ 		return;
+ 	}
+ 
++	priv->sink = gst_bin_new ("muineaudiosink");
++	gst_bin_add_many (GST_BIN(priv->sink), priv->volume, tempsink, NULL);
++	gst_element_link (priv->volume, tempsink);
++	gst_element_add_ghost_pad (priv->sink, 
++		gst_element_get_pad (priv->volume, "sink"),
++		"sink");
++	gst_play_set_audio_sink (priv->play, priv->sink);
++
++	//gst_bin_add (GST_BIN(priv->sink), tempsink);
+ 	g_signal_connect (priv->play,
+ 			  "error",
+ 			  G_CALLBACK (error_cb),
diff --git a/media-sound/muine/muine-0.6.3-r3.ebuild b/media-sound/muine/muine-0.6.3-r3.ebuild
new file mode 100644
index 000000000000..909933232a89
--- /dev/null
+++ b/media-sound/muine/muine-0.6.3-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/muine/muine-0.6.3-r3.ebuild,v 1.1 2005/03/16 15:36:09 zaheerm Exp $
+
+inherit gnome2 mono eutils
+
+DESCRIPTION="A music player for GNOME"
+HOMEPAGE="http://muine.gooeylinux.org/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+LICENSE="GPL-2"
+IUSE="xine mad oggvorbis flac"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+RDEPEND=">=dev-lang/mono-1.0
+	>=dev-dotnet/gtk-sharp-1.0.4-r1
+	>=dev-dotnet/gnome-sharp-1.0.4
+	>=dev-dotnet/glade-sharp-1.0.4
+	>=dev-dotnet/gconf-sharp-1.0.4
+	=dev-dotnet/gtk-sharp-1.0*
+	=dev-dotnet/gnome-sharp-1.0*
+	=dev-dotnet/glade-sharp-1.0*
+	=dev-dotnet/gconf-sharp-1.0*
+	xine? ( >=media-libs/xine-lib-1_rc4 )
+	!xine? (
+		>=media-libs/gstreamer-0.8.0
+		>=media-libs/gst-plugins-0.8.0
+		>=media-plugins/gst-plugins-gnomevfs-0.8.0
+		mad? ( >=media-plugins/gst-plugins-mad-0.8.0 )
+		oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.0 )
+		flac? ( >=media-plugins/gst-plugins-flac-0.8.0 )
+	)
+	>=media-libs/libid3tag-0.15.0b
+	>=media-libs/libvorbis-1.0
+	sys-libs/gdbm
+	>=gnome-base/gconf-2.0.0
+	>=gnome-base/gnome-vfs-2.0.0
+	>=x11-libs/gtk+-2.0.0
+	media-libs/flac"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/scrollkeeper"
+
+use xine && \
+	G2CONF="${G2CONF} --enable-gstreamer=no" || \
+	G2CONF="${G2CONF} --enable-gstreamer=yes"
+
+DOCS="AUTHORS COPYING ChangeLog INSTALL \
+	  MAINTAINERS NEWS README TODO"
+
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-mono-1.1.1-compat.diff
+	epatch ${FILESDIR}/${P}-gnome-2.10-compat.diff
+	# patch to fix broken use of libgstplay (#85017)
+	cd ${S}/libmuine
+	epatch ${FILESDIR}/${P}-libgstplay.diff
+}