* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2011-09-18 2:22 Matt Turner
0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2011-09-18 2:22 UTC (permalink / raw
To: gentoo-commits
commit: 1aaab69a5dbb0884b9022f68d6518d7b34333d72
Author: Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 18 02:21:35 2011 +0000
Commit: Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Sep 18 02:21:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1aaab69a
app-benchmarks/glmark2: don't require libpng12
---
app-benchmarks/glmark2/glmark2-2011.08.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/app-benchmarks/glmark2/glmark2-2011.08.ebuild b/app-benchmarks/glmark2/glmark2-2011.08.ebuild
index 7444fa8..4661c15 100644
--- a/app-benchmarks/glmark2/glmark2-2011.08.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2011.08.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gles2"
-RDEPEND="media-libs/libpng:1.2
+RDEPEND="media-libs/libpng
media-libs/mesa[gles2?]
x11-libs/libX11"
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2013-05-16 1:21 David Heidelberger
0 siblings, 0 replies; 10+ messages in thread
From: David Heidelberger @ 2013-05-16 1:21 UTC (permalink / raw
To: gentoo-commits
commit: ed144563e564d93cdb3e037311e2be70548110e2
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Thu May 16 01:20:37 2013 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Thu May 16 01:20:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ed144563
[app-benchmarks/glmark2] update ebuild
Package-Manager: portage-2.2.0_alpha174
---
app-benchmarks/glmark2/glmark2-2011.08.ebuild | 2 +-
app-benchmarks/glmark2/metadata.xml | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/app-benchmarks/glmark2/glmark2-2011.08.ebuild b/app-benchmarks/glmark2/glmark2-2011.08.ebuild
index 1a842c0..17c2113 100644
--- a/app-benchmarks/glmark2/glmark2-2011.08.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2011.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
diff --git a/app-benchmarks/glmark2/metadata.xml b/app-benchmarks/glmark2/metadata.xml
new file mode 100644
index 0000000..344ceb1
--- /dev/null
+++ b/app-benchmarks/glmark2/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<use>
+ <flag name='gles2'>Enable GLES2 support</flag>
+</use>
+</pkgmetadata>
+
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2013-08-09 10:29 David Heidelberger
0 siblings, 0 replies; 10+ messages in thread
From: David Heidelberger @ 2013-08-09 10:29 UTC (permalink / raw
To: gentoo-commits
commit: 6ba9977fc6f5e825321ed32904f5eaa5473b350e
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Fri Aug 9 10:29:32 2013 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Fri Aug 9 10:29:32 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6ba9977f
app-benchmarks/glmark2: bump p280, new wayland supported, fixed build without patching
Package-Manager: portage-2.2.0_alpha195
---
app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild | 89 ++++++++++++++++++++++
1 file changed, 89 insertions(+)
diff --git a/app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild b/app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild
new file mode 100644
index 0000000..d6ce2ea
--- /dev/null
+++ b/app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit waf-utils python-single-r1
+
+DESCRIPTION="Opengl test suite"
+HOMEPAGE="https://launchpad.net/glmark2"
+SRC_URI="http://bazaar.launchpad.net/~glmark2-dev/glmark2/trunk/tarball/280 -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~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
+ if use opengl; then
+ myconf+="x11-gl"
+ fi
+ if use opengl && use gles2; then
+ myconf+=","
+ fi
+ if use gles2; then
+ myconf+="x11-glesv2"
+ fi
+
+ fi
+ if use drm; then
+ if use X; then
+ myconf+=","
+ fi
+ if use opengl; then
+ myconf+="drm-gl"
+ fi
+ if use opengl && use gles2; then
+ myconf+=","
+ fi
+ if use gles2; then
+ myconf+="drm-glesv2"
+ fi
+
+ fi
+ if use wayland; then
+ if use X || use drm; then
+ myconf+=","
+ fi
+ if use opengl; then
+ myconf+="wayland-gl"
+ fi
+ if use opengl && use gles2; then
+ myconf+=","
+ fi
+ if use gles2; then
+ myconf+="wayland-glesv2"
+ fi
+
+ fi
+
+ # it does not know --libdir specification, dandy huh
+ CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
+ --prefix=/usr \
+ --with-flavors ${myconf} \
+ configure || die "configure failed"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2014-01-09 16:13 David Heidelberger
0 siblings, 0 replies; 10+ messages in thread
From: David Heidelberger @ 2014-01-09 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 3db00927cb308f02267fc67bae0b34346ccf45d0
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Thu Jan 9 16:13:03 2014 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Thu Jan 9 16:13:03 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3db00927
app-benchmarks/glmark2: bump p285, small fix, drop p280
Package-Manager: portage-2.2.7
---
.../{glmark2-2012.12_p280.ebuild => glmark2-2012.12_p285.ebuild} | 0
app-benchmarks/glmark2/metadata.xml | 6 ++++++
2 files changed, 6 insertions(+)
diff --git a/app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild b/app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild
similarity index 100%
rename from app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild
rename to app-benchmarks/glmark2/glmark2-2012.12_p285.ebuild
diff --git a/app-benchmarks/glmark2/metadata.xml b/app-benchmarks/glmark2/metadata.xml
index 42c0a9a..7b1a813 100644
--- a/app-benchmarks/glmark2/metadata.xml
+++ b/app-benchmarks/glmark2/metadata.xml
@@ -6,5 +6,11 @@
<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>
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2014-05-09 20:06 David Heidelberger
0 siblings, 0 replies; 10+ messages in thread
From: David Heidelberger @ 2014-05-09 20:06 UTC (permalink / raw
To: gentoo-commits
commit: f41b5ff7ff52b37468c32fbb15af2f0c48921a98
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Fri May 9 20:06:24 2014 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Fri May 9 20:06:24 2014 +0000
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2019-06-24 21:09 Matt Turner
0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2019-06-24 21:09 UTC (permalink / raw
To: gentoo-commits
commit: afbaafaa912dc09a19fee7ee28ef94c44a134a06
Author: Sandino Araico Sanchez <sandino <AT> sandino <DOT> net>
AuthorDate: Sun Jun 23 00:20:32 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 21:08:58 2019 +0000
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 <AT> sandino.net>
Signed-off-by: Matt Turner <mattst88 <AT> 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() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2021-02-16 2:23 Matt Turner
0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2021-02-16 2:23 UTC (permalink / raw
To: gentoo-commits
commit: acf64d44f89f2e8a4cd77f069be558fc1a04e589
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 02:19:47 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 02:20:05 2021 +0000
URL: https://gitweb.gentoo.org/proj/x11.git/commit/?id=acf64d44
app-benchmarks/glmark2: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> 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..00000000
--- 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..00000000
--- 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"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2022-04-11 23:04 Matt Turner
0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2022-04-11 23:04 UTC (permalink / raw
To: gentoo-commits
commit: 09b02cfdbbdcdce8a6249841048b33c1b900ac8b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 22:47:35 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 22:47:35 2022 +0000
URL: https://gitweb.gentoo.org/proj/x11.git/commit/?id=09b02cfd
app-benchmarks/glmark2: Version bump to 2021.12
Signed-off-by: Matt Turner <mattst88 <AT> 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 00000000..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
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2022-04-11 23:17 Matt Turner
0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2022-04-11 23:17 UTC (permalink / raw
To: gentoo-commits
commit: e339e6cbf5ffefcb7a7b6b70ca876b33f70b56ef
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 23:15:21 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 23:15:21 2022 +0000
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 <mattst88 <AT> 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"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/
@ 2024-05-30 20:29 Matt Turner
0 siblings, 0 replies; 10+ messages in thread
From: Matt Turner @ 2024-05-30 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 6c0050760b497487e548b06f2eee526193b9c892
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 20:27:39 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu May 30 20:28:52 2024 +0000
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 <mattst88 <AT> 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=()
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-05-30 20:29 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-09 20:06 [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/ David Heidelberger
-- strict thread matches above, loose matches on Subject: below --
2024-05-30 20:29 Matt Turner
2022-04-11 23:17 Matt Turner
2022-04-11 23:04 Matt Turner
2021-02-16 2:23 Matt Turner
2019-06-24 21:09 Matt Turner
2014-01-09 16:13 David Heidelberger
2013-08-09 10:29 David Heidelberger
2013-05-16 1:21 David Heidelberger
2011-09-18 2:22 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox