diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake index 8a5e829ab677e4..431721cc4951c0 100644 --- 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 index 6caff1610db8f6..fb09b307f9e96f 100644 --- 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 index 334e64649c0935..baa13fd6c9d601 100644 --- 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 index 86143ae9c3438c..d4610b6e4b32df 100644 --- 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 new file mode 100644 index 00000000000000..c29c51f4fa1e2d --- /dev/null +++ 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 ++#include + + #ifdef __CUDACC_RTC__ + using uint16_t = unsigned short; diff --git a/ports/arrayfire/portfile.cmake b/ports/arrayfire/portfile.cmake index 20e92f5d6f5e4e..d6640becc7e500 100644 --- 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 index 668cf97e62bd11..6ccec696fd6cc3 100644 --- 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 index 56458ab276defc..73767d6bebf4ec 100644 --- 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 index 4d0bc024fd109d..0d04c2368f3e6f 100644 --- 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 index 5cb7618e58f993..cee86ff6b40b38 100644 --- 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 index 0b25228b728506..4892c0c66c4613 100644 --- 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 b/ports/fastdds/disable-symlink.patch similarity index 99% rename from ports/fastrtps/disable-symlink.patch rename to ports/fastdds/disable-symlink.patch index d9584c81efbdff..680308477d9025 100644 --- a/ports/fastrtps/disable-symlink.patch +++ b/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 $ -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 $) \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 $) \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 $ -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 $) \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 $) \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 b/ports/fastdds/fix-find-package-asio.patch similarity index 69% rename from ports/fastrtps/fix-find-package-asio.patch rename to ports/fastdds/fix-find-package-asio.patch index 4592311e2a55aa..c0da3d0beb34b7 100644 --- a/ports/fastrtps/fix-find-package-asio.patch +++ b/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 new file mode 100644 index 00000000000000..e36bfc3879d4b1 --- /dev/null +++ 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 b/ports/fastdds/portfile.cmake similarity index 91% rename from ports/fastrtps/portfile.cmake rename to ports/fastdds/portfile.cmake index 46fc85ab6042d2..94907aad1393a9 100644 --- a/ports/fastrtps/portfile.cmake +++ b/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 b/ports/fastdds/vcpkg.json similarity index 94% rename from ports/fastrtps/vcpkg.json rename to ports/fastdds/vcpkg.json index 1e2308a96a17d7..d55b0a38e3785a 100644 --- a/ports/fastrtps/vcpkg.json +++ b/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 index 004ddcf87c2eec..c2399a7fa2af82 100644 --- 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 new file mode 100644 index 00000000000000..d94d109c8008f7 --- /dev/null +++ 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 index 73875a5db9d2a0..9cf2635b8f9d0e 100644 --- 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 index 81230696268a62..81d0ad316c6bf8 100644 --- 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 deleted file mode 100644 index 2963d0452cfcc3..00000000000000 --- a/ports/gloo/fix-array.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/gloo/transport/tcp/device.cc b/gloo/transport/tcp/device.cc -index cda44c8..2df6167 100644 ---- a/gloo/transport/tcp/device.cc -+++ b/gloo/transport/tcp/device.cc -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - #include "gloo/common/linux.h" - #include "gloo/common/logging.h" -diff --git a/gloo/transport/tcp/tls/pair.cc b/gloo/transport/tcp/tls/pair.cc -index e8f95f7..b0277aa 100644 ---- a/gloo/transport/tcp/tls/pair.cc -+++ b/gloo/transport/tcp/tls/pair.cc -@@ -17,6 +17,7 @@ - - #include - #include -+#include - - namespace gloo { - namespace transport { diff --git a/ports/gloo/portfile.cmake b/ports/gloo/portfile.cmake index 8f87e7e0f3eddc..347f577ab0c055 100644 --- 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 index 60740196445c39..03a382327b1d61 100644 --- 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 index fdfdc7116f3ed4..cf7e96e618fd70 100644 --- 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 index dd5fca6aa7a201..044851d5ceba87 100644 --- 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 index 659a60b2a40ba0..44ca45f9ae472e 100644 --- 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 index 4786e0460664b6..f7fd49a72c755f 100644 --- 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 index 7a07d64f2ad272..5b3c341bd15346 100644 --- 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", diff --git a/ports/level-zero/001-patch-install-rules.patch b/ports/level-zero/001-patch-install-rules.patch deleted file mode 100644 index 841fc0ebc7e559..00000000000000 --- a/ports/level-zero/001-patch-install-rules.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 5ef252c..c9d05dd 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -49,21 +49,10 @@ endif() - target_link_libraries(${TARGET_LOADER_NAME} utils) - - install(TARGETS ze_loader -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero -- NAMELINK_SKIP --) -- --install(TARGETS ze_loader -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero-devel -- NAMELINK_ONLY -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero -+ NAMELINK_COMPONENT level-zero-devel - ) - - if(UNIX) -diff --git a/source/drivers/null/CMakeLists.txt b/source/drivers/null/CMakeLists.txt -index b384434..0cb8801 100644 ---- a/source/drivers/null/CMakeLists.txt -+++ b/source/drivers/null/CMakeLists.txt -@@ -21,18 +21,10 @@ target_include_directories(${TARGET_NAME} - - if(INSTALL_NULL_DRIVER) - install(TARGETS ze_null -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero -- NAMELINK_SKIP -- ) -- install(TARGETS ze_null -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero-devel -- NAMELINK_ONLY -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero -+ NAMELINK_COMPONENT level-zero-devel - ) - endif() - -diff --git a/source/layers/tracing/CMakeLists.txt b/source/layers/tracing/CMakeLists.txt -index 1dde028..63e0b20 100644 ---- a/source/layers/tracing/CMakeLists.txt -+++ b/source/layers/tracing/CMakeLists.txt -@@ -49,20 +49,8 @@ set_target_properties(${TARGET_NAME} PROPERTIES - ) - - install(TARGETS ze_tracing_layer -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero -- NAMELINK_SKIP -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero -+ NAMELINK_COMPONENT level-zero-devel - ) -- --install(TARGETS ze_tracing_layer -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero-devel -- NAMELINK_ONLY --) -- -diff --git a/source/layers/validation/CMakeLists.txt b/source/layers/validation/CMakeLists.txt -index 3a4162c..ced5f21 100644 ---- a/source/layers/validation/CMakeLists.txt -+++ b/source/layers/validation/CMakeLists.txt -@@ -37,21 +37,10 @@ set_target_properties(${TARGET_NAME} PROPERTIES - ) - - install(TARGETS ze_validation_layer -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero -- NAMELINK_SKIP --) -- --install(TARGETS ze_validation_layer -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -- LIBRARY -- DESTINATION ${CMAKE_INSTALL_LIBDIR} -- COMPONENT level-zero-devel -- NAMELINK_ONLY -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT level-zero -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero -+ NAMELINK_COMPONENT level-zero-devel - ) - - add_subdirectory(handle_lifetime_tracking) diff --git a/ports/level-zero/portfile.cmake b/ports/level-zero/portfile.cmake index b032a0db9f1dcc..f05a0d5fd6d1a0 100644 --- a/ports/level-zero/portfile.cmake +++ b/ports/level-zero/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/level-zero REF "v${VERSION}" - SHA512 0498ec279ab73a61ccd4a2c27a8c3837090004e0730c01e92ef6e91f32000ca9e91167b87fbec66668674d86b5dede51470ce4c77dafb58f8b4d982db8b6e490 + SHA512 83d97ffe43c21286a845bb9d11504414972c944d9b06975ba9e7680802a92a260b6246f3605ed32e5e5dec358972fbb5cab49543559dc36cb164a9c3b6a69d73 HEAD_REF master - PATCHES - 001-patch-install-rules.patch ) vcpkg_cmake_configure( diff --git a/ports/level-zero/vcpkg.json b/ports/level-zero/vcpkg.json index 769e87b71b9c23..28f8280d96e075 100644 --- a/ports/level-zero/vcpkg.json +++ b/ports/level-zero/vcpkg.json @@ -1,6 +1,6 @@ { "name": "level-zero", - "version": "1.17.28", + "version": "1.17.45", "description": "oneAPI Level Zero Specification Headers and Loader.", "homepage": "https://github.com/oneapi-src/level-zero", "license": "MIT", diff --git a/ports/libcred/disable_tests.patch b/ports/libcred/disable_tests.patch new file mode 100644 index 00000000000000..33d82cdb9c00b4 --- /dev/null +++ b/ports/libcred/disable_tests.patch @@ -0,0 +1,17 @@ +diff --git a/meson.build b/meson.build +index 4de2473..d49a42a 100644 +--- a/meson.build ++++ b/meson.build +@@ -56,8 +56,8 @@ endif + + install_headers('include/libcred.hpp') + +-executable('ex1', ['example/ex1.cpp'], link_with: credhelperlib, include_directories: ['include']) +-executable('ex2', ['example/ex2.cpp'], link_with: credhelperlib, include_directories: ['include']) ++#executable('ex1', ['example/ex1.cpp'], link_with: credhelperlib, include_directories: ['include']) ++#executable('ex2', ['example/ex2.cpp'], link_with: credhelperlib, include_directories: ['include']) + +-testexe = executable('testexe', ['test/test.cpp'], link_with: credhelperlib, include_directories: ['include']) +-test('test1', testexe) ++#testexe = executable('testexe', ['test/test.cpp'], link_with: credhelperlib, include_directories: ['include']) ++#test('test1', testexe) diff --git a/ports/libcred/portfile.cmake b/ports/libcred/portfile.cmake new file mode 100644 index 00000000000000..deb8ad3fc915b2 --- /dev/null +++ b/ports/libcred/portfile.cmake @@ -0,0 +1,21 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mamba-org/libcred + REF ${VERSION} + SHA512 77470b552cafc2506f9f1be56a2cd7aa412a4b568120037bf730273b5cc7c4dbabebb0abb6b192e3aef69912c6b5721d9e80b0cae0059f4fe814a5c0a8f3dcfb + HEAD_REF main + PATCHES + disable_tests.patch +) + +vcpkg_configure_meson(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_install_meson() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() diff --git a/ports/libcred/vcpkg.json b/ports/libcred/vcpkg.json new file mode 100644 index 00000000000000..2865593a770200 --- /dev/null +++ b/ports/libcred/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libcred", + "version": "1.0.0", + "description": "a cross-platform credentials helper library", + "homepage": "https://github.com/mamba-org/libcred", + "license": "MIT", + "supports": "!osx & !uwp & !arm & !(windows & staticcrt) & !android", + "dependencies": [ + { + "name": "glib", + "platform": "linux" + }, + { + "name": "libsecret", + "platform": "linux" + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/ports/libdjinterop/portfile.cmake b/ports/libdjinterop/portfile.cmake index cf3bff1295db64..03694c239d4ec2 100644 --- a/ports/libdjinterop/portfile.cmake +++ b/ports/libdjinterop/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xsco/libdjinterop REF "${VERSION}" - SHA512 c2784ffc6b0ddc9ad92a227621bb00cd1c88aa8f8abe82401774102f9be16dfbe9f0745523d517594faecba60b650a53613c7867afe57e6bcd8a2cc6288dd9ff + SHA512 1c35d8609342f133cf002d1908d5746c411a9d5e74b42a7ec045545f07a3f4b8a89ce9a95d2fc17edd8970facafbee1b6d8a9283fcd8c74c9cb96ff61f15d47d HEAD_REF master ) diff --git a/ports/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json index c96f88d9a2028f..82b8f0de473eaf 100644 --- a/ports/libdjinterop/vcpkg.json +++ b/ports/libdjinterop/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdjinterop", - "version": "0.21.0", + "version": "0.22.1", "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases", "homepage": "https://github.com/xsco/libdjinterop", "license": "LGPL-3.0-or-later", diff --git a/ports/libunwind/portfile.cmake b/ports/libunwind/portfile.cmake index 3e8f4a0125f2a8..5e33035e8a3c22 100644 --- a/ports/libunwind/portfile.cmake +++ b/ports/libunwind/portfile.cmake @@ -1,9 +1,21 @@ +vcpkg_download_distfile(libunwind + URLS "https://github.com/dotnet/runtime/commit/d63c235756d4c46b061bd503a2c47207df6b3324.diff?full_index=1" + FILENAME "libunwind.diff" + SHA512 268af5d4aa3bec16e34c50024c0a3662e9a6fa7d273bb405c25f02066100e6bcbb9a68bd10556e3f420d983b586dac856fc45dbd182798889e5542217f953b27 +) + +file(READ "${libunwind}" contents) +string(REPLACE "/src/native/external/libunwind" "" contents "${contents}") +file(WRITE "${CURRENT_BUILDTREES_DIR}/src/libunwind.diff" "${contents}") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "libunwind/libunwind" REF "v${VERSION}" HEAD_REF master SHA512 dd8332b7a2cbabb4716c01feea422f83b4a7020c1bee20551de139c3285ea0e0ceadfa4171c6f5187448c8ddc53e0ec4728697d0a985ee0c3ff4835b94f6af6f + PATCHES + "${CURRENT_BUILDTREES_DIR}/src/libunwind.diff" ) vcpkg_configure_make( diff --git a/ports/libunwind/vcpkg.json b/ports/libunwind/vcpkg.json index fbdf2d8efebe14..e13af8bc35f887 100644 --- a/ports/libunwind/vcpkg.json +++ b/ports/libunwind/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libunwind", "version": "1.8.1", + "port-version": 1, "description": "Unix libray for portable stack unwinding", "homepage": "https://www.nongnu.org/libunwind", "license": "MIT", diff --git a/ports/libyuv/cmake.diff b/ports/libyuv/cmake.diff index 6da1b027a56b1c..843afb9aa575a2 100644 --- a/ports/libyuv/cmake.diff +++ b/ports/libyuv/cmake.diff @@ -41,9 +41,9 @@ index 9a20941d..d161326c 100644 # install the conversion tool, .so, .a, and all the header files --install ( PROGRAMS ${CMAKE_BINARY_DIR}/yuvconvert DESTINATION bin ) +-install ( TARGETS yuvconvert DESTINATION bin ) -install ( TARGETS ${ly_lib_static} DESTINATION lib ) --install ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin ) +-install ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib ) +if (BUILD_TOOLS) + install(TARGETS yuvconvert yuvconstants) +endif() diff --git a/ports/libyuv/portfile.cmake b/ports/libyuv/portfile.cmake index fa3f2dc4465930..80450bccefa3fe 100644 --- a/ports/libyuv/portfile.cmake +++ b/ports/libyuv/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://chromium.googlesource.com/libyuv/libyuv - REF c21dda06dd8d19b6e50168c28c324c1f32e94407 # 6 commits after switch to 1895, reason: CMake changes + REF a37e6bc81b52d39cdcfd0f1428f5d6c2b2bc9861 # 1896 Fixes build error on macOS Homebrew LLVM 19 # Check https://chromium.googlesource.com/libyuv/libyuv/+/refs/heads/main/include/libyuv/version.h for a version! PATCHES cmake.diff diff --git a/ports/libyuv/vcpkg.json b/ports/libyuv/vcpkg.json index 6408bcd7878aa5..4b8c9cef5ca6d8 100644 --- a/ports/libyuv/vcpkg.json +++ b/ports/libyuv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libyuv", - "version": "1895", + "version": "1896", "port-version": 1, "description": "libyuv is an open source project that includes YUV scaling and conversion functionality", "homepage": "https://chromium.googlesource.com/libyuv/libyuv", diff --git a/ports/ls-qpack/cmake-export.patch b/ports/ls-qpack/cmake-export.patch deleted file mode 100644 index 0e1a6a42978614..00000000000000 --- a/ports/ls-qpack/cmake-export.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 56c3e23..7a4a2d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,10 @@ option(LSQPACK_XXH "Include XXH" ON) - - # Use `cmake -DBUILD_SHARED_LIBS=OFF` to build a static library. - add_library(ls-qpack "") --target_include_directories(ls-qpack PUBLIC .) -+target_include_directories(ls-qpack PUBLIC -+ $ -+ $ -+) - target_sources(ls-qpack PRIVATE lsqpack.c) - - if(LSQPACK_XXH) -@@ -30,7 +33,10 @@ else() - endif() - - if(WIN32) -- target_include_directories(ls-qpack PUBLIC wincompat) -+ target_include_directories(ls-qpack PUBLIC -+ $ -+ $ -+ ) - endif() - - if(MSVC) -@@ -106,7 +112,16 @@ if(LSQPACK_BIN) - add_subdirectory(bin) - endif() - --install(TARGETS ls-qpack) -+install(TARGETS ls-qpack EXPORT unofficial-ls-qpack-config -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) -+install( -+ EXPORT unofficial-ls-qpack-config -+ NAMESPACE unofficial::ls-qpack:: -+ DESTINATION share/unofficial-ls-qpack -+) - install(FILES lsqpack.h lsxpack_header.h DESTINATION include) - if(WIN32) - install(DIRECTORY wincompat/sys DESTINATION include) diff --git a/ports/ls-qpack/portfile.cmake b/ports/ls-qpack/portfile.cmake index ecacfe037eeb1b..c97fda3b4b1e7a 100644 --- a/ports/ls-qpack/portfile.cmake +++ b/ports/ls-qpack/portfile.cmake @@ -6,11 +6,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO litespeedtech/ls-qpack REF "v${VERSION}" - SHA512 7677f673b4b23a68ad5e899706f17536777b30d7e91c63d3ea97504a6a2885cf7f431c191ac0581631723151050f914ec31bcb84e2b6e3fcdf4140cde0a18063 + SHA512 74d4b2ea96bf0de43009cc121c8e57caff83be53c613236b01dce4ac4c12505d0d9fec07d9152ca62166947a160de2ab3f7bf19fb203a60b44507516a927ecb8 HEAD_REF master - PATCHES - xxhash.patch - cmake-export.patch ) vcpkg_find_acquire_program(PKGCONFIG) @@ -27,15 +24,15 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-ls-qpack) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ls-qpack) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) -file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-ls-qpack/unofficial-ls-qpack-config.cmake" cmake_config) -file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-ls-qpack/unofficial-ls-qpack-config.cmake" +file(READ "${CURRENT_PACKAGES_DIR}/share/ls-qpack/ls-qpack-config.cmake" cmake_config) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/ls-qpack/ls-qpack-config.cmake" "include(CMakeFindDependencyMacro) find_dependency(PkgConfig) pkg_check_modules(XXH REQUIRED IMPORTED_TARGET libxxhash) diff --git a/ports/ls-qpack/vcpkg.json b/ports/ls-qpack/vcpkg.json index f38898d1984cf7..eac85cee64d50c 100644 --- a/ports/ls-qpack/vcpkg.json +++ b/ports/ls-qpack/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ls-qpack", - "version": "2.5.4", - "port-version": 3, + "version": "2.5.5", "description": "QPACK compression library for use with HTTP/3", "homepage": "https://github.com/litespeedtech/ls-qpack", "license": "MIT", diff --git a/ports/ls-qpack/xxhash.patch b/ports/ls-qpack/xxhash.patch deleted file mode 100644 index 500e45eb5ec92f..00000000000000 --- a/ports/ls-qpack/xxhash.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1a1f8e9..56c3e23 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,9 +20,13 @@ add_library(ls-qpack "") - target_include_directories(ls-qpack PUBLIC .) - target_sources(ls-qpack PRIVATE lsqpack.c) - --target_include_directories(ls-qpack PRIVATE deps/xxhash/) - if(LSQPACK_XXH) - target_sources(ls-qpack PRIVATE deps/xxhash/xxhash.c) -+else() -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(XXH REQUIRED IMPORTED_TARGET libxxhash) -+ target_link_libraries(ls-qpack PUBLIC PkgConfig::XXH) -+ set(LSQPACK_DEPENDS "libxxhash") - endif() - - if(WIN32) diff --git a/ports/msh3/dependencies_fix.patch b/ports/msh3/dependencies_fix.patch index 4ed623e688ea5e..db8eb244b8b051 100644 --- a/ports/msh3/dependencies_fix.patch +++ b/ports/msh3/dependencies_fix.patch @@ -7,7 +7,7 @@ index 4bd7155..b7adecc 100644 option(LSQPACK_TESTS "Build tests" OFF) option(LSQPACK_BIN "Build binaries" OFF) -add_subdirectory(ls-qpack) -+find_package(unofficial-ls-qpack CONFIG REQUIRED) ++find_package(ls-qpack CONFIG REQUIRED) # Configure and build msquic dependency. if (WIN32) @@ -35,7 +35,7 @@ index ab7fc24..c488486 100644 -if (NOT BUILD_SHARED_LIBS) - target_link_libraries(msh3 PRIVATE base_link) -endif() -+target_link_libraries(msh3 PRIVATE msquic unofficial::ls-qpack::ls-qpack msh3_headers) ++target_link_libraries(msh3 PRIVATE msquic ls-qpack::ls-qpack msh3_headers) if (MSH3_SERVER_SUPPORT) target_link_libraries(msh3 PRIVATE platform) # For selfsign APIs endif() diff --git a/ports/msh3/vcpkg.json b/ports/msh3/vcpkg.json index ff015d50ed2616..ee931458263acc 100644 --- a/ports/msh3/vcpkg.json +++ b/ports/msh3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "msh3", "version": "0.6.0", + "port-version": 1, "description": "Minimal HTTP/3 library", "homepage": "https://github.com/nibanks/msh3", "license": "MIT", diff --git a/ports/openvino/002-fix-onnx-codegen.patch b/ports/openvino/002-fix-onnx-codegen.patch deleted file mode 100644 index 361f7195d4028e..00000000000000 --- a/ports/openvino/002-fix-onnx-codegen.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/frontends/onnx/frontend/CMakeLists.txt b/src/frontends/onnx/frontend/CMakeLists.txt -index 0ceeec8f7606a3..80fd16e2ed6483 100644 ---- a/src/frontends/onnx/frontend/CMakeLists.txt -+++ b/src/frontends/onnx/frontend/CMakeLists.txt -@@ -4,7 +4,7 @@ - - if(NOT BUILD_SHARED_LIBS) - file(GLOB_RECURSE op_list "src/op/*.cpp") -- set(static_reg_file "src/static_reg.hpp") -+ set(static_reg_file ${CMAKE_CURRENT_BINARY_DIR}/static_reg.hpp) - file(WRITE ${static_reg_file} "// Copyright (C) 2018-2024 Intel Corporation\n// SPDX-License-Identifier: Apache-2.0\n// Auto generated file, DO NOT EDIT INLINE\n\n") - file(APPEND ${static_reg_file} "#include \"core/operator_set.hpp\"\n\n") - file(APPEND ${static_reg_file} "#define ONNX_DECL_OP(op) extern ov::OutputVector op(const Node&)\n\n") diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index f9fff1490826f9..db0d3a167c2e9e 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -2,13 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openvinotoolkit/openvino REF "${VERSION}" - SHA512 25ec2bb4c087f58033681920b027d43b1778b60042e3bee358b54c83b0296ac0b754880db6bd4fce94fefe8b53d129ff3ec51f17bcb42f4b7adcdc532701f801 + SHA512 2bf3f00589d825b7f4ca40d43129d81af4ba62382f98b283a3a206e7661a7a69f178c6afafdde646db8d68cb7fc54ec5280d2f4ff4fbbffe24082cf6649dda29 PATCHES # vcpkg specific patch, because OV creates a file in source tree, which is prohibited 001-disable-tools.patch - # https://github.com/openvinotoolkit/openvino/pull/25937 - # onnx codegen cmake script taints source directory - 002-fix-onnx-codegen.patch HEAD_REF master) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -34,20 +31,13 @@ if(ENABLE_INTEL_GPU) # remove 'rapidjson' directory and use vcpkg's one to comply with ODR file(REMOVE_RECURSE ${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/rapidjson) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND ENABLE_INTEL_CPU) - message(WARNING - "OneDNN for GPU is not available for static build, which is required for dGPU. " - "Please, consider using VCPKG_LIBRARY_LINKAGE=\"dynamic\" or disable CPU plugin, " - "which uses another flavor of oneDNN.") - else() - vcpkg_from_github( - OUT_SOURCE_PATH DEP_SOURCE_PATH - REPO oneapi-src/oneDNN - REF 7ab8ee9adda866d675edeee7a3a6a29b2d0a1572 - SHA512 03d0adab0cbb8b2841bd5de73a21911d63314f0a6299590e2396f42ca66673743c32ef1ec72e856cdac863802632b1e9a065bfffd75659e2007db581e1052e89 - ) - file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu") - endif() + vcpkg_from_github( + OUT_SOURCE_PATH DEP_SOURCE_PATH + REPO oneapi-src/oneDNN + REF 4ccd07e3a10e1c08075cf824ac14708245fbc334 + SHA512 c9a28f8427b5cd9c057a546b0b62303026f848045b26e0c9705e2f64d5bc84424ee15935d3bf5ee120d3c430a9dd41b7a6e26ef4fc0c53a2154ce83fcaee8b5a + ) + file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu") list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_OPENCL=ON" @@ -58,8 +48,8 @@ if(ENABLE_INTEL_CPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO openvinotoolkit/oneDNN - REF f0f8defe2dff5058391f2a66e775e20b5de33b08 - SHA512 d52d1ea504bc3ae7cdd01f7fce80f28231827b3778acda232201ec90c119cb845c4b406ac639d63a8f05ccc91063fbf5f405ba36332c5f539531c01ce9443b5f + REF c8ae8d96e963bd04214858319fa334968e5e73c9 + SHA512 6877ca37c3678e738fa94767b70432d3fff73305342164d0902875d9bcce3fe12abaf52bfc6ae0ef288532324e746b01e604ab7e47f198e7776352b8f5b6f009 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn") @@ -85,19 +75,20 @@ if(ENABLE_INTEL_CPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO ARM-software/ComputeLibrary - REF v24.06 - SHA512 d020e4bb710534bb5789355f7396729a9230ce3ce8e0194df7e66750efe0667e38334e1e3696fa07496cf34de38ffcecd1ff6de266fb0e8d85f4f1c60ed9f782 + REF v24.08 + SHA512 82debaf8d8345b79b112afdabf6019c7ad8a9b30161d3061320a3da3040b2ad49153cc508caafe9fb1182c2669c958785acf2c361382080af273465d1727a71c ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary") endif() endif() if(ENABLE_INTEL_NPU) + list(APPEND FEATURE_OPTIONS "-DENABLE_INTEL_NPU_INTERNAL=OFF") vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO oneapi-src/level-zero - REF 4ed13f327d3389285592edcf7598ec3cb2bc712e - SHA512 1159b2dc59ffe201821aa6c4c65c1803f8be26654a5f7e09d4e2cea70afdaf6a49508acbc74279d2d5c8fc7b632ad29b70ea506c442cd599d7db47323de9e62d + REF v1.17.6 + SHA512 bb412e875d97d1c80a0e67087e6dac1a6ffb91fa50e22deb7649ee3250c0937679d225419b52bfd7938f71a66ac15742a6a215cee7714c27e0f935e04df5b88e ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero") diff --git a/ports/openvino/usage b/ports/openvino/usage index ede01545d213d5..27e68898dc2706 100644 --- a/ports/openvino/usage +++ b/ports/openvino/usage @@ -2,9 +2,3 @@ The package OpenVINO can be used in cmake scripts as: find_package(OpenVINO REQUIRED) target_link_libraries(main PRIVATE openvino::runtime) - -Note: static build of Intel GPU plugin disables usage of oneDNN for GPU, which is important -for decent performance on discrete GPU devices. If you want to levarage performance of dGPU, -please, consider either option: -- Building with 'VCPKG_LIBRARY_LINKAGE=dynamic' -- Disable Intel CPU plugin, because it uses different oneDNN flavor diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json index 2bac2cacb58d85..d392279863bf67 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", - "version": "2024.3.0", + "version": "2024.4.0", "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ @@ -14,7 +14,7 @@ "homepage": "https://github.com/openvinotoolkit/openvino", "documentation": "https://docs.openvino.ai/latest/index.html", "license": "Apache-2.0", - "supports": "!uwp & !x86", + "supports": "!uwp & !x86 & !(android & arm32)", "dependencies": [ { "name": "pkgconf", diff --git a/ports/parson/portfile.cmake b/ports/parson/portfile.cmake index 54f5408ccdfebb..6a6f50c89a501e 100644 --- a/ports/parson/portfile.cmake +++ b/ports/parson/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kgabis/parson - REF 1314bf8ad6f22edd2feb9d8c867756f41db21f2a # accessed on 2022-11-13 - SHA512 5f6003caea40c093dedfbd85dfe6d33202708b37b59ad9eeb815a5d287dd7b37f3522d3bf35fb718eab13260bb0c129b691703f04b9f1c3dbe7bef4b494928be + REF ba29f4eda9ea7703a9f6a9cf2b0532a2605723c3 # accessed on 2023-10-31 + SHA512 fdb8c66e9b8966488a22db2e6437d0bfa521c73abc043c7bd18227247fd52de9dd1856dec0d5ebd88f1dacce2493b2c68707b5e16ca4e3032ff6342933f16030 HEAD_REF master PATCHES fix-cmake-files-path.patch @@ -19,8 +19,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_copy_pdbs() diff --git a/ports/parson/vcpkg.json b/ports/parson/vcpkg.json index 0c58d92fcff097..444d62bea390f1 100644 --- a/ports/parson/vcpkg.json +++ b/ports/parson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "parson", - "version-date": "2022-11-13", + "version-date": "2023-10-31", "description": "a lightweight json library written in C", "homepage": "https://github.com/kgabis/parson", "license": "MIT", diff --git a/ports/wavpack/CMakeLists-patch.diff b/ports/wavpack/CMakeLists-patch.diff new file mode 100644 index 00000000000000..1fe37634d0867b --- /dev/null +++ b/ports/wavpack/CMakeLists-patch.diff @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9f9e70..74b6ba2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -624,8 +624,19 @@ if(WAVPACK_INSTALL_CMAKE_MODULE) + write_basic_package_version_file(wavpack-config-version.cmake COMPATIBILITY SameMinorVersion) + endif() + ++ configure_package_config_file( ++ ${CMAKE_CURRENT_LIST_DIR}/wavpack-config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/wavpack-config.cmake" ++ INSTALL_DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} ++ ) ++ ++ install(FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/wavpack-config.cmake" ++ DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} ++ ) ++ + install(EXPORT wavpack-targets +- FILE wavpack-config.cmake ++ FILE wavpack-targets.cmake + NAMESPACE WavPack:: + DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} + ) diff --git a/ports/wavpack/config-patch.diff b/ports/wavpack/config-patch.diff new file mode 100644 index 00000000000000..3fd541238d3cde --- /dev/null +++ b/ports/wavpack/config-patch.diff @@ -0,0 +1,16 @@ +diff --git a/wavpack-config.cmake.in b/wavpack-config.cmake.in +new file mode 100644 +index 0000000..eb6afd8 +--- /dev/null ++++ b/wavpack-config.cmake.in +@@ -0,0 +1,9 @@ ++@PACKAGE_INIT@ ++ ++include(CMakeFindDependencyMacro) ++ ++if(NOT WIN32 AND "@WAVPACK_ENABLE_THREADS@") ++ find_dependency(Threads) ++endif() ++ ++include("${CMAKE_CURRENT_LIST_DIR}/wavpack-targets.cmake") +\ No newline at end of file diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index 8fbb8eb7f4a9c1..1c1495a230748a 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -1,8 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dbry/WavPack - REF 5.6.0 - SHA512 16e1b5a74261843dff148eee6a83a0c84717477c06907af3ee1bc799f9157ba8c0d3c71eee9d93d74a1081151198a8a23d84c14a60c4b35fc145d10ee901cca1 + REF ${VERSION} + SHA512 7a0b00ee19a784b5a2ae40c1d86ddf47d989b0302ee32e6b2f4db828d632b877566f9bb8c1998d129b022f988966f29db05b7a2b59cefdd5b603292ea20464ec + PATCHES + CMakeLists-patch.diff + config-patch.diff ) vcpkg_cmake_configure( diff --git a/ports/wavpack/vcpkg.json b/ports/wavpack/vcpkg.json index 79fd7041a123c0..de3638d9e7cafb 100644 --- a/ports/wavpack/vcpkg.json +++ b/ports/wavpack/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wavpack", - "version": "5.6.0", - "port-version": 2, + "version": "5.7.0", "description": "WavPack encode/decode library, command-line programs, and several plugins", "homepage": "https://github.com/dbry/WavPack", "license": "BSD-3-Clause", diff --git a/ports/wmipp/portfile.cmake b/ports/wmipp/portfile.cmake index 202e47bbfa92a6..60b82b06fb7247 100644 --- a/ports/wmipp/portfile.cmake +++ b/ports/wmipp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sonodima/wmipp REF "v${VERSION}" - SHA512 3cfa7bacc1e03077503fa04e636106ce5bfc66a3fce25e52033433c2328a62229fdf7baad4a0116459fb0c299839ea02507fe8da43c853b9dd8bcfcb3d2301d3 + SHA512 78635ec00928b5cb1fb5ab0001fa9a06f75a2a7e5f77dafb8bc77cf31f3ee2f642db08572d82ed39a09783a89d660bebc9b96f91d0926dbbb3109737d54f91e6 HEAD_REF main ) diff --git a/ports/wmipp/vcpkg.json b/ports/wmipp/vcpkg.json index 981421e15c4608..fd36e46e70fabb 100644 --- a/ports/wmipp/vcpkg.json +++ b/ports/wmipp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wmipp", - "version": "1.2.0", + "version": "1.3.0", "description": "Streamlined Windows Management Instrumentation (WMI) integration for seamless C++ development", "homepage": "https://github.com/sonodima/wmipp", "license": "MIT", diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index 7f30e0f3073b16..c66a98df9f9da1 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 REF z3-${VERSION} - SHA512 8503787fe0b18592b5a131bcec2cacfa5f5096d76386a1c4fda7a836e472924b154433306d27600ff0d0758ddb710c965901fbfc2e5605919b624b9d4d1bc4fd + SHA512 211a855ad2313aacbef67ccad9e02f4d8012ce015880383faefaae2e78785efbc167634f6c272d844dd04ba36c55a25192cae74bfd0c75a32588672ac8516e09 HEAD_REF master PATCHES fix-install-path.patch diff --git a/ports/z3/remove-flag-overrides.patch b/ports/z3/remove-flag-overrides.patch index 24dd075bc44a21..5b7e6471a11580 100644 --- a/ports/z3/remove-flag-overrides.patch +++ b/ports/z3/remove-flag-overrides.patch @@ -7,6 +7,6 @@ index 477410ba8..fcca03917 100644 cmake_minimum_required(VERSION 3.16) -set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") - project(Z3 VERSION 4.13.0.0 LANGUAGES CXX) + project(Z3 VERSION 4.13.2.0 LANGUAGES CXX) ################################################################################ diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index 7975521c8cff49..0e3fcba962bd60 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z3", - "version": "4.13.0", + "version": "4.13.2", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "license": "MIT", diff --git a/ports/zlmediakit/fix-android-build.patch b/ports/zlmediakit/fix-android-build.patch deleted file mode 100644 index 203f7608912209..00000000000000 --- a/ports/zlmediakit/fix-android-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 72a4544e..8f34f1c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -445,6 +445,8 @@ endif() - - if(WIN32) - update_cached_list(MK_LINK_LIBRARIES WS2_32 Iphlpapi shlwapi) -+elseif(ANDROID) -+ update_cached_list(MK_LINK_LIBRARIES log) - elseif(NOT ANDROID OR IOS) - update_cached_list(MK_LINK_LIBRARIES pthread) - endif() diff --git a/ports/zlmediakit/fix-android.patch b/ports/zlmediakit/fix-android.patch new file mode 100644 index 00000000000000..c2414bee9afe35 --- /dev/null +++ b/ports/zlmediakit/fix-android.patch @@ -0,0 +1,22 @@ +Index: src/Rtcp/RtcpFCI.h +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/Rtcp/RtcpFCI.h b/src/Rtcp/RtcpFCI.h +--- a/src/Rtcp/RtcpFCI.h (revision 6b2fcf79435656be7797d396203adcc6c11ecc52) ++++ b/src/Rtcp/RtcpFCI.h (date 1727606590493) +@@ -247,8 +247,13 @@ + // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + class FCI_NACK { + public: ++#if defined(ANDROID) ++ inline static constexpr size_t kSize = 4; ++ inline static constexpr size_t kBitSize = 16; ++#else + static constexpr size_t kSize = 4; + static constexpr size_t kBitSize = 16; ++#endif + + FCI_NACK(uint16_t pid_h, const std::vector &type); + diff --git a/ports/zlmediakit/fix-core.patch b/ports/zlmediakit/fix-core.patch deleted file mode 100644 index fc7d6ef5ea6d50..00000000000000 --- a/ports/zlmediakit/fix-core.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/server/WebApi.cpp b/server/WebApi.cpp -index 5fbe4e19..1ba30b58 100755 ---- a/server/WebApi.cpp -+++ b/server/WebApi.cpp -@@ -1872,6 +1872,7 @@ void installWebApi() { - }); - #endif - -+#if ENABLE_MP4 - api_regist("/index/api/loadMP4File", [](API_ARGS_MAP) { - CHECK_SECRET(); - CHECK_ARGS("vhost", "app", "stream", "file_path"); -@@ -1890,6 +1891,7 @@ void installWebApi() { - // sample_ms设置为0，从配置文件加载；file_repeat可以指定，如果配置文件也指定循环解复用，那么强制开启 - reader->startReadMP4(0, true, allArgs["file_repeat"]); - }); -+#endif - - GET_CONFIG_FUNC(std::set, download_roots, API::kDownloadRoot, [](const string &str) -> std::set { - std::set ret; diff --git a/ports/zlmediakit/portfile.cmake b/ports/zlmediakit/portfile.cmake index 9e45f4e3febdae..724e58e26f9fe5 100644 --- a/ports/zlmediakit/portfile.cmake +++ b/ports/zlmediakit/portfile.cmake @@ -1,20 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ZLMediaKit/ZLMediaKit - REF af3ef996b0ae265e000344e7faf753577f9abf4e - SHA512 e45572a579d4644b4e48e70c999796d032947d64f074d7f143bd760238523d46ae061f079d9fe539a21542032f3c94ff7465fe2ba6c9fb39dbeac245dffd188b + REF 6b2fcf79435656be7797d396203adcc6c11ecc52 + SHA512 a2efe81f7fe6267418cc1e98f74283a10481b995815131324b7587c82f451d4bd35aa0190ef59efe46a057369208d4bf0658eaba44ae1a8532c6162cfb6e34f5 HEAD_REF master PATCHES fix-dependency.patch - fix-android-build.patch - fix-core.patch + fix-android.patch ) vcpkg_from_github( OUT_SOURCE_PATH TOOL_KIT_SOURCE_PATH REPO ZLMediaKit/ZLToolKit - REF 04d1c47d2568f5ce1ff84260cefaf2754e514a5e - SHA512 f467168507cb99f70f1c8f3db4742ecee8cfb3d9ac982b8dfee59907a6fbaf5ca6db4e0c60d8c293843f802a0489270d7a35daf17338f30d78c6b0e854b6ac17 + REF 46231014e2a7ec1903d4a37e96222481ecc779d8 + SHA512 2a0b834f072fbc64edc84f408050e2c992f8d59f2480c67a372cace17d49f21eb2f40587288481acc42118e94a5b7863043982680c3f56bdde3863f97ca69356 HEAD_REF master ) @@ -25,8 +24,8 @@ if ("mp4" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH MEDIA_SRV_SOURCE_PATH REPO ireader/media-server - REF 527c0f5117b489fda78fcd123d446370ddd9ec9a - SHA512 d90788fea5bff79e951604a6b290042e36dae9295fe967c6bc72ec2b5db8159c4465dd3568fc116b6954f90185f845671a3b3e3c2d3ccca7aaf913391e69630c + REF 4e1a89c3247db72076893d3fc5ad80f4b3c04ec2 + SHA512 baa7c8b69f86117e0eb8e3bb3769f3aa7fac498a7a59a24382a703a16ec8c5997e858b01a4681795ad0f8eab0408bf69fe1907400fa941dff588b1c739ffa324 HEAD_REF master ) @@ -53,6 +52,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_POLICY_DEFAULT_CMP0057=NEW -DENABLE_API=ON -DENABLE_API_STATIC_LIB=${ZLMEDIAKIT_BUILD_STATIC} -DENABLE_MSVC_MT=${ZLMEDIAKIT_CRT_STATIC} diff --git a/ports/zlmediakit/vcpkg.json b/ports/zlmediakit/vcpkg.json index 588d4de964c282..cc6b35805a5f36 100644 --- a/ports/zlmediakit/vcpkg.json +++ b/ports/zlmediakit/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zlmediakit", - "version-date": "2024-03-30", - "port-version": 3, + "version-date": "2024-09-29", "description": "A high-performance carrier-grade streaming media service framework based on C++11.", "homepage": "https://github.com/ZLMediaKit/ZLMediaKit", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2fbcb5cbcb31fc..a5ff5808fc7a70 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -328,11 +328,9 @@ epsilon:x64-uwp=fail evpp:arm-neon-android=fail evpp:arm64-android=fail evpp:x64-android=fail -fastrtps:arm-neon-android=fail -fastrtps:arm64-android=fail -fastrtps:x64-android=fail -fastrtps:x64-windows-static-md=fail -fastrtps:x64-windows-static=fail +fastdds:arm-neon-android=fail +fastdds:arm64-android=fail +fastdds:x64-android=fail flashlight-cpu:x64-linux=fail flashlight-cuda:x64-linux=fail flint:arm-neon-android=fail diff --git a/versions/a-/ada-url.json b/versions/a-/ada-url.json index b1c74a20c6ab1d..3986e198f4bcaa 100644 --- a/versions/a-/ada-url.json +++ b/versions/a-/ada-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca729da9e664e3a59d88115c9e8a8d59b775801c", + "version": "2.9.2", + "port-version": 0 + }, { "git-tree": "2587b45a68dd1af9394ffb47b1e517ec04a619e7", "version": "2.9.1", diff --git a/versions/a-/anari.json b/versions/a-/anari.json index 7553b296da75fe..b4c87822244e2b 100644 --- a/versions/a-/anari.json +++ b/versions/a-/anari.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b547bbf12d56d4d9f189a14153d93e75c7aa3451", + "version": "0.10.0", + "port-version": 0 + }, { "git-tree": "bb2704cfb92a03677f5d7dfbf1d81f1d924accd3", "version": "0.7.0", diff --git a/versions/a-/arrayfire.json b/versions/a-/arrayfire.json index 5d0fa9fe409a4c..66152cdfd676ca 100644 --- a/versions/a-/arrayfire.json +++ b/versions/a-/arrayfire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "985696275cbb76cb02d89d11f8e2490921c09874", + "version-semver": "3.8.0", + "port-version": 7 + }, { "git-tree": "45bae5e28a1c092e6024e21dcc4bab12c4e03440", "version-semver": "3.8.0", diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json index da19c3257abd35..08b2fad6fa7bf6 100644 --- a/versions/b-/buck-yeh-bux.json +++ b/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6265f9da5bdfd27e3f493f533efe654c8218efb", + "version": "1.8.1", + "port-version": 0 + }, { "git-tree": "efa7245f66c619800613932d484de76669b5a43e", "version": "1.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index ddc6ec228a1b35..840ab7c8661d02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -37,7 +37,7 @@ "port-version": 16 }, "ada-url": { - "baseline": "2.9.1", + "baseline": "2.9.2", "port-version": 0 }, "ade": { @@ -121,8 +121,8 @@ "port-version": 0 }, "anari": { - "baseline": "0.7.0", - "port-version": 1 + "baseline": "0.10.0", + "port-version": 0 }, "anax": { "baseline": "2.1.0", @@ -242,7 +242,7 @@ }, "arrayfire": { "baseline": "3.8.0", - "port-version": 6 + "port-version": 7 }, "arrow": { "baseline": "17.0.0", @@ -1413,7 +1413,7 @@ "port-version": 0 }, "buck-yeh-bux": { - "baseline": "1.8.0", + "baseline": "1.8.1", "port-version": 0 }, "buck-yeh-bux-mariadb-client": { @@ -2273,7 +2273,7 @@ "port-version": 13 }, "dimcli": { - "baseline": "7.2.0", + "baseline": "7.3.0", "port-version": 0 }, "dingo": { @@ -2676,6 +2676,10 @@ "baseline": "2020-09-11", "port-version": 5 }, + "fastdds": { + "baseline": "3.0.1", + "port-version": 0 + }, "fastfeat": { "baseline": "391d5e9", "port-version": 4 @@ -2696,10 +2700,6 @@ "baseline": "2021-11-22", "port-version": 1 }, - "fastrtps": { - "baseline": "2.14.0", - "port-version": 0 - }, "faudio": { "baseline": "24.09", "port-version": 0 @@ -2846,7 +2846,7 @@ }, "folly": { "baseline": "2024.09.23.00", - "port-version": 0 + "port-version": 1 }, "font-chef": { "baseline": "1.1.0", @@ -2858,7 +2858,7 @@ }, "fontconfig": { "baseline": "2.15.0", - "port-version": 0 + "port-version": 1 }, "foonathan-lexy": { "baseline": "2022.12.1", @@ -3153,8 +3153,8 @@ "port-version": 0 }, "gloo": { - "baseline": "20201203", - "port-version": 3 + "baseline": "20240626", + "port-version": 0 }, "glpk": { "baseline": "5.0", @@ -3189,7 +3189,7 @@ "port-version": 8 }, "godot-cpp": { - "baseline": "4.2.1", + "baseline": "4.3", "port-version": 0 }, "google-cloud-cpp": { @@ -3413,7 +3413,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "9.0.0", + "baseline": "10.0.1", "port-version": 0 }, "hash-library": { @@ -4221,7 +4221,7 @@ "port-version": 0 }, "level-zero": { - "baseline": "1.17.28", + "baseline": "1.17.45", "port-version": 0 }, "leveldb": { @@ -4372,6 +4372,10 @@ "baseline": "1.0", "port-version": 2 }, + "libcred": { + "baseline": "1.0.0", + "port-version": 0 + }, "libcroco": { "baseline": "0.6.13", "port-version": 7 @@ -4417,7 +4421,7 @@ "port-version": 0 }, "libdjinterop": { - "baseline": "0.21.0", + "baseline": "0.22.1", "port-version": 0 }, "libdmx": { @@ -5226,7 +5230,7 @@ }, "libunwind": { "baseline": "1.8.1", - "port-version": 0 + "port-version": 1 }, "liburing": { "baseline": "2.7", @@ -5445,7 +5449,7 @@ "port-version": 5 }, "libyuv": { - "baseline": "1895", + "baseline": "1896", "port-version": 1 }, "libzen": { @@ -5561,8 +5565,8 @@ "port-version": 1 }, "ls-qpack": { - "baseline": "2.5.4", - "port-version": 3 + "baseline": "2.5.5", + "port-version": 0 }, "ltla-aarand": { "baseline": "2023-03-19", @@ -6090,7 +6094,7 @@ }, "msh3": { "baseline": "0.6.0", - "port-version": 0 + "port-version": 1 }, "msinttypes": { "baseline": "2018-02-25", @@ -6729,7 +6733,7 @@ "port-version": 0 }, "openvino": { - "baseline": "2024.3.0", + "baseline": "2024.4.0", "port-version": 0 }, "openvpn3": { @@ -6861,7 +6865,7 @@ "port-version": 0 }, "parson": { - "baseline": "2022-11-13", + "baseline": "2023-10-31", "port-version": 0 }, "pbc": { @@ -9517,8 +9521,8 @@ "port-version": 0 }, "wavpack": { - "baseline": "5.6.0", - "port-version": 2 + "baseline": "5.7.0", + "port-version": 0 }, "wayland": { "baseline": "1.21.0", @@ -9593,7 +9597,7 @@ "port-version": 0 }, "wmipp": { - "baseline": "1.2.0", + "baseline": "1.3.0", "port-version": 0 }, "woff2": { @@ -9849,7 +9853,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.13.0", + "baseline": "4.13.2", "port-version": 0 }, "z4kn4fein-semver": { @@ -9893,8 +9897,8 @@ "port-version": 1 }, "zlmediakit": { - "baseline": "2024-03-30", - "port-version": 3 + "baseline": "2024-09-29", + "port-version": 0 }, "zoe": { "baseline": "3.1", diff --git a/versions/d-/dimcli.json b/versions/d-/dimcli.json index 77d353b623c61c..7f5b71ad3d1a46 100644 --- a/versions/d-/dimcli.json +++ b/versions/d-/dimcli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2aab3a6a4cf3d4b6e2c8e898311990546a6b0607", + "version-semver": "7.3.0", + "port-version": 0 + }, { "git-tree": "665897c6cbc03ae66b434b6584ea61a3445271d2", "version-semver": "7.2.0", diff --git a/versions/f-/fastdds.json b/versions/f-/fastdds.json new file mode 100644 index 00000000000000..d209b8115be48a --- /dev/null +++ b/versions/f-/fastdds.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6ff9b97e272f2c114ff8da8e63e5a04426f49722", + "version": "3.0.1", + "port-version": 0 + } + ] +} diff --git a/versions/f-/folly.json b/versions/f-/folly.json index eceab41d346b6c..b0e7af705c464d 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cc08ef956914a8805f99a52372d3aef51a6f67b", + "version-string": "2024.09.23.00", + "port-version": 1 + }, { "git-tree": "c1d8414e47563364104aa5a263b3fe7bfa0db784", "version-string": "2024.09.23.00", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 22be7c20f851e6..4a082f468947b7 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "443f2cc8005cd715e8786521c1c2cd990a1320a8", + "version": "2.15.0", + "port-version": 1 + }, { "git-tree": "2a11e54fe49673d52f0c4d2df73870f36a228990", "version": "2.15.0", diff --git a/versions/g-/gloo.json b/versions/g-/gloo.json index ad9fc46be03130..adb756df6b356f 100644 --- a/versions/g-/gloo.json +++ b/versions/g-/gloo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae23d02fbd7438a580058574bcbda144323a203e", + "version": "20240626", + "port-version": 0 + }, { "git-tree": "cc506cd5c27f23c9b2f3fb1d3cfe5774c05e0364", "version": "20201203", diff --git a/versions/g-/godot-cpp.json b/versions/g-/godot-cpp.json index 37f58929351288..aab76c8abb0861 100644 --- a/versions/g-/godot-cpp.json +++ b/versions/g-/godot-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "561f56e438444e007a1b6abbcd77b33b6d64ff2c", + "version": "4.3", + "port-version": 0 + }, { "git-tree": "3125afbc0a8a200f3a3213b8a4be710ad3190890", "version": "4.2.1", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index d85acc2f70f126..f5d7274cca0683 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "816a8378a801aa2b0d2cdf2e601b9ee3cfe31dab", + "version": "10.0.1", + "port-version": 0 + }, { "git-tree": "c46893f9942b1516524920b9f82d8f7fcaa06cc9", "version": "9.0.0", diff --git a/versions/l-/level-zero.json b/versions/l-/level-zero.json index 18e6bfb16aeeb2..f1368e330f9791 100644 --- a/versions/l-/level-zero.json +++ b/versions/l-/level-zero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "363f712b8a62c1c35924352077138bf3469fa796", + "version": "1.17.45", + "port-version": 0 + }, { "git-tree": "ce4627310deb48fe8c5e30d69862c69039c31a98", "version": "1.17.28", diff --git a/versions/l-/libcred.json b/versions/l-/libcred.json new file mode 100644 index 00000000000000..7cf82bcf9b041f --- /dev/null +++ b/versions/l-/libcred.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fc969f90949113fa71a044b18b520590400ef352", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libdjinterop.json b/versions/l-/libdjinterop.json index 8d9fc7af549691..6069afdd218d0b 100644 --- a/versions/l-/libdjinterop.json +++ b/versions/l-/libdjinterop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fda458a81fa4a8520df2baf8dcf5211f60669707", + "version": "0.22.1", + "port-version": 0 + }, { "git-tree": "c643a7969afe7b095d0c6e779adbe14b09ad39d0", "version": "0.21.0", diff --git a/versions/l-/libunwind.json b/versions/l-/libunwind.json index 98a63bf81a6943..004952b342cb44 100644 --- a/versions/l-/libunwind.json +++ b/versions/l-/libunwind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e96e575a728361e6c29a57287a0050ad325e88fb", + "version": "1.8.1", + "port-version": 1 + }, { "git-tree": "5fa5d5fa4e60c42c059eb26e5b34650b8bdf6b0e", "version": "1.8.1", diff --git a/versions/l-/libyuv.json b/versions/l-/libyuv.json index a4fd841b0ed11a..5dd190655da1ad 100644 --- a/versions/l-/libyuv.json +++ b/versions/l-/libyuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb6412fd44057b52849ebf8807a0c339cb525104", + "version": "1896", + "port-version": 1 + }, { "git-tree": "9a0250bfbce25cfd98ed744db8528d4214fe3d56", "version": "1895", diff --git a/versions/l-/ls-qpack.json b/versions/l-/ls-qpack.json index a0ce8c32ae5456..2dbc37057696a3 100644 --- a/versions/l-/ls-qpack.json +++ b/versions/l-/ls-qpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73e7312699ae28db63ff0171b70283b694c46bd7", + "version": "2.5.5", + "port-version": 0 + }, { "git-tree": "c8b9ac167ce7e831b1434cff6f3da33cdcee974d", "version": "2.5.4", diff --git a/versions/m-/msh3.json b/versions/m-/msh3.json index dabc820a36e37f..0516d453196926 100644 --- a/versions/m-/msh3.json +++ b/versions/m-/msh3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c26630aa357e123fe98a2dd4359b52681333a81", + "version": "0.6.0", + "port-version": 1 + }, { "git-tree": "1621424c690e4de0daaac921e92fc0c06ace9677", "version": "0.6.0", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index 980a036bb460d5..cce2b4c1a73515 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e65d1d305cc744e9ff5d96358695cbfe22deb8c3", + "version": "2024.4.0", + "port-version": 0 + }, { "git-tree": "6cef527510309fcb267a5c81c12e106fa4ae5064", "version": "2024.3.0", diff --git a/versions/p-/parson.json b/versions/p-/parson.json index 9a4ce3e75cce0a..b6c1212e5de108 100644 --- a/versions/p-/parson.json +++ b/versions/p-/parson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdf972c3f23e82b339cf0f57ab65d2a8cd6306e8", + "version-date": "2023-10-31", + "port-version": 0 + }, { "git-tree": "a154132abe66de11955af5aaca44575373120acd", "version-date": "2022-11-13", diff --git a/versions/w-/wavpack.json b/versions/w-/wavpack.json index 766f6002355e8b..3d7946c749d7be 100644 --- a/versions/w-/wavpack.json +++ b/versions/w-/wavpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a761d9ea9e181d39ee982c68be01ad8fecce6f16", + "version": "5.7.0", + "port-version": 0 + }, { "git-tree": "7f568a69d6cfea01660bacc223ad2f5c61063a32", "version": "5.6.0", diff --git a/versions/w-/wmipp.json b/versions/w-/wmipp.json index 1afd5fe3f1c59d..ba924d697995fa 100644 --- a/versions/w-/wmipp.json +++ b/versions/w-/wmipp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d38c4e313e35c7c38cf884bd6de016de19e3918", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "62fe399df24f53348677d6ee7af427a6d0018aaf", "version": "1.2.0", diff --git a/versions/z-/z3.json b/versions/z-/z3.json index 65e87778e90653..a1b9ddfbe3941e 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5af85394b7d0da874517680ec668ca482f089d5", + "version": "4.13.2", + "port-version": 0 + }, { "git-tree": "6fa6c9e93ad1fe6f090260acfa7d42369d83ee0a", "version": "4.13.0", diff --git a/versions/z-/zlmediakit.json b/versions/z-/zlmediakit.json index 7e046a52fc5dd7..3cfb096680c7ae 100644 --- a/versions/z-/zlmediakit.json +++ b/versions/z-/zlmediakit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee4983a040a7165456de12910b16f1e24f078c32", + "version-date": "2024-09-29", + "port-version": 0 + }, { "git-tree": "e2e858d8f4618dbb8a41963656970b659ad02813", "version-date": "2024-03-30",