Module Name: src
Committed By: mrg
Date: Fri Feb 24 17:08:31 UTC 2023
Modified Files:
src/external/mit/xorg/lib/freetype: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
arrange for ftoption.h to define FT_CONFIG_OPTION_USE_BROTLI but not for tools
guard the definition in ftoption.h with #ifndef TOOL_FCCACHE, and build the
tools portions with this defined if not already set.
this fixes building pkgsrc blender with native x11.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/freetype/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/tools/mkfontscale/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/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.23 src/external/mit/xorg/lib/freetype/Makefile:1.24
--- src/external/mit/xorg/lib/freetype/Makefile:1.23 Tue Nov 16 09:25:51 2021
+++ src/external/mit/xorg/lib/freetype/Makefile Fri Feb 24 17:08:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/11/16 09:25:51 nia Exp $
+# $NetBSD: Makefile,v 1.24 2023/02/24 17:08:31 mrg Exp $
USE_FORT?= yes # data-driven bugs?
@@ -103,6 +103,9 @@ LIBDPLIBS= \
z ${.CURDIR}/../../../../../lib/libz \
bz2 ${.CURDIR}/../../../../../lib/libbz2
+.include "../brotli/brotli.mk"
+CPPFLAGS+= -I${X11SRCDIR.brotli}/c/include
+
PKGCONFIG= freetype2
PKGDIST.freetype2= ${.CURDIR}
PKGCONFIG_VERSION.freetype2= 23:0:17
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.21 src/external/mit/xorg/tools/fc-cache/Makefile:1.22
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.21 Thu Jan 19 17:07:38 2023
+++ src/external/mit/xorg/tools/fc-cache/Makefile Fri Feb 24 17:08:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2023/01/19 17:07:38 martin Exp $
+# $NetBSD: Makefile,v 1.22 2023/02/24 17:08:31 mrg Exp $
.include <bsd.hostinit.mk>
@@ -122,7 +122,6 @@ HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREE
-I${FONTCONFIG}/../include
HOST_CPPFLAGS+= -DXML_POOR_ENTROPY
-
HOST_CPPFLAGS+= -DTOOL_FCCACHE
LDADD= -lz
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.16 src/external/mit/xorg/tools/mkfontscale/Makefile:1.17
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.16 Fri Sep 9 19:15:20 2022
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Fri Feb 24 17:08:31 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/09/09 19:15:20 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2023/02/24 17:08:31 mrg Exp $
.include <bsd.hostinit.mk>
@@ -94,5 +94,7 @@ HOST_CPPFLAGS+= -I${FREETYPE}/include -I
-I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
+HOST_CPPFLAGS+= -DTOOL_FCCACHE
+
.include <bsd.x11.mk>
.include <bsd.hostprog.mk>
