[src/trunk]: src/external/mit/xorg/server/xorg-server remove additional -DHAV...

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

details:   https://anonhg.NetBSD.org/src/rev/7e6e5a52903d
branches:  trunk
changeset: 954948:7e6e5a52903d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Sep 13 23:01:02 2020 +0000

description:
remove additional -DHAVE_DIX_CONFIG_H.

add ${X11FLAGS.DIX} ${X11INCS.DIX} to record.  fixes build on riscv64.

diffstat:

 external/mit/xorg/server/xorg-server/Xext/Makefile            |  3 +--
 external/mit/xorg/server/xorg-server/fb/Makefile.fb           |  6 ++----
 external/mit/xorg/server/xorg-server/hw/vfb/Makefile          |  3 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile |  5 ++---
 external/mit/xorg/server/xorg-server/record/Makefile          |  6 +++++-
 5 files changed, 11 insertions(+), 12 deletions(-)

diffs (95 lines):

diff -r d4512ee3f600 -r 7e6e5a52903d external/mit/xorg/server/xorg-server/Xext/Makefile
--- a/external/mit/xorg/server/xorg-server/Xext/Makefile        Sun Sep 13 21:44:03 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/Xext/Makefile        Sun Sep 13 23:01:02 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2016/08/20 01:03:34 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2020/09/13 23:01:02 mrg Exp $
 
 LIBISPRIVATE=  yes
 LIB=           Xext
@@ -28,7 +28,6 @@
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/miext/sync
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/composite
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/damageext
-#CPPFLAGS+=    -DHAVE_DIX_CONFIG_H
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/../include ${X11FLAGS.DIX}
 
 .PATH:         ${X11SRCDIR.xorg-server}/Xext
diff -r d4512ee3f600 -r 7e6e5a52903d external/mit/xorg/server/xorg-server/fb/Makefile.fb
--- a/external/mit/xorg/server/xorg-server/fb/Makefile.fb       Sun Sep 13 21:44:03 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/fb/Makefile.fb       Sun Sep 13 23:01:02 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.fb,v 1.12 2020/08/09 15:02:52 tsutsui Exp $
+#      $NetBSD: Makefile.fb,v 1.13 2020/09/13 23:01:02 mrg Exp $
 
 .PATH:         ${X11SRCDIR.xorg-server}/fb
 SRCS.fb=       fballpriv.c     \
@@ -30,13 +30,11 @@
                fbutil.c        \
                fbwindow.c
 
-CPPFLAGS+=     ${X11FLAGS.DIX} ${X11INCS.DIX} -DHAVE_DIX_CONFIG_H
+CPPFLAGS+=     ${X11FLAGS.DIX} ${X11INCS.DIX}
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${DESTDIR}${X11INCDIR}/xorg
 
-CPPFLAGS+=     -DHAVE_DIX_CONFIG_H
-
 # XXX
 COPTS.fbpict.c=                -Wno-error
 COPTS.fbwindow.c=      -Wno-error
diff -r d4512ee3f600 -r 7e6e5a52903d external/mit/xorg/server/xorg-server/hw/vfb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Sun Sep 13 21:44:03 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Sun Sep 13 23:01:02 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2020/08/05 15:48:09 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.20 2020/09/13 23:01:02 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -25,7 +25,6 @@
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${DESTDIR}${X11INCDIR}/xorg \
                -I${X11SRCDIR.xorg-server}/render \
-               -DHAVE_DIX_CONFIG_H \
                -UGLXEXT
 
 CPPFLAGS+=     ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
diff -r d4512ee3f600 -r 7e6e5a52903d external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Sun Sep 13 21:44:03 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile     Sun Sep 13 23:01:02 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2019/04/16 21:20:52 mrg Exp $
+#      $NetBSD: Makefile,v 1.18 2020/09/13 23:01:02 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -21,8 +21,7 @@
                -I${DESTDIR}${X11INCDIR}/libdrm \
                -I${DESTDIR}${X11INCDIR}/pixman-1 \
                -I${DESTDIR}${X11INCDIR}/xorg \
-               -I${X11SRCDIR.xorg-server}/render \
-               -DHAVE_DIX_CONFIG_H
+               -I${X11SRCDIR.xorg-server}/render
 
 CPPFLAGS+=     ${X11FLAGS.OS_DEFINES} ${X11FLAGS.DIX} \
                ${X11FLAGS.EXTENSION}
diff -r d4512ee3f600 -r 7e6e5a52903d external/mit/xorg/server/xorg-server/record/Makefile
--- a/external/mit/xorg/server/xorg-server/record/Makefile      Sun Sep 13 21:44:03 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/record/Makefile      Sun Sep 13 23:01:02 2020 +0000
@@ -1,9 +1,13 @@
-#      $NetBSD: Makefile,v 1.2 2008/08/10 06:42:39 rtr Exp $
+#      $NetBSD: Makefile,v 1.3 2020/09/13 23:01:02 mrg Exp $
 
 LIBISPRIVATE=  yes
 
 .include "../Makefile.serverlib"
 
+CPPFLAGS+=      -I${DESTDIR}${X11INCDIR}/xorg
+
+CPPFLAGS+=      ${X11FLAGS.DIX} ${X11INCS.DIX}
+
 LIB=   record
 SRCS=  ${SRCS.record}