Version bump and fix bug #324237

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 300 insertions, 2 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index ddc8f173e27b..8c23ec82cc99 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.290 2010/07/06 14:12:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.291 2010/07/08 18:36:39 pacho Exp $
+
+*totem-2.30.2 (08 Jul 2010)
+
+  08 Jul 2010; Pacho Ramos <pacho@gentoo.org> +totem-2.30.2.ebuild,
+  +files/totem-2.30.2-init-gtype.patch,
+  +files/totem-2.30.2-mp2t-support.patch,
+  +files/totem-2.30.2-webm-support.patch:
+  Version bump with lots of fixes, also include upstream patch to solve
+  crash reported in bug #324237 (by Martin von Gagern).
 
   06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> totem-2.28.6.ebuild:
   Keyword ~ppc64 wrt #313563
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 348904e8e228..b3aa3a203f6b 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -6,16 +9,28 @@ AUX totem-2.30.1-fix-constant-buffering.patch 3505 RMD160 18fb37136caba330089fa9
 AUX totem-2.30.1-fix-gmp-plugin.patch 2659 RMD160 98ea3e484960fb15edc2df76842427bfd70d0a5b SHA1 d4d69b338aa476cc77ec802530376b42ca9ef3f9 SHA256 21dde71ce2807841f369d600f5d0e1369af9ad580e9396c66d4d0fd3d922ccd0
 AUX totem-2.30.1-fix-pygtk-include.patch 1426 RMD160 e4a186bafe7b00340f82937c145e6412021e485e SHA1 10464e94e1b77c2489d6ff5a667f80cdf6dc1d4b SHA256 b72260c8993860d6639e5524445b653b41bc4b756378b66a06e343c65f700345
 AUX totem-2.30.1-fix-qt-eos.patch 1199 RMD160 1d4e0d09ea5581a2c0670eca85a2b7a8e10743b3 SHA1 a0d7fcd8fbed625b31458b65cc63710dbe810ed0 SHA256 eb5bf9646e12b980e2fc0ab44338cddf1bd7be6058c4afe6d2413907f708de1a
+AUX totem-2.30.2-init-gtype.patch 1151 RMD160 28bd7af45d8c60116376f033826cc210749be37b SHA1 7a673ff6ea08c12c5feb732c6689a24943c19223 SHA256 dc4b416de302517259806906ae232540b1d70ebe425876b7fe8c531f4a2a5da3
+AUX totem-2.30.2-mp2t-support.patch 522 RMD160 098ad431572647b1f84fa53d79e599dd68db479f SHA1 c1f437b3dd864589b2a8d45aa5b58087ad164edb SHA256 fd75446210f92e4abfb0d80018f1e5aad7fc0d4ad586c222b9984e0207dde963
+AUX totem-2.30.2-webm-support.patch 1066 RMD160 8d93785ff22c688ec8698f32f6a0d6f5ad5c33b7 SHA1 2c5610c985d1b763eef1509fb32cad5d2b9a7c1e SHA256 d2de14ada3573eb055c9987676e60d83365b43d114fb7ace84443c5da473cceb
 DIST totem-2.26.3.tar.bz2 3193956 RMD160 f265ec3997c130f28bf5e5455c0aef6921e71ece SHA1 ea6fa7244eb993a3038bc76f5e561c8a0661466c SHA256 ae1bd6682385ad401effda4a856f4ba8150b5ef4eab113a288b29e9335170d70
 DIST totem-2.26.5.tar.bz2 3198042 RMD160 174e91dad2f51c908e4b777e93003c6888fd2829 SHA1 34c4a701f1cee440b397ead761de56e08ce97da1 SHA256 33c69497eff649d86b0a710aee7a3b3cbc7cb79c55267bac88a591d62a6ffb3c
 DIST totem-2.28.5-patches.tar.bz2 11640 RMD160 aad39ff2ae08afef567150c9f1500083de9972c6 SHA1 e59c0f614a24741e7b0095cee7a5e5563b4db3c4 SHA256 e2fb840164b2be1bbcf18d97e52e5606cf280306373305b58d128e899367eaf0
 DIST totem-2.28.5.tar.bz2 3083946 RMD160 20fa09187a82380d7b7d19c2fb5e8a5a4475307e SHA1 1653528d66a1f11da4bc8f66746828c4a31343d6 SHA256 c788bb314addbeeb2b27a2af0f7448752db22dcfaf8b0a4e704463ba9a9dc063
 DIST totem-2.28.6.tar.bz2 3086945 RMD160 cae977bf11f512855ab4abbeb055edc149035eb9 SHA1 94037b3b55c241ae7471a746ed9713f714211088 SHA256 224608c9340f7b3839641327feaa41c4941970f085d5cbec5020d968555d06cb
 DIST totem-2.30.0.tar.bz2 3212210 RMD160 4444cbd39ba448a392c089c36d47d865410e5206 SHA1 d8456c879e5858464cf81a5ac973e44c19ade863 SHA256 9d8edd266bd2546e4c8034de1196b79855e24a3634d05cc4f8a07fd3edc7b1af
