Fri Aug 30 19:06:34 2019 UTC ()
Remove graphics/Mesa

This metapackage isn't particularly useful for modern applications and is
potentially misleading.

Not everything needs glu for OpenGL support, and glut has increasingly
fell out of favour, to the extent of being dropped from Mesa. It's
mostly been replaced by e.g. SDL.

Hopefully I've narrowed down everything pulling in the metapackage
and switched everything to using only the individual libraries it needs.


(nia)
diff -r1.844 -r1.845 pkgsrc/graphics/Makefile
diff -r1.3 -r0 pkgsrc/graphics/Mesa/DESCR
diff -r1.74 -r0 pkgsrc/graphics/Mesa/Makefile
diff -r1.6 -r0 pkgsrc/graphics/Mesa/buildlink3.mk
diff -r1.12 -r0 pkgsrc/graphics/Mesa/version.mk
diff -r1.22 -r1.23 pkgsrc/graphics/MesaLib/builtin.mk
diff -r0 -r1.1 pkgsrc/graphics/MesaLib/version.mk
cvs diff -r1.844 -r1.845 pkgsrc/graphics/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/Makefile 2019/08/30 17:17:19 1.844
+++ pkgsrc/graphics/Makefile 2019/08/30 19:06:34 1.845
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.844 2019/08/30 17:17:19 nia Exp $ 1# $NetBSD: Makefile,v 1.845 2019/08/30 19:06:34 nia Exp $
2# 2#
3 3
4COMMENT= Graphics tools and libraries 4COMMENT= Graphics tools and libraries
5 5
6SUBDIR+= AfterShotPro 6SUBDIR+= AfterShotPro
7SUBDIR+= CRWInfo 7SUBDIR+= CRWInfo
8SUBDIR+= Cenon 8SUBDIR+= Cenon
9SUBDIR+= Coin 9SUBDIR+= Coin
10SUBDIR+= GMT 10SUBDIR+= GMT
11SUBDIR+= GUIlib 11SUBDIR+= GUIlib
12SUBDIR+= GraphicsMagick 12SUBDIR+= GraphicsMagick
13SUBDIR+= ImageMagick 13SUBDIR+= ImageMagick
14SUBDIR+= ImageMagick6 14SUBDIR+= ImageMagick6
15SUBDIR+= ImageViewer 15SUBDIR+= ImageViewer
16SUBDIR+= Mesa 
17SUBDIR+= MesaDemos 16SUBDIR+= MesaDemos
18SUBDIR+= MesaLib 17SUBDIR+= MesaLib
19SUBDIR+= Ngraph 18SUBDIR+= Ngraph
20SUBDIR+= OpenRM 19SUBDIR+= OpenRM
21SUBDIR+= PanoTools 20SUBDIR+= PanoTools
22SUBDIR+= R-Cairo 21SUBDIR+= R-Cairo
23SUBDIR+= R-colorspace 22SUBDIR+= R-colorspace
24SUBDIR+= R-colourpicker 23SUBDIR+= R-colourpicker
25SUBDIR+= R-dichromat 24SUBDIR+= R-dichromat
26SUBDIR+= R-effects 25SUBDIR+= R-effects
27SUBDIR+= R-ggExtra 26SUBDIR+= R-ggExtra
28SUBDIR+= R-ggplot2 27SUBDIR+= R-ggplot2
29SUBDIR+= R-ggtern 28SUBDIR+= R-ggtern
File Deleted: pkgsrc/graphics/Mesa/Attic/DESCR
File Deleted: pkgsrc/graphics/Mesa/Attic/Makefile
File Deleted: pkgsrc/graphics/Mesa/Attic/buildlink3.mk
File Deleted: pkgsrc/graphics/Mesa/Attic/version.mk
cvs diff -r1.22 -r1.23 pkgsrc/graphics/MesaLib/builtin.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/builtin.mk 2019/08/21 13:35:28 1.22
+++ pkgsrc/graphics/MesaLib/builtin.mk 2019/08/30 19:06:34 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.22 2019/08/21 13:35:28 nia Exp $ 1# $NetBSD: builtin.mk,v 1.23 2019/08/30 19:06:34 nia Exp $
2 2
3BUILTIN_PKG:= MesaLib 3BUILTIN_PKG:= MesaLib
4 4
5BUILTIN_FIND_FILES_VAR:= H_MESALIB PC_GL 5BUILTIN_FIND_FILES_VAR:= H_MESALIB PC_GL
6BUILTIN_FIND_FILES.H_MESALIB= ${X11BASE}/include/GL/glx.h 6BUILTIN_FIND_FILES.H_MESALIB= ${X11BASE}/include/GL/glx.h
7BUILTIN_FIND_FILES.PC_GL= ${X11BASE}/lib/pkgconfig/gl.pc 7BUILTIN_FIND_FILES.PC_GL= ${X11BASE}/lib/pkgconfig/gl.pc
8BUILTIN_FIND_FILES.PC_GL+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/gl.pc 8BUILTIN_FIND_FILES.PC_GL+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/gl.pc
9 9
10.include "../../mk/buildlink3/bsd.builtin.mk" 10.include "../../mk/buildlink3/bsd.builtin.mk"
11 11
12### 12###
13### Determine if there is a built-in implementation of the package and 13### Determine if there is a built-in implementation of the package and
14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 14### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
@@ -24,27 +24,27 @@ IS_BUILTIN.MesaLib= no @@ -24,27 +24,27 @@ IS_BUILTIN.MesaLib= no
24.endif 24.endif
25 25
26MAKEVARS+= IS_BUILTIN.MesaLib 26MAKEVARS+= IS_BUILTIN.MesaLib
27 27
28### 28###
29### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to 29### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
30### a package name to represent the built-in package. 30### a package name to represent the built-in package.
31### 31###
32.if !defined(BUILTIN_PKG.MesaLib) && \ 32.if !defined(BUILTIN_PKG.MesaLib) && \
33 !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS]) 33 !empty(IS_BUILTIN.MesaLib:M[yY][eE][sS])
34. if empty(PC_GL:M__nonexistent__) 34. if empty(PC_GL:M__nonexistent__)
35BUILTIN_VERSION.Mesa!= ${SED} -n -e 's/Version: //p' ${PC_GL} 35BUILTIN_VERSION.Mesa!= ${SED} -n -e 's/Version: //p' ${PC_GL}
36. elif empty(H_MESALIB:M__nonexistent__) 36. elif empty(H_MESALIB:M__nonexistent__)
37. include "../../graphics/Mesa/version.mk" 37. include "version.mk"
38. else # ? 38. else # ?
39BUILTIN_VERSION.Mesa:= 0.something-weird-happened 39BUILTIN_VERSION.Mesa:= 0.something-weird-happened
40. endif 40. endif
41BUILTIN_PKG.MesaLib= MesaLib-${BUILTIN_VERSION.Mesa} 41BUILTIN_PKG.MesaLib= MesaLib-${BUILTIN_VERSION.Mesa}
42MAKEVARS+= BUILTIN_VERSION.Mesa 42MAKEVARS+= BUILTIN_VERSION.Mesa
43.endif 43.endif
44MAKEVARS+= BUILTIN_PKG.MesaLib 44MAKEVARS+= BUILTIN_PKG.MesaLib
45 45
46### 46###
47### Determine whether we should use the built-in implementation if it 47### Determine whether we should use the built-in implementation if it
48### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 48### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
49### 49###
50.if !defined(USE_BUILTIN.MesaLib) 50.if !defined(USE_BUILTIN.MesaLib)
File Added: pkgsrc/graphics/MesaLib/version.mk
# $NetBSD: version.mk,v 1.1 2019/08/30 19:06:34 nia Exp $
#
# This file computes the version number of the Mesa distributed with
# XFree86 and stores it in ${BUILTIN_VERSION.Mesa}.
#
# NOTE: This file should only be used by the Mesa-related builtin.mk files.
#

BUILTIN_FIND_FILES_VAR:=	H_MESA
BUILTIN_FIND_FILES.H_MESA=	${X11BASE}/include/GL/gl.h
.include "../../mk/buildlink3/find-files.mk"
.include "../../mk/bsd.fast.prefs.mk"
.if !defined(BUILTIN_VERSION.Mesa) && exists(${H_MESA})
#
# According to the Mesa documentation, for stable releases:
#
#	Mesa-6.0 implements OpenGL 1.5,
#	Mesa-5.0 implements OpenGL 1.4,
#	Mesa-4.0.4 implements OpenGL 1.3,
#	Mesa-3.4.2 implements OpenGL 1.2.
#
BUILTIN_VERSION.Mesa!=							\
	${AWK} '/\#define[ 	]*GL_VERSION_1_2/ { v = "3.4.2" }	\
		/\#define[ 	]*GL_VERSION_1_3/ { v = "4.0.4" }	\
		/\#define[ 	]*GL_VERSION_1_4/ { v = "5.0" }		\
		/\#define[ 	]*GL_VERSION_1_5/ { v = "6.0" }		\
		END { printf "%s\n", v }'				\
		${H_MESA}
.endif
MAKEVARS+=	BUILTIN_VERSION.Mesa