From 1077d781823318c7850f6fc43e20bc0c32e41fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 20 Jun 2020 22:17:07 +0200 Subject: [PATCH] glmark2: build with waf3 --- .../glmark2-2020.04-Build:-Fix-Python-3.patch | 22 +++++++++++++++++++ srcpkgs/glmark2/template | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch diff --git a/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch b/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch new file mode 100644 index 0000000000..7cdbe6c604 --- /dev/null +++ b/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch @@ -0,0 +1,22 @@ +From 06e4728ba7312efa0fd595e30745e60ce88f1a4f Mon Sep 17 00:00:00 2001 +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 wscript wscript +index aefde70..e09fa78 100644 +--- wscript ++++ 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/srcpkgs/glmark2/template b/srcpkgs/glmark2/template index a28cd1aa24..cbc18ec4d8 100644 --- a/srcpkgs/glmark2/template +++ b/srcpkgs/glmark2/template @@ -2,7 +2,7 @@ pkgname=glmark2 version=2020.04 revision=1 -build_style=waf +build_style=waf3 configure_args="--with-flavors=x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2" hostmakedepends="pkg-config wayland-devel" makedepends="libjpeg-turbo-devel libpng12-devel libX11-devel MesaLib-devel wayland-devel