* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/, app-benchmarks/glmark2/files/
@ 2013-08-07 14:59 David Heidelberger
0 siblings, 0 replies; 3+ messages in thread
From: David Heidelberger @ 2013-08-07 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 690dcd78fb094c9584b3b83a7baac686127fe666
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Wed Aug 7 14:59:40 2013 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Wed Aug 7 14:59:40 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=690dcd78
app-benchmarks/glmark2: bump 2012.12_p278, lastest tarball
Package-Manager: portage-2.2.0_alpha194
---
.../files/2012.12_p278-cstring_include.patch | 11 +++
app-benchmarks/glmark2/glmark2-2011.08.ebuild | 44 -----------
app-benchmarks/glmark2/glmark2-2012.12_p278.ebuild | 90 ++++++++++++++++++++++
app-benchmarks/glmark2/metadata.xml | 1 +
4 files changed, 102 insertions(+), 44 deletions(-)
diff --git a/app-benchmarks/glmark2/files/2012.12_p278-cstring_include.patch b/app-benchmarks/glmark2/files/2012.12_p278-cstring_include.patch
new file mode 100644
index 0000000..2453257
--- /dev/null
+++ b/app-benchmarks/glmark2/files/2012.12_p278-cstring_include.patch
@@ -0,0 +1,11 @@
+diff -Naur a/glmark2/trunk/src/image-reader.cpp b/glmark2/trunk/src/image-reader.cpp
+--- a/glmark2/trunk/src/image-reader.cpp 2013-08-07 16:21:26.655989291 +0200
++++ b/glmark2/trunk/src/image-reader.cpp 2013-08-07 16:20:29.053983661 +0200
+@@ -21,6 +21,7 @@
+ */
+ #include <png.h>
+ #include <jpeglib.h>
++#include <cstring>
+ #include <memory>
+
+ #include "image-reader.h"
diff --git a/app-benchmarks/glmark2/glmark2-2011.08.ebuild b/app-benchmarks/glmark2/glmark2-2011.08.ebuild
deleted file mode 100644
index 17c2113..0000000
--- a/app-benchmarks/glmark2/glmark2-2011.08.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit waf-utils
-
-DESCRIPTION="Opengl test suite"
-HOMEPAGE="https://launchpad.net/glmark2"
-SRC_URI="http://launchpad.net/${PN}/2011.11/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gles2"
-
-RDEPEND="media-libs/libpng
- media-libs/mesa[gles2?]
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- rm -rf "${S}/src/libpng"
- sed -i -e 's#libpng12#libpng#g' "${S}/wscript ${S}/src/wscript_build" || die
-}
-
-src_configure() {
- : ${WAF_BINARY:="${S}/waf"}
-
- local myconf
-
- if use gles2; then
- myconf += "--enable-glesv2"
- fi
-
- # it does not know --libdir specification, dandy huh
- CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
- --prefix=/usr \
- --enable-gl \
- ${myconf} \
- configure || die "configure failed"
-}
diff --git a/app-benchmarks/glmark2/glmark2-2012.12_p278.ebuild b/app-benchmarks/glmark2/glmark2-2012.12_p278.ebuild
new file mode 100644
index 0000000..e444e97
--- /dev/null
+++ b/app-benchmarks/glmark2/glmark2-2012.12_p278.ebuild
@@ -0,0 +1,90 @@
+# 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/278 -> ${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() {
+ epatch "${FILESDIR}/${PV}-cstring_include.patch"
+ 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"
+}
diff --git a/app-benchmarks/glmark2/metadata.xml b/app-benchmarks/glmark2/metadata.xml
index 344ceb1..42c0a9a 100644
--- a/app-benchmarks/glmark2/metadata.xml
+++ b/app-benchmarks/glmark2/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<herd>x11</herd>
<use>
+ <flag name='drm'>Enable DRM backend support</flag>
<flag name='gles2'>Enable GLES2 support</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/, app-benchmarks/glmark2/files/
@ 2013-10-15 15:31 David Heidelberger
0 siblings, 0 replies; 3+ messages in thread
From: David Heidelberger @ 2013-10-15 15:31 UTC (permalink / raw
To: gentoo-commits
commit: b884c9d0c458e686a6cbb33a7e66a35f44fa0858
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Tue Oct 15 15:29:35 2013 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Tue Oct 15 15:29:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b884c9d0
app-emulation/glmark2: bump p283, remove 278, improve coding style
---
.../files/2012.12_p278-cstring_include.patch | 11 -----
app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild | 48 +++++---------------
....12_p278.ebuild => glmark2-2012.12_p283.ebuild} | 51 ++++++----------------
3 files changed, 25 insertions(+), 85 deletions(-)
diff --git a/app-benchmarks/glmark2/files/2012.12_p278-cstring_include.patch b/app-benchmarks/glmark2/files/2012.12_p278-cstring_include.patch
deleted file mode 100644
index 2453257..0000000
--- a/app-benchmarks/glmark2/files/2012.12_p278-cstring_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/glmark2/trunk/src/image-reader.cpp b/glmark2/trunk/src/image-reader.cpp
---- a/glmark2/trunk/src/image-reader.cpp 2013-08-07 16:21:26.655989291 +0200
-+++ b/glmark2/trunk/src/image-reader.cpp 2013-08-07 16:20:29.053983661 +0200
-@@ -21,6 +21,7 @@
- */
- #include <png.h>
- #include <jpeglib.h>
-+#include <cstring>
- #include <memory>
-
- #include "image-reader.h"
diff --git a/app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild b/app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild
index d6ce2ea..14bdddd 100644
--- a/app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild
@@ -7,9 +7,11 @@ 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/280 -> ${P}.tar.gz"
+SRC_URI="http://bazaar.launchpad.net/~glmark2-dev/glmark2/trunk/tarball/${REV} -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -39,47 +41,21 @@ src_configure() {
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
-
+ use opengl && myconf+="x11-gl"
+ use gles2 && myconf+=",x11-glesv2"
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
+ if use drm; then
+ use opengl && myconf+=",drm-gl"
+ use gles2 && myconf+=",drm-glesv2"
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
+ 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}" \
diff --git a/app-benchmarks/glmark2/glmark2-2012.12_p278.ebuild b/app-benchmarks/glmark2/glmark2-2012.12_p283.ebuild
similarity index 62%
rename from app-benchmarks/glmark2/glmark2-2012.12_p278.ebuild
rename to app-benchmarks/glmark2/glmark2-2012.12_p283.ebuild
index e444e97..14bdddd 100644
--- a/app-benchmarks/glmark2/glmark2-2012.12_p278.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2012.12_p283.ebuild
@@ -7,9 +7,11 @@ 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/278 -> ${P}.tar.gz"
+SRC_URI="http://bazaar.launchpad.net/~glmark2-dev/glmark2/trunk/tarball/${REV} -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -19,7 +21,7 @@ IUSE="drm +gles2 opengl wayland X"
RDEPEND="media-libs/libpng
media-libs/mesa[gles2?]
X? ( x11-libs/libX11 )
- wayland? ( <dev-libs/wayland-1.2 )"
+ wayland? ( >=dev-libs/wayland-1.2 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -29,7 +31,6 @@ REQUIRED_USE="|| ( opengl gles2 )
S="${WORKDIR}/~${PN}-dev/${PN}/trunk/"
src_prepare() {
- epatch "${FILESDIR}/${PV}-cstring_include.patch"
rm -rf "${S}/src/libpng"
sed -i "s/libpng15/libpng/g" "${S}/wscript" # allow build with >= libpng:1.6
}
@@ -40,47 +41,21 @@ src_configure() {
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
-
+ use opengl && myconf+="x11-gl"
+ use gles2 && myconf+=",x11-glesv2"
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
+ if use drm; then
+ use opengl && myconf+=",drm-gl"
+ use gles2 && myconf+=",drm-glesv2"
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
+ 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}" \
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/, app-benchmarks/glmark2/files/
@ 2022-05-16 16:29 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2022-05-16 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 080155ab1dcb60de7df0ef898689a0840ad304da
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 16:28:50 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May 16 16:28:50 2022 +0000
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 <mattst88 <AT> 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 00000000..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 <alexandros.frantzis@collabora.com>
+Date: Mon, 14 Feb 2022 13:54:09 +0200
+Subject: [PATCH] libmatrix: Add missing <utility> 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 <string>
+ #include <vector>
+ #include <map>
++#include <utility>
+ #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=()
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-16 16:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-16 16:29 [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/, app-benchmarks/glmark2/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2013-10-15 15:31 David Heidelberger
2013-08-07 14:59 David Heidelberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox