Fix a problem in the youtube plugin, When trying to play a video, bug #292839. Thanks to Ryan May.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

4 files changed, 199 insertions, 12 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index c8458e91dbc8..ce653754e617 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.261 2009/11/05 20:38:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.262 2009/11/14 17:31:37 mrpouet Exp $
+
+*totem-2.26.4-r1 (14 Nov 2009)
+
+  14 Nov 2009; Romain Perier <mrpouet@gentoo.org>
+  +totem-2.26.4-r1.ebuild,
+  +files/totem-2.26.4-youtube-plug-play-vids.patch:
+  Fix a problem in the youtube plugin, When trying to play a video, bug
+  #292839. Thanks to Ryan May.
 
   05 Nov 2009; Markus Meier <maekke@gentoo.org> totem-2.26.3-r1.ebuild:
   arm stable, bug #281427
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index d47bc367ba70..11383ce32e11 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX totem-2.20.1-startup-notification.patch 1235 RMD160 2b2f1dc18a7910019adf1a831aa2ca3a1febb080 SHA1 1a26bd044901ef3969a042b621c59bd7c2bb86a9 SHA256 88ec75d7ad5d3e637592b91301e28d8241c652e576f1fade9c34e0d2016865e2
 AUX totem-2.20.1-xpcom-hack.patch 414 RMD160 11f8440cd1798c161ef7070dda90fa8c7abf5ccd SHA1 ccfb2c9e4f422454f3ee0ec97850d8e9a272ed4f SHA256 0db11c34b49c80c13e8385fc207a5fcd66f25d17aea1edca65f67a96ee663e71
 AUX totem-2.26.1-smclient-target-detection.patch 1420 RMD160 4808f108ff486f5dc992ce3ea7aa1ac5d0e463da SHA1 d56ea9d8bbe96cd2edf0c68607732d4a8345c29e SHA256 5270fdce107cf60566bcd3a3eac49edeb85307503cc5228bad8ddbfbfcb695b3
 AUX totem-2.26.3-youtube-plugin-404-error.patch 1050 RMD160 4c570c8d9a8479cb483826cee7e638cb857d6004 SHA1 038aa80f3ab24130987e8d329dca931147e931c9 SHA256 c9e3e054c3e220281e457c39e1a5b0a4f352b4bd9baac557c5c5d5f5c4e3cb6a
+AUX totem-2.26.4-youtube-plug-play-vids.patch 888 RMD160 b4e28b2818aa588e257cf5b6ddfb4955e22fad69 SHA1 18148eaaef258e57d7327a538bb3320cf530b09a SHA256 c123f6d9693ad2ace3154771e2e935b361ed7d43b5139a9748754f0782a118b7
 DIST totem-2.20.3.tar.bz2 2194842 RMD160 4ccd9f7cca2a7380f2cc40bebf43ddf2c0678c6f SHA1 a3ae4b9f6cabf4e09b192840b92f02da42aea021 SHA256 9d51de9549c9913f91c34986f31edf55f7604e2f784e9ceea783f6102b140897
 DIST totem-2.24.4.tar.bz2 2603181 RMD160 42bfbace2d213c7c51adcc4d72852d7793928472 SHA1 0fadda7c9eb70f3407866b18f97a9757ed65c6a2 SHA256 31d30ec19c11a22c9ce4d9923388a9c750c6afd92158a0070856a8e88aabaaa3
 DIST totem-2.26.3.tar.bz2 3193956 RMD160 f265ec3997c130f28bf5e5455c0aef6921e71ece SHA1 ea6fa7244eb993a3038bc76f5e561c8a0661466c SHA256 ae1bd6682385ad401effda4a856f4ba8150b5ef4eab113a288b29e9335170d70
@@ -13,14 +11,8 @@ DIST totem-2.28.1.tar.bz2 3027102 RMD160 1270f7188d4307251a4178e0890cd0eb3017529
 EBUILD totem-2.20.3.ebuild 5032 RMD160 2b784ab3e1fe07fc5846e3f0e241c34a1de2a3d0 SHA1 df543761b7eb778820057231ed5adac85231fca3 SHA256 ff7ffe9233c8c168288118d3c55e520c0d6f955804a0a3c13ad292d580392320
 EBUILD totem-2.24.4-r1.ebuild 4146 RMD160 0bbec55a118f60f3a93ccbffbc488c500aa8de0c SHA1 a0142a4c7822b14dece5c7558acc37aafc995947 SHA256 aea75b6d792c5008f19e369e26532d5d04929c8917c1617ea0cf084584cbb255
 EBUILD totem-2.26.3-r1.ebuild 4611 RMD160 b83c9f4b79429e7acbaa0b0416536aba3009dc20 SHA1 cdcce5f987968d9ddea6a2f991c648bc0e8bd221 SHA256 f9ffbde122f59900e584bdba19429ca062eb0138d713a200d2f2c79652d41a21
