Version bump for gnome-3.4. Adds support for rtmp, removes separate youtube plugin (now handled by USE=grilo), adds an optional browser plugin for playing flash videos (warning: can break non-video flash objects).

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 214 insertions, 3 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 748ee0a907c9..bead3f47f610 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.337 2012/05/05 08:58:51 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.338 2012/05/19 23:59:30 tetromino Exp $
+
+*totem-3.4.2 (19 May 2012)
+
+  19 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +totem-3.4.2.ebuild,
+  metadata.xml:
+  Version bump for gnome-3.4. Adds support for rtmp, removes separate youtube
+  plugin (now handled by USE=grilo), adds an optional browser plugin for
+  playing flash videos (warning: can break non-video flash objects).
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> totem-2.32.0-r2.ebuild,
   totem-3.2.2.ebuild:
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 36177ede930b..4428f4a3f694 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,9 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX totem-2.30.2-mp2t-support.patch 522 RMD160 098ad431572647b1f84fa53d79e599dd68db479f SHA1 c1f437b3dd864589b2a8d45aa5b58087ad164edb SHA256 fd75446210f92e4abfb0d80018f1e5aad7fc0d4ad586c222b9984e0207dde963
 AUX totem-2.32.0-smclient-target-detection.patch 1546 RMD160 d26dad41d63e3ce2c819fa0be5844b2797d7fdbd SHA1 103b3182229b54e5b11ab6e941af110ee2761483 SHA256 c2c454e1a1776cc7c07ba4ee069105f6010e92478e9598af23956fac0fb13e63
 DIST totem-2.32.0-patches.tar.bz2 13355 RMD160 9974653c46247d37d14f441c8d6f458e2e8fbd2f SHA1 1c575377a610ca672b670107c822970f90edc356 SHA256 fdf1d04e5c2325ba5b982a4fb59b9c70bbdf018418dfc7d0fa8bd28929335a30
 DIST totem-2.32.0.tar.bz2 3278758 RMD160 5312aa67e3ff611be0626fd72da66e1c26d6eb4d SHA1 46589181aee29e021d686a4804bbbb04149a61dc SHA256 982d6aaeca3e4844694fc0a2540d792bea753e24b55cf33203188b32b5914f47
 DIST totem-3.2.2.tar.xz 3141664 RMD160 5cfa585879a9a7ed8790473a77269f4b85b035fd SHA1 65d1b267f1521432e6a7a7ba21ed186a8951b52a SHA256 b065e486e6b70b27d3a589e70c5459ff16a7affeff0b219ead5942585d4d0c9a
+DIST totem-3.4.2.tar.xz 3162288 RMD160 c7056b30d5a54ce88cea8435748009c5b93a2005 SHA1 78b34aaca343c2fc2986a29676aead27e7d3b066 SHA256 e1532b471a14612b5f44d29b8392716c1123f4d874cd9d01e06a11f32637341e
 EBUILD totem-2.32.0-r2.ebuild 5825 RMD160 68eae16ebe06ca18367e3256204db9c17e561d9d SHA1 3e6be4908200075e8a00429f10da1e09054cab03 SHA256 7a1ff47ebc7e9304f9ac695983e8e2bead2f664889655ab0b48b120d8b9cfe67
 EBUILD totem-3.2.2.ebuild 5254 RMD160 f4a6a5b981c0487ec0c3708e6ca4dd7c263f7f97 SHA1 6e70f518215d83c2a9b668e7a263f6ef239aaf06 SHA256 5003f8fb91af1e224c454bb12fcc5451a37217a61ba4c8731ee5bc72bc696e9a
