[oe-commits] Diego Rondini : glmark2: update to version 2014.03

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: e6af2100727346a1fcabbbec4569601889726416
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=e6af2100727346a1fcabbbec4569601889726416

Author: Diego Rondini <diego.ml at zoho.com>
Date:   Thu May  8 17:28:45 2014 +0200

glmark2: update to version 2014.03

Update glmark2 receipe to upstream version 2014.03.

The configure step has changed and instead of using "--enable-stuff" syntax, now the syntax is "--with-flavors=flavor1,flavor2".
Thanks to Paul Eggleton for the help on how to deal with that:
https://lists.yoctoproject.org/pipermail/yocto/2014-April/019328.html

Signed-off-by: Diego Rondini <diego.ml at zoho.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../{glmark2_2012.12.bb => glmark2_2014.03.bb}        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_2014.03.bb
similarity index 52%
rename from meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb
rename to meta-oe/recipes-benchmark/glmark2/glmark2_2014.03.bb
index 031e3b3..3ff0449 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_2012.12.bb
+++ b/meta-oe/recipes-benchmark/glmark2/glmark2_2014.03.bb
@@ -12,12 +12,23 @@ DEPENDS = "libpng12 jpeg"
 
 SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "4f306664aa3886fa0cf93853603603f8"
-SRC_URI[sha256sum] = "bea6f9de2cdce376195bd91e4a2fdfdf80bf3e480abff8e05b90a6458c1deb47"
+SRC_URI[md5sum] = "739859cf57d4c8a23452c43e84f66e56"
+SRC_URI[sha256sum] = "bded41aaf918ce062d9b81e42cc5be943e6a80bc4ff9d046983b96102c3df6b5"
 
 inherit waf pkgconfig
 
 PACKAGECONFIG ?= "gl gles2"
 
-PACKAGECONFIG[gl] = "--enable-gl,,virtual/libgl"
-PACKAGECONFIG[gles2] = "--enable-glesv2,,virtual/libgles2"
+PACKAGECONFIG[gl] = ",,virtual/libgl"
+PACKAGECONFIG[gles2] = ",,virtual/libgles2"
+
+python __anonymous() {
+    packageconfig = (d.getVar("PACKAGECONFIG", True) or "").split()
+    flavors = []
+    if "gles2" in packageconfig:
+        flavors.append("x11-glesv2")
+    if "gl" in packageconfig:
+        flavors.append("x11-gl")
+    if flavors:
+        d.appendVar("EXTRA_OECONF", " --with-flavors=%s" % ",".join(flavors))
+}