From 4ef6650fc7c9ddc85619435ab5c9e51a8e50861c Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Tue, 15 Oct 2024 09:55:12 +0200
Subject: [PATCH] [tiff] Update to 4.7.0 (#41547)

---
 ports/tiff/portfile.cmake      | 16 ++++++++++++++--
 ports/tiff/prefer-config.diff  | 15 ++++++++++++++-
 ports/tiff/requires-lerc.patch | 13 -------------
 ports/tiff/vcpkg.json          |  3 +--
 versions/baseline.json         |  4 ++--
 versions/t-/tiff.json          |  5 +++++
 6 files changed, 36 insertions(+), 20 deletions(-)
 delete mode 100644 ports/tiff/requires-lerc.patch

diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake
index d1e797d695..ea7eae901a 100644
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@@ -3,12 +3,11 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libtiff/libtiff
     REF "v${VERSION}"
-    SHA512 ef2f1d424219d9e245069b7d23e78f5e817cf6ee516d46694915ab6c8909522166f84997513d20a702f4e52c3f18467813935b328fafa34bea5156dee00f66fa
+    SHA512 924bcd0fe19c03f65ffc068719371ab582057bf95c3847efd3bd03eaff1eb409ec3f22c9d373fafd9f993dd031a161850f0db082cb7068195c7c5c564fa222fc
     HEAD_REF master
     PATCHES
         FindCMath.patch
         prefer-config.diff
-        requires-lerc.patch
 )
 
 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)
     vcpkg_copy_tools(TOOL_NAMES
+        fax2ps
+        fax2tiff
+        pal2rgb
+        ppm2tiff
+        raw2tiff
+        tiff2bw
+        tiff2pdf
+        tiff2ps
+        tiff2rgba
+        tiffcmp
         tiffcp
+        tiffcrop
+        tiffdither
         tiffdump
         tiffinfo
+        tiffmedian
         tiffset
         tiffsplit
         AUTO_CLEAN
diff --git a/ports/tiff/prefer-config.diff b/ports/tiff/prefer-config.diff
index 19f520acd2..340968d7e1 100644
--- a/ports/tiff/prefer-config.diff
+++ b/ports/tiff/prefer-config.diff
@@ -1,5 +1,5 @@
 diff --git a/cmake/LERCCodec.cmake b/cmake/LERCCodec.cmake
-index 54504ca..8dc8e1b 100644
+index 54504ca..3e04997 100644
 --- a/cmake/LERCCodec.cmake
 +++ b/cmake/LERCCodec.cmake
 @@ -25,7 +25,10 @@
@@ -40,3 +40,16 @@ index 3fac861..2957aa3 100644
  
  if(ZSTD_FOUND)
      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()
diff --git a/ports/tiff/requires-lerc.patch b/ports/tiff/requires-lerc.patch
deleted file mode 100644
index 5f3a3d13c4..0000000000
--- a/ports/tiff/requires-lerc.patch
+++ /dev/null
@@ -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()
diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json
index 0bcbd1a5dd..ab012f0cba 100644
--- a/ports/tiff/vcpkg.json
+++ b/ports/tiff/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "tiff",
-  "version": "4.6.0",
-  "port-version": 5,
+  "version": "4.7.0",
   "description": "A library that supports the manipulation of TIFF image files",
   "homepage": "https://libtiff.gitlab.io/libtiff/",
   "license": "libtiff",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4baf1537c7..522f6820d8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8865,8 +8865,8 @@
       "port-version": 2
     },
     "tiff": {
-      "baseline": "4.6.0",
-      "port-version": 5
+      "baseline": "4.7.0",
+      "port-version": 0
     },
     "tinkerforge": {
       "baseline": "2.1.25",
diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json
index f561340d17..c0dc517949 100644
--- a/versions/t-/tiff.json
+++ b/versions/t-/tiff.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "54c1c045d21157ce32df8a1c8b7b9d57b0d5d6ce",
+      "version": "4.7.0",
+      "port-version": 0
+    },
     {
       "git-tree": "6a3bae487fe89087457e2a391ee9720d68393616",
       "version": "4.6.0",