diff options
| author | Michael Hofmann <kmhofmann@users.noreply.github.com> | 2019-02-14 19:22:04 +0100 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-02-14 10:22:04 -0800 |
| commit | 4f7460f685e9f54667cdf62c51e65ac079676c83 (patch) | |
| tree | e4215a079853fb063ea6f7ac399a75746442b710 | |
| parent | 51653d2506b5bb68cbc5018fa5de44f69217ec3b (diff) | |
| download | vcpkg-4f7460f685e9f54667cdf62c51e65ac079676c83.tar.gz vcpkg-4f7460f685e9f54667cdf62c51e65ac079676c83.zip | |
[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
| -rw-r--r-- | ports/tiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 45499f1fd..9723ea8b8 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 6e46ee6d2..d51d772ca 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} ) |