[src/trunk]: src/external/mit/xorg/server/drivers define HAVE_XAA_H in Makefi...

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

details:   https://anonhg.NetBSD.org/src/rev/d5b1a592bd47
branches:  trunk
changeset: 347165:d5b1a592bd47
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 16 06:24:01 2016 +0000

description:
define HAVE_XAA_H in Makefile.xf86-driver for xorg-server 1.10 only,
move it out of many driver makefiles.

diffstat:

 external/mit/xorg/server/drivers/Makefile.xf86-driver           |   7 +++-
 external/mit/xorg/server/drivers/xf86-video-ark/Makefile        |   3 +-
 external/mit/xorg/server/drivers/xf86-video-ast/Makefile        |   4 +--
 external/mit/xorg/server/drivers/xf86-video-ati/Makefile        |   7 ++++-
 external/mit/xorg/server/drivers/xf86-video-i740/Makefile       |   4 +--
 external/mit/xorg/server/drivers/xf86-video-intel/Makefile      |  10 +++---
 external/mit/xorg/server/drivers/xf86-video-mach64/Makefile     |  11 +++++--
 external/mit/xorg/server/drivers/xf86-video-mga/Makefile        |  13 ++++----
 external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile   |   4 +--
 external/mit/xorg/server/drivers/xf86-video-nv/Makefile         |  15 ++++++---
 external/mit/xorg/server/drivers/xf86-video-r128/Makefile       |   4 +-
 external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile |   8 ++++-
 external/mit/xorg/server/drivers/xf86-video-s3/Makefile         |   3 +-
 external/mit/xorg/server/drivers/xf86-video-savage/Makefile     |   4 +-
 external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile    |   3 +-
 external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile     |   3 +-
 external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile     |   3 +-
 external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile     |   3 +-
 external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile     |   3 +-
 external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile       |   3 +-
 external/mit/xorg/server/drivers/xf86-video-trident/Makefile    |   4 +--
 21 files changed, 64 insertions(+), 55 deletions(-)

diffs (truncated from 441 to 300 lines):

diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver     Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver     Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xf86-driver,v 1.19 2010/11/23 08:22:29 mrg Exp $
+#      $NetBSD: Makefile.xf86-driver,v 1.20 2016/08/16 06:24:03 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   ${PACKAGE_MAJOR}
@@ -37,9 +37,12 @@
                -DHAVE_XORG_SERVER_1_1_0 \
                -DSERVER_1_5 \
                -DXSERVER_LIBPCIACCESS \
-               -DXFree86LOADER \
                -DHAVE_XEXTPROTO_71
 
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+=     -DHAVE_XAA_H -DXFree86LOADER
+.endif
+
 CPPFLAGS+=     -DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
 CPPFLAGS+=     -DPACKAGE_VERSION_MINOR=${PACKAGE_MINOR}
 CPPFLAGS+=     -DPACKAGE_VERSION_PATCHLEVEL=${PACKAGE_PATCH}
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-ark/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-ark/Makefile  Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-ark/Makefile  Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2015/07/23 02:04:09 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2016/08/16 06:24:01 mrg Exp $
 
 DRIVER=                xf86-video-ark
 DRIVER_NAME=   ark_drv
@@ -6,6 +6,5 @@
 SRCS=          ark_accel.c ark_driver.c
 
 CPPFLAGS+=     -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\"
-CPPFLAGS+=     -DHAVE_XAA_H
 
 .include "../Makefile.xf86-driver"
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-ast/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-ast/Makefile  Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-ast/Makefile  Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2014/03/20 05:32:31 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2016/08/16 06:24:01 mrg Exp $
 
 DRIVER=                xf86-video-ast
 DRIVER_NAME=   ast_drv
@@ -6,8 +6,6 @@
 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 d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-ati/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-ati/Makefile  Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-ati/Makefile  Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2014/07/26 08:04:54 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2016/08/16 06:24:01 mrg Exp $
 
 DRIVER=                xf86-video-ati
 DRIVER_NAME=   ati_drv
