[tiff] Update to 4.3.0, improvements (#18187)

* Format manifest

* Update to 4.3.0

* Revise features and dependencies

* Fix pc files

* Quote filepath expressions

* Switch to port vcpkg-cmake

* Use features for vcpkg-cmake-wrapper

* [selene] Don't warn/fail on using deprecated types from tiff

* x-add-version

* Use proper 'version' field

* [selene] Format manifest

* [selene] Modernize build file

* Overwrite version and git-tree

* Rebuild

* Implement review comment

* Overwrite git-tree

* Rename cmake wrapper template

* Overwrite git-tree

15 files changed, 358 insertions, 178 deletions

diff --git a/ports/selene/CONTROL b/ports/selene/CONTROL
deleted file mode 100644
index 0a1ef5278..000000000
--- a/ports/selene/CONTROL
+++ /dev/null
@@ -1,10 +0,0 @@
-Source: selene

-Version: 0.3.1

-Port-Version: 3

-Homepage: https://github.com/kmhofmann/selene

-Description: A C++17 image representation, processing and I/O library.

-Build-Depends: zlib, libpng, libjpeg-turbo, tiff

-

-Feature: opencv

-Description: Enable using OpenCV

-Build-Depends: opencv[core]

diff --git a/ports/selene/portfile.cmake b/ports/selene/portfile.cmake
index 703c3d2bc..a7216be1b 100644
--- a/ports/selene/portfile.cmake
+++ b/ports/selene/portfile.cmake
@@ -8,22 +8,25 @@ vcpkg_from_github(
     HEAD_REF master

     PATCHES

         disable_x86_intrinsics_on_arm.patch

+        tiff-deprecated-typedefs.patch

 )

 

-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "opencv" SELENE_USE_OPENCV)

+vcpkg_check_features(

+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS

+    FEATURES

+        "opencv" SELENE_USE_OPENCV

+)

 

-vcpkg_configure_cmake(

-    SOURCE_PATH ${SOURCE_PATH}

-    PREFER_NINJA

-    OPTIONS ${FEATURE_OPTIONS}

+vcpkg_cmake_configure(

+    SOURCE_PATH "${SOURCE_PATH}"

+    OPTIONS

+        ${FEATURE_OPTIONS}

 )

 

-vcpkg_install_cmake()

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/selene)

+vcpkg_cmake_install()

+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/selene)

 vcpkg_copy_pdbs()

 

-# Include files should not be duplicated into the /debug/include directory.

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 

-# Handle copyright

