[src/trunk]: src/external/mit/xorg/server/drivers/xf86-video-radeon define US...

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

details:   https://anonhg.NetBSD.org/src/rev/1e98db2a80f1
branches:  trunk
changeset: 347168:1e98db2a80f1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 16 07:08:17 2016 +0000

description:
define USE_XAA here for xorg-server 1.10.
for xorg-server 1.18 builds, copy some files from xorg-server 1.10.

this may not work with xorg-server 1.18, i'll test later.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-radeon/Makefile |  16 +++++++++++-
 1 files changed, 14 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 5ab82c53081e -r 1e98db2a80f1 external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile       Tue Aug 16 06:54:12 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile       Tue Aug 16 07:08:17 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2015/05/28 14:36:45 rjs Exp $
+#      $NetBSD: Makefile,v 1.20 2016/08/16 07:08:17 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,6 +20,11 @@
 CPPFLAGS+=     ${X11FLAGS.DRI}
 .endif
 
+# XXX
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+CPPFLAGS+=     -DUSE_XAA
+.endif
+
 .if ${X11DRI} != "no"
 # XXX
 . if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -54,7 +59,14 @@
                -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/X11/dri \
                -I${DESTDIR}${X11INCDIR}/libdrm \
-               -I${X11SRCDIR.${DRIVER}}/../include
+               -I${X11SRCDIR.${DRIVER}}/../include \
+               -I${X11SRCDIR.${DRIVER}}/../xorg-server-copy
+.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
+CPPFLAGS+=     -DHAVE_XORG_LIST
+# XXX These have been copied from xorg-server 1.10.6.
+SRCS+=         fi1236.c msp3430.c tda9885.c uda1380.c
+.PATH:         ${X11SRCDIR.${DRIVER}}/../xorg-server-copy
+.endif
 
 # XXX
 COPTS+=        -Wno-error