public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: media-video/totem/files/, media-video/totem/
@ 2011-02-19 10:54 Priit Laes
  0 siblings, 0 replies; 5+ messages in thread
From: Priit Laes @ 2011-02-19 10:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d735678efc1c2a0b4c600f3c20beb0645a5e0c85
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sat Feb 19 10:30:33 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Feb 19 10:41:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d735678e

media-video/totem: Update for latest libpeas API changes

---
 media-video/totem/files/totem-libpeas-compat.patch |   47 ++++++++++++++++++++
 ...{totem-2.91.6.ebuild => totem-2.91.6-r1.ebuild} |    4 +-
 media-video/totem/totem-9999.ebuild                |    2 +-
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/media-video/totem/files/totem-libpeas-compat.patch b/media-video/totem/files/totem-libpeas-compat.patch
new file mode 100644
index 0000000..5f6991a
--- /dev/null
+++ b/media-video/totem/files/totem-libpeas-compat.patch
@@ -0,0 +1,47 @@
+From 6da33d0d064e7dd6b5144d01ea1d73a8cde5b02d Mon Sep 17 00:00:00 2001
+From: Steve Frécinaux <code@istique.net>
+Date: Sun, 13 Feb 2011 23:41:22 +0000
+Subject: Update totem against latest libpeas API changes.
+
+---
+diff --git a/configure.in b/configure.in
+index 641f18f..ec129c7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -48,7 +48,7 @@ TOTEM_PLPARSER_REQS=2.32.2
+ GNOMEICON_REQS=2.15.90
+ DBUS_REQS=0.82
+ VALA_REQS=0.11.1
+-PEAS_REQS=0.7.1
++PEAS_REQS=0.7.2
+ PYTHON_REQS=2.3
+ PYGOBJECT_REQS=2.27.0
+ 
+diff --git a/src/plugins/totem-plugins-engine.c b/src/plugins/totem-plugins-engine.c
+index cdff0bf..4518fe2 100644
+--- a/src/plugins/totem-plugins-engine.c
++++ b/src/plugins/totem-plugins-engine.c
+@@ -120,6 +120,8 @@ totem_plugins_engine_get_default (TotemObject *totem)
+ 	}
+ 	g_strfreev (paths);
+ 
++	peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
++
+ 	g_object_add_weak_pointer (G_OBJECT (engine),
+ 				   (gpointer) &engine);
+ 
+diff --git a/src/totem-menu.c b/src/totem-menu.c
+index 6e76184..1a2e54e 100644
+--- a/src/totem-menu.c
++++ b/src/totem-menu.c
+@@ -1234,7 +1234,7 @@ plugins_action_callback (GtkAction *action, Totem *totem)
+ 					 G_CALLBACK (totem_plugins_response_cb),
+ 					 NULL, 0);
+ 
+-		manager = peas_gtk_plugin_manager_new ();
++		manager = peas_gtk_plugin_manager_new (NULL);
+ 		gtk_widget_show_all (GTK_WIDGET (manager));
+ 		gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (totem->plugins))),
+ 				    manager, TRUE, TRUE, 0);
+--
+cgit v0.8.3.4

diff --git a/media-video/totem/totem-2.91.6.ebuild b/media-video/totem/totem-2.91.6-r1.ebuild
similarity index 98%
rename from media-video/totem/totem-2.91.6.ebuild
rename to media-video/totem/totem-2.91.6-r1.ebuild
index f84d8f9..d2aa72c 100644
--- a/media-video/totem/totem-2.91.6.ebuild
+++ b/media-video/totem/totem-2.91.6-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND=">=dev-libs/glib-2.27.92
 	>=x11-libs/gdk-pixbuf-2.23.0
 	>=x11-libs/gtk+-2.99.3:3[introspection?]
 	>=dev-libs/totem-pl-parser-2.32.2[introspection?]
-	>=dev-libs/libpeas-0.7.1[gtk]
+	>=dev-libs/libpeas-0.7.2[gtk]
 	>=x11-themes/gnome-icon-theme-2.16
 	x11-libs/cairo
 	>=dev-libs/libxml2-2.6
