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

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

5 files changed, 106 insertions, 15 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/Manifest b/media-libs/clutter-gst/Manifest
index 6dda691240cb..8491b3008412 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,12 +1,28 @@
-DIST clutter-gst-1.0.0.tar.bz2 414768 RMD160 f5c825e6c5da62a39a98e5515c0ede2e3e801907 SHA1 22f262b8d4d70d5d0ef499614fc0332a7a641241 SHA256 ae6ec048b570157130e9f9069f2495caf0da9eefa8d7f3b1789f3346fb16f696
-DIST clutter-gst-1.4.4.tar.xz 337000 RMD160 a43f8978a250f9217e26db2a5bee031e754ee11f SHA1 8f9daff9eac48ae654016892ef4af3861fecd95a SHA256 9fdcf8d8531d4d78342e7ac901d1768c7a8f78124f74dd6be8e51961169b8fb5
-DIST clutter-gst-1.4.6.tar.xz 338608 RMD160 f0f601f250591f32be45882c4c1493bf32af26c7 SHA1 8943caf4bccece08dce4b9abb788c61ee3bf1dc3 SHA256 5368ded143b2f73c3128315dab7b45c5dd8d681341cbae8f83664d2f9bbba3c3
-DIST clutter-gst-1.5.6.tar.xz 349328 RMD160 77cd69c1ade1e445cecc9a9b82e59beb8d936948 SHA1 b3edbeaa3b3abbff1bd71253925a420d096f99e8 SHA256 f12b59d5a548abe38c63750ae2e6cb909afd90cfdcc06d2c4288097f962b08bc
-DIST clutter-gst-1.6.0.tar.xz 349332 RMD160 1b34af44136ec413af2c55326b1ff8728516e929 SHA1 bfc34430f611ca0431ebb248ff63e398cc48d5d2 SHA256 abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622
-EBUILD clutter-gst-1.0.0.ebuild 940 RMD160 01c6e9cde34856beb33334f16f12407bfdbc86ac SHA1 0b839edaacb4fa13cd9b91b4492ea3d12f21862d SHA256 c160ac3523d1837176923caf63603951eb76d9712f15bf14aba503f1ed936f11
-EBUILD clutter-gst-1.4.4.ebuild 1337 RMD160 f6b2603b94b40670c4e1f094c01267a6fba30626 SHA1 2e670e7b75978fd6346e6524ff9f7ad762b51f8c SHA256 2fe034648f56c55af1cd89d5528d7f564e69e017f482394149d0cec76ee61590
-EBUILD clutter-gst-1.4.6.ebuild 1551 RMD160 142e6282225f88e669eb2d7be6588b160898a641 SHA1 09bec7e45b0bdee392d3d9dce13d36c4cc888d47 SHA256 de6abb353d62825a88564f27bf1c3eb4cdaae0852d7d64ad901d8eb28f2c59dd
-EBUILD clutter-gst-1.5.6.ebuild 1825 RMD160 9d3768982c538720b00707d5dc58641aaa795c03 SHA1 492cbee04e069398f251e1ffe0d6d547c7339537 SHA256 39678040becbb4a2f58ef1918a02d399eaec98f34577cc78b1973ed039f154e7
-EBUILD clutter-gst-1.6.0.ebuild 1825 RMD160 df6467538030913389379042afe21133f36056c4 SHA1 23bf0a73e31620fb2f859422003fcbafafc9a54e SHA256 5d65e7c4eee46526b8b8280f391eed1b22bf81c5dfe67fa50ac3eb12132f078d
-MISC ChangeLog 4855 RMD160 32af4c66126c084fcfdc76dc2364bfc39e91da14 SHA1 df2f4dbb20d4fc8a612880d5b444f4e9f9ca03cd SHA256 83f01de5107580da73f505de925d1d0d7026b3c18a8dd27aa35db0949602a223
-MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX clutter-gst-1.6.0-doc-fixes.patch 1322 SHA256 e3f822b0b8c3d3169680330379c9afa931521b57196d08a9ac9e984002db50fd SHA512 c5511318cf12b80858b6e7446a78a88db8f8ae21f882a41959a8e0562662e80c5336c53101fc829e77c3196a09750ba97431143fa3c8b887ee635cd4df8ca43d WHIRLPOOL cced709158d4f8a817957b4cd80acab3a63f1d83846ede880bbaa02632b13df92761cc4cdb3d8b017a5a6ed943b5375b35df20f1ae9008159c569964e78b37e9
+AUX clutter-gst-1.6.0-glint.patch 926 SHA256 56a5e937036dbc3407e23407735fe92db8befa86e380acb2a0f668f696202f4b SHA512 d9a92425df831d4bde3a0dc6ff73c92680b88cffb184703228809e58bef936fed4e679153b7f5436bcdc699fa0b68ffaa6df6ee192d51633e670e5c814b6d21a WHIRLPOOL 1fa6b619cbe5f09fa56abcb514599aa826f6501f25119d7fdd6f50a157d41f9f69efdf1b35eb0d24f9d86ac4e71d11a682bc4dd13c9b961260a8ed63b49e8b7e
+DIST clutter-gst-1.0.0.tar.bz2 414768 SHA256 ae6ec048b570157130e9f9069f2495caf0da9eefa8d7f3b1789f3346fb16f696
+DIST clutter-gst-1.4.4.tar.xz 337000 SHA256 9fdcf8d8531d4d78342e7ac901d1768c7a8f78124f74dd6be8e51961169b8fb5 SHA512 f6d86bf1c6fded5900cbfe4841fca5c33506c35e354945e28ac513419955e1e2657fc58c6f1efd033bd616e5c546c9de4037c29e5be9304be3555d0bf9e8e704 WHIRLPOOL c4daafa7e7bcacd8b69b28d7c82baca3b035567f635eb107d2079def8c2637b3c66472dd30efbb036a95635b7d0319b742116407c6751331f09710a213740480
+DIST clutter-gst-1.4.6.tar.xz 338608 SHA256 5368ded143b2f73c3128315dab7b45c5dd8d681341cbae8f83664d2f9bbba3c3 SHA512 3bc7d3a18af57accde26ad51162a751157dbff706127acd1d2b1075e6d6bb58cdde76e92ed4ad86df0090bcccbeae1243d66810efc8dcd5f2834639a86871669 WHIRLPOOL 5a4c793d55c1ea0c88a829b27e2588b6ec72bb9d41cc10368acef1bbb38b43bcb56b19ca032428e5439bc2f77bfdd6de1d31b694ec9aa777a9c38a4ff23e8e06
+DIST clutter-gst-1.5.6.tar.xz 349328 SHA256 f12b59d5a548abe38c63750ae2e6cb909afd90cfdcc06d2c4288097f962b08bc SHA512 0eabb307f2a3975ffd97970c2e4afa31af3cd2728b248f12af4a5cbfcaf310c3f11a5cd1cab7c88e8f3060ea3fefed121c22afc4c946e9318e4ecf5c3d776f03 WHIRLPOOL 783a31718cf398aaafd1d52a67e4efcea0691ed0a77369307f84d96a2d18333eb4277d2883f681a92eafaee20b1492ead51417b7679e468070215d096057cb1b
+DIST clutter-gst-1.6.0.tar.xz 349332 SHA256 abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622 SHA512 5641326567aea1d5c19f84768a94ee329412e6d4958a980de8ec835ce6eb80794ea5b23cd16f041f3dca3d3fe9f2cf371cedffb16b0522aaa124ca1e50552d97 WHIRLPOOL c79d7ae5e39c5d9b05ff38ba329f428f08c8e44f9f439ef5e5e4a1da6cf72d851c6d6cbb11718eabfd2bb2b04312b6fcba85c3b927d641b914d7d26437a901a2
+EBUILD clutter-gst-1.0.0.ebuild 940 SHA256 c160ac3523d1837176923caf63603951eb76d9712f15bf14aba503f1ed936f11 SHA512 a3a634418fb43ed824d151be02bd1d7f24527212387c9e9830762c6b681b752629fbcede796e3e83e785b6b69fa405500f1d0ae800708f0c33897d01b088061e WHIRLPOOL d7fce243af046d648fb439f4b126aac2fa6b120e095cdd60c5e7f3e7d1bf59b2c4d53d077cccf4ed09057feea8c79fb976664ef18b8929bc4ad9a8081e070a8f
+EBUILD clutter-gst-1.4.4.ebuild 1337 SHA256 2fe034648f56c55af1cd89d5528d7f564e69e017f482394149d0cec76ee61590 SHA512 305dd29b0d66be57a960b26d9b67766add02e5450949cc8834ce482b2c39ca8e8ba6b10eb95fd0c5d5b74eeadbc0bd0de3cc89ae051d4feee750fde85f971157 WHIRLPOOL ca5513b1b4d4e83eb5005ba16f9d263b84ebc1752173652fe494c6c29b6121424a1830f79524dfa1b46f4b0707c3e900d424b0d27705189b09853c6a280bcd93
+EBUILD clutter-gst-1.4.6.ebuild 1551 SHA256 de6abb353d62825a88564f27bf1c3eb4cdaae0852d7d64ad901d8eb28f2c59dd SHA512 44b68b115903a8129db5105bb510cbcb3774f1f35cf81b0e938b545496babc9492999e6e6561e8e5a44c8e0d6eb4c0d6d0291f78d575ea25be5781e4d6dc5759 WHIRLPOOL 61ba431f17e385ce1a2dd6c122b55d1d133af92376be62540a681aa504a1a668e7beb9094a9f27a971eab09f710b2ce8fa8a7ababdd27dfa20f523df8d874bd0
+EBUILD clutter-gst-1.5.6.ebuild 1825 SHA256 39678040becbb4a2f58ef1918a02d399eaec98f34577cc78b1973ed039f154e7 SHA512 56671a4f6385f9f69e254919dc2dbb819c5929f2badae176a639122be0dceab7dcc65c93106ded46bb9bbb8fd63e85efbfeb522d3b82e51e8752c9f39378d92c WHIRLPOOL 763f544121c410871434b574a27f9c78226521e18d2ef5b68b212284fcc0a654557fcf1fedc049f3b3b3f1ee7c50acb428b1710c8e2978f9f1f18ddcdc6ebcae
+EBUILD clutter-gst-1.6.0.ebuild 1916 SHA256 05d6422b1b0f409b817c097d175edf1d60bcfdde54821c78da9d2a1af2d02b29 SHA512 85173543a9308a11fe78866a1d855111a63f41b7b5dfc18fe32e18a1b0ef177b52e6f892b5b75f8d3c774c8693049b43a46e7917f95534cb89dfd6fe07139ba5 WHIRLPOOL 639b1568c346eed586b8e8ed005dbbe25cd3a70590c66f9f57b481a9919665d128edbd51b17a13f553dbac500633b4144e627a08ea0dedcdc9fd2cb04e6e410d
+MISC ChangeLog 5123 SHA256 eafe68cbda6dcbeba46684313b4eb2b663124d53a336bf7a1fde76a369964229 SHA512 d213d2e4c95914399884ae711ad8891623b456d470842752d284834881dcac4882651a904334498e8e75b5258968b15d6c628a8fde8a92c71b4f3f7d09025bee WHIRLPOOL 5cdb1a7164c78a6c718d67bddf186a61b6b75afcfd167eda59e512a73428d859cc3bd773c9ee09b03b4d75e73062819492e704893a7d259daf3da76601bd85a9
+MISC metadata.xml 272 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314 SHA512 f3e9cc433eb6e6475a4281ad4dbb021bd050e00e194e9dd1b7ea619ea55a7f09ea2f4952e1e192e38764aba9260a6b15f06082685def060aa9ac7ead67d97237 WHIRLPOOL ed5cb90610d66f50314f1269b41424aff0990c4ff733c10d2f1424492cd01e4f7de682f1677c15b3e70508fe72dca8d04fccac6282395f0adb27b0df99a307cc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQVFE6AAoJEJ0WA1zPCt1hsn4H/2b0AjwGoqHDbVTmp/LyqFlY
+You/eismQRUUPdocC9pK2jebGBmk/8imYlAT4CNa61vqBFJMsTomvG5YkZftfaxb
+Afnoc+DPRiq7XE1+41LYJHB6LU3VlL6xLEtE2Z0c9TrSgWuiDM/J8VPvHIkAMEw2
+3WtzZ7tDGveRTIHf8CiSpS/BqndxQR4jhxzY/Lt+MqKMiw1qjbpzaHJf4m8rzP72
+Bptq12AF9wSVZUU7pTe64hhkHNAwRr39AopWsoNuD1ALYfmNTdk5xr4S3mqRp8gO
+l0uld5sLC9Uz7eRtCkSEkomGnWXma6L58V7dQPvUGl8F25cbAMfWhgcDRGvQnsA=
+=ffT1
+-----END PGP SIGNATURE-----
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
+