@@ -9,3 +9,8 @@
 LIBDPLIBS+=     drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon
 
 .include "../Makefile.xf86-driver"
+
+# XXX
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+=     -DUSE_XAA
+.endif
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-i740/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/06/02 08:57:17 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2016/08/16 06:24:02 mrg Exp $
 
 DRIVER=                xf86-video-i740
 DRIVER_NAME=   i740_drv
@@ -7,6 +7,4 @@
 SRCS+=         i740_i2c.c i740_io.c i740_video.c
 MAN=           i740.4
 
-CPPFLAGS+=     -DHAVE_XAA_H
-
 .include "../Makefile.xf86-driver"
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-intel/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2016/06/08 02:27:31 christos Exp $
+#      $NetBSD: Makefile,v 1.23 2016/08/16 06:24:02 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -23,7 +23,6 @@
 SRCS+=         i810_memory.c
 SRCS+=         i810_video.c
 SRCS+=         i810_wmark.c
-SRCS+=         i810_xaa.c
 
 # sna
 .PATH: ${X11SRCDIR.${DRIVER}}/src/sna
@@ -173,7 +172,6 @@
 CPPFLAGS+=     -DHAVE_SYS_TYPES_H=1
 CPPFLAGS+=     -DHAVE_UNISTD_H=1
 CPPFLAGS+=     -DHAVE_VGAHW_H=1
-CPPFLAGS+=     -DHAVE_XAA_H=1
 CPPFLAGS+=     -DKMS=1
 CPPFLAGS+=     -DSTDC_HEADERS=1
 CPPFLAGS+=     -DUMS=1
@@ -194,6 +192,10 @@
 
 .include "../Makefile.xf86-driver"
 
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SRCS+=         i810_xaa.c
+.endif
+
 CWARNFLAGS.clang+=     -Wno-parentheses -Wno-tautological-compare \
                        -Wno-empty-body -Wno-error
 
@@ -205,5 +207,3 @@
 COPTS.sna_trapezoids_mono.c+=  -Wno-stack-protector
 COPTS.sna_trapezoids_precise.c+=       -Wno-stack-protector
 COPTS.i965_video.c+=   -Wno-stack-protector
-
-.include <bsd.subdir.mk>
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-mach64/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile       Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile       Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2015/07/20 01:17:46 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2016/08/16 06:24:02 mrg Exp $
 
 DRIVER=                xf86-video-mach64
 DRIVER_NAME=   mach64_drv
@@ -18,11 +18,11 @@
 SRCS.dri=      atidri.c
 SRCS.exa=      atimach64exa.c
 
-CPPFLAGS+=     -DUSE_XAA -DUSE_EXA
+CPPFLAGS+=     -DUSE_EXA
 
 .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" || \
     ${MACHINE_ARCH} == "sparc"
-CPPFLAGS+= -DAVOID_CPIO
+CPPFLAGS+=      -DAVOID_CPIO
 .endif
 
 MAN=           # defined
@@ -30,3 +30,8 @@
 CWARNFLAGS.clang+=     -Wno-pointer-sign
 
 .include "../Makefile.xf86-driver"
+
+# XXX
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+=     -DUSE_XAA
+.endif
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-mga/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-mga/Makefile  Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2014/03/20 05:32:31 mrg Exp $
+#      $NetBSD: Makefile,v 1.13 2016/08/16 06:24:02 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,11 +20,6 @@
 CPPFLAGS+=     -DUSE_EXA
 #endif
 
-#if USE_XAA
-SRCS+=         mga_arc.c
-CPPFLAGS+=     -DUSE_XAA -DHAVE_XAA_H
-#endif
-
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
 #CPPFLAGS+=    -I${DESTDIR}${X11INCDIR}/X11/dri
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
@@ -35,3 +30,9 @@
 CWARNFLAGS.clang+=     -Wno-conversion -Wno-format -Wno-empty-body
 
 .include "../Makefile.xf86-driver"
