From a136ed1ef05f83a07f6051844534b97a1a600a73 Mon Sep 17 00:00:00 2001 From: mrg Date: Fri, 24 Feb 2023 17:08:31 +0000 Subject: 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. --- external/mit/xorg/lib/freetype/Makefile | 5 ++++- external/mit/xorg/tools/fc-cache/Makefile | 3 +-- external/mit/xorg/tools/mkfontscale/Makefile | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'external/mit') diff --git a/external/mit/xorg/lib/freetype/Makefile b/external/mit/xorg/lib/freetype/Makefile index 5fa87d4ff83..a4c44757a92 100644 --- a/external/mit/xorg/lib/freetype/Makefile +++ b/external/mit/xorg/lib/freetype/Makefile @@ -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 diff --git a/external/mit/xorg/tools/fc-cache/Makefile b/external/mit/xorg/tools/fc-cache/Makefile index 657229945f8..f5df9703e2f 100644 --- a/external/mit/xorg/tools/fc-cache/Makefile +++ b/external/mit/xorg/tools/fc-cache/Makefile @@ -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 @@ -122,7 +122,6 @@ HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \ -I${FONTCONFIG}/../include HOST_CPPFLAGS+= -DXML_POOR_ENTROPY - HOST_CPPFLAGS+= -DTOOL_FCCACHE LDADD= -lz diff --git a/external/mit/xorg/tools/mkfontscale/Makefile b/external/mit/xorg/tools/mkfontscale/Makefile index ee464f872b0..c88dc1b099d 100644 --- a/external/mit/xorg/tools/mkfontscale/Makefile +++ b/external/mit/xorg/tools/mkfontscale/Makefile @@ -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 @@ -94,5 +94,7 @@ HOST_CPPFLAGS+= -I${FREETYPE}/include -I${FREETYPE}/include/freetype \ -I${DESTDIR}${X11INCDIR} \ -I${DESTDIR}${X11INCDIR}/freetype2 +HOST_CPPFLAGS+= -DTOOL_FCCACHE + .include .include -- cgit