[src/trunk]: src/external/mit/xorg/server more xorg-server 1.20 updates:

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

details:   https://anonhg.NetBSD.org/src/rev/1a78414185fb
branches:  trunk
changeset: 447105:1a78414185fb
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Dec 31 13:05:07 2018 +0000

description:
more xorg-server 1.20 updates:

- more -Wno-error for deprecated functions
- add missing header paths

diffstat:

 external/mit/xorg/server/drivers/xf86-video-intel/Makefile   |  3 ++-
 external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile |  6 ++++--
 external/mit/xorg/server/xorg-server/xkb/Makefile            |  3 ++-
 external/mit/xorg/server/xorg-server/xkbstubs/Makefile       |  3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r bdd0275698c4 -r 1a78414185fb external/mit/xorg/server/drivers/xf86-video-intel/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Mon Dec 31 12:45:19 2018 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Mon Dec 31 13:05:07 2018 +0000
@@ -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.sna_display.c+=          -Wno-error      # XXX deprecated
 COPTS.intel_driver.c+=         -Wno-error      # XXX deprecated
+COPTS.intel_display.c+=                -Wno-error      # XXX deprecated
diff -r bdd0275698c4 -r 1a78414185fb external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile      Mon Dec 31 12:45:19 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile      Mon Dec 31 13:05:07 2018 +0000
@@ -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 @@
                -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
 
diff -r bdd0275698c4 -r 1a78414185fb external/mit/xorg/server/xorg-server/xkb/Makefile
--- a/external/mit/xorg/server/xorg-server/xkb/Makefile Mon Dec 31 12:45:19 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/xkb/Makefile Mon Dec 31 13:05:07 2018 +0000
@@ -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 @@
 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 \
diff -r bdd0275698c4 -r 1a78414185fb external/mit/xorg/server/xorg-server/xkbstubs/Makefile
--- a/external/mit/xorg/server/xorg-server/xkbstubs/Makefile    Mon Dec 31 12:45:19 2018 +0000
+++ b/external/mit/xorg/server/xorg-server/xkbstubs/Makefile    Mon Dec 31 13:05:07 2018 +0000
@@ -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 @@
 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 \