Merge branch 'microsoft:master' into icu

dg0yt · web-flow · commit e74e98a42014 · 2026-08-07T22:17:06.000+02:00
diff --git a/.github/skills/shared/review-vcpkg-pr-guide.md b/.github/skills/shared/review-vcpkg-pr-guide.md
@@ -50,11 +50,11 @@ The report considers the following in particular:
 11. No vendored third-party code is used during the build. List any well-known third-party libraries found in extracted sources.
 12. The versioning scheme in vcpkg.json matches the packaged content.
 13. The license declaration in vcpkg.json matches the content installed by installing a port. Note that content in sources may be skipped in settings in portfile.cmake. If a feature in vcpkg.json installs additional content under a different license, then the feature should have a separate license declared. Treat `"license": null` as an intentional declaration that no SPDX expression is available; inspect the copyright file and installed content instead. When the only available license or copyright notice for a library appears in its header files, patches pass one representative header containing the notice directly to `vcpkg_install_copyright(FILE_LIST ...)`. Do not create a separate text file that copies or extracts the notice from the header.
-14. The generated "usage text" is brief and accurate.
+14. The generated "usage text" is brief and accurate. Custom usage files are only used if not substantially identical to generated usage, which can be checked with `vcpkg print-usage <port> [--generated]`.
 15. Ports do not use system-modifying applications such as sudo, apt, or brew.
 16. Changes in shared build helpers or `scripts/cmake` that affect many ports need explicit justification for why a global change is necessary. Do not edit frozen `scripts/cmake` helpers when a corresponding `vcpkg-*` helper port exists; require ports to adopt the helper port instead.
 17. Ports use `vcpkg_check_linkage` over mutating `VCPKG_LIBRARY_LINKAGE` directly.
-18. Files in the port directory have LF line endings.
+18. Non-patch files in the port directory have LF line endings. Patch files are normally LF-only; CRLF is acceptable in hunk lines that patch CRLF content, as produced by `git diff --output` (ignoring differences in the `index` extended header).
 19. Anything else in the changeset that conflicts with the maintainer guide.
 
 Read the PR description and conversation. Treat them as explanations, motivation, and questions to answer.
diff --git a/ports/armadillo/dependencies.patch b/ports/armadillo/dependencies.patch
@@ -1,16 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b27e3c..78d3952 100644
+index ee702f83..c29fe1d2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -260,7 +260,6 @@ message(STATUS "*** Looking for external libraries")
+@@ -273,7 +273,6 @@ message(STATUS "*** Looking for external libraries")
  ## Find LAPACK and BLAS libraries, or their optimised versions
  ##
  
 -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_aux/Modules/")
  
  if(APPLE)
    message(STATUS "Detected macOS")
-@@ -331,11 +330,16 @@ else()
+@@ -344,11 +343,16 @@ else()
      set(FlexiBLAS_FOUND false)
    endif()
    
@@ -27,19 +27,19 @@ index 5b27e3c..78d3952 100644
    
    message(STATUS "FlexiBLAS_FOUND = ${FlexiBLAS_FOUND}" )
    message(STATUS "      MKL_FOUND = ${MKL_FOUND}"       )
-@@ -449,7 +453,6 @@ else()
+@@ -464,7 +468,6 @@ else()
  endif()
  
  
 -include(ARMA_FindARPACK)
  message(STATUS "ARPACK_FOUND = ${ARPACK_FOUND}")
  
  if(ARPACK_FOUND)
-@@ -457,7 +460,6 @@ if(ARPACK_FOUND)
+@@ -472,7 +475,6 @@ if(ARPACK_FOUND)
    set(ARMA_LIBS ${ARMA_LIBS} ${ARPACK_LIBRARY})
  endif()
  
--include(ARMA_FindSuperLU5)
+-include(ARMA_FindSuperLU)
  message(STATUS "SuperLU_FOUND = ${SuperLU_FOUND}")
  
  if(SuperLU_FOUND)
diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO arma
     FILENAME "armadillo-${VERSION}.tar.xz"
-    SHA512 E5983B109242F522561A16A4C5F095F25A8F5262E9E6A5C8AC9D7FA48B1F1B1C3A2E48D5671EB02C478B378BC1759BACE9AC061434C42E7338C0C2D21779F607
+    SHA512 f605678837c821b39273f64750e6398e0feff9ca4ec507a19712436ba8c0d07ab9901ffa01b96fe77a700ea49a6c19e7a75e66bfd9127c5a09bb20bfba3bbf68
     PATCHES
         cmake-config.patch
         dependencies.patch
