Module Name: src
Committed By: mrg
Date: Sat Aug 20 03:26:56 UTC 2016
Modified Files:
src/distrib/sets/lists/xdebug: md.ofppc
src/distrib/sets/lists/xserver: md.ofppc
src/external/mit/xorg/server/drivers: Makefile
Log Message:
disable chips driver for ofppc and xorg-server 1.18. radeon works.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xdebug/md.ofppc
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xserver/md.ofppc
cvs rdiff -u -r1.80 -r1.81 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.ofppc
diff -u src/distrib/sets/lists/xdebug/md.ofppc:1.7 src/distrib/sets/lists/xdebug/md.ofppc:1.8
--- src/distrib/sets/lists/xdebug/md.ofppc:1.7 Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xdebug/md.ofppc Sat Aug 20 03:26:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.7 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: md.ofppc,v 1.8 2016/08/20 03:26:56 mrg Exp $
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete
./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete
./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg,obsolete
@@ -37,7 +37,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- obsolete,xorg
./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- debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- debug,xorg,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- debug,xorg
./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
Index: src/distrib/sets/lists/xserver/md.ofppc
diff -u src/distrib/sets/lists/xserver/md.ofppc:1.23 src/distrib/sets/lists/xserver/md.ofppc:1.24
--- src/distrib/sets/lists/xserver/md.ofppc:1.23 Fri Aug 19 22:37:04 2016
+++ src/distrib/sets/lists/xserver/md.ofppc Sat Aug 20 03:26:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.23 2016/08/19 22:37:04 mrg Exp $
+# $NetBSD: md.ofppc,v 1.24 2016/08/20 03:26:56 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -25,8 +25,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/kbd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg
@@ -115,7 +115,7 @@
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
./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/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
@@ -131,7 +131,7 @@
./usr/X11R7/man/html1/cvt.html -unknown- html,xorg
./usr/X11R7/man/html1/gtf.html -unknown- html,xorg
./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/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
@@ -147,7 +147,7 @@
./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg
./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg
./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/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.80 src/external/mit/xorg/server/drivers/Makefile:1.81
--- src/external/mit/xorg/server/drivers/Makefile:1.80 Sat Aug 20 01:08:13 2016
+++ src/external/mit/xorg/server/drivers/Makefile Sat Aug 20 03:26:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2016/08/20 01:08:13 mrg Exp $
+# $NetBSD: Makefile,v 1.81 2016/08/20 03:26:56 mrg Exp $
# xf86-input drivers
@@ -235,7 +235,6 @@ SUBDIR+= \
.if ${MACHINE} == "ofppc"
SUBDIR+= \
xf86-video-ati \
- xf86-video-chips \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
@@ -243,6 +242,10 @@ SUBDIR+= \
xf86-video-r128 \
xf86-video-tdfx \
xf86-video-wsfb
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
+ xf86-video-chips
+.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "ofppc"
.if ${MACHINE} == "prep"
