From acd9522919772b4e0c58e857cd5c130b91cb9ccd Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 10 Jan 2026 04:42:22 +0900 Subject: [PATCH] [stlab] update to 2.2.0 (#49280) --- ports/stlab/devendoring.patch | 36 +++++++++++++++---- ports/stlab/portfile.cmake | 65 ++++++++++++++++++++--------------- ports/stlab/use-cxx-20.patch | 12 +++++++ ports/stlab/vcpkg.json | 4 +-- versions/baseline.json | 4 +-- versions/s-/stlab.json | 5 +++ 6 files changed, 88 insertions(+), 38 deletions(-) create mode 100644 ports/stlab/use-cxx-20.patch diff --git a/ports/stlab/devendoring.patch b/ports/stlab/devendoring.patch index 95c5fcaa0a..0fd1bf72fa 100644 --- a/ports/stlab/devendoring.patch +++ b/ports/stlab/devendoring.patch @@ -1,15 +1,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 671f79d..8eabae4 100644 +index 61a3ccb..108f3c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -15,8 +15,8 @@ include(cmake/CPM.cmake) +@@ -9,8 +9,7 @@ include(cmake/CPM.cmake) + # NAME cpp-library + # SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../cpp-library" + # ) +-CPMAddPackage("gh:stlab/cpp-library@5.2.0") +-include(${cpp-library_SOURCE_DIR}/cpp-library.cmake) ++include(cmake/cpp-library/cpp-library.cmake) + # Enable dependency tracking BEFORE project() + cpp_library_enable_dependency_tracking() +@@ -147,11 +146,11 @@ add_subdirectory(src) + # Dependencies (added after project() for dependency tracking) - # Add stlab-copy-on-write as a dependency --CPMAddPackage("gh:stlab/copy-on-write@1.0.3") --target_link_libraries(stlab INTERFACE stlab::copy-on-write) + # https://github.com/stlab/stlab-copy-on-write +-CPMAddPackage("gh:stlab/stlab-copy-on-write@1.1.0") +find_package(stlab-copy-on-write CONFIG REQUIRED) -+target_link_libraries(stlab PUBLIC stlab::copy-on-write) + target_link_libraries(stlab INTERFACE $) + # https://github.com/stlab/stlab-enum-ops +-CPMAddPackage("gh:stlab/stlab-enum-ops@1.2.0") ++find_package(stlab-enum-ops CONFIG REQUIRED) + target_link_libraries(stlab INTERFACE $) + + # System dependencies +@@ -183,7 +182,7 @@ endif() ######################################################## - # clangd + # Installation Support (using cpp-library dependency auto-discovery) + if(PROJECT_IS_TOP_LEVEL) +- include("${cpp-library_SOURCE_DIR}/cmake/cpp-library-install.cmake") ++ include("cmake/cpp-library/cmake/cpp-library-install.cmake") + + # Use cpp-library's install function for automatic dependency discovery + # No manual dependency mappings needed - cpp-library auto-discovers via dependency provider diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake index 069a33a5a5..b359345545 100644 --- a/ports/stlab/portfile.cmake +++ b/ports/stlab/portfile.cmake @@ -1,27 +1,38 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO stlab/libraries - REF "v${VERSION}" - SHA512 9854b93b92dd9fdb468020660c91282a70304a8e99ef07b7c4a6ba348d07c06a4da17531c1162fde64f924ab9c6faadef2b55fc73e1b443e9f8b02838dc66630 - HEAD_REF main - PATCHES - cross-build.patch - devendoring.patch -) - -file(WRITE "${SOURCE_PATH}/cmake/CPM.cmake" "# disabled by vcpkg") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/stlab) -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stlab/libraries + REF "v${VERSION}" + SHA512 b37466fa43c0a6834f8929a77cdd8d1a2230665b28be7032451fe2d3563dc2a5d475e4bd272808f652a6633f02794b82c7b135ffd1c5c064cea78b615e223d84 + HEAD_REF main + PATCHES + cross-build.patch + devendoring.patch + use-cxx-20.patch +) + +file(WRITE "${SOURCE_PATH}/cmake/CPM.cmake" "# disabled by vcpkg") + +# Replace CPM and download cpp-library directly to avoid issues with FETCHCONTENT_FULLY_DISCONNECTED +vcpkg_from_github( + OUT_SOURCE_PATH PACKAGE_PROJECT_PATH + REPO stlab/cpp-library + REF "v5.2.0" + SHA512 4ff589b4a80c63991f2e7ba18236315ee94929775aa5c6bbffb54f445d60f14c5949386b80f71ce3ed547644f557a5bc3ca317b939468e699294565f73f689d8 + HEAD_REF master +) +file(RENAME "${PACKAGE_PROJECT_PATH}" "${SOURCE_PATH}/cmake/cpp-library") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/stlab) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/stlab/use-cxx-20.patch b/ports/stlab/use-cxx-20.patch new file mode 100644 index 0000000000..a8ea18e575 --- /dev/null +++ b/ports/stlab/use-cxx-20.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 108f3c3..e8973a2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,6 +24,7 @@ cpp_library_set_version() + # Create the main library target first + add_library(stlab) + add_library(stlab::stlab ALIAS stlab) ++target_compile_features(stlab PRIVATE cxx_std_20) + + ######################################################## + diff --git a/ports/stlab/vcpkg.json b/ports/stlab/vcpkg.json index 788e7c5370..a3c3955869 100644 --- a/ports/stlab/vcpkg.json +++ b/ports/stlab/vcpkg.json @@ -1,7 +1,6 @@ { "name": "stlab", - "version": "2.0.2", - "port-version": 2, + "version": "2.2.0", "description": [ "stlab is the ongoing work of what was Adobe Software Technology Lab.", "The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures." @@ -10,6 +9,7 @@ "license": "BSL-1.0", "dependencies": [ "stlab-copy-on-write", + "stlab-enum-ops", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 2f25f9e371..72cf662632 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9445,8 +9445,8 @@ "port-version": 0 }, "stlab": { - "baseline": "2.0.2", - "port-version": 2 + "baseline": "2.2.0", + "port-version": 0 }, "stlab-copy-on-write": { "baseline": "1.1.0", diff --git a/versions/s-/stlab.json b/versions/s-/stlab.json index 1f5393c7cd..34dcb58966 100644 --- a/versions/s-/stlab.json +++ b/versions/s-/stlab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21ece7941a63cf763a93218dd4b2999ff6209222", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "7ad1e754cb563b2804b1fbedfb86b1ce94153a9f", "version": "2.0.2",