[src/trunk]: src/external/mit/xorg arrange for ftoption.h to define FT_CONFIG...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f9ec32ec1ede
branches:  trunk
changeset: 373703:f9ec32ec1ede
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Feb 24 17:08:31 2023 +0000

description:
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.

diffstat:

 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(-)

diffs (53 lines):

diff -r e7665b70056f -r f9ec32ec1ede external/mit/xorg/lib/freetype/Makefile
--- a/external/mit/xorg/lib/freetype/Makefile   Fri Feb 24 12:47:23 2023 +0000
+++ b/external/mit/xorg/lib/freetype/Makefile   Fri Feb 24 17:08:31 2023 +0000
@@ -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 @@
        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 -r e7665b70056f -r f9ec32ec1ede external/mit/xorg/tools/fc-cache/Makefile
--- a/external/mit/xorg/tools/fc-cache/Makefile Fri Feb 24 12:47:23 2023 +0000
+++ b/external/mit/xorg/tools/fc-cache/Makefile Fri Feb 24 17:08:31 2023 +0000
@@ -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 @@
                -I${FONTCONFIG}/../include
 
 HOST_CPPFLAGS+=        -DXML_POOR_ENTROPY
-
 HOST_CPPFLAGS+=        -DTOOL_FCCACHE
 
 LDADD= -lz
diff -r e7665b70056f -r f9ec32ec1ede external/mit/xorg/tools/mkfontscale/Makefile
--- a/external/mit/xorg/tools/mkfontscale/Makefile      Fri Feb 24 12:47:23 2023 +0000
+++ b/external/mit/xorg/tools/mkfontscale/Makefile      Fri Feb 24 17:08:31 2023 +0000
@@ -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 @@
                -I${DESTDIR}${X11INCDIR} \
                -I${DESTDIR}${X11INCDIR}/freetype2
 
+HOST_CPPFLAGS+=        -DTOOL_FCCACHE
+
 .include <bsd.x11.mk>
 .include <bsd.hostprog.mk>