[meta-freescale] [meta-fsl-demos][PATCH v3 3/6] packagegroup-fsl-tools-gpu: Do no add xserver-xorg-extension-viv-autohdmi for xwayland

[Tom Hochstein]

From: Neena Busireddy <neena.busireddy at freescale.com>

When both x11 and wayland DISTRO_FEATURES are availiable, install wayland packages as
we will be using x11 on top of wayland (xwayland).

xserver-xorg-extension-viv-autohdmi is a x11 package and do not install it for xwayland.

Signed-off-by: Neena Busireddy <neena.busireddy at freescale.com>
Signed-off-by: Tom Hochstein <tom.hochstein at freescale.com>
---
 recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
index 71df6e0..c4912e3 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu.bb
@@ -20,7 +20,7 @@ SOC_TOOLS_GPU_IMX6QDLSX = " \
     imx-gpu-viv-tools \
     imx-gpu-viv-tools-apitrace \
     ${@base_contains('DISTRO_FEATURES', 'x11', \
-                     'xserver-xorg-extension-viv-autohdmi', '', d)} \
+           base_contains('DISTRO_FEATURES', 'wayland', '', 'xserver-xorg-extension-viv-autohdmi', d), '', d)} \
 "
 SOC_TOOLS_GPU_mx6q  = "${SOC_TOOLS_GPU_IMX6QDLSX}"
 SOC_TOOLS_GPU_mx6dl = "${SOC_TOOLS_GPU_IMX6QDLSX}"
@@ -33,7 +33,7 @@ SOC_TOOLS_GPU_mx6sl = " \
     imx-gpu-viv-g2d \
     imx-gpu-viv-tools \
     ${@base_contains('DISTRO_FEATURES', 'x11', \
-                     'xserver-xorg-extension-viv-autohdmi', '', d)} \
+           base_contains('DISTRO_FEATURES', 'wayland', '', 'xserver-xorg-extension-viv-autohdmi', d), '', d)} \
 "
 
 RDEPENDS_${PN} = " \
-- 
2.1.4