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

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

Browse Source 
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.
This commit is contained in:
tsutsui 2020-08-05 15:48:09 +00:00
parent e6fcbe306d
commit 0d5c31706f
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile vendored
View File

@ -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 @@ SRCS+= stubs.c
.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}

5
external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun vendored
View File

@ -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 @@ SRCS+= sunFbs.c sunIo.c sunKbd.c sunKeyMap.c sunMouse.c
.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}

6
external/mit/xorg/server/xorg-server/hw/vfb/Makefile vendored
View File

@ -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 @@ PROG= Xvfb
.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 \

5
external/mit/xorg/server/xorg-server/hw/xnest/Makefile vendored
View File

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