Module Name: src
Committed By: mrg
Date: Tue Aug 16 07:10:01 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vesa: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
Log Message:
apply -Wno-error more liberally for xorg-server 1.18 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/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-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.6 Sun Aug 24 06:13:36 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Tue Aug 16 07:10:01 2016
@@ -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 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
# 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
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.7 Mon Jul 20 02:07:36 2015
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Tue Aug 16 07:10:01 2016
@@ -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+= smilynx_output.c smilynx_hw.c sm
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"
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.10 Thu Aug 11 23:15:40 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Tue Aug 16 07:10:01 2016
@@ -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 @@ SRCS+= sis_vga.c sis_video.c
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
Index: src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.7 Mon Jun 3 10:03:14 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile Tue Aug 16 07:10:01 2016
@@ -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= BT463ramdac.c BTramdac.c IBM561ra
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"
Index: src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.4 Sat Aug 30 04:44:34 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile Tue Aug 16 07:10:01 2016
@@ -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 @@ DRIVER_NAME= vesa_drv
SRCS= vesa.c
MAN= vesa.4
+COPTS.vesa.c+= -Wno-error
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.9 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.10
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.9 Wed Jun 5 08:42:21 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile Tue Aug 16 07:10:01 2016
@@ -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+= -DXORG_VERSION_CURRENT=${XORG
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"
