Fix build problems with clutter-1.11 and gobject-introspection-1.33. Improve DISPLAY hack.

(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)

4 files changed, 78 insertions, 3 deletions

diff --git a/media-libs/clutter-gst/ChangeLog b/media-libs/clutter-gst/ChangeLog
index 2494687c972d..ac11a4945d75 100644
--- a/media-libs/clutter-gst/ChangeLog
+++ b/media-libs/clutter-gst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter-gst
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.29 2012/07/09 14:29:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.30 2012/09/15 09:58:13 tetromino Exp $
+
+  15 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  clutter-gst-1.6.0.ebuild, +files/clutter-gst-1.6.0-doc-fixes.patch,
+  +files/clutter-gst-1.6.0-glint.patch:
+  Fix build problems with clutter-1.11 and gobject-introspection-1.33. Improve
+  DISPLAY hack.
 
   09 Jul 2012; Brent Baude <ranger@gentoo.org> clutter-gst-1.4.6.ebuild:
   Marking clutter-gst-1.4.6 ~ppc for bug 379649
diff --git a/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild b/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild
index 66b68dc71254..b303347c4b8a 100644
--- a/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.6.0.ebuild,v 1.1 2012/07/03 07:30:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild,v 1.2 2012/09/15 09:58:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -48,11 +48,16 @@ src_prepare() {
 	# FIXME: is this still needed? I don't think so, but not sure. ~nirbheek
 	#eautoreconf
 
+	# In 1.6.1
+	epatch "${FILESDIR}/${P}-glint.patch"
+	epatch "${FILESDIR}/${P}-doc-fixes.patch"
+
 	gnome2_src_prepare
 }
 
 src_compile() {
 	# Clutter tries to access dri without userpriv, upstream bug #661873
 	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
-	DISPLAY="999invalid" emake
+	unset DISPLAY
+	default
 }
diff --git a/media-libs/clutter-gst/files/clutter-gst-1.6.0-doc-fixes.patch b/media-libs/clutter-gst/files/clutter-gst-1.6.0-doc-fixes.patch
new file mode 100644
index 000000000000..e33129ac63d3
--- /dev/null
+++ b/media-libs/clutter-gst/files/clutter-gst-1.6.0-doc-fixes.patch
@@ -0,0 +1,39 @@
+From 61d54db88bd279e3ef68abcc22faa6ad630bc315 Mon Sep 17 00:00:00 2001
+From: Edward Hervey <edward.hervey@collabora.co.uk>
+Date: Thu, 12 Jul 2012 12:03:31 +0200
+Subject: [PATCH] Misc doc fixes
+
+gtk-doc/gi-scanner complains otherwise
+---
+ clutter-gst/clutter-gst-player.h        | 2 +-
+ clutter-gst/clutter-gst-video-texture.c | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/clutter-gst/clutter-gst-player.h b/clutter-gst/clutter-gst-player.h
+index 2a7cdf3..02d45cb 100644
+--- a/clutter-gst/clutter-gst-player.h
++++ b/clutter-gst/clutter-gst-player.h
+@@ -57,7 +57,7 @@ typedef struct _ClutterGstPlayerIfacePrivate ClutterGstPlayerIfacePrivate;
+ 
+ 
+ /**
+- * ClutterGstPlayer
++ * ClutterGstPlayer:
+  *
+  * #ClutterGstPlayer is an opaque structure whose members cannot be
+  * directly accessed
+diff --git a/clutter-gst/clutter-gst-video-texture.c b/clutter-gst/clutter-gst-video-texture.c
+index 7cd9114..8f99a9f 100644
+--- a/clutter-gst/clutter-gst-video-texture.c
++++ b/clutter-gst/clutter-gst-video-texture.c
+@@ -665,7 +665,6 @@ clutter_gst_video_texture_get_idle_material (ClutterGstVideoTexture *texture)
+   return texture->priv->idle_material;
+ }
+ /**
+-
+  * clutter_gst_video_texture_set_idle_material:
+  * @texture: a #ClutterGstVideoTexture
+  * @material: the handle of a Cogl material
+-- 
+1.7.12
+
diff --git a/media-libs/clutter-gst/files/clutter-gst-1.6.0-glint.patch b/media-libs/clutter-gst/files/clutter-gst-1.6.0-glint.patch
new file mode 100644
index 000000000000..b5934c2e97b4
--- /dev/null
+++ b/media-libs/clutter-gst/files/clutter-gst-1.6.0-glint.patch
@@ -0,0 +1,25 @@
+From 11d0a082454dc1f7ca9a7394a1b2284dfc42a055 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Wed, 15 Aug 2012 11:44:47 +0200
+Subject: [PATCH] Don't use GLint needlessly
+
+---
+ clutter-gst/clutter-gst-video-sink.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index bb8317e..2c3c4dd 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -1133,7 +1133,7 @@ static GSList *
+ clutter_gst_build_renderers_list (void)
+ {
+   GSList             *list = NULL;
+-  GLint               nb_texture_units = 0;
++  gint                nb_texture_units = 0;
+   gint                features = 0, i;
+   /* The order of the list of renderers is important. They will be prepended
+    * to a GSList and we'll iterate over that list to choose the first matching
+-- 
+1.7.12
+