Module Name: src
Committed By: mrg
Date: Fri Mar 15 07:03:36 UTC 2019
Modified Files:
src/distrib/sets/lists/xdebug: shl.mi
src/distrib/sets/lists/xserver: mi
Log Message:
properly mark libmesa_dri.so obsolete in mesa18 x86 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.39 -r1.40 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/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.45 src/distrib/sets/lists/xdebug/shl.mi:1.46
--- src/distrib/sets/lists/xdebug/shl.mi:1.45 Fri Mar 15 04:26:13 2019
+++ src/distrib/sets/lists/xdebug/shl.mi Fri Mar 15 07:03:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.45 2019/03/15 04:26:13 mrg Exp $
+# $NetBSD: shl.mi,v 1.46 2019/03/15 07:03:36 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete xorg,obsolete
@@ -106,10 +106,12 @@
./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- obsolete,machine=amd64,mesa_ver=18
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- obsolete,machine=i386,mesa_ver=18
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug obsolete obsolete,!machine=i386,!machine=amd64
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug,machine=amd64,mesa_ver=10
./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,debug,machine=i386,mesa_ver=10
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug obsolete obsolete,xorg,debug,!machine=i386,!machine=amd64
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug obsolete obsolete,xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug -unknown- xorg,debug,machine=amd64
./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug -unknown- xorg,debug,machine=i386
./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.39 src/distrib/sets/lists/xserver/mi:1.40
--- src/distrib/sets/lists/xserver/mi:1.39 Fri Mar 15 04:26:13 2019
+++ src/distrib/sets/lists/xserver/mi Fri Mar 15 07:03:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.39 2019/03/15 04:26:13 mrg Exp $
+# $NetBSD: mi,v 1.40 2019/03/15 07:03:36 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9,10 +9,14 @@
./usr/X11R7/lib/modules/dri/gallium_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/kms_swrast_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- obsolete,xorg,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- obsolete,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- obsolete,machine=amd64,mesa_ver=18
+./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- obsolete,machine=i386,mesa_ver=18
./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- xorg,machine=amd64,mesa_ver=10
./usr/X11R7/lib/modules/dri/libmesa_dri.so -unknown- xorg,machine=i386,mesa_ver=10
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- obsolete,xorg,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- obsolete,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- obsolete,machine=amd64,mesa_ver=18
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- obsolete,machine=i386,mesa_ver=18
./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- xorg,machine=amd64,mesa_ver=10
./usr/X11R7/lib/modules/dri/libmesa_dri.so.0 -unknown- xorg,machine=i386,mesa_ver=10
./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg
