Module Name: src
Committed By: mrg
Date: Sat Oct 8 20:08:57 UTC 2016
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vesa: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
Log Message:
set XFree86LOADER for all xorg-server driver builds again,
it's still needed for many drivers and would normally be
set in xorg-server.h.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/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/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.23 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.23 Mon Sep 26 22:37:31 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.23 2016/09/26 22:37:31 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.24 2016/10/08 20:08:57 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -37,10 +37,11 @@ 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 -DXFree86LOADER
+CPPFLAGS+= -DHAVE_XAA_H
.endif
CPPFLAGS+= -DPACKAGE_VERSION_MAJOR=${PACKAGE_MAJOR}
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.24 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.25
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.24 Mon Sep 19 19:15:04 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/09/19 19:15:04 christos Exp $
+# $NetBSD: Makefile,v 1.25 2016/10/08 20:08:57 mrg Exp $
.include <bsd.own.mk>
@@ -178,7 +178,6 @@ CPPFLAGS+= -DUMS=1
CPPFLAGS+= -DUSE_BACKLIGHT=1
CPPFLAGS+= -DUSE_SNA=1
CPPFLAGS+= -DUSE_UXA=1
-CPPFLAGS+= -DXFree86LOADER
# XXX This should not be hard-coded here...
DRI_DRIVER_PATH= /usr/X11R7/lib/modules/dri
Index: src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile:1.6 Tue Sep 27 02:33:16 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/09/27 02:33:16 christos Exp $
+# $NetBSD: Makefile,v 1.7 2016/10/08 20:08:57 mrg Exp $
DRIVER= xf86-video-vesa
DRIVER_NAME= vesa_drv
@@ -7,6 +7,5 @@ SRCS= vesa.c
MAN= vesa.4
COPTS.vesa.c+= -Wno-error
-CPPFLAGS+=-DXFree86LOADER
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.12
--- src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile:1.11 Sat Oct 8 10:21:18 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/10/08 10:21:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2016/10/08 20:08:57 mrg Exp $
DRIVER= xf86-video-vmware
DRIVER_NAME= vmware_drv
@@ -19,7 +19,6 @@ MAN= vmware.4
CPPFLAGS+= -DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H \
-I${DESTDIR}${X11INCDIR}/libdrm
-CPPFLAGS+= -DXFree86LOADER
# XXX
COPTS.vmware.c+= -Wno-error
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.27 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.28
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.27 Fri Sep 2 11:38:01 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2016/09/02 11:38:01 jakllsch Exp $
+# $NetBSD: Makefile,v 1.28 2016/10/08 20:08:57 mrg Exp $
.include <bsd.own.mk>
@@ -81,7 +81,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
${X11FLAGS.DIX} \
- -DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
+ -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org";' \
-DXVENDORNAME='"The X.Org Foundation"' \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.13 src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.14
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile:1.13 Sat Aug 20 01:03:34 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/08/20 01:03:34 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2016/10/08 20:08:57 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -19,8 +19,6 @@ CPPFLAGS+= \
CPPFLAGS+= \
${X11FLAGS.EXTENSION} \
- -DXFree86LOADER
-CPPFLAGS+= \
-I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
SUBDIR = \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.10 src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.10 Thu Aug 11 08:32:43 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Sat Oct 8 20:08:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/11 08:32:43 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/10/08 20:08:57 mrg Exp $
.include <bsd.own.mk>
@@ -40,7 +40,7 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
CPPFLAGS+= ${X11FLAGS.EXTENSION} ${X11FLAGS.OS_DEFINES} \
${X11FLAGS.DIX} \
- -DXFree86LOADER -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
+ -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
-D__XSERVERNAME__='"Xorg"' -D__XCONFIGFILE__='"xorg.conf"' \
-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org";' \
-DXVENDORNAME='"The X.Org Foundation"' \
