Merge remote-tracking branch 'origin/master' into android-r26

microsoft · May 28, 2024 · f7aa665 · f7aa665
2 parents 44bab63 + 007aace
commit f7aa665
Show file tree

Hide file tree

Showing 1,091 changed files with 8,322 additions and 4,455 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/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/arrow/portfile.cmake b/ports/arrow/portfile.cmake
@@ -2,7 +2,7 @@ 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 773f4f3eef603032c8ba0cfdc023bfd2a24bb5e41c82da354a22d7854ab153294ede1f4782cc32b27451cf1b58303f105bac61ceeb3568faea747b93e21d79e4
+    SHA512 28975f59e1fdde2dba4afaf4a5ba934b63db3a7f27656e2aa0af0f0d2a046c9dbfa9a6082de94629c36d03809b296566a37ea65ec5a2fc17fedac7d21e272d31
 )
 vcpkg_extract_source_archive(
     SOURCE_PATH

diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "arrow",
-  "version": "16.0.0",
-  "port-version": 1,
+  "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/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 9114576f69942f4f8ac0915e39605bf7ba578e33d6cfdec6fe72b0fc7129c5427630e692faad49efa3e04de171bb1afda6e597c93404ef877b7462b77bdb5b99
+    SHA512 11ec0b5c038a70ed80ff5584797310799617135debc8dcf6c778e5a0fc107bb5203aeb396dc2137067534ddc78089b6b28ec5469721d375ad17181253ff1f770
     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": "5.0.0",
+  "version": "5.1.1",
   "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/autodock-vina/fix-compatibility-with-boost-1.85.patch b/ports/autodock-vina/fix-compatibility-with-boost-1.85.patch
@@ -0,0 +1,30 @@
+ src/lib/vina.h      | 2 +-
+ src/split/split.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/vina.h b/src/lib/vina.h
+index a44cf9b..daed498 100644
+--- a/src/lib/vina.h
++++ b/src/lib/vina.h
+@@ -35,7 +35,7 @@
+ #include <boost/program_options.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/exception.hpp>
+-#include <boost/filesystem/convenience.hpp> // filesystem::basename
++#include <boost/filesystem/operations.hpp> // filesystem::basename
+ #include <boost/thread/thread.hpp> // hardware_concurrency // FIXME rm ?
+ #include <boost/algorithm/string.hpp>
+ //#include <openbabel/mol.h>
+diff --git a/src/split/split.cpp b/src/split/split.cpp
+index b42e78a..daee547 100644
+--- a/src/split/split.cpp
++++ b/src/split/split.cpp
+@@ -30,7 +30,7 @@
+ #include <boost/program_options.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/exception.hpp>
+-#include <boost/filesystem/convenience.hpp> // filesystem::basename
++#include <boost/filesystem/operations.hpp> // filesystem::basename
+
+ #include "file.h"
+ #include "parse_error.h"
diff --git a/ports/autodock-vina/portfile.cmake b/ports/autodock-vina/portfile.cmake
@@ -6,7 +6,9 @@ vcpkg_from_github(
     REF v${VERSION}
     SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9
     HEAD_REF develop
-    PATCHES fix-compatibility-with-boost-1.83.patch
+    PATCHES
+        fix-compatibility-with-boost-1.83.patch
+        fix-compatibility-with-boost-1.85.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

diff --git a/ports/autodock-vina/vcpkg.json b/ports/autodock-vina/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "autodock-vina",
   "version-semver": "1.2.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.",
   "homepage": "http://vina.scripps.edu/",
   "dependencies": [

diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO h4tr3d/avcpp
     REF "v${VERSION}"
-    SHA512 10e3ab6bb52ceee2f7d6ea9364dbf5f09fdab5b10f34920f1a1df93ad853e0a4b3de9b554be8482d8444b62e10160c3e26f37907fee217bc9d5728329e06ad85
+    SHA512 365ed55e0c2bf2a699899ed6e303fe28fb9d51286579e9d7d1586132c8ab1b09c4b66e94f8061e860d73b60a28fa44769dcfdf030cb0947acfb7cdfd616127d9
     HEAD_REF master
     PATCHES
         0002-av_init_packet_deprecation.patch

diff --git a/ports/avcpp/vcpkg.json b/ports/avcpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "avcpp",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.",
   "homepage": "https://github.com/h4tr3d/avcpp",
   "license": "LGPL-2.1-only OR BSD-3-Clause",

diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
     REF "azure-core-amqp_${VERSION}"
-    SHA512 b8a38883a6c400de12098cbae9e925edcd5a0435ff0d153b5e885368cbdd63d7eb4fae330eb18e7c7414a32f7fa50cbb5ed8f69525bbd22fc84e15dff5682339
+    SHA512 4f9ff4748f47752593fb9856bd8c1375a87a01ec65f11eb5360e190962c21a7a81167ec77965a6904e856f7c96d2b6c42c0e47f15071ce9837458e0d37135a04
     HEAD_REF main
 )
 

diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json
@@ -4,7 +4,7 @@
     "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
   ],
   "name": "azure-core-amqp-cpp",
-  "version-semver": "1.0.0-beta.8",
+  "version-semver": "1.0.0-beta.9",
   "description": [
     "Microsoft Azure AMQP SDK for C++",
     "This library provides AMQP functionality to Azure SDK services."

diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
     REF "azure-core_${VERSION}"
-    SHA512 ba52f79e578da25831ad0fcd2da95a2e31b0c7c61ee1bc39c9f7de3edd9a59c2897564c0012cd4fd58b0a61c9df1d987b32b14b7cd3528779dc3ea9aac05c4ab
+    SHA512 2202455c042a6859f89699ef2ac8f420a0a9046248e5160b63fa9247664c0f53d2a5b0bdbf35efe5ac7185c91328f27aecb1e2a72880268db7fd51aa3e0500a5
     HEAD_REF main
 )
 

diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json
@@ -4,7 +4,7 @@
     "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
   ],
   "name": "azure-core-cpp",
-  "version-semver": "1.11.3",
+  "version-semver": "1.12.0",
   "description": [
     "Microsoft Azure Core SDK for C++",
     "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."

diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
     REF "azure-messaging-eventhubs_${VERSION}"
-    SHA512 a8143734671b459317a1b57b66b1421ce36f7a55cc3a1773cb589b4296fa0967211d08f34eca7a59423938da76084c5b8b322abae55fb78503783ce6e6de7136
+    SHA512 e787f77707cb2a47b3cf841894d2f54f9179895e2545e0b95c7b32ea97f339278f0f9d4ebf7ef1e894adb633f9c281f392034ef67e20e6efe6dbf6a9e83ce3a3
     HEAD_REF main
 )
 

diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json
@@ -4,7 +4,7 @@
     "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
   ],
   "name": "azure-messaging-eventhubs-cpp",
-  "version-semver": "1.0.0-beta.7",
+  "version-semver": "1.0.0-beta.8",
   "description": [
     "Microsoft Azure Messaging Event Hubs SDK for C++",
     "This library provides Azure Messaging Event Hubs SDK."
@@ -15,7 +15,7 @@
     {
       "name": "azure-core-amqp-cpp",
       "default-features": false,
-      "version>=": "1.0.0-beta.8"
+      "version>=": "1.0.0-beta.9"
     },
     {
       "name": "vcpkg-cmake",

diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
     REF "azure-storage-blobs_${VERSION}"
-    SHA512 652b4edf2e049b33ef37734ab3e421a7b2b8d2f497da2859fe73ae665e8fd76b360d02c9f64c42cd6dbc8baa7150a031263942fc7d6b311d2c051ccd044a0064
+    SHA512 119aef0e2398fa6e645cc635dc09a3addade71c8c723046d104a55016c846f3db653449582eb7a678352c8b8148ee38f33a5c2fd07b67cca7815690d2afdbd02
     HEAD_REF main
 )
 

diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json
@@ -4,8 +4,7 @@
     "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
   ],
   "name": "azure-storage-blobs-cpp",
