[src/trunk]: src/external/mit/xorg/server/xorg-server xorg-server: Enable wsc...

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

details:   https://anonhg.NetBSD.org/src/rev/b7ec7dd9852f
branches:  trunk
changeset: 1026762:b7ec7dd9852f
user:      nia <nia%NetBSD.org@localhost>
date:      Sun Dec 05 22:59:32 2021 +0000

description:
xorg-server: Enable wscons-based autoconfiguration.

This gets us features like automatic configuration of touchscreens,
and X's default keyboard layout matching the console's.

diffstat:

 external/mit/xorg/server/xorg-server/config/Makefile            |  4 +++-
 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r 94b268bf522f -r b7ec7dd9852f external/mit/xorg/server/xorg-server/config/Makefile
--- a/external/mit/xorg/server/xorg-server/config/Makefile      Sun Dec 05 22:37:58 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/config/Makefile      Sun Dec 05 22:59:32 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2016/08/11 08:32:42 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2021/12/05 22:59:32 nia Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -17,5 +17,7 @@
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${X11SRCDIR.xorg-server}/../include
 
+CPPFLAGS+=     -DCONFIG_WSCONS
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 94b268bf522f -r b7ec7dd9852f external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Sun Dec 05 22:37:58 2021 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Sun Dec 05 22:59:32 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.33 2018/12/31 11:14:04 mrg Exp $
+#      $NetBSD: Makefile,v 1.34 2021/12/05 22:59:32 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -82,6 +82,8 @@
 CPPFLAGS+=     -DPCVT_SUPPORT
 .endif
 
+CPPFLAGS+=     -DCONFIG_WSCONS
+
 OS_RELEASE!=   ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
 
 DRIVERS=       mga glint nv tga s3 s3virge sis rendition neomagic \