Module Name: src Committed By: mrg Date: Tue Aug 16 06:24:03 UTC 2016
Modified Files: src/external/mit/xorg/server/drivers: Makefile.xf86-driver src/external/mit/xorg/server/drivers/xf86-video-ark: Makefile src/external/mit/xorg/server/drivers/xf86-video-ast: Makefile src/external/mit/xorg/server/drivers/xf86-video-ati: Makefile src/external/mit/xorg/server/drivers/xf86-video-i740: Makefile src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile src/external/mit/xorg/server/drivers/xf86-video-mach64: Makefile src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile src/external/mit/xorg/server/drivers/xf86-video-neomagic: Makefile src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile src/external/mit/xorg/server/drivers/xf86-video-s3: Makefile src/external/mit/xorg/server/drivers/xf86-video-savage: Makefile src/external/mit/xorg/server/drivers/xf86-video-suncg14: Makefile src/external/mit/xorg/server/drivers/xf86-video-suncg6: Makefile src/external/mit/xorg/server/drivers/xf86-video-sunffb: Makefile src/external/mit/xorg/server/drivers/xf86-video-sunleo: Makefile src/external/mit/xorg/server/drivers/xf86-video-suntcx: Makefile src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile Log Message: define HAVE_XAA_H in Makefile.xf86-driver for xorg-server 1.10 only, move it out of many driver makefiles. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ src/external/mit/xorg/server/drivers/Makefile.xf86-driver cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile cvs rdiff -u -r1.22 -r1.23 \ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile cvs rdiff -u -r1.12 -r1.13 \ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile cvs rdiff -u -r1.10 -r1.11 \ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.19 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.20 --- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.19 Tue Nov 23 08:22:29 2010 +++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Tue Aug 16 06:24:03 2016 @@ -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 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -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} Index: src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile:1.5 Thu Jul 23 02:04:09 2015 +++ src/external/mit/xorg/server/drivers/xf86-video-ark/Makefile Tue Aug 16 06:24:01 2016 @@ -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 @@ DRIVER_NAME= ark_drv SRCS= ark_accel.c ark_driver.c CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\" -CPPFLAGS+= -DHAVE_XAA_H .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile:1.5 Thu Mar 20 05:32:31 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-ast/Makefile Tue Aug 16 06:24:01 2016 @@ -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 @@ DRIVER_NAME= ast_drv 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" Index: src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile:1.5 Sat Jul 26 08:04:54 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-ati/Makefile Tue Aug 16 06:24:01 2016 @@ -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 @@ MAN= ati.4 LIBDPLIBS+= drm_radeon ${.CURDIR}/../../../lib/libdrm_radeon .include "../Makefile.xf86-driver" + +# XXX +.if ${XORG_SERVER_SUBDIR} == "xorg-server.old" +CPPFLAGS+= -DUSE_XAA +.endif Index: src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.4 --- src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.3 Sun Jun 2 08:57:17 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Tue Aug 16 06:24:02 2016 @@ -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_accel.c i740_cursor.c i740_d SRCS+= i740_i2c.c i740_io.c i740_video.c MAN= i740.4 -CPPFLAGS+= -DHAVE_XAA_H - .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.22 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.23 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.22 Wed Jun 8 02:27:31 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue Aug 16 06:24:02 2016 @@ -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_hwmc.c 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_STAT_H=1 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 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib .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_imprecise.c+= -Wno- 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> Index: src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.9 --- src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.8 Mon Jul 20 01:17:46 2015 +++ src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile Tue Aug 16 06:24:02 2016 @@ -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.dga= atidga.c 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 @@ MAN= # defined CWARNFLAGS.clang+= -Wno-pointer-sign .include "../Makefile.xf86-driver" + +# XXX +.if ${XORG_SERVER_SUBDIR} == "xorg-server.old" +CPPFLAGS+= -DUSE_XAA +.endif Index: src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.13 --- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.12 Thu Mar 20 05:32:31 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Tue Aug 16 06:24:02 2016 @@ -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 @@ SRCS+= mga_exa.c 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 @@ CPPFLAGS.mga_dacG.c= -Wno-error # XXX fi 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 Index: src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile:1.5 Sun Jun 2 08:57:17 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile Tue Aug 16 06:24:02 2016 @@ -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 @@ MAN= neomagic.4 COPTS.neo_driver.c= -Wno-error # XXX xf86dgastr.h -CPPFLAGS+= -DHAVE_XAA_H - .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.8 --- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.7 Wed Aug 13 22:48:15 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Tue Aug 16 06:24:02 2016 @@ -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+= -DAVOID_VGAHW #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 Index: src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.11 --- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.10 Thu Jul 30 02:58:00 2015 +++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Tue Aug 16 06:24:02 2016 @@ -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+= -DWITH_VGAHW CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm -CPPFLAGS+= -DHAVE_XAA_H -DUSE_EXA -DR128DRI +CPPFLAGS+= -DUSE_EXA -DR128DRI CWARNFLAGS.clang+= -Wno-format -Wno-pointer-sign Index: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.3 --- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.2 Sat Sep 19 23:00:44 2015 +++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Tue Aug 16 06:24:02 2016 @@ -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 @@ SRCS.DRI= radeon_dri.c 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" Index: src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.12 --- src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile:1.11 Mon Jun 3 08:51:18 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile Tue Aug 16 06:24:02 2016 @@ -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_accel_newmmio.c+= -DS3_NEWMM CPPFLAGS.s3_video.c+= -DS3_NEWMMIO=1 \ CPPFLAGS+= -DPACKAGE_VERSION=\"${PACKAGE_VERSION}\" -CPPFLAGS+= -DHAVE_XAA_H CWARNFLAGS.clang+= -Wno-parentheses Index: src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.14 --- src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.13 Wed Mar 19 23:46:05 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile Tue Aug 16 06:24:02 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/03/19 23:46:05 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2016/08/16 06:24:02 mrg Exp $ DRIVER= xf86-video-savage DRIVER_NAME= savage_drv @@ -23,7 +23,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm -CPPFLAGS+= -DHAVE_XAA_H -DSAVAGEDRI +CPPFLAGS+= -DSAVAGEDRI CPPFLAGS.savage_driver.c= -DPACKAGE_VERSION=\"${PACKAGE_MAJOR}\" CPPFLAGS.savage_exa.c= -Wno-error # volatile -> mempcy Index: src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.5 Tue Jun 25 12:27:41 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile Tue Aug 16 06:24:02 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/06/25 12:27:41 macallan Exp $ +# $NetBSD: Makefile,v 1.6 2016/08/16 06:24:02 mrg Exp $ DRIVER= xf86-video-suncg14 DRIVER_NAME= suncg14_drv @@ -7,6 +7,5 @@ SRCS= cg14_driver.c cg14_cursor.c cg14_ MAN= suncg14.4 CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include -CPPFLAGS+= -DHAVE_XAA_H .include "../Makefile.xf86-driver" Index: src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.5 --- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.4 Wed Nov 25 18:02:08 2015 +++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile Tue Aug 16 06:24:02 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/11/25 18:02:08 macallan Exp $ +# $NetBSD: Makefile,v 1.5 2016/08/16 06:24:02 mrg Exp $ DRIVER= xf86-video-suncg6 DRIVER_NAME= suncg6_drv @@ -6,7 +6,6 @@ DRIVER_NAME= suncg6_drv SRCS= cg6_driver.c cg6_cursor.c cg6_accel.c cg6_exa.c CPPFLAGS+= ${X11FLAGS.DRI} -CPPFLAGS+= -DHAVE_XAA_H MAN= suncg6.4 Index: src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.7 --- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.6 Sun Aug 16 17:48:24 2015 +++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile Tue Aug 16 06:24:03 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/08/16 17:48:24 macallan Exp $ +# $NetBSD: Makefile,v 1.7 2016/08/16 06:24:03 mrg Exp $ DRIVER= xf86-video-sunffb DRIVER_NAME= sunffb_drv @@ -18,7 +18,6 @@ COPTS= -mv8plus .endif CPPFLAGS+= ${X11FLAGS.DRI} -DUSE_VIS -CPPFLAGS+= -DHAVE_XAA_H MAN= sunffb.4 Index: src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.3 --- src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.2 Tue Jun 4 22:45:08 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile Tue Aug 16 06:24:03 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/06/04 22:45:08 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2016/08/16 06:24:03 mrg Exp $ DRIVER= xf86-video-sunleo DRIVER_NAME= sunleo_drv @@ -6,7 +6,6 @@ DRIVER_NAME= sunleo_drv SRCS= leo_accel.c leo_cursor.c leo_driver.c CPPFLAGS+= ${X11FLAGS.DRI} -CPPFLAGS+= -DHAVE_XAA_H MAN= sunleo.4 Index: src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.3 --- src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.2 Tue Jun 4 22:45:08 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile Tue Aug 16 06:24:03 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/06/04 22:45:08 mrg Exp $ +# $NetBSD: Makefile,v 1.3 2016/08/16 06:24:03 mrg Exp $ DRIVER= xf86-video-suntcx DRIVER_NAME= suntcx_drv @@ -6,7 +6,6 @@ DRIVER_NAME= suntcx_drv SRCS= tcx_driver.c tcx_cursor.c tcx_accel.c CPPFLAGS+= ${X11FLAGS.DRI} -CPPFLAGS+= -DHAVE_XAA_H MAN= suntcx.4 Index: src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.14 --- src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.13 Fri Jul 1 23:29:17 2016 +++ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Tue Aug 16 06:24:03 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2016/07/01 23:29:17 macallan Exp $ +# $NetBSD: Makefile,v 1.14 2016/08/16 06:24:03 mrg Exp $ DRIVER= xf86-video-tdfx DRIVER_NAME= tdfx_drv @@ -14,7 +14,6 @@ CPPFLAGS+= -DUSE_INT10 .else CPPFLAGS+= -DUSE_PCIVGAIO=0 .endif -CPPFLAGS+= -DHAVE_XAA_H CPPFLAGS+= -DTDFXDRI CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 Index: src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.8 --- src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.7 Mon Jul 20 03:00:01 2015 +++ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Tue Aug 16 06:24:03 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/07/20 03:00:01 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2016/08/16 06:24:03 mrg Exp $ DRIVER= xf86-video-trident DRIVER_NAME= trident_drv @@ -11,8 +11,6 @@ SRCS+= trident_tv.c trident_video.c tvg SRCS+= xp4_accel.c xp4_accel_exa.c MAN= trident.4 -CPPFLAGS+= -DHAVE_XAA_H - COPTS.trident_driver.c= -Wno-error # XXX xf86dgastr.h CWARNFLAGS.clang+= -Wno-return-type -Wno-empty-body