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 A1D7B1381F3 for ; Tue, 15 Oct 2013 15:31:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3886EE096B; Tue, 15 Oct 2013 15:31:04 +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 AEC6FE096B for ; Tue, 15 Oct 2013 15:31:03 +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 7D67D33EFBE for ; Tue, 15 Oct 2013 15:31:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2524BE5460 for ; Tue, 15 Oct 2013 15:31:01 +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: <1381850975.b884c9d0c458e686a6cbb33a7e66a35f44fa0858.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-2012.12_p278.ebuild app-benchmarks/glmark2/glmark2-2012.12_p280.ebuild app-benchmarks/glmark2/glmark2-2012.12_p283.ebuild X-VCS-Directories: app-benchmarks/glmark2/ app-benchmarks/glmark2/files/ X-VCS-Committer: okias X-VCS-Committer-Name: David Heidelberger X-VCS-Revision: b884c9d0c458e686a6cbb33a7e66a35f44fa0858 X-VCS-Branch: master Date: Tue, 15 Oct 2013 15:31:01 +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: 790f9e45-5041-4cce-aebd-84bb0d45485a X-Archives-Hash: 91924d6a479776d5e3c43276a66ac9c9 commit: b884c9d0c458e686a6cbb33a7e66a35f44fa0858 Author: David Heidelberger ixit cz> AuthorDate: Tue Oct 15 15:29:35 2013 +0000 Commit: David Heidelberger gmail 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 - #include -+#include - #include - - #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 )" 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}" \