Merge branch 'microsoft:master' into meson-1.6

microsoft · Oct 22, 2024 · 006ed32 · 006ed32
2 parents db30b35 + c8582b4
commit 006ed32
Show file tree

Hide file tree

Showing 1,356 changed files with 8,210 additions and 8,869 deletions.
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
@@ -8,14 +8,14 @@ if("tao" IN_LIST FEATURES)
  vcpkg_download_distfile(ARCHIVE
  URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
  FILENAME "ACE-TAO-${VERSION}.tar.gz"
- SHA512 ee46897e13ba943c48d7b04c0792cef8ff48403b048af4eeced4bbfd874dece5ec1130a18216fd31fdbd610e3947673e56e306ab52ee3f1124975b1adaf21838
+ SHA512 e1eb967920eca25a131cb798312877be60790790c97439a99c1db0819749fa26e06f04090c50aed6fac80bfaafd58473e396f67ec24724587104f2b33cdfb703
  )
 else()
  # Don't change to vcpkg_from_github! This points to a release and not an archive
  vcpkg_download_distfile(ARCHIVE
  URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
  FILENAME "ACE-src-${VERSION}.tar.gz"
- SHA512 a29f8009e8f9e12c7c6d4ad9f39f76a62245baeb9fcfe08e346c1a004aedb5ab9d808a2390cde2dc71013be1b0de2ddd9d0dea26144536061e6416554233f547
+ SHA512 2010dcb07758e3d8400fa267b48a4ac0090d620955bee16f1ab3f4f7670c34b7464872b965f8078c7b1eec48d586367ae136cd0095946a75a69bac379d3bf781
  )
 endif()
 

diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "ace",
- "version": "8.0.0",
+ "version": "8.0.1",
  "maintainers": "Johnny Willemsen <jwillemsen@remedy.nl>",
  "description": "The ADAPTIVE Communication Environment",
  "homepage": "https://github.com/DOCGroup/ACE_TAO",

diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json
@@ -1,10 +1,10 @@
 {
  "name": "activemq-cpp",
  "version-semver": "3.9.5",
- "port-version": 16,
+ "port-version": 17,
  "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
  "license": "Apache-2.0",
- "supports": "!(uwp | osx)",
+ "supports": "(windows & !uwp & (x86 | x64)) | (!windows & !osx)",
  "dependencies": [
  "apr",
  {

diff --git a/ports/aklomp-base64/portfile.cmake b/ports/aklomp-base64/portfile.cmake
@@ -2,12 +2,17 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO aklomp/base64
  REF "v${VERSION}"
- SHA512 d63c6b36c99abcdfadf3730096c3a7cd36593526dd3dae815035ce196d3354ece7da1d92ecec800a81e1ab5e1d878b24f0b1de62b7aca516170d06a07c1b42a2
+ SHA512 9f8ca8a6e9feb8ad98158d675ec3331e83c77401d2633de0e43b62e794682a9d63c03e1c2599981ad3cdb249e263964f6a79084dbdf2ca19a1e1eed6195a98f4
  HEAD_REF master
 )
 
 vcpkg_cmake_configure(
- SOURCE_PATH ${SOURCE_PATH}
+ SOURCE_PATH "${SOURCE_PATH}"
+ OPTIONS
+ -DBASE64_BUILD_CLI=OFF
+ -DBASE64_REGENERATE_TABLES=OFF
+ -DBASE64_WERROR=OFF
+ -DBASE64_WITH_OpenMP=OFF
 )
 
 vcpkg_cmake_install()

diff --git a/ports/aklomp-base64/vcpkg.json b/ports/aklomp-base64/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "aklomp-base64",
- "version": "0.5.1",
+ "version": "0.5.2",
  "description": "Implementation of a base64 stream encoding/decoding library in C99 with SIMD (AVX2, AVX512, NEON, AArch64/NEON, SSSE3, SSE4.1, SSE4.2, AVX) and OpenMP acceleration",
  "homepage": "https://github.com/aklomp/base64",
  "license": "BSD-2-Clause",

diff --git a/ports/alembic/fix-runtime-destination.patch b/ports/alembic/fix-runtime-destination.patch
diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake
@@ -4,10 +4,8 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO alembic/alembic
  REF "${VERSION}"
- SHA512 6371b830242be90d4ea833248df5fd42d9e713e305d15eb1383d04410319acdae5743d48d65e8f75f1cedce777d2af7d969cde095f678b17322c19f1c69f477b
+ SHA512 510cc85346b685833091cd616ad6d8a3ba602e716747ab8dea6573abbaa1a2d49eed80b2d566b68293df78f3f3b9cf412ff4e3515f0d37951d63b9634b207a08
  HEAD_REF master
- PATCHES
- fix-runtime-destination.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS)

diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "alembic",
- "version": "1.8.6",
+ "version": "1.8.7",
  "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.",
  "homepage": "https://alembic.io/",
  "supports": "!(windows & x86) & !uwp",

diff --git a/ports/alpaka/portfile.cmake b/ports/alpaka/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO alpaka-group/alpaka
  REF ${VERSION}
- SHA512 ee5354c498c9be12f4885d08c1ab9c11e67e3c305ea90c82605e061bd1a3b4efcc1ae17fb92d0cc9c2b402e8ba44431149409d4df903a2c355c382ae07ec9bcd
+ SHA512 ef161c43cafaa4e6cfa8944855dbdafe260d97b23e9275716608301ffffc0f088a3f8bf2f01dc34c38639cf40fe4266e4f48126684ba824a6db6ef3c13fd873f
  HEAD_REF develop
 )
 set(VCPKG_BUILD_TYPE release)

