Module Name:    src
Committed By:   mrg
Date:           Wed Sep 21 18:00:26 UTC 2016

Modified Files:
        src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile

Log Message:
always build the XAA files as well.  they have functions used
by the EXA code and besides a minor fix, were already setup to
build with HAVE_XAA_H not defined.

this should really fix PR#51480.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
    src/external/mit/xorg/server/drivers/xf86-video-nv/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/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.11	Fri Sep  2 03:49:56 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile	Wed Sep 21 18:00:26 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2016/09/02 03:49:56 jakllsch Exp $
+#	$NetBSD: Makefile,v 1.12 2016/09/21 18:00:26 mrg Exp $
 
 DRIVER=		xf86-video-nv
 DRIVER_NAME=	nv_drv
@@ -11,6 +11,11 @@ SRCS+=		g80_dac.c g80_display.c g80_dma.
 SRCS+=		g80_output.c g80_sor.c
 MAN=		nv.4
 
+# XAA files have generic functions as well
+#.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SRCS+=		nv_xaa.c riva_xaa.c g80_xaa.c
+#.endif
+
 .if ${MACHINE} == "macppc"
 CPPFLAGS+= -DAVOID_VGAHW
 .endif
@@ -30,7 +35,3 @@ COPTS+=		${${ACTIVE_CC} == "gcc":? -Wno-
 COPTS+=		${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
 
 .include "../Makefile.xf86-driver"
-
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SRCS+=		nv_xaa.c riva_xaa.c g80_xaa.c
-.endif

Reply via email to