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 deleted file mode 100644 index 7cdbe6c6044..00000000000 --- a/srcpkgs/glmark2/patches/glmark2-2020.04-Build:-Fix-Python-3.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 cbc18ec4d8c..cc4ce4a0aa5 100644 --- a/srcpkgs/glmark2/template +++ b/srcpkgs/glmark2/template @@ -1,15 +1,16 @@ # Template file for 'glmark2' pkgname=glmark2 -version=2020.04 +version=2021.02 revision=1 -build_style=waf3 -configure_args="--with-flavors=x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2" +build_style=meson +configure_args="-Dflavors=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 +makedepends="libjpeg-turbo-devel libpng-devel libX11-devel MesaLib-devel wayland-devel wayland-protocols" short_desc="OpenGL 2.0 and ES 2.0 benchmark" maintainer="Piotr Wójcik " license="GPL-3.0-or-later" homepage="https://github.com/glmark2/glmark2" +changelog="https://raw.githubusercontent.com/glmark2/glmark2/master/NEWS" distfiles="https://github.com/glmark2/glmark2/archive/${version}.tar.gz" -checksum=0fa7723111c928a73c04d4fa4adfc15a9dea6d335fe189f59c74ae5af26f99a2 +checksum=bebadb78c13aea5e88ed892e5563101ccb745b75f1dc86a8fc7229f00d78cbf1