Merge remote-tracking branch 'upstream/master' into folly

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
 )
 

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",

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
 )
 

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"

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")
 

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",

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)

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"

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"
   ]

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

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",

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

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",

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

ports/folly/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "folly",
-  "version-string": "2024.10.07.00",
+  "version-string": "2024.10.14.00",
   "port-version": 1,
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",

ports/freerdp/install-layout.patch

@@ -1,17 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1633656..db346d3 100644
+index 0a44b35..49e987a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -149,7 +149,7 @@ message(STATUS "Git Revision ${GIT_REVISION}")
- set(FREERDP_DEFAULT_PROJECT_VERSION ${FREERDP_VERSION} CACHE STRING INTERNAL)
-
- set(FREERDP_MAJOR_DIR "freerdp${FREERDP_VERSION_MAJOR}")
--set(FREERDP_INCLUDE_DIR "include/${FREERDP_MAJOR_DIR}/")
-+set(FREERDP_INCLUDE_DIR "include/")
-
- option(WITH_SMARTCARD_EMULATE "Emulate smartcards instead of redirecting readers" ON)
- if (WITH_SMARTCARD_EMULATE)
-@@ -711,6 +711,9 @@ else()
+@@ -666,6 +666,9 @@ else()
  		set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/${FREERDP_MAJOR_DIR}")
  	endif()
  endif()
@@ -22,67 +13,15 @@ index 1633656..db346d3 100644
 
  # Path to put extensions
 diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
-index cc94b99..0423242 100644
+index 72d3ca6..9e2bc12 100644
 --- a/client/Windows/CMakeLists.txt
 +++ b/client/Windows/CMakeLists.txt
-@@ -107,7 +107,7 @@ endif()
- target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS})
+@@ -77,7 +77,7 @@ target_link_libraries(${MODULE_NAME} PUBLIC ${PUB_LIBS})
+ target_link_libraries(${MODULE_NAME} PRIVATE ${PRIV_LIBS})
 
  if(WITH_CLIENT_INTERFACE)
 -	install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries)
 +	install(TARGETS ${MODULE_NAME} COMPONENT libraries)
- 	if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
- 		install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
- 	endif()
-diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in
-index 7555957..21ea0c7 100644
---- a/libfreerdp/freerdp.pc.in
-+++ b/libfreerdp/freerdp.pc.in
-@@ -4,7 +4,7 @@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- includedir=${prefix}/@FREERDP_INCLUDE_DIR@
- libs=-lfreerdp@FREERDP_API_VERSION@
- datarootdir=${prefix}/share
--datadir=${datarootdir}/@FREERDP_MAJOR_DIR@
-+datadir=${datarootdir}/freerdp
- plugindir=${libdir}/@FREERDP_MAJOR_DIR@
- proxy_plugindir=${plugindir}/proxy
- extensiondir=${plugindir}/extensions
-diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
-index 4769741..eb3fe11 100644
---- a/winpr/CMakeLists.txt
-+++ b/winpr/CMakeLists.txt
-@@ -320,7 +320,7 @@ endif()
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
- include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
-
--set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}")
-+set(WINPR_INCLUDE_DIR "include")
-
-
- add_subdirectory(libwinpr)
-diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
-index 4be2015..00c64e0 100644
---- a/winpr/libwinpr/CMakeLists.txt
-+++ b/winpr/libwinpr/CMakeLists.txt
-@@ -195,7 +195,7 @@ else()
  endif()
- target_link_options(${MODULE_NAME} ${LINK_OPTS_MODE} ${WINPR_LINK_OPTIONS})
- target_include_directories(${MODULE_NAME} PRIVATE ${WINPR_INCLUDES})
--target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/winpr${WINPR_VERSION_MAJOR}>)
-+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:${WINPR_INCLUDE_DIR}>)
- target_link_directories(${MODULE_NAME} PRIVATE ${WINPR_LINK_DIRS})
- target_compile_options(${MODULE_NAME} PRIVATE ${WINPR_COMPILE_OPTIONS})
- target_compile_definitions(${MODULE_NAME} PRIVATE ${WINPR_DEFINITIONS})
-diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt
-index e995172..f612718 100644
---- a/winpr/tools/CMakeLists.txt
-+++ b/winpr/tools/CMakeLists.txt
-@@ -110,7 +110,7 @@ if (WITH_LIBRARY_VERSIONING)
- endif()
-
- add_definitions(${WINPR_DEFINITIONS})
--target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:include/winpr${WINPR_VERSION_MAJOR}>)
-+target_include_directories(${MODULE_NAME} INTERFACE $<INSTALL_INTERFACE:${WINPR_INCLUDE_DIR}>)
- target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_TOOLS_LIBS})
+ add_subdirectory(cli)
 
- install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPR-toolsTargets