Thanks hadess, theese changes made it actually output video again :)

5 files changed, 99 insertions, 3 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 04b463dae1c6..e301d61f9295 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.27 2003/12/07 18:39:08 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.28 2003/12/08 14:30:06 spider Exp $
+
+*totem-0.99.8-r2 (08 Dec 2003)
+
+  08 Dec 2003; <spider@gentoo.org> totem-0.99.8-r2.ebuild,
+  files/totem-0.99.8-nvidia.patch:
+  Added a patch to make video output work by disabling some drivers.
 
 *totem-0.99.8-r1 (07 Dec 2003)
 
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index e470acec9703..dc58b1f67628 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,13 +1,14 @@
-MD5 72b48a989a4fc23f4a5cead238c60f7e ChangeLog 3872
+MD5 a437d080fa4afd3c9fecf91fb9af865f ChangeLog 4068
 MD5 dafbcb3d4280b4a0802bb5cd74f74c98 metadata.xml 559
 MD5 34a2f114ddf5d0e6c2cc9da46f684dcd totem-0.99.8.ebuild 1377
 MD5 d51e4b6a5fed90aec4dda7b19615864d totem-0.99.7.ebuild 1302
 MD5 ffbaad8befb74b57db2c00e74adaafba totem-0.99.5.ebuild 1304
 MD5 1090ba4742b2a538ecff0dea3f138318 totem-0.99.8-r1.ebuild 1662
-MD5 1090ba4742b2a538ecff0dea3f138318 totem-0.99.8-r2.ebuild 1662
+MD5 3872f18b1419568ba98d50cd3358c135 totem-0.99.8-r2.ebuild 1834
 MD5 5555967d2623a7a6476864d9294bf323 files/digest-totem-0.99.8 65
 MD5 de48e6636ec8a8884f4e17cadbb89d82 files/digest-totem-0.99.7 65
 MD5 c24abb8ac12e32b2372e91d65343cc34 files/digest-totem-0.99.5 65
 MD5 ffee6132520a471d092c6101e2cfcfc4 files/totem-0.99.8-curl.patch 762
 MD5 5555967d2623a7a6476864d9294bf323 files/digest-totem-0.99.8-r1 65
 MD5 5555967d2623a7a6476864d9294bf323 files/digest-totem-0.99.8-r2 65
+MD5 f19c916fffc4e302cb84b4d6f50c8c03 files/totem-0.99.8-nvidia.patch 526
diff --git a/media-video/totem/files/digest-totem-0.99.8-r2 b/media-video/totem/files/digest-totem-0.99.8-r2
new file mode 100644
index 000000000000..84310a8ca54f
--- /dev/null
+++ b/media-video/totem/files/digest-totem-0.99.8-r2
@@ -0,0 +1 @@
+MD5 fc8c0fcf96bcea69a7c957ef1666cd7e totem-0.99.8.tar.bz2 786192
diff --git a/media-video/totem/files/totem-0.99.8-nvidia.patch b/media-video/totem/files/totem-0.99.8-nvidia.patch
new file mode 100644
index 000000000000..1657c87628a8
--- /dev/null
+++ b/media-video/totem/files/totem-0.99.8-nvidia.patch
@@ -0,0 +1,15 @@
+--- src/bacon-video-widget-xine.c.old	2003-12-08 15:21:56.000000000 +0100
++++ src/bacon-video-widget-xine.c	2003-12-08 15:21:18.000000000 +0100
+@@ -581,10 +581,12 @@
+ 	 * we need to try loading the other ones, skipping dxr3 */
+ 
+ 	/* The types are hardcoded for now */
++	/*
+ 	vo_driver = xine_open_video_driver (bvw->priv->xine, "xvmc",
+ 			XINE_VISUAL_TYPE_X11, (void *) &vis);
+ 	if (vo_driver)
+ 		return vo_driver;
++*/
+ 
+ 	vo_driver = xine_open_video_driver (bvw->priv->xine, "xv",
+ 			XINE_VISUAL_TYPE_X11, (void *) &vis);
diff --git a/media-video/totem/totem-0.99.8-r2.ebuild b/media-video/totem/totem-0.99.8-r2.ebuild
new file mode 100644
index 000000000000..78bb8d745f26
--- /dev/null
+++ b/media-video/totem/totem-0.99.8-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.99.8-r2.ebuild,v 1.1 2003/12/08 14:30:06 spider Exp $
+
+inherit gnome2
+
+IUSE="gstreamer lirc curl"
+DESCRIPTION="Movie player for GNOME"
+HOMEPAGE="http://www.hadess.net/totem.php3"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+
+# specific gtk dep is needed for a certain xfree patch (#21336)
+RDEPEND=">=dev-libs/glib-2.1
+	>=x11-libs/gtk+-2.2.2-r1
+	>=gnome-base/libgnomeui-2.1.1
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-desktop-2.2
+	lirc? ( app-misc/lirc )
+	!gstreamer? ( >=media-libs/xine-lib-1_rc0
+		curl? ( >=net-ftp/curl-7.9.8 )
+	)
+	gstreamer? ( >=media-libs/gstreamer-0.6.3
+		>=media-libs/gst-plugins-0.6.3
+		>=media-plugins/gst-plugins-gnomevfs-0.6.3
+		>=media-plugins/gst-plugins-colorspace-0.6.3
+		>=media-plugins/gst-plugins-xvideo-0.6.3
+		mad? ( >=media-plugins/gst-plugins-mad-0.6.3 )
+		)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.20
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# add enable/disable curl
+	epatch ${FILESDIR}/${P}-curl.patch
+
+	# Disables a videodriver that doesn't work with all nvidia drivers
+	# you can override it by putting xvmc in ~/.gnome2/totem_config
+	epatch ${FILESDIR}/${P}-nvidia.patch
+	export WANT_AUTOCONF_2_5=1
+	autoconf
+
+	#fixes sandbox violations
+	gnome2_omf_fix
+
+}
+
+
+# move this in the right order so stacking works. "fulhack"
+use curl \
+	&& G2CONF="${G2CONF} --enable-curl" \
+	|| G2CONF="${G2CONF} --disable-curl"
+
+# xine is default
+use gstreamer && G2CONF="${G2CONF} --enable-gstreamer --disable-curl"
+
+use lirc \
+	&& G2CONF="${G2CONF} --enable-lirc" \
+	|| G2CONF="${G2CONF} --disable-lirc"
+
+
+