Module Name: src
Committed By: mrg
Date: Mon Dec 31 12:13:50 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-mouse: Makefile
src/external/mit/xorg/server/drivers/xf86-input-synaptics: Makefile
src/external/mit/xorg/server/drivers/xf86-input-vmmouse: Makefile
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
Log Message:
-Wno-error for newly deprecated things.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.12 -r1.13 \
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-input-mouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8 Tue Aug 16 06:53:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/16 06:53:01 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2018/12/31 12:13:50 mrg Exp $
WARNS?= 2
@@ -22,5 +22,7 @@ PKGDIST.xorg-mouse= ${X11SRCDIR.${DRIVER
.PATH: ${X11SRCDIR.${DRIVER}}/include
.PATH: ${X11SRCDIR.${DRIVER}}
+COPTS.mouse.c+= -Wno-error # XXX deprecated
+
XORG_PKG_VER_PROG= ${DRIVER}
.include "../../../xorg-pkg-ver.mk"
Index: src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.1 Sat Jan 29 02:32:36 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/01/29 02:32:36 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-input-synaptics
DRIVER_NAME= synaptics_drv
@@ -11,4 +11,6 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
MAN= synaptics.4
+COPTS.synaptics.c+= -Wno-error # XXX deprecated
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.5 Wed Oct 19 23:07:34 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/10/19 23:07:34 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-input-vmmouse
DRIVER_NAME= vmmouse_drv
@@ -9,7 +9,7 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/shar
CPPFLAGS+= -DXINPUT -DHAVE_XORG_SERVER_1_5_0
CPPFLAGS+= -DABS_VALUATOR_AXES -DNO_MOUSE_MODULE
-COPTS.vmmouse.c= -Wno-error # XXX deprecated
+COPTS.vmmouse.c+= -Wno-error # XXX deprecated
.include "../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/shared
Index: src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14 Sat Dec 10 01:58:36 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/12/10 01:58:36 macallan Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-video-glint
DRIVER_NAME= glint_drv
@@ -22,7 +22,7 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-COPTS.glint_driver.c= -Wno-error # XXX xf86dgastr.h
+COPTS.glint_driver.c= -Wno-error # XXX xf86dgastr.h, deprecated
CWARNFLAGS.clang+= -Wno-format
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.25 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.26
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.25 Sat Oct 8 20:08:57 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/10/08 20:08:57 mrg Exp $
+# $NetBSD: Makefile,v 1.26 2018/12/31 12:13:50 mrg Exp $
.include <bsd.own.mk>
@@ -207,3 +207,6 @@ COPTS.sna_trapezoids_imprecise.c+= -Wno-
COPTS.sna_trapezoids_mono.c+= -Wno-stack-protector
COPTS.sna_trapezoids_precise.c+= -Wno-stack-protector
COPTS.i965_video.c+= -Wno-stack-protector
+
+COPTS.sna_display.c+= -Wno-error # XXX deprecated
+COPTS.intel_driver.c+= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile:1.13 Thu Jul 12 21:22:20 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/07/12 21:22:20 macallan Exp $
+# $NetBSD: Makefile,v 1.14 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-video-nv
DRIVER_NAME= nv_drv
@@ -34,4 +34,6 @@ CPPFLAGS+= -DAVOID_VGAHW
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-error=cpp :}
COPTS+= ${${ACTIVE_CC} == "clang":? -Wno-error=\#warnings :}
+COPTS.g80_dac.c+= -Wno-error # XXX deprecated
+
.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.16 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.17
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.16 Fri Feb 2 01:02:40 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/02/02 01:02:40 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -29,3 +29,5 @@ COPTS.initextx.c+= ${${ACTIVE_CC} == "gc
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
COPTS.sis_utility.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
COPTS.initextx.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
+
+COPTS.sis_driver.c+= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.12 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.13
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.12 Sat Oct 8 20:08:57 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/10/08 20:08:57 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-video-vmware
DRIVER_NAME= vmware_drv
@@ -21,7 +21,7 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../i
-I${DESTDIR}${X11INCDIR}/libdrm
# XXX
-COPTS.vmware.c+= -Wno-error
+COPTS.vmware.c+= -Wno-error # XXX deprecated
COPTS.vmwaremodes.c+= -Wno-error
.include "../Makefile.xf86-driver"
