[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6658/8267] mesa, gstreamer: Add "vulkan" DISTRO_FEATURE

[Emmanuele Bassi <ebassi src gnome org>]

commit 5da100c4eb33db69600df68f8157ec3a072107e4
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date:   Thu Jul 6 10:54:37 2017 +0300

    mesa, gstreamer: Add "vulkan" DISTRO_FEATURE
    
    It doesn't do much but does make enabling vulkan a little less fiddly.
    
    (From OE-Core rev: a5ed54e5253006ce3a5a74c1243c949a42642ff7)
    
    Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-graphics/mesa/mesa.inc                |    3 ++-
 .../gstreamer/gstreamer1.0-plugins-bad.inc         |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index a12ab7a..59e8923 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -25,7 +25,8 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 EXTRA_OECONF = "--enable-shared-glapi --with-llvm-prefix=${STAGING_BINDIR_NATIVE}"
 
 PACKAGECONFIG ??= "gbm egl gles dri \
-               ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \
+               ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 vulkan', d)} \
+               ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
                "
 PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc 
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 4f6bc85..e964fef 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -20,7 +20,7 @@ PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
     ${PACKAGECONFIG_GL} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
-    ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
     bz2 curl dash dtls hls neon rsvg sbc smoothstreaming sndfile uvch264 webp \
 "