Module Name: src
Committed By: nia
Date: Sun Oct 25 16:59:28 UTC 2020
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/lib: Makefile
Removed Files:
src/external/mit/xorg/lib/libglut: Makefile shlib_version
Log Message:
Unhook libglut (MesaGLUT) from the build.
The GL Utility Library was formerly a core part of most OpenGL
distributions.
Originally, this version of libglut was developed as part of Mesa (the
primary OpenGL implementation used in NetBSD) before it was mostly abandoned
and work moved to the freeglut fork. It provides a platform-neutral way of
creating OpenGL contexts, something that many other libraries can also do
today (e.g. SDL, glfw).
All users in pkgsrc have been switched to the freeglut fork and there are no
remaining users of this library in src. If having a GLUT implementation in
base turns out to be particularly useful outside of compatibility with
previous NetBSD versions, we can import freeglut (which, AFAIK, is also
ABI compatible with MesaGLUT).
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.218 -r1.219 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.51 -r1.52 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.9 -r0 src/external/mit/xorg/lib/libglut/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/libglut/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.89 src/distrib/sets/lists/xbase/shl.mi:1.90
--- src/distrib/sets/lists/xbase/shl.mi:1.89 Thu Aug 27 15:32:00 2020
+++ src/distrib/sets/lists/xbase/shl.mi Sun Oct 25 16:59:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.89 2020/08/27 15:32:00 riastradh Exp $
+# $NetBSD: shl.mi,v 1.90 2020/10/25 16:59:27 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -191,9 +191,9 @@
./usr/X11R7/lib/libglapi.so xbase-libglapi-lib xorg,compatx11file
./usr/X11R7/lib/libglapi.so.1 xbase-libglapi-lib xorg,compatx11file
./usr/X11R7/lib/libglapi.so.1.0 xbase-libglapi-lib xorg,compatx11file
-./usr/X11R7/lib/libglut.so xbase-libglut-lib xorg,compatx11file
-./usr/X11R7/lib/libglut.so.4 xbase-libglut-lib xorg,compatx11file
-./usr/X11R7/lib/libglut.so.4.0 xbase-libglut-lib xorg,compatx11file
+./usr/X11R7/lib/libglut.so xbase-obsolete obsolete
+./usr/X11R7/lib/libglut.so.4 xbase-obsolete obsolete
+./usr/X11R7/lib/libglut.so.4.0 xbase-obsolete obsolete
./usr/X11R7/lib/liblbxutil.so xbase-obsolete obsolete
./usr/X11R7/lib/liblbxutil.so.2 xbase-obsolete obsolete
./usr/X11R7/lib/liblbxutil.so.2.0 xbase-obsolete obsolete
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.218 src/distrib/sets/lists/xcomp/mi:1.219
--- src/distrib/sets/lists/xcomp/mi:1.218 Wed Oct 21 15:12:15 2020
+++ src/distrib/sets/lists/xcomp/mi Sun Oct 25 16:59:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.218 2020/10/21 15:12:15 maya Exp $
+# $NetBSD: mi,v 1.219 2020/10/25 16:59:27 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -20,8 +20,8 @@
./usr/X11R7/include/GL/glext.h xcomp-xorgproto-include xorg
./usr/X11R7/include/GL/glu.h xcomp-xorgproto-include xorg
./usr/X11R7/include/GL/glu_mangle.h xcomp-xorgproto-include xorg
-./usr/X11R7/include/GL/glut.h xcomp-xorgproto-include xorg
-./usr/X11R7/include/GL/glutf90.h xcomp-xorgproto-include xorg
+./usr/X11R7/include/GL/glut.h xcomp-obsolete obsolete
+./usr/X11R7/include/GL/glutf90.h xcomp-obsolete obsolete
./usr/X11R7/include/GL/glx.h xcomp-xorgproto-include xorg
./usr/X11R7/include/GL/glx_mangle.h xcomp-xorgproto-include xorg
./usr/X11R7/include/GL/glxext.h xcomp-xorgproto-include xorg
@@ -1229,8 +1229,8 @@
./usr/X11R7/lib/libgbm_p.a xcomp-libgbm-lib profile,xorg,compatx11file
./usr/X11R7/lib/libglapi.a xcomp-libglapi-lib xorg,compatx11file
./usr/X11R7/lib/libglapi_p.a xcomp-libglapi-lib profile,xorg,compatx11file
-./usr/X11R7/lib/libglut.a xcomp-libglut-lib xorg,compatx11file
-./usr/X11R7/lib/libglut_p.a xcomp-libglut-lib profile,xorg,compatx11file
+./usr/X11R7/lib/libglut.a xcomp-obsolete obsolete
+./usr/X11R7/lib/libglut_p.a xcomp-obsolete obsolete
./usr/X11R7/lib/liblbxutil.a xcomp-obsolete obsolete,compatx11file
./usr/X11R7/lib/liblbxutil_p.a xcomp-obsolete obsolete,compatx11file
./usr/X11R7/lib/liblisp.a xcomp-obsolete obsolete
@@ -1340,7 +1340,7 @@
./usr/X11R7/lib/pkgconfig/gl.pc xcomp-libGL-lib xorg
./usr/X11R7/lib/pkgconfig/glproto.pc xcomp-xorgproto-lib xorg
./usr/X11R7/lib/pkgconfig/glu.pc xcomp-libGLU-lib xorg
-./usr/X11R7/lib/pkgconfig/glut.pc xcomp-libglut-lib xorg
+./usr/X11R7/lib/pkgconfig/glut.pc xcomp-obsolete obsolete
./usr/X11R7/lib/pkgconfig/glw.pc xcomp-libGLw-lib xorg
./usr/X11R7/lib/pkgconfig/ice.pc xcomp-libICE-lib xorg
./usr/X11R7/lib/pkgconfig/inputproto.pc xcomp-xorgproto-lib xorg
@@ -4381,7 +4381,7 @@
./usr/libdata/lint/llib-lfontenc.ln xcomp-libXfont2-lintlib lint,xorg
./usr/libdata/lint/llib-lfreetype.ln xcomp-freetype-lintlib lint,xorg
./usr/libdata/lint/llib-lgbm.ln xcomp-libgbm-lintlib lint,xorg
-./usr/libdata/lint/llib-lglut.ln xcomp-libglut-lintlib lint,xorg
+./usr/libdata/lint/llib-lglut.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-llbxutil.ln xcomp-obsolete obsolete,xorg
./usr/libdata/lint/llib-llisp.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-lmp.ln xcomp-obsolete obsolete
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.53 src/distrib/sets/lists/xcomp/shl.mi:1.54
--- src/distrib/sets/lists/xcomp/shl.mi:1.53 Wed Aug 28 12:24:03 2019
+++ src/distrib/sets/lists/xcomp/shl.mi Sun Oct 25 16:59:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.53 2019/08/28 12:24:03 uki Exp $
+# $NetBSD: shl.mi,v 1.54 2020/10/25 16:59:27 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -61,7 +61,7 @@
./usr/X11R7/lib/libfreetype_pic.a xcomp-freetype-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libgbm_pic.a xcomp-libgbm-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libglapi_pic.a xcomp-libglapi-lib xorg,picinstall,compatx11file
-./usr/X11R7/lib/libglut_pic.a xcomp-libglut-lib xorg,picinstall,compatx11file
+./usr/X11R7/lib/libglut_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/liblbxutil_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/liblisp_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/libmp_pic.a xcomp-obsolete obsolete
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.36 src/distrib/sets/lists/xdebug/mi:1.37
--- src/distrib/sets/lists/xdebug/mi:1.36 Fri Oct 16 10:32:52 2020
+++ src/distrib/sets/lists/xdebug/mi Sun Oct 25 16:59:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.36 2020/10/16 10:32:52 nia Exp $
+# $NetBSD: mi,v 1.37 2020/10/25 16:59:27 nia Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R7/lib base-x11-root xorg,debuglib,compatx11dir
./usr/X11R7/lib/libEGL_g.a xdebug-libEGL-debuglib xorg,debuglib,compatx11file,xorg_glamor
@@ -59,7 +59,7 @@
./usr/X11R7/lib/libfreetype_g.a xdebug-freetype-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libgbm_g.a xdebug-libgbm-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libglapi_g.a xdebug-libglapi-debuglib xorg,debuglib,compatx11file
-./usr/X11R7/lib/libglut_g.a xdebug-libglut-debuglib xorg,debuglib,compatx11file
+./usr/X11R7/lib/libglut_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/liblbxutil_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/liblisp_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/libmp_g.a xdebug-obsolete xorg,obsolete
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.55 src/distrib/sets/lists/xdebug/shl.mi:1.56
--- src/distrib/sets/lists/xdebug/shl.mi:1.55 Thu Aug 27 15:32:00 2020
+++ src/distrib/sets/lists/xdebug/shl.mi Sun Oct 25 16:59:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.55 2020/08/27 15:32:00 riastradh Exp $
+# $NetBSD: shl.mi,v 1.56 2020/10/25 16:59:27 nia Exp $
./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug xorg,obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug xorg,obsolete xorg,obsolete
@@ -65,7 +65,7 @@
./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.19.0.debug xdebug-freetype-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug xdebug-libgbm-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libglapi.so.1.0.debug xdebug-libglapi-debug xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug xdebug-libglut-debug xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug xdebug-obsolete xorg,obsolete,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.3.debug xdebug-libpciaccess-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.2.debug xdebug-pixman-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libxcb-atom.so.1.0.debug xdebug-xcb-util-debug xorg,debug,compatx11file
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.51 src/external/mit/xorg/lib/Makefile:1.52
--- src/external/mit/xorg/lib/Makefile:1.51 Sun Jan 19 00:58:14 2020
+++ src/external/mit/xorg/lib/Makefile Sun Oct 25 16:59:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2020/01/19 00:58:14 jmcneill Exp $
+# $NetBSD: Makefile,v 1.52 2020/10/25 16:59:27 nia Exp $
# build libraries for xorg
@@ -50,7 +50,7 @@ SUBDIR+=libchromeXvMCPro
SUBDIR+=libGLU libGLw libXaw6 libXaw libXcursor \
libXrandr \
.WAIT \
- libXpresent libXft libglut \
+ libXpresent libXft \
.WAIT \
libXdmGreet \
xcb-util
