Merge remote-tracking branch 'origin/master' into msys

microsoft · Oct 22, 2024 · a5daa83 · a5daa83
2 parents c7f8a67 + c8582b4
commit a5daa83
Show file tree

Hide file tree

Showing 93 changed files with 357 additions and 461 deletions.
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/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/conjure-enum/portfile.cmake b/ports/conjure-enum/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO fix8mt/conjure_enum
  REF "v${VERSION}"
- SHA512 b9054a62ba10dd7b27b0fa6d2fd6a0c03eaea0f39fc0ba954e12351face02969fccd393278a9e29fa3f8af52b285b16e5ca6d0bc00a05a6ad08d7482bc1c587c
+ SHA512 af8127f2d958227a7168a7d808d7ff7f699b250c04b4a079f6ef9e034ee6d165e4d51054c2ec4dcec64291d3e11c507d73937dbee22e9bc5fcbdb73e127e0275
  HEAD_REF master
 )
 

diff --git a/ports/conjure-enum/vcpkg.json b/ports/conjure-enum/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "conjure-enum",
- "version": "1.0.1",
+ "version": "1.1.0",
  "description": "Lightweight header-only C++20 enum and typename reflection.",
  "homepage": "https://github.com/fix8mt/conjure_enum",
  "license": "MIT"

diff --git a/ports/cppfs/ssh-dependencies.diff b/ports/cppfs/ssh-dependencies.diff
@@ -20,7 +20,7 @@ index aa37eda..d29176a 100644
 
 -find_package(LibSSH2)
 -find_package(LibCrypto)
-+find_package(LibSSH2 NAMES Libssh2)
++find_package(LibSSH2 NAMES libssh2)
  find_package(ZLIB)
  find_package(OpenSSL)
 +set(LibCrypto_FOUND "${OpenSSL_FOUND}")
@@ -36,7 +36,7 @@ index aa37eda..d29176a 100644
 - ${LIBCRYPTO_LIBRARY}
 - ${ZLIB_LIBRARY}
 + OpenSSL::SSL
-+ $<IF:$<TARGET_EXISTS:Libssh2::libssh2_shared>,Libssh2::libssh2_shared,Libssh2::libssh2_static>
++ libssh2::libssh2
 + OpenSSL::Crypto
 + ZLIB::ZLIB
  )

diff --git a/ports/cppfs/vcpkg.json b/ports/cppfs/vcpkg.json
@@ -1,7 +1,7 @@
 {
  "name": "cppfs",
  "version": "1.3.0",
- "port-version": 3,
+ "port-version": 4,
  "description": "Cross-platform C++ file system library supporting multiple backends",
  "license": "MIT",
  "supports": "!uwp",

diff --git a/ports/curl/dependencies.patch b/ports/curl/dependencies.patch
@@ -10,7 +10,7 @@ index 7dc1f99..e83617e 100644
 + find_dependency(c-ares CONFIG)
 +endif()
 +if("@USE_LIBSSH2@")
-+ find_dependency(Libssh2 CONFIG)
++ find_dependency(libssh2 CONFIG)
 +endif()
 +if("@HAVE_BROTLI@")
 + find_dependency(unofficial-brotli CONFIG)
@@ -112,22 +112,18 @@ index dbb0bf4..f1a18d1 100644
  if(LIBPSL_FOUND)
  list(APPEND CURL_LIBS ${LIBPSL_LIBRARIES})
  list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libpsl")
-@@ -1072,7 +1084,13 @@ mark_as_advanced(CURL_USE_LIBSSH2)
+@@ -1072,7 +1084,9 @@ mark_as_advanced(CURL_USE_LIBSSH2)
  set(USE_LIBSSH2 OFF)
 
  if(CURL_USE_LIBSSH2)
 - find_package(Libssh2)
-+ find_package(LIBSSH2 NAMES Libssh2 REQUIRED)
-+ if(TARGET Libssh2::libssh2_shared)
-+ set(LIBSSH2_LIBRARIES Libssh2::libssh2_shared)
-+ else()
-+ set(LIBSSH2_LIBRARIES Libssh2::libssh2_static)
-+ endif()
++ find_package(LIBSSH2 NAMES libssh2 REQUIRED)
++ set(LIBSSH2_LIBRARIES libssh2::libssh2)
 + get_target_property(LIBSSH2_INCLUDE_DIRS "${LIBSSH2_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES)
  if(LIBSSH2_FOUND)
  list(APPEND CURL_LIBS ${LIBSSH2_LIBRARIES})
  list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libssh2")
-@@ -1121,7 +1139,8 @@ endif()
+@@ -1121,7 +1135,8 @@ endif()
  option(CURL_USE_GSASL "Use libgsasl" OFF)
  mark_as_advanced(CURL_USE_GSASL)
  if(CURL_USE_GSASL)
@@ -137,7 +133,7 @@ index dbb0bf4..f1a18d1 100644
  if(LIBGSASL_FOUND)
  list(APPEND CURL_LIBS ${LIBGSASL_LIBRARIES})
  list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS})
