[src/trunk]: src/external/mit/xorg/server/drivers apply -Wno-error more liber...

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

details:   https://anonhg.NetBSD.org/src/rev/a85240a6bcea
branches:  trunk
changeset: 347170:a85240a6bcea
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 16 07:10:01 2016 +0000

description:
apply -Wno-error more liberally for xorg-server 1.18 builds.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile    |   4 ++-
 external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile |   6 +++-
 external/mit/xorg/server/drivers/xf86-video-sis/Makefile           |   7 +++-
 external/mit/xorg/server/drivers/xf86-video-tga/Makefile           |  13 ++++++---
 external/mit/xorg/server/drivers/xf86-video-vesa/Makefile          |   4 ++-
 external/mit/xorg/server/drivers/xf86-video-vmware/Makefile        |   6 +++-
 6 files changed, 29 insertions(+), 11 deletions(-)

diffs (125 lines):

diff -r 8787e43f47c0 -r a85240a6bcea external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile   Tue Aug 16 07:09:27 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile   Tue Aug 16 07:10:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2014/08/24 06:13:36 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2016/08/16 07:10:01 mrg Exp $
 
 DRIVER=                xf86-video-openchrome
 DRIVER_NAME=   openchrome_drv
@@ -44,6 +44,8 @@
 # XXX
 .if defined(HAVE_GCC)
 COPTS.via_dri.c+= -Wno-error
+COPTS.via_driver.c+= -Wno-error=discarded-qualifiers
+COPTS.via_lvds.c+= -Wno-error=discarded-qualifiers
 .endif
 
 CWARNFLAGS.clang+=     -Wno-tautological-compare
diff -r 8787e43f47c0 -r a85240a6bcea external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile        Tue Aug 16 07:09:27 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile        Tue Aug 16 07:10:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2015/07/20 02:07:36 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
 
 DRIVER=                xf86-video-siliconmotion
 DRIVER_NAME=   siliconmotion_drv
@@ -10,7 +10,9 @@
 SRCS+=         smi501_crtc.c smi501_output.c
 MAN=           siliconmotion.4
 
-CPPFLAGS+=     -DHAVE_XAA_H -DHAVE_XMODES -DHAVE_XEXTPROTO_71
+CPPFLAGS+=     -DHAVE_XMODES -DHAVE_XEXTPROTO_71
+
+COPTS.smi_video.c+=    -Wno-error=discarded-qualifiers
 
 .include "../Makefile.xf86-driver"
 
diff -r 8787e43f47c0 -r a85240a6bcea external/mit/xorg/server/drivers/xf86-video-sis/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile  Tue Aug 16 07:09:27 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile  Tue Aug 16 07:10:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $
+#      $NetBSD: Makefile,v 1.11 2016/08/16 07:10:01 mrg Exp $
 
 DRIVER=                xf86-video-sis
 DRIVER_NAME=   sis_drv
@@ -11,13 +11,16 @@
 MAN=           sis.4
 
 CPPFLAGS+=     -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
+CPPFLAGS+=     -DSIS_USE_EXA
 CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/src
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/dri
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
 # XXX
-COPTS.sis_driver.c=    -Wno-error
+COPTS.sis_driver.c+=   -Wno-error=discarded-qualifiers
+COPTS.sis_utility.c+=  -Wno-error=discarded-qualifiers
+COPTS.initextx.c+=     -Wno-error=discarded-qualifiers
 
 X11MANCPP=             yes
 
diff -r 8787e43f47c0 -r a85240a6bcea external/mit/xorg/server/drivers/xf86-video-tga/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-tga/Makefile  Tue Aug 16 07:09:27 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-tga/Makefile  Tue Aug 16 07:10:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2013/06/03 10:03:14 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2016/08/16 07:10:01 mrg Exp $
 
 DRIVER=                xf86-video-tga
 DRIVER_NAME=   tga_drv
@@ -7,8 +7,13 @@
 SRCS+=         tga_accel.c tga_cursor.c tga_dac.c tga_driver.c
 SRCS+=         tga_line.c tga_seg.c
 
-CPPFLAGS+=     -DHAVE_XAA_H
-
-COPTS.tga_driver.c=    -Wno-error      # XXX xf86dgastr.h
+# XXX
+COPTS.BT463ramdac.c+=  -Wno-error
+COPTS.BTramdac.c+=     -Wno-error
+COPTS.IBM561ramdac.c+= -Wno-error
+COPTS.tga_accel.c+=    -Wno-error
+COPTS.tga_cursor.c+=   -Wno-error
+COPTS.tga_dac.c+=      -Wno-error
+COPTS.tga_driver.c+=   -Wno-error
 
 .include "../Makefile.xf86-driver"
diff -r 8787e43f47c0 -r a85240a6bcea external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile Tue Aug 16 07:09:27 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile Tue Aug 16 07:10:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2008/08/30 04:44:34 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2016/08/16 07:10:01 mrg Exp $
 
 DRIVER=                xf86-video-vesa
 DRIVER_NAME=   vesa_drv
@@ -6,4 +6,6 @@
 SRCS=          vesa.c
 MAN=           vesa.4
 
+COPTS.vesa.c+= -Wno-error
+
 .include "../Makefile.xf86-driver"
diff -r 8787e43f47c0 -r a85240a6bcea external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile       Tue Aug 16 07:09:27 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile       Tue Aug 16 07:10:01 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2013/06/05 08:42:21 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2016/08/16 07:10:01 mrg Exp $
 
 DRIVER=                xf86-video-vmware
 DRIVER_NAME=   vmware_drv
@@ -20,4 +20,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H \
                -I${DESTDIR}${X11INCDIR}/libdrm
 
+# XXX
+COPTS.vmware.c+=       -Wno-error
+COPTS.vmwaremodes.c+=  -Wno-error
+
 .include "../Makefile.xf86-driver"