[src/trunk]: src/external/mit/xorg/server/drivers fixes for xorg-server 1.20:

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

details:   https://anonhg.NetBSD.org/src/rev/e1973dccc9b2
branches:  trunk
changeset: 447101:e1973dccc9b2
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Dec 31 11:58:43 2018 +0000

description:
fixes for xorg-server 1.20:

- XFree86LOADER is obsolete.
- some deprecated functions are used, we should fix them.

diffstat:

 external/mit/xorg/server/drivers/Makefile.xf86-driver         |  5 ++---
 external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile |  5 +++--
 external/mit/xorg/server/drivers/xf86-input-ws/Makefile       |  4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 27ef2ef88037 -r e1973dccc9b2 external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver     Mon Dec 31 11:19:58 2018 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver     Mon Dec 31 11:58:43 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xf86-driver,v 1.24 2016/10/08 20:08:57 mrg Exp $
+#      $NetBSD: Makefile.xf86-driver,v 1.25 2018/12/31 11:58:43 mrg Exp $
 
 LIBISMODULE=   yes
 SHLIB_MAJOR=   ${PACKAGE_MAJOR}
@@ -37,8 +37,7 @@
                -DHAVE_XORG_SERVER_1_1_0 \
                -DSERVER_1_5 \
                -DXSERVER_LIBPCIACCESS \
-               -DHAVE_XEXTPROTO_71 \
-               -DXFree86LOADER
+               -DHAVE_XEXTPROTO_71
 
 .if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 CPPFLAGS+=     -DHAVE_XAA_H
diff -r 27ef2ef88037 -r e1973dccc9b2 external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
--- a/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile     Mon Dec 31 11:19:58 2018 +0000
+++ b/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile     Mon Dec 31 11:58:43 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2013/01/12 18:32:12 macallan Exp $
+#      $NetBSD: Makefile,v 1.16 2018/12/31 11:58:43 mrg Exp $
 
 DRIVER=                xf86-input-keyboard
 DRIVER_NAME=   kbd_drv
@@ -26,6 +26,7 @@
 
 X11EXTRAMANDEFS+=      -e 's,__xkb_path__,${X11LIBDIR}/xkb,g'
 
-COPTS.kbd.c=      -Wno-error   # XXX deprecated
+COPTS.kbd.c=           -Wno-error      # XXX deprecated
+COPTS.bsd_kbd.c=       -Wno-error      # XXX deprecated
 
 .include "../Makefile.xf86-driver"
diff -r 27ef2ef88037 -r e1973dccc9b2 external/mit/xorg/server/drivers/xf86-input-ws/Makefile
--- a/external/mit/xorg/server/drivers/xf86-input-ws/Makefile   Mon Dec 31 11:19:58 2018 +0000
+++ b/external/mit/xorg/server/drivers/xf86-input-ws/Makefile   Mon Dec 31 11:58:43 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2012/03/22 23:46:27 joerg Exp $
+#      $NetBSD: Makefile,v 1.4 2018/12/31 11:58:43 mrg Exp $
 
 WARNS?=                2
 
@@ -14,4 +14,6 @@
 
 CWARNFLAGS.clang+=     -Wno-parentheses-equality
 
+COPTS.emumb.c=         -Wno-error      # XXX deprecated
+
 .include "../Makefile.xf86-driver"