summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2021-10-21 17:27:45 +0200
committerCaolán McNamara <caolanm@redhat.com>2021-10-22 09:53:36 +0200
commit51c57b081122f82002b0cca28ccdd464e4a52a54 (patch)
tree4974f5404e4b30a36e120661c778a7986b0777d3 /external
parentcc24aca6050d723e2474871ac724d2d5b90d4426 (diff)
freetype: Build '--without-brotli'
After commit c99b73c16b725ec2bf2f5417f28d1688c3322d7d Date: Wed Oct 20 12:08:02 2021 +0100 upgrade freetype to 2.11.0 my local Android x86 build (using NDK 20.0.5594570) started failing with In file included from .../workdir/UnpackedTarball/freetype/src/sfnt/sfnt.c:25: .../workdir/UnpackedTarball/freetype/src/sfnt/sfwoff2.c:27:10: fatal error: 'brotli/decode.h' file not found #include <brotli/decode.h> ^~~~~~~~~~~~~~~~~ 1 error generated. Disable the optional Brotli dependency added upstream with commit 9443a1bc3e6cfa315db976ff80f6c5e91b12b387 Author: Nikhil Ramakrishnan (निखिल रामकृष्णन) <ramakrishnan.nikhil@gmail.com> Date: Fri Jun 28 01:01:17 2019 +0530 Add Brotli dependency and required checks. Brotli is required for decompressing WOFF2 font directory streams. The library is thus being added as an optional dependency for FreeType. * builds/unix/configure.raw: Add checks for `libbrotlidec'. (REQUIRES_PRIVATE, LIBS_PRIVATE, LIBSSTATIC_CONFIG): Updated. * devel/ftoption.h, include/freetype/config/ftoption.h (FT_CONFIG_OPTION_USE_BROTLI): New macro. Change-Id: Iea8d3e333cb60182026fb9fde5a0171ae197ee57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124031 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/freetype/ExternalProject_freetype.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk
index 8ad6918146bb..032e0362917a 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -19,6 +19,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
$(gb_RUN_CONFIGURE) ./configure \
--disable-shared \
--without-zlib \
+ --without-brotli \
--without-bzip2 \
--without-harfbuzz \
--prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \