[meta-freescale] [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 at 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