Module Name: src
Committed By: mrg
Date: Sun Jun 2 08:57:18 UTC 2013
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-i740: 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-r128: Makefile
Log Message:
updates for xf86 1.3.4, xf86-video-mga 1.6.2, xf86-video-neomagic 1.2.7
and xf86-video-r128 6.9.1.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-r128/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-i740/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.2 Sun Aug 3 07:32:04 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Sun Jun 2 08:57:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/03 07:32:04 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2013/06/02 08:57:17 mrg Exp $
DRIVER= xf86-video-i740
DRIVER_NAME= i740_drv
@@ -7,4 +7,6 @@ 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-mga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.10 Thu Mar 22 23:46:27 2012
+++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Sun Jun 2 08:57:17 2013
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.10 2012/03/22 23:46:27 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2013/06/02 08:57:17 mrg Exp $
.include <bsd.own.mk>
DRIVER= xf86-video-mga
DRIVER_NAME= mga_drv
-SRCS= clientlx.c mga_arc.c mga_bios.c mga_dac3026.c mga_dacG.c
+SRCS= mga_arc.c mga_bios.c mga_dac3026.c mga_dacG.c
SRCS+= mga_dga.c mga_dh.c mga_driver.c mga_esc.c mga_g450pll.c
SRCS+= mga_halmod.c mga_hwcurs.c mga_merge.c mga_shadow.c
SRCS+= mga_vga.c mga_video.c
MAN= mga.4
.if ${X11DRI} != "no"
-SRCS+= mga_dri.c
+#SRCS+= mga_dri.c
.endif
#if USE_EXA
@@ -22,11 +22,11 @@ CPPFLAGS+= -DUSE_EXA
#if USE_XAA
SRCS+= mga_storm.c
-CPPFLAGS+= -DUSE_XAA
+CPPFLAGS+= -DUSE_XAA -DHAVE_XAA_H
#endif
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
+#CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS.mga_driver.c= -Wno-error # XXX fix me please
Index: src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile:1.4 Sat Jul 17 06:55:39 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-neomagic/Makefile Sun Jun 2 08:57:17 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/07/17 06:55:39 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/06/02 08:57:17 mrg Exp $
DRIVER= xf86-video-neomagic
DRIVER_NAME= neomagic_drv
@@ -10,4 +10,6 @@ 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-r128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.5 Thu Aug 11 23:15:40 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Sun Jun 2 08:57:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:40 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2013/06/02 08:57:18 mrg Exp $
DRIVER= xf86-video-r128
DRIVER_NAME= r128_drv
@@ -6,6 +6,8 @@ DRIVER_NAME= r128_drv
SRCS= r128_accel.c r128_cursor.c r128_dga.c r128_driver.c \
r128_video.c r128_misc.c r128_probe.c r128_dri.c
+#SRCS+= r128_exa.c r128_exa_render.c
+
MAN= r128.4
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc64"
@@ -19,6 +21,9 @@ CPPFLAGS+= -DWITH_VGAHW
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+= -DHAVE_XEXTPROTO_71 \
+ -DHAVE_XAA_H -DR128DRI
+
CWARNFLAGS.clang+= -Wno-format -Wno-pointer-sign
.include "../Makefile.xf86-driver"
