CVS commit: pkgsrc/graphics

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 30 19:06:34 UTC 2019

Modified Files:
        pkgsrc/graphics: Makefile
        pkgsrc/graphics/MesaLib: builtin.mk
Added Files:
        pkgsrc/graphics/MesaLib: version.mk
Removed Files:
        pkgsrc/graphics/Mesa: DESCR Makefile buildlink3.mk version.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.844 -r1.845 pkgsrc/graphics/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/Mesa/DESCR
cvs rdiff -u -r1.74 -r0 pkgsrc/graphics/Mesa/Makefile
cvs rdiff -u -r1.6 -r0 pkgsrc/graphics/Mesa/buildlink3.mk
cvs rdiff -u -r1.12 -r0 pkgsrc/graphics/Mesa/version.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/MesaLib/builtin.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/MesaLib/version.mk

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

Modified files:

Index: pkgsrc/graphics/Makefile
diff -u pkgsrc/graphics/Makefile:1.844 pkgsrc/graphics/Makefile:1.845
--- pkgsrc/graphics/Makefile:1.844      Fri Aug 30 17:17:19 2019
+++ pkgsrc/graphics/Makefile    Fri Aug 30 19:06:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.844 2019/08/30 17:17:19 nia Exp $
+# $NetBSD: Makefile,v 1.845 2019/08/30 19:06:34 nia Exp $
 #
 
 COMMENT=       Graphics tools and libraries
@@ -13,7 +13,6 @@ SUBDIR+=      GraphicsMagick
 SUBDIR+=       ImageMagick
 SUBDIR+=       ImageMagick6
 SUBDIR+=       ImageViewer
-SUBDIR+=       Mesa
 SUBDIR+=       MesaDemos
 SUBDIR+=       MesaLib
 SUBDIR+=       Ngraph

Index: pkgsrc/graphics/MesaLib/builtin.mk
diff -u pkgsrc/graphics/MesaLib/builtin.mk:1.22 pkgsrc/graphics/MesaLib/builtin.mk:1.23
--- pkgsrc/graphics/MesaLib/builtin.mk:1.22     Wed Aug 21 13:35:28 2019
+++ pkgsrc/graphics/MesaLib/builtin.mk  Fri Aug 30 19:06:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.22 2019/08/21 13:35:28 nia Exp $
+# $NetBSD: builtin.mk,v 1.23 2019/08/30 19:06:34 nia Exp $
 
 BUILTIN_PKG:=  MesaLib
 
@@ -34,7 +34,7 @@ MAKEVARS+=    IS_BUILTIN.MesaLib
 .  if empty(PC_GL:M__nonexistent__)
 BUILTIN_VERSION.Mesa!= ${SED} -n -e 's/Version: //p' ${PC_GL}
 .  elif empty(H_MESALIB:M__nonexistent__)
-.    include "../../graphics/Mesa/version.mk"
+.    include "version.mk"
 .  else # ?
 BUILTIN_VERSION.Mesa:= 0.something-weird-happened
 .  endif

Added files:

Index: pkgsrc/graphics/MesaLib/version.mk
diff -u /dev/null pkgsrc/graphics/MesaLib/version.mk:1.1
--- /dev/null   Fri Aug 30 19:06:34 2019
+++ pkgsrc/graphics/MesaLib/version.mk  Fri Aug 30 19:06:34 2019
@@ -0,0 +1,30 @@
+# $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