[src/trunk]: src/external/mit/xorg/server/drivers/xf86-video-nouveau updates ...

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

details:   https://anonhg.NetBSD.org/src/rev/a6a939d120d7
branches:  trunk
changeset: 347138:a6a939d120d7
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Aug 15 17:01:25 2016 +0000

description:
updates for xf86-video-nouveau 1.0.12.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 9b97fbc0bb65 -r a6a939d120d7 external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile      Mon Aug 15 15:51:39 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile      Mon Aug 15 17:01:25 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2015/10/13 04:33:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2016/08/15 17:01:25 mrg Exp $
 
 DRIVER=                xf86-video-nouveau
 DRIVER_NAME=   nouveau_drv
@@ -10,7 +10,6 @@
                nouveau_exa.c \
                nouveau_xv.c \
                nouveau_dri2.c \
-               nouveau_glamor.c \
                nouveau_present.c \
                nouveau_sync.c \
                nouveau_wfb.c \
@@ -39,7 +38,6 @@
 
 MAN=           nouveau.4
 
-CPPFLAGS+=     -DHAVE_XAA_H
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
 CPPFLAGS+=     -DNV_MAJOR_VERSION=${PACKAGE_MAJOR}
@@ -47,7 +45,15 @@
 CPPFLAGS+=     -DNV_PATCHLEVEL=${PACKAGE_PATCH}
 CPPFLAGS+=     -DNV_DRIVER_DATE=${DRIVER_DATE}
 
+# XXX
+COPTS.nouveau_xv.c+=   -Wno-error=discarded-qualifiers
+
 .include "../Makefile.xf86-driver"
 
+.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
+CPPFLAGS+=     -DHAVE_XORG_LIST
+CPPFLAGS+=     -DHAVE_XAA_H
+.endif
+
 # from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
 DRIVER_DATE!=awk '/^Date:/{print "\"" $0 "\"";exit}' ${X11SRCDIR.${DRIVER}}/ChangeLog