Module Name: src Committed By: mrg Date: Sun Oct 16 08:20:59 UTC 2016
Modified Files: src/distrib/sets/lists/xdebug: md.sgimips src/distrib/sets/lists/xserver: md.sgimips src/external/mit/xorg/server/drivers: Makefile Log Message: build fixes for sgimips and xorg-server 1.18. newport and crime need to be ported away from XAA. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xdebug/md.sgimips cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/xserver/md.sgimips cvs rdiff -u -r1.91 -r1.92 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.sgimips diff -u src/distrib/sets/lists/xdebug/md.sgimips:1.7 src/distrib/sets/lists/xdebug/md.sgimips:1.8 --- src/distrib/sets/lists/xdebug/md.sgimips:1.7 Sat Sep 24 21:57:38 2016 +++ src/distrib/sets/lists/xdebug/md.sgimips Sun Oct 16 08:20:58 2016 @@ -1,4 +1,4 @@ -# $NetBSD: md.sgimips,v 1.7 2016/09/24 21:57:38 mrg Exp $ +# $NetBSD: md.sgimips,v 1.8 2016/10/16 08:20:58 mrg Exp $ ./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete @@ -37,7 +37,8 @@ ./usr/libdata/debug/usr/X11R7/bin/xf86cfg.debug -unknown- obsolete ./usr/libdata/debug/usr/X11R7/bin/xf86config.debug -unknown- obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/crime_drv.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/crime_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110 +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/crime_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=118,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=118,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug @@ -49,7 +50,8 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug obsolete xorg,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/newport_drv.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/newport_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110 +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/newport_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=118,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xserver/md.sgimips diff -u src/distrib/sets/lists/xserver/md.sgimips:1.52 src/distrib/sets/lists/xserver/md.sgimips:1.53 --- src/distrib/sets/lists/xserver/md.sgimips:1.52 Sat Sep 24 21:57:38 2016 +++ src/distrib/sets/lists/xserver/md.sgimips Sun Oct 16 08:20:58 2016 @@ -1,4 +1,4 @@ -# $NetBSD: md.sgimips,v 1.52 2016/09/24 21:57:38 mrg Exp $ x11 +# $NetBSD: md.sgimips,v 1.53 2016/10/16 08:20:58 mrg Exp $ x11 ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg @@ -9,8 +9,10 @@ ./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete ./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg ./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete -./usr/X11R7/lib/modules/drivers/crime_drv.so -unknown- xorg -./usr/X11R7/lib/modules/drivers/crime_drv.so.0 -unknown- xorg +./usr/X11R7/lib/modules/drivers/crime_drv.so -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/crime_drv.so -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/crime_drv.so.0 -unknown- xorg,xorg_server_ver=118,obsolete +./usr/X11R7/lib/modules/drivers/crime_drv.so.0 -unknown- xorg,xorg_server_ver=118,obsolete ./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg,xorg_server_ver=110 @@ -23,8 +25,10 @@ ./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg -./usr/X11R7/lib/modules/drivers/newport_drv.so -unknown- xorg -./usr/X11R7/lib/modules/drivers/newport_drv.so.0 -unknown- xorg +./usr/X11R7/lib/modules/drivers/newport_drv.so -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/newport_drv.so.0 -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/newport_drv.so -unknown- xorg,xorg_server_ver=118,obsolete +./usr/X11R7/lib/modules/drivers/newport_drv.so.0 -unknown- xorg,xorg_server_ver=118,obsolete ./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/s3_drv.so.0 -unknown- xorg ./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete @@ -157,11 +161,13 @@ ./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg ./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg ./usr/X11R7/man/cat1/xorgconfig.0 -unknown- obsolete -./usr/X11R7/man/cat4/crime.0 -unknown- .cat,xorg +./usr/X11R7/man/cat4/crime.0 -unknown- .cat,xorg,xorg_server_ver=110 +./usr/X11R7/man/cat4/crime.0 -unknown- .cat,xorg,xorg_server_ver=118,obsolete ./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg ./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg ./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg -./usr/X11R7/man/cat4/newport.0 -unknown- .cat,xorg +./usr/X11R7/man/cat4/newport.0 -unknown- .cat,xorg,xorg_server_ver=110 +./usr/X11R7/man/cat4/newport.0 -unknown- .cat,xorg,xorg_server_ver=118,obsolete ./usr/X11R7/man/cat4/void.0 -unknown- obsolete ./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg ./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg @@ -170,7 +176,8 @@ ./usr/X11R7/man/html1/cvt.html -unknown- html,xorg ./usr/X11R7/man/html1/gtf.html -unknown- html,xorg ./usr/X11R7/man/html1/xorgconfig.html -unknown- obsolete -./usr/X11R7/man/html4/crime.html -unknown- html,xorg +./usr/X11R7/man/html4/crime.html -unknown- html,xorg,xorg_server_ver=110 +./usr/X11R7/man/html4/crime.html -unknown- html,xorg,xorg_server_ver=118,obsolete ./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg ./usr/X11R7/man/html4/exa.html -unknown- html,xorg ./usr/X11R7/man/html4/glint.html -unknown- html,xorg,xorg_server_ver=110 @@ -178,7 +185,8 @@ ./usr/X11R7/man/html4/kbd.html -unknown- html,xorg ./usr/X11R7/man/html4/mga.html -unknown- html,xorg ./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg -./usr/X11R7/man/html4/newport.html -unknown- html,xorg +./usr/X11R7/man/html4/newport.html -unknown- html,xorg,xorg_server_ver=110 +./usr/X11R7/man/html4/newport.html -unknown- html,xorg,xorg_server_ver=118,obsolete ./usr/X11R7/man/html4/s3.html -unknown- html,xorg ./usr/X11R7/man/html4/void.html -unknown- obsolete ./usr/X11R7/man/html4/ws.html -unknown- html,xorg @@ -188,7 +196,8 @@ ./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg ./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg ./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete -./usr/X11R7/man/man4/crime.4 -unknown- .man,xorg +./usr/X11R7/man/man4/crime.4 -unknown- .man,xorg,xorg_server_ver=110 +./usr/X11R7/man/man4/crime.4 -unknown- .man,xorg,xorg_server_ver=118,obsolete ./usr/X11R7/man/man4/cirrus.4 -unknown- .man,xorg ./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg ./usr/X11R7/man/man4/glint.4 -unknown- .man,xorg,xorg_server_ver=110 @@ -196,7 +205,8 @@ ./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg ./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg ./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg -./usr/X11R7/man/man4/newport.4 -unknown- .man,xorg +./usr/X11R7/man/man4/newport.4 -unknown- .man,xorg,xorg_server_ver=110 +./usr/X11R7/man/man4/newport.4 -unknown- .man,xorg,xorg_server_ver=118,obsolete ./usr/X11R7/man/man4/s3.4 -unknown- .man,xorg ./usr/X11R7/man/man4/void.4 -unknown- obsolete ./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg Index: src/external/mit/xorg/server/drivers/Makefile diff -u src/external/mit/xorg/server/drivers/Makefile:1.91 src/external/mit/xorg/server/drivers/Makefile:1.92 --- src/external/mit/xorg/server/drivers/Makefile:1.91 Sun Oct 16 06:23:48 2016 +++ src/external/mit/xorg/server/drivers/Makefile Sun Oct 16 08:20:58 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2016/10/16 06:23:48 mrg Exp $ +# $NetBSD: Makefile,v 1.92 2016/10/16 08:20:58 mrg Exp $ .include <bsd.own.mk> @@ -267,13 +267,16 @@ SUBDIR+= \ .if ${MACHINE} == "sgimips" SUBDIR+= \ - xf86-video-crime \ xf86-video-cirrus \ xf86-video-glint \ xf86-video-mga \ - xf86-video-newport \ xf86-video-s3 \ xf86-video-wsfb +.if ${XORG_SERVER_SUBDIR} == "xorg-server.old" +SUBDIR+= \ + xf86-video-crime \ + xf86-video-newport +.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old" .endif # ${MACHINE} == "sgimips" .if ${MACHINE} == "shark"