From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH v2] glmark2: version bump 2019-03-27-geaa70888 -> 2020.04
Date: Mon, 6 Jul 2020 14:14:34 +0200 [thread overview]
Message-ID: <20200706121434.21053-1-p.zabel@pengutronix.de> (raw)
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
Changed since v1:
- added python3 fix from master
---
...1-Build-Fix-Python-3-incompatibility.patch | 21 +++++++++++++++++++
patches/glmark2-2020.04/series | 4 ++++
rules/glmark2.make | 9 ++++----
3 files changed, 29 insertions(+), 5 deletions(-)
create mode 100644 patches/glmark2-2020.04/0001-Build-Fix-Python-3-incompatibility.patch
create mode 100644 patches/glmark2-2020.04/series
diff --git a/patches/glmark2-2020.04/0001-Build-Fix-Python-3-incompatibility.patch b/patches/glmark2-2020.04/0001-Build-Fix-Python-3-incompatibility.patch
new file mode 100644
index 000000000000..88c85406a9af
--- /dev/null
+++ b/patches/glmark2-2020.04/0001-Build-Fix-Python-3-incompatibility.patch
@@ -0,0 +1,21 @@
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Sun, 3 May 2020 18:20:05 +0200
+Subject: [PATCH] Build: Fix Python 3 incompatibility
+
+---
+ wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index aefde706be0a..e09fa7850e1c 100644
+--- a/wscript
++++ b/wscript
+@@ -20,7 +20,7 @@ FLAVORS = {
+ 'x11-gl' : 'glmark2',
+ 'x11-glesv2' : 'glmark2-es2',
+ }
+-FLAVORS_STR = ", ".join(sorted(FLAVORS.keys() + ['all-linux', 'all-win32']))
++FLAVORS_STR = ", ".join(sorted(list(FLAVORS) + ['all-linux', 'all-win32']))
+
+ def linux_flavors():
+ return [f for f in FLAVORS.keys() if not f.startswith('win32')]
diff --git a/patches/glmark2-2020.04/series b/patches/glmark2-2020.04/series
new file mode 100644
index 000000000000..c7415054f2f3
--- /dev/null
+++ b/patches/glmark2-2020.04/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Build-Fix-Python-3-incompatibility.patch
+# 6f94baa0134364a7f817abb600ce0eb2 - git-ptx-patches magic
diff --git a/rules/glmark2.make b/rules/glmark2.make
index 5f495886deb3..d6b35a3bfca4 100644
--- a/rules/glmark2.make
+++ b/rules/glmark2.make
@@ -14,12 +14,11 @@ PACKAGES-$(PTXCONF_GLMARK2) += glmark2
#
# Paths and names
#
-# No tags: use a fake descriptive commit-ish to include the date
-GLMARK2_VERSION := 2019-03-27-geaa70888
-GLMARK2_MD5 := ee3ae64489fbcb942490ae758362e737
+GLMARK2_VERSION := 2020.04
+GLMARK2_MD5 := a90713700a740180fef3576f7ee3c9db
GLMARK2 := glmark2-$(GLMARK2_VERSION)
-GLMARK2_SUFFIX := tar.xz
-GLMARK2_URL := https://github.com/glmark2/glmark2.git;tag=$(GLMARK2_VERSION)
+GLMARK2_SUFFIX := tar.gz
+GLMARK2_URL := https://github.com/glmark2/glmark2/archive/$(GLMARK2_VERSION).$(GLMARK2_SUFFIX)
GLMARK2_SOURCE := $(SRCDIR)/$(GLMARK2).$(GLMARK2_SUFFIX)
GLMARK2_DIR := $(BUILDDIR)/$(GLMARK2)
GLMARK2_LICENSE := GPL-3.0-only AND SGIv1
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next reply other threads:[~2020-07-06 12:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 12:14 Philipp Zabel [this message]
2020-07-07 5:45 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200706121434.21053-1-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox