Merge branch 'master' into test-features

microsoft · Jul 11, 2023 · e811005 · e811005
2 parents 9b5268a + a54b777
commit e811005
Show file tree

Hide file tree

Showing 214 changed files with 1,551 additions and 1,077 deletions.
diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -12,7 +12,7 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。
 * GitHub: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)
 * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/)， #vcpkg 频道
 * Discord: [\#include \<C++\>](https://www.includecpp.org)， #🌏vcpkg 频道
-* 文档: [Documentation](docs/README.md)
+* 文档: [Documentation](https://learn.microsoft.com/vcpkg)
 
 # 目录
 
@@ -241,16 +241,14 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems
 
 使用此种方式可无需设置 `CMAKE_TOOLCHAIN_FILE` 即可使用 vcpkg，且更容易完成配置工作。
 
-[getting-started:using-a-package]: docs/examples/installing-and-using-packages.md
-[getting-started:integration]: docs/users/buildsystems/integration.md
+[getting-started:using-a-package]: https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages
 [getting-started:git]: https://git-scm.com/downloads
 [getting-started:cmake-tools]: https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools
 [getting-started:linux-gcc]: #installing-linux-developer-tools
 [getting-started:macos-dev-tools]: #installing-macos-developer-tools
 [getting-started:macos-brew]: #installing-gcc-on-macos
 [getting-started:macos-gcc]: #installing-gcc-on-macos
 [getting-started:visual-studio]: https://visualstudio.microsoft.com/
-[getting-started:manifest-spec]: docs/specifications/manifests.md
 
 # Tab 补全/自动补全
 
@@ -271,10 +269,10 @@ $ ./vcpkg integrate bash # 或 zsh
 
 ## 示例
 
-请查看 [文档](docs/README.md) 获取具体示例，
-其包含 [安装并使用包](docs/examples/installing-and-using-packages.md)，
-[使用压缩文件添加包](docs/examples/packaging-zipfiles.md)
-和 [从 GitHub 源中添加一个包](docs/examples/packaging-github-repos.md)。
+请查看 [文档](https://learn.microsoft.com/vcpkg) 获取具体示例，
+其包含 [安装并使用包](https://learn.microsoft.com/vcpkg/examples/installing-and-using-packages)，
+[使用压缩文件添加包](https://learn.microsoft.com/vcpkg/examples/packaging-zipfiles)
+和 [从 GitHub 源中添加一个包](https://learn.microsoft.com/vcpkg/examples/packaging-github-repos)。
 
 我们的文档现在也可以从 [vcpkg.io](https://vcpkg.io/) 在线获取。
 我们真诚的希望您向我们提出关于此网站的任何建议! 请在[这里](https://github.com/vcpkg/vcpkg.github.io/issues) 创建 issue.

diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ada-url/ada
     REF "v${VERSION}"
-    SHA512 689dcdc3e89f2ae51e039f6d354efea3231d3ff025c58f572596d87cebd7d5f2bf5ca8c530df8514369a14831dfdb1c65bc1d93a0ece579031eb3f0dd47548c0
+    SHA512 bb3814af0728b924a6685cfa510f1ccf7ced692850c55849e42c88c07234e0f8fc19426ecfdd1c1ef84543041b0604da312e02b98bd7c8cd2609f8a5ed3ae224
     HEAD_REF main
 )
 

diff --git a/ports/ada-url/vcpkg.json b/ports/ada-url/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ada-url",
-  "version": "2.4.2",
+  "version": "2.5.1",
   "description": "WHATWG-compliant and fast URL parser written in modern C++",
   "homepage": "https://ada-url.com/",
   "license": "MIT",

diff --git a/ports/angle/002-fix-builder-error.patch b/ports/angle/002-fix-builder-error.patch
@@ -26,3 +26,15 @@ index f4bb137f2..86495013b 100644
  namespace angle
  {
 
+diff --git a/include/GLSLANG/ShaderVars.h b/include/GLSLANG/ShaderVars.h
+index 94cb93e..5593f66 100644
+--- a/include/GLSLANG/ShaderVars.h
++++ b/include/GLSLANG/ShaderVars.h
+@@ -14,6 +14,7 @@
+ #include <array>
+ #include <string>
+ #include <vector>
++#include <stdint.h>
+
+ namespace sh
+ {
diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "angle",
   "version-string": "chromium_5414",
-  "port-version": 4,
+  "port-version": 5,
   "description": [
     "A conformant OpenGL ES implementation for Windows, Mac and Linux.",
     "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support."

diff --git a/ports/asmtk/portfile.cmake b/ports/asmtk/portfile.cmake
@@ -25,6 +25,13 @@ vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/asmtk)
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/asmtk/globals.h" "!defined(ASMTK_STATIC)" "0")
+endif()
+
+set(cmakefile "${CURRENT_PACKAGES_DIR}/share/asmtk/asmtk-config.cmake")
+file(READ "${cmakefile}" contents)
+file(WRITE "${cmakefile}" "include(CMakeFindDependencyMacro)\nfind_dependency(asmjit)\n${contents}")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md")
diff --git a/ports/asmtk/vcpkg.json b/ports/asmtk/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "asmtk",
   "version-date": "2022-11-06",
+  "port-version": 1,
   "description": "Assembler toolkit based on AsmJit ",
   "homepage": "https://github.com/asmjit/asmtk",
   "supports": "!arm",

diff --git a/ports/azure-core-amqp-cpp/00100-fix_dependency.patch b/ports/azure-core-amqp-cpp/00100-fix_dependency.patch
@@ -0,0 +1,43 @@
+diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt
+index 4af39728..f888b1ba 100644
+--- a/sdk/core/azure-core-amqp/CMakeLists.txt
++++ b/sdk/core/azure-core-amqp/CMakeLists.txt
+@@ -31,7 +31,7 @@ if(NOT AZ_ALL_LIBRARIES)
+ endif()
+
+ find_package(uamqp CONFIG REQUIRED)
+-find_package(umock_c)
++find_package(umock_c CONFIG REQUIRED)
+ find_package(azure_macro_utils_c CONFIG REQUIRED)
+ find_package(azure_c_shared_utility CONFIG REQUIRED)
+
+@@ -101,8 +101,8 @@ add_library(Azure::azure-core-amqp ALIAS azure-core-amqp)
+ # coverage. Has no effect if BUILD_CODE_COVERAGE is OFF
+ create_code_coverage(core azure-core-amqp azure-core-amqp-tests "tests?/*;samples?/*")
+
+-# uAMQP's headers require the manual addition of umock_c and azure_macro_utils_c to the target link libraries. 
+-target_link_libraries(azure-core-amqp PRIVATE uamqp umock_c azure_macro_utils_c PUBLIC Azure::azure-core)
++# uAMQP's headers require the manual addition of umock_c, azure_macro_utils_c, and aziotsharedutil to the target link libraries. 
++target_link_libraries(azure-core-amqp PRIVATE uamqp umock_c azure_macro_utils_c aziotsharedutil PUBLIC Azure::azure-core)
+
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
+ generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION})
+diff --git a/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in b/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in
+index 989c8be1..176bc75f 100644
+--- a/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in
++++ b/sdk/core/azure-core-amqp/vcpkg/Config.cmake.in
+@@ -4,9 +4,12 @@
+ @PACKAGE_INIT@
+
+ include(CMakeFindDependencyMacro)
+-find_dependency(azure-core-cpp "1.9.0-beta.1")
++find_dependency(azure-core-cpp)
+
+-find_dependency(azure-uamqp-c)
++find_dependency(uamqp)
++find_dependency(umock_c)
++find_dependency(azure_macro_utils_c)
++find_dependency(azure_c_shared_utility)
+
+ include("${CMAKE_CURRENT_LIST_DIR}/azure-core-amqp-cppTargets.cmake")
+
diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake
@@ -0,0 +1,21 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Azure/azure-sdk-for-cpp
+    REF azure-core-amqp_1.0.0-beta.1
+    SHA512 4fc520c546cd395d4c50a9385d33db09b50865046b5383b1442057d4ac78ffc6a6be221af6aef3dcb938ffde1927e8de4270d5b1c9cf5d97ac8b1581b51d014b
+    PATCHES
+        00100-fix_dependency.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/sdk/core/azure-core-amqp/"
+    OPTIONS
+        -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_cmake_config_fixup()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+vcpkg_copy_pdbs()
diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json
@@ -0,0 +1,27 @@
+{
+  "name": "azure-core-amqp-cpp",
+  "version-semver": "1.0.0-beta.1",
+  "description": [
+    "Microsoft Azure AMQP SDK for C++",
+    "This library provides AMQP functionality to Azure SDK services."
+  ],
+  "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core-amqp",
+  "license": "MIT",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "azure-core-cpp",
+      "default-features": false,
+      "version>=": "1.9.0-beta.1"
+    },
+    "azure-uamqp-c",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-core_1.10.0
-    SHA512 8917d5a3934a743bd8b44dacc12c3cd410cd59f1fa596c36a50f78562a1c7fe7a189c762e4099f3b24d23fcf5dcb0243ac3f139f1d345e6283ff4b5db418ecda
+    REF azure-core_1.10.1
+    SHA512 498deebd853070b367f4fc07ac6b54a8ec4850ad5152da81728e909838f89aa0c1d2c2996267ad343bb06f6ebaedf151973359298dee6ad3b49949af016eb568
 )
 
 vcpkg_check_features(
@@ -17,6 +17,7 @@ vcpkg_cmake_configure(
     OPTIONS
         ${FEATURE_OPTIONS}
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()

diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-core-cpp",
-  "version-semver": "1.10.0",
+  "version-semver": "1.10.1",
   "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-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake
@@ -1,14 +1,15 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-identity_1.5.0
-    SHA512 1f96c2c9a056e83e083d9d8bc6c55fce1bc84b1ccee0a980c4b09d13b364551a1760c8a44232e5786b179fd60bea4b5b05c6cadd6b7fb270979a606a895bb7b6
+    REF azure-identity_1.5.1
+    SHA512 f3e12c0685ec7a1cde724feafbc84a8aa66688ed7b54bb9c4787d516aee3142310863013a5d49869e1a1e64af8f5ce908640fee64190bc9c2f9715e3afa833bc
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/sdk/identity/azure-identity/"
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
+        -DBUILD_TESTING=OFF
 )
 
 vcpkg_cmake_install()

diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-identity-cpp",
-  "version-semver": "1.5.0",
+  "version-semver": "1.5.1",
   "description": [
     "Microsoft Azure Identity SDK for C++",
     "This library provides common authentication-related abstractions for Azure SDK."