Module Name: src
Committed By: nia
Date: Sun Dec 5 22:59:32 UTC 2021
Modified Files:
src/external/mit/xorg/server/xorg-server/config: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/config/Makefile
cvs rdiff -u -r1.33 -r1.34 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/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/xorg-server/config/Makefile
diff -u src/external/mit/xorg/server/xorg-server/config/Makefile:1.2 src/external/mit/xorg/server/xorg-server/config/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server/config/Makefile:1.2 Thu Aug 11 08:32:42 2016
+++ src/external/mit/xorg/server/xorg-server/config/Makefile Sun Dec 5 22:59:32 2021
@@ -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 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/in
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include
+CPPFLAGS+= -DCONFIG_WSCONS
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.33 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.34
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.33 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Sun Dec 5 22:59:32 2021
@@ -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+= -DPCCONS_SUPPORT -DPCVT_SUPPO
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 \
