pacho 15/02/15 12:29:15 Modified: gst-plugins-bad-1.4.5.ebuild ChangeLog Log: gles2 also collides with opengl (#525936) (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Revision Changes Path 1.3 media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild?r1=1.2&r2=1.3 Index: gst-plugins-bad-1.4.5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.5.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gst-plugins-bad-1.4.5.ebuild 3 Feb 2015 18:19:01 -0000 1.2 +++ gst-plugins-bad-1.4.5.ebuild 15 Feb 2015 12:29:15 -0000 1.3 @@ -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 @@ IUSE="X egl gles2 +introspection opengl +orc vnc wayland" REQUIRED_USE=" egl? ( !gles2 ) - gles2? ( !egl ) + gles2? ( !egl !opengl ) opengl? ( X ) wayland? ( egl ) " 1.164 media-libs/gst-plugins-bad/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog?rev=1.164&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog?rev=1.164&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog?r1=1.163&r2=1.164 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- ChangeLog 3 Feb 2015 18:19:01 -0000 1.163 +++ ChangeLog 15 Feb 2015 12:29:15 -0000 1.164 @@ -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 <pa...@gentoo.org> gst-plugins-bad-1.4.5.ebuild: + gles2 also collides with opengl (#525936) 03 Feb 2015; Pacho Ramos <pa...@gentoo.org> gst-plugins-bad-1.4.5.ebuild: Rework the REQUIRED_USE to express egl and gles2 cannot be combined