-MISC ChangeLog 50258 RMD160 b181b500a061505844889911fafa80afbfa6b435 SHA1 bf43798d7b40f9949e3f2bbc78067f19744b560f SHA256 58af0d8ed22e894fa84d49f1151a2288fcafededcdda572744c31f8c62e6b37b
-MISC metadata.xml 1648 RMD160 ec963093a75f10f0c26251565f2753a2155dce49 SHA1 bce07e78b43a5914de440001b675e44aa92ef1c8 SHA256 776c6417ddc40ab9ed524f88130e5d61ce022afa901dc71705ca3a797ca9938f
+EBUILD totem-3.4.2.ebuild 5341 RMD160 9dcc6350005cf7f7cd7556bb94d3fb6012b10aed SHA1 74f70f0539c0046f72096285c3ac5ddcec48333f SHA256 fade88ac0403d48407be4ea1f40bf5a47a946f01243f0ff78435c76c90bfafef
+MISC ChangeLog 50606 RMD160 aac4034cb82b084bd2cbcfce3b4020178a0097e0 SHA1 3b6f1a41ee3688fee433de7fb8ca02c91f718f5c SHA256 31b3ecc872bdee6a92f6633c8cd5c52897800f275c03133b60bd09fa0aa1b610
+MISC metadata.xml 1800 RMD160 7c38736e8dbf167fca9ed96e0703d2f43b23408f SHA1 7d966622cdbe683f60f61e5f4e5bc5230174a53d SHA256 d5478ecc6ef045dcdaeab363be952807d8f2a6eab87abc7ca11c26063b8a6a4d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPuDPoAAoJEJ0WA1zPCt1hauUIALmffXjvH1b1dLMTDxEi+QKg
+PeUo6NCZw8YolseDExJOcBi0bwkkfTSfalGtmLZbTo1f0sIe5qLbn+rDYetXtmCn
+zu1kgAnp6ewbS8V6QvAZQX37nzDe3bAQGyH8X8Mh0/FDmktX3nC1uxM2IGsZw8Z8
+O7/yA1BskLZW3aJT9sUhAdCS4wzamF1dQLFN3I6TGUhjgLnMiY2j/LxoHy7hWHzK
+zlh3Y30VrbgIrfPH3iGbDsA2AEu1QPl17tPcrz53LYk11/D6MZRpB0pltLpoyEk6
+boVSKrzRWOnV+JdYc9NhI/ECK4K+m3S4TDhM2XKXwkiOCWOEjhhT61NnyTBBSfE=
+=QGIL
+-----END PGP SIGNATURE-----
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index 9d4f5675c900..b33af20d95b5 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -10,6 +10,8 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
 	<use>
 		<flag name="bluetooth">Enable support for user-presence detection via the
 		user's bluetooth handset using <pkg>net-wireless/bluez</pkg></flag>
+		<flag name="flash">Install browser plugin for playing embedded Adobe Flash
+		videos. Warning: breaks non-video Flash objects on many websites.</flag>
 		<flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
 		from various sources</flag>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
