Module Name: src
Committed By: mrg
Date: Sun Jul 11 20:48:48 UTC 2021
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/distrib/sets/lists/xdebug: shl.mi
src/distrib/sets/lists/xserver: mi
Log Message:
remove mesa < 18 support
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xserver/mi
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/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.224 src/distrib/sets/lists/xcomp/mi:1.225
--- src/distrib/sets/lists/xcomp/mi:1.224 Sat Jan 9 02:40:44 2021
+++ src/distrib/sets/lists/xcomp/mi Sun Jul 11 20:48:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.224 2021/01/09 02:40:44 uki Exp $
+# $NetBSD: mi,v 1.225 2021/07/11 20:48:48 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -34,12 +34,11 @@
./usr/X11R7/include/GL/internal/sarea.h xcomp-obsolete obsolete
./usr/X11R7/include/GL/osmesa.h xcomp-xorgproto-include xorg
./usr/X11R7/include/GL/wglext.h xcomp-xorgproto-include xorg
-./usr/X11R7/include/GL/wmesa.h xcomp-obsolete xorg,obsolete,mesa_ver=18
-./usr/X11R7/include/GL/wmesa.h xcomp-xorgproto-include xorg,mesa_ver=10
+./usr/X11R7/include/GL/wmesa.h xcomp-obsolete obsolete
./usr/X11R7/include/GL/xmesa.h xcomp-obsolete obsolete
./usr/X11R7/include/GL/xmesa_x.h xcomp-obsolete obsolete
./usr/X11R7/include/GL/xmesa_xf86.h xcomp-obsolete obsolete
-./usr/X11R7/include/KHR/khrplatform.h xcomp-KHR-include xorg,mesa_ver=18
+./usr/X11R7/include/KHR/khrplatform.h xcomp-KHR-include xorg
./usr/X11R7/include/X11/CallbackI.h xcomp-libXt-include xorg
./usr/X11R7/include/X11/Composite.h xcomp-libXt-include xorg
./usr/X11R7/include/X11/CompositeP.h xcomp-libXt-include xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.61 src/distrib/sets/lists/xdebug/shl.mi:1.62
--- src/distrib/sets/lists/xdebug/shl.mi:1.61 Sun Jul 11 00:08:06 2021
+++ src/distrib/sets/lists/xdebug/shl.mi Sun Jul 11 20:48:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.61 2021/07/11 00:08:06 mrg Exp $
+# $NetBSD: shl.mi,v 1.62 2021/07/11 20:48:48 mrg 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
@@ -107,11 +107,7 @@
./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug xdebug-libxshmfence-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug xdebug-gallium-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug xdebug-MesaLib-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-MesaLib-debug xorg,debug,machine=amd64,mesa_ver=10
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-MesaLib-debug xorg,debug,machine=i386,mesa_ver=10
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-obsolete xorg,obsolete,machine=amd64,mesa_ver=18
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xdebug-obsolete xorg,obsolete,machine=i386,mesa_ver=18
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xorg,obsolete obsolete,!machine=i386,!machine=amd64
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug xorg,obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug xorg,obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug xdebug-xf86-video-nouveau-debug xorg,debug,machine=amd64
./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug xdebug-xf86-video-nouveau-debug xorg,debug,machine=i386
Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.47 src/distrib/sets/lists/xserver/mi:1.48
--- src/distrib/sets/lists/xserver/mi:1.47 Sat Jan 9 02:40:44 2021
+++ src/distrib/sets/lists/xserver/mi Sun Jul 11 20:48:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.47 2021/01/09 02:40:44 uki Exp $
+# $NetBSD: mi,v 1.48 2021/07/11 20:48:48 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9,16 +9,8 @@
./usr/X11R7/lib/modules/dri/gallium_dri.so.0 xserver-gallium-drivers xorg
./usr/X11R7/lib/modules/dri/kms_swrast_dri.so xserver-MesaLib-drivers xorg
./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0 xserver-MesaLib-drivers xorg
-./usr/X11R7/lib/modules/dri/libmesa_dri.so xserver-MesaLib-drivers xorg,machine=amd64,mesa_ver=10
-./usr/X11R7/lib/modules/dri/libmesa_dri.so xserver-MesaLib-drivers xorg,machine=i386,mesa_ver=10
-./usr/X11R7/lib/modules/dri/libmesa_dri.so xserver-obsolete obsolete,!machine=amd64,!machine=i386
-./usr/X11R7/lib/modules/dri/libmesa_dri.so xserver-obsolete obsolete,machine=amd64,mesa_ver=18
-./usr/X11R7/lib/modules/dri/libmesa_dri.so xserver-obsolete obsolete,machine=i386,mesa_ver=18
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 xserver-MesaLib-drivers xorg,machine=amd64,mesa_ver=10
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 xserver-MesaLib-drivers xorg,machine=i386,mesa_ver=10
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 xserver-obsolete obsolete,!machine=amd64,!machine=i386
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 xserver-obsolete obsolete,machine=amd64,mesa_ver=18
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 xserver-obsolete obsolete,machine=i386,mesa_ver=18
+./usr/X11R7/lib/modules/dri/libmesa_dri.so xserver-obsolete obsolete
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 xserver-obsolete obsolete
./usr/X11R7/lib/modules/dri/swrast_dri.so xserver-MesaLib-drivers xorg
./usr/X11R7/lib/modules/dri/swrast_dri.so.0 xserver-MesaLib-drivers xorg
./usr/X11R7/lib/modules/libglamoregl.so xserver-xorg-server-drivers xorg,xorg_glamor
