From 8b63797138a2d4305e57b2952ada520966f99898 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 7 May 2022 07:54:57 +0800 Subject: [PATCH] [live555/guilite/polymorphic-value] Update version (#24555) * [live555/guilite] Update version * [polymorphic-value] Update version Co-authored-by: Cheney-Wang --- ports/guilite/portfile.cmake | 7 ++-- ports/guilite/vcpkg.json | 5 +-- ports/live555/portfile.cmake | 6 ++-- ports/live555/vcpkg.json | 3 +- .../001_no_catch_submodule.patch | 33 ----------------- .../polymorphic-value/002_fixed_config.patch | 14 -------- ports/polymorphic-value/portfile.cmake | 35 +++++++------------ ports/polymorphic-value/vcpkg.json | 17 +++++++-- versions/baseline.json | 6 ++-- versions/g-/guilite.json | 5 +++ versions/l-/live555.json | 5 +++ versions/p-/polymorphic-value.json | 5 +++ 12 files changed, 57 insertions(+), 84 deletions(-) delete mode 100644 ports/polymorphic-value/001_no_catch_submodule.patch delete mode 100644 ports/polymorphic-value/002_fixed_config.patch diff --git a/ports/guilite/portfile.cmake b/ports/guilite/portfile.cmake index 70189fd611..ff509f9bcb 100644 --- a/ports/guilite/portfile.cmake +++ b/ports/guilite/portfile.cmake @@ -1,8 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO "idea4good/GuiLite" - SHA512 "9132f854f2e0d517797a3b30458ac692b509cb5a2fea2bff606b6b84b60a5760311f488c77f2dc21e954a14378e8d803d555750f90d00d5655e216a2a0c83ce8" - REF "master" + REPO idea4good/GuiLite + REF 61d1bd94cbc35da74c0f3c40422a7d783c04d40b + SHA512 b428e9bfc62fabb4d23d4c39b78d521aa13eb52e571a5aaab7609a03bb88e6f2184587885cd4df950eb5f48dece2b8fbff2264f158251ed06c6a6415b9b59f1a + HEAD_REF master ) file(INSTALL "${SOURCE_PATH}/GuiLite.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") diff --git a/ports/guilite/vcpkg.json b/ports/guilite/vcpkg.json index 6cbda897a3..630d5c6cd4 100644 --- a/ports/guilite/vcpkg.json +++ b/ports/guilite/vcpkg.json @@ -1,6 +1,7 @@ { "name": "guilite", - "version-date": "2021-07-31", + "version-date": "2022-05-05", "description": "The smallest header-only GUI library (4 KLOC) for all platforms.", - "homepage": "https://github.com/idea4good/GuiLite" + "homepage": "https://github.com/idea4good/GuiLite", + "license": "Apache-2.0" } diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index 2897dd9502..b11e4d076b 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://www.live555.com/liveMedia/public/live.2021.12.18.tar.gz" - FILENAME "live.2021.12.18.tar.gz" - SHA512 072ae92a1a63687e33c659627fbf562e6f2cdf73cf1c3199959aa3a713636ccd4113d56270c4793c86b42338000f180e16a7b2cf3d893402226a04360f8b2e97 + URLS "http://www.live555.com/liveMedia/public/live.2022.04.26.tar.gz" + FILENAME "live.2022.04.26.tar.gz" + SHA512 0226a451129df1d47d10bc96ef2a9ab8ffb0116fd0daac8b16a1dd57b319b9058b587955a01bc4a939c3f64659915815fe182c8c7b02cb286313ff132dcbe144 ) vcpkg_extract_source_archive_ex( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index 96a9276449..cff2518383 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,8 +1,9 @@ { "name": "live555", - "version-date": "2021-12-18", + "version-date": "2022-05-05", "description": "A complete RTSP server application", "homepage": "https://www.live555.com/liveMedia", + "license": "GPL-3.0-or-later", "dependencies": [ "openssl", { diff --git a/ports/polymorphic-value/001_no_catch_submodule.patch b/ports/polymorphic-value/001_no_catch_submodule.patch deleted file mode 100644 index 8fec58a76a..0000000000 --- a/ports/polymorphic-value/001_no_catch_submodule.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git C:/Users/Charles Barto/Source/vcpkg/buildtrees/polymorphic-value/src/1.3.0-33dc249788/CMakeLists.txt C:/Users/Charles Barto/patched_list.txt -index 2819bf6a4..0ee5fba76 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,9 +9,9 @@ set(POLYMOPHIC_VALUE_VERSION "1.3.0") # Revision 3, see paper p0201r3 - project(polymorphic_value VERSION ${POLYMOPHIC_VALUE_VERSION}) - - option(ENABLE_SANITIZERS "Enable Address Sanitizer and Undefined Behaviour Sanitizer if available" OFF) -- -+if(BUILD_TESTING) - add_subdirectory(externals/catch) -- -+endif() - add_library(polymorphic_value INTERFACE) - target_include_directories(polymorphic_value - INTERFACE -@@ -45,6 +45,7 @@ target_compile_features(polymorphic_value - add_library(polymorphic_value::polymorphic_value ALIAS polymorphic_value) - - if(POLYMORPHIC_IS_NOT_SUBPROJECT) -+ if(BUILD_TESTING) - add_executable(test_polymorphic_value test_polymorphic_value.cpp) - target_link_libraries(test_polymorphic_value - PRIVATE -@@ -107,7 +108,7 @@ if(POLYMORPHIC_IS_NOT_SUBPROJECT) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/externals/catch/contrib) - include(Catch) - catch_discover_tests(test_polymorphic_value) -- -+ endif() - install( - FILES - "${CMAKE_CURRENT_SOURCE_DIR}/polymorphic_value.h" diff --git a/ports/polymorphic-value/002_fixed_config.patch b/ports/polymorphic-value/002_fixed_config.patch deleted file mode 100644 index 77a99b0586..0000000000 --- a/ports/polymorphic-value/002_fixed_config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/./broken_config.cmake.in b/./fixed_config.cmake.in -index e64f8a20f..38c441451 100644 ---- a/polymorphic_value-config.cmake.in -+++ b/polymorphic_value-config.cmake.in -@@ -1,5 +1,7 @@ - @PACKAGE_INIT@ - --set_and_check(POLYMORPHIC_VALUE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") - --check_required_components(Foo) -+ -+check_required_components(polymorphic_value) -+ -+include(${CMAKE_CURRENT_LIST_DIR}/polymorphic_value-target.cmake) diff --git a/ports/polymorphic-value/portfile.cmake b/ports/polymorphic-value/portfile.cmake index 5a03c827b8..56c665a55a 100644 --- a/ports/polymorphic-value/portfile.cmake +++ b/ports/polymorphic-value/portfile.cmake @@ -1,32 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jbcoe/polymorphic_value - REF 1.3.0 - SHA512 67d49933c46d2a2bccb68c65c6f28b92603e193c68ff434b2c6b1602a573855a176fc98227d85cd24a64ae9299461adb42e792b4f165482bb250488620161742 - HEAD_REF master - PATCHES 001_no_catch_submodule.patch - 002_fixed_config.patch + REF 8b386a006c68c25c8f8c119c1f9620a916fb5afc #v1.3.0 + SHA512 4b131b5d7c86d589418d85f25afcee70ceb48c11d2ea807ef0e97667ba273ee27659ebf95a2a7aefb6379e43bb8e5f3c25d7921cfa348ca53db4b56a5336933c + HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -if(VCPKG_HEAD_VERSION) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/polymorphic_value TARGET_PATH share/polymorphic_value) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -else() - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/polymorphic_value) - file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE.txt") -endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file( - INSTALL ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright -) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/polymorphic_value) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/polymorphic-value/vcpkg.json b/ports/polymorphic-value/vcpkg.json index a47f482943..8604b74005 100644 --- a/ports/polymorphic-value/vcpkg.json +++ b/ports/polymorphic-value/vcpkg.json @@ -1,7 +1,18 @@ { "name": "polymorphic-value", - "version-string": "1.3.0", - "port-version": 2, + "version": "1.3.0", + "port-version": 3, "description": "A polymorphic value-type for C++", - "homepage": "https://github.com/jbcoe/polymorphic_value" + "homepage": "https://github.com/jbcoe/polymorphic_value", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a8d2487d28..77ad9a11d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2697,7 +2697,7 @@ "port-version": 2 }, "guilite": { - "baseline": "2021-07-31", + "baseline": "2022-05-05", "port-version": 0 }, "gumbo": { @@ -4249,7 +4249,7 @@ "port-version": 0 }, "live555": { - "baseline": "2021-12-18", + "baseline": "2022-05-05", "port-version": 0 }, "llfio": { @@ -5510,7 +5510,7 @@ }, "polymorphic-value": { "baseline": "1.3.0", - "port-version": 2 + "port-version": 3 }, "ponder": { "baseline": "3.0.0", diff --git a/versions/g-/guilite.json b/versions/g-/guilite.json index db73a1105b..c0a80fd208 100644 --- a/versions/g-/guilite.json +++ b/versions/g-/guilite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43572106c3593ef39db61013f97d37d33c867542", + "version-date": "2022-05-05", + "port-version": 0 + }, { "git-tree": "c68992e6acdc51afc39edfdfe1342ecbd197bee6", "version-date": "2021-07-31", diff --git a/versions/l-/live555.json b/versions/l-/live555.json index 68c898e36c..df73995423 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7dd605bbfb6b2532b7c127eac435600750b3c601", + "version-date": "2022-05-05", + "port-version": 0 + }, { "git-tree": "d2d9c96e8a0fa3a6af648952b384dc53504bf738", "version-date": "2021-12-18", diff --git a/versions/p-/polymorphic-value.json b/versions/p-/polymorphic-value.json index aa4f3ba72a..0def53380e 100644 --- a/versions/p-/polymorphic-value.json +++ b/versions/p-/polymorphic-value.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "439fca88a0bc0bf3bb8639dafe418eed9b21214b", + "version": "1.3.0", + "port-version": 3 + }, { "git-tree": "5eeefe34f5fbc12cbf9c7b1a6cd231bf0c455d6e", "version-string": "1.3.0",