diff options
-rw-r--r-- | app-benchmarks/glmark2/Manifest | 1 | ||||
-rw-r--r-- | app-benchmarks/glmark2/files/glmark2-2020.04-Build-Fix-Python-3-incompatibility.patch | 25 | ||||
-rw-r--r-- | app-benchmarks/glmark2/glmark2-2020.04.ebuild | 66 |
3 files changed, 0 insertions, 92 deletions
diff --git a/app-benchmarks/glmark2/Manifest b/app-benchmarks/glmark2/Manifest index 275cc1ed..1c01da10 100644 --- a/app-benchmarks/glmark2/Manifest +++ b/app-benchmarks/glmark2/Manifest @@ -1,2 +1 @@ -DIST glmark2-2020.04.tar.gz 9364467 SHA256 0fa7723111c928a73c04d4fa4adfc15a9dea6d335fe189f59c74ae5af26f99a2 SHA512 68d72403ab5c6b4562faf43ae94159e4b8dcb697f62ea9dc3eac5634a3e22b19e14e215a081ae2a39e5db77e6f0f40d5ceb0281962600526d08121a197105a80 WHIRLPOOL 786bd372f6081b6c653489012267581a77d625b4e8b353ad7fcc925ec680f0bbb7685ae89f2c9b5bb3d67c330998d22b13ab4415122cdc401ad6c1eb65d1b92c DIST glmark2-2021.12.tar.gz 9360052 SHA256 9f111284b2ef1d3fce91928e249e6ca00796a036831b063a549a0f3b03557a95 SHA512 d1840e6213e27ead650987ff4945ef76276d900d2ff0c08e008e806b98b24d73d77c5fb248017590d9cc3c9293b2a5074d644f5e8473b8e655e0aedd55155eda WHIRLPOOL 86db3e8980c1d8ed2e6a6eabf79d9101779f27a1dc08f0e3c70cfef24cbb222e5988b3f2b77981f88ec461fc8c42ad9ffceffbe4c9bbe9e1425153ad4b0dafde 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 deleted file mode 100644 index ca13bb8b..00000000 --- a/app-benchmarks/glmark2/files/glmark2-2020.04-Build-Fix-Python-3-incompatibility.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 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-2020.04.ebuild b/app-benchmarks/glmark2/glmark2-2020.04.ebuild deleted file mode 100644 index 230109a4..00000000 --- a/app-benchmarks/glmark2/glmark2-2020.04.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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://github.com/glmark2/glmark2/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="drm gles2 +opengl wayland X" - -RDEPEND="media-libs/libpng - media-libs/mesa[gles2?] - X? ( x11-libs/libX11 ) - wayland? ( >=dev-libs/wayland-1.2 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -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" -} - -src_configure() { - : ${WAF_BINARY:="${S}/waf"} - - local myconf - - if use X; then - use opengl && myconf+="x11-gl" - use gles2 && myconf+=",x11-glesv2" - fi - - if use drm; then - use opengl && myconf+=",drm-gl" - use gles2 && myconf+=",drm-glesv2" - fi - - if use wayland; then - use opengl && myconf+=",wayland-gl" - use gles2 && myconf+=",wayland-glesv2" - - fi - myconf=${myconf#,} - - # it does not know --libdir specification, dandy huh - CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \ - --prefix=/usr \ - --with-flavors ${myconf} \ - configure || die "configure failed" -} |