Fri Jan 4 01:43:20 2019 UTC ()
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


(tnn)
diff -r1.42 -r1.43 pkgsrc/graphics/MesaDemos/Makefile
diff -r1.17 -r1.18 pkgsrc/graphics/MesaDemos/PLIST
diff -r1.24 -r1.25 pkgsrc/graphics/MesaDemos/distinfo
diff -r0 -r1.1 pkgsrc/graphics/MesaDemos/options.mk
diff -r1.1 -r0 pkgsrc/graphics/MesaDemos/patches/patch-src_Makefile.in

cvs diff -r1.42 -r1.43 pkgsrc/graphics/MesaDemos/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaDemos/Makefile 2018/01/03 00:29:23 1.42
+++ pkgsrc/graphics/MesaDemos/Makefile 2019/01/04 01:43:20 1.43
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: Makefile,v 1.42 2018/01/03 00:29:23 rillig Exp $ 1# $NetBSD: Makefile,v 1.43 2019/01/04 01:43:20 tnn Exp $
2 2
3DISTNAME= mesa-demos-8.2.0 3DISTNAME= mesa-demos-8.4.0
4PKGNAME= ${DISTNAME:S/mesa-demos/MesaDemos/} 4PKGNAME= ${DISTNAME:S/mesa-demos/MesaDemos/}
5PKGREVISION= 3 
6CATEGORIES= graphics 5CATEGORIES= graphics
7MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/8.2.0/ 6MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://cgit.freedesktop.org/mesa/demos/ 10HOMEPAGE= https://cgit.freedesktop.org/mesa/demos/
12COMMENT= OpenGL examples and Demos 11COMMENT= OpenGL examples and Demos
13#LICENSE= # Each source file has a different license 12#LICENSE= # Each source file has a different license
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19 18
20SUBST_CLASSES+= bitmap 19SUBST_CLASSES+= bitmap
21SUBST_STAGE.bitmap= pre-configure 20SUBST_STAGE.bitmap= pre-configure
22SUBST_MESSAGE.bitmap= Avoid conflict with x11/bitmap and graphics/glx-utils 21SUBST_MESSAGE.bitmap= Avoid conflict with x11/bitmap and graphics/glx-utils
23SUBST_FILES.bitmap= src/glsl/Makefile.in 22SUBST_FILES.bitmap= src/glsl/Makefile.in
24SUBST_FILES.bitmap+= src/xdemos/Makefile.in 23SUBST_FILES.bitmap+= src/xdemos/Makefile.in
25SUBST_SED.bitmap= -e 's/bitmap$$(EXEEXT)/bitmap_mesademos$$(EXEEXT)/g' 24SUBST_SED.bitmap= -e 's/bitmap$$(EXEEXT)/bitmap_mesademos$$(EXEEXT)/g'
26SUBST_SED.bitmap+= -e 's/glxgears$$(EXEEXT)/glxgears_mesademos$$(EXEEXT)/g' 25SUBST_SED.bitmap+= -e 's/glxgears$$(EXEEXT)/glxgears_mesademos$$(EXEEXT)/g'
27SUBST_SED.bitmap+= -e 's/glxinfo$$(EXEEXT)/glxinfo_mesademos$$(EXEEXT)/g' 26SUBST_SED.bitmap+= -e 's/glxinfo$$(EXEEXT)/glxinfo_mesademos$$(EXEEXT)/g'
28 27
 28.include "options.mk"
 29
29.include "../../graphics/freetype2/buildlink3.mk" 30.include "../../graphics/freetype2/buildlink3.mk"
30.include "../../graphics/glew/buildlink3.mk" 31.include "../../graphics/glew/buildlink3.mk"
31.include "../../graphics/glu/buildlink3.mk" 32.include "../../graphics/glu/buildlink3.mk"
32.include "../../graphics/glut/buildlink3.mk" 33.include "../../graphics/glut/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"

cvs diff -r1.17 -r1.18 pkgsrc/graphics/MesaDemos/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/MesaDemos/PLIST 2015/12/30 04:13:07 1.17
+++ pkgsrc/graphics/MesaDemos/PLIST 2019/01/04 01:43:20 1.18
@@ -1,86 +1,87 @@ @@ -1,86 +1,87 @@
1@comment $NetBSD: PLIST,v 1.17 2015/12/30 04:13:07 dholland Exp $ 1@comment $NetBSD: PLIST,v 1.18 2019/01/04 01:43:20 tnn Exp $
2bin/arbfplight 2bin/arbfplight
3bin/arbfslight 3bin/arbfslight
4bin/arbocclude 4bin/arbocclude
5bin/arbocclude2 5bin/arbocclude2
6bin/array 6bin/array
7bin/bezier 7bin/bezier
8bin/bitmap_mesademos 8bin/bitmap_mesademos
9bin/blinking-teapot 9bin/blinking-teapot
10bin/bounce 10bin/bounce
11bin/brick 11bin/brick
12bin/bump 12bin/bump
13bin/clear-color 13bin/clear-color
14bin/clear-fbo 14bin/clear-fbo
15bin/clear-fbo-scissor 15bin/clear-fbo-scissor
16bin/clear-fbo-tex 16bin/clear-fbo-tex
17bin/clear-random 17bin/clear-random
18bin/clear-repeat 18bin/clear-repeat
19bin/clear-scissor 19bin/clear-scissor
20bin/clear-undefined 20bin/clear-undefined
21bin/clearspd 21bin/clearspd
22bin/convolutions 22bin/convolutions
23bin/copypix 23bin/copypix
24bin/copytex 24bin/copytex
25bin/corender 
26bin/createwin 25bin/createwin
27bin/cubemap 26bin/cubemap
28bin/cuberender 27bin/cuberender
29bin/deriv 28bin/deriv
30bin/dinoshade 29bin/dinoshade
31bin/dissolve 30bin/dissolve
32bin/dlist-begin-call-end 31bin/dlist-begin-call-end
33bin/dlist-dangling 32bin/dlist-dangling
34bin/dlist-degenerate 33bin/dlist-degenerate
35bin/dlist-edgeflag 34bin/dlist-edgeflag
36bin/dlist-edgeflag-dangling 35bin/dlist-edgeflag-dangling
37bin/dlist-flat-tri 36bin/dlist-flat-tri
38bin/dlist-mat-tri 37bin/dlist-mat-tri
39bin/dlist-recursive-call 38bin/dlist-recursive-call
40bin/dlist-tri-flat-tri 39bin/dlist-tri-flat-tri
41bin/dlist-tri-mat-tri 40bin/dlist-tri-mat-tri
42bin/draw2arrays 41bin/draw2arrays
43bin/drawarrays 42bin/drawarrays
44bin/drawelements 43bin/drawelements
45bin/drawelements-large 44bin/drawelements-large
46bin/drawoverhead 45bin/drawoverhead
47bin/drawpix 46bin/drawpix
48bin/drawrange 47bin/drawrange
 48${PLIST.egl}bin/eglinfo
