From 50a0769e5de4350aeb7979aecdc3beb564d3fc1c Mon Sep 17 00:00:00 2001 From: mrg Date: Sat, 20 Aug 2016 06:51:00 +0000 Subject: [PATCH] turn off chips driver for macppc and xorg-server 1.18 (for now.) --- distrib/sets/lists/xdebug/md.macppc | 4 ++-- distrib/sets/lists/xserver/md.macppc | 12 ++++++------ external/mit/xorg/server/drivers/Makefile | 7 +++++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/distrib/sets/lists/xdebug/md.macppc b/distrib/sets/lists/xdebug/md.macppc index f7a46ae94a0c..5341e057aae7 100644 --- a/distrib/sets/lists/xdebug/md.macppc +++ b/distrib/sets/lists/xdebug/md.macppc @@ -1,4 +1,4 @@ -# $NetBSD: md.macppc,v 1.7 2016/08/19 22:37:03 mrg Exp $ +# $NetBSD: md.macppc,v 1.8 2016/08/20 06:51:00 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 @@ -54,7 +54,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- obsolete,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug obsolete xorg,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug obsolete xorg,obsolete diff --git a/distrib/sets/lists/xserver/md.macppc b/distrib/sets/lists/xserver/md.macppc index 6a161574db4c..b9e06a72cc57 100644 --- a/distrib/sets/lists/xserver/md.macppc +++ b/distrib/sets/lists/xserver/md.macppc @@ -1,4 +1,4 @@ -# $NetBSD: md.macppc,v 1.70 2016/08/19 22:37:04 mrg Exp $ +# $NetBSD: md.macppc,v 1.71 2016/08/20 06:51:00 mrg Exp $ ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg @@ -29,8 +29,8 @@ ./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- obsolete ./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg -./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg -./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg,xorg_server_ver=110 +./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg,xorg_server_ver=110 ./usr/X11R7/lib/modules/drivers/imstt_drv.so -unknown- obsolete ./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- obsolete ./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg @@ -174,7 +174,7 @@ ./usr/X11R7/man/cat1/scanpci.0 -unknown- obsolete ./usr/X11R7/man/cat1/xorgconfig.0 -unknown- obsolete ./usr/X11R7/man/cat4/ati.0 -unknown- .cat,xorg -./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg +./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg,xorg_server_ver=110 ./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg ./usr/X11R7/man/cat4/imstt.0 -unknown- obsolete ./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg @@ -195,7 +195,7 @@ ./usr/X11R7/man/html1/scanpci.html -unknown- obsolete ./usr/X11R7/man/html1/xorgconfig.html -unknown- obsolete ./usr/X11R7/man/html4/ati.html -unknown- html,xorg -./usr/X11R7/man/html4/chips.html -unknown- html,xorg +./usr/X11R7/man/html4/chips.html -unknown- html,xorg,xorg_server_ver=110 ./usr/X11R7/man/html4/exa.html -unknown- html,xorg ./usr/X11R7/man/html4/imstt.html -unknown- obsolete ./usr/X11R7/man/html4/kbd.html -unknown- html,xorg @@ -216,7 +216,7 @@ ./usr/X11R7/man/man1/scanpci.1 -unknown- obsolete ./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete ./usr/X11R7/man/man4/ati.4 -unknown- .man,xorg -./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg +./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg,xorg_server_ver=110 ./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg ./usr/X11R7/man/man4/imstt.4 -unknown- obsolete ./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg diff --git a/external/mit/xorg/server/drivers/Makefile b/external/mit/xorg/server/drivers/Makefile index db1bbeab2e1a..d930c732cddb 100644 --- a/external/mit/xorg/server/drivers/Makefile +++ b/external/mit/xorg/server/drivers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2016/08/20 05:24:26 mrg Exp $ +# $NetBSD: Makefile,v 1.85 2016/08/20 06:51:00 mrg Exp $ # xf86-input drivers @@ -210,7 +210,6 @@ SUBDIR+= \ .if ${MACHINE} == "macppc" SUBDIR+= \ xf86-video-ati \ - xf86-video-chips \ xf86-video-mach64 \ xf86-video-mga \ xf86-video-nv \ @@ -219,6 +218,10 @@ SUBDIR+= \ xf86-video-tdfx \ xf86-video-wsfb # xf86-video-imstt +.if ${XORG_SERVER_SUBDIR} == "xorg-server.old" +SUBDIR+= \ + xf86-video-chips +.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old" .endif # ${MACHINE} == "macppc" .if ${MACHINE} == "netwinder"