glmark2: build with waf3

This commit is contained in:
Piotr Wójcik 2020-06-20 22:17:07 +02:00 committed by Piotr
parent 7b74ac4c28
commit 1077d78182
2 changed files with 23 additions and 1 deletions

View file

@ -0,0 +1,22 @@
From 06e4728ba7312efa0fd595e30745e60ce88f1a4f Mon Sep 17 00:00:00 2001
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 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')]

View file

@ -2,7 +2,7 @@
pkgname=glmark2 pkgname=glmark2
version=2020.04 version=2020.04
revision=1 revision=1
build_style=waf build_style=waf3
configure_args="--with-flavors=x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2" configure_args="--with-flavors=x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2"
hostmakedepends="pkg-config wayland-devel" hostmakedepends="pkg-config wayland-devel"
makedepends="libjpeg-turbo-devel libpng12-devel libX11-devel MesaLib-devel wayland-devel makedepends="libjpeg-turbo-devel libpng12-devel libX11-devel MesaLib-devel wayland-devel