[src/trunk]: src/external/mit/xorg/server/drivers updates for xf86 1.3.4, xf8...

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

details:   https://anonhg.NetBSD.org/src/rev/ae75f364757d
branches:  trunk
changeset: 787098:ae75f364757d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jun 02 08:57:17 2013 +0000

description:
updates for xf86 1.3.4, xf86-video-mga 1.6.2, xf86-video-neomagic 1.2.7
and xf86-video-r128 6.9.1.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-i740/Makefile     |   4 +++-
 external/mit/xorg/server/drivers/xf86-video-mga/Makefile      |  10 +++++-----
 external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile |   4 +++-
 external/mit/xorg/server/drivers/xf86-video-r128/Makefile     |   7 ++++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diffs (99 lines):

diff -r e4587d6f8929 -r ae75f364757d external/mit/xorg/server/drivers/xf86-video-i740/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Sun Jun 02 07:41:35 2013 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Sun Jun 02 08:57:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2008/08/03 07:32:04 rtr Exp $
+#      $NetBSD: Makefile,v 1.3 2013/06/02 08:57:17 mrg Exp $
 
 DRIVER=                xf86-video-i740
 DRIVER_NAME=   i740_drv
@@ -7,4 +7,6 @@
 SRCS+=         i740_i2c.c i740_io.c i740_video.c
 MAN=           i740.4
 
+CPPFLAGS+=     -DHAVE_XAA_H
+
 .include "../Makefile.xf86-driver"
diff -r e4587d6f8929 -r ae75f364757d external/mit/xorg/server/drivers/xf86-video-mga/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Sun Jun 02 07:41:35 2013 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Sun Jun 02 08:57:17 2013 +0000
@@ -1,18 +1,18 @@
-#      $NetBSD: Makefile,v 1.10 2012/03/22 23:46:27 joerg Exp $
+#      $NetBSD: Makefile,v 1.11 2013/06/02 08:57:17 mrg Exp $
 
 .include <bsd.own.mk>
 
 DRIVER=                xf86-video-mga
 DRIVER_NAME=   mga_drv
 
-SRCS=          clientlx.c mga_arc.c mga_bios.c mga_dac3026.c mga_dacG.c
+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_halmod.c mga_hwcurs.c mga_merge.c mga_shadow.c
 SRCS+=         mga_vga.c mga_video.c
 MAN=           mga.4
 
 .if ${X11DRI} != "no"
-SRCS+=         mga_dri.c
+#SRCS+=                mga_dri.c
 .endif
 
 #if USE_EXA
@@ -22,11 +22,11 @@
 
 #if USE_XAA
 SRCS+=         mga_storm.c
-CPPFLAGS+=     -DUSE_XAA
+CPPFLAGS+=     -DUSE_XAA -DHAVE_XAA_H
 #endif
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/dri
+#CPPFLAGS+=    -I${DESTDIR}${X11INCDIR}/X11/dri
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
 CPPFLAGS.mga_driver.c= -Wno-error      # XXX fix me please
diff -r e4587d6f8929 -r ae75f364757d external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile     Sun Jun 02 07:41:35 2013 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile     Sun Jun 02 08:57:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2010/07/17 06:55:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2013/06/02 08:57:17 mrg Exp $
 
 DRIVER=                xf86-video-neomagic
 DRIVER_NAME=   neomagic_drv
@@ -10,4 +10,6 @@
 
 COPTS.neo_driver.c=    -Wno-error      # XXX xf86dgastr.h
 
+CPPFLAGS+=     -DHAVE_XAA_H
+
 .include "../Makefile.xf86-driver"
diff -r e4587d6f8929 -r ae75f364757d external/mit/xorg/server/drivers/xf86-video-r128/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Sun Jun 02 07:41:35 2013 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Sun Jun 02 08:57:17 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2011/08/11 23:15:40 joerg Exp $
+#      $NetBSD: Makefile,v 1.6 2013/06/02 08:57:18 mrg Exp $
 
 DRIVER=                xf86-video-r128
 DRIVER_NAME=   r128_drv
@@ -6,6 +6,8 @@
 SRCS=  r128_accel.c r128_cursor.c r128_dga.c r128_driver.c \
        r128_video.c r128_misc.c r128_probe.c r128_dri.c
 
+#SRCS+=        r128_exa.c r128_exa_render.c
+
 MAN=   r128.4
 
 .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc64"
@@ -19,6 +21,9 @@
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
+CPPFLAGS+=     -DHAVE_XEXTPROTO_71 \
+               -DHAVE_XAA_H -DR128DRI
+
 CWARNFLAGS.clang+=     -Wno-format -Wno-pointer-sign
 
 .include "../Makefile.xf86-driver"