@@ -145,6 +145,8 @@ src_prepare() {
 	# FIXME: File a bug for this
 	epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
 
+	epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
+
 	if [[ ${PV} != 9999 ]]; then
 		intltoolize --force --copy --automake || die "intltoolize failed"
 		eautoreconf

diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index f84d8f9..2066308 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND=">=dev-libs/glib-2.27.92
 	>=x11-libs/gdk-pixbuf-2.23.0
 	>=x11-libs/gtk+-2.99.3:3[introspection?]
 	>=dev-libs/totem-pl-parser-2.32.2[introspection?]
-	>=dev-libs/libpeas-0.7.1[gtk]
+	>=dev-libs/libpeas-0.7.2[gtk]
 	>=x11-themes/gnome-icon-theme-2.16
 	x11-libs/cairo
 	>=dev-libs/libxml2-2.6



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: media-video/totem/files/, media-video/totem/
@ 2011-02-21 22:06 Nirbheek Chauhan
  0 siblings, 0 replies; 5+ messages in thread
From: Nirbheek Chauhan @ 2011-02-21 22:06 UTC (permalink / raw
  To: gentoo-commits

commit:     ac603e182fd4371844bcaa19757d452cae781212
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 21:54:43 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 22:05:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac603e18

media-video/totem: 2.91.6 -> 2.91.7

* New Zeitgeist plugin, disabled

---
 media-video/totem/files/totem-libpeas-compat.patch |   47 --------------------
 ...{totem-2.91.6-r1.ebuild => totem-2.91.7.ebuild} |    3 +-
 2 files changed, 1 insertions(+), 49 deletions(-)

diff --git a/media-video/totem/files/totem-libpeas-compat.patch b/media-video/totem/files/totem-libpeas-compat.patch
deleted file mode 100644
index 5f6991a..0000000
--- a/media-video/totem/files/totem-libpeas-compat.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6da33d0d064e7dd6b5144d01ea1d73a8cde5b02d Mon Sep 17 00:00:00 2001
-From: Steve Frécinaux <code@istique.net>
-Date: Sun, 13 Feb 2011 23:41:22 +0000
-Subject: Update totem against latest libpeas API changes.
-
----
-diff --git a/configure.in b/configure.in
-index 641f18f..ec129c7 100644
---- a/configure.in
-+++ b/configure.in
-@@ -48,7 +48,7 @@ TOTEM_PLPARSER_REQS=2.32.2
- GNOMEICON_REQS=2.15.90
- DBUS_REQS=0.82
- VALA_REQS=0.11.1
--PEAS_REQS=0.7.1
-+PEAS_REQS=0.7.2
- PYTHON_REQS=2.3
- PYGOBJECT_REQS=2.27.0
- 
-diff --git a/src/plugins/totem-plugins-engine.c b/src/plugins/totem-plugins-engine.c
-index cdff0bf..4518fe2 100644
---- a/src/plugins/totem-plugins-engine.c
-+++ b/src/plugins/totem-plugins-engine.c
-@@ -120,6 +120,8 @@ totem_plugins_engine_get_default (TotemObject *totem)
- 	}
- 	g_strfreev (paths);
- 
-+	peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
-+
- 	g_object_add_weak_pointer (G_OBJECT (engine),
- 				   (gpointer) &engine);
- 
-diff --git a/src/totem-menu.c b/src/totem-menu.c
-index 6e76184..1a2e54e 100644
---- a/src/totem-menu.c
-+++ b/src/totem-menu.c
-@@ -1234,7 +1234,7 @@ plugins_action_callback (GtkAction *action, Totem *totem)
- 					 G_CALLBACK (totem_plugins_response_cb),
- 					 NULL, 0);
- 
--		manager = peas_gtk_plugin_manager_new ();
-+		manager = peas_gtk_plugin_manager_new (NULL);
- 		gtk_widget_show_all (GTK_WIDGET (manager));
- 		gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (totem->plugins))),
- 				    manager, TRUE, TRUE, 0);
---
-cgit v0.8.3.4

diff --git a/media-video/totem/totem-2.91.6-r1.ebuild b/media-video/totem/totem-2.91.7.ebuild
similarity index 98%
rename from media-video/totem/totem-2.91.6-r1.ebuild
rename to media-video/totem/totem-2.91.7.ebuild
index d2aa72c..9402b09 100644
--- a/media-video/totem/totem-2.91.6-r1.ebuild
+++ b/media-video/totem/totem-2.91.7.ebuild
@@ -30,6 +30,7 @@ fi
 # coherence plugin broken upstream
 #
 # FIXME: Automagic tracker-0.9.0
+# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
 RDEPEND=">=dev-libs/glib-2.27.92
 	>=x11-libs/gdk-pixbuf-2.23.0
 	>=x11-libs/gtk+-2.99.3:3[introspection?]
