From 4f7460f685e9f54667cdf62c51e65ac079676c83 Mon Sep 17 00:00:00 2001 From: Michael Hofmann Date: Thu, 14 Feb 2019 19:22:04 +0100 Subject: [PATCH] [tiff] Disable libwebp support. (#5348) * [tiff]: disable libwebp support. Since version 4.0.10, libtiff supports optional compression modes using either libweb or zstd. When libtiff is built, and libwebp and/or zstd are found anywhere on the system, these modes will be enabled. However, the respective libraries are not added as link targets, so this will result in linker errors for any unsuspecting project using libtiff. Since zstd support was already disabled by a previous commit, I have also simply disabled libwebp support to fix this issue. A more proper fix might be to add both libwebp and zstd as required libtiff dependencies, and to patch libtiff's CMakeLists.txt, such that these libraries are properly linked to. However, it is currently very unlikely to encounter TIFF images in the wild compressed using either of these methods, so the effect of disabling support may not be noticeable at all. * [tiff] Change CONTROL version --- ports/tiff/CONTROL | 2 +- ports/tiff/portfile.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 45499f1fd2a..9723ea8b894 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.10-1 +Version: 4.0.10-2 Build-Depends: zlib, libjpeg-turbo, liblzma (!uwp) Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 6e46ee6d268..d51d772ca38 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_configure_cmake( -DBUILD_TESTS=OFF -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing. -Djpeg12=OFF + -Dwebp=OFF -Dzstd=OFF ${TIFF_CXX_TARGET} )