Import of pkgsrc-2015Q1

benchmarks/glmark2/DESCR

@@ -0,0 +1 @@
+glmark2 is an OpenGL 2.0 and ES 2.0 benchmark.

benchmarks/glmark2/Makefile

@@ -0,0 +1,49 @@
+# $NetBSD: Makefile,v 1.5 2015/03/08 23:25:39 joerg Exp $
+
+DISTNAME=	glmark2-2014.03
+CATEGORIES=	benchmarks
+MASTER_SITES=	${MASTER_SITE_GITHUB:=glmark2/}
+GITHUB_TAG=	499aa81a68fb4c8aac1c80f0d6a4cce05941c4cc
+
+MAINTAINER=	prlw1@cam.ac.uk
+HOMEPAGE=	https://github.com/glmark2/glmark2
+COMMENT=	OpenGL 2.0 and ES 2.0 benchmark
+LICENSE=	gnu-gpl-v3 AND modified-bsd
+
+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
+SUBST_STAGE.rmdl=	pre-configure
+SUBST_MESSAGE.rmdl=	remove -ldl
+SUBST_FILES.rmdl=	src/wscript_build
+SUBST_SED.rmdl=		-e "s/, 'dl'//"
+.endif
+
+#./waf configure --with-flavors=<drm-gl,drm-glesv2,mir-gl,mir-glesv2,wayland-gl,wayland-glesv2,x11-gl,x11-glesv2> [--data-path=DATA_PATH --prefix=PREFIX]
+# drm-gl requires libdrm and "gbm"
+do-configure:
+	cd ${WRKSRC:Q} && \
+		${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \
+			--with-flavors=x11-gl \
+			--prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
+
+do-build:
+	cd ${WRKSRC:Q} && \
+		${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf build
+
+do-install:
+	cd ${WRKSRC:Q} && \
+		${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf install \
+			--destdir=${DESTDIR}
+
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../lang/python/extension.mk"
+.include "../../mk/bsd.pkg.mk"

benchmarks/glmark2/PLIST

@@ -0,0 +1,137 @@
+@comment $NetBSD: PLIST,v 1.1 2015/02/28 23:09:27 prlw1 Exp $
+bin/glmark2
+share/glmark2/models/asteroid-high.3ds
+share/glmark2/models/asteroid-low.3ds
+share/glmark2/models/bunny.obj
+share/glmark2/models/cat.3ds
+share/glmark2/models/cube.3ds
+share/glmark2/models/horse.3ds
+share/glmark2/models/jellyfish.jobj
+share/glmark2/shaders/README.shaders
+share/glmark2/shaders/buffer-wireframe.frag
+share/glmark2/shaders/buffer-wireframe.vert
+share/glmark2/shaders/bump-height.frag
+share/glmark2/shaders/bump-height.vert
+share/glmark2/shaders/bump-normals-tangent.frag
+share/glmark2/shaders/bump-normals-tangent.vert
+share/glmark2/shaders/bump-normals.frag
+share/glmark2/shaders/bump-normals.vert
+share/glmark2/shaders/bump-poly.frag
+share/glmark2/shaders/bump-poly.vert
+share/glmark2/shaders/conditionals-step-conditional.all
+share/glmark2/shaders/conditionals-step-simple.all
+share/glmark2/shaders/conditionals.frag
+share/glmark2/shaders/conditionals.vert
+share/glmark2/shaders/depth.frag
+share/glmark2/shaders/depth.vert
+share/glmark2/shaders/desktop-blur.frag
+share/glmark2/shaders/desktop.frag
+share/glmark2/shaders/desktop.vert
+share/glmark2/shaders/effect-2d-convolution.frag
+share/glmark2/shaders/effect-2d.vert
+share/glmark2/shaders/function-call.all
+share/glmark2/shaders/function-step-low.all
+share/glmark2/shaders/function-step-medium.all
+share/glmark2/shaders/function.frag
+share/glmark2/shaders/function.vert
+share/glmark2/shaders/gradient.frag
+share/glmark2/shaders/gradient.vert
+share/glmark2/shaders/ideas-lamp-lit.frag
+share/glmark2/shaders/ideas-lamp-lit.vert
+share/glmark2/shaders/ideas-lamp-unlit.frag
+share/glmark2/shaders/ideas-lamp-unlit.vert
+share/glmark2/shaders/ideas-logo-flat.frag
+share/glmark2/shaders/ideas-logo-flat.vert
+share/glmark2/shaders/ideas-logo-shadow.frag
+share/glmark2/shaders/ideas-logo-shadow.vert
+share/glmark2/shaders/ideas-logo.frag
+share/glmark2/shaders/ideas-logo.vert
+share/glmark2/shaders/ideas-paper.frag
+share/glmark2/shaders/ideas-paper.vert
+share/glmark2/shaders/ideas-table.frag
+share/glmark2/shaders/ideas-table.vert
+share/glmark2/shaders/ideas-text.frag
+share/glmark2/shaders/ideas-text.vert
+share/glmark2/shaders/ideas-under-table.frag
+share/glmark2/shaders/ideas-under-table.vert
+share/glmark2/shaders/jellyfish.frag
+share/glmark2/shaders/jellyfish.vert
+share/glmark2/shaders/light-advanced.frag
+share/glmark2/shaders/light-advanced.vert
+share/glmark2/shaders/light-basic-tex-bilinear.frag
+share/glmark2/shaders/light-basic-tex.frag
+share/glmark2/shaders/light-basic-texgen.vert
+share/glmark2/shaders/light-basic.frag
+share/glmark2/shaders/light-basic.vert
+share/glmark2/shaders/light-cel.frag
+share/glmark2/shaders/light-phong.frag
+share/glmark2/shaders/light-phong.vert
+share/glmark2/shaders/light-refract.frag
+share/glmark2/shaders/light-refract.vert
+share/glmark2/shaders/loop-step-loop.all
+share/glmark2/shaders/loop-step-simple.all
+share/glmark2/shaders/loop.frag
+share/glmark2/shaders/loop.vert
+share/glmark2/shaders/pulsar-light.vert
+share/glmark2/shaders/pulsar.vert
+share/glmark2/shaders/shadow.frag
+share/glmark2/shaders/shadow.vert
+share/glmark2/shaders/terrain-blur.frag
+share/glmark2/shaders/terrain-luminance.frag
+share/glmark2/shaders/terrain-noise.frag
+share/glmark2/shaders/terrain-normalmap.frag
+share/glmark2/shaders/terrain-overlay.frag
+share/glmark2/shaders/terrain-texture.vert
+share/glmark2/shaders/terrain.frag
+share/glmark2/shaders/terrain.vert
+share/glmark2/shaders/text-renderer.frag
+share/glmark2/shaders/text-renderer.vert
+share/glmark2/textures/asteroid-height-map.png
+share/glmark2/textures/asteroid-normal-map-tangent.png
+share/glmark2/textures/asteroid-normal-map.png
+share/glmark2/textures/crate-base.png
+share/glmark2/textures/desktop-shadow-corner.png
+share/glmark2/textures/desktop-shadow.png
+share/glmark2/textures/desktop-window.png
+share/glmark2/textures/effect-2d.png
+share/glmark2/textures/glyph-atlas.png
+share/glmark2/textures/jellyfish-caustics-01.png
+share/glmark2/textures/jellyfish-caustics-02.png
+share/glmark2/textures/jellyfish-caustics-03.png
+share/glmark2/textures/jellyfish-caustics-04.png
+share/glmark2/textures/jellyfish-caustics-05.png
+share/glmark2/textures/jellyfish-caustics-06.png
+share/glmark2/textures/jellyfish-caustics-07.png
+share/glmark2/textures/jellyfish-caustics-08.png
+share/glmark2/textures/jellyfish-caustics-09.png
+share/glmark2/textures/jellyfish-caustics-10.png
+share/glmark2/textures/jellyfish-caustics-11.png
+share/glmark2/textures/jellyfish-caustics-12.png
+share/glmark2/textures/jellyfish-caustics-13.png
+share/glmark2/textures/jellyfish-caustics-14.png
+share/glmark2/textures/jellyfish-caustics-15.png
+share/glmark2/textures/jellyfish-caustics-16.png
+share/glmark2/textures/jellyfish-caustics-17.png
+share/glmark2/textures/jellyfish-caustics-18.png
+share/glmark2/textures/jellyfish-caustics-19.png
+share/glmark2/textures/jellyfish-caustics-20.png
+share/glmark2/textures/jellyfish-caustics-21.png
+share/glmark2/textures/jellyfish-caustics-22.png
+share/glmark2/textures/jellyfish-caustics-23.png
+share/glmark2/textures/jellyfish-caustics-24.png
+share/glmark2/textures/jellyfish-caustics-25.png
+share/glmark2/textures/jellyfish-caustics-26.png
+share/glmark2/textures/jellyfish-caustics-27.png
+share/glmark2/textures/jellyfish-caustics-28.png
+share/glmark2/textures/jellyfish-caustics-29.png
+share/glmark2/textures/jellyfish-caustics-30.png
+share/glmark2/textures/jellyfish-caustics-31.png
+share/glmark2/textures/jellyfish-caustics-32.png
+share/glmark2/textures/jellyfish256.png
+share/glmark2/textures/nasa1.png
+share/glmark2/textures/nasa2.png
+share/glmark2/textures/nasa3.png
+share/glmark2/textures/terrain-backgrounddetailed6.jpg
+share/glmark2/textures/terrain-grasslight-512-nm.jpg
+share/glmark2/textures/terrain-grasslight-512.jpg
+man/man1/glmark2.1

benchmarks/glmark2/distinfo

@@ -0,0 +1,8 @@
+$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

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
+ {

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_;

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;