add fix for cdrom-less machines to use xine-backend (fixes #90362)

Package-Manager: portage-2.0.51.19

5 files changed, 112 insertions, 2 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 59f8580fcbf1..b1c0da68f348 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.49 2005/04/25 17:14:33 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.50 2005/04/26 11:00:09 zaheerm Exp $
+
+*totem-0.100-r3 (26 Apr 2005)
+
+  26 Apr 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +files/totem-0.100-xine_backend-nocdrom.patch, +totem-0.100-r3.ebuild:
+  add fix for cdrom-less machines to use xine-backend (fixes #90362)
 
   25 Apr 2005; Zaheer Abbas Merali <zaheerm@gentoo.org> totem-1.0.1.ebuild:
   Added win32codecs USE flag so gstreamer users can play win32 codecs
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 071026c06c82..2cb94d090442 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,16 +1,19 @@
+MD5 6415e3f7f7ecd493a5c0e516b650a705 totem-0.100-r3.ebuild 2097
 MD5 6da1f545a8db0c4f35b6c2e2727f1b1d totem-0.99.19.ebuild 1747
 MD5 f210826edebfeaa8929396a01b8d220e totem-1.0.1.ebuild 2613
 MD5 9f2858f2d0308b9b48262eb99a4efbd3 totem-0.99.15.1.ebuild 1589
 MD5 38094138149f74a6c9c95872696b8267 totem-1.0.ebuild 2690
 MD5 3160fc8b78ee5a74a654521257b0234c totem-0.100-r2.ebuild 1990
-MD5 485c60e2d15c1d3944d4a05d9731ffea ChangeLog 7024
+MD5 e104f7205f1d95b59c180643671a23c7 ChangeLog 7254
 MD5 74b9bd3cc5015b286abc33eb51408252 metadata.xml 521
 MD5 50a343412446e05871e042a7b5958c93 files/totem-0.100-fix_desktop_item.patch 558
 MD5 cae0d48bbd06a51476128dbfbefb4a5f files/digest-totem-1.0.1 65
 MD5 8dd0c2a14c9603045fb2eebd0ee50534 files/digest-totem-0.100-r2 65
+MD5 8dd0c2a14c9603045fb2eebd0ee50534 files/digest-totem-0.100-r3 65
 MD5 8ab6b544e88eb5901e71820c8b41a477 files/totem-0.100-cdrom_include.patch 413
 MD5 83330cc2d2cf195da778271af666079f files/digest-totem-1.0 63
 MD5 eeba2ab1c3ed87a4a630addd709262ea files/digest-totem-0.99.19 67
 MD5 62cbcd8c86010195b8b70ee4d9703e84 files/totem-0.100-gst_backend_fixes-r1.patch 1036
+MD5 665f89e5e0d268567a54c9acd6026a90 files/totem-0.100-xine_backend-nocdrom.patch 601
 MD5 572a285ceed98dcaa61cf9520e7e59f7 files/totem-0.99.22-x_includes.patch 1330
 MD5 3d9e7881aa0ec7d110c1487cd95d6c40 files/digest-totem-0.99.15.1 69
diff --git a/media-video/totem/files/digest-totem-0.100-r3 b/media-video/totem/files/digest-totem-0.100-r3
new file mode 100644
index 000000000000..b18a963468ee
--- /dev/null
+++ b/media-video/totem/files/digest-totem-0.100-r3
@@ -0,0 +1 @@
+MD5 885423cc7e1d5eb8ff62b7b8ec9c30bc totem-0.100.tar.bz2 1279913
diff --git a/media-video/totem/files/totem-0.100-xine_backend-nocdrom.patch b/media-video/totem/files/totem-0.100-xine_backend-nocdrom.patch
new file mode 100644
index 000000000000..5845e033d083
--- /dev/null
+++ b/media-video/totem/files/totem-0.100-xine_backend-nocdrom.patch
@@ -0,0 +1,18 @@
+===================================================================
+RCS file: /cvs/gnome/totem/src/backend/bacon-video-widget-xine.c,v
+retrieving revision 1.167
+retrieving revision 1.168
+diff -u -r1.167 -r1.168
+--- bacon-video-widget-xine.c	2005/01/30 22:27:50	1.167
++++ bacon-video-widget-xine.c	2005/02/07 08:37:00	1.168
+@@ -2447,6 +2447,10 @@
+ {
+ 	xine_cfg_entry_t entry;
+ 
++	g_return_if_fail (bvw != NULL);
++	g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
++	g_return_if_fail (path != NULL);
++
+ 	/* DVD device */
+ 	bvw_config_helper_string (bvw->priv->xine, "media.dvd.device",
+ 			path, &entry);
diff --git a/media-video/totem/totem-0.100-r3.ebuild b/media-video/totem/totem-0.100-r3.ebuild
new file mode 100644
index 000000000000..e3200106bec1
--- /dev/null
+++ b/media-video/totem/totem-0.100-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.100-r3.ebuild,v 1.1 2005/04/26 11:00:09 zaheerm Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://www.hadess.net/totem.php3"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc amd64 ~sparc"
+IUSE="gstreamer lirc mad debug"
+
+RDEPEND=">=dev-libs/glib-2.2
+	>=x11-libs/gtk+-2.4
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2.4
+	<gnome-extra/nautilus-cd-burner-2.9
+	>=gnome-base/gnome-desktop-2.2
+	lirc? ( app-misc/lirc )
+	!gstreamer? ( >=media-libs/xine-lib-1_rc7
+			>=gnome-base/gconf-2 )
+	sparc? ( >=media-libs/xine-lib-1_rc7
+		>=gnome-base/gconf-2 )
+	!sparc? ( gstreamer? ( >=media-libs/gstreamer-0.8.7
+				>=media-libs/gst-plugins-0.8.5
+				>=media-plugins/gst-plugins-gnomevfs-0.8.5
+				>=media-plugins/gst-plugins-xvideo-0.8.5
+				>=media-plugins/gst-plugins-ffmpeg-0.8.3
+				mad? ( >=media-plugins/gst-plugins-mad-0.8.5 )
+				) )"
+
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.12.0
+	sys-devel/automake"
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+
+# xine is default for now
+use gstreamer && G2CONF="${G2CONF} --enable-gstreamer"
+
+# gtk only support broken
+#use gnome \
+#	&& G2CONF="${G2CONF} --disable-gtk" \
+#	|| G2CONF="${G2CONF} --enable-gtk"
+
+G2CONF="${G2CONF} \
+	$(use_enable lirc) \
+	$(use_enable debug) \
+	--disable-gtk \
+	--disable-mozilla"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# use the omf_fix for scrollkeeper sandbox
+	# violations, see bug #48800 <obz@gentoo.org>
+	gnome2_omf_fix
+
+	# order the cdrom include (#68087)
+	epatch ${FILESDIR}/${P}-cdrom_include.patch
+	# fix the desktop item (#77204)
+	epatch ${FILESDIR}/${P}-fix_desktop_item.patch
+	# some more minor fixes
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-gst_backend_fixes-r1.patch
+	# fix for xine-lib NULL cdrom
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-xine_backend-nocdrom.patch
+	cd ${S}
+
+	WANT_AUTOMAKE=1.4 automake
+
+}
+
+USE_DESTDIR="1"