Fix introspection, gstreamer, clutter-related access violations

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 17 insertions, 44 deletions

diff --git a/media-libs/clutter-gst/ChangeLog b/media-libs/clutter-gst/ChangeLog
index 3aeee04b4a83..9904ff202bc5 100644
--- a/media-libs/clutter-gst/ChangeLog
+++ b/media-libs/clutter-gst/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/clutter-gst
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.6 2011/03/05 15:07:19 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.7 2011/03/23 10:21:27 nirbheek Exp $
+
+  23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -clutter-gst-1.3.4-r1.ebuild, clutter-gst-1.3.6.ebuild:
+  Fix introspection, gstreamer, clutter-related access violations
 
 *clutter-gst-1.3.6 (05 Mar 2011)
 
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index fb800d5b6837..198178551fd4 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,8 +1,6 @@
 DIST clutter-gst-1.0.0.tar.bz2 414768 RMD160 f5c825e6c5da62a39a98e5515c0ede2e3e801907 SHA1 22f262b8d4d70d5d0ef499614fc0332a7a641241 SHA256 ae6ec048b570157130e9f9069f2495caf0da9eefa8d7f3b1789f3346fb16f696
-DIST clutter-gst-1.3.4.tar.bz2 446018 RMD160 4d80a22ec9cb5fecc3ba942c61be80ad7c8d76fe SHA1 0a370ccd2de19f91721f1df3202b29bebb566a15 SHA256 de4ce6d3313be3074c6afc6f20276ef06f1a460b3a6755fc5c6e048685de137a
 DIST clutter-gst-1.3.6.tar.bz2 452087 RMD160 628ec36a2555cdb5be39478179dd4fbd01eff4e4 SHA1 f2518bb28cacd7bece0ff4ea53e518865657b455 SHA256 68c79596ae46ed54885409cac1eeeaf6819673e2f41ee3014fe9705dfbbc1b5a
 EBUILD clutter-gst-1.0.0.ebuild 944 RMD160 10b681dc25b09d33cd0eeba211a2616267fd442b SHA1 78b1dfb19e3cd149fbafd431787655494dae5669 SHA256 8ed5f0238782ccc5a7ade228f533316909ff634fdc6b5ea8432a50ef11825f5a
-EBUILD clutter-gst-1.3.4-r1.ebuild 1114 RMD160 acb180b8a47a43a7f49284cf1a59ece753ef73b8 SHA1 41d609808c5a71c02da2534c42b11e1ab57d9308 SHA256 b8208ed458cb3e3ac7d1041c846e2bd75a893a4e34236b7fcfd3efe331974e93
-EBUILD clutter-gst-1.3.6.ebuild 1111 RMD160 f017c6a591c08c79c98941fe64a1d40e727c1212 SHA1 6f510d0eb40b8b4ca6b81fc8c4e687db93329ccf SHA256 7c9dc1df256360e681d1f9bb7b3d84f46822c5ebe48e517a4913e77c5607ab17
-MISC ChangeLog 1279 RMD160 96afec329a114e7ae68428cacb7160dd7d0038d8 SHA1 136d3b62dd0735dedfa3a844a2a73ae669b4d5cf SHA256 b8dd7b168ffd1e0df3a6ece5a49bc61310979be51bbfd90335eab26b9f9b7cc0
+EBUILD clutter-gst-1.3.6.ebuild 1353 RMD160 703bdd051de519bbddfd45c0a06ccb9049807471 SHA1 4845b79a90fa6d3bfa719a26f0d46b91532c8c24 SHA256 18bb934eb35c4fdec0355ccc4759747818f28ce6e656afc4af2d1a3f5bd25797
+MISC ChangeLog 1458 RMD160 161bf17033814366f84177adc3b61f1244a92d4c SHA1 1a9627bdbf24013646fd48a62c41b9f00471db7c SHA256 0664fa84dc9f9f9300988b834b781f624e79e9cf3631784820555d730d61b0b7
 MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
diff --git a/media-libs/clutter-gst/clutter-gst-1.3.4-r1.ebuild b/media-libs/clutter-gst/clutter-gst-1.3.4-r1.ebuild
deleted file mode 100644
index 6ca61da0adbd..000000000000
--- a/media-libs/clutter-gst/clutter-gst-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.4-r1.ebuild,v 1.2 2011/02/18 06:44:43 nirbheek Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2" # Just a build-time dependency
-CLUTTER_LA_PUNT="yes"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-inherit python gnome2 clutter
-
-DESCRIPTION="GStreamer Integration library for Clutter"
-
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.20
-	>=media-libs/clutter-1.4.0:1.0[introspection?]
-	media-libs/gstreamer:0.10[introspection?]
-	media-libs/gst-plugins-base:0.10[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.8 )"
-
-DOCS="AUTHORS NEWS README"
-EXAMPLES="examples/{*.c,*.png,README}"
-
-src_prepare() {
-	# 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
-}
diff --git a/media-libs/clutter-gst/clutter-gst-1.3.6.ebuild b/media-libs/clutter-gst/clutter-gst-1.3.6.ebuild
index b87943d4f586..d03397f35469 100644
--- a/media-libs/clutter-gst/clutter-gst-1.3.6.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.3.6.ebuild
@@ -1,13 +1,13 @@
 # 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.6.ebuild,v 1.1 2011/03/05 15:07:19 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.3.6.ebuild,v 1.2 2011/03/23 10:21:27 nirbheek Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2" # Just a build-time dependency
 CLUTTER_LA_PUNT="yes"
 
 # inherit clutter after gnome2 so that defaults aren't overriden
-inherit python gnome2 clutter
+inherit python gnome2 clutter virtualx
 
 DESCRIPTION="GStreamer Integration library for Clutter"
 
@@ -35,3 +35,11 @@ src_prepare() {
 	gnome2_src_prepare
 	python_convert_shebangs 2 "${S}"/scripts/pso2h.py
 }
+
+src_compile() {
+	# Avoid sandbox violation with USE="introspection", bug #356283
+	export GST_REGISTRY=${T}/registry.cache.xml
+	# Clutter tries to access dri without userpriv
+	addpredict /dev/dri/card0
+	emake || die "emake failed"
+}