commit:     b48c47f3fa1b0692d05bc9a7386806e0f85e6c2c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 07:43:45 2014 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 07:43:45 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b48c47f3

gst-plugins-bad-1.4.3: Sync with my overlay for GL changes

Upstream rewrote GL everything (new glimagesink element moved from
gst-plugins-gl, removed eglglessink, etc) and configure changed with
that. Blindly port over changes to that effect from my overlay,
without the Raspberry-pi specifics to allow more correct testing
of bug 525936

---
 .../gst-plugins-bad/gst-plugins-bad-1.4.3.ebuild   | 25 +++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.3.ebuild 
b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.3.ebuild
index 00c7eb1..a412850 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.4.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://gstreamer.freedesktop.org/";
 
 LICENSE="LGPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="egl +introspection +orc vnc"
+IUSE="egl gles2 +introspection +orc opengl vnc wayland"
 
 # FIXME: we need to depend on mesa to avoid automagic on egl
 # dtmf plugin moved from bad to good in 1.2
@@ -21,9 +21,14 @@ RDEPEND="
        >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
        >=media-libs/gst-plugins-base-1.2:${SLOT}[${MULTILIB_USEDEP}]
        >=media-libs/gstreamer-1.2:${SLOT}[${MULTILIB_USEDEP}]
-       egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+       egl? (
+               >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+               wayland? ( media-libs/mesa[wayland,${MULTILIB_USEDEP}] )
+       )
+       gles2? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
        introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
        orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+       opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
 
        !<media-libs/gst-plugins-good-1.1:${SLOT}
 "
@@ -40,13 +45,27 @@ src_configure() {
 }
 
 multilib_src_configure() {
+       local myconf
+       myconf=""
+       if use egl; then
+               myconf+=" --enable-egl --enable-gl"
+               if use wayland; then
+                       myconf+=" --enable-wayland"
+               fi
+       else
+               myconf+=" --disable-egl"
+       fi
+
        gstreamer_multilib_src_configure \
                $(multilib_native_use_enable introspection) \
                $(use_enable orc) \
                $(use_enable vnc librfb) \
+               --disable-dispmanx \
                --disable-examples \
                --disable-debug \
-               --with-egl-window-system=$(usex egl x11 none)
+               $(use_enable gles2) \
+               $(use_enable opengl gl) \
+               ${myconf}
 }
 
 multilib_src_install_all() {

Reply via email to