diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-05-21 16:30:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2022-05-21 20:06:24 +0200 |
commit | 11e4235930f05906311f7b70444b0a6487d59a47 (patch) | |
tree | 14a8bdbd3480f819aaf4e1849f206b5deda2a445 /external | |
parent | 79f2773115c30278363a778d6cdfb586145abde6 (diff) |
tiff: enable webp
Change-Id: Ifd277fd89393f964817bf58dead53074321252d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134711
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
-rw-r--r-- | external/libtiff/ExternalProject_libtiff.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/external/libtiff/ExternalProject_libtiff.mk b/external/libtiff/ExternalProject_libtiff.mk index e9ecbdf86765..04af18322541 100644 --- a/external/libtiff/ExternalProject_libtiff.mk +++ b/external/libtiff/ExternalProject_libtiff.mk @@ -15,6 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,libtiff,\ $(eval $(call gb_ExternalProject_use_externals,libtiff,\ libjpeg \ + libwebp \ zlib \ )) @@ -36,6 +37,7 @@ $(call gb_ExternalProject_get_state_target,libtiff,build) : --enable-static \ --enable-jpeg \ --enable-zlib \ + --enable-webp \ --disable-shared \ --disable-cxx \ --disable-libdeflate \ @@ -43,7 +45,6 @@ $(call gb_ExternalProject_get_state_target,libtiff,build) : --disable-lerc \ --disable-lzma \ --disable-mdi \ - --disable-webp \ --disable-win32-io \ --disable-zstd \ --with-pic \ @@ -54,10 +55,15 @@ $(call gb_ExternalProject_get_state_target,libtiff,build) : $(if $(SYSTEM_ZLIB),,--with-zlib-lib-dir="$(gb_StaticLibrary_WORKDIR)") \ $(if $(SYSTEM_LIBJPEG),,--with-jpeg-include-dir="$(call gb_UnpackedTarball_get_dir,libjpeg-turbo)") \ $(if $(SYSTEM_LIBJPEG),,--with-jpeg-lib-dir="$(gb_StaticLibrary_WORKDIR)") \ + $(if $(SYSTEM_LIBWEBP),,--with-webp-include-dir="$(call gb_UnpackedTarball_get_dir,libwebp/src)") \ + $(if $(SYSTEM_LIBWEBP),,$(if $(filter WNT,$(OS_FOR_BUILD)),\ + --with-webp-lib-dir="$(call gb_UnpackedTarball_get_dir,libwebp)/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT)", \ + --with-webp-lib-dir="$(call gb_UnpackedTarball_get_dir,libwebp)/src/.libs")) \ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ LDFLAGS="$(call gb_ExternalProject_get_link_flags,libtiff)" \ ac_cv_lib_z_inflateEnd=yes \ ac_cv_lib_jpeg_jpeg_read_scanlines=yes \ + ac_cv_lib_webp_WebPDecode=yes \ $(gb_CONFIGURE_PLATFORMS) \ && cd libtiff && $(MAKE) libtiff.la \ ) |