Fix playing of apple trailers using the firefox plugin, bug 292852

Package-Manager: portage-2.1.7.16/cvs/Linux i686

4 files changed, 266 insertions, 2 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 5d85dff90d80..a3fe2822acd8 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,13 @@
 # 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.268 2009/12/23 10:21:59 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.269 2009/12/30 01:25:30 nirbheek Exp $
+
+*totem-2.26.5-r1 (30 Dec 2009)
+
+  30 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +totem-2.26.5-r1.ebuild,
+  +files/totem-2.26.5-firefox-plugin-apple-trailers.patch:
+  Fix playing of apple trailers using the firefox plugin, bug 292852
 
 *totem-2.28.5 (23 Dec 2009)
 
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 7deb7ec4ec04..192ce1c3e3d2 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -3,6 +3,7 @@ AUX totem-2.20.1-xpcom-hack.patch 414 RMD160 11f8440cd1798c161ef7070dda90fa8c7ab
 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
+AUX totem-2.26.5-firefox-plugin-apple-trailers.patch 2690 RMD160 647f88df1373c20b1034caa746b456f910afd34f SHA1 a925115dcc1c33b397c0cb2ea561c5a48f402471 SHA256 e89197f6c20c6a525f3c60ade071b918efeaba4fb9178f859a733a72e8bd6e85
 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
@@ -16,10 +17,11 @@ EBUILD totem-2.20.3.ebuild 5032 RMD160 2b784ab3e1fe07fc5846e3f0e241c34a1de2a3d0
 EBUILD totem-2.24.4-r1.ebuild 4146 RMD160 0bbec55a118f60f3a93ccbffbc488c500aa8de0c SHA1 a0142a4c7822b14dece5c7558acc37aafc995947 SHA256 aea75b6d792c5008f19e369e26532d5d04929c8917c1617ea0cf084584cbb255
 EBUILD totem-2.26.3-r1.ebuild 4607 RMD160 e00455982cd7176e812befbe5fbc11108afbd5a4 SHA1 342c47f3f2bf7f44fad724a39ed90efb6181400e SHA256 61290a93c0f13ecb6a1f055a6e646608ea3e9f121142ca92d66e5d58255cae75
 EBUILD totem-2.26.4-r1.ebuild 4559 RMD160 4ed6be30438c3c1e450ed57aa1da0a028c02c38c SHA1 db1edfe0e04b9b9057a940c00bba96dbe160b40f SHA256 1fa2e81b14ac9e8f404f8a2e503e6d0dfd480437e83ab4d352cd8c1058261c1f
+EBUILD totem-2.26.5-r1.ebuild 4699 RMD160 d76d7981344f8317c32d00455dbcbd73ed67c9e0 SHA1 d3bc7fc758dfa145a58a80289ce3667c49d3e636 SHA256 01c856b1d6d8db5866e187c6654e1ec54410efa73f29c55c6c2c5ceaa7e20651
 EBUILD totem-2.26.5.ebuild 4565 RMD160 5399b8b30ac07e941a22d90efc973d8fbe91ef42 SHA1 0e6e4209fd20b0cd3cbf375589ec2facf63edcb6 SHA256 26edef62efc7d10bd14d2edd3f6b88006bccc8328c7aa60bc57d5156233e264c
 EBUILD totem-2.28.1.ebuild 4685 RMD160 95a2c837929c021abbfea581f2a75253465e5a93 SHA1 fa6b42a88c00668c179fcae176b837ac1f329dd5 SHA256 302aa2b41723f7ba97196bd19502cadc2a6a0f20146d595f4ae1515a0f050f0d
 EBUILD totem-2.28.3.ebuild 4689 RMD160 2c85c646ffbc6c6bc126f0e34725b79167f33c10 SHA1 f246065143919b6574b8bd6c5f0985e06e242acd SHA256 f2a6451bf9893160b1c509565ac8d19b3d768bf3ddd637faa9f990e111619448
 EBUILD totem-2.28.4.ebuild 4689 RMD160 622f41a4eb946c4f22dbfc8f4474dd9471fd66ee SHA1 f9b4ae6b4e1a9640fe7ba244f8ee4a054047f42f SHA256 1d6249fea61dbc0b9364ab7a36e0e15965528f873622b6e4574644751f3cca62
 EBUILD totem-2.28.5.ebuild 4689 RMD160 7f901a7dba891c92e7e176a0d80e97e804e3c2b6 SHA1 b3911abf37237d16d95e5d9971d7c50a57a50705 SHA256 01aca97df144f899fc3b9c2de82df51de261c62ed82f93c69b35b7b82faaccdd
-MISC ChangeLog 37995 RMD160 51cbd021cec7628b2719dab344ed96b4770d75d2 SHA1 51d3c72c1a5a8633a0aa3ae25071a30a124969f7 SHA256 ae63614d556d4830e24e88df7cd4e4f8404a12620fb20d3a0ebda1cdfe86d303
+MISC ChangeLog 38238 RMD160 e6b99365c1e7d024ce3b353e8662c0206421639c SHA1 382b2ef8ec5efbb310e68f422887ee8f6eccef52 SHA256 79b8eaa999160aa9366767554942f45dd89362498ecabd388cb8bc5520d0b65f
 MISC metadata.xml 1872 RMD160 0678604a8be6f8432186df7ce003b9e4be9e0fc4 SHA1 63b76103e6b7c2c5aec965a5610643f4a25df37e SHA256 31b4e571c11c47e62c7f7e66698ac12e79159d59bad01de42461cf308d31f833
