Sat Jul 18 16:07:15 2020 UTC ()
Xorg 1.20 servers require libXfont2 instead of libXfont.

Per the following upstream commit:
 https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7
 > dix: Switch to the libXfont2 API (v2)

Now Xorg 1.20 based X68k server builds and confirmed working on XM6i.


(tsutsui)
diff -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs diff -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile 2020/07/18 15:26:30 1.6
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile 2020/07/18 16:07:15 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= X68k 5PROG= X68k
6BINMODE= 4711 6BINMODE= 4711
7 7
8SYMLINKS= ${X11BINDIR}/X68k ${X11BINDIR}/X 8SYMLINKS= ${X11BINDIR}/X68k ${X11BINDIR}/X
9 9
10FILES= X68kConfig 10FILES= X68kConfig
11FILESDIR= ${X11ETCDIR} 11FILESDIR= ${X11ETCDIR}
12 12
13.include "../../../Makefile.serverlib" 13.include "../../../Makefile.serverlib"
14.include "../../../Makefile.servermod" 14.include "../../../Makefile.servermod"
@@ -53,43 +53,43 @@ LDADD+= ${LDADD.dix} \ @@ -53,43 +53,43 @@ LDADD+= ${LDADD.dix} \
53 ${LDADD.mi} \ 53 ${LDADD.mi} \
54 ${LDADD.xkb} \ 54 ${LDADD.xkb} \
55 ${LDADD.xkbstubs} \ 55 ${LDADD.xkbstubs} \
56 ${LDADD.randr} \ 56 ${LDADD.randr} \
57 ${LDADD.Xext} \ 57 ${LDADD.Xext} \
58 ${LDADD.composite} \ 58 ${LDADD.composite} \
59 ${LDADD.render} \ 59 ${LDADD.render} \
60 ${LDADD.os} \ 60 ${LDADD.os} \
61 ${LDADD.xfixes} \ 61 ${LDADD.xfixes} \
62 ${LDADD.damageext} \ 62 ${LDADD.damageext} \
63 ${LDADD.miext/damage} \ 63 ${LDADD.miext/damage} \
64 ${LDADD.miext/sync} \ 64 ${LDADD.miext/sync} \
65 ${LDADD.Xi} \ 65 ${LDADD.Xi} \
66 -lXfont \ 66 -lXfont2 \
67 -lpixman-1 \ 67 -lpixman-1 \
68 -lXext \ 68 -lXext \
69 -lX11 \ 69 -lX11 \
70 -lz \ 70 -lz \
71 -lm 71 -lm
72 72
73DPADD+= ${LDADD.dix} \ 73DPADD+= ${LDADD.dix} \
74 ${DPADD.fb} \ 74 ${DPADD.fb} \
75 ${DPADD.mi} \ 75 ${DPADD.mi} \
76 ${DPADD.xkb} \ 76 ${DPADD.xkb} \
77 ${DPADD.randr} \ 77 ${DPADD.randr} \
78 ${DPADD.Xext} \ 78 ${DPADD.Xext} \
79 ${DPADD.composite} \ 79 ${DPADD.composite} \
80 ${DPADD.render} \ 80 ${DPADD.render} \
81 ${DPADD.os} \ 81 ${DPADD.os} \
82 ${DPADD.xfixes} \ 82 ${DPADD.xfixes} \
83 ${DPADD.damageext} \ 83 ${DPADD.damageext} \
84 ${DPADD.miext/damage} \ 84 ${DPADD.miext/damage} \
85 ${DPADD.miext/sync} \ 85 ${DPADD.miext/sync} \
86 ${DPADD.Xi} \ 86 ${DPADD.Xi} \
87 ${LIBXFONT} \ 87 ${LIBXFONT2} \
88 ${LIBPIXMAN-1} \ 88 ${LIBPIXMAN-1} \
89 ${LIBXEXT} \ 89 ${LIBXEXT} \
90 ${LIBX11} \ 90 ${LIBX11} \
91 ${LIBZ} \ 91 ${LIBZ} \
92 ${LIBM} 92 ${LIBM}
93 93
94.include <bsd.x11.mk> 94.include <bsd.x11.mk>
95.include <bsd.prog.mk> 95.include <bsd.prog.mk>