[meta-freescale] [meta-fsl-arm][PATCH 22/33] glmark2: Add support for building on wayland

[Lauren Post]

Signed-off-by: Lauren Post <lauren.post at freescale.com>
---
 .../recipes-benchmark/glmark2/glmark2_%.bbappend   |   27 ++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
index 8e57d66..c3c0e5b 100644
--- a/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
+++ b/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend
@@ -1,3 +1,26 @@
-#Remove gles2 as it is not supported by sololite
+DEPENDS_remove = "virtual/libx11"
 
-PACKAGECONFIG_remove_mx6sl = "gles2"
+REQUIRED_DISTRO_FEATURES_remove = "x11"
+
+REMOVE_GL = "${@base_contains('DISTRO_FEATURES', 'x11', '', \
+                base_contains('DISTRO_FEATURES', 'wayland', 'gl', '', d), d)}"
+
+PACKAGECONFIG_remove_mx6 = "${REMOVE_GL}"
+
+python __anonymous() {
+
+    packageconfig = (d.getVar("PACKAGECONFIG", True) or "").split()
+    flavors = []
+    if "gles2" in packageconfig:
+        if bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d):
+         flavors.append("x11-glesv2")
+        elif bb.utils.contains('DISTRO_FEATURES', 'wayland', True, False, d):
+         flavors.append("wayland-glesv2")
+    if "gl" in packageconfig:
+        if bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d):
+         flavors.append("x11-gl")
+        elif bb.utils.contains('DISTRO_FEATURES', 'wayland', True, False, d):
+         flavors.append("wayland-gl")
+    if flavors:
+        d.appendVar("EXTRA_OECONF", " --with-flavors=%s" % ",".join(flavors))
+}
-- 
1.7.9.5