mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 09:31:08 +08:00
[tiff] Update to 4.7.0 (#41547)
This commit is contained in:
parent
742e88578d
commit
4ef6650fc7
@ -3,12 +3,11 @@ vcpkg_from_gitlab(
|
|||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO libtiff/libtiff
|
REPO libtiff/libtiff
|
||||||
REF "v${VERSION}"
|
REF "v${VERSION}"
|
||||||
SHA512 ef2f1d424219d9e245069b7d23e78f5e817cf6ee516d46694915ab6c8909522166f84997513d20a702f4e52c3f18467813935b328fafa34bea5156dee00f66fa
|
SHA512 924bcd0fe19c03f65ffc068719371ab582057bf95c3847efd3bd03eaff1eb409ec3f22c9d373fafd9f993dd031a161850f0db082cb7068195c7c5c564fa222fc
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
FindCMath.patch
|
FindCMath.patch
|
||||||
prefer-config.diff
|
prefer-config.diff
|
||||||
requires-lerc.patch
|
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||||
@ -74,9 +73,22 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRE
|
|||||||
|
|
||||||
if ("tools" IN_LIST FEATURES)
|
if ("tools" IN_LIST FEATURES)
|
||||||
vcpkg_copy_tools(TOOL_NAMES
|
vcpkg_copy_tools(TOOL_NAMES
|
||||||
|
fax2ps
|
||||||
|
fax2tiff
|
||||||
|
pal2rgb
|
||||||
|
ppm2tiff
|
||||||
|
raw2tiff
|
||||||
|
tiff2bw
|
||||||
|
tiff2pdf
|
||||||
|
tiff2ps
|
||||||
|
tiff2rgba
|
||||||
|
tiffcmp
|
||||||
tiffcp
|
tiffcp
|
||||||
|
tiffcrop
|
||||||
|
tiffdither
|
||||||
tiffdump
|
tiffdump
|
||||||
tiffinfo
|
tiffinfo
|
||||||
|
tiffmedian
|
||||||
tiffset
|
tiffset
|
||||||
tiffsplit
|
tiffsplit
|
||||||
AUTO_CLEAN
|
AUTO_CLEAN
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git a/cmake/LERCCodec.cmake b/cmake/LERCCodec.cmake
|
diff --git a/cmake/LERCCodec.cmake b/cmake/LERCCodec.cmake
|
||||||
index 54504ca..8dc8e1b 100644
|
index 54504ca..3e04997 100644
|
||||||
--- a/cmake/LERCCodec.cmake
|
--- a/cmake/LERCCodec.cmake
|
||||||
+++ b/cmake/LERCCodec.cmake
|
+++ b/cmake/LERCCodec.cmake
|
||||||
@@ -25,7 +25,10 @@
|
@@ -25,7 +25,10 @@
|
||||||
@ -40,3 +40,16 @@ index 3fac861..2957aa3 100644
|
|||||||
|
|
||||||
if(ZSTD_FOUND)
|
if(ZSTD_FOUND)
|
||||||
if(TARGET zstd::libzstd_shared)
|
if(TARGET zstd::libzstd_shared)
|
||||||
|
diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
|
||||||
|
index a8aa0c3..d5b9b25 100755
|
||||||
|
--- a/libtiff/CMakeLists.txt
|
||||||
|
+++ b/libtiff/CMakeLists.txt
|
||||||
|
@@ -163,7 +163,7 @@ if(JBIG_SUPPORT)
|
||||||
|
endif()
|
||||||
|
if(LERC_SUPPORT)
|
||||||
|
target_link_libraries(tiff PRIVATE LERC::LERC)
|
||||||
|
- if(LERC_VERSION_STRING VERSION_GREATER_EQUAL "4.0")
|
||||||
|
+ if(1)
|
||||||
|
if(NOT BUILD_SHARED_LIBS)
|
||||||
|
set_target_properties(tiff PROPERTIES COMPILE_DEFINITIONS LERC_STATIC)
|
||||||
|
endif()
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
|
|
||||||
index 9c8024e..baee592 100755
|
|
||||||
--- a/libtiff/CMakeLists.txt
|
|
||||||
+++ b/libtiff/CMakeLists.txt
|
|
||||||
@@ -148,7 +148,7 @@ if(JBIG_SUPPORT)
|
|
||||||
endif()
|
|
||||||
if(LERC_SUPPORT)
|
|
||||||
target_link_libraries(tiff PRIVATE LERC::LERC)
|
|
||||||
- list(APPEND tiff_libs_private_list "${LERC_LIBRARY}")
|
|
||||||
+ string(APPEND tiff_requires_private " Lerc")
|
|
||||||
if(NOT BUILD_SHARED_LIBS)
|
|
||||||
set_target_properties(tiff PROPERTIES COMPILE_DEFINITIONS LERC_STATIC)
|
|
||||||
endif()
|
|
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tiff",
|
"name": "tiff",
|
||||||
"version": "4.6.0",
|
"version": "4.7.0",
|
||||||
"port-version": 5,
|
|
||||||
"description": "A library that supports the manipulation of TIFF image files",
|
"description": "A library that supports the manipulation of TIFF image files",
|
||||||
"homepage": "https://libtiff.gitlab.io/libtiff/",
|
"homepage": "https://libtiff.gitlab.io/libtiff/",
|
||||||
"license": "libtiff",
|
"license": "libtiff",
|
||||||
|
@ -8865,8 +8865,8 @@
|
|||||||
"port-version": 2
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"tiff": {
|
"tiff": {
|
||||||
"baseline": "4.6.0",
|
"baseline": "4.7.0",
|
||||||
"port-version": 5
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"tinkerforge": {
|
"tinkerforge": {
|
||||||
"baseline": "2.1.25",
|
"baseline": "2.1.25",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "54c1c045d21157ce32df8a1c8b7b9d57b0d5d6ce",
|
||||||
|
"version": "4.7.0",
|
||||||
|
"port-version": 0
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "6a3bae487fe89087457e2a391ee9720d68393616",
|
"git-tree": "6a3bae487fe89087457e2a391ee9720d68393616",
|
||||||
"version": "4.6.0",
|
"version": "4.6.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user