commit: 706f35cb43e30a6926bea56771e53047a7a24a50 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon Apr 11 23:02:31 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Apr 11 23:02:31 2022 +0000 URL: https://gitweb.gentoo.org/proj/x11.git/commit/?id=706f35cb
app-benchmarks/glmark2: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...020.04-Build-Fix-Python-3-incompatibility.patch | 25 -------- app-benchmarks/glmark2/glmark2-2020.04.ebuild | 66 ---------------------- 2 files changed, 91 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 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 <[email protected]> -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" -}