+DIST totem-2.30.2.tar.bz2 3223073 RMD160 78ab8d58eb8e0349190042c34434c3ce8ac8f3e0 SHA1 78b59e0e61a620718b2e87c82046ea1f1fe4607d SHA256 c50da5479c57b2791c3c1bfc05f815d5ee06082fcd1bacc49f4d88c11ed02b6d
 EBUILD totem-2.26.3-r1.ebuild 4526 RMD160 adc07f7fb932fdb1c6e1d9c46ad145c2004c8fe0 SHA1 b9b3bda2050aa01d4a8abfcfc4b95f6c9ca467c6 SHA256 c52ab14961cf2a49d3cae179f539cf176c4038534ceab4ee0c329e438cde64c1
 EBUILD totem-2.26.5-r1.ebuild 4659 RMD160 87790d120a5f81a24a34c8e6f80cc4f2d6e6a380 SHA1 0dca91ebc9ad6468226becfe761714ead196f3b4 SHA256 5d8ac56ae2f28bdce99d265eb811f0ff8ffa203d48ade009ece961552775b4a0
 EBUILD totem-2.28.5-r3.ebuild 4856 RMD160 2908f0ee033f190db6668b9b2ce433090b4adf98 SHA1 2a27a4b6c440afd92637c3b5566bb4ae9ab869cd SHA256 84f1ac6a9d42f8cf1caa8598ce0a71fdf1fa6f004ba1285f747e6cf6947b6c50
 EBUILD totem-2.28.6.ebuild 4885 RMD160 aaf94cf0eac79dcac247fb2ffa0ac236d08b634b SHA1 2fb9e941511dfa14f991e2419220c81aff76c1bc SHA256 5b5fdf573c5579fc769301c0af28ee06716bd09272884cf566697116780b4d71
 EBUILD totem-2.30.0-r1.ebuild 5100 RMD160 86e58f97874ad765347c8fba4899f9e3d31979d0 SHA1 a2186de453e8046beb5622b5903db5d8855f5a28 SHA256 5f87095b30e1b7940692a456c0a993f994bf2058ad65cfc2db8fc25133c56c4b
-MISC ChangeLog 41971 RMD160 b565028ed7b1de1645d5ade21c0ac490bdd3c9e3 SHA1 acfa7cc7b3cae22f9059dba6b31d231e157218c5 SHA256 5a4bb1b80b7aac7f2cf7795a9e5274c639e18399f230804e8a5ab7aac1d3bd41
+EBUILD totem-2.30.2.ebuild 5145 RMD160 1d8dafe4417652ffc803af2525d67819c38e069f SHA1 11ec7f301a26f9085745fa77522b02a2d41b1568 SHA256 f259ee5de149c99eefe0bf7db89efdb6e76876a6b12669d1684491e6f999ac99
+MISC ChangeLog 42317 RMD160 0d15221e085aa589ef83288601e09af6a0c11383 SHA1 377ff9c4b0dd0b13f221a1e9da7da5ed854b48a0 SHA256 29c03fe1a56cdc792e06c7eae752ab69d15b13aa7b496c4aedd38ada4a195e57
 MISC metadata.xml 1476 RMD160 fbee6439fe2b0f2af87ab4c727213c7c24a768a5 SHA1 941eb1253660067ddd9d5bd3d2282f131d652a48 SHA256 46516740003dded53eb5a259a4068cb7e50044f2727c42a5a9f22bc0f6f6b1f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEUEARECAAYFAkw2Gr8ACgkQCaWpQKGI+9SmRgCaA4/NcZWPRerVnzzx0HQYx+Fw
