[meta-fsl-demos][PATCH 1/4] fsl-image-machine-test: Add XWayland support.

[meta-fsl-demos][PATCH 1/4] fsl-image-machine-test: 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@nxp.com>
---
 recipes-fsl/images/fsl-image-machine-test.bb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/recipes-fsl/images/fsl-image-machine-test.bb b/recipes-fsl/images/fsl-image-machine-test.bb
index def19ee..c0ae7fa 100644
--- a/recipes-fsl/images/fsl-image-machine-test.bb
+++ b/recipes-fsl/images/fsl-image-machine-test.bb
@@ -3,7 +3,9 @@ Freescale's multimedia packages (VPU and GPU) when available, and \
 test and benchmark applications."
 
 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)} \
     debug-tweaks \
     tools-testapps \
     tools-profile \
@@ -20,7 +22,8 @@ CORE_IMAGE_EXTRA_INSTALL += " \
     packagegroup-fsl-tools-gpu-external \
     packagegroup-fsl-tools-testapps \
     packagegroup-fsl-tools-benchmark \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \
-                      bb.utils.contains('DISTRO_FEATURES', 'wayland', 'weston-init', \
-                                    '', d), d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \
+                         'weston weston-init', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \
+                         'weston-xwayland xterm', '', d)} \
 "
-- 
1.9.1

[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@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

[meta-fsl-demos][PATCH 3/4] packagegroup-fsl-tools-gpu: Add XWayland support.

[Tom Hochstein]

If DISTRO_FEATURES contains x11 and wayland, don't include
xserver-xorg-extension-viv-autohdmi.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
index 94bd988..eabb990 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014 Freescale Semiconductor
+# Copyright (C) 2012-2014, 2016 Freescale Semiconductor
 # Copyright (C) 2015, 2016 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 
@@ -16,8 +16,9 @@ SOC_TOOLS_GPU_IMX6QDLSX = " \
     fsl-gpu-sdk \
     imx-gpu-viv-tools \
     imx-gpu-viv-tools-apitrace \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \
-                     'xserver-xorg-extension-viv-autohdmi', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'xserver-xorg-extension-viv-autohdmi', \
+                                                       '', d), d)} \
 "
 SOC_TOOLS_GPU_mx6q  = "${SOC_TOOLS_GPU_IMX6QDLSX}"
 SOC_TOOLS_GPU_mx6dl = "${SOC_TOOLS_GPU_IMX6QDLSX}"
@@ -29,8 +30,9 @@ SOC_TOOLS_GPU_mx6sx = "${SOC_TOOLS_GPU_IMX6QDLSX}"
 SOC_TOOLS_GPU_mx6sl = " \
     imx-gpu-viv-g2d \
     imx-gpu-viv-tools \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \
-                     'xserver-xorg-extension-viv-autohdmi', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
+       bb.utils.contains('DISTRO_FEATURES',     'x11', 'xserver-xorg-extension-viv-autohdmi', \
+                                                       '', d), d)} \
 "
 
 RDEPENDS_${PN} = " \
-- 
1.9.1

[meta-fsl-demos][PATCH 4/4] packagegroup-fsl-tools-gpu-external: Add packages for Wayland and XWayland.

[Tom Hochstein]

If DISTRO_FEATURES contains just wayland, add mesa-demos.

If DISTRO_FEATURES contains x11 and wayland, add mesa-demos and gtkperf.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 .../packagegroup-fsl-tools-gpu-external.bb         | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
index fa34a1c..92d0e76 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Freescale Semiconductor
+# Copyright (C) 2014, 2016 Freescale Semiconductor
 # Copyright (C) 2015, 2016 O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 DESCRIPTION = "Package group used by FSL Community to provide graphic packages used \
@@ -26,12 +26,20 @@ SOC_GPU_TOOLS_FB_mx6dl = "eglinfo-fb"
 SOC_GPU_TOOLS_FB_mx6sx = "eglinfo-fb"
 
 SOC_GPU_TOOLS_WAYLAND = ""
-SOC_GPU_TOOLS_WAYLAND_mx6q  = "glmark2"
-SOC_GPU_TOOLS_WAYLAND_mx6dl = "glmark2"
-SOC_GPU_TOOLS_WAYLAND_mx6sx = "glmark2"
+SOC_GPU_TOOLS_WAYLAND_mx6q  = "mesa-demos glmark2"
+SOC_GPU_TOOLS_WAYLAND_mx6dl = "mesa-demos glmark2"
+SOC_GPU_TOOLS_WAYLAND_mx6sx = "mesa-demos glmark2"
+SOC_GPU_TOOLS_WAYLAND_mx6sl = "mesa-demos"
+
+SOC_GPU_TOOLS_XWAYLAND = ""
+SOC_GPU_TOOLS_XWAYLAND_mx6q  = "mesa-demos gtkperf glmark2"
+SOC_GPU_TOOLS_XWAYLAND_mx6dl = "mesa-demos gtkperf glmark2"
+SOC_GPU_TOOLS_XWAYLAND_mx6sx = "mesa-demos gtkperf glmark2"
+SOC_GPU_TOOLS_XWAYLAND_mx6sl = "mesa-demos gtkperf"
 
 RDEPENDS_${PN} = " \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${SOC_GPU_TOOLS_X11}", \
-        bb.utils.contains("DISTRO_FEATURES", "wayland", "${SOC_GPU_TOOLS_WAYLAND}", \
-                 "${SOC_GPU_TOOLS_FB}", d), d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland", "${SOC_GPU_TOOLS_XWAYLAND}", \
+       bb.utils.contains("DISTRO_FEATURES",     "wayland", "${SOC_GPU_TOOLS_WAYLAND}", \
+       bb.utils.contains("DISTRO_FEATURES",         "x11", "${SOC_GPU_TOOLS_X11}", \
+                                                           "${SOC_GPU_TOOLS_FB}", d), d), d)} \
 "
-- 
1.9.1