From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1jsQ14-0002El-Ju for ptxdist@pengutronix.de; Mon, 06 Jul 2020 14:14:34 +0200 From: Philipp Zabel Date: Mon, 6 Jul 2020 14:14:34 +0200 Message-Id: <20200706121434.21053-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH v2] glmark2: version bump 2019-03-27-geaa70888 -> 2020.04 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Signed-off-by: Philipp Zabel --- 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 +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