commit: 2c59152249ccc83c4e200cc57b177a44331139dd Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> AuthorDate: Sun Jun 28 17:49:32 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Feb 16 02:18:00 2021 +0000 URL: https://gitweb.gentoo.org/proj/x11.git/commit/?id=2c591522
app-benchmarks/glmark2: update to 2020.04 Satisfy some trivial repoman warnings as well. Closes: https://github.com/gentoo/x11/pull/3 Signed-off-by: Signed-off-by: Marty E. Plummer <hanetzer <AT> startmail.com> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...020.04-Build-Fix-Python-3-incompatibility.patch | 25 ++++++++++++++++++++++ app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild | 5 ++--- app-benchmarks/glmark2/glmark2-2014.03.ebuild | 5 ++--- ...mark2-2014.03.ebuild => glmark2-2020.04.ebuild} | 19 ++++++++-------- app-benchmarks/glmark2/metadata.xml | 24 +++++++++++---------- 5 files changed, 52 insertions(+), 26 deletions(-) diff --git a/app-benchmarks/glmark2/files/glmark2-2020.04-Build-Fix-Python-3-incompatibility.patch b/app-benchmarks/glmark2/files/glmark2-2020.04-Build-Fix-Python-3-incompatibility.patch new file mode 100644 index 00000000..ca13bb8b --- /dev/null +++ b/app-benchmarks/glmark2/files/glmark2-2020.04-Build-Fix-Python-3-incompatibility.patch @@ -0,0 +1,25 @@ +From 06e4728ba7312efa0fd595e30745e60ce88f1a4f Mon Sep 17 00:00:00 2001 +From: Marvin Schmidt <m...@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 aefde70..e09fa78 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')] +-- +2.27.0 + diff --git a/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild b/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild index bfa50a43..ce4a9ced 100644 --- a/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild +++ b/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=5 @@ -15,7 +14,7 @@ SRC_URI="http://bazaar.launchpad.net/~glmark2-dev/glmark2/trunk/tarball/${REV} - LICENSE="GPL-3" SLOT="0" -KEYWORDS="~arm ~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="drm +gles2 opengl wayland X" RDEPEND="media-libs/libpng diff --git a/app-benchmarks/glmark2/glmark2-2014.03.ebuild b/app-benchmarks/glmark2/glmark2-2014.03.ebuild index 4d47a987..19c7b21c 100644 --- a/app-benchmarks/glmark2/glmark2-2014.03.ebuild +++ b/app-benchmarks/glmark2/glmark2-2014.03.ebuild @@ -1,6 +1,5 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=5 @@ -15,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"; LICENSE="GPL-3" SLOT="0" -KEYWORDS="~arm ~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="drm gles2 +opengl wayland X" RDEPEND="media-libs/libpng diff --git a/app-benchmarks/glmark2/glmark2-2014.03.ebuild b/app-benchmarks/glmark2/glmark2-2020.04.ebuild similarity index 74% copy from app-benchmarks/glmark2/glmark2-2014.03.ebuild copy to app-benchmarks/glmark2/glmark2-2020.04.ebuild index 4d47a987..230109a4 100644 --- a/app-benchmarks/glmark2/glmark2-2014.03.ebuild +++ b/app-benchmarks/glmark2/glmark2-2020.04.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit waf-utils python-single-r1 REV=${PV#*_p} DESCRIPTION="Opengl test suite" HOMEPAGE="https://launchpad.net/glmark2"; -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"; +SRC_URI="https://github.com/glmark2/glmark2/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~arm ~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="drm gles2 +opengl wayland X" RDEPEND="media-libs/libpng @@ -28,11 +27,13 @@ DEPEND="${RDEPEND} REQUIRED_USE="|| ( opengl gles2 ) || ( drm wayland X )" +PATCHES=( + "${FILESDIR}/${PN}"-2020.04-Build-Fix-Python-3-incompatibility.patch +) + src_prepare() { + default rm -rf "${S}/src/libpng" - sed -i "s/libpng15/libpng/g" "${S}/wscript" # allow build with >= libpng:1.6 - sed -i "/req_funcs/ s/,..sqrt.*\]/\]/" "${S}/wscript" # sqrt patch - sed -i "s/-Werror//" "${S}/wscript" } src_configure() { diff --git a/app-benchmarks/glmark2/metadata.xml b/app-benchmarks/glmark2/metadata.xml index 7b1a8138..dcf2721b 100644 --- a/app-benchmarks/glmark2/metadata.xml +++ b/app-benchmarks/glmark2/metadata.xml @@ -1,16 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<herd>x11</herd> -<use> - <flag name='drm'>Enable DRM backend support</flag> - <flag name='gles2'>Enable GLES2 support</flag> -</use> -<upstream> - <bugs-to>https://bugs.launchpad.net/glmark2/+filebug</bugs-to> -</upstream> -<longdescription> -glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of the OpenGL 2.0 API that is compatible with OpenGL ES 2.0. -</longdescription> + <maintainer type="project"> + <email>x...@gentoo.org</email> + </maintainer> + <use> + <flag name='drm'>Enable DRM backend support</flag> + <flag name='gles2'>Enable GLES2 support</flag> + </use> + <upstream> + <bugs-to>https://bugs.launchpad.net/glmark2/+filebug</bugs-to> + </upstream> + <longdescription> + glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of the OpenGL 2.0 API that is compatible with OpenGL ES 2.0. + </longdescription> </pkgmetadata>
