Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Unhook libglut (MesaGLUT) from the build.



details:   https://anonhg.NetBSD.org/src/rev/31f477d04986
branches:  trunk
changeset: 945299:31f477d04986
user:      nia <nia%NetBSD.org@localhost>
date:      Sun Oct 25 16:59:27 2020 +0000

description:
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).

diffstat:

 distrib/sets/lists/xbase/shl.mi             |   8 +-
 distrib/sets/lists/xcomp/mi                 |  14 ++--
 distrib/sets/lists/xcomp/shl.mi             |   4 +-
 distrib/sets/lists/xdebug/mi                |   4 +-
 distrib/sets/lists/xdebug/shl.mi            |   4 +-
 external/mit/xorg/lib/Makefile              |   4 +-
 external/mit/xorg/lib/libglut/Makefile      |  82 -----------------------------
 external/mit/xorg/lib/libglut/shlib_version |   4 -
 8 files changed, 19 insertions(+), 105 deletions(-)

diffs (237 lines):

diff -r a0b029899799 -r 31f477d04986 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi   Sun Oct 25 16:39:00 2020 +0000
+++ b/distrib/sets/lists/xbase/shl.mi   Sun Oct 25 16:59:27 2020 +0000
@@ -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
diff -r a0b029899799 -r 31f477d04986 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Sun Oct 25 16:39:00 2020 +0000
+++ b/distrib/sets/lists/xcomp/mi       Sun Oct 25 16:59:27 2020 +0000
@@ -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
diff -r a0b029899799 -r 31f477d04986 distrib/sets/lists/xcomp/shl.mi
--- a/distrib/sets/lists/xcomp/shl.mi   Sun Oct 25 16:39:00 2020 +0000
+++ b/distrib/sets/lists/xcomp/shl.mi   Sun Oct 25 16:59:27 2020 +0000
@@ -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
diff -r a0b029899799 -r 31f477d04986 distrib/sets/lists/xdebug/mi
--- a/distrib/sets/lists/xdebug/mi      Sun Oct 25 16:39:00 2020 +0000
+++ b/distrib/sets/lists/xdebug/mi      Sun Oct 25 16:59:27 2020 +0000
@@ -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
diff -r a0b029899799 -r 31f477d04986 distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi  Sun Oct 25 16:39:00 2020 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi  Sun Oct 25 16:59:27 2020 +0000
@@ -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
diff -r a0b029899799 -r 31f477d04986 external/mit/xorg/lib/Makefile
--- a/external/mit/xorg/lib/Makefile    Sun Oct 25 16:39:00 2020 +0000
+++ b/external/mit/xorg/lib/Makefile    Sun Oct 25 16:59:27 2020 +0000
@@ -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+=libGLU libGLw libXaw6 libXaw libXcursor \
        libXrandr \
        .WAIT \
-       libXpresent libXft libglut \
+       libXpresent libXft \
        .WAIT \
        libXdmGreet \
        xcb-util
diff -r a0b029899799 -r 31f477d04986 external/mit/xorg/lib/libglut/Makefile
--- a/external/mit/xorg/lib/libglut/Makefile    Sun Oct 25 16:39:00 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-#      $NetBSD: Makefile,v 1.9 2019/03/10 02:29:53 mrg Exp $
-
-.include <bsd.own.mk>
-
-.include "../mesa-which.mk"
-
-LIB=           glut
-
-.PATH: ${X11SRCDIR.MesaGLUT}/src/glut/glx
-SRCS=  \
-       glut_8x13.c \
-       glut_9x15.c \
-       glut_bitmap.c \
-       glut_bwidth.c \
-       glut_cindex.c \
-       glut_cmap.c \
-       glut_cursor.c \
-       glut_dials.c \
-       glut_dstr.c \
-       glut_event.c \
-       glut_ext.c \
-       glut_fcb.c \
-       glut_fullscrn.c \
-       glut_gamemode.c \
-       glut_get.c \
-       glut_glxext.c \
-       glut_hel10.c \
-       glut_hel12.c \
-       glut_hel18.c \
-       glut_init.c \
-       glut_input.c \
-       glut_joy.c \
-       glut_key.c \
-       glut_keyctrl.c \
-       glut_keyup.c \
-       glut_menu.c \
-       glut_menu2.c \
-       glut_mesa.c \
-       glut_modifier.c \
-       glut_mroman.c \
-       glut_overlay.c \
-       glut_ppm.c \
-       glut_roman.c \
-       glut_shapes.c \
-       glut_space.c \
-       glut_stroke.c \
-       glut_swap.c \
-       glut_swidth.c \
-       glut_tablet.c \
-       glut_teapot.c \
-       glut_tr10.c \
-       glut_tr24.c \
-       glut_util.c \
-       glut_vidresize.c \
-       glut_warp.c \
-       glut_win.c \
-       glut_winmisc.c \
-       layerutil.c
-
-CPPFLAGS+=     -I${X11SRCDIR.MesaGLUT}/include -I${X11SRCDIR.Mesa}/include
-CFLAGS+=       -fno-strict-aliasing -fexceptions
-
-.PATH:         ${X11SRCDIR.MesaGLUT}/include/GL
-INCS=  glut.h glutf90.h
-INCSDIR=${X11INCDIR}/GL
-
-LIBDPLIBS=     Xi      ${.CURDIR}/../libXi \
-               Xmu     ${.CURDIR}/../libXmu \
-               Xt      ${.CURDIR}/../libXt \
-               X11     ${.CURDIR}/../libX11/dynamic \
-               GL      ${.CURDIR}/../libGL${OLD_PREFIX} \
-               GLU     ${.CURDIR}/../libGLU
-
-LIBDPLIBS+=    m ${NETBSDSRCDIR}/lib/libm
-
-PKGCONFIG=     glut
-PKGDIST.glut=  ${X11SRCDIR.MesaGLUT}/src/glut/glx
-.include "${.CURDIR}/../libGL/mesa-ver.mk"
-PKGCONFIG_VERSION.glut=        ${MESA_VER}
-
-.include <bsd.x11.mk>
-.include <bsd.lib.mk>
diff -r a0b029899799 -r 31f477d04986 external/mit/xorg/lib/libglut/shlib_version
--- a/external/mit/xorg/lib/libglut/shlib_version       Sun Oct 25 16:39:00 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#      $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:13 christos Exp $
-#
-major=4
-minor=0



Home | Main Index | Thread Index | Old Index