diff options
| author | ghesketh <gifford.hesketh@gmail.com> | 2021-04-19 17:19:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 17:19:07 -0700 |
| commit | 8f54f09957b3a6f1feaa6a2754f7180f6cff518d (patch) | |
| tree | 930f375eb357752801c376eb6f7ce13ca1ec1fa4 | |
| parent | dd2255ee31c726945c4fc91c6c6f4b2cb10cc91a (diff) | |
| download | vcpkg-8f54f09957b3a6f1feaa6a2754f7180f6cff518d.tar.gz vcpkg-8f54f09957b3a6f1feaa6a2754f7180f6cff518d.zip | |
[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 f1a5a53dc9eaa063e2ca193f4fddeb6fcb5a9df4.
* Revert "support WebP compression in TIFF image files"
This reverts commit f9ac7fe53761a3b602269286c7f0f6d754247de2.
| -rw-r--r-- | ports/tiff/CONTROL | 6 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/tiff.json | 5 |
4 files changed, 13 insertions, 3 deletions
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 1eb69723c..788c78d1a 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -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 diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 7e94ac05a..a23160312 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -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} diff --git a/versions/baseline.json b/versions/baseline.json index 8cc8753bf..6c14c4f2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5970,7 +5970,7 @@ }, "tiff": { "baseline": "4.1.0", - "port-version": 1 + "port-version": 2 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index d3ad7ef0a..a62d16ebd 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "fe41977af36a6513424daacb4d4686093a67e670", + "version-string": "4.1.0", + "port-version": 2 + }, + { "git-tree": "8bb1dc9606c9b3573f08bcf6befad16ac730f287", "version-string": "4.1.0", "port-version": 1 |