Module Name: src
Committed By: tsutsui
Date: Sat Jul 18 16:07:15 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6 Sat Jul 18 15:26:30 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Sat Jul 18 16:07:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $
.include <bsd.own.mk>
@@ -63,7 +63,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.miext/damage} \
${LDADD.miext/sync} \
${LDADD.Xi} \
- -lXfont \
+ -lXfont2 \
-lpixman-1 \
-lXext \
-lX11 \
@@ -84,7 +84,7 @@ DPADD+= ${LDADD.dix} \
${DPADD.miext/damage} \
${DPADD.miext/sync} \
${DPADD.Xi} \
- ${LIBXFONT} \
+ ${LIBXFONT2} \
${LIBPIXMAN-1} \
${LIBXEXT} \
${LIBX11} \
