Merge branch 'microsoft:master' into OpenXLSX

microsoft · Sep 30, 2024 · ebf9f13 · ebf9f13
2 parents 8a3debe + 2960d7d
commit ebf9f13
Show file tree

Hide file tree

Showing 93 changed files with 468 additions and 423 deletions.
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 74bad3f234dfe7b72e2057583e077e6a0f78f34b9c699751972d079b8027ef2dc34e6ef07c0dedeb923d8979f91c58a8a90473e69152c89e76baaa3659fa575b
+ SHA512 bc876db537153d6b0599215ca8be8261bceca6d213fcc63af5fda13c1b32876496cb8d4e98c787f17317cf8ffd1940431551513807f1a18f9ce993fad35f5ec6
  HEAD_REF main
  PATCHES
  no-cpm.patch

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

diff --git a/ports/anari/portfile.cmake b/ports/anari/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO KhronosGroup/ANARI-SDK
  REF "v${VERSION}"
- SHA512 51937d160a9508c56cf123eda13002c705acff501366710f83da1c62d875f8427cec27f10ea2d05f4637be141fb9a87935f4b0b9f0fabb6bd6a7cca6a4f48ee1
+ SHA512 cf2c2e044b04d695e0a6c6c1abfb3495ea0996a018742ad3a6baccc6e0e3e9b83cb91b61eda8cf07e8f67f4beba24d07d927697a27606ae008a85fee9fa64fa8
  HEAD_REF main
 )
 

diff --git a/ports/anari/vcpkg.json b/ports/anari/vcpkg.json
@@ -1,7 +1,6 @@
 {
  "name": "anari",
- "version": "0.7.0",
- "port-version": 1,
+ "version": "0.10.0",
  "description": "Cross-Platform 3D Rendering Engine API.",
  "homepage": "https://www.khronos.org/anari",
  "license": "Apache-2.0",

diff --git a/ports/arrayfire/fix-miss-header-file.patch b/ports/arrayfire/fix-miss-header-file.patch
@@ -0,0 +1,12 @@
+diff --git a/src/backend/common/half.hpp b/src/backend/common/half.hpp
+index fb25d03..2f6a8a4 100644
+--- a/src/backend/common/half.hpp
++++ b/src/backend/common/half.hpp
+@@ -33,6 +33,7 @@
+ #endif
+
+ #include <backend.hpp>
++#include <cstdint>
+
+ #ifdef __CUDACC_RTC__
+ using uint16_t = unsigned short;
diff --git a/ports/arrayfire/portfile.cmake b/ports/arrayfire/portfile.cmake
@@ -1,3 +1,10 @@
+vcpkg_download_distfile(
+ CUDA_PATCHES
+ URLS "https://github.com/arrayfire/arrayfire/pull/3552/commits/674e7bec90b90467139d32bf633467fe60824617.diff?full_index=1"
+ FILENAME "fix-cuda-674e7bec90b90467139d32bf633467fe60824617.patch"
+ SHA512 201ba8c46f5eafd5d8dbc78ddc1fb4c24b8d820f034e081b8ff30712705fe059c2850bbb7394d81931620619071559fed0e98b13cc4f985103e354c44a322e78
+)
+
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO arrayfire/arrayfire
@@ -8,6 +15,8 @@ vcpkg_from_github(
  build.patch
  Fix-constexpr-error-with-vs2019-with-half.patch
  fix-dependency-clfft.patch
+ fix-miss-header-file.patch
+ "${CUDA_PATCHES}"
 )
 
 # arrayfire cpu thread lib needed as a submodule for the CPU backend
@@ -91,7 +100,7 @@ vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-if(VCPKG_TARGET_IS_OSX)
+if(NOT VCPKG_TARGET_IS_WINDOWS)
  vcpkg_cmake_config_fixup(CONFIG_PATH share/ArrayFire/cmake)
 else()
  vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
@@ -103,6 +112,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
  "${CURRENT_PACKAGES_DIR}/examples"
  "${CURRENT_PACKAGES_DIR}/LICENSES"
  "${CURRENT_PACKAGES_DIR}/debug/LICENSES")
