[tiff] 4.4.0 (#24986)

ports/tiff/cmakelists.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dddbaf6..ee57b7b 100644
+index 770b0fac..df44e99e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -133,16 +133,28 @@ find_package(CMath REQUIRED)
+@@ -131,16 +131,28 @@ find_package(CMath REQUIRED)
  # Release support
  include(Release)
  
@@ -29,30 +29,30 @@ index dddbaf6..ee57b7b 100644
  add_subdirectory(html)
 +endif()
  
- 
- message(STATUS "")
+ # pkg-config support
+ include(PkgConfig)
 diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
-index 90105b2..db5f140 100755
+index b6b31677..5c21e29f 100755
 --- a/libtiff/CMakeLists.txt
 +++ b/libtiff/CMakeLists.txt
-@@ -161,7 +161,7 @@ if(CXX_SUPPORT)
+@@ -189,7 +189,7 @@ if(CXX_SUPPORT)
    set(tiffxx_HEADERS
            tiffio.hxx)
  
--  add_library(tiffxx)
-+  add_library(tiffxx STATIC)
+-  add_library(tiffxx ../placeholder.h)
++  add_library(tiffxx STATIC ../placeholder.h)
    target_sources(tiffxx PRIVATE
            ${tiffxx_HEADERS}
            tif_stream.cxx)
-@@ -189,6 +189,7 @@ if(CXX_SUPPORT)
+@@ -217,6 +217,7 @@ if(CXX_SUPPORT)
  
  endif()
  
 +if(NOT CMAKE_CROSSCOMPILING)
- add_executable(mkg3states)
+ add_executable(mkg3states ../placeholder.h)
  target_sources(mkg3states PRIVATE mkg3states.c tif_fax3.h)
  target_link_libraries(mkg3states tiff port)
-@@ -198,3 +199,4 @@ add_custom_target(faxtable
+@@ -226,3 +227,4 @@ add_custom_target(faxtable
          COMMAND ${CMAKE_COMMAND} -E rm "tif_fax3sm.c"
          COMMAND mkg3states -b -c const "tif_fax3sm.c"
          WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")

ports/tiff/fix-pkgconfig.patch

@@ -1,104 +0,0 @@
-From f337e19d0d0564b1b000ecd5dfbefed6c37f4d5b Mon Sep 17 00:00:00 2001
-From: Matthias Kuhn <matthias@opengis.ch>
-Date: Tue, 21 Dec 2021 07:57:09 +0000
-Subject: [PATCH] Fix pkgconfig
-
----
- CMakeLists.txt         |  4 ++--
- libtiff-4.pc.in        |  3 ++-
- libtiff/CMakeLists.txt | 19 +++++++++++++++++++
- 3 files changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2188f97..93e6a34 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -124,8 +124,6 @@ include(WindowsSupport)
- # Orthogonal features
- include(LibraryFeatures)
- 
--# pkg-config support
--include(PkgConfig)
- 
- # math.h/libm portability
- find_package(CMath REQUIRED)
-@@ -156,6 +154,8 @@ add_subdirectory(man)
- add_subdirectory(html)
- endif()
- 
-+# pkg-config support
-+include(PkgConfig)
- 
- message(STATUS "")
- message(STATUS "Libtiff is now configured for ${CMAKE_SYSTEM}")
-diff --git a/libtiff-4.pc.in b/libtiff-4.pc.in
-index abe75a6..8899725 100644
---- a/libtiff-4.pc.in
-+++ b/libtiff-4.pc.in
-@@ -5,7 +5,8 @@ includedir=@includedir@
- 
- Name: libtiff
- Description:  Tag Image File Format (TIFF) library.
--Version: @VERSION@
-+Version: @LIBTIFF_VERSION_FULL@
- Libs: -L${libdir} -ltiff
- Libs.private: @tiff_libs_private@
- Cflags: -I${includedir}
-+Requires.private: @tiff_requires_private@
-diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
-index db5f140..32721ec 100755
---- a/libtiff/CMakeLists.txt
-+++ b/libtiff/CMakeLists.txt
-@@ -106,14 +106,19 @@ target_include_directories(tiff
-         ${TIFF_INCLUDES}
- )
- 
-+set(tiff_libs_private "")
-+set(tiff_requires_private "")
-+
- if(ZIP_SUPPORT)
-   target_link_libraries(tiff PRIVATE ZLIB::ZLIB)
-+  string(APPEND tiff_requires_private " zlib")
- endif()
- if(ZIP_SUPPORT AND LIBDEFLATE_SUPPORT)
-   target_link_libraries(tiff PRIVATE Deflate::Deflate)
- endif()
- if(JPEG_SUPPORT)
-   target_link_libraries(tiff PRIVATE JPEG::JPEG)
-+  string(APPEND tiff_requires_private " libjpeg")
-   if(JPEG_DUAL_MODE_8_12)
-     target_include_directories(tiff PRIVATE ${JPEG12_INCLUDE_DIR})
-     target_link_libraries(tiff PRIVATE ${JPEG12_LIBRARIES})
-@@ -127,15 +132,29 @@ if(LERC_SUPPORT)
- endif()
- if(LZMA_SUPPORT)
-     target_link_libraries(tiff PRIVATE LibLZMA::LibLZMA)
-+    string(APPEND tiff_requires_private " liblzma")
- endif()
- if(ZSTD_SUPPORT)
-   target_link_libraries(tiff PRIVATE ZSTD::ZSTD)
-+  string(APPEND tiff_requires_private " libzstd")
- endif()
- if(WEBP_SUPPORT)
-   target_link_libraries(tiff PRIVATE WebP::WebP)
-+  string(APPEND tiff_requires_private " libwebp")
- endif()
- target_link_libraries(tiff PRIVATE CMath::CMath)
- 
-+include(CheckLibraryExists)
-+
-+CHECK_LIBRARY_EXISTS(m sin "" HAVE_LIB_M)
-+
-+if (HAVE_LIB_M)
-+    string(APPEND tiff_libs_private " -lm")
-+endif()
-+
-+set(tiff_libs_private "${tiff_libs_private}" PARENT_SCOPE)
-+set(tiff_requires_private "${tiff_requires_private}" PARENT_SCOPE)
-+
- set_target_properties(tiff PROPERTIES SOVERSION ${SO_COMPATVERSION})
- if(NOT CYGWIN)
-     # This property causes shared libraries on Linux to have the full version
--- 
-2.25.1
-

ports/tiff/portfile.cmake

@@ -1,78 +1,14 @@
-set(LIBTIFF_VERSION 4.3.0)
-
-vcpkg_download_distfile(CVE_2022_0561_diff
-    URLS https://gitlab.com/libtiff/libtiff/-/commit/eecb0712f4c3a5b449f70c57988260a667ddbdef.diff
-    FILENAME libtiff-CVE-2022-0561.diff
-    SHA512 48df4e93202723778fdb6b87bcb7e2e4118546c6deb47e9999b8818e69420ad52a4a7823c68ab74d30657adb2278641971e43db771a1796fda95d2433ad991a0
-)
-
-vcpkg_download_distfile(CVE_2022_0562_diff
-    URLS https://gitlab.com/libtiff/libtiff/-/commit/561599c99f987dc32ae110370cfdd7df7975586b.diff
-    FILENAME libtiff-CVE-2022-0562.diff
-    SHA512 4346098e7a2433cf15d02a7baa3d1fa4b648f58845200264ecc0a230035f15da4cf1427c4a4ff73797bc01f105bd9ff705371c2f3867be4f9103b07d4d0edea8
-)
-
-vcpkg_download_distfile(CVE_2022_0865_diff
-    URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/306.diff
-    FILENAME libtiff-CVE-2022-0865.diff
-    SHA512 f22e0cee03716e6c6f130606c74acc7033dd61e20276e38e89a0ba485857d05a7bc22e445c52010797b7020febc30d3aca854d8a0c4ed0e2453201de550b4058
-)
-
-vcpkg_download_distfile(CVE_2022_0891_diff
-    URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/307.diff
-    FILENAME libtiff-CVE-2022-0891.diff
-    SHA512 6a88a0423057da11121d5297e2f425199341cbc6b299a0f77dd57baddf3f6a022a6dfe1fb97caabfd6e95a40b6c95a0e6b9a80e199054c271ccb257e23671fcf
-)
-
-vcpkg_download_distfile(CVE_2022_0907_diff
-    URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/314.diff
-    FILENAME libtiff-CVE-2022-0907.diff
-    SHA512 72455bb9698e8670b7ffcc1e6c644b9fd4d3aab46ca5940dc8130c796435a838f05555bf85293770c77b73690b137cd6931d59d61d649482b42b7b98afe88f3a
-)
-
-vcpkg_download_distfile(CVE_2022_0908_diff
-    URLS https://gitlab.com/libtiff/libtiff/-/commit/a95b799f65064e4ba2e2dfc206808f86faf93e85.diff
-    FILENAME libtiff-CVE-2022-0908.diff
-    SHA512 1f6bb30c00d671665870aea46898390c1545d00d80e17db07b5136f6bfb85fff8d95c2c63493066b9257d871858935497062d992cf978ca5037d8b079bfdeab1
-)
-
-vcpkg_download_distfile(CVE_2022_0909_diff
-    URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/310.diff
-    FILENAME libtiff-CVE-2022-0909.diff
-    SHA512 d675ac09a40136bdc808ae75030f199ebcbaf38b2e904b3b26b21d18e39fe89a1c703d5ee6156b337ec9dde29ad311cb6551de984aa87d796c9af0a26d758af3
-)
-
-vcpkg_download_distfile(CVE_2022_0924_diff
-    URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/311.diff
-    FILENAME libtiff-CVE-2022-0924.diff
-    SHA512 dcd22b4ef121128aabc8b2aadf4eac16597ee8b211bb06467c93bbccafe47a45917f07a6f4264d43f4c1596eb54d7d0a073987e6899a9f8d057632244cf75c67
-)
-
-vcpkg_download_distfile(CVE_2022_22844_diff
-    URLS https://gitlab.com/libtiff/libtiff/-/merge_requests/287.diff
-    FILENAME libtiff-CVE-2022-22844.diff
-    SHA512 2a3bb8ae9191794bff52a4b776a35b244a24e3b2ca963ccfd40166566fae18a2333d7db6c2e2cf17daa9fe61eaca3bd8c36d9807fd1aa0491a041ec22d65c70e
-)
+set(LIBTIFF_VERSION 4.4.0)
 
 vcpkg_from_gitlab(
     GITLAB_URL https://gitlab.com
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libtiff/libtiff
     REF v${LIBTIFF_VERSION}
-    SHA512 eaa2503dc1805283e0590b06e3e660a793fe849ae8b975b2d69369695d65a40640787c156574faaca856917be799eeb844e60f55555e1f219dd513cef66ea95d
+    SHA512 93955a2b802cf243e41d49048499da73862b5d3ffc005e3eddf0bf948a8bd1537f7c9e7f112e72d082549b4c49e256b9da9a3b6d8039ad8fc5c09a941b7e75d7
     HEAD_REF master
     PATCHES cmakelists.patch
-    fix-pkgconfig.patch
     FindCMath.patch
-    ${CVE_2022_0561_diff}
-    ${CVE_2022_0562_diff}
-    ${CVE_2022_0865_diff}
-    ${CVE_2022_0891_diff}
-    ${CVE_2022_0907_diff}
-    ${CVE_2022_0908_diff}
-    ${CVE_2022_0909_diff}
-    ${CVE_2022_0924_diff}
-    ${CVE_2022_22844_diff}
 )
 
 set(EXTRA_OPTIONS "")
@@ -111,6 +47,8 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
+
 set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc")
 if(EXISTS "${_file}")
     vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd")

ports/tiff/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "tiff",
-  "version": "4.3.0",
-  "port-version": 8,
+  "version": "4.4.0",
   "description": "A library that supports the manipulation of TIFF image files",
   "homepage": "https://libtiff.gitlab.io/libtiff/",
   "license": null,
@@ -9,6 +8,10 @@
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ],
   "default-features": [

versions/baseline.json

@@ -6977,8 +6977,8 @@
       "port-version": 5
     },
     "tiff": {
-      "baseline": "4.3.0",
-      "port-version": 8
+      "baseline": "4.4.0",
+      "port-version": 0
     },
     "tinkerforge": {
       "baseline": "2.1.25",

versions/t-/tiff.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "18c67848b7384af1ff6ad1c4e92b013376b136b6",
+      "version": "4.4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e2cafe3465d7c00233114c75abd86ed11538c186",
       "version": "4.3.0",