diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-02-15 12:29:15 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-02-15 12:29:15 +0000 |
| commit | 064848b7885a242903b0e3fadf8999a46814c3ef (patch) | |
| tree | 79c790fb442c2f11f9cdccccb36a8d866f2595ed /media-libs | |
| parent | amd64 stable, bug #539324 (diff) | |
| download | gentoo-2-064848b7885a242903b0e3fadf8999a46814c3ef.tar.gz gentoo-2-064848b7885a242903b0e3fadf8999a46814c3ef.tar.bz2 gentoo-2-064848b7885a242903b0e3fadf8999a46814c3ef.zip | |
gles2 also collides with opengl (#525936)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/gst-plugins-bad/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-libs/gst-plugins-bad/ChangeLog b/media-libs/gst-plugins-bad/ChangeLog index 7cf21cb26452..665ad2db9006 100644 --- a/media-libs/gst-plugins-bad/ChangeLog +++ b/media-libs/gst-plugins-bad/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/gst-plugins-bad # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog,v 1.163 2015/02/03 18:19:01 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog,v 1.164 2015/02/15 12:29:15 pacho Exp $ + + 15 Feb 2015; Pacho Ramos <pacho@gentoo.org> gst-plugins-bad-1.4.5.ebuild: + gles2 also collides with opengl (#525936) 03 Feb 2015; Pacho Ramos <pacho@gentoo.org> gst-plugins-bad-1.4.5.ebuild: Rework the REQUIRED_USE to express egl and gles2 cannot be combined diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild index 0da476117af1..df352f2235e1 100644 --- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild,v 1.2 2015/02/03 18:19:01 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild,v 1.3 2015/02/15 12:29:15 pacho Exp $ EAPI="5" GST_ORG_MODULE="gst-plugins-bad" @@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x8 IUSE="X egl gles2 +introspection opengl +orc vnc wayland" REQUIRED_USE=" egl? ( !gles2 ) - gles2? ( !egl ) + gles2? ( !egl !opengl ) opengl? ( X ) wayland? ( egl ) " |