[src/trunk]: src/external/mit/xorg XXX: use -Wno-error for files that use old...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7fe0aea4d7eb
branches:  trunk
changeset: 755072:7fe0aea4d7eb
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat May 22 05:45:01 2010 +0000

description:
XXX: use -Wno-error for files that use old foostr.h includes that now have
XXX: #warning's in them.

diffstat:

 external/mit/xorg/lib/libX11/Makefile                                   |  3 ++-
 external/mit/xorg/server/xorg-server/Xext/Makefile.Xext                 |  5 +++--
 external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule           |  4 ++--
 external/mit/xorg/server/xorg-server/hw/vfb/Makefile                    |  4 +++-
 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile         |  4 +++-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile        |  4 +++-
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile |  3 ++-
 external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile            |  6 ++++--
 external/mit/xorg/server/xorg-server/hw/xnest/Makefile                  |  4 +++-
 external/mit/xorg/server/xorg-server/os/Makefile                        |  3 ++-
 10 files changed, 27 insertions(+), 13 deletions(-)

diffs (180 lines):

diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/lib/libX11/Makefile
--- a/external/mit/xorg/lib/libX11/Makefile     Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile     Sat May 22 05:45:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2008/10/27 20:24:10 cube Exp $
+#      $NetBSD: Makefile,v 1.7 2010/05/22 05:45:01 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -79,6 +79,7 @@
                XrmEnumerateDatabase.3 XrmGetFileDatabase.3 \
                XrmGetResource.3 XrmInitialize.3 XrmMergeDatabases.3 \
                XrmPutResource.3 XrmUniqueQuark.3
+# XGetEventData.man
 
 FILES=         XErrorDB XKeysymDB Xcms.txt
 FILESDIR=      ${X11LIBDIR}
diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/server/xorg-server/Xext/Makefile.Xext
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext   Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xext   Sat May 22 05:45:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xext,v 1.8 2010/05/22 02:42:37 mrg Exp $
+#      $NetBSD: Makefile.Xext,v 1.9 2010/05/22 05:45:01 mrg Exp $
 
 .PATH:         ${X11SRCDIR.xorg-server}/Xext
 
@@ -9,7 +9,7 @@
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/hw/xfree86/dixmods/extmod
 CPPFLAGS+=     -DHAVE_DIX_CONFIG_H
 
-COPTS.mbuf.c+=                 -Wno-error
+#COPTS.mbuf.c+=                        -Wno-error
 COPTS.panoramiX.c+=            -Wno-error
 COPTS.panoramiXprocs.c+=       -Wno-error
 COPTS.saver.c+=                        -Wno-error
@@ -23,6 +23,7 @@
 COPTS.xvmain.c+=               -Wno-error
 COPTS.xvmc.c+=                 -Wno-error
 COPTS.bigreq.c+=               -Wno-error      # XXX bigreqstr.h
+COPTS.xcmisc.c+=               -Wno-error      # XXX xcmiscstr.h
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule     Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile.Xextmodule     Sat May 22 05:45:01 2010 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile.Xextmodule,v 1.7 2009/06/12 01:59:04 mrg Exp $
+#      $NetBSD: Makefile.Xextmodule,v 1.8 2010/05/22 05:45:01 mrg Exp $
 
 SRCS.Xextmodule=       xvmain.c xvdisp.c xvmc.c
 SRCS.Xextmodule+=      xres.c
 SRCS.Xextmodule+=      saver.c
-SRCS.Xextmodule+=      mbuf.c
+#SRCS.Xextmodule+=     mbuf.c
 SRCS.Xextmodule+=      dpms.c
diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/server/xorg-server/hw/vfb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Sat May 22 05:45:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2009/06/12 01:59:04 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2010/05/22 05:45:01 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -106,5 +106,7 @@
 DPADD+=        ${LIBALPHA}
 .endif
 
+COPTS.miinitext.c+=    -Wno-error      # XXX xf86bigfstr.h
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Sat May 22 05:45:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2009/08/22 02:40:27 mrg Exp $
+#      $NetBSD: Makefile,v 1.13 2010/05/22 05:45:01 mrg Exp $
 
 .include <bsd.sys.mk> # for HOST_SH
 
@@ -121,6 +121,8 @@
 COPTS.xf86RandR.c=             -Wno-error
 COPTS.xf86Helper.c=            -Wno-error
 COPTS.xf86cmap.c=              -Wno-error
+COPTS.xf86Cursor.c=            -Wno-error      # XXX xf86dgastr.h
+COPTS.xf86DGA.c=               -Wno-error      # XXX xf86dgastr.h
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile  Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile  Sat May 22 05:45:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2009/06/18 03:32:41 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2010/05/22 05:45:01 mrg Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -31,6 +31,8 @@
        wfb \
        xorgxkb
 
+COPTS.miinitext.c=     -Wno-error      # XXX xf86bigfstr.h
+
 .include <bsd.x11.mk>
 LIBDIR=        ${XMODULEDIR}
 .include <bsd.lib.mk>
diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile   Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/extmod/Makefile   Sat May 22 05:45:01 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/08/22 02:40:27 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/05/22 05:45:01 mrg Exp $
 
 XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
 
@@ -32,6 +32,7 @@
 # XXX
 CPPFLAGS.xf86RandR12.c=        -Wno-error
 CPPFLAGS.xf86dga2.c=   -Wno-error
+CPPFLAGS.xf86vmode.c=  -Wno-error      # XXX xf86vmstr.h
 
 XEXTMODULEOBJDIR!=  cd ${NETBSDSRCDIR}/external/mit/xorg/server/xorg-server/Xext/Xextmodule && ${PRINTOBJDIR}
 LIBXEXTMODULE= ${XEXTMODULEOBJDIR}/libXextmodule.a
diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile      Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile      Sat May 22 05:45:01 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/10/08 19:06:52 snj Exp $
+# $NetBSD: Makefile,v 1.8 2010/05/22 05:45:02 mrg Exp $
 
 XMODULEDIR=    ${X11USRLIBDIR}/modules/extensions
 
@@ -33,7 +33,9 @@
 CPPFLAGS+=     -DXF86DRI \
                ${X11FLAGS.DIX}
 
-CPPFLAGS.dri.c=        -Wno-error
+CPPFLAGS.dri.c=                -Wno-error
+CPPFLAGS.drimodule.c=  -Wno-error      # XXX xf86dristr.h
+CPPFLAGS.xf86dri.c=    -Wno-error      # XXX xf86dristr.h
 
 LIBDPLIBS=     drm ${.CURDIR}/../../../../../lib/libdrm
 
diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/server/xorg-server/hw/xnest/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xnest/Makefile    Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xnest/Makefile    Sat May 22 05:45:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2009/08/22 02:40:27 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2010/05/22 05:45:02 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -109,5 +109,7 @@
 DPADD+=        ${LIBALPHA}
 .endif
 
+COPTS.miinitext.c+=    -Wno-error      # XXX xf86bigfstr.h
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r f450605ef8a1 -r 7fe0aea4d7eb external/mit/xorg/server/xorg-server/os/Makefile
--- a/external/mit/xorg/server/xorg-server/os/Makefile  Sat May 22 05:44:08 2010 +0000
+++ b/external/mit/xorg/server/xorg-server/os/Makefile  Sat May 22 05:45:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2009/06/11 05:43:19 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2010/05/22 05:45:02 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -59,6 +59,7 @@
 
 COPTS.xdmauth.c=       -Wno-error      # XXX
 COPTS.xstrans.c=       -Wno-error      # XXX
+COPTS.io.c=            -Wno-error      # XXX bigreqstr.h
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>