diff options
| -rw-r--r-- | ports/sail/portfile.cmake | 47 | ||||
| -rw-r--r-- | ports/sail/usage.unix | 16 | ||||
| -rw-r--r-- | ports/sail/vcpkg.json | 13 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/s-/sail.json | 5 |
5 files changed, 35 insertions, 48 deletions
diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index e12f36e08..c17b9d106 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -3,16 +3,16 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO smoked-herring/sail
- REF v0.9.0-pre13
- SHA512 cce4e4f3316c9cc65f2026d0734e1f962079febfcf51c59a673899dace60b71604440c647652769db97e9b253d1eb9667921da2c76ff8c2d453e768eb49585fb
+ REF v0.9.0-pre14
+ SHA512 a1b50893a9d4112f2bf2ca73e763d705615d0b110a41a1dbe8c32566b7706c054cb44d9c169163ef4f9d125242b39b55e123021fb2dad8d2f5a4d216c1a202b4
HEAD_REF master
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SAIL_STATIC)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
+
OPTIONS
-DSAIL_STATIC=${SAIL_STATIC}
-DSAIL_COMBINE_CODECS=ON
@@ -20,7 +20,7 @@ vcpkg_configure_cmake( -DSAIL_BUILD_TESTS=OFF
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
vcpkg_copy_pdbs()
@@ -29,33 +29,22 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
# Move cmake configs
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sail)
+vcpkg_cmake_config_fixup(PACKAGE_NAME sail CONFIG_PATH lib/cmake/sail DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME sailcodecs CONFIG_PATH lib/cmake/sailcodecs DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME sailcommon CONFIG_PATH lib/cmake/sailcommon DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME sailc++ CONFIG_PATH lib/cmake/sailc++ DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME sailmanip CONFIG_PATH lib/cmake/sailmanip DO_NOT_DELETE_PARENT_CONFIG_PATH)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake"
+ "${CURRENT_PACKAGES_DIR}/debug/lib/cmake")
+
# Fix pkg-config files
vcpkg_fixup_pkgconfig()
# Handle usage
-if (UNIX AND NOT APPLE)
- file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage.unix DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
- file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage.unix ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage)
-else()
- file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-endif()
-
-# Move C++ configs
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}c++)
-file(GLOB SAIL_CPP_CONFIGS "${CURRENT_PACKAGES_DIR}/share/${PORT}/SailC++*")
-foreach(SAIL_CPP_CONFIG IN LISTS SAIL_CPP_CONFIGS)
- get_filename_component(SAIL_CPP_CONFIG_NAME "${SAIL_CPP_CONFIG}" NAME)
- file(RENAME ${SAIL_CPP_CONFIG} ${CURRENT_PACKAGES_DIR}/share/${PORT}c++/${SAIL_CPP_CONFIG_NAME})
-endforeach()
-
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}manip)
-file(GLOB SAIL_MANIP_CONFIGS "${CURRENT_PACKAGES_DIR}/share/${PORT}/SailManip*")
-foreach(SAIL_MANIP_CONFIG IN LISTS SAIL_MANIP_CONFIGS)
- get_filename_component(SAIL_MANIP_CONFIG_NAME "${SAIL_MANIP_CONFIG}" NAME)
- file(RENAME ${SAIL_MANIP_CONFIG} ${CURRENT_PACKAGES_DIR}/share/${PORT}manip/${SAIL_MANIP_CONFIG_NAME})
-endforeach()
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/sail/usage.unix b/ports/sail/usage.unix deleted file mode 100644 index 6f06da874..000000000 --- a/ports/sail/usage.unix +++ /dev/null @@ -1,16 +0,0 @@ -The package sail provides CMake targets:
-
-C libraries:
-
- find_package(Sail CONFIG REQUIRED)
- target_link_libraries(main PRIVATE SAIL::sail)
-
-C++ bindings:
-
- find_package(Sail CONFIG REQUIRED)
- target_link_libraries(main PRIVATE SAIL::sail-c++)
-
-Note for static builds on Unix-like platforms: the client application
-must be built with -rdynamic or an equivalent to enable dlopen and dlsym
-on the same binary. If you use CMake, this could be achieved by setting
-CMAKE_ENABLE_EXPORTS to ON.
diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index f1693365e..4b77bfb6d 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,13 +1,22 @@ { "name": "sail", - "version-semver": "0.9.0-pre13", + "version-semver": "0.9.0-pre14", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/smoked-herring/sail", "supports": "!uwp", "dependencies": [ "giflib", + "libavif", "libjpeg-turbo", "libpng", - "tiff" + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 31e4c6074..14cddecf3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5661,7 +5661,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre13", + "baseline": "0.9.0-pre14", "port-version": 0 }, "sais": { diff --git a/versions/s-/sail.json b/versions/s-/sail.json index c8a5acb4b..c8ad05b43 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "0878a59a5c61e19c3c83c3ad8cfb4b611bfe3c54", + "version-semver": "0.9.0-pre14", + "port-version": 0 + }, + { "git-tree": "27feb53acf390b5f3a6a5cd4cc194c29591d4a6a", "version-semver": "0.9.0-pre13", "port-version": 0 |