[src/trunk]: src/external/mit/xorg/server/drivers turn on XAA explicitly for ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab96a6df4bde
branches:  trunk
changeset: 327887:ab96a6df4bde
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Mar 20 05:32:31 2014 +0000

description:
turn on XAA explicitly for ast.
remove removed sources for mga, and fix the XAA list.
remove redundant defines for tdfx.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-ast/Makefile  |   4 +++-
 external/mit/xorg/server/drivers/xf86-video-mga/Makefile  |  10 +++++-----
 external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile |   3 +--
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r aeb763675b24 -r ab96a6df4bde external/mit/xorg/server/drivers/xf86-video-ast/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-ast/Makefile  Thu Mar 20 03:13:31 2014 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-ast/Makefile  Thu Mar 20 05:32:31 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/08/11 23:15:39 joerg Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/20 05:32:31 mrg Exp $
 
 DRIVER=                xf86-video-ast
 DRIVER_NAME=   ast_drv
@@ -6,6 +6,8 @@
 SRCS=          ast_2dtool.c ast_accel.c ast_cursor.c ast_driver.c
 SRCS+=         ast_mode.c ast_tool.c ast_vgatool.c
 
+CPPFLAGS+=     -DHAVE_XAA_H
+
 CWARNFLAGS.clang+=     -Wno-format
 
 .include "../Makefile.xf86-driver"
diff -r aeb763675b24 -r ab96a6df4bde external/mit/xorg/server/drivers/xf86-video-mga/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Thu Mar 20 03:13:31 2014 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Thu Mar 20 05:32:31 2014 +0000
@@ -1,14 +1,14 @@
-#      $NetBSD: Makefile,v 1.11 2013/06/02 08:57:17 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2014/03/20 05:32:31 mrg Exp $
 
 .include <bsd.own.mk>
 
 DRIVER=                xf86-video-mga
 DRIVER_NAME=   mga_drv
 
-SRCS=          mga_arc.c mga_bios.c mga_dac3026.c mga_dacG.c
-SRCS+=         mga_dga.c mga_dh.c mga_driver.c mga_esc.c mga_g450pll.c
+SRCS=          mga_bios.c mga_dac3026.c mga_dacG.c
+SRCS+=         mga_dga.c mga_dh.c mga_driver.c mga_g450pll.c
 SRCS+=         mga_halmod.c mga_hwcurs.c mga_merge.c mga_shadow.c
-SRCS+=         mga_vga.c mga_video.c
+SRCS+=         mga_vga.c mga_video.c mga_storm.c
 MAN=           mga.4
 
 .if ${X11DRI} != "no"
@@ -21,7 +21,7 @@
 #endif
 
 #if USE_XAA
-SRCS+=         mga_storm.c
+SRCS+=         mga_arc.c
 CPPFLAGS+=     -DUSE_XAA -DHAVE_XAA_H
 #endif
 
diff -r aeb763675b24 -r ab96a6df4bde external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Thu Mar 20 03:13:31 2014 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Thu Mar 20 05:32:31 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2013/06/03 10:24:24 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2014/03/20 05:32:31 mrg Exp $
 
 DRIVER=                xf86-video-tdfx
 DRIVER_NAME=   tdfx_drv
@@ -11,7 +11,6 @@
 .if ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=     -DUSE_INT10
-CPPFLAGS+=     -DUSE_PCIVGAIO
 .endif
 CPPFLAGS+=     -DHAVE_XAA_H
 CPPFLAGS+=     -DTDFXDRI