[gentoo-commits] proj/gnome:master commit in: media-libs/clutter-gst/, media-libs/clutter-gst/files/

[gentoo-commits] proj/gnome:master commit in: media-libs/clutter-gst/, media-libs/clutter-gst/files/

[Alexandre Restovtsev]

commit:     874a04b7c16b4befe4e8fbeaee6624fa6e1cbb81
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Oct  3 00:05:34 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct  3 00:09:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=874a04b7

media-libs/clutter-gst: add 1.4.0

Hack around the access violation bugs (#360219, #360073, #363917, and
now #385433) by deliberately setting an invalid DISPLAY. Depend on cogl
since configure checks for it and this is, after all, the gnome-3.2
overlay.

---
 media-libs/clutter-gst/clutter-gst-1.4.0.ebuild    |   53 ++++++++++++++++++++
 .../files/clutter-gst-1.4.0-null-free.patch        |   24 +++++++++
 2 files changed, 77 insertions(+), 0 deletions(-)

diff --git a/media-libs/clutter-gst/clutter-gst-1.4.0.ebuild b/media-libs/clutter-gst/clutter-gst-1.4.0.ebuild
new file mode 100644
index 0000000..7434688
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-1.4.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.3.14.ebuild,v 1.1 2011/09/09 17:14:58 pacho Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2" # Just a build-time dependency
+GNOME_TARBALL_SUFFIX="xz"
+CLUTTER_LA_PUNT="yes"
+
+# inherit clutter after gnome2 so that defaults aren't overriden
+# inherit gnome.org in the end so we use gnome mirrors and get the xz tarball
+inherit python gnome2 clutter gnome.org
+
+DESCRIPTION="GStreamer Integration library for Clutter"
+
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples +introspection"
+
+# Automagic cogl-1.8 dependency, and cogl requires clutter-1.8
+RDEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.8.0:1.0[introspection?]
+	>=media-libs/cogl-1.8.0:1.0[introspection?]
+	>=media-libs/gstreamer-0.10.26:0.10[introspection?]
+	media-libs/gst-plugins-base:0.10[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+DOCS="AUTHORS NEWS README"
+EXAMPLES="examples/{*.c,*.png,README}"
+
+src_prepare() {
+	# Patch from upstream to not free a NULL, will be in next release
+	epatch "${FILESDIR}/${P}-null-free.patch"
+
+	# XXX: debug default is "minimum" in even releases; "yes" in odd releases
+	G2CONF="${G2CONF}
+		$(use_enable introspection)"
+
+	gnome2_src_prepare
+	python_convert_shebangs 2 "${S}"/scripts/pso2h.py
+}
+
+src_compile() {
+	# Clutter tries to access dri without userpriv
+	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917, bug 385433
+	DISPLAY="999invalid"
+
+	gnome2_src_compile
+}

diff --git a/media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.patch b/media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.patch
new file mode 100644
index 0000000..b40f97a
--- /dev/null
+++ b/media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.patch
@@ -0,0 +1,24 @@
+From 08e539ecef13de3fdefc83fb422babb9a2201ac3 Mon Sep 17 00:00:00 2001
+From: Damien Lespiau <damien.lespiau@intel.com>
+Date: Fri, 30 Sep 2011 12:00:48 +0000
+Subject: player: Don't try to free NULL GstTagList
+
+When the info is not ready yet, tag lists are NULL. Don't try to free
+NULL tag lists...
+---
+diff --git a/clutter-gst/clutter-gst-player.c b/clutter-gst/clutter-gst-player.c
+index b60161c..9f4ecf5 100644
+--- a/clutter-gst/clutter-gst-player.c
++++ b/clutter-gst/clutter-gst-player.c
+@@ -285,7 +285,8 @@ free_tags_list (GList **listp)
+   l = *listp;
+   while (l)
+     {
+-      gst_tag_list_free (l->data);
++      if (l->data)
++        gst_tag_list_free (l->data);
+       l = g_list_delete_link (l, l);
+     }
+ 
+--
+cgit v0.9.0.2

[gentoo-commits] proj/gnome:master commit in: media-libs/clutter-gst/, media-libs/clutter-gst/files/

[Alexandre Restovtsev]

commit:     495bec63ad9018c8f58a3ebcdf7b55319d1e6734
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Oct  5 23:56:44 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct  5 23:56:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=495bec63

media-libs/clutter-gst: 1.4.0 → 1.4.2

Bump, fixes segfault on nouveau. Patch was applied upstream.

---
 ...r-gst-1.4.0.ebuild => clutter-gst-1.4.2.ebuild} |    3 --
 .../files/clutter-gst-1.4.0-null-free.patch        |   24 --------------------
 2 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/media-libs/clutter-gst/clutter-gst-1.4.0.ebuild b/media-libs/clutter-gst/clutter-gst-1.4.2.ebuild
similarity index 93%
rename from media-libs/clutter-gst/clutter-gst-1.4.0.ebuild
rename to media-libs/clutter-gst/clutter-gst-1.4.2.ebuild
index 7434688..700bc8e 100644
--- a/media-libs/clutter-gst/clutter-gst-1.4.0.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.4.2.ebuild
@@ -33,9 +33,6 @@ DOCS="AUTHORS NEWS README"
 EXAMPLES="examples/{*.c,*.png,README}"
 
 src_prepare() {
-	# Patch from upstream to not free a NULL, will be in next release
-	epatch "${FILESDIR}/${P}-null-free.patch"
-
 	# XXX: debug default is "minimum" in even releases; "yes" in odd releases
 	G2CONF="${G2CONF}
 		$(use_enable introspection)"

diff --git a/media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.patch b/media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.patch
deleted file mode 100644
index b40f97a..0000000
--- a/media-libs/clutter-gst/files/clutter-gst-1.4.0-null-free.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 08e539ecef13de3fdefc83fb422babb9a2201ac3 Mon Sep 17 00:00:00 2001
-From: Damien Lespiau <damien.lespiau@intel.com>
-Date: Fri, 30 Sep 2011 12:00:48 +0000
-Subject: player: Don't try to free NULL GstTagList
-
-When the info is not ready yet, tag lists are NULL. Don't try to free
-NULL tag lists...
----
-diff --git a/clutter-gst/clutter-gst-player.c b/clutter-gst/clutter-gst-player.c
-index b60161c..9f4ecf5 100644
---- a/clutter-gst/clutter-gst-player.c
-+++ b/clutter-gst/clutter-gst-player.c
-@@ -285,7 +285,8 @@ free_tags_list (GList **listp)
-   l = *listp;
-   while (l)
-     {
--      gst_tag_list_free (l->data);
-+      if (l->data)
-+        gst_tag_list_free (l->data);
-       l = g_list_delete_link (l, l);
-     }
- 
---
-cgit v0.9.0.2