Module Name:    src
Committed By:   mrg
Date:           Tue Jun  4 22:45:08 UTC 2013

Modified Files:
        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

Log Message:
updates for merge xf86-video-suncg14 1.1.2, xf86-video-suncg6 1.1.2,
xf86-video-sunffb 1.2.2, xf86-video-suntcx 1.1.2 and xf86-video-sunleo 1.2.1


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.3 -r1.4 \
    src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile
cvs rdiff -u -r1.1 -r1.2 \
    src/external/mit/xorg/server/drivers/xf86-video-suntcx/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-suncg14/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile:1.2	Thu Apr 14 16:50:05 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg14/Makefile	Tue Jun  4 22:45:07 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2011/04/14 16:50:05 macallan Exp $
+#	$NetBSD: Makefile,v 1.3 2013/06/04 22:45:07 mrg Exp $
 
 DRIVER=		xf86-video-suncg14
 DRIVER_NAME=	suncg14_drv
@@ -7,5 +7,6 @@ SRCS=		cg14_driver.c cg14_cursor.c
 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.2 src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile:1.2	Tue Jan 20 10:18:32 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-suncg6/Makefile	Tue Jun  4 22:45:08 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2009/01/20 10:18:32 martin Exp $
+#	$NetBSD: Makefile,v 1.3 2013/06/04 22:45:08 mrg Exp $
 
 DRIVER=		xf86-video-suncg6
 DRIVER_NAME=	suncg6_drv
@@ -6,6 +6,7 @@ DRIVER_NAME=	suncg6_drv
 SRCS=		cg6_driver.c cg6_cursor.c cg6_accel.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.3 src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile:1.3	Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-sunffb/Makefile	Tue Jun  4 22:45:08 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/02/14 13:32:13 abs Exp $
+#	$NetBSD: Makefile,v 1.4 2013/06/04 22:45:08 mrg Exp $
 
 DRIVER=		xf86-video-sunffb
 DRIVER_NAME=	sunffb_drv
@@ -17,6 +17,7 @@ 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.1 src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile:1.1	Sat Sep  5 22:35:53 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-sunleo/Makefile	Tue Jun  4 22:45:08 2013
@@ -1,13 +1,12 @@
-#	$NetBSD: Makefile,v 1.1 2009/09/05 22:35:53 macallan Exp $
+#	$NetBSD: Makefile,v 1.2 2013/06/04 22:45:08 mrg Exp $
 
 DRIVER=		xf86-video-sunleo
 DRIVER_NAME=	sunleo_drv
 
-SRCS=		leo_accel.c leo_checks.c leo_cursor.c leo_driver.c \
-		leo_frect.c leo_frectsp.c leo_fspans.c leo_fspanssp.c \
-		leo_glyph.c
+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.1 src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.1	Wed Aug 26 22:30:46 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile	Tue Jun  4 22:45:08 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2009/08/26 22:30:46 macallan Exp $
+#	$NetBSD: Makefile,v 1.2 2013/06/04 22:45:08 mrg Exp $
 
 DRIVER=		xf86-video-suntcx
 DRIVER_NAME=	suntcx_drv
@@ -6,6 +6,7 @@ DRIVER_NAME=	suntcx_drv
 SRCS=		tcx_driver.c tcx_cursor.c tcx_accel.c
 
 CPPFLAGS+=	${X11FLAGS.DRI}
+CPPFLAGS+=	-DHAVE_XAA_H
 
 MAN=		suntcx.4
 

Reply via email to