Merge branch 'microsoft:master' into master

LORD-MicroStrain · May 24, 2024 · 90be37d · 90be37d
2 parents 86e9122 + 59aeb8f
commit 90be37d
Show file tree

Hide file tree

Showing 1,875 changed files with 19,836 additions and 15,483 deletions.
diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -211,16 +211,7 @@ $ xcode-select --install
 
 ### CLion 中使用 vcpkg
 
-打开 Toolchains 设置
-(File > Settings on Windows and Linux, CLion > Preferences on macOS)，
-并打开 CMake 设置 (Build, Execution, Deployment > CMake)。
-最后在 `CMake options` 中添加以下行:
-
-```
--DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake
-```
-
-您必须手动将此选项加入每个项目配置文件中。
+Vcpkg 已经集成在 CLion IDE 中。具体操作请参见[官方文档](https://www.jetbrains.com/help/clion/package-management.html)。
 
 ### 将 vcpkg 作为一个子模块
 

diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
     REF "${VERSION}"
-    SHA512 41504899ac4fd4a6eaa0a5fdf27a7765ec81962fb99b6a07982ceed32c5289e9eb12206c83a70fd44c5c3e1b96c2bfa160eb12f1dbbb45f1109d632c7690de90
+    SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e
     HEAD_REF master
 )
 
@@ -26,7 +26,9 @@ endif ()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    OPTIONS -DABSL_PROPAGATE_CXX_STD=ON ${ABSL_USE_CXX17_OPTION}
+    OPTIONS
+        -DABSL_PROPAGATE_CXX_STD=ON
+        ${ABSL_USE_CXX17_OPTION}
 )
 
 vcpkg_cmake_install()

diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "name": "abseil",
-  "version": "20240116.1",
+  "version": "20240116.2",
   "description": [
-    "an open-source collection designed to augment the C++ standard library.",
     "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
     "In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.",
     "Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole."

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 afa26e0579ebbac5db82df80a4ce6c2350d4665043bb549688dce4db08b3b1a7c6b072544d651b90bd521ae477de069f280ab8d52fe957143d1f8a7cbd23eb29
+        SHA512 cf28ca68e460b163d1af2858dddf597306dac7a048ea1d8c69d74e65d671594ce16ecd5f3b1b571e2be6e0e860a7bbedf7372a2c6aea9427d1c8f83f73b99e12
     )
 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 b08c8cf98b622248cfbf167ca91c8314284c84c4dcb1c48fedb9180be2bc354c1d647372eb046e75d426ac4f2ad0318a8dd9e3f233d36bc30f744d5f9e37c5ec
+        SHA512 7eefc6ec2cb3ad862deffe341dab81e75a75a73acf429c8b64229e63de6ec2baa01e6bbef1643519cfd7312cc70564aa2836d57824667ea4f456659f01ba3fd5
     )
 endif()
 

diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ace",
-  "version": "7.1.2",
-  "port-version": 1,
+  "version": "7.1.4",
   "maintainers": "Johnny Willemsen <[email protected]>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://github.com/DOCGroup/ACE_TAO",

diff --git a/ports/amd-amf/portfile.cmake b/ports/amd-amf/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO GPUOpen-LibrariesAndSDKs/AMF
-        REF "v${VERSION}"
-        SHA512 43d7d3c05cb385cc5b0b76562dae3f8d5fb0123300291019ddce1032eec55a664290bd9b0552073d3a5cc7036886a015d9edb1f17e2f0f8ffd07acf57360ec18
-        HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO GPUOpen-LibrariesAndSDKs/AMF
+    REF "v${VERSION}"
+    SHA512 e0c4f583996ff2d1d61c53b8ce7ef2eadb32d2a13930e59146b935840e31d032c5cec48baced70b0007fa5f33e30537d03ddf71140ff51213085aba20e16f5ca
+    HEAD_REF master
 )
 
 # Install the AMF headers to the default vcpkg location

diff --git a/ports/amd-amf/vcpkg.json b/ports/amd-amf/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "amd-amf",
-  "version": "1.4.29",
+  "version": "1.4.33",
+  "port-version": 1,
   "description": "AMD Advanced Media Framework headers",
   "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/AMF",
   "license": "MIT",

diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake
@@ -47,6 +47,13 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_pkgconfig()
 
+if(VCPKG_TARGET_IS_WINDOWS)
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/aom.pc" " -lm" "")
+  if(NOT VCPKG_BUILD_TYPE)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/aom.pc" " -lm" "")
+  endif()
+endif()
+
 # Move cmake configs
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 

diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aom",
   "version-semver": "3.8.1",
+  "port-version": 1,
   "description": "AV1 codec library",
   "homepage": "https://aomedia.googlesource.com/aom",
   "license": "BSD-2-Clause",

diff --git a/ports/approval-tests-cpp/portfile.cmake b/ports/approval-tests-cpp/portfile.cmake
@@ -1,14 +1,14 @@
 vcpkg_download_distfile(single_header
-    URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.2/ApprovalTests.v.10.12.2.hpp
-    FILENAME ApprovalTests.v.10.12.2.hpp
-    SHA512 ed59736f52afff246409dcf435ad12a8f15697ae80962c456ca877fbf8adcb99af1bb71424ebcb214df719506015aac27006c1cfec174700b1833db64efb3568
+    URLS "https://github.com/approvals/ApprovalTests.cpp/releases/download/v.${VERSION}/ApprovalTests.v.${VERSION}.hpp"
+    FILENAME "ApprovalTests.v.${VERSION}.hpp"
+    SHA512 06887b2a7d9c9a18b052065e5a43bb02aeadb31095f655bf65c17f39271c5ede881afa521597a42820fd30d2680cfc2f2f516a9d74880b2d15bedf259c3881b6
 )
 
 vcpkg_download_distfile(license_file
-    URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.12.2/LICENSE
-    FILENAME ApprovalTestsLicense.v.10.12.2
+    URLS "https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.${VERSION}/LICENSE"
+    FILENAME "ApprovalTestsLicense.v.${VERSION}"
     SHA512 dc6b68d13b8cf959644b935f1192b02c71aa7a5cf653bd43b4480fa89eec8d4d3f16a2278ec8c3b40ab1fdb233b3173a78fd83590d6f739e0c9e8ff56c282557
 )
 
 file(INSTALL "${single_header}" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME ApprovalTests.hpp)
-file(INSTALL "${license_file}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${license_file}")
diff --git a/ports/approval-tests-cpp/vcpkg.json b/ports/approval-tests-cpp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "approval-tests-cpp",
-  "version": "10.12.2",
+  "version": "10.13.0",
   "description": "Approval Tests allow you to verify a chunk of output (such as a file) in one operation as opposed to writing test assertions for each element.",
-  "homepage": "https://github.com/approvals/ApprovalTests.cpp"
+  "homepage": "https://github.com/approvals/ApprovalTests.cpp",
+  "license": "Apache-2.0"
 }
diff --git a/ports/apriltag/portfile.cmake b/ports/apriltag/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO AprilRobotics/apriltag
     REF v${VERSION}
-    SHA512 c6efa98b8c85702441b421955a8fd78cb99ff07e014da5593b95246a0aaf391e9959d336d8005ba193fb6dad0fb5858852918087a401e180af9c46df38a900aa
+    SHA512 2e7edda62e1f196ac954cb999d11a43e81e4e8a5de296b7ce28744a0ec3a4a3209b413e2328aaebce61b2eef782209855ca1112c489bbcb5437387ab6379a849
     HEAD_REF master
 )
 

diff --git a/ports/apriltag/vcpkg.json b/ports/apriltag/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "apriltag",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "description": "AprilTag is a visual fiducial system popular for robotics research.",
   "homepage": "https://april.eecs.umich.edu/software/apriltag",
   "license": "BSD-2-Clause",

diff --git a/ports/aricpp/portfile.cmake b/ports/aricpp/portfile.cmake
@@ -2,8 +2,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO daniele77/aricpp
-    REF v1.1.2
-    SHA512 bf325de240cdc9c567524cdc127c256d1ac783e785779117374f1d2a5fd4f352545e87f3d1556c2a24e47a203b55bc581a92fb20426295f5f9dcb4a8078cb215
+    REF v1.1.3
+    SHA512 5b4c2829177f338f46f5d48baee8d3dd35bdce11780ed1b4b20ddb738573d12227982574877be8f9a8cea355e202cac97eb85a16fd582d2e348a9404b34467fd
     HEAD_REF master
 )
 

