Module Name: src
Committed By: mrg
Date: Sat Aug 20 03:57:26 UTC 2016
Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386
src/external/mit/xorg/server/drivers: Makefile
Log Message:
re-enable ast driver for xorg-server 1.18 and x86 as 1.1.5 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.110 -r1.111 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.81 -r1.82 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.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.31 src/distrib/sets/lists/xdebug/md.amd64:1.32
--- src/distrib/sets/lists/xdebug/md.amd64:1.31 Sat Aug 20 01:08:13 2016
+++ src/distrib/sets/lists/xdebug/md.amd64 Sat Aug 20 03:57:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.31 2016/08/20 01:08:13 mrg Exp $
+# $NetBSD: md.amd64,v 1.32 2016/08/20 03:57:25 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file
@@ -77,7 +77,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=118
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.27 src/distrib/sets/lists/xdebug/md.i386:1.28
--- src/distrib/sets/lists/xdebug/md.i386:1.27 Sat Aug 20 01:08:13 2016
+++ src/distrib/sets/lists/xdebug/md.i386 Sat Aug 20 03:57:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.27 2016/08/20 01:08:13 mrg Exp $
+# $NetBSD: md.i386,v 1.28 2016/08/20 03:57:25 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
@@ -85,7 +85,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/amdgpu_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=118
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.93 src/distrib/sets/lists/xserver/md.amd64:1.94
--- src/distrib/sets/lists/xserver/md.amd64:1.93 Sat Aug 20 01:08:13 2016
+++ src/distrib/sets/lists/xserver/md.amd64 Sat Aug 20 03:57:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.93 2016/08/20 01:08:13 mrg Exp $
+# $NetBSD: md.amd64,v 1.94 2016/08/20 03:57:25 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -53,8 +53,8 @@
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ast_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ast_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/ast_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ast_drv.so.1 -unknown- xorg
./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/ch7017_drv.so -unknown- xorg,xorg_server_ver=110
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.110 src/distrib/sets/lists/xserver/md.i386:1.111
--- src/distrib/sets/lists/xserver/md.i386:1.110 Sat Aug 20 01:08:13 2016
+++ src/distrib/sets/lists/xserver/md.i386 Sat Aug 20 03:57:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.110 2016/08/20 01:08:13 mrg Exp $
+# $NetBSD: md.i386,v 1.111 2016/08/20 03:57:25 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -60,8 +60,8 @@
./usr/X11R7/lib/modules/drivers/apm_drv.so.1 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ark_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ark_drv.so.0 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ast_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/ast_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/ast_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ast_drv.so.1 -unknown- xorg
./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/ch7017_drv.so -unknown- xorg,xorg_server_ver=110
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.81 src/external/mit/xorg/server/drivers/Makefile:1.82
--- src/external/mit/xorg/server/drivers/Makefile:1.81 Sat Aug 20 03:26:56 2016
+++ src/external/mit/xorg/server/drivers/Makefile Sat Aug 20 03:57:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2016/08/20 03:26:56 mrg Exp $
+# $NetBSD: Makefile,v 1.82 2016/08/20 03:57:26 mrg Exp $
# xf86-input drivers
@@ -26,6 +26,7 @@ SUBDIR+= \
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
+ xf86-video-ast \
xf86-video-ati \
xf86-video-intel \
xf86-video-mach64 \
@@ -57,7 +58,6 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-apm \
xf86-video-ark \
- xf86-video-ast \
xf86-video-chips \
xf86-video-cirrus \
xf86-video-cirrus_alpine \
