From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F36A91381F3 for ; Wed, 7 Aug 2013 14:59:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E0E8E0B49; Wed, 7 Aug 2013 14:59:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15273E0B49 for ; Wed, 7 Aug 2013 14:59:07 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77FA233EB42 for ; Wed, 7 Aug 2013 14:59:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F4213E468F for ; Wed, 7 Aug 2013 14:59:04 +0000 (UTC) From: "David Heidelberger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Heidelberger" Message-ID: <1375887580.690dcd78fb094c9584b3b83a7baac686127fe666.okias@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/, app-benchmarks/glmark2/files/ X-VCS-Repository: proj/x11 X-VCS-Files: app-benchmarks/glmark2/files/2012.12_p278-cstring_include.patch app-benchmarks/glmark2/glmark2-2011.08.ebuild app-benchmarks/glmark2/glmark2-2012.12_p278.ebuild app-benchmarks/glmark2/metadata.xml X-VCS-Directories: app-benchmarks/glmark2/ app-benchmarks/glmark2/files/ X-VCS-Committer: okias X-VCS-Committer-Name: David Heidelberger X-VCS-Revision: 690dcd78fb094c9584b3b83a7baac686127fe666 X-VCS-Branch: master Date: Wed, 7 Aug 2013 14:59:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f0bf082d-0b02-469a-85f6-42d9f077a3d6 X-Archives-Hash: 59b465cc000ab41cb476a01174ccc013 commit: 690dcd78fb094c9584b3b83a7baac686127fe666 Author: David Heidelberger ixit cz> AuthorDate: Wed Aug 7 14:59:40 2013 +0000 Commit: David Heidelberger gmail 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 + #include ++#include + #include + + #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? ( = 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 @@ x11 + Enable DRM backend support Enable GLES2 support