diff --git a/ports/aricpp/vcpkg.json b/ports/aricpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aricpp",
-  "version-semver": "1.1.2",
+  "version-semver": "1.1.3",
   "description": "Asterisk ARI interface bindings for modern C++",
   "homepage": "https://github.com/daniele77/aricpp",
   "license": "BSL-1.0",

diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
@@ -28,7 +28,12 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH share/Armadillo/CMake)
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME Armadillo CONFIG_PATH share/Armadillo/CMake)
+vcpkg_replace_string(   "${CURRENT_PACKAGES_DIR}/share/Armadillo/ArmadilloConfig.cmake"
+                        [[include("${VCPKG_IMPORT_PREFIX}/share/Armadillo/ArmadilloLibraryDepends.cmake")]]
+                        "include(CMakeFindDependencyMacro)\nfind_dependency(LAPACK)\ninclude(\"\${VCPKG_IMPORT_PREFIX}/share/Armadillo/ArmadilloLibraryDepends.cmake\")"
+                    )
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 

diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "armadillo",
   "version": "12.6.6",
+  "port-version": 1,
   "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/arpack-ng/portfile.cmake b/ports/arpack-ng/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencollab/arpack-ng
     REF ${VERSION}
-    SHA512 fbcaa2179dd1aa5a39fc3e7d80f377ec90ddf16ef93184a88e6ecfc464ed97e5659f2cf578294ac3e0b0c0da6408c86acf5bbdce533e1e9d2a3121848340d282
+    SHA512 1ca590a8c4f75aa74402f9bd62e63851039687f4cb11afa8acb05fce1f22a512bff5fd1709ea85fdbea90b344fbbc01e3944c770b5ddc4d1aabc98ac334f78d2
     HEAD_REF master
 )
 

diff --git a/ports/arpack-ng/vcpkg.json b/ports/arpack-ng/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "arpack-ng",
-  "version": "3.9.0",
-  "port-version": 1,
+  "version": "3.9.1",
   "description": "ARPACK-NG is a collection of Fortran77 subroutines designed to solve large scale eigenvalue problems.",
   "homepage": "https://github.com/opencollab/arpack-ng",
   "license": "BSD-3-Clause",

