[tiff] support zstd compression in TIFF image files (take 2) (#16610)

* support zstd compression in TIFF image files

* x-add-version tiff

* support WebP compression in TIFF image files

* x-add-version tiff

* Revert "x-add-version tiff" with WebP

This reverts commit f1a5a53dc9.

* Revert "support WebP compression in TIFF image files"

This reverts commit f9ac7fe537.
This commit is contained in:
ghesketh 2021-04-19 17:19:07 -07:00 committed by GitHub
parent dd2255ee31
commit 8f54f09957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions

View File

@ -1,9 +1,13 @@
Source: tiff
Version: 4.1.0
Port-Version: 1
Port-Version: 2
Build-Depends: zlib, libjpeg-turbo, liblzma
Homepage: https://download.osgeo.org/libtiff
Description: A library that supports the manipulation of TIFF image files
Feature: tool
Description: Build tools
Feature: zstd
Build-Depends: zstd
Description: support zstd compression in TIFF image files

View File

@ -21,6 +21,7 @@ endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
tool BUILD_TOOLS
zstd WITH_ZSTD
)
vcpkg_configure_cmake(
@ -34,7 +35,7 @@ vcpkg_configure_cmake(
-Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing.
-Djpeg12=OFF
-Dwebp=OFF
-Dzstd=OFF
-Dzstd=${WITH_ZSTD}
-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON
-DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON
${TIFF_CXX_TARGET}

View File

@ -5970,7 +5970,7 @@
},
"tiff": {
"baseline": "4.1.0",
"port-version": 1
"port-version": 2
},
"tinkerforge": {
"baseline": "2.1.25",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fe41977af36a6513424daacb4d4686093a67e670",
"version-string": "4.1.0",
"port-version": 2
},
{
"git-tree": "8bb1dc9606c9b3573f08bcf6befad16ac730f287",
"version-string": "4.1.0",