Fix warnings to build with default clang flags.

5 files changed, 58 insertions, 2 deletions

diff --git a/benchmarks/glmark2/Makefile b/benchmarks/glmark2/Makefile
index 416044fc5a6..3576b1b3bf2 100644
--- a/benchmarks/glmark2/Makefile
+++ b/benchmarks/glmark2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/03/07 21:14:32 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2015/03/08 23:25:39 joerg Exp $
 
 DISTNAME=	glmark2-2014.03
 CATEGORIES=	benchmarks
@@ -14,6 +14,8 @@ USE_LANGUAGES=	c c++
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34
 
+USE_TOOLS+=	pkg-config
+
 .include "../../mk/dlopen.buildlink3.mk"
 .if empty(BUILTIN_LIB_FOUND.dl:M[yY][eE][sS])
 SUBST_CLASSES+=		rmdl
diff --git a/benchmarks/glmark2/distinfo b/benchmarks/glmark2/distinfo
index 8ce501bdaab..30c39968914 100644
--- a/benchmarks/glmark2/distinfo
+++ b/benchmarks/glmark2/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/03/07 14:27:15 tnn Exp $
+$NetBSD: distinfo,v 1.3 2015/03/08 23:25:39 joerg Exp $
 
 SHA1 (glmark2-2014.03-499aa81a68fb4c8aac1c80f0d6a4cce05941c4cc.tar.gz) = 2cedb183b5ee5cb1a4448200a63835862a2796a7
 RMD160 (glmark2-2014.03-499aa81a68fb4c8aac1c80f0d6a4cce05941c4cc.tar.gz) = d20f6500c02b3eda2ae7d0f04910a79b977be6c0
 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
diff --git a/benchmarks/glmark2/patches/patch-src_image-reader.h b/benchmarks/glmark2/patches/patch-src_image-reader.h
new file mode 100644
index 00000000000..5655336a257
--- /dev/null
+++ b/benchmarks/glmark2/patches/patch-src_image-reader.h
@@ -0,0 +1,22 @@
+$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
new file mode 100644
index 00000000000..462b02813fe
--- /dev/null
+++ b/benchmarks/glmark2/patches/patch-src_scene-buffer.cpp
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..6dade9b390c
--- /dev/null
+++ b/benchmarks/glmark2/patches/patch-src_scene-refract.cpp
@@ -0,0 +1,17 @@
+$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;