[meta-freescale] [meta-fsl-demos][PATCH 2/4] fsl-image-multimedia: Add XWayland support.

[Tom Hochstein]

If DISTRO_FEATURES contains x11 and wayland, configure the image
with an XWayland backend.

Signed-off-by: Tom Hochstein <tom.hochstein at nxp.com>
---
 recipes-fsl/images/fsl-image-multimedia.bb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/recipes-fsl/images/fsl-image-multimedia.bb b/recipes-fsl/images/fsl-image-multimedia.bb
index a51d0a2..331084d 100644
--- a/recipes-fsl/images/fsl-image-multimedia.bb
+++ b/recipes-fsl/images/fsl-image-multimedia.bb
@@ -3,7 +3,9 @@ Freescale's multimedia packages (VPU and GPU) when available for the specific \
 machine."
 
 IMAGE_FEATURES += "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'x11-base', \
+                                                       '', d), d)} \
 "
 
 LICENSE = "MIT"
@@ -13,10 +15,11 @@ inherit core-image
 CORE_IMAGE_EXTRA_INSTALL += " \
     packagegroup-fsl-tools-gpu \
     packagegroup-fsl-gstreamer1.0 \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                      bb.utils.contains('DISTRO_FEATURES', 'wayland', \
-                                    'weston weston-init weston-examples \
-                                         gtk+3-demo clutter-1.0-examples', '', d), d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+                         'weston weston-init weston-examples \
+                          gtk+3-demo clutter-1.0-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \
+                         'weston-xwayland xterm', '', d)} \
 "
 
 CORE_IMAGE_EXTRA_INSTALL_remove_mx6sl = "clutter-1.0-examples"
-- 
1.9.1