49bin/engine 49bin/engine
50bin/fbo_firecube 50bin/fbo_firecube
51bin/fbobind 51bin/fbobind
52bin/fbotexture 52bin/fbotexture
53bin/fill 53bin/fill
54bin/fire 54bin/fire
55bin/flat-clip 55bin/flat-clip
56bin/fogcoord 56bin/fogcoord
57bin/fplight 57bin/fplight
58bin/fragcoord 58bin/fragcoord
59bin/fs-tri 59bin/fs-tri
60bin/fslight 60bin/fslight
61bin/fsraytrace 61bin/fsraytrace
62bin/gamma 62bin/gamma
63bin/gearbox 63bin/gearbox
64bin/gears 64bin/gears
65bin/geartrain 65bin/geartrain
66bin/genmipmap 66bin/genmipmap
67bin/geom-outlining-130 67bin/geom-outlining-130
68bin/geom-outlining-150 68bin/geom-outlining-150
69bin/geom-sprites 69bin/geom-sprites
70bin/geom-stipple-lines 70bin/geom-stipple-lines
71bin/geom-wide-lines 71bin/geom-wide-lines
72bin/glinfo 72bin/glinfo
73bin/gloss 73bin/gloss
 74bin/glsl-compile-time
74bin/glslstateschange 75bin/glslstateschange
75bin/glsync 76bin/glsync
76bin/gltestperf 77bin/gltestperf
77bin/glthreads 78bin/glthreads
78bin/glxcontexts 79bin/glxcontexts
79bin/glxdemo 80bin/glxdemo
80bin/glxgears_fbconfig 81bin/glxgears_fbconfig
81bin/glxgears_mesademos 82bin/glxgears_mesademos
82bin/glxgears_pixmap 83bin/glxgears_pixmap
83bin/glxheads 84bin/glxheads
84bin/glxinfo_mesademos 85bin/glxinfo_mesademos
85bin/glxpbdemo 86bin/glxpbdemo
86bin/glxpixmap 87bin/glxpixmap
@@ -236,26 +237,27 @@ bin/tri-mask-tri @@ -236,26 +237,27 @@ bin/tri-mask-tri
236bin/tri-multitex-vbo 237bin/tri-multitex-vbo
237bin/tri-orig 238bin/tri-orig
238bin/tri-point-line-clipped 239bin/tri-point-line-clipped
239bin/tri-query 240bin/tri-query
240bin/tri-repeat 241bin/tri-repeat
241bin/tri-rotate 242bin/tri-rotate
242bin/tri-scissor-tri 243bin/tri-scissor-tri
243bin/tri-square 244bin/tri-square
244bin/tri-stencil 245bin/tri-stencil
245bin/tri-stipple 246bin/tri-stipple
246bin/tri-tex 247bin/tri-tex
247bin/tri-tex-1d 248bin/tri-tex-1d
248bin/tri-tex-3d 249bin/tri-tex-3d
 250bin/tri-tex-stipple
249bin/tri-tri 251bin/tri-tri
250bin/tri-unfilled 252bin/tri-unfilled
251bin/tri-unfilled-clip 253bin/tri-unfilled-clip
252bin/tri-unfilled-edgeflag 254bin/tri-unfilled-edgeflag
253bin/tri-unfilled-fog 255bin/tri-unfilled-fog
254bin/tri-unfilled-point 256bin/tri-unfilled-point
255bin/tri-unfilled-smooth 257bin/tri-unfilled-smooth
256bin/tri-unfilled-tri 258bin/tri-unfilled-tri
257bin/tri-unfilled-tri-lit 259bin/tri-unfilled-tri-lit
258bin/tri-unfilled-userclip 260bin/tri-unfilled-userclip
259bin/tri-unfilled-userclip-stip 261bin/tri-unfilled-userclip-stip
260bin/tri-userclip 262bin/tri-userclip
261bin/tri-viewport 263bin/tri-viewport

cvs diff -r1.24 -r1.25 pkgsrc/graphics/MesaDemos/distinfo (expand / switch to unified diff)

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

File Added: pkgsrc/graphics/MesaDemos/options.mk
# $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

File Deleted: pkgsrc/graphics/MesaDemos/patches/Attic/patch-src_Makefile.in