CVS commit: pkgsrc/graphics/MesaDemos

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  4 01:43:20 UTC 2019

Modified Files:
        pkgsrc/graphics/MesaDemos: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/MesaDemos: options.mk
Removed Files:
        pkgsrc/graphics/MesaDemos/patches: patch-src_Makefile.in

Log Message:
MesaDemos: update to 8.4.0

- Add option to install new eglinfo binary, disabled by default as
  it requires mesa with EGL and native X11 might not have that.

8.4.0
New features and changes:
- glxinfo now supports OpenGL 4.6
- glxinfo prints more OpenGL limits (GL 3.0 up to GL 4.6)
- glxinfo gained support for GL_ATI_meminfo and GL_NVX_gpu_memory_info
- eglinfo binary is now installed by `make install`
- misc bugfixes

8.3.0
This new mesa-demos release fixes the build issue against mesa 10.6 (Bug 91643)
and picks up the latest glxinfo changes.
- misc changes
- misc bugfixes


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/graphics/MesaDemos/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/MesaDemos/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/MesaDemos/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/MesaDemos/options.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/MesaDemos/patches/patch-src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaDemos/Makefile
diff -u pkgsrc/graphics/MesaDemos/Makefile:1.42 pkgsrc/graphics/MesaDemos/Makefile:1.43
--- pkgsrc/graphics/MesaDemos/Makefile:1.42     Wed Jan  3 00:29:23 2018
+++ pkgsrc/graphics/MesaDemos/Makefile  Fri Jan  4 01:43:20 2019
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2018/01/03 00:29:23 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2019/01/04 01:43:20 tnn Exp $
 
-DISTNAME=      mesa-demos-8.2.0
+DISTNAME=      mesa-demos-8.4.0
 PKGNAME=       ${DISTNAME:S/mesa-demos/MesaDemos/}
-PKGREVISION=   3
 CATEGORIES=    graphics
-MASTER_SITES=  ftp://ftp.freedesktop.org/pub/mesa/demos/8.2.0/
+MASTER_SITES=  ftp://ftp.freedesktop.org/pub/mesa/demos/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -26,6 +25,8 @@ SUBST_SED.bitmap=     -e 's/bitmap$$(EXEEXT)
 SUBST_SED.bitmap+=     -e 's/glxgears$$(EXEEXT)/glxgears_mesademos$$(EXEEXT)/g'
 SUBST_SED.bitmap+=     -e 's/glxinfo$$(EXEEXT)/glxinfo_mesademos$$(EXEEXT)/g'
 
+.include "options.mk"
+
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"

Index: pkgsrc/graphics/MesaDemos/PLIST
diff -u pkgsrc/graphics/MesaDemos/PLIST:1.17 pkgsrc/graphics/MesaDemos/PLIST:1.18
--- pkgsrc/graphics/MesaDemos/PLIST:1.17        Wed Dec 30 04:13:07 2015
+++ pkgsrc/graphics/MesaDemos/PLIST     Fri Jan  4 01:43:20 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2015/12/30 04:13:07 dholland Exp $
+@comment $NetBSD: PLIST,v 1.18 2019/01/04 01:43:20 tnn Exp $
 bin/arbfplight
 bin/arbfslight
 bin/arbocclude
@@ -22,7 +22,6 @@ bin/clearspd
 bin/convolutions
 bin/copypix
 bin/copytex
-bin/corender
 bin/createwin
 bin/cubemap
 bin/cuberender
@@ -46,6 +45,7 @@ bin/drawelements-large
 bin/drawoverhead
 bin/drawpix
 bin/drawrange
+${PLIST.egl}bin/eglinfo
 bin/engine
 bin/fbo_firecube
 bin/fbobind
@@ -71,6 +71,7 @@ bin/geom-stipple-lines
 bin/geom-wide-lines
 bin/glinfo
 bin/gloss
+bin/glsl-compile-time
 bin/glslstateschange
 bin/glsync
 bin/gltestperf
@@ -246,6 +247,7 @@ bin/tri-stipple
 bin/tri-tex
 bin/tri-tex-1d
 bin/tri-tex-3d
+bin/tri-tex-stipple
 bin/tri-tri
 bin/tri-unfilled
 bin/tri-unfilled-clip

Index: pkgsrc/graphics/MesaDemos/distinfo
diff -u pkgsrc/graphics/MesaDemos/distinfo:1.24 pkgsrc/graphics/MesaDemos/distinfo:1.25
--- pkgsrc/graphics/MesaDemos/distinfo:1.24     Tue Nov  3 21:33:51 2015
+++ pkgsrc/graphics/MesaDemos/distinfo  Fri Jan  4 01:43:20 2019
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.24 2015/11/03 21:33:51 agc Exp $
+$NetBSD: distinfo,v 1.25 2019/01/04 01:43:20 tnn Exp $
 
-SHA1 (mesa-demos-8.2.0.tar.bz2) = e1a66ac63eebba4f950f95d830f34a6005167116
-RMD160 (mesa-demos-8.2.0.tar.bz2) = e6804e480ed5d227ba689cb9b3ea95cc85353889
-SHA512 (mesa-demos-8.2.0.tar.bz2) = 590e9fb66e23c0ad526754e9084858eb3e1fa906be55ee6121089325254b970e135e04d53c634cabd13d59c572ea39a4a877bce14b120d73850aafd159a5c8de
-Size (mesa-demos-8.2.0.tar.bz2) = 10071635 bytes
-SHA1 (patch-src_Makefile.in) = ab349abae606c4b0f8dae4604e96fc51c02828ac
+SHA1 (mesa-demos-8.4.0.tar.bz2) = 57ba892e919fa22ce3db9f25e7331a6fa33c652c
+RMD160 (mesa-demos-8.4.0.tar.bz2) = dcbfec40c173cacef19bf929b4b8119ce78e8e1b
+SHA512 (mesa-demos-8.4.0.tar.bz2) = b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
+Size (mesa-demos-8.4.0.tar.bz2) = 10073259 bytes
 SHA1 (patch-src_xdemos_glinfo__common.c) = 1f657daf58f2ae08a161cd7ab73285af441f17b0

Added files:

Index: pkgsrc/graphics/MesaDemos/options.mk
diff -u /dev/null pkgsrc/graphics/MesaDemos/options.mk:1.1
--- /dev/null   Fri Jan  4 01:43:20 2019
+++ pkgsrc/graphics/MesaDemos/options.mk        Fri Jan  4 01:43:20 2019
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2019/01/04 01:43:20 tnn Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaDemos
+PKG_SUPPORTED_OPTIONS=         egl
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=   egl
+
+.if !empty(PKG_OPTIONS:Megl)
+CONFIGURE_ARGS+=       --enable-egl
+PLIST.egl=             yes
+.else
+CONFIGURE_ARGS+=       --disable-egl
+.endif