[src/trunk]: src/external/mit/xorg/server/xorg-server/hw/xnest No need to bui...

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

details:   https://anonhg.NetBSD.org/src/rev/565a60ae34e5
branches:  trunk
changeset: 937021:565a60ae34e5
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Aug 05 15:48:09 2020 +0000

description:
No need to build fbcmap_mi.c in each DDX server.

Per upstream commit:
 https://cgit.freedesktop.org/xorg/xserver/commit/?id=432fc37e2ca833f1ec3cb614cbdc3a7ae13f22b7
> Build fbcmap_mi.c once, rather than once for each DDX, and make it part of libfb
> or libwfb convenience library.

Tested on sun3 and x68k.

diffstat:

 external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile |  5 +----
 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun    |  5 +----
 external/mit/xorg/server/xorg-server/hw/vfb/Makefile         |  6 +-----
 external/mit/xorg/server/xorg-server/hw/xnest/Makefile       |  5 ++---
 4 files changed, 5 insertions(+), 16 deletions(-)

diffs (77 lines):

diff -r 269009e67d09 -r 565a60ae34e5 external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Wed Aug 05 15:40:46 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Wed Aug 05 15:48:09 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2020/07/22 21:25:03 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.9 2020/08/05 15:48:09 tsutsui Exp $
 
 .include <bsd.own.mk>
 
@@ -25,9 +25,6 @@
 .PATH: ${X11SRCDIR.xorg-server}/mi
 SRCS+= miinitext.c
 
-.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS+= fbcmap_mi.c
-
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
                ${X11INCS.DIX}
 
diff -r 269009e67d09 -r 565a60ae34e5 external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun
--- a/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Wed Aug 05 15:40:46 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun Wed Aug 05 15:48:09 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xsun,v 1.4 2020/08/04 14:31:58 tsutsui Exp $
+#      $NetBSD: Makefile.Xsun,v 1.5 2020/08/05 15:48:09 tsutsui Exp $
 
 .include <bsd.own.mk>
 
@@ -70,9 +70,6 @@
 .PATH:  ${X11SRCDIR.xorg-server}/Xi
 SRCS+=  stubs.c
 
-.PATH: ${X11SRCDIR.xorg-server}/fb
-SRCS+= fbcmap_mi.c
-
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/hw/sun \
                ${X11INCS.DIX}
 
diff -r 269009e67d09 -r 565a60ae34e5 external/mit/xorg/server/xorg-server/hw/vfb/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Wed Aug 05 15:40:46 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/vfb/Makefile      Wed Aug 05 15:48:09 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2018/12/31 11:14:04 mrg Exp $
+#      $NetBSD: Makefile,v 1.19 2020/08/05 15:48:09 tsutsui Exp $
 
 .include <bsd.own.mk>
 
@@ -13,10 +13,6 @@
 .PATH:         ${X11SRCDIR.xorg-server}/mi
 SRCS=          InitInput.c InitOutput.c miinitext.c stubs.c
 
-# XXX should not be needed now
-#.PATH:                ${X11SRCDIR.xorg-server}/fb
-#SRCS+=                fbcmap_mi.c
-
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11 \
                -I${X11SRCDIR.xorg-server}/fb \
                -I${X11SRCDIR.xorg-server}/mfb \
diff -r 269009e67d09 -r 565a60ae34e5 external/mit/xorg/server/xorg-server/hw/xnest/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xnest/Makefile    Wed Aug 05 15:40:46 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xnest/Makefile    Wed Aug 05 15:48:09 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2020/07/20 13:59:57 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.23 2020/08/05 15:48:09 tsutsui Exp $
 
 .include <bsd.own.mk>
 
@@ -16,8 +16,7 @@
 SRCS=          Args.c Color.c Cursor.c Display.c Events.c Font.c \
                GC.c GCOps.c Handlers.c Init.c Keyboard.c \
                Pixmap.c Pointer.c Screen.c Visual.c Window.c \
-               stubs.c miinitext.c \
-               fbcmap_mi.c
+               stubs.c miinitext.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xorg-server}/hw/xnest \
                -I${DESTDIR}${X11INCDIR}/X11 \