Module Name: src
Committed By: mrg
Date: Mon Dec 31 13:05:08 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc: Makefile
src/external/mit/xorg/server/xorg-server/xkb: Makefile
src/external/mit/xorg/server/xorg-server/xkbstubs: Makefile
Log Message:
more xorg-server 1.20 updates:
- more -Wno-error for deprecated functions
- add missing header paths
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/xkb/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/xkbstubs/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-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.26 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.27
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.26 Mon Dec 31 12:13:50 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Mon Dec 31 13:05:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/12/31 12:13:50 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2018/12/31 13:05:07 mrg Exp $
.include <bsd.own.mk>
@@ -210,3 +210,4 @@ COPTS.i965_video.c+= -Wno-stack-protecto
COPTS.sna_display.c+= -Wno-error # XXX deprecated
COPTS.intel_driver.c+= -Wno-error # XXX deprecated
+COPTS.intel_display.c+= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.7 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile Mon Dec 31 13:05:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/12/31 13:05:07 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -17,7 +17,9 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/miext/damage \
-I${X11SRCDIR.xorg-server}/render \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
+ -I${X11SRCDIR.xorg-server}/../include
CWARNFLAGS.clang+= -Wno-format
Index: src/external/mit/xorg/server/xorg-server/xkb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.10 src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.10 Sun Aug 14 00:03:59 2016
+++ src/external/mit/xorg/server/xorg-server/xkb/Makefile Mon Dec 31 13:05:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/14 00:03:59 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2018/12/31 13:05:08 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -21,6 +21,7 @@ SRCS= ${DDXSRCS} ${DIXSRCS} ${XKBFILESR
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
Index: src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.3 src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.3 Sun Aug 14 00:03:59 2016
+++ src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile Mon Dec 31 13:05:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/14 00:03:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 13:05:08 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -13,6 +13,7 @@ SRCS= ${DDXSRCS}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
