Workaround sandbox violations due to gst-inspect, bug #358755 & co.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 29 insertions, 13 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index 7dc3f2d12a9c..cfb35c6854ad 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/totem
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.354 2013/01/12 11:11:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.355 2013/01/12 11:38:07 eva Exp $
+
+  12 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> totem-2.32.0-r2.ebuild,
+  totem-3.4.3.ebuild, totem-3.6.3-r1.ebuild:
+  Workaround sandbox violations due to gst-inspect, bug #358755 & co.
 
   12 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> totem-2.32.0-r2.ebuild,
   totem-3.4.3.ebuild:
diff --git a/media-video/totem/totem-2.32.0-r2.ebuild b/media-video/totem/totem-2.32.0-r2.ebuild
index 92a0dc4dcea8..45430574dc1d 100644
--- a/media-video/totem/totem-2.32.0-r2.ebuild
+++ b/media-video/totem/totem-2.32.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.14 2013/01/12 11:11:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.15 2013/01/12 11:38:08 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -157,6 +157,12 @@ src_prepare() {
 
 	# disable pyc compiling
 	python_clean_py-compile_files
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst010_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
 }
 
 src_configure() {
diff --git a/media-video/totem/totem-3.4.3.ebuild b/media-video/totem/totem-3.4.3.ebuild
index ffd9be7fbd47..8d5e706282cf 100644
--- a/media-video/totem/totem-3.4.3.ebuild
+++ b/media-video/totem/totem-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.4.3.ebuild,v 1.6 2013/01/12 11:11:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.4.3.ebuild,v 1.7 2013/01/12 11:38:07 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -164,13 +164,12 @@ src_prepare() {
 	# Only needed when regenerating C sources from Vala files
 	#use vala && vala_src_prepare
 	gnome2_src_prepare
-}
 
-src_configure() {
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-0.10 (bug #358755)
-	unset DISPLAY
-	gnome2_src_configure
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst010_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
 }
 
 pkg_postinst() {
diff --git a/media-video/totem/totem-3.6.3-r1.ebuild b/media-video/totem/totem-3.6.3-r1.ebuild
index 664713be047e..a5420983c277 100644
--- a/media-video/totem/totem-3.6.3-r1.ebuild
+++ b/media-video/totem/totem-3.6.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.6.3-r1.ebuild,v 1.7 2013/01/06 09:58:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.6.3-r1.ebuild,v 1.8 2013/01/12 11:38:07 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -88,6 +88,16 @@ DEPEND="${RDEPEND}
 "
 # docbook-xml-dtd is needed for user doc
 
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
+
 src_configure() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 	use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
@@ -125,9 +135,6 @@ src_configure() {
 
 	G2CONF="${G2CONF} --with-plugins=${plugins}"
 
-	# Work around sandbox violations when FEATURES=-userpriv caused by
-	# gst-inspect-1.0(bug #358755)
-	unset DISPLAY
 	gnome2_src_configure
 }