Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
mrg 2016-10-08 20:08:57 +00:00
parent 7c397bf711
commit 9b1f020a53
7 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
external/mit/xorg/server/drivers/Makefile.xf86-driver vendored
View File

@ -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}

3
external/mit/xorg/server/drivers/xf86-video-intel/Makefile vendored
View File

@ -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

3
external/mit/xorg/server/drivers/xf86-video-vesa/Makefile vendored
View File

@ -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"

3
external/mit/xorg/server/drivers/xf86-video-vmware/Makefile vendored
View File

@ -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

4
external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile vendored
View File

@ -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/xfree86/common \
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"' \

4
external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile vendored
View File

@ -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 = \

4
external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile vendored
View File

@ -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/xfree86/common \
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"' \