+EBUILD totem-2.26.4-r1.ebuild 4559 RMD160 4ed6be30438c3c1e450ed57aa1da0a028c02c38c SHA1 db1edfe0e04b9b9057a940c00bba96dbe160b40f SHA256 1fa2e81b14ac9e8f404f8a2e503e6d0dfd480437e83ab4d352cd8c1058261c1f
 EBUILD totem-2.26.4.ebuild 4425 RMD160 d688dc204178f4f90bb849b12a952e80b3cafadf SHA1 bd1fc196affa885fbc45f09e91fb79fcc989cf0e SHA256 baadf63c0cebe53a78b845d7b3341637ebbd575d332dccbe9ce64b6487779cb3
 EBUILD totem-2.28.1.ebuild 4685 RMD160 95a2c837929c021abbfea581f2a75253465e5a93 SHA1 fa6b42a88c00668c179fcae176b837ac1f329dd5 SHA256 302aa2b41723f7ba97196bd19502cadc2a6a0f20146d595f4ae1515a0f050f0d
-MISC ChangeLog 36921 RMD160 9d78bad759242de3bdff344b729dcfb5d7f629e6 SHA1 3d5558ce44f9492fc192809ff44439652bd0c4dd SHA256 ad568e29e7e0c82f1318707cc850a6204b9a77a411a98489f71670b9250e0b56
+MISC ChangeLog 37187 RMD160 eb090ba833435c5f9b7376f421e7a85451e5b79c SHA1 8dfe5d6c092f996ab0c3a31043ca5c5f34ae3334 SHA256 6a090d061ec3bba6012249be041d24d3358d581925a6b7ad9220f27c6871fcd2
 MISC metadata.xml 1872 RMD160 0678604a8be6f8432186df7ce003b9e4be9e0fc4 SHA1 63b76103e6b7c2c5aec965a5610643f4a25df37e SHA256 31b4e571c11c47e62c7f7e66698ac12e79159d59bad01de42461cf308d31f833
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrzN8MACgkQkKaRLQcq0GI1oACdHDnkvzybaE37m3Et9AhSCIWe
-x2wAoJjbXsmkIrlU59td6V8aNpb0fzab
-=UFVl
------END PGP SIGNATURE-----
diff --git a/media-video/totem/files/totem-2.26.4-youtube-plug-play-vids.patch b/media-video/totem/files/totem-2.26.4-youtube-plug-play-vids.patch
new file mode 100644
index 000000000000..5b9aa3fe955c
--- /dev/null
+++ b/media-video/totem/files/totem-2.26.4-youtube-plug-play-vids.patch
@@ -0,0 +1,22 @@
+Date: Sat, 14 Nov 2009 18:15:55 +0100
+Subject: Fix a problem in the youtube plugin when we try to play a video (in the search panel or by giving it a url).
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=292839
+
+Mainly due to a malformed regexp.
+
+---
+ src/plugins/youtube/youtube.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+--- a/src/plugins/youtube/youtube.py
++++ b/src/plugins/youtube/youtube.py
+@@ -204,7 +204,7 @@ class YouTube (totem.Plugin):
+ 	def resolve_t_param (self, youtube_id):
+ 		"""We have to get the t parameter from the actual video page, since Google changed how their URLs work"""
+ 		stream = urllib.urlopen ("http://youtube.com/watch?v=" + urllib.quote (youtube_id))
+-		regexp1 = re.compile ("swfArgs.*\"t\": \"([^\"]+)\"")
++		regexp1 = re.compile ("'SWF_ARGS'.*\"t\": \"([^\"]+)\"")
+ 		regexp2 = re.compile ("</head>")
+ 
+ 		contents = stream.read ()
+
diff --git a/media-video/totem/totem-2.26.4-r1.ebuild b/media-video/totem/totem-2.26.4-r1.ebuild
new file mode 100644
index 000000000000..5763e3c3d414
--- /dev/null
+++ b/media-video/totem/totem-2.26.4-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.26.4-r1.ebuild,v 1.1 2009/11/14 17:31:37 mrpouet Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2 multilib python
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://gnome.org/projects/totem/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="bluetooth debug doc galago lirc nautilus nsplugin python tracker"
+
+# TODO:
+# easy-publish-and-consume is not in tree (epc)
+# Cone (VLC) plugin needs someone with the right setup (remi ?)
+# check gmyth requirement ? -> waiting for updates in tree
+# coherence plugin not enabled until we have deps in tree
+
+# youtube plugin depends on gst-plugins-soup
+RDEPEND=">=dev-libs/glib-2.15
+	>=x11-libs/gtk+-2.13.0
+	>=gnome-base/gconf-2.0
+	>=dev-libs/totem-pl-parser-2.23.91
+	>=x11-themes/gnome-icon-theme-2.16
+	x11-libs/cairo
+	app-text/iso-codes
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/dbus-glib-0.71
+	>=media-libs/gstreamer-0.10.16
+	>=media-libs/gst-plugins-good-0.10
+	>=media-libs/gst-plugins-base-0.10.12
+	>=media-plugins/gst-plugins-gconf-0.10
+
+	>=media-plugins/gst-plugins-gio-0.10
+	>=media-plugins/gst-plugins-pango-0.10
+	>=media-plugins/gst-plugins-x-0.10
+	>=media-plugins/gst-plugins-meta-0.10-r2
+
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXtst
+	>=x11-libs/libXrandr-1.1.1
+	>=x11-libs/libXxf86vm-1.0.1
+
+	bluetooth? ( || (
+		net-wireless/bluez
+		net-wireless/bluez-libs ) )
+	galago? ( >=dev-libs/libgalago-0.5.2 )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.10 )
+	python? (
+		dev-lang/python[threads]
+		>=dev-python/pygtk-2.12
+		dev-python/pyxdg
+		dev-python/gdata
+		dev-python/gst-python
+		dev-python/gconf-python
+		media-plugins/gst-plugins-soup )
+	tracker? ( >=app-misc/tracker-0.5.3 )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	app-text/scrollkeeper
+	gnome-base/gnome-common
+	app-text/gnome-doc-utils
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.20
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.11 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+# FIXME: tests broken with USE="-doc" upstream bug #577774
+RESTRICT="test"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--disable-static
+		--disable-vala
+		--with-dbus
+		--with-smclient
+		--enable-easy-codec-installation
+		$(use_enable nsplugin browser-plugins)"
+
+	# Plugin configuration
+	G2CONF="${G2CONF}
+		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
+		PLUGINDIR=/usr/$(get_libdir)/totem/plugins"
+
+	local plugins="properties,thumbnail,screensaver,ontop,gromit,media-player-keys,skipto,brasero-disc-recorder,screenshot"
+	use bluetooth && plugins="${plugins},bemused"
+	use galago && plugins="${plugins},galago"
+	use lirc && plugins="${plugins},lirc"
+	use python && plugins="${plugins},youtube,opensubtitles,jamendo,pythonconsole"
+	use tracker && plugins="${plugins},tracker"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable nautilus)
+		$(use_enable python)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix broken smclient option passing
+	epatch "${FILESDIR}/${PN}-2.26.1-smclient-target-detection.patch"
+	# YouTube plugin broken, when we try to load some videos, bug #292839
+	epatch "${FILESDIR}/${P}-youtube-plug-play-vids.patch"
+
+	# FIXME: tarball generated with broken gtk-doc, revisit me.
+	if use doc; then
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
+			-i gtk-doc.make || die "sed 1 failed"
+	else
+		sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \
+			-i gtk-doc.make || die "sed 2 failed"
+	fi
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+src_configure() {
+	# FIXME: why does it need write access here, probably need to set up a fake
+	# home in /var/tmp like other pkgs do
+
+	addpredict "$(unset HOME; echo ~)/.gconf"
+	addpredict "$(unset HOME; echo ~)/.gconfd"
+	addpredict "$(unset HOME; echo ~)/.gnome2"
+
+	gnome2_src_configure
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize /usr/$(get_libdir)/totem/plugins
+	fi
+
+	ewarn
+	ewarn "If totem doesn't play some video format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+}