From f5d149356239d71adae62588cf229f82e00c6b87 Mon Sep 17 00:00:00 2001 From: mrg Date: Tue, 16 Aug 2016 07:08:17 +0000 Subject: [PATCH] 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. --- .../server/drivers/xf86-video-radeon/Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile b/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile index fe4c3176b184..25d56935b21f 100644 --- a/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile +++ b/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile @@ -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 @@ -20,6 +20,11 @@ SRCS.DRI= radeon_dri.c 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 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \ -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