diff --git a/media-video/totem/totem-3.4.2.ebuild b/media-video/totem/totem-3.4.2.ebuild
new file mode 100644
index 000000000000..698487826a03
--- /dev/null
+++ b/media-video/totem/totem-3.4.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.4.2.ebuild,v 1.1 2012/05/19 23:59:31 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+WANT_AUTOMAKE="1.11"
+PYTHON_DEPEND="python? 2:2.5"
+PYTHON_USE_WITH="threads"
+PYTHON_USE_WITH_OPT="python"
+
+inherit gnome2 multilib python
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="http://projects.gnome.org/totem/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+# TODO:
+# Cone (VLC) plugin needs someone with the right setup (remi ?)
+# coherence plugin broken upstream
+#
+# FIXME: Automagic tracker-0.9.0
+# Runtime dependency on gnome-session-2.91
+RDEPEND=">=dev-libs/glib-2.27.92:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.3.6:3[introspection?]
+	>=dev-libs/totem-pl-parser-2.32.4[introspection?]
+	>=dev-libs/libpeas-1.1.0[gtk]
+	>=x11-themes/gnome-icon-theme-2.16
+	x11-libs/cairo
+	>=dev-libs/libxml2-2.6:2
+	>=media-libs/clutter-1.6.8:1.0
+	>=media-libs/clutter-gst-1.3.9:1.0
+	>=media-libs/clutter-gtk-1.0.2:1.0
+	>=media-libs/gstreamer-0.10.30:0.10
+	>=media-libs/gst-plugins-base-0.10.30:0.10
+	x11-libs/mx:1.0
+
+	media-libs/gst-plugins-good: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
+
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXtst
+	>=x11-libs/libXxf86vm-1.0.1
+	x11-themes/gnome-icon-theme-symbolic
+
+	flash? ( dev-libs/totem-pl-parser[quvi] )
+	grilo? ( >=media-libs/grilo-0.1.16 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	nsplugin? (
+		>=dev-libs/dbus-glib-0.82
+		>=x11-misc/shared-mime-info-0.22 )
+	python? (
+		>=dev-libs/gobject-introspection-0.6.7
+		>=dev-python/pygobject-2.90.3:3
+		>=x11-libs/gtk+-2.91.7:3[introspection]
+		dev-python/pyxdg
+		dev-python/gst-python:0.10
+		dev-python/dbus-python
+		iplayer? (
+			dev-python/httplib2
+			dev-python/feedparser
+			dev-python/beautifulsoup ) )
+	vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
+	zeitgeist? ( dev-libs/libzeitgeist )
+	zeroconf? ( >net-libs/libepc-0.4.0 )"
+# XXX: zeroconf requires unreleased version of libepc
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/gnome-doc-utils-0.20.3
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	x11-proto/xextproto
+	x11-proto/xproto
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.14 )
+	test? ( python? ( dev-python/pylint ) )"
+# docbook-xml-dtd is needed for user doc
+
+# see bug #359379
+REQUIRED_USE="flash? ( nsplugin )
+	python? ( introspection )
+	zeitgeist? ( introspection vala )"
+
+# XXX: pylint checks fail because of bad code
+RESTRICT="test"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
+	G2CONF="${G2CONF}
+		--disable-run-in-source-tree
+		--disable-schemas-compile
+		--disable-scrollkeeper
+		--disable-static
+		--with-smclient=auto
+		--enable-easy-codec-installation
+		$(use_enable flash vegas-plugin)
+		$(use_enable introspection)
+		$(use_enable nautilus)
+		$(use_enable nsplugin browser-plugins)
+		$(use_enable python)
+		$(use_enable python introspection)
+		$(use_enable vala)
+		VALAC=$(type -P valac-0.14)
+		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+
+	if ! use test; then
+		# pylint is checked unconditionally, but is only used for make check
+		G2CONF="${G2CONF} PYLINT=$(type -P true)"
+	fi
+	#--with-smclient=auto needed to correctly link to libICE and libSM
+
+	# Disabled: sample-python, sample-vala, zeitgeist-dp
+	local plugins="brasero-disc-recorder,chapters,im-status,gromit"
+	plugins="${plugins},media-player-keys,ontop,properties,screensaver"
+	plugins="${plugins},screenshot,sidebar-test,skipto"
+	use grilo && plugins="${plugins},grilo"
+	use iplayer && plugins="${plugins},iplayer"
+	use lirc && plugins="${plugins},lirc"
+	use nautilus && plugins="${plugins},save-file"
+	use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
+	use vala && plugins="${plugins},rotation"
+	use zeitgeist && plugins="${plugins},zeitgeist-dp"
+	use zeroconf && plugins="${plugins},publish"
+
+	G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
+	mkdir -p m4
+
+	#if [[ ${PV} != 9999 ]]; then
+	#	intltoolize --force --copy --automake || die "intltoolize failed"
+	#	eautoreconf
+	#fi
+
+	use python && python_clean_py-compile_files
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Work around sandbox violations when FEATURES=-userpriv caused by
+	# gst-inspect-0.10 (bug #358755)
+	unset DISPLAY
+	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
+	use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+}