From 600e1197b22d416d9b8486da170b0558c05703ff Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 19 May 2026 00:02:34 -0700 Subject: [PATCH] [sail] Disable self copying dependencies. (#51853) --- ports/sail/fix-include-directory.patch | 18 +++++++++--------- ports/sail/no-binary-dependencies-install.diff | 12 ++++++++++++ ports/sail/portfile.cmake | 1 + ports/sail/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sail.json | 5 +++++ 6 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 ports/sail/no-binary-dependencies-install.diff diff --git a/ports/sail/fix-include-directory.patch b/ports/sail/fix-include-directory.patch index 150907112a..75f50210e4 100644 --- a/ports/sail/fix-include-directory.patch +++ b/ports/sail/fix-include-directory.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac81279..cfc2f3b 100644 +index df970d3..7c4df5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -299,7 +299,7 @@ endif() +@@ -298,7 +298,7 @@ endif() # Common configuration file # configure_file("${PROJECT_SOURCE_DIR}/src/config.h.in" "${PROJECT_BINARY_DIR}/include/sail-common/config.h" @ONLY) @@ -12,10 +12,10 @@ index ac81279..cfc2f3b 100644 # Print configuration statistics # diff --git a/src/bindings/sail-c++/CMakeLists.txt b/src/bindings/sail-c++/CMakeLists.txt -index 4b69ad4..f4bac29 100644 +index a4ad915..6806f2f 100644 --- a/src/bindings/sail-c++/CMakeLists.txt +++ b/src/bindings/sail-c++/CMakeLists.txt -@@ -131,7 +131,7 @@ install(TARGETS sail-c++ +@@ -134,7 +134,7 @@ install(TARGETS sail-c++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" @@ -25,7 +25,7 @@ index 4b69ad4..f4bac29 100644 # Install development packages # diff --git a/src/sail-common/CMakeLists.txt b/src/sail-common/CMakeLists.txt -index 06ce246..c8576e5 100644 +index 5193f90..0e689f7 100644 --- a/src/sail-common/CMakeLists.txt +++ b/src/sail-common/CMakeLists.txt @@ -114,7 +114,7 @@ endif() @@ -47,10 +47,10 @@ index 06ce246..c8576e5 100644 # Install development packages # diff --git a/src/sail-manip/CMakeLists.txt b/src/sail-manip/CMakeLists.txt -index 5740764..47b81bb 100644 +index 334a423..4ad54b2 100644 --- a/src/sail-manip/CMakeLists.txt +++ b/src/sail-manip/CMakeLists.txt -@@ -59,7 +59,7 @@ install(TARGETS sail-manip +@@ -67,7 +67,7 @@ install(TARGETS sail-manip ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" @@ -60,10 +60,10 @@ index 5740764..47b81bb 100644 # Install development packages # diff --git a/src/sail/CMakeLists.txt b/src/sail/CMakeLists.txt -index 85590af..2303f63 100644 +index 9fd7119..ec4be36 100644 --- a/src/sail/CMakeLists.txt +++ b/src/sail/CMakeLists.txt -@@ -118,11 +118,11 @@ install(TARGETS sail +@@ -125,11 +125,11 @@ install(TARGETS sail ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" diff --git a/ports/sail/no-binary-dependencies-install.diff b/ports/sail/no-binary-dependencies-install.diff new file mode 100644 index 0000000000..9a057b4d1d --- /dev/null +++ b/ports/sail/no-binary-dependencies-install.diff @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c4df5c..23ef1e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -277,7 +277,6 @@ if (SAIL_VCPKG AND WIN32) + set(SAIL_VCPKG_BIN_PATH "${CMAKE_TOOLCHAIN_FILE}/../../../installed/${VCPKG_TARGET_TRIPLET}/debug/bin") + endif() + get_filename_component(SAIL_VCPKG_BIN_PATH "${SAIL_VCPKG_BIN_PATH}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}") +- install(DIRECTORY "${SAIL_VCPKG_BIN_PATH}/" DESTINATION ${SAIL_EXTRA_LIBS_INSTALL_PATH} OPTIONAL) + endif() + + if (ENABLED_CODECS) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index 64bc55420c..65470624c7 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-heif.patch fix-include-directory.patch + no-binary-dependencies-install.diff ) # Enable selected codecs diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index ac95863822..be06177425 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sail", "version-semver": "0.9.10", + "port-version": 1, "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1de8b8cb01..5404d0925e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8978,7 +8978,7 @@ }, "sail": { "baseline": "0.9.10", - "port-version": 0 + "port-version": 1 }, "sajson": { "baseline": "2018-09-21", diff --git a/versions/s-/sail.json b/versions/s-/sail.json index f631474f2c..098b29559c 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a56a45b1fdfd2466df43ac1e4e86b05f45e86cc", + "version-semver": "0.9.10", + "port-version": 1 + }, { "git-tree": "7102d490a2126e7820cc9a15530a57b9fd326aaa", "version-semver": "0.9.10",