Module Name: src
Committed By: mrg
Date: Sat Jun 22 23:02:45 UTC 2024
Modified Files:
src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.cats md.i386
src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386
src/external/mit/xorg/server/drivers: Makefile
Log Message:
xf86-video-ark builds with xorg-server 21.
enable it where it was diabled: x86, alpha, cats.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xdebug/md.alpha
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xdebug/md.cats
cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.127 -r1.128 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.143 -r1.144 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.110 -r1.111 src/external/mit/xorg/server/drivers/Makefile
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/md.alpha
diff -u src/distrib/sets/lists/xdebug/md.alpha:1.22 src/distrib/sets/lists/xdebug/md.alpha:1.23
--- src/distrib/sets/lists/xdebug/md.alpha:1.22 Fri Jan 26 12:58:51 2024
+++ src/distrib/sets/lists/xdebug/md.alpha Sat Jun 22 23:02:44 2024
@@ -1,11 +1,10 @@
-# $NetBSD: md.alpha,v 1.22 2024/01/26 12:58:51 tsutsui Exp $
+# $NetBSD: md.alpha,v 1.23 2024/06/22 23:02:44 mrg Exp $
./usr/X11R7/lib/modules/extensions/libdri2_g.a xdebug-obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/bin/Xorg.debug xdebug-xorg-server-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-xf86-video-apm-debug xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug xdebug-xf86-video-ast-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug xdebug-obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug xdebug-obsolete obsolete
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.65 src/distrib/sets/lists/xdebug/md.amd64:1.66
--- src/distrib/sets/lists/xdebug/md.amd64:1.65 Fri Jan 26 13:06:36 2024
+++ src/distrib/sets/lists/xdebug/md.amd64 Sat Jun 22 23:02:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.65 2024/01/26 13:06:36 tsutsui Exp $
+# $NetBSD: md.amd64,v 1.66 2024/06/22 23:02:44 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a xdebug-libI810XvMC-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libIntelXvMC_g.a xdebug-libIntelXvMC-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libchromeXvMCPro_g.a xdebug-libchromeXvMCPro-debuglib xorg,debuglib,compatx11file
@@ -77,8 +77,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.23.debug xdebug-xf86-video-amdgpu-debug xorg,debug,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-xf86-video-apm-debug xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug xdebug-xf86-video-ast-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug xdebug-obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug xdebug-obsolete obsolete
Index: src/distrib/sets/lists/xdebug/md.cats
diff -u src/distrib/sets/lists/xdebug/md.cats:1.23 src/distrib/sets/lists/xdebug/md.cats:1.24
--- src/distrib/sets/lists/xdebug/md.cats:1.23 Fri Jan 26 13:06:36 2024
+++ src/distrib/sets/lists/xdebug/md.cats Sat Jun 22 23:02:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.23 2024/01/26 13:06:36 tsutsui Exp $
+# $NetBSD: md.cats,v 1.24 2024/06/22 23:02:44 mrg Exp $
./usr/X11R7/lib/modules/extensions/libcfb32_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/modules/extensions/libcfb_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/modules/extensions/libdbe_g.a xdebug-obsolete xorg,obsolete
@@ -30,8 +30,7 @@
./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-xf86-video-apm-debug xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug xdebug-xf86-video-ast-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug xdebug-obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug xdebug-obsolete obsolete
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.62 src/distrib/sets/lists/xdebug/md.i386:1.63
--- src/distrib/sets/lists/xdebug/md.i386:1.62 Fri Jan 26 13:06:36 2024
+++ src/distrib/sets/lists/xdebug/md.i386 Sat Jun 22 23:02:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.62 2024/01/26 13:06:36 tsutsui Exp $
+# $NetBSD: md.i386,v 1.63 2024/06/22 23:02:44 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a xdebug-libI810XvMC-debuglib xorg,debuglib
./usr/X11R7/lib/libIntelXvMC_g.a xdebug-libIntelXvMC-debuglib xorg,debuglib
./usr/X11R7/lib/libchromeXvMCPro_g.a xdebug-libchromeXvMCPro-debuglib xorg,debuglib
@@ -86,8 +86,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.23.debug xdebug-xf86-video-amdgpu-debug xorg,debug,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug xdebug-xf86-video-apm-debug xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug xdebug-xf86-video-ark-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug xdebug-xf86-video-ast-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug xdebug-obsolete obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug xdebug-obsolete obsolete
Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.64 src/distrib/sets/lists/xserver/md.alpha:1.65
--- src/distrib/sets/lists/xserver/md.alpha:1.64 Sat Jun 22 17:59:49 2024
+++ src/distrib/sets/lists/xserver/md.alpha Sat Jun 22 23:02:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.64 2024/06/22 17:59:49 mrg Exp $
+# $NetBSD: md.alpha,v 1.65 2024/06/22 23:02:45 mrg Exp $
./usr/X11R7/bin/X xserver-xorg-server-bin xorg
./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg
./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg
@@ -38,10 +38,8 @@
./usr/X11R7/lib/modules/drivers/apm_drv.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 xserver-obsolete xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ark_drv.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so xserver-xf86-video-ast-drivers xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so.1 xserver-xf86-video-ast-drivers xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so xserver-xf86-video-ati-drivers xorg
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.127 src/distrib/sets/lists/xserver/md.amd64:1.128
--- src/distrib/sets/lists/xserver/md.amd64:1.127 Fri Jan 26 13:06:36 2024
+++ src/distrib/sets/lists/xserver/md.amd64 Sat Jun 22 23:02:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.127 2024/01/26 13:06:36 tsutsui Exp $
+# $NetBSD: md.amd64,v 1.128 2024/06/22 23:02:45 mrg Exp $
./usr/X11R7/bin/X xserver-xorg-server-bin xorg
./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg
./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg
@@ -56,10 +56,8 @@
./usr/X11R7/lib/modules/drivers/apm_drv.so xserver-xf86-video-apm-drivers xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 xserver-obsolete xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 xserver-xf86-video-apm-drivers xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ark_drv.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so xserver-xf86-video-ark-drivers xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0 xserver-xf86-video-ark-drivers xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/ark_drv.so xserver-xf86-video-ark-drivers xorg
+./usr/X11R7/lib/modules/drivers/ark_drv.so.0 xserver-xf86-video-ark-drivers xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so xserver-xf86-video-ast-drivers xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so.1 xserver-xf86-video-ast-drivers xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so xserver-xf86-video-ati-drivers xorg
Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.72 src/distrib/sets/lists/xserver/md.cats:1.73
--- src/distrib/sets/lists/xserver/md.cats:1.72 Fri Jan 26 13:06:36 2024
+++ src/distrib/sets/lists/xserver/md.cats Sat Jun 22 23:02:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.72 2024/01/26 13:06:36 tsutsui Exp $
+# $NetBSD: md.cats,v 1.73 2024/06/22 23:02:45 mrg Exp $
./usr/X11R7/bin/X xserver-xorg-server-bin xorg
./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg
./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg
@@ -14,10 +14,8 @@
./usr/X11R7/lib/modules/drivers/apm_drv.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 xserver-obsolete xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ark_drv.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so xserver-xf86-video-ast-drivers xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so.1 xserver-xf86-video-ast-drivers xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so xserver-xf86-video-ati-drivers xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.143 src/distrib/sets/lists/xserver/md.i386:1.144
--- src/distrib/sets/lists/xserver/md.i386:1.143 Fri Jan 26 13:06:37 2024
+++ src/distrib/sets/lists/xserver/md.i386 Sat Jun 22 23:02:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.143 2024/01/26 13:06:37 tsutsui Exp $
+# $NetBSD: md.i386,v 1.144 2024/06/22 23:02:45 mrg Exp $
./usr/X11R7/bin/X xserver-xorg-server-bin xorg
./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg
./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg
@@ -63,10 +63,8 @@
./usr/X11R7/lib/modules/drivers/apm_drv.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 xserver-obsolete xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ark_drv.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ark_drv.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so xserver-xf86-video-ast-drivers xorg
./usr/X11R7/lib/modules/drivers/ast_drv.so.1 xserver-xf86-video-ast-drivers xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so xserver-xf86-video-ati-drivers xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.110 src/external/mit/xorg/server/drivers/Makefile:1.111
--- src/external/mit/xorg/server/drivers/Makefile:1.110 Sat Jun 22 17:59:49 2024
+++ src/external/mit/xorg/server/drivers/Makefile Sat Jun 22 23:02:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2024/06/22 17:59:49 mrg Exp $
+# $NetBSD: Makefile,v 1.111 2024/06/22 23:02:45 mrg Exp $
.include <bsd.own.mk>
@@ -27,6 +27,7 @@ SUBDIR+= \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
xf86-video-amdgpu \
+ xf86-video-ark \
xf86-video-ast \
xf86-video-ati \
xf86-video-chips \
@@ -65,7 +66,6 @@ SUBDIR+= \
# needs porting for xorg-server 1.18
# xf86-video-apm \
-# xf86-video-ark \
# xf86-video-glint \
# xf86-video-intel-old \
# xf86-video-xgi
@@ -80,6 +80,7 @@ SUBDIR+= \
.if ${MACHINE} == "alpha"
SUBDIR+= \
xf86-video-ast \
+ xf86-video-ark \
xf86-video-ati \
xf86-video-chips \
xf86-video-cirrus \
@@ -102,7 +103,6 @@ SUBDIR+= \
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
xf86-video-apm \
- xf86-video-ark \
xf86-video-glint \
xf86-video-s3 \
xf86-video-tga \
@@ -128,6 +128,7 @@ SUBDIR+= \
.if ${MACHINE} == "cats"
SUBDIR+= \
+ xf86-video-ark \
xf86-video-ast \
xf86-video-ati \
xf86-video-chips \
@@ -153,7 +154,6 @@ SUBDIR+= \
# needs porting for xorg-server 1.18
# xf86-video-apm \
-# xf86-video-ark \
# xf86-video-glint
.endif # ${MACHINE} == "cats"
