Update glmark2 to git acac90b257

- Build: Allow disabling the -Werror compiler flag
- Build: Allow user defined CXXFLAGS to override all built-in flags
- Build: Exclude git repository files from dist tarball
- Fix clang build errors
- NativeStateMir: Update for newest Mir client API

5 files changed, 8 insertions, 62 deletions

diff --git a/benchmarks/glmark2/Makefile b/benchmarks/glmark2/Makefile
index bb56b403b72..913f1ad2aca 100644
--- a/benchmarks/glmark2/Makefile
+++ b/benchmarks/glmark2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2015/12/05 21:25:30 adam Exp $
+# $NetBSD: Makefile,v 1.8 2016/01/22 15:26:25 prlw1 Exp $
 
 DISTNAME=	glmark2-2014.03
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	benchmarks
 MASTER_SITES=	${MASTER_SITE_GITHUB:=glmark2/}
-GITHUB_TAG=	499aa81a68fb4c8aac1c80f0d6a4cce05941c4cc
+GITHUB_TAG=	acac90b257a14bd14a1492cd442b79dcaa1c13cf
 
 MAINTAINER=	prlw1@cam.ac.uk
 HOMEPAGE=	https://github.com/glmark2/glmark2
diff --git a/benchmarks/glmark2/distinfo b/benchmarks/glmark2/distinfo
index 3c74cc0204f..f4ab9600103 100644
--- a/benchmarks/glmark2/distinfo
+++ b/benchmarks/glmark2/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 00:25:50 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/01/22 15:26:25 prlw1 Exp $
 
-SHA1 (glmark2-2014.03-499aa81a68fb4c8aac1c80f0d6a4cce05941c4cc.tar.gz) = 2cedb183b5ee5cb1a4448200a63835862a2796a7
-RMD160 (glmark2-2014.03-499aa81a68fb4c8aac1c80f0d6a4cce05941c4cc.tar.gz) = d20f6500c02b3eda2ae7d0f04910a79b977be6c0
-SHA512 (glmark2-2014.03-499aa81a68fb4c8aac1c80f0d6a4cce05941c4cc.tar.gz) = e72694971fd89ed9f06484ad46d9d6b611ef3f67efc72bac440b8c97a904344db29be6dfc7d8bb6ae6bfcf736ee57148b068a833f666c7cd637fee01da59582e
-Size (glmark2-2014.03-499aa81a68fb4c8aac1c80f0d6a4cce05941c4cc.tar.gz) = 7811333 bytes
-SHA1 (patch-src_image-reader.h) = d3a39e6129a956b1021213976d4e9caf0296d136
-SHA1 (patch-src_scene-buffer.cpp) = 7016ed9d986f2d6b5e978862028480d17fee2a61
-SHA1 (patch-src_scene-refract.cpp) = e0217ba76e238b1d23e8fb43b7fe75ebbe5ef843
+SHA1 (glmark2-2014.03-acac90b257a14bd14a1492cd442b79dcaa1c13cf.tar.gz) = e9730fd2850ceace5e93029c1759531dcec4b2b4
+RMD160 (glmark2-2014.03-acac90b257a14bd14a1492cd442b79dcaa1c13cf.tar.gz) = e4eb87716a77048a0c40383c3f1d99e7e316c5b5
+SHA512 (glmark2-2014.03-acac90b257a14bd14a1492cd442b79dcaa1c13cf.tar.gz) = 1f69541be3b585a2791bcf2d5e4904f89444a7ba92918347adb668299fc8d2399796faf69b427cb046f3c20a53bb1bf21f54d7b7042a24fc80e632d3c0d98bbf
+Size (glmark2-2014.03-acac90b257a14bd14a1492cd442b79dcaa1c13cf.tar.gz) = 7811479 bytes
diff --git a/benchmarks/glmark2/patches/patch-src_image-reader.h b/benchmarks/glmark2/patches/patch-src_image-reader.h
deleted file mode 100644
index 5655336a257..00000000000
--- a/benchmarks/glmark2/patches/patch-src_image-reader.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_image-reader.h,v 1.1 2015/03/08 23:25:39 joerg Exp $
-
---- src/image-reader.h.orig	2015-03-05 10:43:06.000000000 +0000
-+++ src/image-reader.h
-@@ -32,7 +32,7 @@ public:
-     virtual ~ImageReader() {}
- };
- 
--class PNGReaderPrivate;
-+struct PNGReaderPrivate;
- 
- class PNGReader : public ImageReader
- {
-@@ -54,7 +54,7 @@ private:
-     PNGReaderPrivate *priv_;
- };
- 
--class JPEGReaderPrivate;
-+struct JPEGReaderPrivate;
- 
- class JPEGReader : public ImageReader
- {
diff --git a/benchmarks/glmark2/patches/patch-src_scene-buffer.cpp b/benchmarks/glmark2/patches/patch-src_scene-buffer.cpp
deleted file mode 100644
index 462b02813fe..00000000000
--- a/benchmarks/glmark2/patches/patch-src_scene-buffer.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_scene-buffer.cpp,v 1.1 2015/03/08 23:25:39 joerg Exp $
-
---- src/scene-buffer.cpp.orig	2015-03-05 10:57:51.000000000 +0000
-+++ src/scene-buffer.cpp
-@@ -183,7 +183,6 @@ private:
-     double wave_k_;
-     double wave_period_;
-     double wave_full_period_;
--    double wave_fill_;
-     double wave_velocity_;
- 
-     std::vector<double> displacement_;
diff --git a/benchmarks/glmark2/patches/patch-src_scene-refract.cpp b/benchmarks/glmark2/patches/patch-src_scene-refract.cpp
deleted file mode 100644
index 6dade9b390c..00000000000
--- a/benchmarks/glmark2/patches/patch-src_scene-refract.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_scene-refract.cpp,v 1.1 2015/03/08 23:25:39 joerg Exp $
-
---- src/scene-refract.cpp.orig	2015-03-05 11:02:14.000000000 +0000
-+++ src/scene-refract.cpp
-@@ -245,10 +245,8 @@ DistanceRenderTarget::teardown()
- {
-     program_.stop();
-     program_.release();
--    if (tex_) {
--        glDeleteTextures(2, &tex_[0]);
--        tex_[DEPTH] = tex_[COLOR] = 0;
--    }
-+    glDeleteTextures(2, &tex_[0]);
-+    tex_[DEPTH] = tex_[COLOR] = 0;
-     if (fbo_) {
-         glDeleteFramebuffers(1, &fbo_);
-         fbo_ = 0;