diff --git a/ports/alpaka/vcpkg.json b/ports/alpaka/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "alpaka",
- "version": "1.1.0",
+ "version": "1.2.0",
  "description": "The alpaka library is a header-only abstraction library for accelerator development",
  "homepage": "https://github.com/alpaka-group/alpaka",
  "license": "MPL-2.0",

diff --git a/ports/apr/0100-add-host-tools-dir.diff b/ports/apr/0100-add-host-tools-dir.diff
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d16eec6..92146f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,13 +87,17 @@ STRING(REGEX REPLACE ".*#define APR_PATCH_VERSION[ \t]+([0-9]+).*" "\\1" APR_PAT
+
+ CONFIGURE_FILE(include/apr.hwc
+ ${PROJECT_BINARY_DIR}/apr.h)
+
+ ADD_EXECUTABLE(gen_test_char tools/gen_test_char.c)
+
++set(UNOFFICIAL_APR_HOST_TOOLS_DIR "$<TARGET_FILE_DIR:gen_test_char>" CACHE STRING "")
++set(UNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX "$<TARGET_PROPERTY:gen_test_char,SUFFIX>" CACHE STRING "")
++install(TARGETS gen_test_char)
++
+ ADD_CUSTOM_COMMAND(
+ COMMENT "Generating character tables, apr_escape_test_char.h, for current locale"
+ DEPENDS gen_test_char
+- COMMAND $<TARGET_FILE:gen_test_char> > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
++ COMMAND "${UNOFFICIAL_APR_HOST_TOOLS_DIR}/gen_test_char${UNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX}" > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
+ OUTPUT ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
+ )
+ ADD_CUSTOM_TARGET(
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
@@ -1,6 +1,3 @@
-
-set(VERSION 1.7.5)
-
 vcpkg_download_distfile(ARCHIVE
  URLS "https://archive.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
  FILENAME "apr-${VERSION}.tar.bz2"
@@ -11,8 +8,19 @@ vcpkg_extract_source_archive(SOURCE_PATH
  ARCHIVE "${ARCHIVE}"
  PATCHES
  unglue.patch
+ 0100-add-host-tools-dir.diff
 )
 
+set(CURRENT_HOST_TOOLS_DIR "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}")
+
+set(CROSSCOMPILING_OPTIONS "")
+if(VCPKG_CROSSCOMPILING)
+ list(APPEND CROSSCOMPILING_OPTIONS
+ "-DUNOFFICIAL_APR_HOST_TOOLS_DIR=${CURRENT_HOST_TOOLS_DIR}"
+ "-DUNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX=${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+ )
+endif()
+
 if (VCPKG_TARGET_IS_WINDOWS)
  vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  FEATURES
@@ -32,6 +40,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
  -DMIN_WINDOWS_VER=Windows7
  -DAPR_HAVE_IPV6=ON
  ${FEATURE_OPTIONS}
+ ${CROSSCOMPILING_OPTIONS}
  )
 
  vcpkg_cmake_install()
@@ -42,6 +51,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
  )
  # There is no way to suppress installation of the headers in debug builds.
  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+ vcpkg_copy_tools(TOOL_NAMES gen_test_char AUTO_CLEAN)
 
  vcpkg_copy_pdbs()
 

diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
@@ -1,12 +1,17 @@
 {
  "name": "apr",
  "version": "1.7.5",
- "port-version": 1,
+ "port-version": 2,
  "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
  "homepage": "https://apr.apache.org/",
  "license": "Apache-2.0",
- "supports": "!uwp",
+ "supports": "!uwp & !mingw",
  "dependencies": [
+ {
+ "name": "apr",
+ "host": true,
+ "platform": "windows"
+ },
  {
  "name": "vcpkg-cmake",
  "host": true,

diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake
@@ -1,8 +1,10 @@
+set(VCPKG_BUILD_TYPE release) # header-only
+
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO Tradias/asio-grpc
  REF "v${VERSION}"
- SHA512 c94ffd8270728d15e60a2605413ec703fa8426088b0b0fea152e462fb7016eac3309deeb830ef7251a024b05884f7c8268974c84233701da0aeecd325aa42344
+ SHA512 4736b5e4e3e891417391374e21f06a51b135791ced82f7f1c4c0f0d6ead275ea81f8f97812a9570376463f4a18c8a43b73d6f75db624c19337b6553cedf8f2b3
  HEAD_REF master
 )
 

diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "asio-grpc",
- "version": "3.2.0",
+ "version": "3.2.1",
  "description": "Asynchronous gRPC with Asio/unified executors",
  "homepage": "https://github.com/Tradias/asio-grpc",
  "license": "Apache-2.0",

diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO redboltz/async_mqtt
  REF "${VERSION}"
- SHA512 25aa9b5ceb32247025143531bb849ecb52a5d54dc671bf4739e99c2190082e497b857c97245bae5adbc62b3e0cedefab712a71ba422b992756a47eab9d192f9e
+ SHA512 cf76113f9fc3999c83781ca8213dbaa18edb5f4c081366b25ed1581cb955f8dfd562175bbd6ba5c127e560d5f9a0e013e42185211a4de77e76cdd44b279873a6
  HEAD_REF main
 )
 

diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "async-mqtt",
- "version": "9.0.1",
+ "version": "9.0.2",
  "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.",
  "homepage": "https://github.com/redboltz/async_mqtt",
  "license": "BSL-1.0",

diff --git a/ports/asyncplusplus/portfile.cmake b/ports/asyncplusplus/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO Amanieu/asyncplusplus
- REF 172ca3f8e0df1b3f7f5ee8b8244e4ac67258b0d8 # v1.1
- SHA512 fd95b3349ceed4cab5cb0e146d2ccfe77c85318303015cf513037fc69c1ade7cfdb3dc81de8a90846c4387c5e31f5a70a64da770547c201dfe24d2c181be1933
+ REF v1.2
+ SHA512 4b59ef805d4683631ef2ba51039deb210d9ba28b35021489560b0f2da6f75a68da8cb676807f9831047c997673556f69fdca0ae2081996274015e708fd6ff55e
  HEAD_REF master
 )
 

diff --git a/ports/asyncplusplus/vcpkg.json b/ports/asyncplusplus/vcpkg.json
@@ -1,7 +1,6 @@
 {
  "name": "asyncplusplus",
- "version": "1.1",
- "port-version": 2,
+ "version": "1.2",
  "description": "Async++ is a lightweight concurrency framework for C++11",
  "license": "MIT",
  "supports": "!uwp",

diff --git a/ports/aurora-au/disable-googletest.patch b/ports/aurora-au/disable-googletest.patch
@@ -0,0 +1,41 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b18407f..f1be4c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,9 +52,6 @@ FetchContent_Declare(
+ # For Windows: Prevent overriding the parent project's compiler/linker settings
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
+-FetchContent_MakeAvailable(googletest)
+-include(GoogleTest)
+-
+ add_subdirectory(au)
+
+ # Configure how Au will be installed.
+diff --git a/cmake/AuConfig.cmake.in b/cmake/AuConfig.cmake.in
+index b121f76..65da38a 100644
+--- a/cmake/AuConfig.cmake.in
++++ b/cmake/AuConfig.cmake.in
+@@ -14,9 +14,6 @@
+
+ @PACKAGE_INIT@
+
+-include(CMakeFindDependencyMacro)
+-find_dependency(googletest 1.12.1)
+-
+ include(${CMAKE_CURRENT_LIST_DIR}/AuHeaders.cmake)
+
+ check_required_components(Au)
+diff --git a/cmake/HeaderOnlyLibrary.cmake b/cmake/HeaderOnlyLibrary.cmake
+index 28daf00..f2bf389 100644
+--- a/cmake/HeaderOnlyLibrary.cmake
++++ b/cmake/HeaderOnlyLibrary.cmake
+@@ -75,7 +75,7 @@ function(header_only_library)
+ )
+
+ # Add the test, if requested.
+- if (DEFINED ARG_GTEST_SRCS)
++ if (0)
+ add_executable("${ARG_NAME}_test")
+ target_sources("${ARG_NAME}_test" PRIVATE ${ARG_GTEST_SRCS})
+ target_link_libraries(
diff --git a/ports/aurora-au/portfile.cmake b/ports/aurora-au/portfile.cmake
@@ -0,0 +1,23 @@
+set(VCPKG_BUILD_TYPE release) # header-only
+
+vcpkg_from_github(
+ OUT_SOURCE_PATH SOURCE_PATH
+ REPO aurora-opensource/au
+ REF "${VERSION}"
+ SHA512 4aa3282f6b76fbadd04ca572734f72c86b1b0b4e85fc21a03d1ab00b83d3aea319ab2dac3934361b5f6fa7c4a0dccece94fe0a57f3d73d208315b51b1950e374
+ HEAD_REF main
+ PATCHES 
+ disable-googletest.patch
+)
+
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+ CONFIG_PATH lib/cmake/Au
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Remove empty directory
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/aurora-au/usage b/ports/aurora-au/usage
@@ -0,0 +1,4 @@
+The package aurora-au provides CMake targets:
+
+ find_package(Au REQUIRED)
+ target_link_libraries(main PRIVATE Au::au)
diff --git a/ports/aurora-au/vcpkg.json b/ports/aurora-au/vcpkg.json
@@ -0,0 +1,19 @@
+{
+ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+ "name": "aurora-au",
+ "version-semver": "0.3.5",
+ "description": "A C++14-compatible physical units library with no dependencies and a single-file delivery option. Emphasis on safety, accessibility, performance, and developer experience.",
+ "homepage": "https://github.com/aurora-opensource/au",
+ "license": "Apache-2.0",
+ "supports": "!osx",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ]
+}
diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO awslabs/aws-c-common
  REF "v${VERSION}"
- SHA512 25da9356e36c87210bcdd95b007824288f36fd3ae4bdd757a1d3e88ef3cc8b65a0c1a31cbe338147949257c8e908c1721fc6297aeb0cbfe7cb89b4d7727dc2ad
+ SHA512 482bfeb5c7dac16486236417af0f5c0a20bc36c271aaf32088d188186861d61bf0b96c5da13a1c88853fdc6a1fb8b8db254a547c3648a659ec6e91177978dc9b
  HEAD_REF master
  PATCHES
  disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow

diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "aws-c-common",
- "version": "0.9.28",
+ "version": "0.9.30",
  "description": "AWS common library for C",
  "homepage": "https://github.com/awslabs/aws-c-common",
  "license": "Apache-2.0",

diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO awslabs/aws-c-mqtt
  REF "v${VERSION}"
- SHA512 ecb8be77edbbeac4633bd57878251f9debdf0c86654a70a2299ae9c03a8852e015b65d82a98076ea44df0b2dc3ddfead7735c2b5ff03025b2d749f873dc0f049
+ SHA512 4384d20020ee9dbb84db9db7c4feb32477f42990bf4c1412e48184675f10d9056b4433d825056ed8302654788dd1131c3150e99cb173c92520695f8d09311fe3
  HEAD_REF master
 )