Module Name: src
Committed By: mrg
Date: Sat Jun 22 17:59:49 UTC 2024
Modified Files:
src/distrib/sets/lists/xserver: md.alpha
src/external/mit/xorg/server/drivers: Makefile
Log Message:
fix alpha builds with xorg-server 21.3.
the s3, tga, and trident drivers are not ported to newer xorg-server
so mark them as xorg 1.10 only, and obsolete with newer.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.109 -r1.110 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/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.63 src/distrib/sets/lists/xserver/md.alpha:1.64
--- src/distrib/sets/lists/xserver/md.alpha:1.63 Sun Jan 28 06:20:02 2024
+++ src/distrib/sets/lists/xserver/md.alpha Sat Jun 22 17:59:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.63 2024/01/28 06:20:02 tsutsui Exp $
+# $NetBSD: md.alpha,v 1.64 2024/06/22 17:59:49 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
@@ -82,8 +82,10 @@
./usr/X11R7/lib/modules/drivers/radeon_drv.so.6 xserver-xf86-video-radeon-kms-drivers xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so xserver-obsolete xorg,obsolete
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 xserver-obsolete xorg,obsolete
-./usr/X11R7/lib/modules/drivers/s3_drv.so xserver-xf86-video-s3-drivers xorg
-./usr/X11R7/lib/modules/drivers/s3_drv.so.0 xserver-xf86-video-s3-drivers xorg
+./usr/X11R7/lib/modules/drivers/s3_drv.so xserver-xf86-video-s3-drivers xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/s3_drv.so.0 xserver-xf86-video-s3-drivers xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/s3_drv.so xserver-xf86-video-s3-drivers xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/s3_drv.so.0 xserver-xf86-video-s3-drivers xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/s3virge_drv.so xserver-xf86-video-s3virge-drivers xorg
./usr/X11R7/lib/modules/drivers/s3virge_drv.so.1 xserver-xf86-video-s3virge-drivers xorg
./usr/X11R7/lib/modules/drivers/savage_drv.so xserver-xf86-video-savage-drivers xorg
@@ -94,10 +96,14 @@
./usr/X11R7/lib/modules/drivers/sis_drv.so.0 xserver-xf86-video-sis-drivers xorg
./usr/X11R7/lib/modules/drivers/tdfx_drv.so xserver-xf86-video-tdfx-drivers xorg
./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 xserver-xf86-video-tdfx-drivers xorg
-./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-xf86-video-tga-drivers xorg
-./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-xf86-video-tga-drivers xorg
-./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg
-./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg
+./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-xf86-video-tga-drivers xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-xf86-video-tga-drivers xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-xf86-video-tga-drivers xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-xf86-video-tga-drivers xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/tseng_drv.so xserver-xf86-video-tseng-drivers xorg
./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 xserver-xf86-video-tseng-drivers xorg
./usr/X11R7/lib/modules/drivers/vga_drv.so xserver-obsolete obsolete
@@ -396,13 +402,15 @@
./usr/X11R7/man/man4/r128.4 xserver-xf86-video-r128-man .man,xorg
./usr/X11R7/man/man4/radeon.4 xserver-xf86-video-radeon-kms-man .man,xorg
./usr/X11R7/man/man4/radeonhd.4 xserver-obsolete .man,xorg,obsolete
-./usr/X11R7/man/man4/s3.4 xserver-xf86-video-s3-man .man,xorg
+./usr/X11R7/man/man4/s3.4 xserver-xf86-video-s3-man .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/s3.4 xserver-xf86-video-s3-man .man,xorg,xorg_server_ver=120,obsolete
./usr/X11R7/man/man4/s3virge.4 xserver-xf86-video-s3virge-man .man,xorg
./usr/X11R7/man/man4/savage.4 xserver-xf86-video-savage-man .man,xorg
./usr/X11R7/man/man4/siliconmotion.4 xserver-xf86-video-siliconmotion-man .man,xorg
./usr/X11R7/man/man4/sis.4 xserver-xf86-video-sis-man .man,xorg
./usr/X11R7/man/man4/tdfx.4 xserver-xf86-video-tdfx-man .man,xorg
-./usr/X11R7/man/man4/trident.4 xserver-xf86-video-trident-man .man,xorg
+./usr/X11R7/man/man4/trident.4 xserver-xf86-video-trident-man .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/trident.4 xserver-xf86-video-trident-man .man,xorg,xorg_server_ver=120,obsolete
./usr/X11R7/man/man4/tseng.4 xserver-xf86-video-tseng-man .man,xorg
./usr/X11R7/man/man4/vga.4 xserver-obsolete obsolete
./usr/X11R7/man/man4/void.4 xserver-obsolete obsolete
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.109 src/external/mit/xorg/server/drivers/Makefile:1.110
--- src/external/mit/xorg/server/drivers/Makefile:1.109 Mon Feb 27 00:34:11 2023
+++ src/external/mit/xorg/server/drivers/Makefile Sat Jun 22 17:59:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2023/02/27 00:34:11 mrg Exp $
+# $NetBSD: Makefile,v 1.110 2024/06/22 17:59:49 mrg Exp $
.include <bsd.own.mk>
@@ -90,14 +90,11 @@ SUBDIR+= \
xf86-video-nv \
xf86-video-r128 \
xf86-video-radeon \
- xf86-video-s3 \
xf86-video-s3virge \
xf86-video-savage \
xf86-video-siliconmotion \
xf86-video-sis \
xf86-video-tdfx \
- xf86-video-tga \
- xf86-video-trident \
xf86-video-tseng \
xf86-video-wsfb
# xf86-video-imstt
@@ -106,7 +103,10 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-apm \
xf86-video-ark \
- xf86-video-glint
+ xf86-video-glint \
+ xf86-video-s3 \
+ xf86-video-tga \
+ xf86-video-trident
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "alpha"
