pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics Remove graphics/Mesa
details: https://anonhg.NetBSD.org/pkgsrc/rev/24f1915c2277
branches: trunk
changeset: 338816:24f1915c2277
user: nia <nia%pkgsrc.org@localhost>
date: Fri Aug 30 19:06:34 2019 +0000
description:
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.
diffstat:
graphics/Makefile | 3 +--
graphics/Mesa/DESCR | 5 -----
graphics/Mesa/Makefile | 21 ---------------------
graphics/Mesa/buildlink3.mk | 7 -------
graphics/Mesa/version.mk | 30 ------------------------------
graphics/MesaLib/builtin.mk | 4 ++--
graphics/MesaLib/version.mk | 30 ++++++++++++++++++++++++++++++
7 files changed, 33 insertions(+), 67 deletions(-)
diffs (148 lines):
diff -r 51991e8d7d65 -r 24f1915c2277 graphics/Makefile
--- a/graphics/Makefile Fri Aug 30 18:55:07 2019 +0000
+++ b/graphics/Makefile Fri Aug 30 19:06:34 2019 +0000
@@ -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+= ImageMagick
SUBDIR+= ImageMagick6
SUBDIR+= ImageViewer
-SUBDIR+= Mesa
SUBDIR+= MesaDemos
SUBDIR+= MesaLib
SUBDIR+= Ngraph
diff -r 51991e8d7d65 -r 24f1915c2277 graphics/Mesa/DESCR
--- a/graphics/Mesa/DESCR Fri Aug 30 18:55:07 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-Metapackage that pulls in all the libraries necessary for an OpenGL
-environment.
-
-Don't include this when making packages, use MesaLib, glu, and freeglut
-individually instead.
diff -r 51991e8d7d65 -r 24f1915c2277 graphics/Mesa/Makefile
--- a/graphics/Mesa/Makefile Fri Aug 30 18:55:07 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.74 2019/08/30 17:30:11 nia Exp $
-
-PKGNAME= Mesa-7.11.2
-MASTER_SITES= # empty
-DISTFILES= # empty
-CATEGORIES= graphics
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-COMMENT= Graphics library meta package (deprecated)
-
-META_PACKAGE= # empty
-
-CONFLICTS= Mesa-glx-[0-9]*
-
-# The ordering is important here as glut/buildlink3.mk sets the version
-# of Mesa required.
-.include "../../graphics/freeglut/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff -r 51991e8d7d65 -r 24f1915c2277 graphics/Mesa/buildlink3.mk
--- a/graphics/Mesa/buildlink3.mk Fri Aug 30 18:55:07 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.6 2019/08/30 17:01:33 nia Exp $
-
-BUILDLINK_PREFIX.Mesa= ${BUILDLINK_PREFIX.MesaLib}
-
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/freeglut/buildlink3.mk"
diff -r 51991e8d7d65 -r 24f1915c2277 graphics/Mesa/version.mk
--- a/graphics/Mesa/version.mk Fri Aug 30 18:55:07 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# $NetBSD: version.mk,v 1.12 2005/06/20 22:13:10 jlam 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"
-
-.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
diff -r 51991e8d7d65 -r 24f1915c2277 graphics/MesaLib/builtin.mk
--- a/graphics/MesaLib/builtin.mk Fri Aug 30 18:55:07 2019 +0000
+++ b/graphics/MesaLib/builtin.mk Fri Aug 30 19:06:34 2019 +0000
@@ -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 @@
. 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
diff -r 51991e8d7d65 -r 24f1915c2277 graphics/MesaLib/version.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib/version.mk Fri Aug 30 19:06:34 2019 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index