Module Name: src
Committed By: martin
Date: Mon Nov 27 19:50:37 UTC 2023
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard [netbsd-9]:
Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1766):
external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile: revision
1.23 (via patch)
xf86-input-keyboard: add build glue to enable USE_WSKBD_GETMAP.
To generate a diff of this commit:
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16.2.1 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16.2.2
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16.2.1 Tue Jun 1 10:36:32 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Mon Nov 27 19:50:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16.2.1 2021/06/01 10:36:32 martin Exp $
+# $NetBSD: Makefile,v 1.16.2.2 2023/11/27 19:50:37 martin Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -16,6 +16,7 @@ CPPFLAGS+= -DPCVT_SUPPORT
.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || ${MACHINE} == "sgimips" || \
${MACHINE} == "shark" || ${MACHINE} == "vax" || \
+ ${MACHINE} == "ews4800mips" || ${MACHINE} == "newsmips" || \
${MACHINE} == "evbarm" || ${MACHINE} == "mac68k"
CPPFLAGS+= -DDEFAULT_TO_WSKBD
.endif
@@ -24,6 +25,14 @@ CPPFLAGS+= -DWSCONS_SUPPORT
CPPFLAGS+= -DXKB
CPPFLAGS.kbd.c= -D__XKBDEFRULES__=${__XKBDEFRULES__}
+.if \
+ ${MACHINE} == "ews4800mips" || \
+ ${MACHINE} == "newsmips" || \
+ 0
+CPPFLAGS+= -DUSE_WSKBD_GETMAP
+SRCS+= ws_KbdMap.c
+.endif
+
X11EXTRAMANDEFS+= -e 's,__xkb_path__,${X11LIBDIR}/xkb,g'
COPTS.kbd.c= -Wno-error # XXX deprecated