+HXAAmIx3MJ8hPh/vI9zDDOy8QeBqp5s=
+=Ilsp
+-----END PGP SIGNATURE-----
diff --git a/media-video/totem/files/totem-2.30.2-init-gtype.patch b/media-video/totem/files/totem-2.30.2-init-gtype.patch
new file mode 100644
index 000000000000..18e73dc2465c
--- /dev/null
+++ b/media-video/totem/files/totem-2.30.2-init-gtype.patch
@@ -0,0 +1,38 @@
+From dc894da891c37c30b0acb648da9d49e2bc9c6d61 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 16 Jun 2010 13:49:14 +0000
+Subject: Initialise the GType system when called into
+
+Add calls to g_type_init() in the plugin entry points so that
+GThread is initialised if not already, so that GIO calls work
+as expected.
+
+Note that this requires GLib 2.24 to work properly, so only
+done in master (gnome-2-30 depends on GLib 2.22)
+
+https://bugzilla.gnome.org/show_bug.cgi?id=621771
+---
+diff --git a/browser-plugin/totemPluginGlue.cpp b/browser-plugin/totemPluginGlue.cpp
+index fc5afc1..f14b913 100644
+--- a/browser-plugin/totemPluginGlue.cpp
++++ b/browser-plugin/totemPluginGlue.cpp
+@@ -315,6 +315,8 @@ NP_GetMIMEDescription (void)
+ 	if (mime_list != NULL)
+ 		return mime_list;
+ 
++	g_type_init ();
++
+ 	list = g_string_new (NULL);
+ 
+ 	/* Load the configuration files for the enabled plugins */
+@@ -396,6 +398,8 @@ NP_Initialize (NPNetscapeFuncs *aMozillaVTable,
+ {
+ 	g_debug ("NP_Initialize");
+ 
++	g_type_init ();
++
+ 	if (aMozillaVTable == NULL || aPluginVTable == NULL)
+ 		return NPERR_INVALID_FUNCTABLE_ERROR;
+ 
+--
+cgit v0.8.3.1
diff --git a/media-video/totem/files/totem-2.30.2-mp2t-support.patch b/media-video/totem/files/totem-2.30.2-mp2t-support.patch
new file mode 100644
index 000000000000..80724429d327
--- /dev/null
+++ b/media-video/totem/files/totem-2.30.2-mp2t-support.patch
@@ -0,0 +1,21 @@
+From 046920a4b1a1e4b085e1faded57d47e45492d368 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sat, 22 May 2010 11:54:18 +0000
+Subject: Add support for video/mp2t
+
+https://bugzilla.gnome.org/show_bug.cgi?id=614422
+---
+diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt
+index a6eab04..8cf04e9 100644
+--- a/data/mime-type-list.txt
++++ b/data/mime-type-list.txt
+@@ -72,6 +72,7 @@ video/3gpp
+ video/dv
+ video/fli
+ video/flv
++video/mp2t
+ video/mp4
+ video/mp4v-es
+ video/mpeg
+--
+cgit v0.8.3.1
diff --git a/media-video/totem/files/totem-2.30.2-webm-support.patch b/media-video/totem/files/totem-2.30.2-webm-support.patch
new file mode 100644
index 000000000000..e82a02116680
--- /dev/null
+++ b/media-video/totem/files/totem-2.30.2-webm-support.patch
@@ -0,0 +1,32 @@
+From 2285e792f616f3be400f7eaab51d3a528afe8e68 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 20 May 2010 15:57:42 +0000
+Subject: Add WebM support to Totem and browser plugin
+
+---
+diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
+index 5382bb2..1c420f3 100644
+--- a/browser-plugin/totemPlugin.cpp
++++ b/browser-plugin/totemPlugin.cpp
+@@ -126,6 +126,7 @@ static const totemPluginMimeEntry kMimeTypes[] = {
+   { "audio/mpeg", "mp3", NULL },
+   { "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" },
+   { "video/flv", "flv", "application/x-flash-video" },
++  { "video/webm", "webm", NULL },
+   { "application/x-totem-plugin", "", "Totem Multimedia plugin" },
+   { "audio/midi", "mid, midi", NULL },
+ #else
+diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt
+index 303bb23..a6eab04 100644
+--- a/data/mime-type-list.txt
++++ b/data/mime-type-list.txt
+@@ -82,6 +82,7 @@ video/vivo
+ video/vnd.divx
+ video/vnd.rn-realvideo
+ video/vnd.vivo
++video/webm
+ video/x-anim
+ video/x-avi
+ video/x-flc
+--
+cgit v0.8.3.1
diff --git a/media-video/totem/totem-2.30.2.ebuild b/media-video/totem/totem-2.30.2.ebuild
new file mode 100644
index 000000000000..188a53a5b90a
--- /dev/null
+++ b/media-video/totem/totem-2.30.2.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.2.ebuild,v 1.1 2010/07/08 18:36:39 pacho 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"
+
+# FIXME: Enable for now python USE flag per bug #316409
+# this change should only be noticed by people not following current
+# current linux profiles default
+IUSE="bluetooth debug doc galago iplayer lirc nautilus nsplugin +python tracker +youtube" #zeroconf
+
+# TODO:
+# 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
+# vala ( dev-lang/vala ) requires 0.7.5
+RDEPEND=">=dev-libs/glib-2.24
+	>=x11-libs/gtk+-2.19.5
+	>=gnome-base/gconf-2.0
+	>=dev-libs/totem-pl-parser-2.29.1
+	>=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.28.1
+	>=media-libs/gst-plugins-good-0.10
+	>=media-libs/gst-plugins-base-0.10.26
+	>=media-plugins/gst-plugins-gconf-0.10
+
+	>=media-plugins/gst-plugins-taglib-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
+
+	dev-libs/libunique
+	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 )
+	galago? ( >=dev-libs/libgalago-0.5.2 )
+	iplayer? (
+		dev-python/pygobject
+		dev-python/pygtk
+		dev-python/httplib2
+		dev-python/feedparser
+		dev-python/beautifulsoup )
+	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/gst-python
+		dev-python/dbus-python
+		dev-python/gconf-python )
+	tracker? ( >=app-misc/tracker-0.7.1 )
+	youtube? (
+		>=dev-libs/libgdata-0.4.0
+		media-plugins/gst-plugins-soup )"
+# FIXME: freezes totem
+#	zeroconf? ( >=net-libs/libepc-0.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 )
+	app-text/docbook-xml-dtd:4.5"
+# docbook-xml-dtd is needed for user doc
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+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 iplayer && plugins="${plugins},iplayer"
+	use lirc && plugins="${plugins},lirc"
+	use python && plugins="${plugins},opensubtitles,jamendo,pythonconsole,dbus-service"
+	use tracker && plugins="${plugins},tracker"
+	use youtube && plugins="${plugins},youtube"
+	#use zeroconf && plugins="${plugins},publish"
+
+	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"
+
+	# Add WebM support to Totem and browser plugin
+	epatch "${FILESDIR}/${P}-webm-support.patch"
+
+	# Add support for video/mp2t
+	epatch "${FILESDIR}/${P}-mp2t-support.patch"
+
+	# Initialise the GType system when called into (bug #324237)
+	epatch "${FILESDIR}/${P}-init-gtype.patch"
+
+	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
+}
+
+src_install() {
+	gnome2_src_install
+	# Installed for plugins, but they're dlopen()-ed
+	# firefox, totem as well as nautilus
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+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
+}