+
+# XXX
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SRCS+=         mga_arc.c
+CPPFLAGS+=     -DUSE_XAA
+.endif
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile     Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile     Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2013/06/02 08:57:17 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2016/08/16 06:24:02 mrg Exp $
 
 DRIVER=                xf86-video-neomagic
 DRIVER_NAME=   neomagic_drv
@@ -10,6 +10,4 @@
 
 COPTS.neo_driver.c=    -Wno-error      # XXX xf86dgastr.h
 
-CPPFLAGS+=     -DHAVE_XAA_H
-
 .include "../Makefile.xf86-driver"
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-nv/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-nv/Makefile   Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-nv/Makefile   Tue Aug 16 06:24:01 2016 +0000
@@ -1,14 +1,14 @@
-#      $NetBSD: Makefile,v 1.7 2014/08/13 22:48:15 macallan Exp $
+#      $NetBSD: Makefile,v 1.8 2016/08/16 06:24:02 mrg Exp $
 
 DRIVER=                xf86-video-nv
 DRIVER_NAME=   nv_drv
 
 SRCS=          nv_cursor.c nv_dac.c nv_dga.c nv_driver.c nv_hw.c
-SRCS+=         nv_setup.c nv_shadow.c nv_video.c nv_xaa.c riva_cursor.c
+SRCS+=         nv_setup.c nv_shadow.c nv_video.c riva_cursor.c
 SRCS+=         riva_dac.c riva_dga.c riva_driver.c riva_hw.c
-SRCS+=         riva_setup.c riva_shadow.c riva_xaa.c g80_cursor.c
+SRCS+=         riva_setup.c riva_shadow.c g80_cursor.c
 SRCS+=         g80_dac.c g80_display.c g80_dma.c g80_driver.c g80_exa.c
-SRCS+=         g80_output.c g80_sor.c g80_xaa.c
+SRCS+=         g80_output.c g80_sor.c
 MAN=           nv.4
 
 .if ${MACHINE} == "macppc"
@@ -25,6 +25,11 @@
 #CPPFLAGS+= -DNV_TEST_FOR_KERNEL_DRIVER
 .endif
 
-CPPFLAGS+= -DHAVE_XAA_H
+# XXX
+COPTS+=        -Wno-error=cpp
 
 .include "../Makefile.xf86-driver"
+
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SRCS+=         nv_xaa.c riva_xaa.c g80_xaa.c
+.endif
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-r128/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2015/07/30 02:58:00 macallan Exp $
+#      $NetBSD: Makefile,v 1.11 2016/08/16 06:24:02 mrg Exp $
 
 DRIVER=                xf86-video-r128
 DRIVER_NAME=   r128_drv
@@ -20,7 +20,7 @@
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
-CPPFLAGS+=     -DHAVE_XAA_H -DUSE_EXA -DR128DRI
+CPPFLAGS+=     -DUSE_EXA -DR128DRI
 
 CWARNFLAGS.clang+=     -Wno-format -Wno-pointer-sign
 
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile   Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile   Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2015/09/19 23:00:44 wiz Exp $
+#      $NetBSD: Makefile,v 1.3 2016/08/16 06:24:02 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -16,6 +16,12 @@
 CPPFLAGS+=     ${X11FLAGS.DRI}
 .endif
 
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+=     -DUSE_XAA
+.else
+CPPFLAGS+=     -DHAS_DIRTYTRACKING2 -DHAVE_XORG_LIST
+.endif
+
 .if ${X11DRI} != "no"
 # XXX
 . if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
diff -r d134eca271f6 -r d5b1a592bd47 external/mit/xorg/server/drivers/xf86-video-s3/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-s3/Makefile   Tue Aug 16 06:19:47 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-s3/Makefile   Tue Aug 16 06:24:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2013/06/03 08:51:18 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2016/08/16 06:24:02 mrg Exp $
 
 DRIVER=                xf86-video-s3
 DRIVER_NAME=   s3_drv
@@ -20,7 +20,6 @@
 CPPFLAGS.s3_video.c+=          -DS3_NEWMMIO=1 \
 
 CPPFLAGS+=     -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\"