@@ -53,4 +53,8 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp"
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE.txt"
+        "${SOURCE_PATH}/NOTICE.txt"
+)
diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "armadillo",
-  "version": "14.4.1",
-  "port-version": 1,
+  "version": "15.4.2",
   "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use",
   "homepage": "https://arma.sourceforge.net/",
   "license": "Apache-2.0",
diff --git a/ports/aws-c-sdkutils/portfile.cmake b/ports/aws-c-sdkutils/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-sdkutils
     REF "v${VERSION}"
-    SHA512 4ca56a50f2d13d1753ecb5fa78697b9ed25dd0304723ee2c95845d873125524f274ea557a2a9d0472cbe6e4e44facc56c5b2487ffaf1801ab7f3e0f4083f678f
+    SHA512 46db6a4bc6746311d5e5eeb5888b4dd22513fe2e17c147ee40d649dea8db86a9b229e5815911fc8ae5e8f716be1df6cf4915c646ab842d5bc39f7a9ed5c36976
     HEAD_REF main
 )
 
@@ -29,4 +29,8 @@ file(REMOVE_RECURSE
 
 vcpkg_copy_pdbs()
 
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE"
+        "${SOURCE_PATH}/NOTICE"
+)
diff --git a/ports/aws-c-sdkutils/vcpkg.json b/ports/aws-c-sdkutils/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-c-sdkutils",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...",
   "homepage": "https://github.com/awslabs/aws-c-sdkutils",
   "license": "Apache-2.0",
diff --git a/ports/boinc/fix-base64-header.patch b/ports/boinc/fix-base64-header.patch
@@ -0,0 +1,17 @@
+diff --git a/lib/base64.h b/lib/base64.h
+index 0a4ad0e220d..9c8ea95d045 100644
+--- a/lib/base64.h
++++ b/lib/base64.h
+@@ -18,11 +18,8 @@
+ #ifndef BOINC_BASE64_H
+ #define BOINC_BASE64_H
+ 
+-#ifndef _WIN32
+-#include <cstdio>
+-#include <cstdlib>
++#include <stddef.h>
+ #include <string>
+-#endif
+ 
+ class InvalidBase64Exception
+ {
diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake
@@ -4,8 +4,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BOINC/boinc
     REF "client_release/${MAJOR_MINOR}/${VERSION}"
-    SHA512 68b008d8208fe8077726ec49657b76a76f3c30b3ac247cd09cf7c97b2cde126f92048fc812bf2df4cca343566654021f4a0dadb02db0ec8b91d57868cea2387d
+    SHA512 e3984f66e37f8d677696a15b9c6fa363e55c6cd4895a0d39580f2cae02049c1ac494c70603ef5b5d15df1228d7bd322fffdbde6a2cf5ec60a3c968e82dcd647a
     HEAD_REF master
+    PATCHES
+        fix-base64-header.patch # https://github.com/BOINC/boinc/pull/7205
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "boinc",
-  "version": "8.2.13",
+  "version": "8.2.15",
   "description": "Open-source software for volunteer computing and grid computing.",
   "homepage": "https://boinc.berkeley.edu/",
   "license": "LGPL-3.0-or-later",
diff --git a/ports/crashcatch/portfile.cmake b/ports/crashcatch/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO keithpotz/CrashCatch
     REF "v${VERSION}"
-    SHA512 ba3f431b1c1da9f8ead4038ff8073df3010394ce84a6976ba6b9e9f50842a3aacb367b443a92fef75317ee49cf08384a39d76b944bf1e2735d3e2a3647c63f01
+    SHA512 1f7b8a75673abf74ee417fbc679bb293a04dc48f1c4a17fd69db0b7e260a30575564c4f406d98ab37478a9515b46cdc7b044e3050462a1b1384c0f95019b40da
     HEAD_REF main
     PATCHES
         fix-disable-examples-tests.patch
diff --git a/ports/crashcatch/vcpkg.json b/ports/crashcatch/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "crashcatch",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "A cross-platform, single-header C++ crash-reporting library for modern C++ applications.",
   "homepage": "https://github.com/keithpotz/CrashCatch",
   "license": "MIT",
diff --git a/ports/nanoflann/portfile.cmake b/ports/nanoflann/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jlblancoc/nanoflann
     REF "${VERSION}"
-    SHA512 95c4e929c9e5accc99ac5f2927119ed3f8240729ed7695ed1fbe89ee96ba3498c1aa25164c57819d44f0f829a7c2b46c468932bb0bfb665bb01f60bf1bb9e02a
+    SHA512 f7340b4f0126f3e3af6729d4fdbd9c21d91f9a49bde4d1be2042bde051c736f5b40fbe2174d0792d4d0aefe6069c6330d904b50bc6d361b18812f1de42969b2c
     HEAD_REF master
 )
 
diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "nanoflann",
-  "version": "1.10.1",
+  "version": "1.12.0",
   "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).",
   "homepage": "https://github.com/jlblancoc/nanoflann",
-  "license": "BSD-3-Clause",
+  "license": "BSD-2-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/ports/nvidia-cutlass/portfile.cmake b/ports/nvidia-cutlass/portfile.cmake
@@ -1,55 +1,55 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO NVIDIA/cutlass
-    REF "v${VERSION}"
-    SHA512 435bd838b1c89a5fec45c95ac45bec78b3dd641f93665b97a2cea3d4a9a82bddb9d7cd4139afe9d749e5c6e7195521f09aff4871981eddfa546d5bf9b2dc23a3
-    HEAD_REF main
-)
-
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON_PATH "${PYTHON3}" PATH)
-vcpkg_add_to_path(PREPEND "${PYTHON_PATH}")
-
-vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT cuda_toolkit_root)
-list(APPEND FEATURE_OPTIONS
-    "-DCMAKE_CUDA_COMPILER=${NVCC}"
-    "-DCUDAToolkit_ROOT=${cuda_toolkit_root}"
-)
-
-list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/cudnn")
-find_package(CUDNN REQUIRED)
-get_filename_component(CUDNN_LIBRARY_DIR "${CUDNN_LIBRARIES}" DIRECTORY)
-set(ENV{CUDNN_PATH} "${CUDNN_LIBRARY_DIR};${CUDNN_INCLUDE_DIRS}")
-
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DCMAKE_SUPPRESS_REGENERATION=ON # for some reason it keeps regenerating in Windows
-        "-DCUTLASS_REVISION:STRING=v${VERSION}"
-        -DCUTLASS_NATIVE_CUDA=OFF
-        -DCUTLASS_ENABLE_HEADERS_ONLY=ON
-        -DCUTLASS_ENABLE_TOOLS=ON
-        -DCUTLASS_ENABLE_LIBRARY=OFF
-        -DCUTLASS_ENABLE_PROFILER=OFF
-        -DCUTLASS_ENABLE_PERFORMANCE=OFF
-        -DCUTLASS_ENABLE_TESTS=OFF
-        -DCUTLASS_ENABLE_GTEST_UNIT_TESTS=OFF
-        -DCUTLASS_ENABLE_CUBLAS=ON
-        -DCUTLASS_ENABLE_CUDNN=ON
-        "-DPython3_EXECUTABLE:FILEPATH=${PYTHON3}"
-        ${FEATURE_OPTIONS}
-    MAYBE_UNUSED_VARIABLES
-        CUTLASS_NATIVE_CUDA
-)
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/NvidiaCutlass" PACKAGE_NAME "NvidiaCutlass")
-
-
-
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug"
-    "${CURRENT_PACKAGES_DIR}/test"
-    "${CURRENT_PACKAGES_DIR}/lib"
-)
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO NVIDIA/cutlass
+    REF "v${VERSION}"
+    SHA512 dd1a3f3b3ffd8b0ba6b499311d58592edc7d5df413d03feb736b7e74938b769fedb2879b4d8a6a5ad42ca7cbd063aafd84c6e70583873df5d7f8d4bb2e5f837c
+    HEAD_REF main
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+get_filename_component(PYTHON_PATH "${PYTHON3}" PATH)
+vcpkg_add_to_path(PREPEND "${PYTHON_PATH}")
+
+vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT cuda_toolkit_root)
+list(APPEND FEATURE_OPTIONS
+    "-DCMAKE_CUDA_COMPILER=${NVCC}"
+    "-DCUDAToolkit_ROOT=${cuda_toolkit_root}"
+)
+
+list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/cudnn")
+find_package(CUDNN REQUIRED)
+get_filename_component(CUDNN_LIBRARY_DIR "${CUDNN_LIBRARIES}" DIRECTORY)
+set(ENV{CUDNN_PATH} "${CUDNN_LIBRARY_DIR};${CUDNN_INCLUDE_DIRS}")
+
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCMAKE_SUPPRESS_REGENERATION=ON # for some reason it keeps regenerating in Windows
+        "-DCUTLASS_REVISION:STRING=v${VERSION}"
+        -DCUTLASS_NATIVE_CUDA=OFF
+        -DCUTLASS_ENABLE_HEADERS_ONLY=ON
+        -DCUTLASS_ENABLE_TOOLS=ON
+        -DCUTLASS_ENABLE_LIBRARY=OFF
+        -DCUTLASS_ENABLE_PROFILER=OFF
+        -DCUTLASS_ENABLE_PERFORMANCE=OFF
+        -DCUTLASS_ENABLE_TESTS=OFF
+        -DCUTLASS_ENABLE_GTEST_UNIT_TESTS=OFF
+        -DCUTLASS_ENABLE_CUBLAS=ON
+        -DCUTLASS_ENABLE_CUDNN=ON
+        "-DPython3_EXECUTABLE:FILEPATH=${PYTHON3}"
+        ${FEATURE_OPTIONS}
+    MAYBE_UNUSED_VARIABLES
+        CUTLASS_NATIVE_CUDA
+)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/NvidiaCutlass" PACKAGE_NAME "NvidiaCutlass")
+
+
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug"
+    "${CURRENT_PACKAGES_DIR}/test"
+    "${CURRENT_PACKAGES_DIR}/lib"
+)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/nvidia-cutlass/vcpkg.json b/ports/nvidia-cutlass/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nvidia-cutlass",
-  "version": "4.5.2",
+  "version": "4.6.1",
   "description": "CUDA Templates for Linear Algebra Subroutines",
   "homepage": "https://github.com/NVIDIA/cutlass",
   "license": "BSD-3-Clause",
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
@@ -96,7 +96,6 @@ aravis[introspection]:arm64-windows=skip # needs arm64 host
 aravis[usb]:arm64-linux=cascade
 armadillo:arm-neon-android=cascade
 armadillo:arm64-android=cascade