@@ -145,8 +146,6 @@ src_prepare() {
 	# FIXME: File a bug for this
 	epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
 
-	epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
-
 	if [[ ${PV} != 9999 ]]; then
 		intltoolize --force --copy --automake || die "intltoolize failed"
 		eautoreconf



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: media-video/totem/files/, media-video/totem/
@ 2012-11-07  5:24 Alexandre Rostovtsev
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Rostovtsev @ 2012-11-07  5:24 UTC (permalink / raw
  To: gentoo-commits

commit:     2a024c4e5eaa2f9bf0649f97ce0b7f5c2bcba83e
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  7 05:19:05 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 05:20:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2a024c4e

media-video/totem: fix "Element 'pitch' is missing" error, update license

---
 .../totem/files/totem-3.6.2-scaletempo.patch       |   46 ++++++++++++++++++++
 .../{totem-3.6.2.ebuild => totem-3.6.2-r1.ebuild}  |    7 ++-
 media-video/totem/totem-9999.ebuild                |    2 +-
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/media-video/totem/files/totem-3.6.2-scaletempo.patch b/media-video/totem/files/totem-3.6.2-scaletempo.patch
new file mode 100644
index 0000000..f46318b
--- /dev/null
+++ b/media-video/totem/files/totem-3.6.2-scaletempo.patch
@@ -0,0 +1,46 @@
+From 9370ec9985b8fa528eb56072a9aaca34ed9ea57a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
+Date: Fri, 2 Nov 2012 23:29:25 +0000
+Subject: [PATCH] backend: really use scaletempo instead of soundpitch plugin
+
+The soundpitch plugin is irreparably broken, and the scaletempo
+offers the same features without the bugs, or the need to change
+the pitch ratio ourselves.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686391
+---
+ src/backend/bacon-video-widget.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
+index 99bc075..0b1ee39 100644
+--- a/src/backend/bacon-video-widget.c
++++ b/src/backend/bacon-video-widget.c
+@@ -5963,7 +5963,7 @@ bacon_video_widget_initable_init (GInitable     *initable,
+ 
+   /* Instantiate all the fallible plugins */
+   bvw->priv->play = element_make_or_warn ("playbin", "play");
+-  bvw->priv->audio_pitchcontrol = element_make_or_warn ("pitch", "scaletempo");
++  bvw->priv->audio_pitchcontrol = element_make_or_warn ("scaletempo", "scaletempo");
+   video_sink = element_make_or_warn ("cluttersink", "video-sink");
+   audio_sink = element_make_or_warn ("autoaudiosink", "audio-sink");
+ 
+@@ -6150,7 +6150,6 @@ bacon_video_widget_set_rate (BaconVideoWidget *bvw,
+   GstEvent *event;
+   gboolean retval = FALSE;
+   gint64 cur;
+-  gfloat pitch, ratio;
+ 
+   g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
+   g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
+@@ -6160,7 +6159,6 @@ bacon_video_widget_set_rate (BaconVideoWidget *bvw,
+ 	return TRUE;
+   if (new_rate >= 2.0)
+ 	return TRUE;
+-  ratio = new_rate / bvw->priv->rate;
+ 
+   if (gst_element_query_position (bvw->priv->play, GST_FORMAT_TIME, &cur)) {
+     GST_DEBUG ("Setting new rate at %"G_GINT64_FORMAT"", cur);
+-- 
+1.8.0
+

diff --git a/media-video/totem/totem-3.6.2.ebuild b/media-video/totem/totem-3.6.2-r1.ebuild
similarity index 97%
rename from media-video/totem/totem-3.6.2.ebuild
rename to media-video/totem/totem-3.6.2-r1.ebuild
index 46b766d..46f1d85 100644
--- a/media-video/totem/totem-3.6.2.ebuild
+++ b/media-video/totem/totem-3.6.2-r1.ebuild
@@ -11,7 +11,7 @@ PYTHON_USE_WITH="threads"
 PYTHON_USE_WITH_OPT="python"
 VALA_MIN_API_VERSION="0.14"
 
-inherit gnome2 multilib python
+inherit eutils gnome2 multilib python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -19,7 +19,7 @@ fi
 DESCRIPTION="Media player for GNOME"
 HOMEPAGE="http://projects.gnome.org/totem/"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test vala zeitgeist"
 if [[ ${PV} = 9999 ]]; then
@@ -109,6 +109,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# in 3.6.3
+	epatch "${FILESDIR}/${P}-scaletempo.patch"
+
 	use python && python_clean_py-compile_files
 	# Only needed when regenerating C sources from Vala files
 	#use vala && vala_src_prepare

diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index d187586..d87d9bf 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -18,7 +18,7 @@ fi
 DESCRIPTION="Media player for GNOME"
 HOMEPAGE="http://projects.gnome.org/totem/"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test vala zeitgeist"
 if [[ ${PV} = 9999 ]]; then


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: media-video/totem/files/, media-video/totem/
@ 2012-11-08 23:12 Alexandre Rostovtsev
  0 siblings, 0 replies; 5+ messages in thread
From: Alexandre Rostovtsev @ 2012-11-08 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d84112363075d182b447024be9dd1baf566f79ec
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  8 22:41:24 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Nov  8 23:07:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d8411236

media-video/totem: 3.6.2-r1 → 3.6.3

Remove vala USE flag from non-live ebuild since tarball totem releases
can be built without valac.

---
 .../totem/files/totem-3.6.2-scaletempo.patch       |   46 --------------------
 .../{totem-3.6.2-r1.ebuild => totem-3.6.3.ebuild}  |   46 +++++++++++---------
 media-video/totem/totem-9999.ebuild                |   43 +++++++++++-------
 3 files changed, 51 insertions(+), 84 deletions(-)

diff --git a/media-video/totem/files/totem-3.6.2-scaletempo.patch b/media-video/totem/files/totem-3.6.2-scaletempo.patch
deleted file mode 100644
index f46318b..0000000
--- a/media-video/totem/files/totem-3.6.2-scaletempo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9370ec9985b8fa528eb56072a9aaca34ed9ea57a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
-Date: Fri, 2 Nov 2012 23:29:25 +0000
-Subject: [PATCH] backend: really use scaletempo instead of soundpitch plugin
-
-The soundpitch plugin is irreparably broken, and the scaletempo
-offers the same features without the bugs, or the need to change
-the pitch ratio ourselves.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686391
----
- src/backend/bacon-video-widget.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
-index 99bc075..0b1ee39 100644
---- a/src/backend/bacon-video-widget.c
-+++ b/src/backend/bacon-video-widget.c
-@@ -5963,7 +5963,7 @@ bacon_video_widget_initable_init (GInitable     *initable,
- 
-   /* Instantiate all the fallible plugins */
-   bvw->priv->play = element_make_or_warn ("playbin", "play");
--  bvw->priv->audio_pitchcontrol = element_make_or_warn ("pitch", "scaletempo");
-+  bvw->priv->audio_pitchcontrol = element_make_or_warn ("scaletempo", "scaletempo");
-   video_sink = element_make_or_warn ("cluttersink", "video-sink");
-   audio_sink = element_make_or_warn ("autoaudiosink", "audio-sink");
- 
-@@ -6150,7 +6150,6 @@ bacon_video_widget_set_rate (BaconVideoWidget *bvw,
-   GstEvent *event;
-   gboolean retval = FALSE;
-   gint64 cur;
--  gfloat pitch, ratio;
- 
-   g_return_val_if_fail (BACON_IS_VIDEO_WIDGET (bvw), FALSE);
-   g_return_val_if_fail (GST_IS_ELEMENT (bvw->priv->play), FALSE);
-@@ -6160,7 +6159,6 @@ bacon_video_widget_set_rate (BaconVideoWidget *bvw,
- 	return TRUE;
-   if (new_rate >= 2.0)
- 	return TRUE;
--  ratio = new_rate / bvw->priv->rate;
- 
-   if (gst_element_query_position (bvw->priv->play, GST_FORMAT_TIME, &cur)) {
-     GST_DEBUG ("Setting new rate at %"G_GINT64_FORMAT"", cur);
--- 
-1.8.0
-

diff --git a/media-video/totem/totem-3.6.2-r1.ebuild b/media-video/totem/totem-3.6.3.ebuild
similarity index 88%
rename from media-video/totem/totem-3.6.2-r1.ebuild
rename to media-video/totem/totem-3.6.3.ebuild
index 46f1d85..8035880 100644
--- a/media-video/totem/totem-3.6.2-r1.ebuild
+++ b/media-video/totem/totem-3.6.3.ebuild
@@ -9,11 +9,11 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
 PYTHON_DEPEND="python? 2:2.5"
 PYTHON_USE_WITH="threads"
 PYTHON_USE_WITH_OPT="python"
-VALA_MIN_API_VERSION="0.14"
 
-inherit eutils gnome2 multilib python
+inherit gnome2 multilib python
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	VALA_MIN_API_VERSION="0.14"
+	inherit gnome2-live vala
 fi
 
 DESCRIPTION="Media player for GNOME"
@@ -21,8 +21,15 @@ HOMEPAGE="http://projects.gnome.org/totem/"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test vala zeitgeist"
+IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
+# see bug #359379
+REQUIRED_USE="flash? ( nsplugin )
+	python? ( introspection )
+	zeitgeist? ( introspection )"
+
 if [[ ${PV} = 9999 ]]; then
+	IUSE+=" vala"
+	REQUIRED_USE+=" zeitgeist? ( vala )"
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
@@ -91,14 +98,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( python? ( dev-python/pylint ) )
 "
+# docbook-xml-dtd is needed for user do
 # Only needed when regenerating C sources from Vala files
-#	vala? ( $(vala_depend) )"
-# docbook-xml-dtd is needed for user doc
-
-# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
-	python? ( introspection )
-	zeitgeist? ( introspection vala )"
+[[ ${PV} = 9999 ]] && DEPEND+=" vala? ( $(vala_depend) )"
 
 # XXX: pylint checks fail because of bad code
 RESTRICT="test"
@@ -109,12 +111,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# in 3.6.3
-	epatch "${FILESDIR}/${P}-scaletempo.patch"
-
 	use python && python_clean_py-compile_files
-	# Only needed when regenerating C sources from Vala files
-	#use vala && vala_src_prepare
+	if [[ ${PV} = 9999 ]]; then
+		# Only needed when regenerating C sources from Vala files
+		use vala && vala_src_prepare
+	fi
 	gnome2_src_prepare
 }
 
@@ -132,11 +133,7 @@ src_configure() {
 		$(use_enable nautilus)
 		$(use_enable nsplugin browser-plugins)
 		$(use_enable python)
-		$(use_enable vala)
-		VALAC=$(type -P true)
 		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-		# Only needed when regenerating C sources from Vala files
-		#VALAC=$(type -P valac-$(vala_best_api_version))
 
 	if ! use test; then
 		# pylint is checked unconditionally, but is only used for make check
@@ -154,7 +151,14 @@ src_configure() {
 	use lirc && plugins+=",lirc"
 	use nautilus && plugins+=",save-file"
 	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-	use vala && plugins+=",rotation"
+	if [[ ${PV} = 9999 ]]; then
+		# Only needed when regenerating C sources from Vala files
+		G2CONF="${G2CONF} $(use_enable vala)"
+		use vala && plugins+=",rotation"
+	else
+		G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)"
+		plugins+=",rotation"
+	fi
 	use zeitgeist && plugins+=",zeitgeist-dp"
 
 	G2CONF="${G2CONF} --with-plugins=${plugins}"

diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index d87d9bf..9fc75a3 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -12,7 +12,8 @@ PYTHON_USE_WITH_OPT="python"
 
 inherit gnome2 multilib python
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	VALA_MIN_API_VERSION="0.14"
+	inherit gnome2-live vala
 fi
 
 DESCRIPTION="Media player for GNOME"
@@ -20,8 +21,15 @@ HOMEPAGE="http://projects.gnome.org/totem/"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test vala zeitgeist"
+IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
+# see bug #359379
+REQUIRED_USE="flash? ( nsplugin )
+	python? ( introspection )
+	zeitgeist? ( introspection )"
+
 if [[ ${PV} = 9999 ]]; then
+	IUSE+=" vala"
+	REQUIRED_USE+=" zeitgeist? ( vala )"
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
@@ -49,7 +57,7 @@ RDEPEND="
 	x11-libs/mx:1.0
 
 	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0[X,introspection,pango]
+	media-libs/gst-plugins-base:1.0[X,introspection?,pango]
 	media-libs/gst-plugins-bad:1.0
 	media-libs/gst-plugins-good:1.0
 	media-plugins/gst-plugins-taglib:1.0
@@ -88,15 +96,11 @@ DEPEND="${RDEPEND}
 	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 )"
+# docbook-xml-dtd is needed for user do
+# Only needed when regenerating C sources from Vala files
+[[ ${PV} = 9999 ]] && DEPEND+=" vala? ( $(vala_depend) )"
 
 # XXX: pylint checks fail because of bad code
 RESTRICT="test"
@@ -116,8 +120,10 @@ src_prepare() {
 	#fi
 
 	use python && python_clean_py-compile_files
-	# Only needed when regenerating C sources from Vala files
-	#use vala && vala_src_prepare
+	if [[ ${PV} = 9999 ]]; then
+		# Only needed when regenerating C sources from Vala files
+		use vala && vala_src_prepare
+	fi
 	gnome2_src_prepare
 }
 
@@ -135,11 +141,7 @@ src_configure() {
 		$(use_enable nautilus)
 		$(use_enable nsplugin browser-plugins)
 		$(use_enable python)
-		$(use_enable vala)
-		VALAC=$(type -P valac-0.14)
 		BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-		# Only needed when regenerating C sources from Vala files
-		#VALAC=$(type -P valac-$(vala_best_api_version))
 
 	if ! use test; then
 		# pylint is checked unconditionally, but is only used for make check
@@ -157,7 +159,14 @@ src_configure() {
 	use lirc && plugins+=",lirc"
 	use nautilus && plugins+=",save-file"
 	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-	use vala && plugins+=",rotation"
+	if [[ ${PV} = 9999 ]]; then
+		# Only needed when regenerating C sources from Vala files
+		G2CONF="${G2CONF} $(use_enable vala)"
+		use vala && plugins+=",rotation"
+	else
+		G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)"
+		plugins+=",rotation"
+	fi
 	use zeitgeist && plugins+=",zeitgeist-dp"
 
 	G2CONF="${G2CONF} --with-plugins=${plugins}"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: media-video/totem/files/, media-video/totem/
@ 2018-06-07 22:21 Gilles Dartiguelongue
  0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2018-06-07 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     5df9f766204246b0ff96862bd9629d565d3ec0bc
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 22:13:23 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 22:20:57 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5df9f766

media-video/totem: 3.24.0 → 3.26.0

Switch to meson build system. Remove unused totem-audio-preview.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 media-video/totem/files/3.26-control-plugins.patch | 207 +++++++++++++++++++++
 .../totem/files/3.26-gst-inspect-sandbox.patch     |  42 +++++
 media-video/totem/files/3.26-meson-fixes.patch     |  40 ++++
 .../totem/files/3.26-skip-pylint-check.patch       |  37 ++++
 media-video/totem/totem-3.26.0.ebuild              | 139 ++++++++++++++
 5 files changed, 465 insertions(+)

diff --git a/media-video/totem/files/3.26-control-plugins.patch b/media-video/totem/files/3.26-control-plugins.patch
new file mode 100644
index 00000000..1a467603
--- /dev/null
+++ b/media-video/totem/files/3.26-control-plugins.patch
@@ -0,0 +1,207 @@
+From e2dd2508e0b356159e00ba90afdfef0b6b623b27 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Thu, 7 Jun 2018 22:52:21 +0200
+Subject: [PATCH 2/5] Allow full control over which plugins are built
+
+---
+ meson.build             |  2 +-
+ meson_options.txt       | 28 +++++++++++++++++-
+ src/plugins/meson.build | 65 ++++++++++++++++++++++++++++++-----------
+ 3 files changed, 76 insertions(+), 19 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 9c4797dd..aa91ae10 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,7 +7,7 @@ project(
+     'c_std=gnu99',
+     'warning_level=1'
+   ],
+-  meson_version: '>= 0.41.0'
++  meson_version: '>= 0.44.0'
+ )
+ 
+ totem_version = meson.project_version()
+diff --git a/meson_options.txt b/meson_options.txt
+index 3b6ff67b..6e056952 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,7 +1,33 @@
+ option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Whether to enable easy codec installation support for GStreamer')
+ option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support')
+ option('enable-vala', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'whether Vala plugin support is requested')
+-option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
++option('with-plugins', type: 'array', choices: [
++  'all',
++  'auto',
++  'apple-trailers',
++  'autoload-subtitles',
++  'brasero-disc-recorder',
++  'dbusservice',
++  'gromit',
++  'im-status',
++  'lirc',
++  'media-player-keys',
++  'ontop',
++  'opensubtitles',
++  'properties',
++  'pythonconsole',
++  'recent',
++  'rotation',
++  'sample-vala',
++  'samplepython',
++  'save-file',
++  'screensaver',
++  'screenshot',
++  'skipto',
++  'variable-rate',
++  'vimeo',
++  'zeitgeist-dp'
++], value: ['auto'], description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
+ option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'compile the nautilus plugin')
+ option('with-nautilusdir', type: 'string', value: '', description: 'Installation path for Nautilus extension')
+ option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+diff --git a/src/plugins/meson.build b/src/plugins/meson.build
+index 95af6485..20134952 100644
+--- a/src/plugins/meson.build
++++ b/src/plugins/meson.build
+@@ -41,8 +41,8 @@ allowed_plugins = [
+ plugins = []
+ 
+ plugins_option = get_option('with-plugins')
+-if plugins_option != 'none'
+-  plugins += [
++if plugins_option.length() > 0
++  foreach plugin: [
+     'apple-trailers',
+     'autoload-subtitles',
+     'im-status',
+@@ -56,61 +56,83 @@ if plugins_option != 'none'
+     'variable-rate',
+     'vimeo'
+   ]
++    if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin)
++      plugins += plugin
++    endif
++  endforeach
+ 
+-  plugin_error = (plugins_option == 'all')
++  if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('gromit')
++    gdk_targets = gtk_dep.get_pkgconfig_variable('targets')
++  else
++    gdk_targets = []
++  endif
+ 
+-  gdk_targets = gtk_dep.get_pkgconfig_variable('targets')
+   if gdk_targets.contains('x11')
+     plugins += 'gromit'
+   else
+     str = 'the gromit plugin is not supported on non-X11 targets'
+-    if plugin_error
++    if plugins_option.contains('all') or plugins_option.contains('gromit')
+       error(str)
+     endif
+     message(str)
+   endif
+ 
+-  lirc_dep = dependency('lirc', required: false)
++  if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('lirc')
++    lirc_dep = dependency('lirc', required: false)
++  else
++    lirc_dep = disabler()
++  endif
++
+   if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and cc.has_header('lirc/lirc_client.h')
+     plugins += 'lirc'
+   else
+     str = 'you need lirc_client installed for the lirc plugin'
+-    if plugin_error
++    if plugins_option.contains('all') or plugins_option.contains('lirc')
+       error(str)
+     endif
+     message(str)
+   endif
+ 
+-  libxml_req_version = '>= 2.6.0'
+-  libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false)
+-  gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false)
++  if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('brasero-disc-recorder')
++    libxml_req_version = '>= 2.6.0'
++    libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false)
++    gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false)
++  else
++    libxml_dep = disabler()
++    gtk_x11_dep = disabler()
++  endif
++
+   if libxml_dep.found() and gtk_x11_dep.found()
+     plugins += 'brasero-disc-recorder'
+   else
+     str = 'you need libxml-2.0 ' + libxml_req_version + ' and gtk+-x11-3.0 to use the brasero-disc-recorder plugin'
+-    if plugin_error
++    if plugins_option.contains('all') or plugins_option.contains('brasero-disc-recorder')
+       error(str)
+     endif
+     message(str)
+   endif
+ 
+-  if have_nautilus
++  if have_nautilus and (plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('save-file'))
+     plugins += 'save-file'
+   else
+     str = 'you need libnautilus-extension to use the save-file plugin'
+-    if plugin_error
++    if plugins_option.contains('all') or plugins_option.contains('save-file')
+       error(str)
+     endif
+     message(str)
+   endif
+ 
+   if have_python
+-    plugins += [
++    foreach plugin: [
+       'dbusservice',
+       'opensubtitles',
+       'pythonconsole',
+       'samplepython'
+     ]
++      if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin)
++        plugins += plugin
++      endif
++    endforeach
+   endif
+ 
+   if have_vala
+@@ -129,17 +151,26 @@ if plugins_option != 'none'
+       '--pkg=@0@-@1@'.format(totem_gir_ns, totem_api_version)
+     ]
+ 
+-    plugins += [
++    foreach plugin: [
+       'rotation',
+       'sample-vala'
+     ]
++      if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin)
++        plugins += plugin
++      endif
++    endforeach
++
++    if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('zeitgeist-dp')
++      zeitgeist_dep = dependency('zeitgeist-2.0', version: '>= 0.9.12', required: false)
++    else
++      zeitgeist_dep = disabler()
++    endif
+ 
+-    zeitgeist_dep = dependency('zeitgeist-2.0', version: '>= 0.9.12', required: false)
+     if zeitgeist_dep.found()
+       plugins += 'zeitgeist-dp'
+     else
+       str = 'you need zeitgeist-2.0 >= 0.9.12 to use the zeitgeist-dp plugin'
+-      if plugin_error
++      if plugins_option.contains('all') or plugins_option.contains('zeitgeist-dp')
+         error(str)
+       endif
+       message(str)
+-- 
+2.17.0
+

diff --git a/media-video/totem/files/3.26-gst-inspect-sandbox.patch b/media-video/totem/files/3.26-gst-inspect-sandbox.patch
new file mode 100644
index 00000000..016368a6
--- /dev/null
+++ b/media-video/totem/files/3.26-gst-inspect-sandbox.patch
@@ -0,0 +1,42 @@
+From 742b64b7a74eabd67344ef1cc260427dc402588f Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Thu, 7 Jun 2018 23:47:48 +0200
+Subject: [PATCH 5/5] Make gst-inspect calls optional at build-time
+
+Crashes on Gentoo due to plugins trying to access dri nodes which are sandboxed
+---
+ meson_options.txt       | 1 +
+ src/backend/meson.build | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 6e056952..631b8cca 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -32,3 +32,4 @@ option('enable-nautilus', type: 'combo', choices: ['yes', 'no', 'auto'], value:
+ option('with-nautilusdir', type: 'string', value: '', description: 'Installation path for Nautilus extension')
+ option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+ option('enable-introspection', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable GObject Introspection (depends on GObject)')
++option('gst-inspect', type: 'boolean', value: true, description: 'build-time test of available gstreamer plugins')
+diff --git a/src/backend/meson.build b/src/backend/meson.build
+index 28c8e123..55037a6a 100644
+--- a/src/backend/meson.build
++++ b/src/backend/meson.build
+@@ -1,5 +1,6 @@
+ backend_inc = include_directories('.')
+ 
++if get_option('gst-inspect')
+ gst_inspect = find_program(
+   'gst-inspect-1.0',
+   join_paths(gst_dep.get_pkgconfig_variable('toolsdir'), 'gst-inspect-1.0'),
+@@ -31,6 +32,7 @@ foreach plugin: gst_good_plugins
+   assert(r.returncode() == 0,
+          'Cannot find required GStreamer-1.0 plugin "' + plugin + '". It should be part of gst-plugins-good. Please install it.')
+ endforeach
++endif
+ 
+ sources = files(
+   'bacon-time-label.c',
+-- 
+2.17.0
+

diff --git a/media-video/totem/files/3.26-meson-fixes.patch b/media-video/totem/files/3.26-meson-fixes.patch
new file mode 100644
index 00000000..924d91c5
--- /dev/null
+++ b/media-video/totem/files/3.26-meson-fixes.patch
@@ -0,0 +1,40 @@
+From b66ceb0e2fe72591132576a6ca3469eff905cd8d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Thu, 7 Jun 2018 22:52:04 +0200
+Subject: [PATCH 1/4] meson.build: Fix typos in vala handling
+
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 8a87b8b9..9c4797dd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -238,13 +238,13 @@ if python_option != 'no'
+ endif
+ 
+ # vala support
++vala_req_version = '>= 0.14.1'
+ have_vala = false
+ 
+ vala_option = get_option('enable-vala')
+ if vala_option != 'no'
+   if have_gir
+     if add_languages('vala', required: false)
+-      vala_req_version = '>= 0.14.1'
+       if meson.get_compiler('vala').version().version_compare(vala_req_version)
+         have_vala = true
+       endif
+@@ -258,7 +258,7 @@ if vala_option != 'no'
+   endif
+ 
+   if not have_vala
+-    if vala_options == 'yes' or introspection_option == 'yes'
++    if vala_option == 'yes' or introspection_option == 'yes'
+       error(str)
+     endif
+     message(str)
+-- 
+2.17.0
+

diff --git a/media-video/totem/files/3.26-skip-pylint-check.patch b/media-video/totem/files/3.26-skip-pylint-check.patch
new file mode 100644
index 00000000..326cffbc
--- /dev/null
+++ b/media-video/totem/files/3.26-skip-pylint-check.patch
@@ -0,0 +1,37 @@
+From 008df868818b821cdbed8d124d1a86f0747ad3fc Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Thu, 7 Jun 2018 22:55:56 +0200
+Subject: [PATCH 3/4] Drop requirement for pylint at build-time
+
+This is a development QA tool anyway.
+---
+ meson.build | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index aa91ae10..f8f306e4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -219,9 +219,8 @@ if python_option != 'no'
+     python_version = r.stdout().split(' ')[1]
+ 
+     pygobject_dep = dependency('pygobject-3.0', version: '>= 2.90.3', required: false)
+-    pylint = find_program('pylint-3', 'pylint3', 'pylint', required: false)
+ 
+-    if python_version.version_compare(python_req_version) and pygobject_dep.found() and pylint.found()
++    if python_version.version_compare(python_req_version) and pygobject_dep.found()
+       have_python = true
+       python_deps += pygobject_dep
+       meson.add_install_script('meson_compile_python.py')
+@@ -229,7 +228,7 @@ if python_option != 'no'
+   endif
+ 
+   if not have_python
+-    str = 'python ' + python_req_version + ', pygobject or pylint not found'
++    str = 'python ' + python_req_version + ' or pygobject not found'
+     if python_option == 'yes'
+       error(str)
+     endif
+-- 
+2.17.0
+

diff --git a/media-video/totem/totem-3.26.0.ebuild b/media-video/totem/totem-3.26.0.ebuild
new file mode 100644
index 00000000..8ab39a4f
--- /dev/null
+++ b/media-video/totem/totem-3.26.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads"
+
+inherit gnome-meson python-single-r1 vala
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="cdr +introspection lirc nautilus +python test vala"
+# see bug #359379
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# FIXME:
+# Runtime dependency on gnome-session-2.91
+COMMON_DEPEND="
+	>=dev-libs/glib-2.43.4:2[dbus]
+	>=dev-libs/libpeas-1.1[gtk]
+	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-2.99.2:3.0
+	>=media-libs/clutter-gtk-1.8.1:1.0
+	>=x11-libs/cairo-1.14
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.19.4:3[introspection?]
+
+	>=media-libs/grilo-0.3.0:0.3[playlist]
+	>=media-libs/gstreamer-1.6.0:1.0
+	>=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
+	media-libs/gst-plugins-good:1.0
+
+	x11-libs/libX11
+
+	gnome-base/gnome-desktop:3=
+	gnome-base/gsettings-desktop-schemas
+
+	cdr? (
+		>=dev-libs/libxml2-2.6:2
+		>=x11-libs/gtk+-3.19.4:3[X]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/grilo-plugins:0.3
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=x11-libs/gtk+-3.5.2:3[introspection] )
+"
+# libxml2+gdk-pixbuf required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	>=dev-libs/libxml2-2.6:2
+	>=dev-util/meson-0.44
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	vala? ( $(vala_depend) )
+"
+# docbook-xml-dtd is needed for user doc
+# Prevent dev-python/pylint dep, bug #482538
+
+PATCHES=(
+	# Fix some typos in meson.build files
+	"${FILESDIR}"/3.26-meson-fixes.patch
+	# Do not force all plugins
+	"${FILESDIR}"/3.26-control-plugins.patch
+	# Do not force pylint with USE=python
+	"${FILESDIR}"/3.26-skip-pylint-check.patch
+	# Allow disabling calls to gst-inspect (sandbox issue)
+	"${FILESDIR}"/3.26-gst-inspect-sandbox.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	vala_src_prepare
+	gnome-meson_src_prepare
+}
+
+src_configure() {
+	# Disabled: sample-python, sample-vala, zeitgeist-dp
+	# brasero-disc-recorder and gromit depend on GTK+ X11 backend and could be made optional
+	# if totem itself didn't depend on it
+	local plugins="apple-trailers,autoload-subtitles"
+	plugins+=",im-status,media-player-keys,ontop"
+	plugins+=",properties,recent,screensaver,screenshot"
+	plugins+=",skipto,variable-rate,vimeo"
+	use cdr && plugins+=",brasero-disc-recorder"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+	use vala && plugins+=",rotation"
+	plugins+=",gromit"
+
+	# pylint is checked unconditionally, but is only used for make check
+	# appstream-util overriding necessary until upstream fixes their macro
+	# to respect configure switch
+	gnome-meson_src_configure \
+		-Denable-easy-codec-installation=yes \
+		-Denable-gtk-doc=false \
+		-Denable-introspection=$(usex introspection yes no) \
+		-Denable-nautilus=$(usex nautilus yes no) \
+		-Denable-python=$(usex python yes no) \
+		-Denable-vala=$(usex vala yes no) \
+	    -Dgst-inspect=false \
+		-Dwith-plugins=${plugins}
+}
+
+src_install() {
+	gnome-meson_src_install
+	if use python ; then
+		local plugin
+		for plugin in dbusservice pythonconsole opensubtitles ; do
+			python_optimize "${ED}"usr/$(get_libdir)/totem/plugins/${plugin}
+		done
+	fi
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2018-06-07 22:21 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-07  5:24 [gentoo-commits] proj/gnome:master commit in: media-video/totem/files/, media-video/totem/ Alexandre Rostovtsev
  -- strict thread matches above, loose matches on Subject: below --
2018-06-07 22:21 Gilles Dartiguelongue
2012-11-08 23:12 Alexandre Rostovtsev
2011-02-21 22:06 Nirbheek Chauhan
2011-02-19 10:54 Priit Laes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox