Skip to contentSkip to conversation

glmark2: upgrade to latest HEAD

PATCH New Ross Burton 1 participant 2 messages Nov 26, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 glmark2: upgrade to latest HEAD

---
 meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +2 -2
index d590b0501b..8b767463bf 100644
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 
 DEPENDS = "libpng jpeg udev"
 
-PV = "20190205+${SRCPV}"
+PV = "20190904+${SRCPV}"
 
 COMPATIBLE_HOST_rpi  = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}"
 
 SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https"
-SRCREV = "c17fd14505f30d9e4dbad276f7aa956fd21a637b"
+SRCREV = "24a1139dcbfd86bd02065316eaa90559e39374e1"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 glmark2: use Python 3 to build

---
 .../recipes-benchmark/glmark2/glmark2/python3.patch  | 12 ++++++++++++
 meta-oe/recipes-benchmark/glmark2/glmark2_git.bb     |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch
meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch new file +12 -0
new file mode 100644
index 0000000000..df208cf878
@@ -0,0 +1,12 @@
+Use Python 3 instead of Python 2.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <[email protected]>
+
+diff --git a/waf b/waf
+index 6ce2a24..de3c898 100755
+--- a/waf
++++ b/waf
+@@ -1 +1 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +2 -1
index 8b767463bf..50b553c807 100644
@@ -14,7 +14,8 @@ PV = "20190904+${SRCPV}"
 
 COMPATIBLE_HOST_rpi  = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}"
 
-SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https"
+SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \
+           file://python3.patch"
 SRCREV = "24a1139dcbfd86bd02065316eaa90559e39374e1"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.20.1