-  "version-semver": "12.10.0",
-  "port-version": 1,
+  "version-semver": "12.11.0",
   "description": [
     "Microsoft Azure Storage Blobs SDK for C++",
     "This library provides Azure Storage Blobs SDK."
@@ -16,7 +15,7 @@
     {
       "name": "azure-storage-common-cpp",
       "default-features": false,
-      "version>=": "12.5.0"
+      "version>=": "12.6.0"
     },
     {
       "name": "vcpkg-cmake",

diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
     REF "azure-storage-common_${VERSION}"
-    SHA512 46c9cc4ebec54f289ba7270356da4e89e5f8e890004c7a232200b87ca33357064c2f46670a1090fe41ca6962cdbc76d2e3520bb600438cbc0f21f15cf7816f04
+    SHA512 a033e9269db6482696b511531f62608ff7bead322555b656844cbbf19175a60f81dc99c61a746daf24233a6ea73e64d1d558e9122eb782f4ab3737dba7cdcc9e
     HEAD_REF main
 )
 

diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json
@@ -4,8 +4,7 @@
     "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
   ],
   "name": "azure-storage-common-cpp",
-  "version-semver": "12.5.0",
-  "port-version": 1,
+  "version-semver": "12.6.0",
   "description": [
     "Microsoft Azure Common Storage SDK for C++",
     "This library provides common Azure Storage-related abstractions for Azure SDK."
@@ -16,7 +15,7 @@
     {
       "name": "azure-core-cpp",
       "default-features": false,
-      "version>=": "1.10.3"
+      "version>=": "1.11.3"
     },
     {
       "name": "libxml2",

diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
     REF "azure-storage-files-datalake_${VERSION}"
-    SHA512 3314adc2c43b54f3bb776b099876062dc157cb35215c8efb49c1d23474479601ab0c067f901809c9ee4bce646feabf0065e8e8b96ae77f4d0f8585e8e269294b
+    SHA512 04e18095262043394fbb1f0e654a0aef5d36cc432cdea4be7021fa2455b21035fc6430cd09b3da612aff1777b330c78950b627b5a4ff383033bbbdbe01694c85
     HEAD_REF main
 )
 

diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json
@@ -4,8 +4,7 @@
     "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
   ],
   "name": "azure-storage-files-datalake-cpp",
-  "version-semver": "12.9.0",
-  "port-version": 1,
+  "version-semver": "12.10.0",
   "description": [
     "Microsoft Azure Storage Files Data Lake SDK for C++",
     "This library provides Azure Storage Files Data Lake SDK."
@@ -16,7 +15,7 @@
     {
       "name": "azure-storage-blobs-cpp",
       "default-features": false,
-      "version>=": "12.10.0"
+      "version>=": "12.11.0"
     },
     {
       "name": "vcpkg-cmake",

diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
     REF "azure-storage-files-shares_${VERSION}"
-    SHA512 a22cce4f43fd77aabdb43fdbc9ea3e5a501f5abeaafe5f5fea7e8737b6b017dc2ca3b674ac0c5f8bcda9b836af7644b3c17db050b02db5e076728047aa5c2ec0
+    SHA512 b0613bc6fa207f2d94d5694d7c4c174e6088ea2fa7eba80b6b373e99bd0e44efab4f97009eeec3ccbdc65dd279f19ecea5b0277ec424b1539b541ba512f5a32d
     HEAD_REF main
 )
 

diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json
@@ -4,8 +4,7 @@
     "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp."
   ],
   "name": "azure-storage-files-shares-cpp",
-  "version-semver": "12.8.0",
-  "port-version": 1,
+  "version-semver": "12.9.0",
   "description": [
     "Microsoft Azure Storage Files Shares SDK for C++",
     "This library provides Azure Storage Files Shares SDK."
@@ -16,7 +15,7 @@
     {
       "name": "azure-storage-common-cpp",
       "default-features": false,
-      "version>=": "12.5.0"
+      "version>=": "12.6.0"
     },
     {
       "name": "vcpkg-cmake",

diff --git a/ports/baresip-libre/fix-static-library-build.patch b/ports/baresip-libre/fix-static-library-build.patch