+if(FEATURES STREQUAL "core")
+ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+endif()
 
 # Copyright and license
 file(INSTALL "${SOURCE_PATH}/COPYRIGHT.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json
@@ -1,7 +1,7 @@
 {
  "name": "arrayfire",
  "version-semver": "3.8.0",
- "port-version": 6,
+ "port-version": 7,
  "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.",
  "homepage": "https://github.com/arrayfire/arrayfire",
  "license": "BSD-3-Clause",

diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO buck-yeh/bux
  REF "${VERSION}"
- SHA512 e91ab0e53b8af5b6548a368f7c3259eb6b368d895df6554b090a92aaf52cab7b26ed2a6e740ebd88029994cd91aa723648fa43b62a56ad69629186e723d80510
+ SHA512 87eb9938c0f1f865f60c7df5517e8a0f615b77e883349c8c4173a0bfe4a4e6a1784c195b5cc37b6ccc7837ef4513d2f0d2fc9bb3b9e06c550796882172a42c80
  HEAD_REF main
 )
 

diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "buck-yeh-bux",
- "version": "1.8.0",
+ "version": "1.8.1",
  "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.",
  "homepage": "https://github.com/buck-yeh/bux",
  "license": "MIT",

diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO gknowles/dimcli
  REF "v${VERSION}"
- SHA512 2d475e80e91e10244fd4c7ffeefb1f9fc84a786e2e7885d42295850e7c2dddc6572ad09a610b65e19639da9adca6ac6b6b3e6038cfed803fc2c59ae3818b4281
+ SHA512 fff7ac643b42c9c4464ac34c80369ef1e3d9d87677a3c7c660fd6a697b57348599b445794ac278d87a9a8d31c00adfded5932ecaa54e8ed918cb4665023fd8d5
  HEAD_REF master
 )
 

diff --git a/ports/dimcli/vcpkg.json b/ports/dimcli/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "dimcli",
- "version-semver": "7.2.0",
+ "version-semver": "7.3.0",
  "description": "C++ command line parser toolkit",
  "homepage": "https://github.com/gknowles/dimcli",
  "documentation": "https://gknowles.github.io/dimcli",

diff --git a/ports/fastrtps/disable-symlink.patch → ports/fastdds/disable-symlink.patch b/ports/fastrtps/disable-symlink.patch → ports/fastdds/disable-symlink.patch
@@ -1,16 +1,16 @@
-Normally, the build script attempts to create a symlink to fast-discovery-server on Windows
-and only falls back to a batch file if the necessary administrator privileges are not available.
-Since symlinks do not work well with vcpkg binary caching,
-we force the build script to create a batch file in any case.
-diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt
---- a/tools/fds/CMakeLists.txt
-+++ b/tools/fds/CMakeLists.txt
-@@ -116,7 +116,7 @@ # - on windows privileges to create symlinks (a .bat file is provided on unprivileged installations)
- if( WIN32 )
- # Use powershell to generate the link
- install(
-- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $<TARGET_FILE_NAME:${PROJECT_NAME}> -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $<TARGET_FILE_NAME:${PROJECT_NAME}>) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()"
-+ CODE "set(FAST_SERVER_BINARY_NAME $<TARGET_FILE_NAME:${PROJECT_NAME}>) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n"
- COMPONENT discovery)
- else()
- # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix
+Normally, the build script attempts to create a symlink to fast-discovery-server on Windows
+and only falls back to a batch file if the necessary administrator privileges are not available.
+Since symlinks do not work well with vcpkg binary caching,
+we force the build script to create a batch file in any case.
+diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt
+--- a/tools/fds/CMakeLists.txt
++++ b/tools/fds/CMakeLists.txt
+@@ -116,7 +116,7 @@ # - on windows privileges to create symlinks (a .bat file is provided on unprivileged installations)
+ if( WIN32 )
+ # Use powershell to generate the link
+ install(
+- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $<TARGET_FILE_NAME:${PROJECT_NAME}> -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $<TARGET_FILE_NAME:${PROJECT_NAME}>) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()"
++ CODE "set(FAST_SERVER_BINARY_NAME $<TARGET_FILE_NAME:${PROJECT_NAME}>) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n"
+ COMPONENT discovery)
+ else()
+ # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix
diff --git a/ports/fastrtps/fix-find-package-asio.patch → ports/fastdds/fix-find-package-asio.patch b/ports/fastrtps/fix-find-package-asio.patch → ports/fastdds/fix-find-package-asio.patch
@@ -1,12 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,7 +141,7 @@ if(NOT BUILD_SHARED_LIBS)
- endif()
-
- eprosima_find_package(fastcdr REQUIRED)
--eprosima_find_thirdparty(Asio asio VERSION 1.10.8)
-+find_package(asio CONFIG REQUIRED)
- eprosima_find_thirdparty(TinyXML2 tinyxml2)
-
- find_package(foonathan_memory REQUIRED)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c930e31..11b96a3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -255,7 +255,7 @@ if(NOT BUILD_SHARED_LIBS)
+ endif()
+
+ eprosima_find_package(fastcdr 2 REQUIRED)
+-eprosima_find_thirdparty(Asio asio VERSION 1.10.8)
++find_package(asio CONFIG REQUIRED)
+ eprosima_find_thirdparty(TinyXML2 tinyxml2)
+
+ find_package(foonathan_memory REQUIRED)
diff --git a/ports/fastdds/pdb-file.patch b/ports/fastdds/pdb-file.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
+index e0be0a7..9eb07a6 100644
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
+@@ -661,7 +661,7 @@ if(MSVC OR MSVC_IDE)
+ endif()
+
+ # install symbols if any
+- if(PDB_FILE)
++ if(PDB_FILE AND BUILD_SHARED_LIBS)
+ install(FILES ${PDB_FILE}
+ DESTINATION ${LIB_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}
+ COMPONENT symbols
diff --git a/ports/fastrtps/portfile.cmake → ports/fastdds/portfile.cmake b/ports/fastrtps/portfile.cmake → ports/fastdds/portfile.cmake
@@ -2,12 +2,13 @@
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO eProsima/Fast-DDS
- REF v2.14.0
- SHA512 cf3628ac7598c83f09e3975de9fb59e868797adc331d7b4a226c38c0bbd1f7ce15deeb7cedee938a86a68426585e0b5646a84f40705c9a04553b7e37f20b2a4d
+ REF "v${VERSION}"
+ SHA512 84333bef4b5264b72129e515c2208048c25794d7d653073298cbf5f43ba95c85f2aa64f30e6911a69daf9affc4dc1e10cea4064da43fdd709bbe04ef1cf1f4d7
  HEAD_REF master
  PATCHES
  fix-find-package-asio.patch
  disable-symlink.patch
+ pdb-file.patch
 )
 
 set(extra_opts "")