diff --git a/media-video/totem/files/totem-2.26.5-firefox-plugin-apple-trailers.patch b/media-video/totem/files/totem-2.26.5-firefox-plugin-apple-trailers.patch
new file mode 100644
index 000000000000..b9d129c02a46
--- /dev/null
+++ b/media-video/totem/files/totem-2.26.5-firefox-plugin-apple-trailers.patch
@@ -0,0 +1,86 @@
+Fixes playing of apple trailers using the firefox plugin by changing the UA
+
+Patch backported by Ryan May
+
+http://bugs.gentoo.org/show_bug.cgi?id=292852
+
+---
+--- browser-plugin/totemPlugin.cpp
++++ browser-plugin/totemPlugin.cpp
+@@ -156,6 +156,15 @@
+   "The <a href=\"http://www.gnome.org/projects/totem/\">Totem</a> " PACKAGE_VERSION " plugin handles video and audio streams.";
+ #endif
+ 
++static const char kPluginUserAgent[] =
++#if defined(TOTEM_NARROWSPACE_PLUGIN)
++  "Quicktime/"TOTEM_NARROWSPACE_VERSION;
++#elif defined(TOTEM_GMP_PLUGIN)
++  "Windows-Media-Player/10.00.00.4019";
++#else
++  "";
++#endif
++
+ #if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H)
+ nsTArray<totemPlugin*> *totemPlugin::sPlugins;
+ 
+@@ -463,10 +472,13 @@
+ 		return NPERR_NO_ERROR;
+ #endif /* TOTEM_COMPLEX_PLUGIN */
+ 
+-	const char *userAgent = NPN_UserAgent (mNPP);
+-	if (!userAgent) {
+-		/* See https://bugzilla.mozilla.org/show_bug.cgi?id=328778 */
+-		D ("User agent has more than 127 characters; fix your browser!");
++	const char *userAgent = kPluginUserAgent;
++	if (*kPluginUserAgent == '\0') {
++		userAgent = NPN_UserAgent (mNPP);
++		if (!userAgent) {
++			/* See https://bugzilla.mozilla.org/show_bug.cgi?id=328778 */
++			D ("User agent has more than 127 characters; fix your browser!");
++		}
+ 	}
+ 
+         GPtrArray *arr = g_ptr_array_new ();
+--- browser-plugin/totem-plugin-viewer.c
++++ browser-plugin/totem-plugin-viewer.c
+@@ -2336,7 +2336,7 @@
+ 	/* FIXME: this won't work with gvfs:
+ 	 * http://bugzilla.gnome.org/show_bug.cgi?id=534482 */
+ 	if (arg_user_agent != NULL) {
+-		g_setenv ("GNOME_VFS_HTTP_USER_AGENT", arg_user_agent, TRUE);
++		g_setenv ("BACON_VIDEO_WIDGET_HTTP_USER_AGENT", arg_user_agent, TRUE);
+ 		g_free (arg_user_agent);
+ 		arg_user_agent = NULL;
+ 	}
+--- src/backend/bacon-video-widget-gst-0.10.c
++++ src/backend/bacon-video-widget-gst-0.10.c
+@@ -1686,6 +1686,21 @@
+ }
+ 
+ static void
++bvw_set_user_agent_on_element (BaconVideoWidget * bvw, GstElement * element)
++{
++  const char *ua;
++
++  ua = g_getenv ("BACON_VIDEO_WIDGET_HTTP_USER_AGENT");
++  if (ua == NULL)
++    return;
++
++  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "user-agent")) {
++    GST_DEBUG ("Setting HTTP user-agent to '%s'", ua);
++    g_object_set (element, "user-agent", ua, NULL);
++  }
++}
++
++static void
+ playbin_source_notify_cb (GObject *play, GParamSpec *p, BaconVideoWidget *bvw)
+ {
+   GObject *source = NULL;
+@@ -1709,6 +1724,7 @@
+   if (source) {
+     GST_DEBUG ("Got source of type %s", G_OBJECT_TYPE_NAME (source));
+     bvw_set_device_on_element (bvw, GST_ELEMENT (source));
++    bvw_set_user_agent_on_element (bvw, GST_ELEMENT (source));
+     g_object_unref (source);
+   }
+ }
diff --git a/media-video/totem/totem-2.26.5-r1.ebuild b/media-video/totem/totem-2.26.5-r1.ebuild
new file mode 100644
index 000000000000..c9abcc0dbb89
--- /dev/null
+++ b/media-video/totem/totem-2.26.5-r1.ebuild
@@ -0,0 +1,169 @@
+# 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.5-r1.ebuild,v 1.1 2009/12/30 01:25:30 nirbheek 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}/${PN}-2.26.4-youtube-plug-play-vids.patch"
+
+	# Fix playing of Apple trailers using firefox plugin, bug 292852
+	epatch "${FILESDIR}/${P}-firefox-plugin-apple-trailers.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
+}