Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[sail] Disable self copying dependencies. (#51853)

This commit is contained in:
Billy O'Neal 2026-05-19 00:02:34 -07:00 committed by GitHub
parent cfb59059f3
commit 600e1197b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/sail/fix-include-directory.patch
View File

@ -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}"

12
ports/sail/no-binary-dependencies-install.diff Normal file
View File

@ -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)

1
ports/sail/portfile.cmake
View File

@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
fix-heif.patch
fix-include-directory.patch
no-binary-dependencies-install.diff
)
# Enable selected codecs

1
ports/sail/vcpkg.json
View File

@ -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",

2
versions/baseline.json
View File

@ -8978,7 +8978,7 @@
},
"sail": {
"baseline": "0.9.10",
"port-version": 0
"port-version": 1
},
"sajson": {
"baseline": "2018-09-21",

5
versions/s-/sail.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7a56a45b1fdfd2466df43ac1e4e86b05f45e86cc",
"version-semver": "0.9.10",
"port-version": 1
},
{
"git-tree": "7102d490a2126e7820cc9a15530a57b9fd326aaa",
"version-semver": "0.9.10",