[meta-freescale] [meta-fsl-demos][PATCH v2 2/9] packagegroup-fsl-gpu-external: Update to support tools on specific SoC

[Lauren Post]

Add glcompbench and gtkperf to the external package group but only
install on X11 for specific i.MX SoC.  glcompbench not supported on SoloLite.
Add OpenCV apps and samples to package group.
Add Wayland support for glmark2 but not for SoloLite.

Signed-off-by: Lauren Post <lauren.post at freescale.com>
---
 .../packagegroup-fsl-tools-gpu-external.bb         |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
index 2455084..cfe6325 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-tools-gpu-external.bb
@@ -17,9 +17,11 @@ SOC_GPU_TOOLS_X11 = " \
     mesa-demos \
     glmark2 \
 "
-SOC_GPU_TOOLS_X11_append_mx6q  = " eglinfo-x11"
-SOC_GPU_TOOLS_X11_append_mx6dl = " eglinfo-x11"
-SOC_GPU_TOOLS_X11_append_mx6sx = " eglinfo-x11"
+
+SOC_GPU_TOOLS_X11_append_mx6q  = " eglinfo-x11 gtkperf glcompbench"
+SOC_GPU_TOOLS_X11_append_mx6dl = " eglinfo-x11 gtkperf glcompbench"
+SOC_GPU_TOOLS_X11_append_mx6sx = " eglinfo-x11 gtkperf glcompbench"
+SOC_GPU_TOOLS_X11_append_mx6sl = " gtkperf"
 
 SOC_GPU_TOOLS_FB = ""
 SOC_GPU_TOOLS_FB_mx6q  = "eglinfo-fb"
@@ -27,13 +29,21 @@ SOC_GPU_TOOLS_FB_mx6dl = "eglinfo-fb"
 SOC_GPU_TOOLS_FB_mx6sx = "eglinfo-fb"
 
 SOC_GPU_TOOLS_WAYLAND = ""
+SOC_GPU_TOOLS_WAYLAND_append_mx6q  = " glmark2"
+SOC_GPU_TOOLS_WAYLAND_append_mx6dl = " glmark2"
+SOC_GPU_TOOLS_WAYLAND_append_mx6sx = " glmark2"
 
 SOC_GPU_TOOLS_DIRECTFB = ""
 
+# OpenCV test apps
+OPENCV_TOOLS_INSTALL = ""
+OPENCV_TOOLS_INSTALL_append_mx6 = "opencv-apps opencv-samples"
+
 RDEPENDS_${PN} = " \
     ${@base_contains("LICENSE_FLAGS_WHITELIST", "commercial", "opencv-samples", "", d)} \
     ${@base_contains("DISTRO_FEATURES", "x11", "${SOC_GPU_TOOLS_X11}", \
         base_contains("DISTRO_FEATURES", "wayland", "${SOC_GPU_TOOLS_WAYLAND}", \
             base_contains("DISTRO_FEATURES", "directfb", "${SOC_GPU_TOOLS_DIRECTFB}", \
                  "${SOC_GPU_TOOLS_FB}", d), d), d)} \
+    ${OPENCV_TOOLS_INSTALL} \
 "
-- 
1.7.9.5