-armadillo:arm64-linux=cascade
 armadillo:x64-android=cascade
 arpack-ng:arm64-linux=cascade
 arpack-ng:arm64-windows=cascade
diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "91dd42817d9c5da731dfaa226083b201b6ab681e",
+      "version": "15.4.2",
+      "port-version": 0
+    },
     {
       "git-tree": "0f116cda098b88510f370ee379175762873550cb",
       "version": "14.4.1",
diff --git a/versions/a-/aws-c-sdkutils.json b/versions/a-/aws-c-sdkutils.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e148ccc44209d73772107a0f8ad770926339f6bd",
+      "version": "0.2.9",
+      "port-version": 0
+    },
     {
       "git-tree": "c97bbe5eac74e74010a565b5039d3f1957c58398",
       "version": "0.2.8",
diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b4cea3c49b1b3ce71ed4523f887824e38f341c84",
+      "version": "8.2.15",
+      "port-version": 0
+    },
     {
       "git-tree": "8b0a7d121590b4e866e9c5cc25a906350b235e76",
       "version": "8.2.13",
diff --git a/versions/baseline.json b/versions/baseline.json
diff --git a/versions/c-/crashcatch.json b/versions/c-/crashcatch.json
diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json
diff --git a/versions/n-/nvidia-cutlass.json b/versions/n-/nvidia-cutlass.json

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "armadillo",`
`3`		`- "version": "14.4.1",`
`4`		`- "port-version": 1,`
	`3`	`+ "version": "15.4.2",`
`5`	`4`	`"description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use",`
`6`	`5`	`"homepage": "https://arma.sourceforge.net/",`
`7`	`6`	`"license": "Apache-2.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aws-c-sdkutils",`
`3`		`- "version": "0.2.8",`
	`3`	`+ "version": "0.2.9",`
`4`	`4`	`"description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...",`
`5`	`5`	`"homepage": "https://github.com/awslabs/aws-c-sdkutils",`
`6`	`6`	`"license": "Apache-2.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "boinc",`
`3`		`- "version": "8.2.13",`
	`3`	`+ "version": "8.2.15",`
`4`	`4`	`"description": "Open-source software for volunteer computing and grid computing.",`
`5`	`5`	`"homepage": "https://boinc.berkeley.edu/",`
`6`	`6`	`"license": "LGPL-3.0-or-later",`