Module Name: src
Committed By: mrg
Date: Thu Jan 3 23:25:53 UTC 2019
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/share/mk: bsd.x11.mk
Log Message:
move some defines from xorg-server dix-config.h back into makefiles,
so that Xx68k can build.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.126 -r1.127 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/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.25 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.26
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.25 Mon Dec 31 11:58:43 2018
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Thu Jan 3 23:25:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.25 2018/12/31 11:58:43 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.26 2019/01/03 23:25:52 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -37,7 +37,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \
-DXSERVER_LIBPCIACCESS \
- -DHAVE_XEXTPROTO_71
+ -DHAVE_XEXTPROTO_71 \
+ -DXFree86LOADER
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DHAVE_XAA_H
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.126 src/share/mk/bsd.x11.mk:1.127
--- src/share/mk/bsd.x11.mk:1.126 Mon Dec 31 11:19:58 2018
+++ src/share/mk/bsd.x11.mk Thu Jan 3 23:25:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.126 2018/12/31 11:19:58 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.127 2019/01/03 23:25:53 mrg Exp $
.include <bsd.init.mk>
@@ -44,7 +44,7 @@ X11FLAGS.EXTENSION= ${X11FLAGS.BASE_EXTE
${X11FLAGS.PERVASIVE_EXTENSION}
X11FLAGS.DIX= -DHAVE_DIX_CONFIG_H -D_BSD_SOURCE -DHAS_FCHOWN \
- -DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS \
+ -DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS=200112L \
-DHAVE_XORG_CONFIG_H
X11INCS.DIX= -I${X11INCSDIR}/freetype2 \
-I${X11INCSDIR}/pixman-1 \
@@ -88,7 +88,6 @@ 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
@@ -96,7 +95,6 @@ X11FLAGS.DIX+= -DDBE -DXRECORD -DPRESEN
# ServerDefines
X11FLAGS.SERVER+= -DXFreeXDGA -DXF86VIDMODE
X11FLAGS.SERVER+= -DXINPUT -DXSERVER_LIBPCIACCESS
-. endif
.endif
.if ${MACHINE_ARCH} == "alpha" || \
