Merge pull request #1760 from microsoft/master

Merge from microsoft-master
Jimmy-Hu · Sep 18, 2024 · 8f18907 · 8f18907
2 parents d6e53da + dd3adcf
commit 8f18907
Show file tree

Hide file tree

Showing 84 changed files with 240 additions and 127 deletions.
diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-io
     REF "v${VERSION}"
-    SHA512 b5dc81635ce775c3783df2d4f6ccf0890b1e1669bddb1c10f6d200203684e84504ca87099cb88874010df28f98f658da5a4eacb9e4df0408d40d845f3d394f48
+    SHA512 3e690edc5a13bd603fd28917d60e3f96f1796bfc8194c1f9632447a94e02dc0be8297e3b96752cffb70a21d75fc57825acd64a99680189f9a3216e9ec6c3fa9f
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-c-io",
-  "version": "0.14.9",
+  "version": "0.14.18",
   "description": "Handles all IO and TLS work for application protocols.",
   "homepage": "https://github.com/awslabs/aws-c-io",
   "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 0d6b884e40845173623e2561191f7ba7d67a88797f56b43ce80986ad09f05bb88ad9b290990e4c62db39e67c4e5abdf89e2c8be6176b53f65c617c158aab7767
+    SHA512 cfa5d723b8c46cc6b542d154ccb5577233b01673952bfc558bd1524dc79f59d4c83bdeb3723e37c72bf8fbae4a5793abea3f2e8512396fcb47dbc5ffdfa008f5
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-c-mqtt",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "C99 implementation of the MQTT 3.1.1 specification.",
   "homepage": "https://github.com/awslabs/aws-c-mqtt",
   "license": "Apache-2.0",

diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO BOINC/boinc
     REF "client_release/${MAJOR_MINOR}/${VERSION}"
-    SHA512 a53506bc3e92c813e7cc1a9be8741822aabc843f6ca824e35a0cd48cec34d0965d51bf97dfea2ec4898c5c36887c8bbdc4919a46a093ad2ac43b081eca3ad882
+    SHA512 0e0c4f7647325f8f1e8a87da0d7ff43d1a3e5d3ef0dc3daf1fb974a47c0e4fb7318b3fdde77d0ae6ec4f3d30be113a5ceff33658facc8f3c2c325c8c61942698
     HEAD_REF master
 )
 

diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "boinc",
-  "version": "8.0.3",
+  "version": "8.0.4",
   "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/capstone/portfile.cmake b/ports/capstone/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "capstone-engine/capstone"
     REF "${VERSION}"
-    SHA512 350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5
+    SHA512 2fd3194dd37065e6091d208c7670b12c0ca6872931eef794bd6b2dd624601c843e8ee6c5714eae0372e394e91a9bc1e4de7dfea6b1087542dd461226569101de
     HEAD_REF next
     PATCHES
         001-silence-windows-crt-secure-warnings.patch

diff --git a/ports/capstone/vcpkg.json b/ports/capstone/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "capstone",
-  "version": "5.0.1",
-  "port-version": 1,
+  "version": "5.0.3",
   "description": "Multi-architecture disassembly framework",
   "homepage": "https://github.com/capstone-engine/capstone",
   "dependencies": [

diff --git a/ports/cargs/portfile.cmake b/ports/cargs/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO likle/cargs
     REF "v${VERSION}"
-    SHA512 936fa94da31b07de27c0278688199705f9fdc55cf248c7a88405c373e5c77eed2a703d9398d3ea80a3a534db3d542898babb49db268d26c5945c4907540ccc1b
+    SHA512 56877e330745369585b1b6ed274e8c898381439915048375a22a3fed077c1818b5d21356a33a77f516571d834a3fce7f78e509df63ce0f93b8276ac0a93df02a
     HEAD_REF master
 )
 

