Merge branch 'master' into KBrown-pub

app-benchmarks/glmark2/Manifest

@@ -0,0 +1,3 @@
+DIST glmark2-2014.03.tar.gz 7801401 BLAKE2B e7ee338fe0c21106cc80ecd4b5ead0eb3944ed8d69e1e6deb1e30b5d86594b68539498e3af458e8a365e27706432f6c6f91f4d19fa39d6ac57ed265f7b82d027 SHA512 fe2781f56083ed6fcdecd70210cbe55609b679c447cf8634b0ab5a1c2dd8e4ca72a7b40fe260bb6d8b435aa21571283bfc659279d008ba5dea4df24bfbdca542
+EBUILD glmark2-2014.03-r100.ebuild 1460 BLAKE2B 23571bbce9a1bc644d4304d9c4a3acffea3040f77347b9303a7340b14009dba28881938ca155106dd3b148ee62551d78c00d2c246c3549bb8978529f69b6e380 SHA512 abaa6541eb8f44dd37a8ee5ae1112f70c1597899fd42616a34d76a33300611339b877140095308bdb69634d74fde430b2219933019e75912991aafc1a337f6d7
+MISC metadata.xml 523 BLAKE2B 72d3bf7f78d757eca3308f7bbc872fe59ea68e1c6e770e45bd56e7f9ec91d557d1036a4f42f43d9c9bbef8fcec4d3b0ed3f8d29189c78ed2088e320cab2ebfb0 SHA512 a4df60a4d96aaf124cb87adb51948ce163454bf902c31aaf31465fa8b4ff48c0259cdd3ebdcc942710ef1b8c2f99dc33332a59eda9ae3f470e4d7bee14b5ee68

app-benchmarks/glmark2/glmark2-2014.03-r100.ebuild

@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit waf-utils python-single-r1
+
+REV=${PV#*_p}
+
+DESCRIPTION="Opengl test suite"
+HOMEPAGE="https://launchpad.net/glmark2"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${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 )"
+
+src_prepare() {
+	rm -rf "${S}/src/libpng"
+	sed -i "s/libpng15/libpng/g" "${S}/wscript" # allow build with >= libpng:1.6
+	sed -i "/req_funcs/ s/,..sqrt.*\]/\]/" "${S}/wscript" #	sqrt patch
+	sed -i "s/-Werror//" "${S}/wscript" 
+}
+
+src_configure() {
+	: ${WAF_BINARY:="${S}/waf"}
+
+	local myconf
+
+	if use X; then
+		use opengl && myconf+="x11-gl"
+		use gles2 && myconf+=",x11-glesv2"
+	fi
+
+	if use drm; then
+		use opengl && myconf+=",drm-gl"
+		use gles2 && myconf+=",drm-glesv2"
+	fi
+
+	if use wayland; then
+		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}" \
+		--prefix=/usr \
+		--with-flavors ${myconf} \
+		configure || die "configure failed"
+}

app-benchmarks/glmark2/metadata.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<use>
+	<flag name='drm'>Enable DRM backend support</flag>
+	<flag name='gles2'>Enable GLES2 support</flag>
+</use>
+<upstream>
+	<bugs-to>https://bugs.launchpad.net/glmark2/+filebug</bugs-to>
+</upstream>
+<longdescription>
+glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of the OpenGL 2.0 API that is compatible with OpenGL ES 2.0.
+</longdescription>
+</pkgmetadata>
+