-@@ -1139,7 +1158,10 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF)
+@@ -1139,7 +1154,10 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF)
  mark_as_advanced(CURL_USE_GSSAPI)
 
  if(CURL_USE_GSSAPI)

diff --git a/ports/curl/vcpkg-cmake-wrapper.cmake b/ports/curl/vcpkg-cmake-wrapper.cmake
@@ -28,7 +28,7 @@ if(CURL_FOUND)
  if(_curl_link_libraries MATCHES "OpenSSL::")
  string(REGEX REPLACE "([\$]<[^;]*)?OpenSSL::(SSL|Crypto)([^;]*>)?" "${OPENSSL_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}")
  endif()
- if(_curl_link_libraries MATCHES "Libssh2::libssh2_(shared|static)")
+ if(_curl_link_libraries MATCHES "libssh2::libssh2")
  # TODO: move find_dependency(Libssh2 CONFIG) into CURL config
  set(_libssh2_target "${CMAKE_MATCH_0}")
  find_package(Libssh2 CONFIG QUIET)

diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json
@@ -1,6 +1,7 @@
 {
  "name": "curl",
  "version": "8.10.1",
+ "port-version": 1,
  "description": "A library for transferring data with URLs",
  "homepage": "https://curl.se/",
  "license": "curl AND ISC AND BSD-3-Clause",

diff --git a/ports/directx-dxc/directx-dxc-config.cmake.in b/ports/directx-dxc/directx-dxc-config.cmake.in
@@ -15,9 +15,9 @@ set_target_properties(Microsoft::DirectXShaderCompiler PROPERTIES
 
 add_library(Microsoft::DXIL SHARED IMPORTED)
 set_target_properties(Microsoft::DXIL PROPERTIES
- IMPORTED_LOCATION "${CURRENT_INSTALLED_DIR}/@dll_dir@/@dll_name_dxil@"
+ IMPORTED_LOCATION "${_dxc_root}/@dll_dir@/@dll_name_dxil@"
  IMPORTED_IMPLIB "${_dxc_root}/lib/@lib_name@"
- IMPORTED_SONAME  "@lib_name@"
+ IMPORTED_NO_SONAME TRUE
  INTERFACE_INCLUDE_DIRECTORIES "${_dxc_root}/include/directx-dxc"
  IMPORTED_LINK_INTERFACE_LANGUAGES "C")
 

diff --git a/ports/directx-dxc/vcpkg.json b/ports/directx-dxc/vcpkg.json
@@ -1,7 +1,7 @@
 {
  "name": "directx-dxc",
  "version-date": "2024-07-31",
- "port-version": 1,
+ "port-version": 2,
  "description": "DirectX Shader Compiler (LLVM/Clang)",
  "homepage": "https://github.com/microsoft/DirectXShaderCompiler",
  "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki",

diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO brainboxdotcc/DPP
  REF "v${VERSION}"
- SHA512 0aac06f8ee67e3b4c430c9844beb6bdc3e31adebfcb2c077d18be8a8295451d70735f96dd5316d299df30b4cc4229180ffbad5095e51b49adf182290a8133a90
+ SHA512 69fe3323aceb4ad52ec1fcfb38a8770e88c03ae0b6cb49768441b603e13659625720d984b992311fcca8ef863d40b8b7fb082996fae2d396e785b637b673a328
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json
@@ -1,12 +1,11 @@
 {
  "name": "dpp",
- "version": "10.0.31",
+ "version": "10.0.33",
  "description": "D++ Extremely Lightweight C++ Discord Library.",
  "homepage": "https://dpp.dev/",
  "license": "Apache-2.0",
  "supports": "(windows & !static & !uwp) | linux | osx",
  "dependencies": [
- "libsodium",
  "nlohmann-json",
  "openssl",
  "opus",

diff --git a/ports/fbthrift/0002-fix-dependency.patch → ports/fbthrift/fix-deps.patch b/ports/fbthrift/0002-fix-dependency.patch → ports/fbthrift/fix-deps.patch
@@ -1,16 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5eea37c..145e5b6 100644
+index c6b2b2a810..787a83bb1c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -96,23 +96,25 @@ endif ()
+@@ -105,24 +105,26 @@ endif ()
 
  # Find required dependencies for thrift/lib
  if (THRIFT_LIB_ONLY OR build_all)
 - find_package(Gflags REQUIRED)
+- find_package(Glog REQUIRED)
 + find_package(gflags CONFIG REQUIRED)
 + set(LIBGFLAGS_LIBRARY gflags::gflags)
-  find_package(glog CONFIG REQUIRED)
- set (GLOG_LIBRARIES glog::glog)
++ find_package(glog CONFIG REQUIRED)
++ set(GLOG_LIBRARIES glog::glog)
  find_package(folly CONFIG REQUIRED)
  find_package(fizz CONFIG REQUIRED)
  find_package(wangle CONFIG REQUIRED)
@@ -22,6 +23,7 @@ index 5eea37c..145e5b6 100644
 + elseif(TARGET zstd::libzstd_static)
 + set(ZSTD_LIBRARIES zstd::libzstd_static)
 + endif()
+ find_package(Xxhash REQUIRED)
  find_package(mvfst CONFIG REQUIRED)
  # https://cmake.org/cmake/help/v3.9/module/FindThreads.html
  set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -31,27 +33,28 @@ index 5eea37c..145e5b6 100644
 - ${GLOG_INCLUDE_DIRS}
 - ${OPENSSL_INCLUDE_DIR}
 - ${ZSTD_INCLUDE_DIRS}
+- ${Xxhash_INCLUDE_DIR}
  )
  add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0")
  if (THRIFT_LIB_ONLY)
 diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in
-index 1d38221..ab96215 100644
+index 057015258c..f0c6692246 100644
 --- a/thrift/cmake/FBThriftConfig.cmake.in
 +++ b/thrift/cmake/FBThriftConfig.cmake.in
-@@ -28,8 +28,15 @@ else()
+@@ -29,8 +29,15 @@ else()
  set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1")
  endif()
 
 -find_dependency(ZLIB REQUIRED)
 -find_package(mvfst CONFIG REQUIRED)
 +find_dependency(ZLIB)
 +find_dependency(mvfst CONFIG)
-+find_dependency(fizz CONFIG )
-+find_dependency(fmt CONFIG )
-+find_dependency(folly CONFIG )
++find_dependency(fizz CONFIG)
++find_dependency(fmt CONFIG)
++find_dependency(folly CONFIG)
 +find_dependency(gflags CONFIG)
-+find_dependency(glog CONFIG )
-+find_dependency(wangle CONFIG )
++find_dependency(glog CONFIG)
++find_dependency(wangle CONFIG)
 +find_dependency(zstd CONFIG)
 
  if (NOT TARGET FBThrift::thriftcpp2)

diff --git a/ports/fbthrift/fix-glog.patch b/ports/fbthrift/fix-glog.patch
diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake
@@ -2,11 +2,10 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO facebook/fbthrift
  REF "v${VERSION}"
- SHA512 b1a880a922e5823ec6c87d1540651978d895a2d0389158865011198ca80034342f39f7b2c1a104745ccb1cb3cb8d355cb0afb5b08c38fb8187a285ea37071f26
+ SHA512 5018dd3e062489633c6e6fdef867656bc8ae6717dd74808a29ce5066fd5d0d69d3038a1a0326ed4df2139590dce6b99381cdaaecae0af5ef37d26a5903be1e7e
  HEAD_REF main
- PATCHES 
- fix-glog.patch
- 0002-fix-dependency.patch
+ PATCHES
+ fix-deps.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake")
@@ -34,6 +33,7 @@ file(REMOVE_RECURSE
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test"
+ "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/async/metadata/test"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/debug_thrift_data_difference/test"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/folly_dynamic/test"
@@ -42,6 +42,7 @@ file(REMOVE_RECURSE
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/detail/test"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/tool"
+ "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/demo"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/runtime/test"
  "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test"

diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "fbthrift",
- "version-string": "2024.10.07.00",
+ "version-string": "2024.10.14.00",
  "description": "Facebook's branch of Apache Thrift, including a new C++ server.",
  "homepage": "https://github.com/facebook/fbthrift",
  "license": "Apache-2.0",
@@ -28,6 +28,7 @@
  "host": true
  },
  "wangle",
+ "xxhash",
  "zlib",
  "zstd"
  ]

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 e20ecda20f0a4dce306cddfbdcf990212067aa4d3df551ee9d0b4a9a17f0509aba0c38bc9945ba2ba039a60f51a9cd5ea3e6fe6f97ba7d1c80e76238301bd283
+ SHA512 5c18e5f66df1fd87a656212a2c4ffa2fd314f82318911e67831e979b2ea2695eec5ef5f61cebeaef954f55c904a5410d49a04cbea6549ba6ee8804db441efcc2
  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.10.07.00",
+ "version-string": "2024.10.14.00",
  "description": "a TLS 1.3 implementation by Facebook",
  "homepage": "https://github.com/facebookincubator/fizz",
  "license": "BSD-3-Clause",

diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake
@@ -10,7 +10,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO FluidSynth/fluidsynth
  REF "v${VERSION}"
- SHA512 521e103e49c281ab7a44a2a275f614894062c1be6eb4df776b11e3756803c6b4b73d1e9596d364959c81b37dff4798d56798f9262c486e098f072ae1e7bef1c1
+ SHA512 f5fd5ddbc4d30ded258ae3d04ba5981ce8da1132c5d93faf1e8745a9d9f89c9fb3365f0447b94e0fe0e9b032c789fcbd6e647a65a50d1f76179b53a76683d004
  HEAD_REF master
  PATCHES
  gentables.patch

diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "fluidsynth",
- "version": "2.3.6",
+ "version": "2.3.7",
  "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.",
  "homepage": "https://github.com/FluidSynth/fluidsynth",
  "license": "LGPL-2.1-or-later",

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 cb8feb35e51072555b910613e87f079acd1f97892df0e6f3888bd9a8a336ca6183d552bfb4e16cfafbf8f5a7ec3f2a85dda686c74528e23e4bc821b2f67bfa77
+ SHA512 d402a2ebdff0c56e23e020823a040ef409b5c7834f598a75248126ca554f622806154d7aabc11ae65c9c2f16907a8a3589ad50e833c359714c4c5b1525cd1ba5
  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.10.07.00",
+ "version-string": "2024.10.14.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",