[gentoo-commits] proj/x11:master commit in: app-benchmarks/glmark2/, app-benchmarks/glmark2/files/

["David Heidelberger" <d.okias@gmail.com>]

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}" \