From c1ab87caae92a58b1dfab7abc1a856fab102e3ed Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Mon, 29 Aug 2016 10:40:35 +0100 Subject: gstreamer1.0-plugins-bad: add packageconfig for egl In commit 9c3a94aea1d (gstreamer1.0-plugins-bad: Move EGL requirement for Wayland), --enable-egl was explicitely added to the wayland packageconfig. While this is correct that enabling wayland requires egl, it should be possible to enable egl without wayland, even when using X11. For example, glimagesink can be used for GPU based color conversion using EGL/GLES. As such, let's make egl and wayland two separate PACKAGECONFIG flags. Signed-off-by: Nicolas Dechesne Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index d8c8179aa9..a815c5061b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc @@ -21,7 +21,7 @@ PACKAGECONFIG ??= " \ ${PACKAGECONFIG_GL} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \ " @@ -32,6 +32,7 @@ PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2" PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" PACKAGECONFIG[dtls] = "--enable-dtls,--disable-dtls,openssl" +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" @@ -58,7 +59,7 @@ PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp" PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev" PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc" PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc" -PACKAGECONFIG[wayland] = "--enable-wayland --enable-egl,--disable-wayland --disable-egl,wayland-native wayland virtual/egl" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland" PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" # these plugins have not been ported to 1.0 (yet): -- cgit 1.2.3-korg