Module Name: src
Committed By: mrg
Date: Mon Dec 31 11:19:58 UTC 2018
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
updates for xorg-server 1.20. don't define stuff here for it.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.125 src/share/mk/bsd.x11.mk:1.126
--- src/share/mk/bsd.x11.mk:1.125 Sun Mar 4 23:47:55 2018
+++ src/share/mk/bsd.x11.mk Mon Dec 31 11:19:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.125 2018/03/04 23:47:55 christos Exp $
+# $NetBSD: bsd.x11.mk,v 1.126 2018/12/31 11:19:58 mrg Exp $
.include <bsd.init.mk>
@@ -88,12 +88,15 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVE
${MACHINE} == "x68k" || \
${MACHINE} == "vax")
# EXT_DEFINES
+. if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
X11FLAGS.EXTENSION+= -DXF86VIDMODE
X11FLAGS.DIX+= -DDBE -DXRECORD -DPRESENT
# ServerDefines
-X11FLAGS.SERVER+= -DXINPUT -DXFreeXDGA -DXF86VIDMODE -DXSERVER_LIBPCIACCESS
+X11FLAGS.SERVER+= -DXFreeXDGA -DXF86VIDMODE
+X11FLAGS.SERVER+= -DXINPUT -DXSERVER_LIBPCIACCESS
+. endif
.endif
.if ${MACHINE_ARCH} == "alpha" || \
@@ -132,8 +135,8 @@ XORG_SERVER_MAJOR= 1
XORG_SERVER_MINOR= 10
XORG_SERVER_TEENY= 6
.else
-XORG_SERVER_MINOR= 18
-XORG_SERVER_TEENY= 4
+XORG_SERVER_MINOR= 20
+XORG_SERVER_TEENY= 3
.endif
XVENDORNAMESHORT= '"X.Org"'
