summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-03-24 03:11:41 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-03-24 03:11:41 +0000
commit2bef9893a240eec81dbd1e6871e971a1d6667a15 (patch)
tree59a56cb314c9d0836363315e02ee1ac87dc39283 /media-libs
parentVersion bump. Remove old ebuilds. Security bug #359769 (diff)
downloadgentoo-2-2bef9893a240eec81dbd1e6871e971a1d6667a15.tar.gz
gentoo-2-2bef9893a240eec81dbd1e6871e971a1d6667a15.tar.bz2
gentoo-2-2bef9893a240eec81dbd1e6871e971a1d6667a15.zip
Refine the dri addpredict, bug 360219
(Portage version: 2.1.9.44/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/clutter-gst/ChangeLog6
-rw-r--r--media-libs/clutter-gst/clutter-gst-1.3.6.ebuild14
2 files changed, 15 insertions, 5 deletions
diff --git a/media-libs/clutter-gst/ChangeLog b/media-libs/clutter-gst/ChangeLog
index c899ab6d0e0c..44d018d3e22e 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.8 2011/03/23 11:12:26 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.9 2011/03/24 03:11:41 nirbheek Exp $
+
+ 24 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+ clutter-gst-1.3.6.ebuild:
+ Refine the dri addpredict, bug 360219
23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
clutter-gst-1.3.6.ebuild:
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 cf1b720603a0..a4f3cb66a3a9 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.3 2011/03/23 11:12:26 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.3.6.ebuild,v 1.4 2011/03/24 03:11:41 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 virtualx
+inherit python gnome2 clutter
DESCRIPTION="GStreamer Integration library for Clutter"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="debug doc examples +introspection"
RDEPEND="
- >=dev-libs/glib-2.20
+ >=dev-libs/glib-2.20:2
>=media-libs/clutter-1.4.0:1.0[introspection?]
media-libs/gstreamer:0.10[introspection?]
media-libs/gst-plugins-base:0.10[introspection?]
@@ -39,7 +39,13 @@ src_prepare() {
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 $(echo /dev/dri/card? | sed 's/ /:/g')
+ # Massive failure of a hack, see bug 360219 and bug 360073
+ shopt -s nullglob
+ local cards=$(echo -n /dev/dri/card* /dev/nvidiactl* | sed 's/ /:/g')
+ shopt -u nullglob
+ test -n "${cards}" && addpredict "${cards}"
+
emake || die "emake failed"
}