-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/selene/tiff-deprecated-typedefs.patch b/ports/selene/tiff-deprecated-typedefs.patch
new file mode 100644
index 000000000..e2429138d
--- /dev/null
+++ b/ports/selene/tiff-deprecated-typedefs.patch
@@ -0,0 +1,14 @@
+diff --git a/selene/CMakeLists.txt b/selene/CMakeLists.txt
+index ab2760c..d1e1e6c 100644
+--- a/selene/CMakeLists.txt
++++ b/selene/CMakeLists.txt
+@@ -229,6 +229,9 @@ if(TIFF_FOUND)
+             )
+ 
+     target_compile_options(selene_img_io_tiff PRIVATE ${SELENE_COMPILER_OPTIONS} ${SELENE_IMG_COMPILER_OPTIONS})
++    if(MSVC)
++        target_compile_options(selene_img_io_tiff PRIVATE /wd4996)
++    endif()
+ 
+     target_compile_definitions(selene_img_io_tiff PRIVATE ${SELENE_COMPILER_DEFINITIONS})
+ 
diff --git a/ports/selene/vcpkg.json b/ports/selene/vcpkg.json
new file mode 100644
index 000000000..0d70c7c40
--- /dev/null
+++ b/ports/selene/vcpkg.json
@@ -0,0 +1,32 @@
+{
+  "name": "selene",
+  "version": "0.3.1",
+  "port-version": 4,
+  "description": "A C++17 image representation, processing and I/O library.",
+  "homepage": "https://github.com/kmhofmann/selene",
+  "dependencies": [
+    "libjpeg-turbo",
+    "libpng",
+    "tiff",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    "zlib"
+  ],
+  "features": {
+    "opencv": {
+      "description": "Enable using OpenCV",
+      "dependencies": [
+        {
+          "name": "opencv",
+          "default-features": false
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL
deleted file mode 100644
index 788c78d1a..000000000
--- a/ports/tiff/CONTROL
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: tiff
-Version: 4.1.0
-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/cmakelists.patch b/ports/tiff/cmakelists.patch
index a82de0452..67c953714 100644
--- a/ports/tiff/cmakelists.patch
+++ b/ports/tiff/cmakelists.patch
@@ -1,84 +1,59 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 845ddf0..9ccb9b3 100644
+index dddbaf6..ee57b7b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -181,9 +181,7 @@ foreach(flag ${test_flags})
-   endif (${test_c_flag})
- endforeach(flag ${test_flags})
+@@ -133,16 +133,28 @@ find_package(CMath REQUIRED)
+ # Release support
+ include(Release)
  
--if(MSVC)
--    set(CMAKE_DEBUG_POSTFIX "d")
--endif()
-+set(CMAKE_DEBUG_POSTFIX "d")
- 
- option(ld-version-script "Enable linker version script" ON)
- # Check if LD supports linker scripts.
-@@ -601,12 +599,15 @@ check_include_file(OpenGL/gl.h HAVE_OPENGL_GL_H)
- check_include_file(OpenGL/glu.h HAVE_OPENGL_GLU_H)
- 
- # Win32 IO
--set(win32_io FALSE)
--if(WIN32)
--  set(win32_io TRUE)
-+set(USE_WIN32_FILEIO FALSE CACHE BOOL "")
 +if(MSVC)
-+  if (NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")  #on UWP we use the unix I/O api
-+    set(USE_WIN32_FILEIO TRUE CACHE BOOL "" FORCE)
-+    add_definitions(-DUSE_WIN32_FILEIO)
-+  endif()
-+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS /wd4996)
- endif()
- 
--set(USE_WIN32_FILEIO ${win32_io})
- 
- # Orthogonal features
- 
-@@ -708,16 +709,28 @@ endif()
- 
- #report_values(TIFF_INCLUDES TIFF_LIBRARY_DEPS)
++    add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
++    add_compile_options(/wd4996)
++endif()
  
-+option(BUILD_TOOLS "Build tool executables" ON)
-+option(BUILD_DOCS "Build docs" ON)
-+option(BUILD_CONTRIB "Build contributed executables" ON)
-+option(BUILD_TESTS "Build tests" ON)
-+
  # Process subdirectories
  add_subdirectory(port)
  add_subdirectory(libtiff)
--add_subdirectory(tools)
--add_subdirectory(test)
--add_subdirectory(contrib)
--add_subdirectory(build)
--add_subdirectory(man)
--add_subdirectory(html)
--
 +if(BUILD_TOOLS)
-+  add_subdirectory(tools)
+ add_subdirectory(tools)
 +endif()
 +if(BUILD_TESTS)
-+  add_subdirectory(test)
+ add_subdirectory(test)
 +endif()
 +if(BUILD_CONTRIB)
-+  add_subdirectory(contrib)
+ add_subdirectory(contrib)
+ add_subdirectory(build)
 +endif()
 +if(BUILD_DOCS)
-+  add_subdirectory(build)
-+  add_subdirectory(man)
-+  add_subdirectory(html)
+ add_subdirectory(man)
+ add_subdirectory(html)
 +endif()
- #message(STATUS "EXTRA_DIST: ${EXTRA_DIST}")
+ 
  
  message(STATUS "")
 diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt
-index 1cf1b75..4ee29f6 100644
+index 90105b2..db5f140 100755
 --- a/libtiff/CMakeLists.txt
 +++ b/libtiff/CMakeLists.txt
-@@ -143,7 +143,7 @@ install(FILES ${tiff_HEADERS} ${nodist_tiff_HEADERS}
-         DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+@@ -161,7 +161,7 @@ if(CXX_SUPPORT)
+   set(tiffxx_HEADERS
+           tiffio.hxx)
+ 
+-  add_library(tiffxx)
++  add_library(tiffxx STATIC)
+   target_sources(tiffxx PRIVATE
+           ${tiffxx_HEADERS}
+           tif_stream.cxx)
+@@ -189,6 +189,7 @@ if(CXX_SUPPORT)
  
- if(CXX_SUPPORT)
--  add_library(tiffxx ${tiffxx_SOURCES} ${tiffxx_HEADERS})
-+	add_library(tiffxx STATIC ${tiffxx_SOURCES} ${tiffxx_HEADERS})
-   target_link_libraries(tiffxx tiff)
-   set_target_properties(tiffxx PROPERTIES SOVERSION ${SO_COMPATVERSION})
-   if(NOT CYGWIN)
+ endif()
+ 
++if(NOT CMAKE_CROSSCOMPILING)
+ add_executable(mkg3states)
+ target_sources(mkg3states PRIVATE mkg3states.c tif_fax3.h)
+ target_link_libraries(mkg3states tiff port)
+@@ -198,3 +199,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}")
++endif()
diff --git a/ports/tiff/fix-pkgconfig.patch b/ports/tiff/fix-pkgconfig.patch
new file mode 100644
index 000000000..a67910ef5
--- /dev/null
+++ b/ports/tiff/fix-pkgconfig.patch
@@ -0,0 +1,84 @@
+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..6db71ee 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,14 +132,23 @@ 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)
++if(CMath_LIBRARY)
++  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)
diff --git a/ports/tiff/fix-stddef.patch b/ports/tiff/fix-stddef.patch
deleted file mode 100644
index a9c2ddf0b..000000000
--- a/ports/tiff/fix-stddef.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/port/lfind.c port/lfind.c
-index 087dfa9..20fa8b4 100644
---- a/port/lfind.c
-+++ b/port/lfind.c
-@@ -38,7 +38,7 @@
- #ifdef _WIN32_WCE
- # include <wce_types.h>
- #else
--# include <sys/types.h>
-+# include <stddef.h>
- #endif
- 
- #ifndef NULL
diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake
index a23160312..1e36968fe 100644
--- a/ports/tiff/portfile.cmake
+++ b/ports/tiff/portfile.cmake
@@ -1,84 +1,101 @@
-set(LIBTIFF_VERSION 4.1.0)
+set(LIBTIFF_VERSION 4.3.0)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz"
+    URLS "https://download.osgeo.org/libtiff/tiff-${LIBTIFF_VERSION}.tar.gz"
     FILENAME "tiff-${LIBTIFF_VERSION}.tar.gz"
-    SHA512 fd541dcb11e3d5afaa1ec2f073c9497099727a52f626b338ef87dc93ca2e23ca5f47634015a4beac616d4e8f05acf7b7cd5797fb218758cc2ad31b390491c5a6
+    SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493
 )
 
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE "${ARCHIVE}"
     REF ${LIBTIFF_VERSION}
     PATCHES
-        fix-stddef.patch
         cmakelists.patch
+        fix-pkgconfig.patch
 )
 
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
-    set (TIFF_CXX_TARGET -Dcxx=OFF)
+set(EXTRA_OPTIONS "")
+if(VCPKG_TARGET_IS_UWP)
+    list(APPEND EXTRA_OPTIONS "-DUSE_WIN32_FILEIO=OFF")  # On UWP we use the unix I/O api.
+endif()
+
+if("cxx" IN_LIST FEATURES)
+    vcpkg_fail_port_install(
+        MESSAGE "Feature 'cxx' is not supported on ${VCPKG_TARGET_ARCHITECTURE}."
+        ON_ARCH arm arm64
+    )
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    tool BUILD_TOOLS
-	zstd WITH_ZSTD
+    FEATURES
+        cxx     cxx
+        jpeg    jpeg
+        lzma    lzma
+        tools   BUILD_TOOLS
+        webp    webp
+        zip     zlib
+        zstd    zstd
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
+        ${EXTRA_OPTIONS}
         -DBUILD_DOCS=OFF
         -DBUILD_CONTRIB=OFF
         -DBUILD_TESTS=OFF
+        -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only.
+        -Dlibdeflate=OFF
         -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing.
         -Djpeg12=OFF
-        -Dwebp=OFF
-        -Dzstd=${WITH_ZSTD}
+        -Dlerc=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON
-        ${TIFF_CXX_TARGET}
 )
 
