Module Name: src
Committed By: mrg
Date: Tue Aug 16 01:03:07 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk bsd.x11.mk
Log Message:
add a HAVE_XORG_SERVER_VER for use in sets. clean up the x11
defines a little for modern xorg, particularly the version.
To generate a diff of this commit:
cvs rdiff -u -r1.940 -r1.941 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.119 -r1.120 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.own.mk
diff -u src/share/mk/bsd.own.mk:1.940 src/share/mk/bsd.own.mk:1.941
--- src/share/mk/bsd.own.mk:1.940 Mon Aug 15 21:52:46 2016
+++ src/share/mk/bsd.own.mk Tue Aug 16 01:03:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.940 2016/08/15 21:52:46 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.941 2016/08/16 01:03:07 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1389,7 +1389,9 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
.endfor
# During transition from xorg-server 1.10 to 1.18
-.if 0
+HAVE_XORG_SERVER_VER?=110
+
+.if ${HAVE_XORG_SERVER_VER:U0} == "118"
XORG_SERVER_SUBDIR?=xorg-server
.else
XORG_SERVER_SUBDIR?=xorg-server.old
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.119 src/share/mk/bsd.x11.mk:1.120
--- src/share/mk/bsd.x11.mk:1.119 Sun May 29 03:02:07 2016
+++ src/share/mk/bsd.x11.mk Tue Aug 16 01:03:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.119 2016/05/29 03:02:07 nakayama Exp $
+# $NetBSD: bsd.x11.mk,v 1.120 2016/08/16 01:03:07 mrg Exp $
.include <bsd.init.mk>
@@ -90,7 +90,7 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVE
X11FLAGS.EXTENSION+= -DXF86VIDMODE
# ServerDefines
-X11FLAGS.SERVER+= -DXINPUT -DXFreeXDGA -DXF86VIDMODE
+X11FLAGS.SERVER+= -DXINPUT -DXFreeXDGA -DXF86VIDMODE -DXSERVER_LIBPCIACCESS
.endif
.if ${MACHINE_ARCH} == "alpha" || \
@@ -117,17 +117,25 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64
X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_MODULE -DXFree86Module \
${${ACTIVE_CXX} == "gcc":? -fno-merge-constants :}
.endif
-
+
# XXX FIX ME
+XORG_SERVER_MAJOR= 1
+.if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
+XORG_SERVER_MINOR= 10
+XORG_SERVER_TEENY= 6
+.else
+XORG_SERVER_MINOR= 18
+XORG_SERVER_TEENY= 4
+.endif
+
XVENDORNAMESHORT= '"X.Org"'
XVENDORNAME= '"The X.Org Foundation"'
-XORG_RELEASE= '"Release 1.10.6"'
+XORG_RELEASE= '"Release ${XORG_SERVER_MAJOR}.${XORG_SERVER_MINOR}.${XORG_SERVER_TEENY}"'
__XKBDEFRULES__= '"xorg"'
XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
-# XXX oh yeah, fix me later
-XORG_VERSION_CURRENT="(((1) * 10000000) + ((10) * 100000) + ((6) * 1000) + 0)"
+XORG_VERSION_CURRENT="(((${XORG_SERVER_MAJOR}) * 10000000) + ((${XORG_SERVER_MINOR}) * 100000) + ((${XORG_SERVER_TEENY}) * 1000) + 0)"
PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
match($$1, "([0-9]+\\.)+[0-9]+"); \
