Module Name: src
Committed By: mrg
Date: Sat Aug 22 02:40:28 UTC 2009
Modified Files:
src/external/mit/xorg/server/xorg-server/Xext: Makefile.Xext
src/external/mit/xorg/server/xorg-server/composite: Makefile
src/external/mit/xorg/server/xorg-server/damageext: Makefile
src/external/mit/xorg/server/xorg-server/dbe: Makefile
src/external/mit/xorg/server/xorg-server/dix: Makefile
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
src/external/mit/xorg/server/xorg-server/mi: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile
src/external/mit/xorg/server/xorg-server/render: Makefile
src/external/mit/xorg/server/xorg-server/xfixes: Makefile
Log Message:
add -Wno-error for a bunch of files that use (xorg) deprecated symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/composite/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/damageext/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/dbe/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/mi/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/randr/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/render/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/xfixes/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/xorg-server/Xext/Makefile.Xext
diff -u src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.6 src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.7
--- src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext:1.6 Sat Aug 9 06:48:17 2008
+++ src/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext Sat Aug 22 02:40:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xext,v 1.6 2008/08/09 06:48:17 rtr Exp $
+# $NetBSD: Makefile.Xext,v 1.7 2009/08/22 02:40:26 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/Xext
@@ -9,7 +9,19 @@
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
CPPFLAGS+= -DHAVE_DIX_CONFIG_H
-COPTS.xres.c= -Wno-error
+COPTS.mbuf.c+= -Wno-error
+COPTS.panoramiX.c+= -Wno-error
+COPTS.panoramiXprocs.c+= -Wno-error
+COPTS.saver.c+= -Wno-error
+COPTS.security.c+= -Wno-error
+COPTS.shape.c+= -Wno-error
+COPTS.shm.c+= -Wno-error
+COPTS.sync.c+= -Wno-error
+COPTS.xf86bigfont.c+= -Wno-error
+COPTS.xres.c= -Wno-error
+COPTS.xvdisp.c+= -Wno-error
+COPTS.xvmain.c+= -Wno-error
+COPTS.xvmc.c+= -Wno-error
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/composite/Makefile
diff -u src/external/mit/xorg/server/xorg-server/composite/Makefile:1.3 src/external/mit/xorg/server/xorg-server/composite/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/composite/Makefile:1.3 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/composite/Makefile Sat Aug 22 02:40:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/08/22 02:40:26 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -24,6 +24,8 @@
# XXX
COPTS.compwindow.c= -Wno-error
+COPTS.compext.c= -Wno-error
+COPTS.compinit.c= -Wno-error
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/damageext/Makefile
diff -u src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.1 src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server/damageext/Makefile:1.1 Sat Aug 2 21:19:21 2008
+++ src/external/mit/xorg/server/xorg-server/damageext/Makefile Sat Aug 22 02:40:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/22 02:40:26 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -17,5 +17,7 @@
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
+COPTS.damageext.c+= -Wno-error
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/dbe/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dbe/Makefile:1.2 src/external/mit/xorg/server/xorg-server/dbe/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/dbe/Makefile:1.2 Sat Aug 9 09:08:25 2008
+++ src/external/mit/xorg/server/xorg-server/dbe/Makefile Sat Aug 22 02:40:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/09 09:08:25 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/22 02:40:27 mrg Exp $
LIBISPRIVATE= yes
@@ -7,4 +7,6 @@
LIB= dbe
SRCS= ${SRCS.dbe}
+COPTS.dbe.c= -Wno-error
+
.include "Makefile.dbe"
Index: src/external/mit/xorg/server/xorg-server/dix/Makefile
diff -u src/external/mit/xorg/server/xorg-server/dix/Makefile:1.7 src/external/mit/xorg/server/xorg-server/dix/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/dix/Makefile:1.7 Thu Jun 11 05:43:15 2009
+++ src/external/mit/xorg/server/xorg-server/dix/Makefile Sat Aug 22 02:40:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/11 05:43:15 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/22 02:40:27 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -30,6 +30,14 @@
-DVENDOR_NAME="\"The Xorg Foundation\""
COPTS.dixutils.c= -Wno-error
+COPTS.colormap.c= -Wno-error
+COPTS.cursor.c= -Wno-error
+COPTS.deprecated.c= -Wno-error
+COPTS.dispatch.c= -Wno-error
+COPTS.dixfonts.c= -Wno-error
+COPTS.events.c= -Wno-error
+COPTS.resource.c= -Wno-error
+COPTS.window.c= -Wno-error
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.2 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.2 Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Sat Aug 22 02:40:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.2 2009/06/12 01:59:04 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.3 2009/08/22 02:40:27 mrg Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -39,6 +39,8 @@
COPTS.glxcmds.c= -Wno-error
COPTS.indirect_dispatch.c= -Wno-error
COPTS.indirect_dispatch_swap.c= -Wno-error
+COPTS.glxscreens.c= -Wno-error
+COPTS.xfont.c= -Wno-error
CPPFLAGS+= \
-I${X11SRCDIR.xorg-server}/include \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.11 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.12
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.11 Tue Jun 23 04:39:52 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Sat Aug 22 02:40:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/06/23 04:39:52 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/22 02:40:27 mrg Exp $
.include <bsd.sys.mk> # for HOST_SH
@@ -120,6 +120,7 @@
COPTS.xf86Cursor.c= -Wno-error
COPTS.xf86RandR.c= -Wno-error
COPTS.xf86Helper.c= -Wno-error
+COPTS.xf86cmap.c= -Wno-error
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile:1.3 Sat Aug 9 09:08:25 2008
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/dbe/Makefile Sat Aug 22 02:40:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/09 09:08:25 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2009/08/22 02:40:27 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -15,4 +15,6 @@
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= -DHAVE_XORG_CONFIG_H
+COPTS.dbe.c+= -Wno-error
+
.include "../../../../dbe/Makefile.dbe"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile:1.7 Fri Jun 12 01:59:05 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile Sat Aug 22 02:40:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/06/12 01:59:05 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2009/08/22 02:40:27 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -31,6 +31,7 @@
# XXX
CPPFLAGS.xf86RandR12.c= -Wno-error
+CPPFLAGS.xf86dga2.c= -Wno-error
XEXTMODULEOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/Xext/Xextmodule && ${PRINTOBJDIR}
LIBXEXTMODULE= ${XEXTMODULEOBJDIR}/libXextmodule.a
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.2 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.2 Fri Jun 12 01:59:05 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile Sat Aug 22 02:40:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/06/12 01:59:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/22 02:40:27 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -36,6 +36,8 @@
LIBDPLIBS= drm ${.CURDIR}/../../../../../lib/libdrm
+COPTS.dri2ext.c+= -Wno-error
+
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile:1.10 Fri Jun 12 01:59:07 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xnest/Makefile Sat Aug 22 02:40:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/06/12 01:59:07 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2009/08/22 02:40:27 mrg Exp $
.include <bsd.own.mk>
@@ -41,6 +41,8 @@
CPPFLAGS.Events.c= -Wno-error
CPPFLAGS.Screen.c= -Wno-error
+CPPFLAGS.Color.c= -Wno-error
+CPPFLAGS.Window.c= -Wno-error
CPPFLAGS.miinitext.c= -UDPMSExtension
.include "../../Makefile.Xserver"
Index: src/external/mit/xorg/server/xorg-server/mi/Makefile
diff -u src/external/mit/xorg/server/xorg-server/mi/Makefile:1.6 src/external/mit/xorg/server/xorg-server/mi/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/mi/Makefile:1.6 Sat Feb 14 13:32:13 2009
+++ src/external/mit/xorg/server/xorg-server/mi/Makefile Sat Aug 22 02:40:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/02/14 13:32:13 abs Exp $
+# $NetBSD: Makefile,v 1.7 2009/08/22 02:40:27 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -41,5 +41,8 @@
.endif
.endif
+COPTS.micmap.c+= -Wno-error
+COPTS.miexpose.c+= -Wno-error
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/randr/Makefile
diff -u src/external/mit/xorg/server/xorg-server/randr/Makefile:1.3 src/external/mit/xorg/server/xorg-server/randr/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/randr/Makefile:1.3 Thu Jun 11 05:43:19 2009
+++ src/external/mit/xorg/server/xorg-server/randr/Makefile Sat Aug 22 02:40:28 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/11 05:43:19 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/08/22 02:40:28 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -17,5 +17,12 @@
-I${X11SRCDIR.xorg-server}/../include
CPPFLAGS+= ${X11FLAGS.DIX}
+COPTS.randr.c+= -Wno-error
+COPTS.rrcrtc.c+= -Wno-error
+COPTS.rrdispatch.c+= -Wno-error
+COPTS.rrmode.c+= -Wno-error
+COPTS.rroutput.c+= -Wno-error
+COPTS.rrproperty.c+= -Wno-error
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/render/Makefile
diff -u src/external/mit/xorg/server/xorg-server/render/Makefile:1.2 src/external/mit/xorg/server/xorg-server/render/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/render/Makefile:1.2 Thu Jun 11 05:43:19 2009
+++ src/external/mit/xorg/server/xorg-server/render/Makefile Sat Aug 22 02:40:28 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/06/11 05:43:19 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/22 02:40:28 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -17,6 +17,8 @@
COPTS.miglyph.c=-Wno-error # XXX gcc 3.3
COPTS.mirect.c= -Wno-error # XXX gcc 3.3
+COPTS.picture.c= -Wno-error
+COPTS.render.c= -Wno-error
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/xfixes/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.2 src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/xfixes/Makefile:1.2 Thu Aug 28 07:34:20 2008
+++ src/external/mit/xorg/server/xorg-server/xfixes/Makefile Sat Aug 22 02:40:28 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/28 07:34:20 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/22 02:40:28 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -20,6 +20,8 @@
# XXX
COPTS.cursor.c+= -Wno-error
+COPTS.region.c+= -Wno-error
+COPTS.select.c+= -Wno-error
.include <bsd.x11.mk>
.include <bsd.lib.mk>
