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

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

[Matt Turner]

commit:     274d0a9aa1db3ec54b6b01625829bf52a494e01e
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 18 02:19:32 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Sep 18 02:19:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=274d0a9a

app-benchmarks/glmark2: version bump, fixes, move category

media-libs makes no sense.

---
 .../glmark2/glmark2-2011.08.ebuild                 |   24 +++++++++++++++----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/media-libs/glmark2/glmark2-11.01.ebuild b/app-benchmarks/glmark2/glmark2-2011.08.ebuild
similarity index 55%
rename from media-libs/glmark2/glmark2-11.01.ebuild
rename to app-benchmarks/glmark2/glmark2-2011.08.ebuild
index 92c05a8..7444fa8 100644
--- a/media-libs/glmark2/glmark2-11.01.ebuild
+++ b/app-benchmarks/glmark2/glmark2-2011.08.ebuild
@@ -8,23 +8,37 @@ inherit waf-utils
 
 DESCRIPTION="Opengl test suite"
 HOMEPAGE="https://launchpad.net/glmark2"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+SRC_URI="http://launchpad.net/${PN}/2011.11/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="gles2"
 
-DEPEND="media-libs/mesa[gallium]"
-RDEPEND="${DEPEND}"
+RDEPEND="media-libs/libpng:1.2
+	media-libs/mesa[gles2?]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-util/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 \
-		--enable-glesv2 \
+		${myconf} \
 		configure || die "configure failed"
 }