[src/trunk]: src/external/mit/xorg/server set XFree86LOADER for all xorg-serv...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8e74d2d1b6c9
branches:  trunk
changeset: 818336:8e74d2d1b6c9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Oct 08 20:08:57 2016 +0000

description:
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.

diffstat:

 external/mit/xorg/server/drivers/Makefile.xf86-driver            |  7 ++++---
 external/mit/xorg/server/drivers/xf86-video-intel/Makefile       |  3 +--
 external/mit/xorg/server/drivers/xf86-video-vesa/Makefile        |  3 +--
 external/mit/xorg/server/drivers/xf86-video-vmware/Makefile      |  3 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile  |  4 ++--
 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile |  4 +---
 external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile    |  4 ++--
 7 files changed, 12 insertions(+), 16 deletions(-)

diffs (127 lines):

diff -r e7204ab8d48f -r 8e74d2d1b6c9 external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver     Sat Oct 08 20:03:04 2016 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver     Sat Oct 08 20:08:57 2016 +0000
@@ -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 @@
                -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}
diff -r e7204ab8d48f -r 8e74d2d1b6c9 external/mit/xorg/server/drivers/xf86-video-intel/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Sat Oct 08 20:03:04 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile        Sat Oct 08 20:08:57 2016 +0000
@@ -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+=     -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
diff -r e7204ab8d48f -r 8e74d2d1b6c9 external/mit/xorg/server/drivers/xf86-video-vesa/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile Sat Oct 08 20:03:04 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-vesa/Makefile Sat Oct 08 20:08:57 2016 +0000
@@ -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 @@
 MAN=           vesa.4
 
 COPTS.vesa.c+= -Wno-error
-CPPFLAGS+=-DXFree86LOADER
 
 .include "../Makefile.xf86-driver"
diff -r e7204ab8d48f -r 8e74d2d1b6c9 external/mit/xorg/server/drivers/xf86-video-vmware/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile       Sat Oct 08 20:03:04 2016 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-vmware/Makefile       Sat Oct 08 20:08:57 2016 +0000
@@ -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 @@
 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
diff -r e7204ab8d48f -r 8e74d2d1b6c9 external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Sat Oct 08 20:03:04 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile   Sat Oct 08 20:08:57 2016 +0000
@@ -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+=     ${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"' \
diff -r e7204ab8d48f -r 8e74d2d1b6c9 external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile  Sat Oct 08 20:03:04 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile  Sat Oct 08 20:08:57 2016 +0000
@@ -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+= \
        ${X11FLAGS.EXTENSION} \
-       -DXFree86LOADER
-CPPFLAGS+= \
        -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
 
 SUBDIR = \
diff -r e7204ab8d48f -r 8e74d2d1b6c9 external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile     Sat Oct 08 20:03:04 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile     Sat Oct 08 20:08:57 2016 +0000
@@ -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+=     ${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"' \