[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
commit: f41b5ff7ff52b37468c32fbb15af2f0c48921a98
Author: David Heidelberger ixit cz>
AuthorDate: Fri May 9 20:06:24 2014 +
Commit: David Heidelberger gmail com>
CommitDate: Fri May 9 20:06:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f41b5ff7
app-benchmarks/glmark2: bump 2014.03
Package-Manager: portage-2.2.10
---
.../{glmark2-2012.12_p283.ebuild => glmark2-2014.03.ebuild} | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/app-benchmarks/glmark2/glmark2-2012.12_p283.ebuild
b/app-benchmarks/glmark2/glmark2-2014.03.ebuild
similarity index 85%
rename from app-benchmarks/glmark2/glmark2-2012.12_p283.ebuild
rename to app-benchmarks/glmark2/glmark2-2014.03.ebuild
index 6a934c1..1d4cb19 100644
--- a/app-benchmarks/glmark2/glmark2-2012.12_p283.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2014.03.ebuild
@@ -4,19 +4,19 @@
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
inherit waf-utils python-single-r1
REV=${PV#*_p}
DESCRIPTION="Opengl test suite"
HOMEPAGE="https://launchpad.net/glmark2";
-SRC_URI="http://bazaar.launchpad.net/~glmark2-dev/glmark2/trunk/tarball/${REV}
-> ${P}.tar.gz"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~arm ~amd64 ~x86"
-IUSE="drm +gles2 opengl wayland X"
+IUSE="drm gles2 +opengl wayland X"
RDEPEND="media-libs/libpng
media-libs/mesa[gles2?]
@@ -28,8 +28,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="|| ( opengl gles2 )
|| ( drm wayland X )"
-S="${WORKDIR}/~${PN}-dev/${PN}/trunk/"
-
src_prepare() {
rm -rf "${S}/src/libpng"
sed -i "s/libpng15/libpng/g" "${S}/wscript" # allow build with >=
libpng:1.6
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
commit: afbaafaa912dc09a19fee7ee28ef94c44a134a06
Author: Sandino Araico Sanchez sandino net>
AuthorDate: Sun Jun 23 00:20:32 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Jun 24 21:08:58 2019 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=afbaafaa
app-benchmarks/glmark2: add patch to fix compile
Compile fix copied from
https://bbs.archlinux.org/viewtopic.php?id=212719
Closes: https://bugs.gentoo.org/688518
Closes: https://github.com/gentoo/x11/pull/2
Signed-off-by: Sandino Araico Sanchez sandino.net>
Signed-off-by: Matt Turner gentoo.org>
app-benchmarks/glmark2/glmark2-2014.03.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app-benchmarks/glmark2/glmark2-2014.03.ebuild
b/app-benchmarks/glmark2/glmark2-2014.03.ebuild
index db6f924c..4d47a987 100644
--- a/app-benchmarks/glmark2/glmark2-2014.03.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2014.03.ebuild
@@ -31,6 +31,8 @@ REQUIRED_USE="|| ( opengl gles2 )
src_prepare() {
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() {
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
commit: 09b02cfdbbdcdce8a6249841048b33c1b900ac8b
Author: Matt Turner gentoo org>
AuthorDate: Mon Apr 11 22:47:35 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Apr 11 22:47:35 2022 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=09b02cfd
app-benchmarks/glmark2: Version bump to 2021.12
Signed-off-by: Matt Turner gentoo.org>
app-benchmarks/glmark2/glmark2-2021.12.ebuild | 72 +++
1 file changed, 72 insertions(+)
diff --git a/app-benchmarks/glmark2/glmark2-2021.12.ebuild
b/app-benchmarks/glmark2/glmark2-2021.12.ebuild
new file mode 100644
index ..4c76c3c8
--- /dev/null
+++ b/app-benchmarks/glmark2/glmark2-2021.12.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-single-r1
+
+REV=${PV#*_p}
+
+DESCRIPTION="glmark2 is an OpenGL 2.0 and ES 2.0 benchmark"
+HOMEPAGE="https://github.com/glmark2/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="
+ virtual/jpeg:0=
+ media-libs/libpng:0=
+
+ gles2? ( media-libs/mesa[gles2?] )
+ drm? (
+ x11-libs/libdrm
+ media-libs/mesa[gbm(+)]
+ virtual/libudev:=
+ )
+ X? ( x11-libs/libX11 )
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.12
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ wayland? ( dev-util/wayland-scanner )
+"
+
+REQUIRED_USE="|| ( opengl gles2 )
+ || ( drm wayland X )"
+
+src_configure() {
+ local flavors=()
+
+ if use X; then
+ use opengl && flavors+=("x11-gl")
+ use gles2 && flavors+=("x11-glesv2")
+ fi
+
+ if use drm; then
+ use opengl && flavors+=("drm-gl")
+ use gles2 && flavors+=("drm-glesv2")
+ fi
+
+ if use wayland; then
+ use opengl && flavors+=("wayland-gl")
+ use gles2 && flavors+=("wayland-glesv2")
+ fi
+
+ flavor_list() {
+ local flavors="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${flavors//$'\n'/,}"
+ }
+
+ local emesonargs=(
+ -Dflavors=$(flavor_list "${flavors[*]}")
+ )
+ meson_src_configure
+}
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
commit: e339e6cbf5ffefcb7a7b6b70ca876b33f70b56ef
Author: Matt Turner gentoo org>
AuthorDate: Mon Apr 11 23:15:21 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Apr 11 23:15:21 2022 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=e339e6cb
app-benchmarks/glmark2: Remove unneeded python-any-r1 inherit
Signed-off-by: Matt Turner gentoo.org>
app-benchmarks/glmark2/glmark2-2021.12.ebuild | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/app-benchmarks/glmark2/glmark2-2021.12.ebuild
b/app-benchmarks/glmark2/glmark2-2021.12.ebuild
index 4c76c3c8..00290d61 100644
--- a/app-benchmarks/glmark2/glmark2-2021.12.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2021.12.ebuild
@@ -3,10 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-inherit meson python-single-r1
-
-REV=${PV#*_p}
+inherit meson
DESCRIPTION="glmark2 is an OpenGL 2.0 and ES 2.0 benchmark"
HOMEPAGE="https://github.com/glmark2/glmark2";
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
commit: acf64d44f89f2e8a4cd77f069be558fc1a04e589
Author: Matt Turner gentoo org>
AuthorDate: Tue Feb 16 02:19:47 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Feb 16 02:20:05 2021 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=acf64d44
app-benchmarks/glmark2: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild | 64 --
app-benchmarks/glmark2/glmark2-2014.03.ebuild | 64 --
2 files changed, 128 deletions(-)
diff --git a/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild
b/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild
deleted file mode 100644
index ce4a9ced..
--- a/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit waf-utils python-single-r1
-
-REV=${PV#*_p}
-
-DESCRIPTION="Opengl test suite"
-HOMEPAGE="https://launchpad.net/glmark2";
-SRC_URI="http://bazaar.launchpad.net/~glmark2-dev/glmark2/trunk/tarball/${REV}
-> ${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 )"
-
-S="${WORKDIR}/~${PN}-dev/${PN}/trunk/"
-
-src_prepare() {
- rm -rf "${S}/src/libpng"
- sed -i "s/libpng15/libpng/g" "${S}/wscript" # allow build with >=
libpng:1.6
-}
-
-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"
-}
diff --git a/app-benchmarks/glmark2/glmark2-2014.03.ebuild
b/app-benchmarks/glmark2/glmark2-2014.03.ebuild
deleted file mode 100644
index 19c7b21c..
--- a/app-benchmarks/glmark2/glmark2-2014.03.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-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";
-
-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 )"
-
-src_prepare() {
- 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() {
- : ${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"
-}
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
commit: 6c0050760b497487e548b06f2eee526193b9c892
Author: Matt Turner gentoo org>
AuthorDate: Thu May 30 20:27:39 2024 +
Commit: Matt Turner gentoo org>
CommitDate: Thu May 30 20:28:52 2024 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=6c005076
app-benchmarks/glmark2: Version bump to 2023.01
Closes: https://bugs.gentoo.org/932788
Signed-off-by: Matt Turner gentoo.org>
.../glmark2/{glmark2-2021.12.ebuild => glmark2-2023.01.ebuild} | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/app-benchmarks/glmark2/glmark2-2021.12.ebuild
b/app-benchmarks/glmark2/glmark2-2023.01.ebuild
similarity index 88%
rename from app-benchmarks/glmark2/glmark2-2021.12.ebuild
rename to app-benchmarks/glmark2/glmark2-2023.01.ebuild
index 28e00b55..fbdb74af 100644
--- a/app-benchmarks/glmark2/glmark2-2021.12.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2023.01.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit meson
@@ -18,7 +18,7 @@ RDEPEND="
virtual/jpeg:0=
media-libs/libpng:0=
- gles2? ( media-libs/mesa[gles2?] )
+ gles2? ( media-libs/mesa[gles2(+)?] )
drm? (
x11-libs/libdrm
media-libs/mesa[gbm(+)]
@@ -39,10 +39,6 @@ BDEPEND="
REQUIRED_USE="|| ( opengl gles2 )
|| ( drm wayland X )"
-PATCHES=(
- "${FILESDIR}"/${PV}-libmatrix-Add-missing-utility-include.patch
-)
-
src_configure() {
local flavors=()
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/files/, app-benchmarks/glmark2/
commit: 706f35cb43e30a6926bea56771e53047a7a24a50
Author: Matt Turner gentoo org>
AuthorDate: Mon Apr 11 23:02:31 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Apr 11 23:02:31 2022 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=706f35cb
app-benchmarks/glmark2: Drop old versions
Signed-off-by: Matt Turner 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..
---
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
-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..
--- 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"
-}
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/, app-benchmarks/glmark2/files/
commit: 080155ab1dcb60de7df0ef898689a0840ad304da
Author: Matt Turner gentoo org>
AuthorDate: Mon May 16 16:28:50 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Mon May 16 16:28:50 2022 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=080155ab
app-benchmarks/glmark2: Add patch to fix build with gcc-12
Closes: https://github.com/gentoo/x11/issues/4
Signed-off-by: Matt Turner gentoo.org>
12-libmatrix-Add-missing-utility-include.patch | 27 ++
app-benchmarks/glmark2/glmark2-2021.12.ebuild | 4
2 files changed, 31 insertions(+)
diff --git
a/app-benchmarks/glmark2/files/2021.12-libmatrix-Add-missing-utility-include.patch
b/app-benchmarks/glmark2/files/2021.12-libmatrix-Add-missing-utility-include.patch
new file mode 100644
index ..6d99d87c
--- /dev/null
+++
b/app-benchmarks/glmark2/files/2021.12-libmatrix-Add-missing-utility-include.patch
@@ -0,0 +1,27 @@
+From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 2001
+From: Alexandros Frantzis
+Date: Mon, 14 Feb 2022 13:54:09 +0200
+Subject: [PATCH] libmatrix: Add missing include
+
+Fixes compilation with GCC 12.
+
+Fixes #169
+---
+ src/libmatrix/program.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h
+index f95b470..1c9de08 100644
+--- a/src/libmatrix/program.h
b/src/libmatrix/program.h
+@@ -15,6 +15,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "mat.h"
+
+ // Simple shader container. Abstracts all of the OpenGL bits, but leaves
+--
+2.35.1
+
diff --git a/app-benchmarks/glmark2/glmark2-2021.12.ebuild
b/app-benchmarks/glmark2/glmark2-2021.12.ebuild
index 00290d61..28e00b55 100644
--- a/app-benchmarks/glmark2/glmark2-2021.12.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2021.12.ebuild
@@ -39,6 +39,10 @@ BDEPEND="
REQUIRED_USE="|| ( opengl gles2 )
|| ( drm wayland X )"
+PATCHES=(
+ "${FILESDIR}"/${PV}-libmatrix-Add-missing-utility-include.patch
+)
+
src_configure() {
local flavors=()
[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/files/, app-benchmarks/glmark2/
commit: 2c59152249ccc83c4e200cc57b177a44331139dd
Author: Marty E. Plummer startmail com>
AuthorDate: Sun Jun 28 17:49:32 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Feb 16 02:18:00 2021 +
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 startmail.com>
Signed-off-by: Matt Turner 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 ..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
+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