diff --git a/ports/cargs/vcpkg.json b/ports/cargs/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cargs",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A lightweight cross-platform getopt alternative that works on Linux, Windows and macOS. Command line argument parser library for C/C++. Can be used to parse argv and argc parameters.",
   "homepage": "https://likle.github.io/cargs/",
   "dependencies": [

diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO catchorg/Catch2
     REF v${VERSION}
-    SHA512 4f577da378c9fa7c205abc145b92f8b81a998274c2e5a08fce233cd43326a6ae30645379e2c3e32abca21c2168a298fd4690893a13d65733d8bd1e7b19fefea8
+    SHA512 e04c676e6bb3d7791f51a1caa770c4675d79b5396c9ba029c01ca0938e53bfa374dce117fccf753a89f3663192c91356acc9bc195e4866d215855df0667faff0
     HEAD_REF devel
     PATCHES
         fix-install-path.patch

diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "catch2",
-  "version-semver": "3.7.0",
+  "version-semver": "3.7.1",
   "description": "A modern, C++-native, test framework for unit-tests, TDD and BDD.",
   "homepage": "https://github.com/catchorg/Catch2",
   "license": "BSL-1.0",

diff --git a/ports/cpp-peglib/portfile.cmake b/ports/cpp-peglib/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO yhirose/cpp-peglib
     REF "v${VERSION}"
-    SHA512 c579da831822459c643c43be64eded925b2364bc1ae6b99ab8eaeeb48f441ecc2c019b08313027fd12113a1356826c7570d0c8b1b0ea7eef6984d810903b92c4
+    SHA512 084e2770a6f73a66a90b43bae0f2c372c1767ca975e2ca2581f38b1828c3587bcfe400868cb5710b7546b499e516040fe33145a2c4098c15de11d384f6377bf4
     HEAD_REF master
 )
 

diff --git a/ports/cpp-peglib/vcpkg.json b/ports/cpp-peglib/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cpp-peglib",
-  "version": "1.8.6",
+  "version": "1.9.0",
   "description": "C++11 header-only PEG (Parsing Expression Grammars) library.",
   "license": "MIT"
 }
diff --git a/ports/crashpad/crashpadConfig.cmake.in b/ports/crashpad/crashpadConfig.cmake.in
@@ -13,7 +13,7 @@ if(NOT TARGET crashpad::crashpad)
   add_library(crashpad::crashpad INTERFACE IMPORTED)
   target_include_directories(crashpad::crashpad INTERFACE "${_IMPORT_PREFIX}/include/crashpad")
 
-  set(_libs crashpad_client crashpad_client_common crashpad_util crashpad_base)
+  set(_libs vcpkg_crashpad_client vcpkg_crashpad_client_common vcpkg_crashpad_util vcpkg_crashpad_base)
   if(APPLE)
     list(APPEND _libs mig_output)
   endif()

diff --git a/ports/crashpad/fix-lib-name-conflict-1.patch b/ports/crashpad/fix-lib-name-conflict-1.patch
@@ -6,7 +6,7 @@ index 0bcf519..c637f2b 100644
  import("../build/platform.gni")
 
  static_library("base") {
-+  output_name = "crashpad_base"
++  output_name = "vcpkg_crashpad_base"
    sources = [
      "atomicops.h",
      "atomicops_internals_atomicword_compat.h",
diff --git a/ports/crashpad/fix-lib-name-conflict.patch b/ports/crashpad/fix-lib-name-conflict.patch
@@ -6,15 +6,15 @@ index bd150ab..5cbf469 100644
  import("../build/crashpad_buildconfig.gni")
 
  crashpad_static_library("client") {
-+  output_name = "crashpad_client"
++  output_name = "vcpkg_crashpad_client"
    sources = [
      "crashpad_client.h",
      "prune_crash_reports.cc",
 @@ -114,6 +115,7 @@ crashpad_static_library("client") {
  }
 
  static_library("common") {
-+  output_name = "crashpad_client_common"
++  output_name = "vcpkg_crashpad_client_common"
    sources = [
      "annotation.cc",
      "annotation.h",
@@ -26,7 +26,7 @@ index a2d6f7f..70a997e 100644
  }
 
  static_library("common") {
-+  output_name = "crashpad_handler_common"
++  output_name = "vcpkg_crashpad_handler_common"
    sources = [
      "crash_report_upload_thread.cc",
      "crash_report_upload_thread.h",
@@ -38,7 +38,7 @@ index e7ff4a8..9efcb41 100644
  }
 
  crashpad_static_library("util") {
-+  output_name = "crashpad_util"
++  output_name = "vcpkg_crashpad_util"
    sources = [
      "file/delimited_file_reader.cc",
      "file/delimited_file_reader.h",
diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "crashpad",
   "version-date": "2024-04-11",
-  "port-version": 3,
+  "port-version": 4,
   "description": [
     "Crashpad is a crash-reporting system.",
     "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss."

diff --git a/ports/debug-assert/portfile.cmake b/ports/debug-assert/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO foonathan/debug_assert
-    REF 0144b6532ec80349780ffac3cf85a92d87eb7b1b
-    SHA512 16cf38406d5f71585b763ff8af59b09c7b8b05372b07714cdc82f6f27292597c0b6d9025f823515744f8235b326b95e1d630af34db4a0e15d4ded79364290630
+    REF "v${VERSION}"
+    SHA512 0cc2f301e5f604501d29bab0e05ab9b667c1e0160003fc26da4f3edf747c761ff6d409cacc6bbe7fb15cd5caf9d3175fd4e88c0b066e659b41966916fab45ba8
     HEAD_REF v1.3.3
 )
 

diff --git a/ports/debug-assert/vcpkg.json b/ports/debug-assert/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "debug-assert",
-  "version": "1.3.3",
-  "port-version": 2,
+  "version": "1.3.4",
   "description": "Provides flexible DEBUG_ASSERT() macro.",
   "homepage": "https://github.com/foonathan/debug_assert",
   "dependencies": [

diff --git a/ports/dtl/portfile.cmake b/ports/dtl/portfile.cmake
@@ -4,8 +4,8 @@ include(CMakePackageConfigHelpers)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cubicdaiya/dtl
-    REF v1.20
-    SHA512 44cdaf190d8a103effbca8df244c652b642590795f7307f5f7fdf64fc34bdbe2fa5ab2e1a08185abf099e35b0d9158306a80a8dc24bba9eccab4c77c7b1eed5e
+    REF "v${VERSION}"
+    SHA512 53a448ce499d96c5030ff787db68dd4cb52ee9686453da81aeb5c143e21d4a10fcc4c9b88ebf86d71824cb919d6e4ebf39df52b74bd9333f411935e5f23bfa86
     HEAD_REF master
 )
 

diff --git a/ports/dtl/vcpkg.json b/ports/dtl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "dtl",
-  "version": "1.20",
+  "version": "1.21",
   "description": "Diff template library",
   "license": "BSD-4-Clause"
 }
diff --git a/ports/fakeit/fix-include_dir.patch b/ports/fakeit/fix-include_dir.patch
diff --git a/ports/fakeit/portfile.cmake b/ports/fakeit/portfile.cmake
@@ -4,20 +4,20 @@ vcpkg_from_github(
     REF "${VERSION}"
     SHA512 3575dc2247a97ea6d3c584e9b933e32cc0d1936fec480b19caf8305e8ba39bb11b4437930a5343b343df66347354ef5aaa8d2811e0ff3119bfc619629a0c2b8b
     HEAD_REF master
-    PATCHES fix-include_dir.patch
 )
 
 set(VCPKG_BUILD_TYPE release) # header-only port
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DCMAKE_INSTALL_INCLUDEDIR=include/fakeit/single_header
         -DENABLE_TESTING=OFF
 )
 
 vcpkg_cmake_install()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FakeIt)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 

diff --git a/ports/fakeit/usage b/ports/fakeit/usage
@@ -1,9 +1,5 @@
-The package FakeIt provides CMake targets:
+FakeIt provides CMake targets:
 
-    # Usage for specific framework tests (e.g. boost, catch, gtest, etc.)
-    find_package(FakeIt CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE FakeIt::FakeIt-<framework>)
-
-    # Only specific test framework configuration files are provided upstream.
-    # It does not install its own source header files.
-    # So only the usage of the test framework is provided here.
+  # Usage for specific framework tests (e.g. boost, catch, gtest, etc.)
+  find_package(FakeIt CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE FakeIt::FakeIt-<framework>)
diff --git a/ports/fakeit/vcpkg.json b/ports/fakeit/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fakeit",
   "version": "2.4.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.",
   "homepage": "https://github.com/eranpeer/FakeIt",
   "license": "MIT",

diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/fbthrift
     REF "v${VERSION}"
-    SHA512 10ee7740d8bbedc06f0156b563cd12ab2e650c22323692b90b8da90a09cede276a0b061328dccff32c4fe08b5bc8fa39a5f08afe1bd5128734c31076efcf8c8c
+    SHA512 3b0459013e9e3cb1396fbbb83763a5adcda57255f1831d0117ce8db66532594ce0f1499a7c305c667bcbf4fd42d4ebb0d7877fe8989ab6269ea4c822bd6a029f
     HEAD_REF main
     PATCHES 
         fix-glog.patch

diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fbthrift",
-  "version-string": "2024.09.09.00",
+  "version-string": "2024.09.16.00",
   "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
   "homepage": "https://github.com/facebook/fbthrift",
   "license": "Apache-2.0",

diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/fizz
     REF "v${VERSION}"
-    SHA512 ab9ce79c5f7dd2358a95e6842aa8e5c5410e7608f1aecfd2a19902a14fcc207a99207a7c3637d58f7ba07217a33db4c7abdd2f20de9e300390cb54c927f091af
+    SHA512 8377a28763c5b049135714d45e352850aa6db807cd4c367003fb0a917714a4dddeb857e8b3bfc07aac15b6bb385495e5f8d1d6eb04d04a57d1ff71801f0cb097
     HEAD_REF main
     PATCHES
         fix-build.patch

diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "fizz",
-  "version-string": "2024.09.09.00",
+  "version-string": "2024.09.16.00",
   "description": "a TLS 1.3 implementation by Facebook",
   "homepage": "https://github.com/facebookincubator/fizz",
   "license": "BSD-3-Clause",

diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebook/folly
     REF "v${VERSION}"
-    SHA512 78797f1383fb45cdb26977f19945d84fdf5056ba2156c47e0176fa7e3d5d0e7c7b61f1efbf98b09a45cad8826d931fcfdb26641f2d0065c6b6a601e9c8cc03f7
+    SHA512 3575ffb109c84c6070679ef7654e37f600ad19ca7e4e90840e0a4ea16f6ffdb29ecaba1fe05c2a2224d914258688b5bdf77f10f5ffa0f0e097a4e05e21f001b6
     HEAD_REF main
     PATCHES
         disable-non-underscore-posix-names.patch

diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "folly",
-  "version-string": "2024.09.09.00",
+  "version-string": "2024.09.16.00",
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "license": "Apache-2.0",

diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO stephenberry/glaze
     REF "v${VERSION}"
-    SHA512 87ad455cc29793ce328dbc462fe87a895329def4fb56ae86d349a4f5bb54f8199917c3ccac464210790777980620639beaccc6cc4b346aa41f44ca0b38a7b394
+    SHA512 6e3cdc974cff8b3d374596e23d868fc582804b3228c84f9b1c88307765afa81fc7c5f25c38bae345ad489a69f871c4907053d0b4ef5347430e096ee714648934
     HEAD_REF main
 )
 

diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "glaze",
-  "version": "3.3.1",
+  "version": "3.4.0",
   "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.",
   "homepage": "https://github.com/stephenberry/glaze",
   "license": "MIT",

diff --git a/ports/jigson/portfile.cmake b/ports/jigson/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO JoshuaSledden/Jigson
     REF "${VERSION}"
-    SHA512 dba66846021eab6914adf1e4d6e5fcd0fa5b54edea91c27d4d116002776ea1c1bcb5a6fed6b4778959d0aa525098ac037134842b65499ab2367b5d767b3cea10
+    SHA512 88cbd9d83d4b51b508c4d778ed5a230c6723274121e09170dff17aaaca01e1df0705f0b06e0ef395bd02aa85ad3da49fb60e1742935fb329afad713bd18b97dc
     HEAD_REF master
 )
 

diff --git a/ports/jigson/vcpkg.json b/ports/jigson/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "jigson",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "A simple C++ library designed to facilitate easy mapping from json content to a class model.",
   "homepage": "https://github.com/JoshuaSledden/Jigson",
   "license": "MIT",

diff --git a/ports/lest/portfile.cmake b/ports/lest/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO martinmoene/lest
-    REF v1.35.1
-    SHA512 06b786cbca37cb4d20737d040176bf34398090d566310b88558b788804d8b832c682f1814f5c68ef11192243dbde5643e73b78be4fb1407b831bcde43adb002c
+    REF "v${VERSION}"
+    SHA512 c45501b3876031205aa9a8e5264d61e545ecf827ce33b2f20fdc635345b6a4780a94334d2ddddce1bc708a8849cdba8dc3a73b045de81d6b32083be9036a7ff6
 )
 
 file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)

diff --git a/ports/lest/vcpkg.json b/ports/lest/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "lest",
-  "version": "1.35.1",
-  "port-version": 3,
+  "version": "1.35.2",
   "description": "A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant)",
   "homepage": "https://github.com/martinmoene/lest"
 }