-vcpkg_install_cmake()
-set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc")
-if(EXISTS "${_file}")
-    vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd")
-endif()
+vcpkg_cmake_install()
 
-# Fix dependencies:
 set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libtiff-4.pc")
 if(EXISTS "${_file}")
-    vcpkg_replace_string("${_file}" "Version: 4.1.0" "Version: 4.1.0\nRequires.private: liblzma libjpeg")
-endif() 
-set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libtiff-4.pc")
-if(EXISTS "${_file}")
-    vcpkg_replace_string("${_file}" "Version: 4.1.0" "Version: 4.1.0\nRequires.private: liblzma libjpeg")
+    vcpkg_replace_string("${_file}" "-ltiff" "-ltiffd")
 endif()
-
 vcpkg_fixup_pkgconfig()
+
 file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
-    ${CURRENT_PACKAGES_DIR}/share
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/share"
 )
 
+configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
+file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-if ("tool" IN_LIST FEATURES)
-    file(GLOB TIFF_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
-    file(INSTALL ${TIFF_TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
-    file(REMOVE ${TIFF_TOOLS})
-    file(GLOB TIFF_TOOLS ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
-    file(REMOVE ${TIFF_TOOLS})
-
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-    endif()
+if ("tools" IN_LIST FEATURES)
+    set(_tools
+        fax2ps
+        fax2tiff
+        pal2rgb
+        ppm2tiff
+        raw2tiff
+        tiff2bw
+        tiff2pdf
+        tiff2ps
+        tiff2rgba
+        tiffcmp
+        tiffcp
+        tiffcrop
+        tiffdither
+        tiffdump
+        tiffinfo
+        tiffmedian
+        tiffset
+        tiffsplit
+    )
+    vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN)
+elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
 vcpkg_copy_pdbs()
diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake b/ports/tiff/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index a35deceee..000000000
--- a/ports/tiff/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-_find_package(${ARGS})
-
-find_package(LibLZMA CONFIG)
-find_package(JPEG)
-find_package(ZLIB)
-if(TARGET TIFF::TIFF)
-  set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA JPEG::JPEG ZLIB::ZLIB)
-  if(UNIX)
-    set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES m)
-  endif()
-endif()
-if(TIFF_LIBRARIES)
-  list(APPEND TIFF_LIBRARIES ${LZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
-  if(UNIX)
-    list(APPEND TIFF_LIBRARIES m)
-  endif()
-endif()
-if(TIFF_LIBRARY)
-  list(APPEND TIFF_LIBRARY ${LZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
-  if(UNIX)
-    list(APPEND TIFF_LIBRARY m)
-  endif()
-endif()
diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in
new file mode 100644
index 000000000..cd356483a
--- /dev/null
+++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in
@@ -0,0 +1,49 @@
+_find_package(${ARGS})
+
+set(_tiff_features ";@FEATURES@;")
+set(_tiff_link_libraries "")
+set(_tiff_libraries "")
+if(_tiff_features MATCHES ";webp;")
+    find_package(WebP CONFIG REQUIRED)
+    list(APPEND _tiff_link_libraries WebP::WebP)
+    list(APPEND _tiff_libraries ${WEBP_LIBRARIES})
+endif()
+if(_tiff_features MATCHES ";lzma;")
+    find_package(LibLZMA CONFIG REQUIRED)
+    list(APPEND _tiff_link_libraries LibLZMA::LibLZMA)
+    list(APPEND _tiff_libraries ${LZMA_LIBRARIES})
+endif()
+if(_tiff_features MATCHES ";jpeg;")
+    find_package(JPEG REQUIRED)
+    list(APPEND _tiff_link_libraries JPEG::JPEG)
+    list(APPEND _tiff_libraries ${JPEG_LIBRARIES})
+endif()
+if(_tiff_features MATCHES ";zstd;")
+    find_package(ZSTD CONFIG REQUIRED)
+    if(TARGET zstd::libzstd_shared)
+        set(_tiff_zstd zstd::libzstd_shared)
+    else()
+        set(_tiff_zstd zstd::libzstd_static)
+    endif()
+    list(APPEND _tiff_link_libraries ${_tiff_zstd})
+    list(APPEND _tiff_libraries ${_tiff_zstd})
+endif()
+if(_tiff_features MATCHES ";zip;")
+    find_package(ZLIB REQUIRED)
+    list(APPEND _tiff_link_libraries ZLIB::ZLIB)
+    list(APPEND _tiff_libraries ${ZLIB_LIBRARIES})
+endif()
+if(UNIX)
+    list(APPEND _tiff_link_libraries m)
+    list(APPEND _tiff_libraries m)
+endif()
+
+if(TARGET TIFF::TIFF)
+  set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${_tiff_link_libraries})
+endif()
+if(TIFF_LIBRARIES)
+  list(APPEND TIFF_LIBRARIES ${_tiff_libraries})
+endif()
+if(TIFF_LIBRARY)
+  list(APPEND TIFF_LIBRARY ${_tiff_libraries})
+endif()
diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json
new file mode 100644
index 000000000..494a34957
--- /dev/null
+++ b/ports/tiff/vcpkg.json
@@ -0,0 +1,55 @@
+{
+  "name": "tiff",
+  "version": "4.3.0",
+  "description": "A library that supports the manipulation of TIFF image files",
+  "homepage": "https://libtiff.gitlab.io/libtiff/",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
+  "default-features": [
+    "jpeg",
+    "lzma",
+    "zip"
+  ],
+  "features": {
+    "cxx": {
+      "description": "Build C++ libtiffxx library"
+    },
+    "jpeg": {
+      "description": "Support JPEG compression in TIFF image files",
+      "dependencies": [
+        "libjpeg-turbo"
+      ]
+    },
+    "lzma": {
+      "description": "Support LZMA compression in TIFF image files",
+      "dependencies": [
+        "liblzma"
+      ]
+    },
+    "tools": {
+      "description": "Build tools"
+    },
+    "webp": {
+      "description": "Support WEBP compression in TIFF image files",
+      "dependencies": [
+        "libwebp"
+      ]
+    },
+    "zip": {
+      "description": "Support ZIP/deflate compression in TIFF image files",
+      "dependencies": [
+        "zlib"
+      ]
+    },
+    "zstd": {
+      "description": "Support ZSTD compression in TIFF image files",
+      "dependencies": [
+        "zstd"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 97d589373..5a96b9aa6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5686,7 +5686,7 @@
     },
     "selene": {
       "baseline": "0.3.1",
-      "port-version": 3
+      "port-version": 4
     },
     "sentencepiece": {
       "baseline": "v0.1.82",
@@ -6161,8 +6161,8 @@
       "port-version": 0
     },
     "tiff": {
-      "baseline": "4.1.0",
-      "port-version": 2
+      "baseline": "4.3.0",
+      "port-version": 0
     },
     "tinkerforge": {
       "baseline": "2.1.25",
diff --git a/versions/s-/selene.json b/versions/s-/selene.json
index 7931daf9e..443e010d0 100644
--- a/versions/s-/selene.json
+++ b/versions/s-/selene.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "414a898c6d7a263608c56e4bdddfc69936a6b9d7",
+      "version": "0.3.1",
+      "port-version": 4
+    },
+    {
       "git-tree": "3e7996d3fb4faf8d14f4ea4ab7f963e66fac121e",
       "version-string": "0.3.1",
       "port-version": 3
diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json
index a62d16ebd..8a52bde57 100644
--- a/versions/t-/tiff.json
+++ b/versions/t-/tiff.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "e6f91f4785acec97b685989a9c61fa96927cf707",
+      "version": "4.3.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "fe41977af36a6513424daacb4d4686093a67e670",
       "version-string": "4.1.0",
       "port-version": 2