diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index e0174f57ecb49c..c2ca1b8760a80f 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 REF v${VERSION} - SHA512 e04c676e6bb3d7791f51a1caa770c4675d79b5396c9ba029c01ca0938e53bfa374dce117fccf753a89f3663192c91356acc9bc195e4866d215855df0667faff0 + SHA512 a8084d2fc7d792c87b13dc0db6b4bad5222efea79e7f60a6e093019de97619a4d6adc8eef73195cf74f1827c2ca0655d572471d4b7c90a757282f0e6742b6711 HEAD_REF devel PATCHES fix-install-path.patch diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index 1c34870dbc91b5..ddb9d9fe721e34 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "catch2", - "version-semver": "3.7.1", + "version-semver": "3.8.0", "description": "A modern, C++-native, test framework for unit-tests, TDD and BDD.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index e72f2af3a94de5..94261e25ad6827 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift REF "v${VERSION}" - SHA512 7b21682c020c4e281e54da40407d13e002e2a5342fcbef3e444be4026450867673d7a747dc18e37989210f770c8898db8b7e5cd94c57e21d849efb93592c0441 + SHA512 a288bd91f3f0b7adb0d5dcfc6e7fef2f60a18ea56545e63e67d449a72986e710c2f58c8782d0950ef48f7a6bf331af0bc2019240638ece4cdacebec4571c920e HEAD_REF main PATCHES fix-deps.patch diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 9e3d7ae4c04307..b84267a999ae25 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2024.12.30.00", + "version-string": "2025.01.06.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 8f4a314381a8a3..d6f1ffabb25b51 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz REF "v${VERSION}" - SHA512 5c20cfb7e12f850a2aa9c92457e497281cebb9e3b56532707f544e81e3f7d13a5ee543d37b13bf766ffde6e0c01a3a64c614c7e73c662f00c4ae2479bbdfdb26 + SHA512 5066a9f394a9cfce396a3bee06c1d3a1ad84ebc1ff5b7c860540149727b0278dc007073748af54f2d61a4c5ab246cdb825f22c7cb88d50f17f96a633adb08ea4 HEAD_REF main PATCHES fix-build.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 2a224e6d31a5ce..d6ff4bd6e7b283 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2024.12.30.00", + "version-string": "2025.01.06.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index baed9633e2ff36..ff39d89c008904 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly REF "v${VERSION}" - SHA512 2cf26cfcd11399b05d55472085343b2705d89a0aad9012582ad16c53dafdc132b99359d5d6b2e237ba6ff539ab3e18d4ac5e7424ad420353cf289aca9d4d7c4b + SHA512 df28a863e11aa7d6b58b2a1b6634c2697b427269c70d2b7eba2fa6fa70665eaa6fa3f50ffc21dc2ff2afb86cd56aa06fd2488449029b14f76c0f3f40ac8fc640 HEAD_REF main PATCHES fix-windows-minmax.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 8aab0bc62098c7..b3d68268ff4366 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2024.12.30.00", + "version-string": "2025.01.06.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/libjpeg-turbo/usage b/ports/libjpeg-turbo/usage index 6d70f46ff96850..fd8720a89740cc 100644 --- a/ports/libjpeg-turbo/usage +++ b/ports/libjpeg-turbo/usage @@ -1,7 +1,7 @@ libjpeg-turbo is compatible with built-in implementation-agnostic CMake targets: find_package(JPEG REQUIRED) - target_include_directories(main PRIVATE JPEG::JPEG) + target_link_libraries(main PRIVATE JPEG::JPEG) libjpeg-turbo provides CMake targets for the TurboJPEG C API: diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index c5555b50750d8a..adc1239b7a6644 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libjpeg-turbo", "version": "3.1.0", + "port-version": 1, "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/ports/libremidi/vcpkg.json b/ports/libremidi/vcpkg.json index 5075c4ebbb9230..f58172bedc46b4 100644 --- a/ports/libremidi/vcpkg.json +++ b/ports/libremidi/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libremidi", "version": "4.5.0", + "port-version": 1, "description": "A modern C++ MIDI real-time & file I/O library", "homepage": "https://github.com/jcelerier/libremidi", "license": "BSD-2-Clause", @@ -9,6 +10,10 @@ "name": "alsa", "platform": "linux" }, + { + "name": "readerwriterqueue", + "platform": "linux" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index fc39ac0723f759..a02d1adc98b10b 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/mvfst REF "v${VERSION}" - SHA512 ef46bcab8fc157f8ce524b97ac9ee01bde618eab3b14a550774a94bf1f3fad96f0817856d427975dee108f751a5727ea52b8c925300a8aa49666f909a58917e2 + SHA512 d0bf90eb2e07a951bcc3414455c5feb4ff7578f5d0c714c9fba2bcb9df2057cb352846a1b99bdde96b5b21095adb19bc1376372aea72e862141f942165d16796 HEAD_REF main ) diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index b35c08dc40de12..717a0ce5ce49da 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2024.12.30.00", + "version-string": "2025.01.06.00", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebook/mvfst", "license": "MIT", diff --git a/ports/opencl/001-remove-extra-install-rules.patch b/ports/opencl/001-remove-extra-install-rules.patch new file mode 100644 index 00000000000000..4b212f9735d10c --- /dev/null +++ b/ports/opencl/001-remove-extra-install-rules.patch @@ -0,0 +1,36 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index dfb336d..ef97f82 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -114,13 +114,6 @@ foreach(UTIL_LIB_NAME IN ITEMS Utils UtilsCpp) + DESTINATION ${config_package_location} + COMPONENT binary + ) +- +- # For packaging the utils libraries +- install( +- TARGETS ${UTIL_LIB_TARGET} +- DESTINATION ${CMAKE_INSTALL_LIBDIR} +- COMPONENT binary +- ) + endforeach() + + if(OPENCL_SDK_BUILD_SAMPLES) +diff --git a/lib/src/Extensions/CMakeLists.txt b/lib/src/Extensions/CMakeLists.txt +index e05d4e7..017f7ad 100644 +--- a/lib/src/Extensions/CMakeLists.txt ++++ b/lib/src/Extensions/CMakeLists.txt +@@ -151,13 +151,6 @@ if (OPENCL_EXTENSION_LOADER_INSTALL) + DESTINATION ${OPENCL_EXTENSION_LOADER_CONFIG_PATH} + COMPONENT binary + ) +- +- # For packaging the extensions library +- install( +- TARGETS OpenCLExt +- DESTINATION ${CMAKE_INSTALL_LIBDIR} +- COMPONENT binary +- ) + endif() + + if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING) diff --git a/ports/opencl/portfile.cmake b/ports/opencl/portfile.cmake index acfc16f45452dd..06a48876ae0cf8 100644 --- a/ports/opencl/portfile.cmake +++ b/ports/opencl/portfile.cmake @@ -1,16 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenCL-SDK - REF "${VERSION}" - SHA512 995ed5cff95fec7ffd8470f04eb4d00325f9acb20cc1f0d78442890d0636554c2526c015351f4b19bc673dcadd531bb62d9d3c8c526dd921f236cb5035e906e0 + REF "v${VERSION}" + SHA512 be396a7aad6251d9d1f1af265ecf20f3428d87610d680c14d92fb5b060a59ce8b8522135a0dd29eaf20e75683e45c1c8ea55035a7c3ec3eddc4bc7680d68b66e HEAD_REF main + PATCHES + # see https://github.com/KhronosGroup/OpenCL-SDK/pull/88/files#r1905072265 + 001-remove-extra-install-rules.patch ) vcpkg_from_github( OUT_SOURCE_PATH OPENCL_HEADERS REPO KhronosGroup/OpenCL-Headers - REF "${VERSION}" - SHA512 2f1a46d58a5a9329470bab4c3662f17e81aab9558bfd9e1aafa14d3e1ab129513ab9493eeeb3cc48f0f91f0bc6b61bd54e28d7083eed58af9f34cd973cc93de1 + REF "v${VERSION}" + SHA512 9d2ed2a8346bc3f967989091d8cc36148ffe5ff13fe30e12354cc8321c09328bbe23e74817526b99002729c884438a3b1834e175a271f6d36e8341fd86fc1ad5 HEAD_REF main ) if(NOT EXISTS "${SOURCE_PATH}/external/OpenCL-Headers/CMakeLists.txt") @@ -21,8 +24,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH OPENCL_CLHPP REPO KhronosGroup/OpenCL-CLHPP - REF "${VERSION}" - SHA512 6396cd67a2edef6a76695857e3e45f7eeb8cdaa8c729197357c6374ac58b41caa37bbe8c3b7a1724d43d3805f8cd5edd53a8ed833d6415bf072745800b744572 + REF "v${VERSION}" + SHA512 7cdadc8ef182d1556346bd34b5a9ffe6e239ab61ec527e5609d69e1bcaf81a88f3fc534f5bdeed037236e1b0e61f1544d2a95c06df55f9cd8e03e13baf4143ba HEAD_REF main ) if(NOT EXISTS "${SOURCE_PATH}/external/OpenCL-CLHPP/CMakeLists.txt") @@ -33,8 +36,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH OPENCL_ICD_LOADER REPO KhronosGroup/OpenCL-ICD-Loader - REF "${VERSION}" - SHA512 12d62183e49c5a1f813807291744d816008afca55b09f5acf2eef1bce50a453bf35a8dfbeb5f433022b0c5517f0a210d7123a3bac7a15ea63cc10f3bc71510f0 + REF "v${VERSION}" + SHA512 29043eff21076440046314edf62bb488b7e4e17d9fbdac4c3727d8e2523c0c8fbf89ee7fcf762528af761ddbcb4be24e5f062ffa82f778401d6365faa35344a8 HEAD_REF main ) if(NOT EXISTS "${SOURCE_PATH}/external/OpenCL-ICD-Loader/CMakeLists.txt") @@ -49,7 +52,6 @@ vcpkg_from_github( SHA512 d6fa8b6788cabdbb185a6ffba79c994762924a1c60595b769a7d3bb4a3ddf0f80cdeac7bd915cffa720f9123a720a1b7f0023fd7f2cf58906d15758529a99e2d HEAD_REF master ) -vcpkg_replace_string("${SOURCE_PATH}/cmake/Dependencies/whereami/whereami.cmake" [[${CMAKE_CURRENT_BINARY_DIR}/_deps/whereami-external-src]] [[${whereami-external_SOURCE_DIR}]]) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/opencl/vcpkg.json b/ports/opencl/vcpkg.json index 99b9f3cb9870dc..117f07c7fad7ab 100644 --- a/ports/opencl/vcpkg.json +++ b/ports/opencl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencl", - "version-string": "v2024.05.08", + "version": "2024.10.24", "description": "OpenCL SDK", "homepage": "https://github.com/KhronosGroup/OpenCL-SDK", "license": "Apache-2.0 AND (MIT OR WTFPL)", diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 8ac59576bbdfb1..ea5e57e173130b 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -1,5 +1,11 @@ set(USE_QT_VERSION "6") +vcpkg_download_distfile(PATCH_ADD_INCLUDE_CHRONO + URLS https://github.com/opencv/opencv/commit/96d6395a6dccb9554bc2f83105f87ebd071d37fa.patch?full_index=1 + SHA512 d385b5386a19e4a0b3e78d5423baac4d132d25581d9336f084db819b9f68a6bc1ac23968a901891ac5023ab2fe4fa4513d7c70e5170e72cb57710d51b50e67a1 + FILENAME opencv4-4.11.0-include-chrono.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv @@ -23,6 +29,7 @@ vcpkg_from_github( 0017-fix-flatbuffers.patch 0019-opencl-kernel.patch 0020-miss-openexr.patch + "${PATCH_ADD_INCLUDE_CHRONO}" ) # Disallow accidental build of vendored copies file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 56c8d886856d76..9ab146681383a4 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.10.0", - "port-version": 2, + "port-version": 3, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/openssl/mkbuildinf.diff b/ports/openssl/mkbuildinf.diff new file mode 100644 index 00000000000000..e756c8c6a8b7ac --- /dev/null +++ b/ports/openssl/mkbuildinf.diff @@ -0,0 +1,15 @@ +diff --git a/util/mkbuildinf.pl b/util/mkbuildinf.pl +index a57c80a..5cecf83 100755 +--- a/util/mkbuildinf.pl ++++ b/util/mkbuildinf.pl +@@ -9,7 +9,9 @@ + use strict; + use warnings; + +-my ($cflags, $platform) = @ARGV; ++my $platform = pop @ARGV; ++my $cflags = join(' ', @ARGV); ++$cflags =~ s(\\)(\\\\)g; + $cflags = "compiler: $cflags"; + + # Use the value of the envvar SOURCE_DATE_EPOCH, even if it's diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 732da8dbe50190..c4b011394858bf 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( PATCHES cmake-config.patch command-line-length.patch + mkbuildinf.diff script-prefix.patch asm-armcap.patch windows/install-layout.patch diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index d9350a1f3f3f1e..ef168c96da49a8 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version": "3.4.0", + "port-version": 1, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/ports/openvino/004-opencl-v2024.10.24.patch b/ports/openvino/004-opencl-v2024.10.24.patch new file mode 100644 index 00000000000000..332c23862420f7 --- /dev/null +++ b/ports/openvino/004-opencl-v2024.10.24.patch @@ -0,0 +1,64 @@ +commit 255202328d39490f2cdca0d646b2e12b17ac9b69 +Author: Ilya Lavrenov +Date: Mon Jan 6 09:56:08 2025 +0100 + + Migrate to OpenCL v2024.10.24 + +diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp +index 759d796a5e..7246a6f6df 100644 +--- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp ++++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp +@@ -16,6 +16,10 @@ + #include + #endif + ++#ifndef CL_HPP_PARAM_NAME_CL_INTEL_UNIFIED_SHARED_MEMORY_ ++#define OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 ++#endif ++ + #include + + #ifdef _WIN32 +@@ -45,12 +49,16 @@ typedef cl_va_api_device_set_intel cl_device_set_intel; + + #endif // cl_intel_required_subgroup_size + ++#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 ++ + namespace cl { + namespace detail { +-CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, vector) ++CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, cl::vector) + } // namespace detail + } // namespace cl + ++#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 ++ + /*************************************************************** + * cl_intel_command_queue_families + ***************************************************************/ +@@ -260,11 +268,15 @@ typedef cl_bitfield cl_device_feature_capabilities_intel; + + #endif // cl_intel_device_attribute_query + ++#ifndef CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ + #define CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(F) \ + F(cl_device_info, CL_DEVICE_QUEUE_FAMILY_PROPERTIES_INTEL, cl::vector) \ + \ + F(cl_command_queue_info, CL_QUEUE_FAMILY_INTEL, cl_uint) \ + F(cl_command_queue_info, CL_QUEUE_INDEX_INTEL, cl_uint) ++#endif // CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ ++ ++#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 + + namespace cl { + namespace detail { +@@ -279,6 +291,8 @@ CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(CL_HPP_DECLARE_PARAM_TRAITS_) + } // namespace detail + } // namespace cl + ++#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 ++ + #include + + namespace { diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index 2f9d502f44b773..2eddc5a5b344f6 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( 002-fix-onnx.patch 003-protobuf.patch add-include-chrono.patch #https://github.com/openvinotoolkit/openvino/pull/27782 + 004-opencl-v2024.10.24.patch # https://github.com/openvinotoolkit/openvino/pull/28275 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json index d7341debe38b54..6ae6e73a9340c2 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", "version": "2024.4.0", - "port-version": 5, + "port-version": 6, "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 58337b0f3b7f28..a0170be0d2dc06 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen REF "v${VERSION}" - SHA512 c8bc346dac463e49bb78db8274aa95a8d991670b95e6aa418498247f7b47b1ea580f4a11914a3bae83f62b45c7b0c241f0ba6ee198d03be2f5de28772e138236 + SHA512 bb744110ec328b560483ce7f04916235e73ed69240415a69a68126bc7464dc3d946fc4ce1a396354742c752a3fd4d02cbb7b647fcfecd4b1c2c3d619a8097fae HEAD_REF main PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index a178447c3476a7..183b76f48da9f2 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2024.12.30.00", + "version-string": "2025.01.06.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "license": "BSD-3-Clause", diff --git a/ports/rtlsdr/Compile-with-msvc.patch b/ports/rtlsdr/Compile-with-msvc.patch deleted file mode 100644 index 5374ed41260080..00000000000000 --- a/ports/rtlsdr/Compile-with-msvc.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2def354..674ff2d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,6 +66,12 @@ endif() - ######################################################################## - # Find build dependencies - ######################################################################## -+if(MSVC) -+find_package(pthreads) -+find_package(libusb) -+include_directories(${PThreads4W_INCLUDE_DIR}) -+include_directories(${LIBUSB_INCLUDE_DIRS}) -+else() - if(WIN32 AND NOT MINGW) - set(THREADS_USE_PTHREADS_WIN32 true) - endif() -@@ -79,6 +85,7 @@ endif() - if(NOT THREADS_FOUND) - message(FATAL_ERROR "pthreads(-win32) required to compile rtl-sdr") - endif() -+endif() - - ######################################################################## - # Create uninstall target -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 33faee7..fda4612 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -20,7 +20,11 @@ - ######################################################################## - add_library(rtlsdr SHARED librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) -+if(MSVC) -+target_link_libraries(rtlsdr ${LIBUSB_LIBRARIES}) -+else() - target_link_libraries(rtlsdr PkgConfig::LIBUSB) -+endif() - target_include_directories(rtlsdr PUBLIC - $ - $ # /include -@@ -36,7 +40,11 @@ generate_export_header(rtlsdr) - ######################################################################## - add_library(rtlsdr_static STATIC librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) -+if(MSVC) -+target_link_libraries(rtlsdr_static ${LIBUSB_LIBRARIES}) -+else() - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) -+endif() - target_include_directories(rtlsdr_static PUBLIC - $ - $ # /include -@@ -58,8 +66,8 @@ IF(MSVC) - ${CMAKE_CURRENT_SOURCE_DIR}/rtlsdr.rc.in - ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc - @ONLY) -- target_sources(rtlsdr ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) -- target_sources(rtlsdr_static ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) -+ target_sources(rtlsdr PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) -+ target_sources(rtlsdr_static PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) - ENDIF(MSVC) - - ######################################################################## -@@ -77,6 +85,11 @@ add_library(libgetopt_static STATIC - target_link_libraries(convenience_static - rtlsdr - ) -+if(MSVC) -+target_link_libraries(convenience_static -+ ${PThreads4W_LIBRARY} -+) -+endif() - endif() - - ######################################################################## -diff --git a/src/rtl_tcp.c b/src/rtl_tcp.c -index 562198f..b4bfa51 100644 ---- a/src/rtl_tcp.c -+++ b/src/rtl_tcp.c -@@ -35,6 +35,7 @@ - #include - #else - #include -+#include - #include "getopt/getopt.h" - #endif - diff --git a/ports/rtlsdr/Findlibusb.cmake b/ports/rtlsdr/Findlibusb.cmake deleted file mode 100644 index 052ae21dfc2eb1..00000000000000 --- a/ports/rtlsdr/Findlibusb.cmake +++ /dev/null @@ -1,17 +0,0 @@ -find_path( - LIBUSB_INCLUDE_DIRS - NAMES libusb.h - PATH_SUFFIXES libusb-1.0 -) - -find_library( - LIBUSB_LIBRARIES - NAMES libusb-1.0 -) - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args( - LIBUSB - REQUIRED_VARS LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIRS -) diff --git a/ports/rtlsdr/dependencies.diff b/ports/rtlsdr/dependencies.diff new file mode 100644 index 00000000000000..5680930d73d140 --- /dev/null +++ b/ports/rtlsdr/dependencies.diff @@ -0,0 +1,60 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1ff6c9a..95c335c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,6 +73,7 @@ if(PKG_CONFIG_FOUND) + pkg_check_modules(LIBUSB libusb-1.0 IMPORTED_TARGET) + if(LIBUSB_LINK_LIBRARIES) + set(LIBUSB_LIBRARIES "${LIBUSB_LINK_LIBRARIES}") ++ set(LIBUSB_LIBRARY_DIRS "") + endif() + else() + set(LIBUSB_LIBRARIES "" CACHE STRING "manual libusb path") +@@ -80,7 +81,8 @@ else() + endif() + + if(MSVC) +- set(THREADS_PTHREADS_LIBRARY "" CACHE STRING "manual pthread-win32 path") ++ find_package(PThreads4W REQUIRED) ++ set(THREADS_PTHREADS_LIBRARY "PThreads4W::PThreads4W" CACHE INTERNAL "") + set(THREADS_PTHREADS_INCLUDE_DIR "" CACHE STRING "manual pthread-win32 includepath") + else() + set(THREADS_PTHREADS_LIBRARY "" CACHE INTERNAL "manual pthread-win32 path") +diff --git a/cmake/rtlsdrConfig.cmake b/cmake/rtlsdrConfig.cmake +index eeff2f3..23702ca 100644 +--- a/cmake/rtlsdrConfig.cmake ++++ b/cmake/rtlsdrConfig.cmake +@@ -1,5 +1,7 @@ +-include(FindPkgConfig) +-pkg_check_modules(LIBUSB libusb-1.0 IMPORTED_TARGET) ++if(MSVC) ++ include(CMakeFindDependencyMacro) ++ find_dependency(PThreads4W) ++endif() + + get_filename_component(RTLSDR_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + +diff --git a/librtlsdr.pc.in b/librtlsdr.pc.in +index e46519a..92bbddf 100644 +--- a/librtlsdr.pc.in ++++ b/librtlsdr.pc.in +@@ -8,4 +8,5 @@ Description: C Utility Library + Version: @VERSION@ + Cflags: -I${includedir}/ + Libs: -L${libdir} -lrtlsdr +-Libs.private: -lusb-1.0 @RTLSDR_PC_LIBS@ ++Libs.private: @RTLSDR_PC_LIBS@ ++Requires.private: libusb-1.0 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a2bcb3d..ecc3c90 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -38,7 +38,7 @@ generate_export_header(rtlsdr) + ######################################################################## + add_library(rtlsdr_static STATIC librtlsdr.c + tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) +-target_link_libraries(rtlsdr ${LIBUSB_LIBRARIES} ${THREADS_PTHREADS_LIBRARY}) ++target_link_libraries(rtlsdr_static ${LIBUSB_LIBRARIES} ${THREADS_PTHREADS_LIBRARY}) + target_include_directories(rtlsdr_static PUBLIC + $ + $ # /include diff --git a/ports/rtlsdr/fix-version.patch b/ports/rtlsdr/fix-version.patch deleted file mode 100644 index 854a054abafcca..00000000000000 --- a/ports/rtlsdr/fix-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/modules/Version.cmake b/cmake/modules/Version.cmake -index 2d4e76d..6acffe2 100644 ---- a/cmake/modules/Version.cmake -+++ b/cmake/modules/Version.cmake -@@ -39,7 +39,9 @@ if(GIT_FOUND) - OUTPUT_VARIABLE GIT_DESCRIBE OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) --else() -+endif() -+ -+if ("${GIT_DESCRIBE}" STREQUAL "") - set(GIT_DESCRIBE "v${MAJOR_VERSION}.${MINOR_VERSION}.x-xxx-xunknown") - endif() - diff --git a/ports/rtlsdr/library-linkage.diff b/ports/rtlsdr/library-linkage.diff new file mode 100644 index 00000000000000..79fd14d4568ca0 --- /dev/null +++ b/ports/rtlsdr/library-linkage.diff @@ -0,0 +1,100 @@ +diff --git a/librtlsdr.pc.in b/librtlsdr.pc.in +index 92bbddf..20a2735 100644 +--- a/librtlsdr.pc.in ++++ b/librtlsdr.pc.in +@@ -7,6 +7,7 @@ Name: RTL-SDR Library + Description: C Utility Library + Version: @VERSION@ + Cflags: -I${includedir}/ ++Cflags.private: -Drtlsdr_STATIC + Libs: -L${libdir} -lrtlsdr + Libs.private: @RTLSDR_PC_LIBS@ + Requires.private: libusb-1.0 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3c02e6c..e6585ee 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -45,12 +45,11 @@ target_include_directories(rtlsdr_static PUBLIC + ${LIBUSB_INCLUDE_DIRS} + ${THREADS_PTHREADS_INCLUDE_DIR} + ) +-set_property(TARGET rtlsdr_static APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) ++target_compile_definitions(rtlsdr_static PUBLIC "rtlsdr_STATIC") + if(NOT WIN32) + # Force same library filename for static and shared variants of the library + set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) + endif() +-generate_export_header(rtlsdr_static) + + ######################################################################## + # Set up Windows DLL resource files +@@ -66,6 +65,14 @@ IF(MSVC) + target_sources(rtlsdr_static PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) + ENDIF(MSVC) + ++if(BUILD_SHARED_LIBS) ++ set(rtlsdr_target rtlsdr) ++ set_target_properties(rtlsdr_static PROPERTIES EXCLUDE_FROM_ALL 1) ++else() ++ set(rtlsdr_target rtlsdr_static) ++ set_target_properties(rtlsdr PROPERTIES EXCLUDE_FROM_ALL 1) ++endif() ++ + ######################################################################## + # Setup libraries used in executables + ######################################################################## +@@ -79,7 +86,7 @@ add_library(libgetopt_static STATIC + getopt/getopt.c + ) + target_link_libraries(convenience_static +- rtlsdr ++ ${rtlsdr_target} + ) + endif() + +@@ -96,6 +103,10 @@ add_executable(rtl_power rtl_power.c) + add_executable(rtl_biast rtl_biast.c) + set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) + ++foreach(executable IN ITEMS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) ++ target_link_libraries(${executable} convenience_static ${rtlsdr_target} ${THREADS_PTHREADS_LIBRARY}) ++endforeach() ++if(0) + target_link_libraries(rtl_sdr rtlsdr convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} +@@ -128,6 +139,7 @@ target_link_libraries(rtl_biast rtlsdr convenience_static + ${LIBUSB_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ) ++endif(0) + if(UNIX) + target_link_libraries(rtl_fm m) + target_link_libraries(rtl_adsb m) +@@ -148,6 +160,7 @@ target_link_libraries(rtl_eeprom libgetopt_static) + target_link_libraries(rtl_adsb libgetopt_static) + target_link_libraries(rtl_power libgetopt_static) + target_link_libraries(rtl_biast libgetopt_static) ++if(0) + set_property(TARGET rtl_sdr APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) + set_property(TARGET rtl_tcp APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) + set_property(TARGET rtl_test APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) +@@ -156,16 +169,12 @@ set_property(TARGET rtl_eeprom APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATI + set_property(TARGET rtl_adsb APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) + set_property(TARGET rtl_power APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) + set_property(TARGET rtl_biast APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) ++endif(0) + endif() + ######################################################################## + # Install built library files & utilities + ######################################################################## +-install(TARGETS rtlsdr EXPORT RTLSDR-export +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file +- ) +-install(TARGETS rtlsdr_static EXPORT RTLSDR-export +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file +- ) ++install(TARGETS ${rtlsdr_target} EXPORT RTLSDR-export) + install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast + DESTINATION ${CMAKE_INSTALL_BINDIR} + ) diff --git a/ports/rtlsdr/portfile.cmake b/ports/rtlsdr/portfile.cmake index e3a397af384dae..7113c4656dc842 100644 --- a/ports/rtlsdr/portfile.cmake +++ b/ports/rtlsdr/portfile.cmake @@ -1,44 +1,50 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmocom/rtl-sdr - REF d794155ba65796a76cd0a436f9709f4601509320 - SHA512 21fe10f1dbecca651650f03d1008560930fac439d220c33b4a23acce98d78d8476ff200765eed8cfa6cddde761d45f7ba36c8b5bc3662aa85819172830ea4938 + REF v${VERSION} + SHA512 20a1630df7d4da5d263c5ffd4d83a7c2a6fc674e3838bf02b2b59c1da8d946dafc48790d410ab2fcbc0362c2ac70e5cdcae9391c5f04803bf2cdddafd6f58483 HEAD_REF master PATCHES - Compile-with-msvc.patch - fix-version.patch + dependencies.diff + library-linkage.diff + tools.diff ) -file( - COPY "${CMAKE_CURRENT_LIST_DIR}/Findlibusb.cmake" - DESTINATION "${SOURCE_PATH}/cmake/Modules" +vcpkg_check_features(OUT_FEATURE_OPTIONS options + FEATURES + tools BUILD_TOOLS ) +vcpkg_find_acquire_program(PKGCONFIG) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${options} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + "-DCMAKE_REQUIRE_FIND_PACKAGE_PkgConfig=1" + "-DCMAKE_DISABLE_FIND_PACKAGE_Git=1" + OPTIONS_DEBUG + -DBUILD_TOOLS=OFF ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/rtlsdr) vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -file( - INSTALL "${SOURCE_PATH}/COPYING" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/rtlsdr" - RENAME copyright -) +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/librtlsdr.pc" " -lrtlsdr" " -lrtlsdr_static") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/librtlsdr.pc" " -lrtlsdr" " -lrtlsdr_static") + endif() +endif() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES rtl_adsb rtl_biast rtl_eeprom rtl_fm rtl_power rtl_sdr rtl_tcp rtl_test AUTO_CLEAN) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -else() - file(GLOB DEBUG_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") - file(GLOB RELEASE_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*.exe") - file( - INSTALL ${RELEASE_TOOLS} - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" - ) - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") - file(REMOVE ${DEBUG_TOOLS} ${RELEASE_TOOLS}) -endif() +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/rtlsdr/tools.diff b/ports/rtlsdr/tools.diff new file mode 100644 index 00000000000000..e433a36aa53da2 --- /dev/null +++ b/ports/rtlsdr/tools.diff @@ -0,0 +1,26 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 18c3821..52f4991 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -103,8 +103,12 @@ add_executable(rtl_power rtl_power.c) + add_executable(rtl_biast rtl_biast.c) + set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) + ++option(BUILD_TOOLS "Build tools" ON) + foreach(executable IN ITEMS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) + target_link_libraries(${executable} convenience_static ${rtlsdr_target} ${THREADS_PTHREADS_LIBRARY}) ++ if(NOT BUILD_TOOLS) ++ set_target_properties(${executable} PROPERTIES EXCLUDE_FROM_ALL 1) ++ endif() + endforeach() + if(0) + target_link_libraries(rtl_sdr rtlsdr convenience_static +@@ -175,6 +179,8 @@ endif() + # Install built library files & utilities + ######################################################################## + install(TARGETS ${rtlsdr_target} EXPORT RTLSDR-export) ++if(BUILD_TOOLS) + install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast + DESTINATION ${CMAKE_INSTALL_BINDIR} + ) ++endif() diff --git a/ports/rtlsdr/usage b/ports/rtlsdr/usage new file mode 100644 index 00000000000000..a86088511f3556 --- /dev/null +++ b/ports/rtlsdr/usage @@ -0,0 +1,9 @@ +rtlsdr provides CMake targets: + + find_package(rtlsdr CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,rtlsdr::rtlsdr,rtlsdr::rtlsdr_static>) + +rtlsdr provides pkg-config modules: + + # C Utility Library + librtlsdr diff --git a/ports/rtlsdr/vcpkg.json b/ports/rtlsdr/vcpkg.json index b033ba6bdea8e8..f217c158153014 100644 --- a/ports/rtlsdr/vcpkg.json +++ b/ports/rtlsdr/vcpkg.json @@ -1,15 +1,16 @@ { + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "rtlsdr", - "version-date": "2020-04-16", - "port-version": 4, + "version": "2.0.2", "description": "rtl-sdr is a library that turns your Realtek RTL2832 based DVB dongle into a SDR receiver", "homepage": "https://osmocom.org/projects/rtl-sdr", - "supports": "windows & (x86 | x64)", + "license": "GPL-2.0-or-later", + "supports": "!uwp", "dependencies": [ "libusb", { "name": "pthreads", - "platform": "windows" + "platform": "windows & !mingw" }, { "name": "vcpkg-cmake", @@ -19,5 +20,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tools": { + "description": "Build tools", + "supports": "!android" + } + } } diff --git a/ports/vsgxchange/portfile.cmake b/ports/vsgxchange/portfile.cmake index 274be55c3c3521..d925057e5924f3 100644 --- a/ports/vsgxchange/portfile.cmake +++ b/ports/vsgxchange/portfile.cmake @@ -4,34 +4,38 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 a4c79092162c64f745556fa64b10fd06906526f5f7b7e22e61fc34f42d50116fe1816ff5cb0ca862f7da6a4a221818e99867e8520da4ffc2b9867ef15a01cd13 HEAD_REF master - PATCHES require-features.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - assimp VSGXCHANGE_WITH_ASSIMP - curl VSGXCHANGE_WITH_CURL - freetype VSGXCHANGE_WITH_FREETYPE - gdal VSGXCHANGE_WITH_GDAL - openexr VSGXCHANGE_WITH_OPENEXR + assimp vsgXchange_assimp + assimp CMAKE_REQUIRE_FIND_PACKAGE_assimp + curl vsgXchange_curl + curl CMAKE_REQUIRE_FIND_PACKAGE_CURL + freetype vsgXchange_freetype + freetype CMAKE_REQUIRE_FIND_PACKAGE_Freetype + gdal vsgXchange_GDAL + gdal CMAKE_REQUIRE_FIND_PACKAGE_GDAL + openexr vsgXchange_openexr + openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1 + -DCMAKE_DISABLE_FIND_PACKAGE_osg2vsg=1 ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "vsgXchange" CONFIG_PATH "lib/cmake/vsgXchange") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/vsgXchange") vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES vsgconv AUTO_CLEAN) -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/vsgconvd${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() +vcpkg_clean_executables_in_bin(FILE_NAMES vsgconvd) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/vsgxchange/require-features.patch b/ports/vsgxchange/require-features.patch deleted file mode 100644 index 8357414699d873..00000000000000 --- a/ports/vsgxchange/require-features.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/src/assimp/build_vars.cmake b/src/assimp/build_vars.cmake -index 821de33..b2283fb 100644 ---- a/src/assimp/build_vars.cmake -+++ b/src/assimp/build_vars.cmake -@@ -1,5 +1,7 @@ - # add assimp if available --find_package(assimp 5.1 QUIET) -+if (VSGXCHANGE_WITH_ASSIMP) -+ find_package(assimp CONFIG REQUIRED) -+endif() - - if(assimp_FOUND) - OPTION(vsgXchange_assimp "Optional Assimp support provided" ON) -diff --git a/src/curl/build_vars.cmake b/src/curl/build_vars.cmake -index 3f8206d..bdf1cd7 100644 ---- a/src/curl/build_vars.cmake -+++ b/src/curl/build_vars.cmake -@@ -1,5 +1,7 @@ - # add CURL if available --find_package(CURL) -+if(VSGXCHANGE_WITH_CURL) -+ find_package(CURL REQUIRED) -+endif() - - if(CURL_FOUND) - OPTION(vsgXchange_curl "Optional CURL support provided" ON) -diff --git a/src/freetype/build_vars.cmake b/src/freetype/build_vars.cmake -index cb63a8b..2b2343f 100644 ---- a/src/freetype/build_vars.cmake -+++ b/src/freetype/build_vars.cmake -@@ -1,5 +1,7 @@ - # add freetype if available --find_package(Freetype) -+if(VSGXCHANGE_WITH_FREETYPE) -+ find_package(Freetype REQUIRED) -+endif() - - if(FREETYPE_FOUND) - OPTION(vsgXchange_freetype "Freetype support provided" ON) -diff --git a/src/gdal/build_vars.cmake b/src/gdal/build_vars.cmake -index dd240b0..cdcbdb4 100644 ---- a/src/gdal/build_vars.cmake -+++ b/src/gdal/build_vars.cmake -@@ -1,5 +1,7 @@ - # add GDAL if available --find_package(GDAL QUIET) -+if(VSGXCHANGE_WITH_GDAL) -+ find_package(GDAL CONFIG REQUIRED) -+endif() - - if(GDAL_FOUND) - OPTION(vsgXchange_GDAL "GDAL support provided" ON) -diff --git a/src/openexr/build_vars.cmake b/src/openexr/build_vars.cmake -index c4c880a..6595c41 100644 ---- a/src/openexr/build_vars.cmake -+++ b/src/openexr/build_vars.cmake -@@ -1,5 +1,7 @@ - # add openexr if available --find_package(OpenEXR QUIET) -+if(VSGXCHANGE_WITH_OPENEXR) -+ find_package(OpenEXR CONFIG REQUIRED) -+endif() - - if(OpenEXR_FOUND) - OPTION(vsgXchange_openexr "Optional OpenEXR support provided" ON) diff --git a/ports/vsgxchange/vcpkg.json b/ports/vsgxchange/vcpkg.json index b0e3279fe34ed4..3da576c2f93f04 100644 --- a/ports/vsgxchange/vcpkg.json +++ b/ports/vsgxchange/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vsgxchange", "version": "1.1.4", + "port-version": 1, "description": "Utility library for converting 3rd party images, models and fonts formats to/from VulkanSceneGraph.", "homepage": "https://github.com/vsg-dev/vsgXchange", "license": "MIT", @@ -25,19 +26,28 @@ "curl": { "description": "Enable support for reading image and model files from http:// and https://", "dependencies": [ - "curl" + { + "name": "curl", + "default-features": false + } ] }, "freetype": { "description": "Enable support for reading fonts as vsg::Font via Freetype", "dependencies": [ - "freetype" + { + "name": "freetype", + "default-features": false + } ] }, "gdal": { "description": "Enable support for reading geospatial data formats as vsg::Data via GDAL", "dependencies": [ - "gdal" + { + "name": "gdal", + "default-features": false + } ] }, "openexr": { diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 1949722cef5818..649acd67270b60 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle REF "v${VERSION}" - SHA512 6742ef1020c105778af3c553e8d12e464819e92c4347331f9c626355744a86622bd8467020d8b69b7d07b20d2745f3ef4e623ba8dcd7ec266aedddf396a6cb7c + SHA512 c373b5c5a6d93027c162c65095529cf4e6ae74856cda8f34c3bed7276ed0d0a1bd099376ea6e5c51fae09977df714684a941093c977872d4ddaa447ebef0f081 HEAD_REF main PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index a4f4f4d8ac82c7..ab5d38806cadae 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2024.12.30.00", + "version-string": "2025.01.06.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", diff --git a/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake b/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake new file mode 100644 index 00000000000000..065116c276adcf --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mdl-sdk/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json b/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json new file mode 100644 index 00000000000000..4556dd2662403a --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mdl-sdk/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "vcpkg-ci-mdl-sdk", + "version-string": "ci", + "description": "Port to force features of certain ports within CI", + "license": "BSD-3-Clause", + "supports": "!(windows & static)", + "dependencies": [ + { + "name": "mdl-sdk", + "default-features": false, + "features": [ + "dds", + "openimageio" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-rtlsdr/portfile.cmake b/scripts/test_ports/vcpkg-ci-rtlsdr/portfile.cmake new file mode 100644 index 00000000000000..dd2570612035c8 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-rtlsdr/portfile.cmake @@ -0,0 +1,10 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}/project" + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" +) +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-rtlsdr/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-rtlsdr/project/CMakeLists.txt new file mode 100644 index 00000000000000..650d16757d71c9 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-rtlsdr/project/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required(VERSION 3.10) +project(rtlsdr-test C) + +find_package(PkgConfig REQUIRED) + +block() + find_package(rtlsdr CONFIG REQUIRED) + + add_executable(rtlsdr_cmake main.c) + target_link_libraries(rtlsdr_cmake $,rtlsdr::rtlsdr,rtlsdr::rtlsdr_static>) +endblock() + +block() + pkg_check_modules(librtlsdr IMPORTED_TARGET REQUIRED librtlsdr) + + add_executable(rtlsdr_pkgconfig main.c) + target_link_libraries(rtlsdr_pkgconfig PkgConfig::librtlsdr) +endblock() diff --git a/scripts/test_ports/vcpkg-ci-rtlsdr/project/main.c b/scripts/test_ports/vcpkg-ci-rtlsdr/project/main.c new file mode 100644 index 00000000000000..8dc76e62343a14 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-rtlsdr/project/main.c @@ -0,0 +1,6 @@ +#include + +int main() +{ + return (int)rtlsdr_get_device_count(); +} diff --git a/scripts/test_ports/vcpkg-ci-rtlsdr/vcpkg.json b/scripts/test_ports/vcpkg-ci-rtlsdr/vcpkg.json new file mode 100644 index 00000000000000..9f3b1cafb54365 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-rtlsdr/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "vcpkg-ci-rtlsdr", + "version-string": "ci", + "description": "Validates rtlsdr", + "dependencies": [ + "rtlsdr", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + { + "name": "tools", + "platform": "!android" + } + ], + "features": { + "tools": { + "description": "Install rtlsdr tools", + "dependencies": [ + { + "name": "rtlsdr", + "features": [ + "tools" + ] + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index f70052217890bd..34db39e684bec6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1529,7 +1529,7 @@ "port-version": 2 }, "catch2": { - "baseline": "3.7.1", + "baseline": "3.8.0", "port-version": 0 }, "cblas": { @@ -2733,7 +2733,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2024.12.30.00", + "baseline": "2025.01.06.00", "port-version": 0 }, "fcl": { @@ -2785,7 +2785,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2024.12.30.00", + "baseline": "2025.01.06.00", "port-version": 0 }, "flagpp": { @@ -2869,7 +2869,7 @@ "port-version": 1 }, "folly": { - "baseline": "2024.12.30.00", + "baseline": "2025.01.06.00", "port-version": 0 }, "font-chef": { @@ -4722,7 +4722,7 @@ }, "libjpeg-turbo": { "baseline": "3.1.0", - "port-version": 0 + "port-version": 1 }, "libjuice": { "baseline": "1.5.4", @@ -5054,7 +5054,7 @@ }, "libremidi": { "baseline": "4.5.0", - "port-version": 0 + "port-version": 1 }, "libressl": { "baseline": "4.0.0", @@ -6221,7 +6221,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2024.12.30.00", + "baseline": "2025.01.06.00", "port-version": 0 }, "mygui": { @@ -6657,7 +6657,7 @@ "port-version": 2 }, "opencl": { - "baseline": "v2024.05.08", + "baseline": "2024.10.24", "port-version": 0 }, "opencolorio": { @@ -6686,7 +6686,7 @@ }, "opencv4": { "baseline": "4.10.0", - "port-version": 2 + "port-version": 3 }, "opendnp3": { "baseline": "3.1.1", @@ -6766,7 +6766,7 @@ }, "openssl": { "baseline": "3.4.0", - "port-version": 0 + "port-version": 1 }, "opensubdiv": { "baseline": "3.5.0", @@ -6794,7 +6794,7 @@ }, "openvino": { "baseline": "2024.4.0", - "port-version": 5 + "port-version": 6 }, "openvpn3": { "baseline": "3.10", @@ -7265,7 +7265,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2024.12.30.00", + "baseline": "2025.01.06.00", "port-version": 0 }, "psimd": { @@ -8077,8 +8077,8 @@ "port-version": 1 }, "rtlsdr": { - "baseline": "2020-04-16", - "port-version": 4 + "baseline": "2.0.2", + "port-version": 0 }, "rtmfp-cpp": { "baseline": "1.5.1", @@ -9530,7 +9530,7 @@ }, "vsgxchange": { "baseline": "1.1.4", - "port-version": 0 + "port-version": 1 }, "vst3sdk": { "baseline": "v3.7.12_build_20", @@ -9609,7 +9609,7 @@ "port-version": 0 }, "wangle": { - "baseline": "2024.12.30.00", + "baseline": "2025.01.06.00", "port-version": 0 }, "wasmedge": { diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 9bd1dd2ead94cc..501db57a5b4a49 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0da5966831e52358f57a6915d729c6d2b7f3db4b", + "version-semver": "3.8.0", + "port-version": 0 + }, { "git-tree": "6f03dab61d096d616b0c745d442d406e525f4b7f", "version-semver": "3.7.1", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 628706a76dd170..0fca364564c3b8 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2038a9a6e4321c1a88e2e294c0d110ef5ed1e4c1", + "version-string": "2025.01.06.00", + "port-version": 0 + }, { "git-tree": "e17992eaebd8d5f3e631cf269e1118adabe079e5", "version-string": "2024.12.30.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 3a50f26caf279a..151d2ca1e2e653 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77073beea006fc3b64f6592a59d74e6b90cfa004", + "version-string": "2025.01.06.00", + "port-version": 0 + }, { "git-tree": "737e457beb35f48f639e481d4e71ca0ce02d04bd", "version-string": "2024.12.30.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index eea61c0e8852e3..897cb6e31478e4 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30952a6a926c5b4f92f0f9504caa70a65da12d0d", + "version-string": "2025.01.06.00", + "port-version": 0 + }, { "git-tree": "0337979b65f9c2550e8531950f777cbcc648a044", "version-string": "2024.12.30.00", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 82004b65f6904a..ee7f585719c4d6 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6180688844449e5724d6dc8eb49ab90124438ce2", + "version": "3.1.0", + "port-version": 1 + }, { "git-tree": "8286a6351f59be7eed5e924d32c3a419d0612ee9", "version": "3.1.0", diff --git a/versions/l-/libremidi.json b/versions/l-/libremidi.json index b3abfd4f3826e7..f07e46c6f5b52d 100644 --- a/versions/l-/libremidi.json +++ b/versions/l-/libremidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9f7f74d1c8742a224f1bd79011ac5fee7a0247b", + "version": "4.5.0", + "port-version": 1 + }, { "git-tree": "355e1ad8bb5377cfbc28e346d2666d94adf0eb4b", "version": "4.5.0", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index a8b23826504f9d..729a44b9975f81 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6471544b7d43b5cf383094dd38e8669dac612aaa", + "version-string": "2025.01.06.00", + "port-version": 0 + }, { "git-tree": "1478d76e276182dc2c61a2e8c969b11ae5d0a55b", "version-string": "2024.12.30.00", diff --git a/versions/o-/opencl.json b/versions/o-/opencl.json index 813233162c963c..1e990d2d9dd298 100644 --- a/versions/o-/opencl.json +++ b/versions/o-/opencl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "038100d3145dff266fc54053ff67c4e98ce7cca4", + "version": "2024.10.24", + "port-version": 0 + }, { "git-tree": "37ee1974a90da69c3cf4536bab58bf7b5a208a47", "version-string": "v2024.05.08", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 8535411cf221e1..44f8f3206f7bee 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b252c88917d365d1df72e1eba286537f11b0350b", + "version": "4.10.0", + "port-version": 3 + }, { "git-tree": "c493a7ea4c35003983be050429d12e2a51ee8fed", "version": "4.10.0", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index bc69fea55830d1..d4c2408bf7d3c8 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "facccb0b0c47f9804b6e336096d0985c3e541eec", + "version": "3.4.0", + "port-version": 1 + }, { "git-tree": "ce504a83eb9627d54f1cffdb497a6bf5bd970d18", "version": "3.4.0", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index e65183d15eaceb..d3f809fbae4523 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a52cc9b435c23fc08e94f744aa4799de019a76c7", + "version": "2024.4.0", + "port-version": 6 + }, { "git-tree": "d3497e79615424c72514c072b5f7deb876f35718", "version": "2024.4.0", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 34a9b35dd044a8..ed945d4bcfc82d 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f465dacce60e0c82be08b7f94007a848a39d591e", + "version-string": "2025.01.06.00", + "port-version": 0 + }, { "git-tree": "a7e07fb28f6d60b42ba90090380e507bcbaef3a2", "version-string": "2024.12.30.00", diff --git a/versions/r-/rtlsdr.json b/versions/r-/rtlsdr.json index 53d1401eaa3ea4..bdefab993ea715 100644 --- a/versions/r-/rtlsdr.json +++ b/versions/r-/rtlsdr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4aa1a9961d93dffda1ca3f54f51d14f603337e7c", + "version": "2.0.2", + "port-version": 0 + }, { "git-tree": "34080655f9f5ad3c03d665ded67df7469407a78c", "version-date": "2020-04-16", diff --git a/versions/v-/vsgxchange.json b/versions/v-/vsgxchange.json index 512e9156ed82ee..5d0223c3c4503a 100644 --- a/versions/v-/vsgxchange.json +++ b/versions/v-/vsgxchange.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce4bd6f08fa8c050c1642b222a44997deec56f09", + "version": "1.1.4", + "port-version": 1 + }, { "git-tree": "bc9b4c901aa03cdb767383d0924c1e5318b97748", "version": "1.1.4", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 3adec872125706..4f39aaa5809fcb 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eba2cc1d3860195e034a50fe9be95c49893554bd", + "version-string": "2025.01.06.00", + "port-version": 0 + }, { "git-tree": "f1e924ced45a6b8674c3c9fff3e0457cb427451f", "version-string": "2024.12.30.00",