Module Name: src
Committed By: mrg
Date: Mon Dec 31 11:58:43 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile
Log Message:
fixes for xorg-server 1.20:
- XFree86LOADER is obsolete.
- some deprecated functions are used, we should fix them.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-input-ws/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/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.25
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24 Sat Oct 8 20:08:57 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Mon Dec 31 11:58:43 2018
@@ -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 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-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
Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.15 Sat Jan 12 18:32:12 2013
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Mon Dec 31 11:58:43 2018
@@ -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 @@ CPPFLAGS.kbd.c= -D__XKBDEFRULES__=${__XK
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"
Index: src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.3 Thu Mar 22 23:46:27 2012
+++ src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile Mon Dec 31 11:58:43 2018
@@ -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 @@ CPPFLAGS+= -DHAVE_CONFIG_H \
CWARNFLAGS.clang+= -Wno-parentheses-equality
+COPTS.emumb.c= -Wno-error # XXX deprecated
+
.include "../Makefile.xf86-driver"
