[tiff] Update to 4.7.2 (#52718)

This commit is contained in:
SunBlack 2026-07-05 08:15:29 +02:00 committed by GitHub
parent 7fb8caabee
commit 604869ee19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 37 additions and 20 deletions

View File

@ -1,5 +1,5 @@
diff --git a/cmake/FindCMath.cmake b/cmake/FindCMath.cmake
index ad92218..9c8247f 100644
index 346106de..8a2e700c 100644
--- a/cmake/FindCMath.cmake
+++ b/cmake/FindCMath.cmake
@@ -31,6 +31,15 @@ include(CheckSymbolExists)
@ -18,16 +18,3 @@ index ad92218..9c8247f 100644
find_library(CMath_LIBRARY NAMES m)
if(NOT CMath_HAVE_LIBC_POW)
@@ -61,7 +70,11 @@ if(CMath_FOUND)
endif()
if(NOT TARGET CMath::CMath)
- if(CMath_LIBRARIES)
+ if(CMath_LIBRARIES STREQUAL "m")
+ add_library(CMath::CMath INTERFACE IMPORTED)
+ set_target_properties(CMath::CMath PROPERTIES
+ INTERFACE_LINK_LIBRARIES m)
+ elseif(CMath_LIBRARIES)
add_library(CMath::CMath UNKNOWN IMPORTED)
set_target_properties(CMath::CMath PROPERTIES
IMPORTED_LOCATION "${CMath_LIBRARY}")

View File

@ -0,0 +1,24 @@
diff --git a/cmake/JPEGCodec.cmake b/cmake/JPEGCodec.cmake
index 2a26c432..d8fb5ae7 100644
--- a/cmake/JPEGCodec.cmake
+++ b/cmake/JPEGCodec.cmake
@@ -53,6 +53,19 @@ if(NOT jpeg-prefer-standard)
set(JPEG_INCLUDE_DIRS "")
endif()
unset(_jpeg_includes)
+ elseif(TARGET libjpeg-turbo::jpeg-static AND NOT TARGET JPEG::JPEG)
+ add_library(JPEG::JPEG ALIAS libjpeg-turbo::jpeg-static)
+ set(JPEG_FOUND TRUE)
+ # Set JPEG_LIBRARIES to the target name
+ set(JPEG_LIBRARIES libjpeg-turbo::jpeg-static)
+ # For JPEG_INCLUDE_DIRS, try to get the property, but it's OK if it's not set
+ get_target_property(_jpeg_includes libjpeg-turbo::jpeg-static INTERFACE_INCLUDE_DIRECTORIES)
+ if(_jpeg_includes)
+ set(JPEG_INCLUDE_DIRS "${_jpeg_includes}")
+ else()
+ set(JPEG_INCLUDE_DIRS "")
+ endif()
+ unset(_jpeg_includes)
elseif(TARGET libjpeg-turbo::turbojpeg AND NOT TARGET JPEG::JPEG)
# Only use turbojpeg as a fallback if jpeg target doesn't exist
# This is unlikely to work correctly but better than nothing

View File

@ -3,18 +3,19 @@ vcpkg_from_gitlab(
OUT_SOURCE_PATH SOURCE_PATH
REPO libtiff/libtiff
REF "v${VERSION}"
SHA512 dcdabe2598db33a973d06f0009dd528aa1f38813bd6015e2595097b838a42240f9ccbe7524b5235ea2f4207a10d5d706339c7a6f4772b531e00a20281a00f67b
SHA512 c4dcde3c79e5d69c7231f8862e2e5a83d90d9cce694fb2a4804800b2f8f1bc9db504b9252d81dce872eec8358b33a3a1dbdddcbb6181f6fb8d1d7fc0e9a9fc6a
HEAD_REF master
PATCHES
FindCMath.patch
prefer-config.diff
jpeccodec.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
cxx tiff-cxx
jpeg jpeg
jpeg CMAKE_REQUIRE_FIND_PACKAGE_JPEG
jpeg CMAKE_REQUIRE_FIND_PACKAGE_libjpeg-turbo
libdeflate libdeflate
libdeflate CMAKE_REQUIRE_FIND_PACKAGE_Deflate
lerc lerc
@ -38,14 +39,14 @@ vcpkg_cmake_configure(
-Dtiff-contrib=OFF
-Dtiff-tests=OFF
-Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing.
-Djpeg12=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON
-DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON
-DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON
-DZSTD_HAVE_DECOMPRESS_STREAM=ON
-DHAVE_JPEGTURBO_DUAL_MODE_8_12=OFF
OPTIONS_DEBUG
-DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only.
MAYBE_UNUSED_VARIABLES
CMAKE_DISABLE_FIND_PACKAGE_JPEG # find_package(JPEG) only called when libjpeg-turbo was not found
CMAKE_DISABLE_FIND_PACKAGE_GLUT
CMAKE_DISABLE_FIND_PACKAGE_OpenGL
ZSTD_HAVE_DECOMPRESS_STREAM

View File

@ -1,6 +1,6 @@
{
"name": "tiff",
"version": "4.7.1",
"version": "4.7.2",
"description": "A library that supports the manipulation of TIFF image files",
"homepage": "https://libtiff.gitlab.io/libtiff/",
"license": "libtiff",

View File

@ -10121,7 +10121,7 @@
"port-version": 2
},
"tiff": {
"baseline": "4.7.1",
"baseline": "4.7.2",
"port-version": 0
},
"tiledb": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a9a8ba148c5c2295dbcf22fe4f6ee5de135b0e33",
"version": "4.7.2",
"port-version": 0
},
{
"git-tree": "9391305288677bb3959bf22a08218a61ffec0be0",
"version": "4.7.1",