From 0ea963c7e79727d3b0b3f2996a9d571bf67124df Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Fri, 21 May 2021 10:44:26 +0300 Subject: [PATCH] [sail] Update to 0.9.0-pre13 (#17994) * [sail] Update to v0.9.0-pre13 * [sail] vcpkg x-add-version sail * [sail] Move SailManip configs * [sail] vcpkg x-add-version sail --overwrite-version * [sail] Remove port-version * [sail] vcpkg x-add-version sail --overwrite-version * [sail] Remove a duplicate 0.9.0-pre13 version under versions/ --- ports/sail/portfile.cmake | 12 +++++++++--- ports/sail/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sail.json | 5 +++++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index 490951bc1c..e12f36e088 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO smoked-herring/sail - REF v0.9.0-pre12 - SHA512 2082c9715b101fd15b698bc85dd3af2c47233325ddea2852fe3abcd0c456a8fd9e915fbec5c30e4c2c53bf159f843ecebf88f80f23fe0b5365a0b030f36ede5c + REF v0.9.0-pre13 + SHA512 cce4e4f3316c9cc65f2026d0734e1f962079febfcf51c59a673899dace60b71604440c647652769db97e9b253d1eb9667921da2c76ff8c2d453e768eb49585fb HEAD_REF master ) @@ -44,12 +44,18 @@ 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() + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index dc591f10e0..f1693365e1 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sail", - "version-semver": "0.9.0-pre12", - "port-version": 1, + "version-semver": "0.9.0-pre13", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/smoked-herring/sail", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 9e23a77943..a6cdae61d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5457,8 +5457,8 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre12", - "port-version": 1 + "baseline": "0.9.0-pre13", + "port-version": 0 }, "sais": { "baseline": "2.4.1-1", diff --git a/versions/s-/sail.json b/versions/s-/sail.json index 25eb657d31..c8a5acb4b9 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27feb53acf390b5f3a6a5cd4cc194c29591d4a6a", + "version-semver": "0.9.0-pre13", + "port-version": 0 + }, { "git-tree": "5494cae319135c06b4ce8d6150c90e148fb6c924", "version-semver": "0.9.0-pre12",