diff --git a/ports/arrow/android.patch b/ports/arrow/android.patch
@@ -0,0 +1,27 @@
+diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
+index 026bb5c..5c1b5e3 100644
+--- a/cpp/src/arrow/CMakeLists.txt
++++ b/cpp/src/arrow/CMakeLists.txt
+@@ -166,7 +166,7 @@ if(WIN32)
+   list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
+ endif()
+
+-if(NOT WIN32 AND NOT APPLE)
++if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
+   # Pass -lrt on Linux only
+   list(APPEND ARROW_SYSTEM_LINK_LIBS rt)
+ endif()
+diff --git a/cpp/src/arrow/vendored/musl/strptime.c b/cpp/src/arrow/vendored/musl/strptime.c
+index 41912fd..0ea36e9 100644
+--- a/cpp/src/arrow/vendored/musl/strptime.c
++++ b/cpp/src/arrow/vendored/musl/strptime.c
+@@ -18,7 +18,9 @@
+ #undef HAVE_LANGINFO
+
+ #ifndef _WIN32
++# if !(defined(__ANDROID__) && __ANDROID_API__ < 26)
+ #define HAVE_LANGINFO 1
++# endif
+ #endif
+
+ #ifdef HAVE_LANGINFO
diff --git a/ports/arrow/fix-ci-error.patch b/ports/arrow/fix-ci-error.patch
diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
@@ -2,16 +2,17 @@ vcpkg_download_distfile(
     ARCHIVE_PATH
     URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz"
     FILENAME apache-arrow-${VERSION}.tar.gz
-    SHA512 6c83e3be1e5840c30387f088315b74aca8e7c2d060793af70a156effb496a71e3e6af0693188c0f46f8a4a061a263a47095912ef04a5dc8141abd59075b14c78
+    SHA512 28975f59e1fdde2dba4afaf4a5ba934b63db3a7f27656e2aa0af0f0d2a046c9dbfa9a6082de94629c36d03809b296566a37ea65ec5a2fc17fedac7d21e272d31
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE ${ARCHIVE_PATH}
     PATCHES
+        android.patch
         msvc-static-name.patch
         utf8proc.patch
         thrift.patch
-        fix-ci-error.patch
+        remove-dll-suffix.patch #Upstream PR: https://github.com/apache/arrow/pull/41341
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

diff --git a/ports/arrow/remove-dll-suffix.patch b/ports/arrow/remove-dll-suffix.patch
@@ -0,0 +1,39 @@
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index 941f5db..473e380 100644
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
+@@ -711,7 +711,7 @@ list(APPEND ARROW_TEST_LINK_LIBS ${ARROW_GTEST_GMOCK} ${ARROW_GTEST_GTEST_MAIN})
+ if(ARROW_BUILD_BENCHMARKS)
+   set(ARROW_BENCHMARK_LINK_LIBS benchmark::benchmark_main ${ARROW_TEST_LINK_LIBS})
+   if(WIN32)
+-    list(APPEND ARROW_BENCHMARK_LINK_LIBS Shlwapi.dll)
++    list(APPEND ARROW_BENCHMARK_LINK_LIBS Shlwapi)
+   endif()
+ endif()
+
+diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
+index 5c1b5e3..f16ee55 100644
+--- a/cpp/src/arrow/CMakeLists.txt
++++ b/cpp/src/arrow/CMakeLists.txt
+@@ -163,7 +163,7 @@ if(CMAKE_THREAD_LIBS_INIT)
+ endif()
+
+ if(WIN32)
+-  list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
++  list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32")
+ endif()
+
+ if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
+@@ -628,9 +628,9 @@ else()
+   list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS ArrowTesting::gtest)
+ endif()
+ if(WIN32)
+-  list(APPEND ARROW_TESTING_SHARED_LINK_LIBS "ws2_32.dll")
+-  list(APPEND ARROW_TESTING_STATIC_LINK_LIBS "ws2_32.dll")
+-  list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS "ws2_32.dll")
++  list(APPEND ARROW_TESTING_SHARED_LINK_LIBS "ws2_32")
++  list(APPEND ARROW_TESTING_STATIC_LINK_LIBS "ws2_32")
++  list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS "ws2_32")
+ endif()
+
+ set(ARROW_TESTING_SRCS
diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "arrow",
-  "version": "15.0.2",
+  "version": "16.1.0",
   "description": "Cross-language development platform for in-memory analytics",
   "homepage": "https://arrow.apache.org",
   "license": "Apache-2.0",

diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Tradias/asio-grpc
     REF "v${VERSION}"
-    SHA512 5780604f4e91886b138d9ce692dd98087587ea7a5624285ee9f8463c300102a6fb53997593d4b2da39663d7ec22cee40b00f13a4cb1588e412b425d7ce4c6d2b
+    SHA512 2377fe49acc320ad16150420348a09c89308d96451f7e4974874862f927dfd60651ca04b038ca6e467b104986f3723bbd67243032790a994aa1a50c510193d4d
     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.0.0",
+  "version": "3.1.0",
   "description": "Asynchronous gRPC with Asio/unified executors",
   "homepage": "https://github.com/Tradias/asio-grpc",
   "license": "Apache-2.0",

diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chriskohlhoff/asio
-    REF asio-1-29-0
-    SHA512 f8df39c5a5e89dcfe4bd37c7e757e44e3e94d9b79d7ab08d1804ad8980993a607070f7e12238ffe3286840cd08c0b3c8e3639d3a1177e5ff795994cbc42a8292
+    REF asio-1-30-2
+    SHA512 cfba1998d4f666156e751c4cab1e504441b368efbf344e22de30f8b983670a88d045d3ca82f197b95522a2026262274f93bc3061210781ce30c35c71a386ce6e
     HEAD_REF master
 )
 
@@ -26,4 +26,4 @@ file(INSTALL
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/asio/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/asio/LICENSE_1_0.txt")
diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "asio",
-  "version": "1.29.0",
+  "version": "1.30.2",
   "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
   "homepage": "https://github.com/chriskohlhoff/asio",
   "documentation": "https://think-async.com/Asio/asio-1.28.0/doc/",