Module Name: src
Committed By: mrg
Date: Sat May 22 10:18:04 UTC 2010
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tga: Makefile
Log Message:
push HAVE_XEXTPROTO_71 into Makefile.xf86-driver. (for now?)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-tga/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.16 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.17
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.16 Thu Oct 8 19:06:50 2009
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Sat May 22 10:18:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.16 2009/10/08 19:06:50 snj Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.17 2010/05/22 10:18:03 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -39,7 +39,8 @@
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \
-DXSERVER_LIBPCIACCESS \
- -DXFree86LOADER
+ -DXFree86LOADER \
+ -DHAVE_XEXTPROTO_71
CPPFLAGS+= -DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
CPPFLAGS+= -DPACKAGE_VERSION_MINOR=${PACKAGE_MINOR}
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.7 Sat May 22 05:42:54 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Sat May 22 10:18:03 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/05/22 05:42:54 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/05/22 10:18:03 mrg Exp $
.include <bsd.own.mk>
@@ -31,7 +31,7 @@
CPPFLAGS+= -DDISABLE_EASF -DENABLE_ALL_SERVICE_FUNCTIONS \
-DATOM_BIOS -DATOM_BIOS_PARSER -DDRIVER_PARSER \
- -DHAVE_CONFIG_H -DHAVE_XEXTPROTO_71
+ -DHAVE_CONFIG_H
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
Index: src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.5 Sat May 22 07:26:09 2010
+++ src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile Sat May 22 10:18:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/05/22 07:26:09 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/05/22 10:18:04 mrg Exp $
DRIVER= xf86-video-tga
DRIVER_NAME= tga_drv
@@ -7,9 +7,6 @@
SRCS+= tga_accel.c tga_cursor.c tga_dac.c tga_driver.c
SRCS+= tga_line.c tga_seg.c
-# new xextproto
-CPPFLAGS+= -DHAVE_XEXTPROTO_71
-
COPTS.tga_driver.c= -Wno-error # XXX xf86dgastr.h
.include "../Makefile.xf86-driver"