@@ -28,7 +29,7 @@ vcpkg_cmake_configure(
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH share/fastrtps/cmake)
+vcpkg_cmake_config_fixup(CONFIG_PATH share/fastdds/cmake)
 
 if(VCPKG_TARGET_IS_WINDOWS)
  # copy tools from "bin" to "tools" folder

diff --git a/ports/fastrtps/vcpkg.json → ports/fastdds/vcpkg.json b/ports/fastrtps/vcpkg.json → ports/fastdds/vcpkg.json
@@ -1,6 +1,6 @@
 {
- "name": "fastrtps",
- "version": "2.14.0",
+ "name": "fastdds",
+ "version": "3.0.1",
  "description": "eprosima Fast DDS (formerly Fast RTPS) is a C++ implementation of the DDS (Data Distribution Service) standard of the OMG (Object Management Group). eProsima Fast DDS implements the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.",
  "homepage": "https://www.eprosima.com/",
  "license": "Apache-2.0",

diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
@@ -1,10 +1,11 @@
 {
  "name": "folly",
  "version-string": "2024.09.23.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",
  "license": "Apache-2.0",
- "supports": "(windows & x64 & !uwp) | (!windows & (x64 | arm64))",
+ "supports": "(windows & x64 & !uwp & !mingw) | (!windows & (x64 | arm64))",
  "dependencies": [
  "boost-chrono",
  "boost-context",

diff --git a/ports/fontconfig/fix-wasm-shared-memory-atomics.patch b/ports/fontconfig/fix-wasm-shared-memory-atomics.patch
@@ -0,0 +1,14 @@
+diff --git a/meson.build b/meson.build
+index 8e78700..95bae59 100644
+--- a/meson.build
++++ b/meson.build
+@@ -112,6 +112,9 @@ check_alignofs = [
+ ]
+
+ add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
++if cc.get_id() == 'clang' and host_machine.cpu_family() == 'wasm'
++ add_project_arguments('-matomics', '-mbulk-memory', language: 'c')
++endif
+
+ c_args = []
+
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_gitlab(
  PATCHES
  no-etc-symlinks.patch
  libgetopt.patch
+ fix-wasm-shared-memory-atomics.patch
 )
 
 vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf")

diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json
@@ -1,6 +1,7 @@
 {
  "name": "fontconfig",
  "version": "2.15.0",
+ "port-version": 1,
  "description": "Library for configuring and customizing font access.",
  "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
  "license": "MIT",

diff --git a/ports/gloo/fix-array.patch b/ports/gloo/fix-array.patch
diff --git a/ports/gloo/portfile.cmake b/ports/gloo/portfile.cmake
@@ -1,12 +1,10 @@
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO facebookincubator/gloo
- REF 1da21174054eaabbbd189b7f657ea24842d821e2
- SHA512 ebd8369e413aee739a3928f8e6738c15708f009e0cd5a3763b8cadbe6f6d0a9d758585a7a2b0f7dd6d39a12882ff2f9497ab2d4edcebd4eb2a7237ab857f317e
+ REF 81925d1c674c34f0dc34dd9a0f2151c1b6f701eb
+ SHA512 2783908e7e0d6bd7f8cf59f4e6a94c84908e459f394c294cdf34aa8d1943a193fb25d15a8662f5a32a82b23a2657e63b1aa562f3ad8953ef79c9f502d04fed20
  HEAD_REF master
- PATCHES
- fix-array.patch #https://github.com/facebookincubator/gloo/issues/332
- )
+)
 
 # Determine which backend to build via specified feature
 vcpkg_check_features(

diff --git a/ports/gloo/vcpkg.json b/ports/gloo/vcpkg.json
@@ -1,7 +1,6 @@
 {
  "name": "gloo",
- "version": "20201203",
- "port-version": 3,
+ "version": "20240626",
  "description": "Collective communications library with various primitives for multi-machine training.",
  "homepage": "https://github.com/facebookincubator/gloo",
  "supports": "x64 & linux",

diff --git a/ports/godot-cpp/packagable.patch b/ports/godot-cpp/packagable.patch
@@ -6,7 +6,7 @@ index e715102..b000066 100644
  # Todo
  # Test build for Windows, Mac and mingw.
 
--cmake_minimum_required(VERSION 3.12)
+-cmake_minimum_required(VERSION 3.13)
 +cmake_minimum_required(VERSION 3.19)
  project(godot-cpp LANGUAGES CXX)
 

diff --git a/ports/godot-cpp/portfile.cmake b/ports/godot-cpp/portfile.cmake
@@ -1,11 +1,10 @@
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO "godotengine/godot-cpp"
  REF "godot-${VERSION}-stable"
- SHA512 "820e07ffb0545324f01598898bb342d7e143dcc8b83818824e7e1bc22937d3e8016b435f1ec085ebaae8b26e6f6dfb5500f120089316fc0f0c4153c340226941"
+ SHA512 "4012e2c8cbdbccf5362b139a6318785af6e2cfdc99848734d5e3825afba8b8a46cdd7fff63887e2503cf3195efe79c0bd39a900b535322ab0fb51c3452dc07f5"
  HEAD_REF "master"
  PATCHES
  "packagable.patch"

diff --git a/ports/godot-cpp/vcpkg.json b/ports/godot-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "godot-cpp",
- "version": "4.2.1",
+ "version": "4.3",
  "description": "C++ bindings for the Godot script API",
  "homepage": "https://github.com/godotengine/godot-cpp",
  "license": "MIT",

diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
  OUT_SOURCE_PATH SOURCE_PATH
  REPO harfbuzz/harfbuzz
  REF ${VERSION}
- SHA512 2f59759d29b735ff869407598afb5fd298db4709d8c7b932389ec60d42c1ec43d07dc6672ac0c14341c1bae1b839eb3bd2cb7ef1985fb02b5a48c8e5b02f4e7c
+ SHA512 ca1b7af7b4d05c9321a64b6083d618ca8a758547a8fc43eae5c2769110dcc784f9bb769d2ddb9479ebe62bb3f91ee9d5320fb4eaad3244b783f4fe31e6de33a0
  HEAD_REF master
  PATCHES
  fix-win32-build.patch

diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json
@@ -1,6 +1,6 @@
 {
  "name": "harfbuzz",
- "version": "9.0.0",
+ "version": "10.0.1",
  "description": "HarfBuzz OpenType text shaping engine",
  "homepage": "https://github.com/harfbuzz/harfbuzz",
  "license": "MIT-Modern-Variant",