summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2016-08-29 10:40:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 23:45:52 +0100
commitfef13d890c11a52615592fef261e7d7a1cae91e2 (patch)
tree0321c828adb4aeea327ba98b44b0bc59e8bb6d96
parent4b4387455c62cf19fa3d215a11b5d0b1211d4570 (diff)
downloadpoky-fef13d890c11a52615592fef261e7d7a1cae91e2.tar.gz
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. (From OE-Core rev: c1ab87caae92a58b1dfab7abc1a856fab102e3ed) Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc5
1 files changed, 3 insertions, 2 deletions
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 ??= " \
21 ${PACKAGECONFIG_GL} \ 21 ${PACKAGECONFIG_GL} \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
23 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ 23 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
25 bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \ 25 bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \
26" 26"
27 27
@@ -32,6 +32,7 @@ PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
32PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2" 32PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2"
33PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" 33PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb"
34PACKAGECONFIG[dtls] = "--enable-dtls,--disable-dtls,openssl" 34PACKAGECONFIG[dtls] = "--enable-dtls,--disable-dtls,openssl"
35PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
35PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" 36PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac"
36PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" 37PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2"
37PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" 38PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa"
@@ -58,7 +59,7 @@ PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp"
58PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev" 59PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev"
59PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc" 60PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc"
60PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc" 61PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc"
61PACKAGECONFIG[wayland] = "--enable-wayland --enable-egl,--disable-wayland --disable-egl,wayland-native wayland virtual/egl" 62PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland"
62PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" 63PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
63 64
64# these plugins have not been ported to 1.0 (yet): 65# these plugins have not been ported to 1.0 (yet):