diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index a332681ee8382b..9e597e1f48d6e8 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "activemq-cpp", "version-semver": "3.9.5", - "port-version": 16, + "port-version": 17, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", "license": "Apache-2.0", - "supports": "!(uwp | osx)", + "supports": "(windows & !uwp & (x86 | x64)) | (!windows & !osx)", "dependencies": [ "apr", { diff --git a/ports/apr/0100-add-host-tools-dir.diff b/ports/apr/0100-add-host-tools-dir.diff new file mode 100644 index 00000000000000..c38d8975f6d5ab --- /dev/null +++ b/ports/apr/0100-add-host-tools-dir.diff @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d16eec6..92146f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,13 +87,17 @@ STRING(REGEX REPLACE ".*#define APR_PATCH_VERSION[ \t]+([0-9]+).*" "\\1" APR_PAT + + CONFIGURE_FILE(include/apr.hwc + ${PROJECT_BINARY_DIR}/apr.h) + + ADD_EXECUTABLE(gen_test_char tools/gen_test_char.c) + ++set(UNOFFICIAL_APR_HOST_TOOLS_DIR "$" CACHE STRING "") ++set(UNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX "$" CACHE STRING "") ++install(TARGETS gen_test_char) ++ + ADD_CUSTOM_COMMAND( + COMMENT "Generating character tables, apr_escape_test_char.h, for current locale" + DEPENDS gen_test_char +- COMMAND $ > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h ++ COMMAND "${UNOFFICIAL_APR_HOST_TOOLS_DIR}/gen_test_char${UNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX}" > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h + OUTPUT ${PROJECT_BINARY_DIR}/apr_escape_test_char.h + ) + ADD_CUSTOM_TARGET( diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 895a98896a66ff..fee527df8c9c9e 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -1,6 +1,3 @@ - -set(VERSION 1.7.5) - vcpkg_download_distfile(ARCHIVE URLS "https://archive.apache.org/dist/apr/apr-${VERSION}.tar.bz2" FILENAME "apr-${VERSION}.tar.bz2" @@ -11,8 +8,19 @@ vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES unglue.patch + 0100-add-host-tools-dir.diff ) +set(CURRENT_HOST_TOOLS_DIR "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") + +set(CROSSCOMPILING_OPTIONS "") +if(VCPKG_CROSSCOMPILING) + list(APPEND CROSSCOMPILING_OPTIONS + "-DUNOFFICIAL_APR_HOST_TOOLS_DIR=${CURRENT_HOST_TOOLS_DIR}" + "-DUNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX=${VCPKG_HOST_EXECUTABLE_SUFFIX}" + ) +endif() + if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -32,6 +40,7 @@ if (VCPKG_TARGET_IS_WINDOWS) -DMIN_WINDOWS_VER=Windows7 -DAPR_HAVE_IPV6=ON ${FEATURE_OPTIONS} + ${CROSSCOMPILING_OPTIONS} ) vcpkg_cmake_install() @@ -42,6 +51,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ) # There is no way to suppress installation of the headers in debug builds. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + vcpkg_copy_tools(TOOL_NAMES gen_test_char AUTO_CLEAN) vcpkg_copy_pdbs() diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index e052319294e0e0..7b4bbf485c73fc 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,12 +1,17 @@ { "name": "apr", "version": "1.7.5", - "port-version": 1, + "port-version": 2, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", "license": "Apache-2.0", - "supports": "!uwp", + "supports": "!uwp & !mingw", "dependencies": [ + { + "name": "apr", + "host": true, + "platform": "windows" + }, { "name": "vcpkg-cmake", "host": true, diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake index bf203ba6d7fbd6..fe2eac89bc6794 100644 --- a/ports/async-mqtt/portfile.cmake +++ b/ports/async-mqtt/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/async_mqtt REF "${VERSION}" - SHA512 25aa9b5ceb32247025143531bb849ecb52a5d54dc671bf4739e99c2190082e497b857c97245bae5adbc62b3e0cedefab712a71ba422b992756a47eab9d192f9e + SHA512 cf76113f9fc3999c83781ca8213dbaa18edb5f4c081366b25ed1581cb955f8dfd562175bbd6ba5c127e560d5f9a0e013e42185211a4de77e76cdd44b279873a6 HEAD_REF main ) diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json index e22500bbe3d9d1..702042f3fe4c8f 100644 --- a/ports/async-mqtt/vcpkg.json +++ b/ports/async-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "async-mqtt", - "version": "9.0.1", + "version": "9.0.2", "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.", "homepage": "https://github.com/redboltz/async_mqtt", "license": "BSL-1.0", diff --git a/ports/aurora-au/disable-googletest.patch b/ports/aurora-au/disable-googletest.patch new file mode 100644 index 00000000000000..ff6f750dafa038 --- /dev/null +++ b/ports/aurora-au/disable-googletest.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b18407f..f1be4c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,9 +52,6 @@ FetchContent_Declare( + # For Windows: Prevent overriding the parent project's compiler/linker settings + set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + +-FetchContent_MakeAvailable(googletest) +-include(GoogleTest) +- + add_subdirectory(au) + + # Configure how Au will be installed. +diff --git a/cmake/AuConfig.cmake.in b/cmake/AuConfig.cmake.in +index b121f76..65da38a 100644 +--- a/cmake/AuConfig.cmake.in ++++ b/cmake/AuConfig.cmake.in +@@ -14,9 +14,6 @@ + + @PACKAGE_INIT@ + +-include(CMakeFindDependencyMacro) +-find_dependency(googletest 1.12.1) +- + include(${CMAKE_CURRENT_LIST_DIR}/AuHeaders.cmake) + + check_required_components(Au) +diff --git a/cmake/HeaderOnlyLibrary.cmake b/cmake/HeaderOnlyLibrary.cmake +index 28daf00..f2bf389 100644 +--- a/cmake/HeaderOnlyLibrary.cmake ++++ b/cmake/HeaderOnlyLibrary.cmake +@@ -75,7 +75,7 @@ function(header_only_library) + ) + + # Add the test, if requested. +- if (DEFINED ARG_GTEST_SRCS) ++ if (0) + add_executable("${ARG_NAME}_test") + target_sources("${ARG_NAME}_test" PRIVATE ${ARG_GTEST_SRCS}) + target_link_libraries( diff --git a/ports/aurora-au/portfile.cmake b/ports/aurora-au/portfile.cmake new file mode 100644 index 00000000000000..afd21242bcc8d4 --- /dev/null +++ b/ports/aurora-au/portfile.cmake @@ -0,0 +1,23 @@ +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aurora-opensource/au + REF "${VERSION}" + SHA512 4aa3282f6b76fbadd04ca572734f72c86b1b0b4e85fc21a03d1ab00b83d3aea319ab2dac3934361b5f6fa7c4a0dccece94fe0a57f3d73d208315b51b1950e374 + HEAD_REF main + PATCHES + disable-googletest.patch +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/Au +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Remove empty directory +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/aurora-au/usage b/ports/aurora-au/usage new file mode 100644 index 00000000000000..6b9b5f7ed51259 --- /dev/null +++ b/ports/aurora-au/usage @@ -0,0 +1,4 @@ +The package aurora-au provides CMake targets: + + find_package(Au REQUIRED) + target_link_libraries(main PRIVATE Au::au) diff --git a/ports/aurora-au/vcpkg.json b/ports/aurora-au/vcpkg.json new file mode 100644 index 00000000000000..9aa3ab6ca20ac7 --- /dev/null +++ b/ports/aurora-au/vcpkg.json @@ -0,0 +1,19 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "aurora-au", + "version-semver": "0.3.5", + "description": "A C++14-compatible physical units library with no dependencies and a single-file delivery option. Emphasis on safety, accessibility, performance, and developer experience.", + "homepage": "https://github.com/aurora-opensource/au", + "license": "Apache-2.0", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index 1efde57bbc52f1..79b57f894a86fc 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common REF "v${VERSION}" - SHA512 25da9356e36c87210bcdd95b007824288f36fd3ae4bdd757a1d3e88ef3cc8b65a0c1a31cbe338147949257c8e908c1721fc6297aeb0cbfe7cb89b4d7727dc2ad + SHA512 482bfeb5c7dac16486236417af0f5c0a20bc36c271aaf32088d188186861d61bf0b96c5da13a1c88853fdc6a1fb8b8db254a547c3648a659ec6e91177978dc9b HEAD_REF master PATCHES disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json index f00e34053f57f9..20469aaef6e2e0 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-common", - "version": "0.9.28", + "version": "0.9.30", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", "license": "Apache-2.0", diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 60e78e63242f34..dde9d0508ca78e 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 d09d157566765239e42f404b2b70da807b7c089604f93ab81beb6b75269d95f666198005e076c88be0f9cc79aa236912cf3d2fe349c357d860035dea5203a5b6 + SHA512 01579a7be61b70cee534bc3ada89f921e1849d2b7927107ad38ec3ab972f92dc24c9b18a2bec28033db498bf90f03f20e2ae8541b8cb0f8a47208d4c485b3bc5 PATCHES fix-aws-root.patch lock-curl-http-and-tls-settings.patch diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 88e6149cee0c5f..9e89863265c2c7 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.11.420", + "version": "1.11.428", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake index d0ff59d76af3aa..8e1dbfb178df74 100644 --- a/ports/azure-core-amqp-cpp/portfile.cmake +++ b/ports/azure-core-amqp-cpp/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "azure-core-amqp_${VERSION}" SHA512 92d5648b832c38587c2ceccaf3293252a7f5b976df7f57fc475b8fcd396ba3bb7fd2c18e46b3b06f6c8776aed6df1c4a36ef2b8bc5f07f1f23c771ff476a7af7 HEAD_REF main + PATCHES + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp") diff --git a/ports/azure-core-amqp-cpp/set_version.patch b/ports/azure-core-amqp-cpp/set_version.patch new file mode 100644 index 00000000000000..89e179106fa951 --- /dev/null +++ b/ports/azure-core-amqp-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt +index 3ef7bf8d9..6d2829e84 100644 +--- a/sdk/core/azure-core-amqp/CMakeLists.txt ++++ b/sdk/core/azure-core-amqp/CMakeLists.txt +@@ -177,6 +177,7 @@ target_link_libraries(azure-core-amqp PRIVATE + PUBLIC Azure::azure-core) + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-core-amqp PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json index 92923eedbbf68c..a8357c35faebb4 100644 --- a/ports/azure-core-amqp-cpp/vcpkg.json +++ b/ports/azure-core-amqp-cpp/vcpkg.json @@ -5,6 +5,7 @@ ], "name": "azure-core-amqp-cpp", "version-semver": "1.0.0-beta.11", + "port-version": 1, "description": [ "Microsoft Azure AMQP SDK for C++", "This library provides AMQP functionality to Azure SDK services." diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 6066ad0bd66c75..09c71b3f7f5adb 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF main PATCHES useragent.patch + set_version.patch ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/set_version.patch b/ports/azure-core-cpp/set_version.patch new file mode 100644 index 00000000000000..685171adf530d6 --- /dev/null +++ b/ports/azure-core-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt +index 87c5cfd9b..c7d29c3f2 100644 +--- a/sdk/core/azure-core/CMakeLists.txt ++++ b/sdk/core/azure-core/CMakeLists.txt +@@ -192,6 +192,7 @@ if(BUILD_TRANSPORT_WINHTTP) + endif() + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-core PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-core ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index a0cb47cff4ef5b..cee04f30c36e1a 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -5,6 +5,7 @@ ], "name": "azure-core-cpp", "version-semver": "1.14.0", + "port-version": 1, "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake index 69e537f2d5d3e6..9cb2fff0c06557 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake +++ b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF main PATCHES useragent.patch + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry") diff --git a/ports/azure-core-tracing-opentelemetry-cpp/set_version.patch b/ports/azure-core-tracing-opentelemetry-cpp/set_version.patch new file mode 100644 index 00000000000000..1407e5217ed422 --- /dev/null +++ b/ports/azure-core-tracing-opentelemetry-cpp/set_version.patch @@ -0,0 +1,13 @@ +diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt +index 23cf7d143..a3c058874 100644 +--- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt ++++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt +@@ -83,6 +83,8 @@ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") + generate_documentation(azure-core-tracing-opentelemetry ${AZ_LIBRARY_VERSION}) + + if(BUILD_AZURE_CORE_TRACING_OPENTELEMETRY) ++ set_target_properties(azure-core-tracing-opentelemetry PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) ++ + az_vcpkg_export( + azure-core-tracing-opentelemetry + CORE_TRACING_OPENTELEMETRY diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json index 302ecec7d81006..6d119f5bd676ea 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json +++ b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json @@ -5,7 +5,7 @@ ], "name": "azure-core-tracing-opentelemetry-cpp", "version-semver": "1.0.0-beta.4", - "port-version": 4, + "port-version": 5, "description": [ "Microsoft Azure Core Tracing OpenTelemetry SDK for C++", "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs." diff --git a/ports/azure-data-tables-cpp/portfile.cmake b/ports/azure-data-tables-cpp/portfile.cmake index 29bf86782bae1d..6e1f60972acad9 100644 --- a/ports/azure-data-tables-cpp/portfile.cmake +++ b/ports/azure-data-tables-cpp/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "azure-data-tables_${VERSION}" SHA512 16d45e595b0ce2a16b8e65d1ac7ffd56d08ea3f51ca87592d9826a246690cda494d0b7aa20f3b59a0f3376be1bc724eb4b50330c5d7e93a484c866d0d349012f HEAD_REF main + PATCHES + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/tables/azure-data-tables") diff --git a/ports/azure-data-tables-cpp/set_version.patch b/ports/azure-data-tables-cpp/set_version.patch new file mode 100644 index 00000000000000..491e1784a2b13a --- /dev/null +++ b/ports/azure-data-tables-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/tables/azure-data-tables/CMakeLists.txt b/sdk/tables/azure-data-tables/CMakeLists.txt +index 038e267d7..f3b5e679c 100644 +--- a/sdk/tables/azure-data-tables/CMakeLists.txt ++++ b/sdk/tables/azure-data-tables/CMakeLists.txt +@@ -106,6 +106,7 @@ target_include_directories( + target_link_libraries(azure-data-tables PUBLIC Azure::azure-core) + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-data-tables PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-data-tables ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-data-tables-cpp/vcpkg.json b/ports/azure-data-tables-cpp/vcpkg.json index 640f4350d09238..27e37faf20e668 100644 --- a/ports/azure-data-tables-cpp/vcpkg.json +++ b/ports/azure-data-tables-cpp/vcpkg.json @@ -5,6 +5,7 @@ ], "name": "azure-data-tables-cpp", "version-semver": "1.0.0-beta.4", + "port-version": 1, "description": [ "Microsoft Azure Data Tables SDK for C++", "This library provides Azure Data Tables SDK." diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake index 33a4ac88f57bf5..6a924872e4632f 100644 --- a/ports/azure-identity-cpp/portfile.cmake +++ b/ports/azure-identity-cpp/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "azure-identity_${VERSION}" SHA512 129472704e740a62108400b0227d19ede14ea3a67bf66d6f34b52e0b8d6f7124240d96dc962c318f6b51d2e69c007036dae03f9390f5e3b5b615b63f0783dd2e HEAD_REF main + PATCHES + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/identity/azure-identity") diff --git a/ports/azure-identity-cpp/set_version.patch b/ports/azure-identity-cpp/set_version.patch new file mode 100644 index 00000000000000..a6f09c9247c3da --- /dev/null +++ b/ports/azure-identity-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt +index 57fe6bbc2..2cd8243ac 100644 +--- a/sdk/identity/azure-identity/CMakeLists.txt ++++ b/sdk/identity/azure-identity/CMakeLists.txt +@@ -117,6 +117,7 @@ else() + endif() + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-identity PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-identity ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json index 7e64af35683ae8..35804c3112952f 100644 --- a/ports/azure-identity-cpp/vcpkg.json +++ b/ports/azure-identity-cpp/vcpkg.json @@ -5,7 +5,7 @@ ], "name": "azure-identity-cpp", "version-semver": "1.10.0", - "port-version": 1, + "port-version": 2, "description": [ "Microsoft Azure Identity SDK for C++", "This library provides common authentication-related abstractions for Azure SDK." diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake index c81a52a3077b0d..248ec2fbdceff8 100644 --- a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF main PATCHES useragent.patch + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob") diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/set_version.patch b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/set_version.patch new file mode 100644 index 00000000000000..e2c226785b07c5 --- /dev/null +++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt +index 215269090..9fbc1062a 100644 +--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt ++++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CMakeLists.txt +@@ -91,6 +91,7 @@ target_link_libraries(azure-messaging-eventhubs-checkpointstore-blob + create_code_coverage(eventhubs azure-messaging-eventhubs-checkpointstore-blob azure-messaging-eventhubs-blobcheckpointstore-test "tests?/*;samples?/*") + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-messaging-eventhubs-checkpointstore-blob PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + #generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-messaging-eventhubs-checkpointstore-blob ${AZ_LIBRARY_VERSION}) + diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json index e7eb0f02052ab0..96636239929c17 100644 --- a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json @@ -5,7 +5,7 @@ ], "name": "azure-messaging-eventhubs-checkpointstore-blob-cpp", "version-semver": "1.0.0-beta.1", - "port-version": 3, + "port-version": 4, "description": [ "Microsoft Azure Messaging Event Hubs Blob Checkpoint Store SDK for C++", "This library provides an Azure-Storage-Blobs based implementation of an Azure Messaging Event Hubs SDK Checkpoint Store." diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake index d1a29c169c81de..204acf1d563a77 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF main PATCHES useragent.patch + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs") diff --git a/ports/azure-messaging-eventhubs-cpp/set_version.patch b/ports/azure-messaging-eventhubs-cpp/set_version.patch new file mode 100644 index 00000000000000..b82ca7f916d85e --- /dev/null +++ b/ports/azure-messaging-eventhubs-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt +index 0ea0b8e10..1cb7273fa 100644 +--- a/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt ++++ b/sdk/eventhubs/azure-messaging-eventhubs/CMakeLists.txt +@@ -116,6 +116,7 @@ target_compile_definitions(azure-messaging-eventhubs PRIVATE _azure_BUILDING_SDK + create_code_coverage(eventhubs azure-messaging-eventhubs azure-messaging-eventhubs-test "tests?/*;samples?/*") + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-messaging-eventhubs PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-messaging-eventhubs ${AZ_LIBRARY_VERSION}) + + add_subdirectory(test) diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json index 645cd1e43f895e..97e7eeeffe2e73 100644 --- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json @@ -5,7 +5,7 @@ ], "name": "azure-messaging-eventhubs-cpp", "version-semver": "1.0.0-beta.9", - "port-version": 1, + "port-version": 2, "description": [ "Microsoft Azure Messaging Event Hubs SDK for C++", "This library provides Azure Messaging Event Hubs SDK." diff --git a/ports/azure-security-attestation-cpp/portfile.cmake b/ports/azure-security-attestation-cpp/portfile.cmake index 96cf6a353b81cc..cc04c8f3300b2e 100644 --- a/ports/azure-security-attestation-cpp/portfile.cmake +++ b/ports/azure-security-attestation-cpp/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( PATCHES context_syntax.patch useragent.patch + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/attestation/azure-security-attestation") diff --git a/ports/azure-security-attestation-cpp/set_version.patch b/ports/azure-security-attestation-cpp/set_version.patch new file mode 100644 index 00000000000000..3f923b368214fb --- /dev/null +++ b/ports/azure-security-attestation-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt +index 8dec8cfa5..dee51d63f 100644 +--- a/sdk/attestation/azure-security-attestation/CMakeLists.txt ++++ b/sdk/attestation/azure-security-attestation/CMakeLists.txt +@@ -86,6 +86,7 @@ create_code_coverage(attestation azure-security-attestation azure-security-attes + + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-security-attestation PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-security-attestation ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-security-attestation-cpp/vcpkg.json b/ports/azure-security-attestation-cpp/vcpkg.json index 199eb73fff9331..0fc6fd35ad6335 100644 --- a/ports/azure-security-attestation-cpp/vcpkg.json +++ b/ports/azure-security-attestation-cpp/vcpkg.json @@ -5,7 +5,7 @@ ], "name": "azure-security-attestation-cpp", "version-semver": "1.1.0", - "port-version": 5, + "port-version": 6, "description": [ "Microsoft Azure Attestation Service SDK for C++", "This library provides API access to the Microsoft Azure Attestation service." diff --git a/ports/azure-security-keyvault-administration-cpp/portfile.cmake b/ports/azure-security-keyvault-administration-cpp/portfile.cmake index c5e83bece73d22..0a992359288d86 100644 --- a/ports/azure-security-keyvault-administration-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-administration-cpp/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "azure-security-keyvault-administration_${VERSION}" SHA512 075364958d05b4eace3babbcc700706a02f2125577d3f903ef4ca2cc71245a45963ca5ac82f1e9bd3903c799d3c44846741802cbd917bbc8f65a92d047caf7ef HEAD_REF main + PATCHES + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration") diff --git a/ports/azure-security-keyvault-administration-cpp/set_version.patch b/ports/azure-security-keyvault-administration-cpp/set_version.patch new file mode 100644 index 00000000000000..3d8966f305c952 --- /dev/null +++ b/ports/azure-security-keyvault-administration-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt +index 5f70eb301..45a1181e7 100644 +--- a/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt ++++ b/sdk/keyvault/azure-security-keyvault-administration/CMakeLists.txt +@@ -95,6 +95,7 @@ target_compile_definitions(azure-security-keyvault-administration PRIVATE _azure + create_code_coverage(keyvault azure-security-keyvault-administration azure-security-keyvault-administration-test "tests?/*;samples?/*") + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-security-keyvault-administration PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-security-keyvault-administration ${AZ_LIBRARY_VERSION}) + if(BUILD_TESTING) + diff --git a/ports/azure-security-keyvault-administration-cpp/vcpkg.json b/ports/azure-security-keyvault-administration-cpp/vcpkg.json index 81baedb0015110..1207ed01c40625 100644 --- a/ports/azure-security-keyvault-administration-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-administration-cpp/vcpkg.json @@ -5,6 +5,7 @@ ], "name": "azure-security-keyvault-administration-cpp", "version-semver": "4.0.0-beta.5", + "port-version": 1, "description": [ "Microsoft Azure Key Vault Administration SDK for C++", "This library provides Azure Key Vault Administration SDK." diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index 7e704d4cb4e690..1960aae4e67315 100644 --- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF main PATCHES useragent.patch + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates") diff --git a/ports/azure-security-keyvault-certificates-cpp/set_version.patch b/ports/azure-security-keyvault-certificates-cpp/set_version.patch new file mode 100644 index 00000000000000..e22a1d3ddb267a --- /dev/null +++ b/ports/azure-security-keyvault-certificates-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt +index 0806e09b0..0c08f1576 100644 +--- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt ++++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt +@@ -100,6 +100,7 @@ target_compile_definitions(azure-security-keyvault-certificates PRIVATE _azure_B + create_code_coverage(keyvault azure-security-keyvault-certificates azure-security-keyvault-certificates-test "tests?/*;samples?/*") + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-security-keyvault-certificates PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-security-keyvault-certificates ${AZ_LIBRARY_VERSION}) + + if(BUILD_TESTING) diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index b7da7c52d8baae..fa45bcd04f2090 100644 --- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -5,7 +5,7 @@ ], "name": "azure-security-keyvault-certificates-cpp", "version-semver": "4.2.1", - "port-version": 2, + "port-version": 3, "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index f8956acb524dc0..ff865983bcd37f 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF main PATCHES useragent.patch + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys") diff --git a/ports/azure-security-keyvault-keys-cpp/set_version.patch b/ports/azure-security-keyvault-keys-cpp/set_version.patch new file mode 100644 index 00000000000000..49ab6c0cb2e64e --- /dev/null +++ b/ports/azure-security-keyvault-keys-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt +index 6217fd13f..d5b6db60a 100644 +--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt ++++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt +@@ -138,6 +138,7 @@ target_compile_definitions(azure-security-keyvault-keys PRIVATE _azure_BUILDING_ + create_code_coverage(keyvault azure-security-keyvault-keys azure-security-keyvault-keys-test "tests?/*;samples?/*") + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-security-keyvault-keys PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-security-keyvault-keys ${AZ_LIBRARY_VERSION}) + + if(BUILD_TESTING) diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index c23260cce430c0..badfdb225590fb 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -5,7 +5,7 @@ ], "name": "azure-security-keyvault-keys-cpp", "version-semver": "4.4.1", - "port-version": 2, + "port-version": 3, "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index ec646793e523eb..5f17c65e035164 100644 --- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF main PATCHES useragent.patch + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets") diff --git a/ports/azure-security-keyvault-secrets-cpp/set_version.patch b/ports/azure-security-keyvault-secrets-cpp/set_version.patch new file mode 100644 index 00000000000000..623ee43893edca --- /dev/null +++ b/ports/azure-security-keyvault-secrets-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt +index e5acb6001..647285994 100644 +--- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt ++++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt +@@ -133,6 +133,7 @@ target_compile_definitions(azure-security-keyvault-secrets PRIVATE _azure_BUILDI + create_code_coverage(keyvault azure-security-keyvault-secrets azure-security-keyvault-secrets-test "tests?/*;samples?/*") + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-security-keyvault-secrets PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-security-keyvault-secrets ${AZ_LIBRARY_VERSION}) + if(BUILD_TESTING) + diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index bf2d068736490a..1bc75c16d822b7 100644 --- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -5,7 +5,7 @@ ], "name": "azure-security-keyvault-secrets-cpp", "version-semver": "4.2.1", - "port-version": 2, + "port-version": 3, "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 1d8a7d7c7ffdaf..5fb4f7c590a2ee 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "azure-storage-blobs_${VERSION}" SHA512 b8d060c0e26e48c590ecacbe0491361a93f41dbd14a1f76564056b288e47e472e5525588122ba7d12653f43110a56ac88dc66c0ea77fff02dc708978a9dfcfa3 HEAD_REF main + PATCHES + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-blobs") diff --git a/ports/azure-storage-blobs-cpp/set_version.patch b/ports/azure-storage-blobs-cpp/set_version.patch new file mode 100644 index 00000000000000..2269eec1d08b6c --- /dev/null +++ b/ports/azure-storage-blobs-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt +index f87ceae40..d624433d8 100644 +--- a/sdk/storage/azure-storage-blobs/CMakeLists.txt ++++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt +@@ -96,6 +96,7 @@ target_link_libraries(azure-storage-blobs PUBLIC Azure::azure-storage-common) + target_compile_definitions(azure-storage-blobs PRIVATE _azure_BUILDING_SDK) + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-storage-blobs PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-storage-blobs ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 49dbb82158e504..2295214c864dd4 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -5,6 +5,7 @@ ], "name": "azure-storage-blobs-cpp", "version-semver": "12.13.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index af50c4f2fd202d..6f7a44121f417f 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "azure-storage-common_${VERSION}" SHA512 2b82ff3e8d4e76c1c7205d363e2e9ff042cf4034c41a0bc7d47591a42c144b09ad6f732ea322ce0c918bcf5de548c88c58a577571182d988b85a4418c51d9f59 HEAD_REF main + PATCHES + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common") diff --git a/ports/azure-storage-common-cpp/set_version.patch b/ports/azure-storage-common-cpp/set_version.patch new file mode 100644 index 00000000000000..6cebbe2c1b25fb --- /dev/null +++ b/ports/azure-storage-common-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt +index 30f056dca..76afb17a3 100644 +--- a/sdk/storage/azure-storage-common/CMakeLists.txt ++++ b/sdk/storage/azure-storage-common/CMakeLists.txt +@@ -107,6 +107,7 @@ else() + endif() + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-storage-common PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-storage-common ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index f048e235301d34..81ec4d5730682a 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -5,6 +5,7 @@ ], "name": "azure-storage-common-cpp", "version-semver": "12.8.0", + "port-version": 1, "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index 5b8c4cfa543faf..1fcccbf3611f98 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "azure-storage-files-datalake_${VERSION}" SHA512 fa91118b8f17c6c2800610833f0a6fbb6543a1470d8cdffd1d654516252df62f54496d9dd9756ab5ee0772230dbf58873819fc07a642fdc24af32d255f525de5 HEAD_REF main + PATCHES + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake") diff --git a/ports/azure-storage-files-datalake-cpp/set_version.patch b/ports/azure-storage-files-datalake-cpp/set_version.patch new file mode 100644 index 00000000000000..edc82e88fae3b1 --- /dev/null +++ b/ports/azure-storage-files-datalake-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt +index 71905c86d..d02850bf1 100644 +--- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt ++++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt +@@ -92,6 +92,7 @@ target_include_directories( + target_link_libraries(azure-storage-files-datalake PUBLIC Azure::azure-storage-blobs) + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-storage-files-datalake PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-storage-files-datalake ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index 0fdc9bc09a1620..b49b8cea7d8a5d 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -5,6 +5,7 @@ ], "name": "azure-storage-files-datalake-cpp", "version-semver": "12.12.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 9842750d069bf6..5785a94fef869e 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "azure-storage-files-shares_${VERSION}" SHA512 56119c742d09164363d10690659513de7491c0274b1afc0ca09ad32c4a6f0252bb63634972403f27142e53df40ef812842150a6d8e9589b73c7fddcd73ed974e HEAD_REF main + PATCHES + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares") diff --git a/ports/azure-storage-files-shares-cpp/set_version.patch b/ports/azure-storage-files-shares-cpp/set_version.patch new file mode 100644 index 00000000000000..3ca4422a7d9634 --- /dev/null +++ b/ports/azure-storage-files-shares-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt +index 891f95480..3b79e1041 100644 +--- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt ++++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt +@@ -88,6 +88,7 @@ target_include_directories( + target_link_libraries(azure-storage-files-shares PUBLIC Azure::azure-storage-common) + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-storage-files-shares PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-storage-files-shares ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index ad74b43e7d56c3..77638829f898bc 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -5,6 +5,7 @@ ], "name": "azure-storage-files-shares-cpp", "version-semver": "12.11.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index f1b2e3bab36610..81c9a8bf3e6662 100644 --- a/ports/azure-storage-queues-cpp/portfile.cmake +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "azure-storage-queues_${VERSION}" SHA512 919353a8cf8c98906bfbe6795245c81ece5a82914f01c8d7083fd6e44f13877f42aefee3ed16c2078befa89e520339b8430e8dc115064bdffdd366b8c83684da HEAD_REF main + PATCHES + set_version.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-queues") diff --git a/ports/azure-storage-queues-cpp/set_version.patch b/ports/azure-storage-queues-cpp/set_version.patch new file mode 100644 index 00000000000000..eb0450c632f542 --- /dev/null +++ b/ports/azure-storage-queues-cpp/set_version.patch @@ -0,0 +1,12 @@ +diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt +index e567623d5..9ffc621ad 100644 +--- a/sdk/storage/azure-storage-queues/CMakeLists.txt ++++ b/sdk/storage/azure-storage-queues/CMakeLists.txt +@@ -81,6 +81,7 @@ target_include_directories( + target_link_libraries(azure-storage-queues PUBLIC Azure::azure-storage-common) + + get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp") ++set_target_properties(azure-storage-queues PROPERTIES VERSION ${AZ_LIBRARY_VERSION}) + generate_documentation(azure-storage-queues ${AZ_LIBRARY_VERSION}) + + az_vcpkg_export( diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json index c5aca907a6657f..f1f2be238d2c8b 100644 --- a/ports/azure-storage-queues-cpp/vcpkg.json +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -5,6 +5,7 @@ ], "name": "azure-storage-queues-cpp", "version-semver": "12.4.0", + "port-version": 1, "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." diff --git a/ports/directxmath/portfile.cmake b/ports/directxmath/portfile.cmake index 889efca7da5068..d74cc61c69c954 100644 --- a/ports/directxmath/portfile.cmake +++ b/ports/directxmath/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMath - REF feb2024b - SHA512 c1d9eebebc6ad049ba8999f04a31e8b240783f597776ea3b38512ec6b272f27b233d1aea80fa0e4dac01ff3d52d33a0e800150383572d0d4def979dd74e6fbde + REF oct2024 + SHA512 501a3c8b51cd6d3d4fbcc511c2c37f1d0511bd84d546d5254c2bc81238c11242b9d62c7a153ee110dc9d96a0c7d2544428d8de832c943b680b0cb09d8e3760f2 HEAD_REF main ) diff --git a/ports/directxmath/vcpkg.json b/ports/directxmath/vcpkg.json index c247c1cede17e2..1458bf1881a71d 100644 --- a/ports/directxmath/vcpkg.json +++ b/ports/directxmath/vcpkg.json @@ -1,11 +1,11 @@ { "name": "directxmath", - "version-date": "2024-02-14", - "port-version": 1, + "version-date": "2024-10-15", "description": "DirectXMath SIMD C++ math library", "homepage": "https://github.com/Microsoft/DirectXMath", "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal", "license": "MIT", + "supports": "!arm32", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index e27522fa9b675e..fcbf82491fb0a0 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI REF "v${VERSION}" - SHA512 99d1792e9949e50c856fb1833a839ae8c31cd9290c43b6091086387722d838472088443352b8ebdbd88f0e7ac5bfa756e175e4f048def1b30153623f532c7e5a + SHA512 344e960491e17e9626f6ab4a42f28fe59842c0c15cf32ef2508e850099105667c651feaa6dd642207413fbeac43283310fe2b9a98a2ebfd4a49716da43e5cade HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 1b697315f1a7a6..10fc18de5f837f 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version": "2.0.6", + "version": "2.0.7", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "MIT", diff --git a/ports/dlib/fix-dependencies.patch b/ports/dlib/fix-dependencies.patch index 8077fd393fc66b..06e17db437388f 100644 --- a/ports/dlib/fix-dependencies.patch +++ b/ports/dlib/fix-dependencies.patch @@ -1,16 +1,16 @@ diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt -index 9f3001d..962cfc4 100644 +index cfe6ad9..75cfd54 100644 --- a/dlib/CMakeLists.txt +++ b/dlib/CMakeLists.txt -@@ -287,6 +287,7 @@ if (NOT TARGET dlib) - - set(dlib_needed_libraries) - set(dlib_needed_includes) +@@ -293,6 +293,7 @@ if (NOT TARGET dlib) + set(dlib_needed_public_ldflags) + set(dlib_needed_private_libraries) + set(dlib_needed_private_includes) + set(pkg_config_dlib_requires_private "") if (DLIB_ISO_CPP_ONLY) add_library(dlib ${source_files} ) -@@ -814,6 +815,10 @@ if (NOT TARGET dlib) +@@ -833,6 +834,10 @@ if (NOT TARGET dlib) if (DLIB_LINK_WITH_SQLITE3) @@ -21,7 +21,7 @@ index 9f3001d..962cfc4 100644 find_library(sqlite sqlite3) # make sure sqlite3.h is in the include path find_path(sqlite_path sqlite3.h) -@@ -829,6 +834,10 @@ if (NOT TARGET dlib) +@@ -848,6 +853,10 @@ if (NOT TARGET dlib) if (DLIB_USE_FFTW) @@ -32,7 +32,7 @@ index 9f3001d..962cfc4 100644 find_library(fftw fftw3) # make sure fftw3.h is in the include path find_path(fftw_path fftw3.h) -@@ -964,6 +973,8 @@ if (NOT TARGET dlib) +@@ -998,6 +1007,8 @@ if (NOT TARGET dlib) ## dlib-1.pc generation and installation @@ -41,7 +41,7 @@ index 9f3001d..962cfc4 100644 configure_file("cmake_utils/dlib.pc.in" "dlib-1.pc" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dlib-1.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -@@ -977,7 +988,7 @@ if (NOT TARGET dlib) +@@ -1011,7 +1022,7 @@ if (NOT TARGET dlib) endif() diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 183e533347fbc6..d7d4baa9aa39fd 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO davisking/dlib - REF 6097093ab329fcd19aed03a8fe67949f6971a65d #v19.24 - SHA512 4bdcecdf0f986abc748245d21616bf2c304461e9a37572c66743f69141fc3f37eb846fdaedc6c910135d986534f7989cbcc52a884ae7a52464fbb2a07b16a327 + REF "v${VERSION}" + SHA512 548f15fcd345a56b6e7a0a568fa7c694beeeda3b863492f59bdaa0b0e6d48b21d6705e2ac56a06f349aa26b0e9b79aa0a437870940170772b5b30cf35841cbb4 HEAD_REF master PATCHES fix-dependencies.patch @@ -43,6 +43,7 @@ vcpkg_cmake_configure( -DDLIB_GIF_SUPPORT=OFF -DDLIB_WEBP_SUPPORT=OFF -DDLIB_USE_MKL_FFT=OFF + -DDLIB_USE_FFMPEG=OFF OPTIONS_DEBUG ${dbg_opts} #-DDLIB_ENABLE_STACK_TRACE=ON @@ -78,6 +79,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_a file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_sse4") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libjpeg") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libpng") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libjxl") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/cmake_utils/test_for_libwebp") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm") -file(INSTALL "${SOURCE_PATH}/dlib/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/dlib/LICENSE.txt") diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json index c5f64563b0aa85..323e919d686e85 100644 --- a/ports/dlib/vcpkg.json +++ b/ports/dlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dlib", - "version": "19.24", - "port-version": 4, + "version": "19.24.6", "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", "homepage": "https://github.com/davisking/dlib", "license": "BSL-1.0", diff --git a/ports/fakeit/portfile.cmake b/ports/fakeit/portfile.cmake index 195d899623ada4..0b2d4e79c77f80 100644 --- a/ports/fakeit/portfile.cmake +++ b/ports/fakeit/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eranpeer/FakeIt REF "${VERSION}" - SHA512 3575dc2247a97ea6d3c584e9b933e32cc0d1936fec480b19caf8305e8ba39bb11b4437930a5343b343df66347354ef5aaa8d2811e0ff3119bfc619629a0c2b8b + SHA512 CA9932DF909D6C7F75AB775B6AC9695C80F1DC4A58599C789EEA279A05183E9568BB80B63EBDA5EF77EDD54D766977AB7C5BCD565FB45A61B56CB8D43E49007B HEAD_REF master ) diff --git a/ports/fakeit/vcpkg.json b/ports/fakeit/vcpkg.json index e6fd96597e0cf3..44ef830901827d 100644 --- a/ports/fakeit/vcpkg.json +++ b/ports/fakeit/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fakeit", - "version": "2.4.0", - "port-version": 3, + "version": "2.4.1", "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.", "homepage": "https://github.com/eranpeer/FakeIt", "license": "MIT", diff --git a/ports/fastdds/portfile.cmake b/ports/fastdds/portfile.cmake index 94907aad1393a9..b77db18bc8375f 100644 --- a/ports/fastdds/portfile.cmake +++ b/ports/fastdds/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eProsima/Fast-DDS REF "v${VERSION}" - SHA512 84333bef4b5264b72129e515c2208048c25794d7d653073298cbf5f43ba95c85f2aa64f30e6911a69daf9affc4dc1e10cea4064da43fdd709bbe04ef1cf1f4d7 + SHA512 c2b22f6355fc38ccf49d41f7fe074092c6962d2fa759351b37d83af863c60839d9579bfef0f96540276229bcdb2d3d218e18777db89cf16092d09c26f2e24533 HEAD_REF master PATCHES fix-find-package-asio.patch diff --git a/ports/fastdds/vcpkg.json b/ports/fastdds/vcpkg.json index d55b0a38e3785a..4b9b0fba76187d 100644 --- a/ports/fastdds/vcpkg.json +++ b/ports/fastdds/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fastdds", - "version": "3.0.1", + "version": "3.1.0", "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/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 707382cffffab5..42d0af7f7bd2f1 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 5d6206b72a9579ab3207dae55dab753b13747e8f964fa5d95c1691046a4d151d2043b0e6b341954dffd01082107ee7ce849a81baaf8d569ea388a193b2860469 + SHA512 b1a880a922e5823ec6c87d1540651978d895a2d0389158865011198ca80034342f39f7b2c1a104745ccb1cb3cb8d355cb0afb5b08c38fb8187a285ea37071f26 HEAD_REF main PATCHES fix-glog.patch @@ -19,7 +19,11 @@ file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake") file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake") file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake") -vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-Dthriftpy=OFF" +) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fbthrift) diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 91a23184674c87..0930517bbbdc6d 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2024.09.30.00", + "version-string": "2024.10.07.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/ffmpeg/vcpkg-cmake-wrapper.cmake b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake index eaa4f359af8772..7271f1387642b7 100644 --- a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake +++ b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake @@ -31,7 +31,7 @@ if(NOT z_vcpkg_using_vcpkg_find_ffmpeg) include(SelectLibraryConfigurations) -if(WIN32) +if(CMAKE_HOST_WIN32) set(PKG_CONFIG_EXECUTABLE "${CMAKE_CURRENT_LIST_DIR}/../../../@_HOST_TRIPLET@/tools/pkgconf/pkgconf.exe" CACHE STRING "" FORCE) endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index de583231f498e1..4a32b7c8c1f280 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "7.0.2", - "port-version": 4, + "port-version": 5, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake index 07104f719e20b6..5092e09bdf9a18 100644 --- a/ports/ffnvcodec/portfile.cmake +++ b/ports/ffnvcodec/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FFmpeg/nv-codec-headers REF "n${VERSION}" - SHA512 3c7d06e6a859cab5b915035544cb0103b1b1413c69ac418bc668145445498e1f9cb6ec597c4071f6198e378f6cea60e5a7b0be44b0de3191d65609d50dfdad4a + SHA512 dd2f1c7ff54890016ab17500449620cdf3690aa1d34dec78f1b27bdc0d51ec1335a66fda5942ddb43e1a1310de95874aef5232a1e676c21882fae08472d17808 HEAD_REF master ) diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index 7ce90e8ab7b5d1..b02718f8f3bad5 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ffnvcodec", - "version": "12.1.14.0", + "version": "12.2.72.0", "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", "supports": "linux | (!osx & !uwp & !(arm64 & windows))" diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 3980a4d62875f6..f4d58365334f43 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 9ad53ab9756ef614113c816773d73312da01533b26037a6fa071226a955751c8f30f18c40c876884f50b7d9899260dfa50a9ea035a89c04471e313392d6b8957 + SHA512 e20ecda20f0a4dce306cddfbdcf990212067aa4d3df551ee9d0b4a9a17f0509aba0c38bc9945ba2ba039a60f51a9cd5ea3e6fe6f97ba7d1c80e76238301bd283 HEAD_REF main PATCHES fix-build.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 19c96b83219f51..faa8361765d58c 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2024.09.30.00", + "version-string": "2024.10.07.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/folly/fix-fmt-patch-for-old-cmake.patch b/ports/folly/fix-fmt-patch-for-old-cmake.patch deleted file mode 100644 index 4c432fe4e9eefd..00000000000000 --- a/ports/folly/fix-fmt-patch-for-old-cmake.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMake/GenPkgConfig.cmake b/CMake/GenPkgConfig.cmake -index 0e93175bd..9de854022 100644 ---- a/CMake/GenPkgConfig.cmake -+++ b/CMake/GenPkgConfig.cmake -@@ -103,6 +103,11 @@ function(gen_pkgconfig_vars) - "" "" - cflags "${cflags}" - ) -+ -+ endif() -+ # patch for fmt's generator expression on older CMake -+ if (MSVC) -+ string(REPLACE "$<$,$>:/utf-8>" "/utf-8" cflags "${cflags}") - endif() - - set("${var_prefix}_CFLAGS" "${cflags}" PARENT_SCOPE) --- -2.34.1 diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index c907805bb55f51..82911402083731 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 61e9f011544314f330feea61d90771a06438ee2358023540d6f0658180491c09a9df4d2d4bb10375fe97467e9e233d1d1f8004b2df8e9c6281417a9b913e6ac6 + SHA512 cb8feb35e51072555b910613e87f079acd1f97892df0e6f3888bd9a8a336ca6183d552bfb4e16cfafbf8f5a7ec3f2a85dda686c74528e23e4bc821b2f67bfa77 HEAD_REF main PATCHES disable-non-underscore-posix-names.patch @@ -17,7 +17,6 @@ vcpkg_from_github( fix-deps.patch disable-uninitialized-resize-on-new-stl.patch fix-unistd-include.patch - fix-fmt-patch-for-old-cmake.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 1445be20c2bc23..ccc71c028086eb 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2024.09.30.00", + "version-string": "2024.10.07.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/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 752d2716221860..57ebe75e264423 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 e625ed1736f16bdcb0608fc251f238128e11a3384808764cf82b64243e79a4711f53b8fedb82bd8d992057ed94d426eda764096679cfc348c7341327c0bddcb6 + SHA512 fccdcf484bdc833dc5f0d6ad1fce9d152fa8b861cf23b634400d8bf7fd97d2c33a6b87050538c5a6c896d4ba870469134521cc44fdad3e071adffbf29329cb9b HEAD_REF master PATCHES find-link-libraries.patch diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 8ea029de5d0f2a..e6d0d5d54c73e7 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gdal", - "version-semver": "3.9.2", + "version-semver": "3.9.3", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/ports/gdcm/Fix-Cmake_DIR.patch b/ports/gdcm/Fix-Cmake_DIR.patch deleted file mode 100644 index 189b28e05a09b2..00000000000000 --- a/ports/gdcm/Fix-Cmake_DIR.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/CMake/ExportConfiguration/GDCMConfig.cmake.in b/CMake/ExportConfiguration/GDCMConfig.cmake.in -index f8e9d0b..ab28546 100644 ---- a/CMake/ExportConfiguration/GDCMConfig.cmake.in -+++ b/CMake/ExportConfiguration/GDCMConfig.cmake.in -@@ -33,28 +33,28 @@ if(GDCM_USE_VTK) - set(GDCM_VTK_DIR "@GDCM_VTK_DIR_CONFIG@") - endif() - --get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --if(EXISTS ${SELF_DIR}/GDCMTargets.cmake) -+get_filename_component(GDCM_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -+if(EXISTS ${GDCM_SELF_DIR}/GDCMTargets.cmake) - # This is an install tree -- include(${SELF_DIR}/GDCMTargets.cmake) -- get_filename_component(GDCM_INCLUDE_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE) -+ include(${GDCM_SELF_DIR}/GDCMTargets.cmake) -+ get_filename_component(GDCM_INCLUDE_ROOT "${GDCM_SELF_DIR}/../../@GDCM_INSTALL_INCLUDE_DIR@" ABSOLUTE) - set(GDCM_INCLUDE_DIRS ${GDCM_INCLUDE_ROOT}) -- get_filename_component(GDCM_LIB_ROOT "${SELF_DIR}/../../@GDCM_INSTALL_LIB_DIR@" ABSOLUTE) -+ get_filename_component(GDCM_LIB_ROOT "${GDCM_SELF_DIR}/../../@GDCM_INSTALL_LIB_DIR@" ABSOLUTE) - set(GDCM_LIBRARY_DIRS ${GDCM_LIB_ROOT}) - else() -- if(EXISTS ${SELF_DIR}/GDCMExports.cmake) -+ if(EXISTS ${GDCM_SELF_DIR}/GDCMExports.cmake) - # This is a build tree - set( GDCM_INCLUDE_DIRS "@GDCM_INCLUDE_PATH@") - set(GDCM_LIBRARY_DIRS "@GDCM_LIBRARY_DIR@") - -- include(${SELF_DIR}/GDCMExports.cmake) -+ include(${GDCM_SELF_DIR}/GDCMExports.cmake) - - else() - message(FATAL_ERROR "ooops") - endif() - endif() - --set(GDCM_USE_FILE ${SELF_DIR}/UseGDCM.cmake) -+set(GDCM_USE_FILE ${GDCM_SELF_DIR}/UseGDCM.cmake) - - # Backward compatible part: - set(GDCM_FOUND TRUE) diff --git a/ports/gdcm/copyright.diff b/ports/gdcm/copyright.diff new file mode 100644 index 00000000000000..3a7e72e2508897 --- /dev/null +++ b/ports/gdcm/copyright.diff @@ -0,0 +1,87 @@ +diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt +index 4cdc999..5971705 100644 +--- a/Utilities/CMakeLists.txt ++++ b/Utilities/CMakeLists.txt +@@ -12,8 +12,8 @@ if(NOT GDCM_USE_SYSTEM_LJPEG) + endif() + + # Do expat +-APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmexpat/COPYING) + if(NOT GDCM_USE_SYSTEM_EXPAT) ++APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmexpat/COPYING) + set(EXPAT_NAMESPACE "GDCMEXPAT") + set(EXPAT_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) + set(EXPAT_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) +@@ -22,8 +22,8 @@ if(NOT GDCM_USE_SYSTEM_EXPAT) + endif() + + # Do openjpeg (jpeg2000 implementation) +-APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmopenjpeg/LICENSE) + if(NOT GDCM_USE_SYSTEM_OPENJPEG) ++APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmopenjpeg/LICENSE) + set(OPENJPEG_NAMESPACE "GDCMOPENJPEG") + set(OPENJPEG_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) + set(OPENJPEG_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) +@@ -34,9 +34,9 @@ if(NOT GDCM_USE_SYSTEM_OPENJPEG) + endif() + + # Do jpegls (JPEG-LS aka near lossless implementation) +-APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmcharls/License.txt) + if(GDCM_USE_JPEGLS) + if(NOT GDCM_USE_SYSTEM_CHARLS) ++APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmcharls/License.txt) + set(CHARLS_NAMESPACE "GDCMCHARLS") + set(CHARLS_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) + set(CHARLS_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) +@@ -47,9 +47,9 @@ endif() + endif() + + # Do md5 +-APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmmd5/COPYING) + if(GDCM_BUILD_TESTING) + if(NOT GDCM_USE_SYSTEM_MD5) ++APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmmd5/COPYING) + set(MD5_NAMESPACE "GDCMMD5") + set(MD5_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) + set(MD5_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) +@@ -59,8 +59,8 @@ endif() + endif() + + # Do zlib +-APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmzlib/COPYING) + if(NOT GDCM_USE_SYSTEM_ZLIB) ++APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmzlib/COPYING) + set(ZLIB_NAMESPACE "GDCMZLIB") + set(ZLIB_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) + set(ZLIB_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) +@@ -70,8 +70,8 @@ endif() + + # Do getopt + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/getopt) +- APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/getopt/COPYING) + if(WIN32 AND NOT CYGWIN AND NOT MINGW) ++ APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/getopt/COPYING) + set(GETOPT_NAMESPACE "GDCMGETOPT") + set(GETOPT_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) + set(GETOPT_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) +@@ -81,9 +81,9 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/getopt) + endif() + + # you could be running mingw32 on linux in which case you do NOT want the gdcmuuid lib +-APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmuuid/COPYING) + if(NOT WIN32 AND NOT MINGW) + if(NOT GDCM_USE_SYSTEM_UUID) ++APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmuuid/COPYING) + set(UUID_NAMESPACE "GDCMUUID") + set(UUID_INSTALL_NO_LIBRARIES ${GDCM_INSTALL_NO_LIBRARIES}) + set(UUID_INSTALL_BIN_DIR ${GDCM_INSTALL_BIN_DIR}) +@@ -92,8 +92,8 @@ if(NOT WIN32 AND NOT MINGW) + endif() + endif() + +-APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/pvrg/COPYING) + if(GDCM_USE_PVRG) ++APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/pvrg/COPYING) + if(NOT GDCM_USE_SYSTEM_PVRG) + add_subdirectory(pvrg) + endif() diff --git a/ports/gdcm/fix-dependence-getopt.patch b/ports/gdcm/fix-dependence-getopt.patch deleted file mode 100644 index 935be24aefd0eb..00000000000000 --- a/ports/gdcm/fix-dependence-getopt.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt -index 4cdc999..c6ede41 100644 ---- a/Utilities/CMakeLists.txt -+++ b/Utilities/CMakeLists.txt -@@ -69,6 +69,7 @@ if(NOT GDCM_USE_SYSTEM_ZLIB) - endif() - - # Do getopt -+if(NOT USE_VCPKG_GETOPT) - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/getopt) - APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/getopt/COPYING) - if(WIN32 AND NOT CYGWIN AND NOT MINGW) -@@ -79,6 +80,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/getopt) - add_subdirectory(getopt) - endif() - endif() -+endif() - - # you could be running mingw32 on linux in which case you do NOT want the gdcmuuid lib - APPEND_COPYRIGHT(${CMAKE_CURRENT_SOURCE_DIR}/gdcmuuid/COPYING) -diff --git a/Utilities/VTK/Applications/CMakeLists.txt b/Utilities/VTK/Applications/CMakeLists.txt -index a7f7e7e..ab89a73 100644 ---- a/Utilities/VTK/Applications/CMakeLists.txt -+++ b/Utilities/VTK/Applications/CMakeLists.txt -@@ -60,7 +60,12 @@ foreach(app ${GDCM_VTK_APPS}) - endif() - endif() - if(WIN32 AND NOT CYGWIN) -- target_link_libraries(${app} gdcmgetopt) -+ if(USE_VCPKG_GETOPT) -+ find_package(unofficial-getopt-win32 REQUIRED) -+ target_link_libraries(${app} PRIVATE unofficial::getopt-win32::getopt) -+ else() -+ target_link_libraries(${app} gdcmgetopt) -+ endif() - endif() - if(NOT GDCM_INSTALL_NO_RUNTIME) - install(TARGETS ${app} diff --git a/ports/gdcm/fix-share-path.patch b/ports/gdcm/fix-share-path.patch deleted file mode 100644 index 9310946814efd0..00000000000000 --- a/ports/gdcm/fix-share-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6ac16ab..842d833 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -246,15 +246,15 @@ if(NOT GDCM_INSTALL_LIB_DIR) - endif() - - if(NOT GDCM_INSTALL_DATA_DIR) -- set(GDCM_INSTALL_DATA_DIR "share/${subdir}") -+ set(GDCM_INSTALL_DATA_DIR "share/${projectname}") - endif() - - if(NOT GDCM_INSTALL_INCLUDE_DIR) -- set(GDCM_INSTALL_INCLUDE_DIR "include/${subdir}") -+ set(GDCM_INSTALL_INCLUDE_DIR "include/${projectname}") - endif() - - if(NOT GDCM_INSTALL_DOC_DIR) -- set(GDCM_INSTALL_DOC_DIR "share/doc/${subdir}") -+ set(GDCM_INSTALL_DOC_DIR "share/doc/${projectname}") - endif() - - if(NOT GDCM_INSTALL_MAN_DIR) -@@ -262,7 +262,7 @@ if(NOT GDCM_INSTALL_MAN_DIR) - endif() - - if(NOT GDCM_INSTALL_PACKAGE_DIR) -- set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${subdir} -+ set(GDCM_INSTALL_PACKAGE_DIR ${GDCM_INSTALL_LIB_DIR}/${projectname} - CACHE INTERNAL "") - endif() - diff --git a/ports/gdcm/include-no-namespace.diff b/ports/gdcm/include-no-namespace.diff new file mode 100644 index 00000000000000..86c36335f601b3 --- /dev/null +++ b/ports/gdcm/include-no-namespace.diff @@ -0,0 +1,22 @@ +diff --git a/Source/Common/gdcmFilename.cxx b/Source/Common/gdcmFilename.cxx +index 5384510..9c99f94 100644 +--- a/Source/Common/gdcmFilename.cxx ++++ b/Source/Common/gdcmFilename.cxx +@@ -16,6 +16,9 @@ + #include + #include // realpath + #include ++#ifdef _WIN32 ++# include ++#endif + + namespace gdcm + { +@@ -97,7 +100,6 @@ const char *Filename::ToUnixSlashes() + } + + #if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__)) +-#include + + inline void Realpath(const char *path, std::string & resolved_path) + { diff --git a/ports/gdcm/no-absolute-paths.diff b/ports/gdcm/no-absolute-paths.diff new file mode 100644 index 00000000000000..e76dd30fd9cbe4 --- /dev/null +++ b/ports/gdcm/no-absolute-paths.diff @@ -0,0 +1,39 @@ +diff --git a/CMake/ExportConfiguration/GDCMConfig.cmake.in b/CMake/ExportConfiguration/GDCMConfig.cmake.in +index d43d565..dd2023d 100644 +--- a/CMake/ExportConfiguration/GDCMConfig.cmake.in ++++ b/CMake/ExportConfiguration/GDCMConfig.cmake.in +@@ -46,8 +46,6 @@ if(EXISTS ${SELF_DIR}/GDCMTargets.cmake) + else() + if(EXISTS ${SELF_DIR}/GDCMExports.cmake) + # This is a build tree +- set( GDCM_INCLUDE_DIRS "@GDCM_INCLUDE_PATH@") +- set(GDCM_LIBRARY_DIRS "@GDCM_LIBRARY_DIR@") + + include(${SELF_DIR}/GDCMExports.cmake) + +diff --git a/Source/Common/gdcmConfigure.h.in b/Source/Common/gdcmConfigure.h.in +index 4a5d68f..276c0f4 100644 +--- a/Source/Common/gdcmConfigure.h.in ++++ b/Source/Common/gdcmConfigure.h.in +@@ -37,9 +37,9 @@ + + /* Useful in particular for loadshared where the full path + * to the lib is needed */ +-#define GDCM_SOURCE_DIR "@GDCM_SOURCE_DIR@" +-#define GDCM_EXECUTABLE_OUTPUT_PATH "@EXECUTABLE_OUTPUT_PATH@" +-#define GDCM_LIBRARY_OUTPUT_PATH "@LIBRARY_OUTPUT_PATH@" ++#define GDCM_SOURCE_DIR "" ++#define GDCM_EXECUTABLE_OUTPUT_PATH "" ++#define GDCM_LIBRARY_OUTPUT_PATH "" + + #cmakedefine GDCM_BUILD_TESTING + +@@ -81,7 +81,7 @@ + /* only cerr, for instance 'invalid file' will be allowed */ + #cmakedefine GDCM_DEBUG + +-#define GDCM_CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" ++#define GDCM_CMAKE_INSTALL_PREFIX "" + #define GDCM_INSTALL_INCLUDE_DIR "@GDCM_INSTALL_INCLUDE_DIR@" + #define GDCM_INSTALL_DATA_DIR "@GDCM_INSTALL_DATA_DIR@" + diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake index 00436fa6c7b451..3e8a1c48d05e3f 100644 --- a/ports/gdcm/portfile.cmake +++ b/ports/gdcm/portfile.cmake @@ -1,48 +1,35 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO malaterre/GDCM REF "v${VERSION}" - SHA512 a1c45434e925ddac293993014686865aecf1b6745013ed6a141b6ee1bdbe7ddef6abcfc2491583e63f33f4292617ee65412da4c41f38731409df9149903a8772 + SHA512 2fe28444cee171a536d63f26c1ad7308a03b946e79dc8b7d648b5c7e6f4a8f52c0c32ec9cf463d95b876db31becc81541638b97fc7f15b79ae04de5988d6941e HEAD_REF master PATCHES - use-openjpeg-config.patch - fix-share-path.patch - Fix-Cmake_DIR.patch - fix-dependence-getopt.patch + copyright.diff + include-no-namespace.diff + no-absolute-paths.diff + prefer-config.diff ) -file(REMOVE "${SOURCE_PATH}/CMake/FindOpenJPEG.cmake") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(VCPKG_BUILD_SHARED_LIBS ON) -else() - set(VCPKG_BUILD_SHARED_LIBS OFF) -endif() - -set(USE_VCPKG_GETOPT OFF) -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(USE_VCPKG_GETOPT ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF - -DGDCM_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS} + -DGDCM_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DGDCM_BUILD_TESTING=OFF + -DGDCM_INSTALL_DATA_DIR=share/${PORT} + -DGDCM_INSTALL_DOC_DIR=share/${PORT}/doc -DGDCM_INSTALL_INCLUDE_DIR=include + -DGDCM_INSTALL_PACKAGE_DIR=share/${PORT} -DGDCM_USE_SYSTEM_EXPAT=ON - -DGDCM_USE_SYSTEM_ZLIB=ON -DGDCM_USE_SYSTEM_OPENJPEG=ON - -DGDCM_BUILD_TESTING=OFF - -DUSE_VCPKG_GETOPT=${USE_VCPKG_GETOPT} - MAYBE_UNUSED_VARIABLES - USE_VCPKG_GETOPT + -DGDCM_USE_SYSTEM_ZLIB=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/gdcm) +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() file(REMOVE_RECURSE @@ -50,22 +37,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMTargets.cmake" - "set(CMAKE_IMPORT_FILE_VERSION 1)" - "set(CMAKE_IMPORT_FILE_VERSION 1) - find_package(OpenJPEG QUIET)" -) - -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_SOURCE_DIR \"${SOURCE_PATH}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_EXECUTABLE_OUTPUT_PATH \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_LIBRARY_OUTPUT_PATH \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_CMAKE_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") - -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMConfig.cmake" "set( GDCM_INCLUDE_DIRS \"${SOURCE_PATH}/Source/Common;${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Source/Common;${SOURCE_PATH}/Source/DataStructureAndEncodingDefinition;${SOURCE_PATH}/Source/MediaStorageAndFileFormat;${SOURCE_PATH}/Source/MessageExchangeDefinition;${SOURCE_PATH}/Source/DataDictionary;${SOURCE_PATH}/Source/InformationObjectDefinition\")" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMConfig.cmake" "set(GDCM_LIBRARY_DIRS \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/.\")" "") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright.txt") +vcpkg_install_copyright(FILE_LIST "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Copyright.txt") diff --git a/ports/gdcm/prefer-config.diff b/ports/gdcm/prefer-config.diff new file mode 100644 index 00000000000000..3698bab7ea8a34 --- /dev/null +++ b/ports/gdcm/prefer-config.diff @@ -0,0 +1,47 @@ +diff --git a/CMake/ExportConfiguration/GDCMConfig.cmake.in b/CMake/ExportConfiguration/GDCMConfig.cmake.in +index 169cb82..c77cf1f 100644 +--- a/CMake/ExportConfiguration/GDCMConfig.cmake.in ++++ b/CMake/ExportConfiguration/GDCMConfig.cmake.in +@@ -1,3 +1,7 @@ ++include(CMakeFindDependencyMacro) ++find_dependency(expat CONFIG) ++find_dependency(OpenJPEG CONFIG) ++find_dependency(ZLIB) + #----------------------------------------------------------------------------- + # + # GDCMConfig.cmake - CMake configuration file for external projects. +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 38c65d1..b0cb77b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -360,8 +360,8 @@ else() + endif() + + if(GDCM_USE_SYSTEM_OPENJPEG) +- find_package(OpenJPEG 2.0.0 REQUIRED) +- set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES}) ++ find_package(OpenJPEG CONFIG REQUIRED) ++ set(GDCM_OPENJPEG_LIBRARIES $) + else() + set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2) + endif() +@@ -401,7 +401,7 @@ if(GDCM_USE_SYSTEM_ZLIB) + # If user say so, then this is a requirement ! + find_package(ZLIB REQUIRED) + include_directories(${ZLIB_INCLUDE_DIR}) +- set(GDCM_ZLIB_LIBRARIES ${ZLIB_LIBRARIES}) ++ set(GDCM_ZLIB_LIBRARIES ZLIB::ZLIB) + else() + set(GDCM_ZLIB_LIBRARIES "gdcmzlib") + endif() +@@ -420,8 +420,8 @@ endif() + + if(GDCM_USE_SYSTEM_EXPAT) + # If user say so, then this is a requirement ! +- find_package(EXPAT REQUIRED) +- set(GDCM_EXPAT_LIBRARIES ${EXPAT_LIBRARIES}) ++ find_package(expat CONFIG REQUIRED) ++ set(GDCM_EXPAT_LIBRARIES expat::expat) + else() + set(GDCM_EXPAT_LIBRARIES "gdcmexpat") + endif() diff --git a/ports/gdcm/use-openjpeg-config.patch b/ports/gdcm/use-openjpeg-config.patch deleted file mode 100644 index ff64bb1c26160d..00000000000000 --- a/ports/gdcm/use-openjpeg-config.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f82bfd2..a062170 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -375,7 +375,10 @@ else() - endif() - - if(GDCM_USE_SYSTEM_OPENJPEG) -- find_package(OpenJPEG 2.0.0 REQUIRED) -+ find_package(OpenJPEG REQUIRED) -+ if(OPENJPEG_MAJOR_VERSION VERSION_LESS 2) -+ message( FATAL_ERROR "You need at least OpenJPEG 2") -+ endif() - set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES}) - else() - set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2) diff --git a/ports/gdcm/vcpkg.json b/ports/gdcm/vcpkg.json index b570723e331112..b3ad627bafca56 100644 --- a/ports/gdcm/vcpkg.json +++ b/ports/gdcm/vcpkg.json @@ -1,15 +1,15 @@ { "name": "gdcm", - "version": "3.0.23", + "version": "3.0.24", "description": "Grassroots DICOM library", "homepage": "https://github.com/malaterre/GDCM", - "license": "BSD-3-Clause", - "supports": "!uwp & !(windows & arm)", + "license": null, + "supports": "!uwp", "dependencies": [ "expat", { - "name": "getopt", - "platform": "windows & !mingw" + "name": "libiconv", + "platform": "!windows" }, "openjpeg", { diff --git a/ports/gdcm2/portfile.cmake b/ports/gdcm2/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/ports/gdcm2/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/gdcm2/vcpkg.json b/ports/gdcm2/vcpkg.json deleted file mode 100644 index bdbe890c59bdc3..00000000000000 --- a/ports/gdcm2/vcpkg.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "gdcm2", - "version-string": "deprecated", - "port-version": 1, - "description": "This port was renamed to gdcm. The gdcm2 name is deprecated.", - "homepage": "https://github.com/malaterre/GDCM", - "dependencies": [ - "gdcm" - ] -} diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index d1ca8968abe4ba..2aec3a1d0af346 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -50,6 +50,7 @@ vcpkg_configure_meson( ${OPTIONS} -Ddocumentation=false -Dinstalled_tests=false + -Dintrospection=disabled -Dlibelf=disabled -Dman-pages=disabled -Dtests=false diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 646c5844968a23..3d86408cff42c2 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib", "version": "2.80.0", + "port-version": 1, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/ports/json-rpc-cxx/portfile.cmake b/ports/json-rpc-cxx/portfile.cmake index cd1b8f21f2127d..1a756e55b1b81d 100644 --- a/ports/json-rpc-cxx/portfile.cmake +++ b/ports/json-rpc-cxx/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jsonrpcx/json-rpc-cxx REF "v${VERSION}" - SHA512 0b8f2b1c8ff95bee14585f6b363f6aa4bf046e3905f7a65cf2e562e5c9181a3ba882baded36fab4d3ff9ac5b2f3245eeb54260f2163491af7fba264ff547f6d8 + SHA512 fa4ee807dd29027edd86949a8632adede77c3706406e6b78a8b6e38003f80103082ef70e0b89293a608db238d6f5662669b69cf0cb3d607bcc959c8801c5f3e0 HEAD_REF master PATCHES fix-config.patch diff --git a/ports/json-rpc-cxx/vcpkg.json b/ports/json-rpc-cxx/vcpkg.json index 2030a0e2f6135c..063e87308b6a3f 100644 --- a/ports/json-rpc-cxx/vcpkg.json +++ b/ports/json-rpc-cxx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "json-rpc-cxx", - "version": "0.3.1", + "version": "0.3.2", "description": "A JSON-RPC 2.0 framework implemented in C++17 using the nlohmann's json for modern C++.", "homepage": "https://github.com/jsonrpcx/json-rpc-cxx", "license": "MIT", diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 1161e52042f34c..94f782669bff64 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - SHA512 7f86c6634a599fafaba012d30c586340074cbed9d9ac6eadc270da253b725ce9ae9f920d1bf1e60530579b6e4fb4cd5c0eda8c491c0c704da471e4ac05c29c7b + SHA512 6168378a117850297fcda78853a0babd0ce7e0ca21b3e8c276acb7e75e04d85ed8909061a62e3324c309fe9e31bc59d89ea06e47853b50481843273e95172ab8 HEAD_REF main ) diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index b5292ebc0b59e1..705154254e6f2b 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsonifier", - "version": "0.9.96", + "version": "0.9.97", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 40e50f2998ff4d..c86fa82ebae195 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libarchive/libarchive REF "v${VERSION}" - SHA512 7d77e70a3ceaa69f25edaf82d371899340a4713db0101d2058273cff675d57867242f23983c71a9482fae922734807ae06387381e76eae963b7c8af6a26fa66b + SHA512 95c6232d178b26daa0eeba43d64ea4235aa96fa279c85fff715ac5e6cc73b2e65f276770f91c3538cb8ca989380555169497628d73e120bfa52e12f657049ff0 HEAD_REF master PATCHES disable-warnings.patch diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index 0e2a7972458a30..67a53fc4b238ba 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libarchive", - "version": "3.7.6", + "version": "3.7.7", "description": "Library for reading and writing streaming archives", "homepage": "https://www.libarchive.org", "license": null, @@ -64,19 +64,6 @@ "lzo" ] }, - "openssl": { - "description": "Deprecated. Use feature crypto instead.", - "dependencies": [ - { - "name": "libarchive", - "default-features": false, - "features": [ - "crypto" - ], - "platform": "!osx" - } - ] - }, "zstd": { "description": "Zstd support", "dependencies": [ diff --git a/ports/libavif/disable-source-utf8.patch b/ports/libavif/disable-source-utf8.patch index 486a473c7265ad..3cb92be7a9e8f3 100644 --- a/ports/libavif/disable-source-utf8.patch +++ b/ports/libavif/disable-source-utf8.patch @@ -1,15 +1,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d9431c..29d7d60 100644 +index baf5964..a28e6c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -161,8 +161,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC") - # A C4556 warning will be generated on violation. - # Commonly used /utf-8 flag assumes UTF-8 for both source and console, which is usually not the case. - # Warnings can be suppressed but there will still be random characters printed to the console. -- /source-charset:utf-8 -- /execution-charset:us-ascii -+ #/source-charset:utf-8 -+ #/execution-charset:us-ascii - ) - else() - message(FATAL_ERROR "libavif: Unknown compiler, bailing out") +@@ -296,8 +296,8 @@ if(MSVC) + # A C4556 warning will be generated on violation. + # Commonly used /utf-8 flag assumes UTF-8 for both source and console, which is usually not the case. + # Warnings can be suppressed but there will still be random characters printed to the console. +- /source-charset:utf-8 +- /execution-charset:us-ascii ++ #/source-charset:utf-8 ++ #/execution-charset:us-ascii + > + ) + endif() diff --git a/ports/libavif/find-dependency.patch b/ports/libavif/find-dependency.patch deleted file mode 100644 index 4a4e93c0786e36..00000000000000 --- a/ports/libavif/find-dependency.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aca5d6f..48a26c3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -156,7 +156,10 @@ if(AVIF_LOCAL_LIBYUV) - set(libyuv_FOUND TRUE) - message(STATUS "libavif: local libyuv found; libyuv-based fast paths enabled.") - else(AVIF_LOCAL_LIBYUV) -- find_package(libyuv QUIET) # not required -+ find_package(libyuv_config NAMES libyuv CONFIG REQUIRED) -+ set(LIBYUV_INCLUDE_DIR "${libyuv_INCLUDE_DIRS}") -+ set(LIBYUV_LIBRARY "yuv") -+ find_package(libyuv MODULE REQUIRED) - if(libyuv_FOUND) - # libyuv 1755 exposed all of the I*Matrix() functions, which libavif relies on. - # libyuv 1774 exposed ScalePlane_12 function, which libavif can use for some additional optimizations. -@@ -660,7 +663,7 @@ endif() - if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - install( - TARGETS avif -- EXPORT ${PROJECT_NAME}-config -+ EXPORT ${PROJECT_NAME}-targets - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -@@ -668,7 +671,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - - # Enable CMake configs in VCPKG mode - if(BUILD_SHARED_LIBS OR VCPKG_TARGET_TRIPLET) -- install(EXPORT ${PROJECT_NAME}-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) -+ install(EXPORT ${PROJECT_NAME}-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - - include(CMakePackageConfigHelpers) - write_basic_package_version_file( -@@ -677,6 +680,28 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} - ) -+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "@PACKAGE_INIT@\n") -+ if(NOT BUILD_SHARED_LIBS) -+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in " -+ include(CMakeFindDependencyMacro) -+ find_dependency(libyuv CONFIG) -+ set(THREADS_PREFER_PTHREAD_FLAG ON) -+ find_dependency(Threads) -+ ") -+ endif() -+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in "include(\${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}-targets.cmake)") -+ -+ # Install CMake configuration export file. -+ configure_package_config_file( -+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake.in -+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO -+ ) -+ install( -+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ ) - endif() - - # Handle both relative and absolute paths (e.g. NixOS) for a relocatable package diff --git a/ports/libavif/portfile.cmake b/ports/libavif/portfile.cmake index 3129b86ab07ac0..1cfdc16ba25494 100644 --- a/ports/libavif/portfile.cmake +++ b/ports/libavif/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AOMediaCodec/libavif REF "v${VERSION}" - SHA512 37f0de757180c6414778e688006940395960b316c25192d6beb97a07942aff4bd3b712dec2eff52cd26f5d72c352731442175dfeb90e2e1381133539760142b0 + SHA512 ba72b8d02b098f361643a073361fccafd22eaac14e46dd06378d5e7acd9853538c5d166473e1de0b020de62dac25be83e42bd57ba51f675d11e2ddf155fbfa21 HEAD_REF master PATCHES disable-source-utf8.patch - find-dependency.patch # from https://github.com/AOMediaCodec/libavif/pull/1339 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -19,6 +18,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DAVIF_BUILD_APPS=OFF + -DAVIF_BUILD_TESTS=OFF -DCMAKE_DISABLE_FIND_PACKAGE_libsharpyuv=ON ${FEATURE_OPTIONS} ) diff --git a/ports/libavif/vcpkg.json b/ports/libavif/vcpkg.json index 6dda17fd5416fe..78312d7ac24130 100644 --- a/ports/libavif/vcpkg.json +++ b/ports/libavif/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libavif", - "version-semver": "1.0.4", - "port-version": 2, + "version-semver": "1.1.1", "description": "Library for encoding and decoding AVIF files", "homepage": "https://github.com/AOMediaCodec/libavif", "license": "BSD-2-Clause AND Apache-2.0", diff --git a/ports/libedit/portfile.cmake b/ports/libedit/portfile.cmake new file mode 100644 index 00000000000000..c6fa61aa347bbb --- /dev/null +++ b/ports/libedit/portfile.cmake @@ -0,0 +1,37 @@ +message( +"libedit currently requires the following programs from the system package manager: + autoconf autoheader aclocal automake libtoolize +On Debian and Ubuntu derivatives: + sudo apt install autoconf libtool +On recent Red Hat and Fedora derivatives: + sudo dnf install autoconf libtool +On Arch Linux and derivatives: + sudo pacman -S autoconf automake libtool +On Alpine: + apk add autoconf automake libtool" +) + +string(REPLACE "-" "" REF_SHORT_VERSION_DATE ${VERSION}) +vcpkg_download_distfile(ARCHIVE + URLS "https://thrysoee.dk/editline/libedit-${REF_SHORT_VERSION_DATE}-3.1.tar.gz" + FILENAME "libedit-${REF_SHORT_VERSION_DATE}-3.1.tar.gz" + SHA512 b11d64947f9484bb2320b0fbcfdc94466993af1dfa0d853853b73c222e95d6c1e78d88d0c305929b95bf7a85009129475c9fef0ac8595b43d75543d85052a4ff +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) +vcpkg_install_make() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libedit/vcpkg.json b/ports/libedit/vcpkg.json new file mode 100644 index 00000000000000..f5133042710fa6 --- /dev/null +++ b/ports/libedit/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libedit", + "version-date": "2024-08-08", + "description": "A command line editor library that provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline.", + "homepage": "https://thrysoee.dk/editline/", + "license": "BSD-4-Clause-UC", + "supports": "(!windows | mingw) & !android" +} diff --git a/ports/libmupdf/dont-generate-extract-3rd-party-things.patch b/ports/libmupdf/dont-generate-extract-3rd-party-things.patch index ec3cb4f890ad63..6ce589aa4ac825 100644 --- a/ports/libmupdf/dont-generate-extract-3rd-party-things.patch +++ b/ports/libmupdf/dont-generate-extract-3rd-party-things.patch @@ -1,6 +1,8 @@ +diff --git a/Makethird b/Makethird +index f9c7896..63799b1 100644 --- a/Makethird +++ b/Makethird -@@ -238,6 +238,7 @@ endif +@@ -253,6 +253,7 @@ endif # --- EXTRACT --- @@ -8,9 +10,11 @@ THIRD_CFLAGS += $(EXTRACT_CFLAGS) THIRD_LIBS += $(EXTRACT_LIBS) THIRD_SRC += $(EXTRACT_SRC) -@@ -268,3 +269,4 @@ thirdparty/extract/src/odt_template.c: thirdparty/extract/src/template.odt third - @touch $@ +@@ -283,6 +284,7 @@ thirdparty/extract/src/odt_template.c: thirdparty/extract/src/template.odt third + @touch $@ generate: thirdparty/extract/src/docx_template.c +endif - + + # --- LIBARCHIVE --- + diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index c64416a73f5541..4e176d724cac17 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArtifexSoftware/mupdf REF "${VERSION}" - SHA512 248340d2cde5d97b4ccfabbdf5e8f2080dba6233031fa384dcfdb98022ecfd7d7feebe38b19f9b94c2768bfef41c361417c73240ea7f8a458c6b9ea9cfedf665 + SHA512 b3a3e9ba000d920641647b936c01bf88d6df4f3cd5635240fc50402e7ed1663015deb5de09f51c698181cb33ea4c76441a5bdbace81d6e472275afd02d0f84d7 HEAD_REF master PATCHES dont-generate-extract-3rd-party-things.patch @@ -23,7 +23,7 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_EXAMPLES=OFF - ${FEATURE_OPTIONS} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -32,4 +32,4 @@ file(COPY "${SOURCE_PATH}/include/mupdf" DESTINATION "${CURRENT_PACKAGES_DIR}/in vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libmupdf/vcpkg.json b/ports/libmupdf/vcpkg.json index 57ae70035ba330..0f9af2d1cb5b81 100644 --- a/ports/libmupdf/vcpkg.json +++ b/ports/libmupdf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmupdf", - "version": "1.23.11", + "version": "1.24.10", "description": "a lightweight PDF, XPS, and E-book library", "homepage": "https://github.com/ArtifexSoftware/mupdf", "license": "AGPL-3.0-only", diff --git a/ports/libnick/portfile.cmake b/ports/libnick/portfile.cmake index ead5cf2d9a69f7..c61ec841fa24a0 100644 --- a/ports/libnick/portfile.cmake +++ b/ports/libnick/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NickvisionApps/libnick REF "${VERSION}" - SHA512 ae8ab0423fa6cebdad88b8c85aedba308aef0c2a77753943f854d168975b4807c851d50aa4dad8359dcfd7c8b57bb3869269a7a80202f35758272831819f3c3d + SHA512 b8b6fc636842b8731d423b97a3aee45a18aba58a56d1475e1e7a3b5614b2f5f99a9fd11a8520451ec2331f2fc4bfb616be615b87fcee0df445efc8bb665790ce HEAD_REF main ) diff --git a/ports/libnick/vcpkg.json b/ports/libnick/vcpkg.json index a70a51a2afcf51..76ebca82b90765 100644 --- a/ports/libnick/vcpkg.json +++ b/ports/libnick/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libnick", - "version": "2024.9.2", + "version": "2024.10.0", "maintainers": "Nicholas Logozzo nlogozzo225@gmail.com", "description": "A cross-platform base for native Nickvision applications.", "homepage": "https://github.com/NickvisionApps/libnick", diff --git a/ports/librtpi/condition_variable-fix-wait_until-predicate-evaluation.patch b/ports/librtpi/condition_variable-fix-wait_until-predicate-evaluation.patch new file mode 100644 index 00000000000000..77e20feef611ed --- /dev/null +++ b/ports/librtpi/condition_variable-fix-wait_until-predicate-evaluation.patch @@ -0,0 +1,26 @@ +From 75409d8ec67146e0c245316cb564aed5ffda5041 Mon Sep 17 00:00:00 2001 +From: Ryan Zoeller +Date: Fri, 30 Aug 2024 10:51:27 -0500 +Subject: [PATCH] condition_variable: fix wait_until predicate evaluation + +Signed-off-by: Ryan Zoeller +--- + src/rtpi/condition_variable.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/rtpi/condition_variable.hpp b/src/rtpi/condition_variable.hpp +index 9041ab7..6fd82d8 100644 +--- a/src/rtpi/condition_variable.hpp ++++ b/src/rtpi/condition_variable.hpp +@@ -185,7 +185,7 @@ class condition_variable { + const std::chrono::time_point &timeout_time, + Predicate stop_waiting) + { +- while (!stop_waiting) { ++ while (!stop_waiting()) { + if (wait_until(lock, timeout_time) == + cv_status::timeout) + return stop_waiting(); +-- +2.43.5 + diff --git a/ports/librtpi/portfile.cmake b/ports/librtpi/portfile.cmake new file mode 100644 index 00000000000000..e405109330e9c4 --- /dev/null +++ b/ports/librtpi/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_gitlab( + OUT_SOURCE_PATH SOURCE_PATH + GITLAB_URL https://gitlab.com + REPO linux-rt/librtpi + REF "${VERSION}" + SHA512 fb0cdd14f3c94f610fc153154ea09d5cfd7d3def16bdaabf8c2b4e0a8b7fa8ddec4cde6ae0b8726d58ee4a773df5c4f13002e565fb06ad3c8e9731a45122704f + HEAD_REF main + PATCHES + condition_variable-fix-wait_until-predicate-evaluation.patch +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(INSTALL "${CURRENT_PORT_DIR}/unofficial-${PORT}-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") diff --git a/ports/librtpi/unofficial-librtpi-config.cmake b/ports/librtpi/unofficial-librtpi-config.cmake new file mode 100644 index 00000000000000..49f4832da2e526 --- /dev/null +++ b/ports/librtpi/unofficial-librtpi-config.cmake @@ -0,0 +1,25 @@ +if(NOT TARGET unofficial::librtpi::librtpi) + get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + + add_library(unofficial::librtpi::librtpi UNKNOWN IMPORTED) + + set_target_properties(unofficial::librtpi::librtpi PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + ) + + find_library(LIBRTPI_LIBRARY_DEBUG NAMES rtpi librtpi PATHS "${_IMPORT_PREFIX}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(EXISTS "${LIBRTPI_LIBRARY_DEBUG}") + set_property(TARGET unofficial::librtpi::librtpi APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(unofficial::librtpi::librtpi PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBRTPI_LIBRARY_DEBUG}") + endif() + + find_library(LIBRTPI_LIBRARY_RELEASE NAMES rtpi librtpi PATHS "${_IMPORT_PREFIX}/" PATH_SUFFIXES lib NO_DEFAULT_PATH) + if(EXISTS "${LIBRTPI_LIBRARY_RELEASE}") + set_property(TARGET unofficial::librtpi::librtpi APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(unofficial::librtpi::librtpi PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBRTPI_LIBRARY_RELEASE}") + endif() + + unset(_IMPORT_PREFIX) +endif() diff --git a/ports/librtpi/vcpkg.json b/ports/librtpi/vcpkg.json new file mode 100644 index 00000000000000..8735bc25e97da0 --- /dev/null +++ b/ports/librtpi/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "librtpi", + "version": "1.0.0", + "port-version": 1, + "description": "The Real-Time Priority Inheritance Library (librtpi) is intended to bridge the gap between the glibc pthread implementation and a functionally correct priority inheritance for pthread locking primitives, such as pthread_mutex and pthread_condvar.", + "homepage": "https://gitlab.com/linux-rt/librtpi", + "license": "LGPL-2.1-only", + "supports": "linux" +} diff --git a/ports/libtorch/cmake-fixes.patch b/ports/libtorch/cmake-fixes.patch index 69fa3b986f919d..8d618714ef1128 100644 --- a/ports/libtorch/cmake-fixes.patch +++ b/ports/libtorch/cmake-fixes.patch @@ -40,7 +40,7 @@ index feebad7..ad407e1 100644 if(ANDROID) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index c3abce5..cfaf83e 100644 +index c3abce5..63f665f 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -285,7 +285,7 @@ endif() @@ -113,18 +113,36 @@ index c3abce5..cfaf83e 100644 endif() list(APPEND Caffe2_DEPENDENCY_LIBS fp16) -@@ -1244,8 +1247,8 @@ endif(USE_LLVM) +@@ -1127,7 +1130,7 @@ if(BUILD_PYTHON) + # Observers are required in the python build + caffe2_update_option(USE_OBSERVERS ON) + else() +- message(WARNING "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF") ++ message(FATAL_ERROR "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF") + caffe2_update_option(BUILD_PYTHON OFF) + endif() + endif() +@@ -1231,7 +1234,7 @@ endif() + # ---[ LLVM + if(USE_LLVM) + message(STATUS "Looking for LLVM in ${USE_LLVM}") +- find_package(LLVM PATHS ${USE_LLVM} NO_DEFAULT_PATH) ++ find_package(LLVM) + + if(LLVM_FOUND) + message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") +@@ -1244,8 +1247,10 @@ endif(USE_LLVM) # ---[ cuDNN if(USE_CUDNN) -- set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include) -- target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR}) + find_package(CUDNN REQUIRED) + set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include) + target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR}) + target_include_directories(torch::cudnn INTERFACE "${CUDNN_INCLUDE_DIR}") endif() # ---[ HIP -@@ -1555,7 +1558,10 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) +@@ -1555,7 +1560,10 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17) endif() endif() @@ -136,27 +154,28 @@ index c3abce5..cfaf83e 100644 add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) if(NOT USE_SYSTEM_ONNX) -@@ -1573,14 +1579,14 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) +@@ -1573,23 +1581,13 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) target_compile_options(onnx PRIVATE -Wno-deprecated-declarations) endif() else() - add_library(onnx SHARED IMPORTED) - find_library(ONNX_LIBRARY onnx) -+ add_library(onnx UNKNOWN IMPORTED) -+ find_library(ONNX_LIBRARY NAMES onnx REQUIRED) - if(NOT ONNX_LIBRARY) - message(FATAL_ERROR "Cannot find onnx") - endif() - set_property(TARGET onnx PROPERTY IMPORTED_LOCATION ${ONNX_LIBRARY}) +- if(NOT ONNX_LIBRARY) +- message(FATAL_ERROR "Cannot find onnx") +- endif() +- set_property(TARGET onnx PROPERTY IMPORTED_LOCATION ${ONNX_LIBRARY}) - add_library(onnx_proto SHARED IMPORTED) - find_library(ONNX_PROTO_LIBRARY onnx_proto) -+ add_library(onnx_proto UNKNOWN IMPORTED) -+ find_library(ONNX_PROTO_LIBRARY NAMES onnx_proto REQUIRED) - if(NOT ONNX_PROTO_LIBRARY) - message(FATAL_ERROR "Cannot find onnx") - endif() -@@ -1589,7 +1595,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) - list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx) +- if(NOT ONNX_PROTO_LIBRARY) +- message(FATAL_ERROR "Cannot find onnx") +- endif() +- set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY}) +- message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}") +- list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx) ++ find_package(ONNX CONFIG REQUIRED) ++ set(ONNX_LIBRARY ONNX::onnx) ++ set(ONNX_PROTO_LIBRARY ONNX::onnx_proto) ++ list(APPEND Caffe2_DEPENDENCY_LIBS ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}) endif() include_directories(${FOXI_INCLUDE_DIRS}) - list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader) @@ -164,7 +183,7 @@ index c3abce5..cfaf83e 100644 # Recover the build shared libs option. set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS}) endif() -@@ -1834,8 +1840,8 @@ endif() +@@ -1834,8 +1832,8 @@ endif() # set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) @@ -175,7 +194,7 @@ index c3abce5..cfaf83e 100644 # Disable compiler feature checks for `fmt`. # # CMake compiles a little program to check compiler features. Some of our build -@@ -1843,7 +1849,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) +@@ -1843,7 +1841,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know # `fmt` is compatible with a superset of the compilers that PyTorch is, it # shouldn't be too bad to just disable the checks. diff --git a/ports/libtorch/fix-build.patch b/ports/libtorch/fix-build.patch index c29ccb8e9f3994..d2bf943e79fe70 100644 --- a/ports/libtorch/fix-build.patch +++ b/ports/libtorch/fix-build.patch @@ -29,34 +29,6 @@ index ecbc7c1..2dd1001 100644 namespace c10 { /// The primary ATen error class. -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index b46a444..255d7f4 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -1581,19 +1581,10 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) - target_compile_options(onnx PRIVATE -Wno-deprecated-declarations) - endif() - else() -- add_library(onnx UNKNOWN IMPORTED) -- find_library(ONNX_LIBRARY NAMES onnx REQUIRED) -- if(NOT ONNX_LIBRARY) -- message(FATAL_ERROR "Cannot find onnx") -- endif() -- set_property(TARGET onnx PROPERTY IMPORTED_LOCATION ${ONNX_LIBRARY}) -- add_library(onnx_proto UNKNOWN IMPORTED) -- find_library(ONNX_PROTO_LIBRARY NAMES onnx_proto REQUIRED) -- if(NOT ONNX_PROTO_LIBRARY) -- message(FATAL_ERROR "Cannot find onnx") -- endif() -- set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY}) -- message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}") -+ find_package(ONNX REQUIRED) -+ set(ONNX_LIBRARY onnx) -+ set(ONNX_PROTO_LIBRARY onnx_proto) -+ message("-- Found onnx") - list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx) - endif() - include_directories(${FOXI_INCLUDE_DIRS}) diff --git a/pyproject.toml b/pyproject.toml index eb764cb..c70f317 100644 --- a/pyproject.toml diff --git a/ports/libtorch/more-fixes.patch b/ports/libtorch/more-fixes.patch index a2d721025b9788..84400781f71e14 100644 --- a/ports/libtorch/more-fixes.patch +++ b/ports/libtorch/more-fixes.patch @@ -164,37 +164,6 @@ index 74d0d55..cf349c2 100644 endif() # ---[ Caffe2 HIP sources. -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index cfaf83e..b46a444 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -1130,7 +1130,7 @@ if(BUILD_PYTHON) - # Observers are required in the python build - caffe2_update_option(USE_OBSERVERS ON) - else() -- message(WARNING "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF") -+ message(FATAL_ERROR "Python dependencies not met. Not compiling with python. Suppress this warning with -DBUILD_PYTHON=OFF") - caffe2_update_option(BUILD_PYTHON OFF) - endif() - endif() -@@ -1234,7 +1234,7 @@ endif() - # ---[ LLVM - if(USE_LLVM) - message(STATUS "Looking for LLVM in ${USE_LLVM}") -- find_package(LLVM PATHS ${USE_LLVM} NO_DEFAULT_PATH) -+ find_package(LLVM) - - if(LLVM_FOUND) - message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") -@@ -1248,6 +1248,8 @@ endif(USE_LLVM) - # ---[ cuDNN - if(USE_CUDNN) - find_package(CUDNN REQUIRED) -+ set(CUDNN_FRONTEND_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/cudnn_frontend/include) -+ target_include_directories(torch::cudnn INTERFACE ${CUDNN_FRONTEND_INCLUDE_DIR}) - target_include_directories(torch::cudnn INTERFACE "${CUDNN_INCLUDE_DIR}") - endif() - diff --git a/cmake/Modules/FindCUSPARSELT.cmake b/cmake/Modules/FindCUSPARSELT.cmake index 8727f44..1e41281 100644 --- a/cmake/Modules/FindCUSPARSELT.cmake diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json index 7f6920cff59eb7..c8c639f2ad4831 100644 --- a/ports/libtorch/vcpkg.json +++ b/ports/libtorch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtorch", "version": "2.1.2", - "port-version": 6, + "port-version": 7, "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration", "homepage": "https://pytorch.org/", "license": null, diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 05f6668ccface9..066802196f9d76 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv REF "v${VERSION}" - SHA512 202a4f8b950ddf38db0d9f645d27c257aa4d65f9c170b9a32f7ee935a60d0cbcb2987561769c04bb42628184c22515df5b992b3ae1146f45632d51782b959a62 + SHA512 aaaff8a609f8d8e40ce863f05b443d73ea85c5cda2756e8d05db9b31bf704573ed8788319fed195874fb5e20f4aa947e6af8a78f8284d6719b9fc791d03c7a6e HEAD_REF v1.x PATCHES fix-build-type.patch diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index d2aced41912787..ae58dfbcb4d945 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libuv", - "version-semver": "1.49.0", + "version-semver": "1.49.1", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "license": "BSD-3-Clause", diff --git a/ports/mapbox-polylabel/portfile.cmake b/ports/mapbox-polylabel/portfile.cmake index 8a981e3af536b9..c371022cf8035f 100644 --- a/ports/mapbox-polylabel/portfile.cmake +++ b/ports/mapbox-polylabel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/polylabel - REF v1.1.0 - SHA512 597920397969a1ae12fc2ad2bdd8143f32f6fa0b27b46a5fb6d7315b8456bbcb335e52c36277b50e3daa4658a0f3826863871df4f4a7868e923899af5832f783 + REF "v${VERSION}" + SHA512 e739b0f9c293fd1fd50de56be0804b638ad4ca5ca2c6ee6272907cffc99e133f183f62dd75ca415983ebf9a03da07910b2fa5e8d18b606a6faf7b14baa930622 HEAD_REF master ) diff --git a/ports/mapbox-polylabel/vcpkg.json b/ports/mapbox-polylabel/vcpkg.json index 6b58ad14926f08..59e6722833ff30 100644 --- a/ports/mapbox-polylabel/vcpkg.json +++ b/ports/mapbox-polylabel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mapbox-polylabel", - "version-semver": "1.1.0", + "version-semver": "2.0.1", "description": "A fast algorithm for finding the pole of inaccessibility of a polygon (in JavaScript and C++)", "homepage": "https://github.com/mapbox/polylabel", "license": "ISC", diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index 97682a0dc07c1a..28cffcd4d15eb1 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mlpack/mlpack REF "${VERSION}" - SHA512 2ae159a4aa8340be4763944c1b1e460f4d8fe838c79325cffdcacfbac340cca4cec3031493caec7e9b4dcf6fc921cbd93c1384d7e1954492fe410c83d3e615f8 + SHA512 fd1612a2689e7e54bcbebb0b9da7d20aa6fe2fce395d544d476136d8de7f63a638bbbbab1bc2d00991649bcdf66ee6493ffdeed28c42121f98c82ee208c35947 HEAD_REF master ) diff --git a/ports/mlpack/vcpkg.json b/ports/mlpack/vcpkg.json index e79aed2f8fbfec..dc3a5470d941fc 100644 --- a/ports/mlpack/vcpkg.json +++ b/ports/mlpack/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mlpack", - "version": "4.4.0", + "version": "4.5.0", "description": "mlpack is an intuitive, fast, and flexible header-only C++ machine learning library with bindings to other languages.", "homepage": "https://github.com/mlpack/mlpack", "license": "BSD-3-Clause", diff --git a/ports/msgpack-c/portfile.cmake b/ports/msgpack-c/portfile.cmake index 67ff6374b9f765..e7e1830bcc79fc 100644 --- a/ports/msgpack-c/portfile.cmake +++ b/ports/msgpack-c/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO msgpack/msgpack-c - REF c-6.0.0 - SHA512 ba7d1b649dd1318f99d45ba5fd44346e53924ba7a121104a080c3865e8c01db3842efa1dc9e01478b962274675ba4632d9daaeb163821d46531b30d6abcda161 + REF "c-${VERSION}" + SHA512 b211af122e894bc0c32fa02ebcc0130ac797d99b7c60688df26247bc020d51b7322b4858fd12a749d28812c5efb66b5dc687cdfe20f4bc68a21eb484d531230a HEAD_REF c_master ) diff --git a/ports/msgpack-c/vcpkg.json b/ports/msgpack-c/vcpkg.json index 694914041a06b9..79b8bbda25a306 100644 --- a/ports/msgpack-c/vcpkg.json +++ b/ports/msgpack-c/vcpkg.json @@ -1,6 +1,6 @@ { "name": "msgpack-c", - "version": "6.0.0", + "version": "6.1.0", "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.", "homepage": "https://github.com/msgpack/msgpack-c", "license": "BSL-1.0", diff --git a/ports/mujs/portfile.cmake b/ports/mujs/portfile.cmake index 4cdb2e24fc348a..1411803034148f 100644 --- a/ports/mujs/portfile.cmake +++ b/ports/mujs/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ccxvii/mujs REF "${VERSION}" - SHA512 0806684be5e6dc3cb7305355ab7c7babbfd3fd5bbd22515659a88a82c25f3f4b6af14f7ca07bacd154823b19110b749bba68311c9f317dd684e0fd5628ece573 + SHA512 9ebe0d2926d2621110cb67e701c1cdd87883703d58c49dc08e366b20c93dbdbc2f56e59b710999373bd8aaaee75b2d35adb1dad6929795684a8fff6483d9df25 HEAD_REF master ) diff --git a/ports/mujs/vcpkg.json b/ports/mujs/vcpkg.json index 609b98ddbbfb90..669667252c903b 100644 --- a/ports/mujs/vcpkg.json +++ b/ports/mujs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mujs", - "version": "1.3.4", + "version": "1.3.5", "description": "An embeddable Javascript interpreter in C", "homepage": "https://github.com/ccxvii/mujs", "license": "ISC", diff --git a/ports/mvfst/fix-cmake.patch b/ports/mvfst/fix-cmake.patch new file mode 100644 index 00000000000000..4828d189b3c7a0 --- /dev/null +++ b/ports/mvfst/fix-cmake.patch @@ -0,0 +1,25 @@ +diff --git a/quic/api/CMakeLists.txt b/quic/api/CMakeLists.txt +index 5522347c5..a0a34761e 100644 +--- a/quic/api/CMakeLists.txt ++++ b/quic/api/CMakeLists.txt +@@ -47,6 +47,7 @@ add_library( + QuicPacketScheduler.cpp + QuicStreamAsyncTransport.cpp + QuicTransportBase.cpp ++ QuicTransportBaseLite.cpp + QuicTransportFunctions.cpp + ) + + +diff --git a/quic/state/CMakeLists.txt b/quic/state/CMakeLists.txt +index 0916546fe..14297bb30 100644 +--- a/quic/state/CMakeLists.txt ++++ b/quic/state/CMakeLists.txt +@@ -55,6 +55,7 @@ add_library( + mvfst_state_ack_handler + AckEvent.cpp + AckHandlers.cpp ++ AckedPacketIterator.cpp + ) + + set_property(TARGET mvfst_state_ack_handler PROPERTY VERSION ${PACKAGE_VERSION}) diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index cb9c96c260575e..e9b6374bc77d05 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -2,8 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/mvfst REF "v${VERSION}" - SHA512 42d3216221d9008c9a10cfcbe3ce6f738e9f96c1c3374a8a379673a26d48367ae65056454c2057928b17103687ddec50e1d06fb641b97942682f0c5eb50e5f54 + SHA512 8ec9e7daf1c259f31e90eaa32cfa29d377e279f93c2072528447455f4f8ea897ab17f2759222a2ea9a73fdafe96b7d8223cf1efbadad2e8ea180b23832090aa7 HEAD_REF main + PATCHES fix-cmake.patch ) vcpkg_cmake_configure( diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index ff8e8b683c573b..b3257e9b170ee7 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2024.09.30.00", + "version-string": "2024.10.07.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/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index a1c3a0dae0c400..992038f8751001 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 REF "v${VERSION}" - SHA512 debb43ad331c1a1e8a1591e9aab21a0e5f7a03372a845ee67f32307863aed5acf9d87feb4ca037158452c7482b59ce3e2a113992d5d696c8bfd7131bb02b38b1 + SHA512 e5d72bda4504df4ff7b000d50b2c7d6517c512e444d9ac79e96dd142a00b5008d31503b3a3cbaeca9d7e725b015fde3b619c562a87ac4fac11b141263abc7556 HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index b8bfd5471e4b4c..67ff9be00f5f80 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.62.1", + "version": "1.63.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "license": "MIT", diff --git a/ports/nlopt/portfile.cmake b/ports/nlopt/portfile.cmake index 053d52bff6a674..28cf33a553ae90 100644 --- a/ports/nlopt/portfile.cmake +++ b/ports/nlopt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevengj/nlopt - REF v2.7.1 - SHA512 e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2 + REF "v${VERSION}" + SHA512 cb294caa5532e11ae0d22ed849705920bbae79f712144c840a5ca865ef8e6a15c6c9540c81ced0c3c05b9f44c360d50f74e235e69d893be34b7e1c5599f07c71 HEAD_REF master ) diff --git a/ports/nlopt/vcpkg.json b/ports/nlopt/vcpkg.json index 09155bad71c683..65eee0cd1dfd51 100644 --- a/ports/nlopt/vcpkg.json +++ b/ports/nlopt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nlopt", - "version": "2.7.1", - "port-version": 1, + "version": "2.8.0", "description": "Library for nonlinear local and global optimization, for functions with and without gradient information.", "homepage": "https://github.com/stevengj/nlopt", "dependencies": [ diff --git a/ports/nmap/fix-msvc-prj.patch b/ports/nmap/fix-msvc-prj.patch deleted file mode 100644 index 25893f13793580..00000000000000 --- a/ports/nmap/fix-msvc-prj.patch +++ /dev/null @@ -1,1986 +0,0 @@ -diff --git a/libdnet-stripped/libdnet-stripped.vcxproj b/libdnet-stripped/libdnet-stripped.vcxproj -index 1f2b760..1756c5c 100644 ---- a/libdnet-stripped/libdnet-stripped.vcxproj -+++ b/libdnet-stripped/libdnet-stripped.vcxproj -@@ -5,10 +5,18 @@ - Debug - Win32 - -+ -+ Debug -+ x64 -+ - - Release - Win32 - -+ -+ Release -+ x64 -+ - - - libdnet-stripped -@@ -22,11 +30,21 @@ - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - StaticLibrary - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - - -@@ -34,10 +52,18 @@ - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - <_ProjectFileVersion>10.0.30319.1 -@@ -64,6 +90,23 @@ - $(OutDir)libdnet-stripped.lib - - -+ -+ -+ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -+ Disabled -+ include;..\mswin32\pcap-include;%(AdditionalIncludeDirectories) -+ WIN32;_LIB;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ -+ -+ Level3 -+ ProgramDatabase -+ -+ -+ $(OutDir)libdnet-stripped.lib -+ -+ - - - /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -@@ -78,6 +121,20 @@ - $(OutDir)libdnet-stripped.lib - - -+ -+ -+ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -+ include;..\mswin32\pcap-include;%(AdditionalIncludeDirectories) -+ WIN32;_LIB;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) -+ -+ -+ Level3 -+ ProgramDatabase -+ -+ -+ $(OutDir)libdnet-stripped.lib -+ -+ - - - -diff --git a/liblinear/liblinear.vcxproj b/liblinear/liblinear.vcxproj -index cf99e3d..ac5ff7c 100644 ---- a/liblinear/liblinear.vcxproj -+++ b/liblinear/liblinear.vcxproj -@@ -5,10 +5,18 @@ - Debug - Win32 - -+ -+ Debug -+ x64 -+ - - Release - Win32 - -+ -+ Release -+ x64 -+ - - - -@@ -36,6 +44,12 @@ - Unicode - v120 - -+ -+ StaticLibrary -+ true -+ Unicode -+ v120 -+ - - StaticLibrary - false -@@ -43,19 +57,33 @@ - Unicode - v120 - -+ -+ StaticLibrary -+ false -+ true -+ Unicode -+ v120 -+ - - - - - - -+ -+ -+ - - - -+ -+ -+ - - - .\ - -+ - - .\ - -@@ -75,6 +103,21 @@ - true - - -+ -+ -+ -+ -+ Level3 -+ Disabled -+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) -+ MultiThreadedDebugDLL -+ /D_CRT_SECURE_NO_WARNINGS=1 %(AdditionalOptions) -+ -+ -+ Windows -+ true -+ -+ - - - Level3 -@@ -93,6 +136,24 @@ - true - - -+ -+ -+ Level3 -+ -+ -+ MaxSpeed -+ true -+ true -+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) -+ /D_CRT_SECURE_NO_WARNINGS=1 %(AdditionalOptions) -+ -+ -+ Windows -+ true -+ true -+ true -+ -+ - - - -diff --git a/liblua/liblua.vcxproj b/liblua/liblua.vcxproj -index 8e80221..db6b1ea 100644 ---- a/liblua/liblua.vcxproj -+++ b/liblua/liblua.vcxproj -@@ -5,10 +5,18 @@ - Debug - Win32 - -+ -+ Debug -+ x64 -+ - - Release - Win32 - -+ -+ Release -+ x64 -+ - - - {31FB0767-A71F-4575-8379-002D72B8AF86} -@@ -22,20 +30,37 @@ - true - v120 - -+ -+ StaticLibrary -+ NotSet -+ true -+ v120 -+ - - StaticLibrary - NotSet - v120 - -+ -+ StaticLibrary -+ NotSet -+ v120 -+ - - - - - - -+ -+ -+ - - - -+ -+ -+ - - - <_ProjectFileVersion>10.0.30319.1 -@@ -68,6 +93,29 @@ - $(OutDir)liblua.lib - - -+ -+ -+ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -+ Disabled -+ WIN32;_LIB;%(PreprocessorDefinitions) -+ -+ -+ Default -+ MultiThreadedDebugDLL -+ false -+ false -+ false -+ -+ -+ Level3 -+ ProgramDatabase -+ Cdecl -+ CompileAsC -+ -+ -+ $(OutDir)liblua.lib -+ -+ - - - /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -@@ -91,6 +139,29 @@ - $(OutDir)liblua.lib - - -+ -+ -+ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -+ false -+ WIN32;_LIB;%(PreprocessorDefinitions) -+ false -+ -+ -+ Default -+ false -+ false -+ false -+ -+ -+ Level3 -+ -+ -+ CompileAsC -+ -+ -+ $(OutDir)liblua.lib -+ -+ - - - -diff --git a/libnetutil/libnetutil.vcxproj b/libnetutil/libnetutil.vcxproj -index 8f4fbb5..00cc7c2 100644 ---- a/libnetutil/libnetutil.vcxproj -+++ b/libnetutil/libnetutil.vcxproj -@@ -5,10 +5,18 @@ - Debug - Win32 - -+ -+ Debug -+ x64 -+ - - Release - Win32 - -+ -+ Release -+ x64 -+ - - - {99157C3F-39F6-4663-99D7-1D9C1484494E} -@@ -22,20 +30,37 @@ - true - v120 - -+ -+ StaticLibrary -+ Unicode -+ true -+ v120 -+ - - StaticLibrary - Unicode - v120 - -+ -+ StaticLibrary -+ Unicode -+ v120 -+ - - - - - - -+ -+ -+ - - - -+ -+ -+ - - - <_ProjectFileVersion>10.0.30319.1 -@@ -61,6 +86,22 @@ - $(OutDir)libnetutil.lib - - -+ -+ -+ Disabled -+ ..;../mswin32;../nbase;../mswin32/pcap-include;../libdnet-stripped/include;%(AdditionalIncludeDirectories) -+ WIN32;BPF_MAJOR_VERSION;_DEBUG;_LIB;%(PreprocessorDefinitions) -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ -+ -+ Level3 -+ ProgramDatabase -+ -+ -+ $(OutDir)libnetutil.lib -+ -+ - - - MaxSpeed -@@ -74,6 +115,19 @@ - ProgramDatabase - - -+ -+ -+ MaxSpeed -+ true -+ ..;../mswin32;../nbase;../mswin32/pcap-include;../libdnet-stripped/include;%(AdditionalIncludeDirectories) -+ WIN32;BPF_MAJOR_VERSION;NDEBUG;_LIB;%(PreprocessorDefinitions) -+ true -+ -+ -+ Level3 -+ ProgramDatabase -+ -+ - - - -diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln -index 3f9fa22..4484bbd 100644 ---- a/mswin32/nmap.sln -+++ b/mswin32/nmap.sln -@@ -5,14 +5,11 @@ MinimumVisualStudioVersion = 10.0.40219.1 - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap", "nmap.vcxproj", "{361719F0-AB42-4C93-9DE8-7D2144B96625}" - ProjectSection(ProjectDependencies) = postProject - {99157C3F-39F6-4663-99D7-1D9C1484494E} = {99157C3F-39F6-4663-99D7-1D9C1484494E} -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D} = {A7BE3D76-F20C-40C5-8986-DE4028B3B57D} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsock", "..\nsock\nsock.vcxproj", "{F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\libpcre\libpcre.vcxproj", "{5DE86C7A-DE72-4265-8807-4CA38F94F22A}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nbase", "..\nbase\nbase.vcxproj", "{B630C8F7-3138-43E8-89ED-78742FA2AC5F}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdnet-stripped", "..\libdnet-stripped\libdnet-stripped.vcxproj", "{5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}" -@@ -27,14 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetutil", "..\libnetutil - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblinear", "..\liblinear\liblinear.vcxproj", "{A7BE3D76-F20C-40C5-8986-DE4028B3B57D}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nmap-update", "..\nmap-update\nmap-update.vcxproj", "{BBF27339-C7B6-4F52-B742-897796C1F13B}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libz", "..\libz\contrib\vstudio\vc11\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh2", "..\libssh2\win32\libssh2.vcxproj", "{ED957342-E43B-496E-92D9-4C76B525BDF5}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "..\libz\contrib\vstudio\vc11\zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" --EndProject - Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 -@@ -49,176 +38,148 @@ Global - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.ActiveCfg = Debug|Win32 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|Win32.Build.0 = Debug|Win32 -- {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|x64.ActiveCfg = Debug|Win32 -+ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|x64.ActiveCfg = Debug|x64 -+ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Debug|x64.Build.0 = Debug|x64 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|Win32.ActiveCfg = Release|Win32 -- {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|x64.ActiveCfg = Release|Win32 -+ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|x64.ActiveCfg = Release|x64 -+ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Ncat Static|x64.Build.0 = Release|x64 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.ActiveCfg = Release|Win32 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|Win32.Build.0 = Release|Win32 -- {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.ActiveCfg = Release|Win32 -+ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.ActiveCfg = Release|x64 -+ {361719F0-AB42-4C93-9DE8-7D2144B96625}.Release|x64.Build.0 = Release|x64 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -+ {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 -+ {361719F0-AB42-4C93-9DE8-7D2144B96625}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|Win32.Build.0 = Debug|Win32 -- {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|x64.ActiveCfg = Debug|Win32 -+ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|x64.ActiveCfg = Debug|x64 -+ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Debug|x64.Build.0 = Debug|x64 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|Win32.ActiveCfg = Static|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|Win32.Build.0 = Static|Win32 -- {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|x64.ActiveCfg = Static|Win32 -+ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|x64.ActiveCfg = Static|x64 -+ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Ncat Static|x64.Build.0 = Static|x64 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.ActiveCfg = Release|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|Win32.Build.0 = Release|Win32 -- {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.ActiveCfg = Release|Win32 -+ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.ActiveCfg = Release|x64 -+ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.Release|x64.Build.0 = Release|x64 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseNoPcap|Win32 - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseNoPcap|Win32 -- {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseNoPcap|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.ActiveCfg = Debug|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|Win32.Build.0 = Debug|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Debug|x64.ActiveCfg = Debug|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Ncat Static|Win32.ActiveCfg = Release|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Ncat Static|x64.ActiveCfg = Release|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.ActiveCfg = Release|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|Win32.Build.0 = Release|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.Release|x64.ActiveCfg = Release|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {5DE86C7A-DE72-4265-8807-4CA38F94F22A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -+ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseNoPcap|x64 -+ {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4}.ReleaseWithoutAsm|x64.Build.0 = ReleaseNoPcap|x64 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.ActiveCfg = Debug|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|Win32.Build.0 = Debug|Win32 -- {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|x64.ActiveCfg = Debug|Win32 -+ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|x64.ActiveCfg = Debug|x64 -+ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Debug|x64.Build.0 = Debug|x64 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|Win32.ActiveCfg = Static|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|Win32.Build.0 = Static|Win32 -- {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|x64.ActiveCfg = Static|Win32 -+ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|x64.ActiveCfg = Static|x64 -+ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Ncat Static|x64.Build.0 = Static|x64 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.ActiveCfg = Release|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|Win32.Build.0 = Release|Win32 -- {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.ActiveCfg = Release|Win32 -+ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.ActiveCfg = Release|x64 -+ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.Release|x64.Build.0 = Release|x64 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -+ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 -+ {B630C8F7-3138-43E8-89ED-78742FA2AC5F}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.ActiveCfg = Debug|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|Win32.Build.0 = Debug|Win32 -- {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|x64.ActiveCfg = Debug|Win32 -+ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|x64.ActiveCfg = Debug|x64 -+ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Debug|x64.Build.0 = Debug|x64 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|Win32.ActiveCfg = Release|Win32 -- {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|x64.ActiveCfg = Release|Win32 -+ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|x64.ActiveCfg = Release|x64 -+ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Ncat Static|x64.Build.0 = Release|x64 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.ActiveCfg = Release|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|Win32.Build.0 = Release|Win32 -- {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.ActiveCfg = Release|Win32 -+ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.ActiveCfg = Release|x64 -+ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.Release|x64.Build.0 = Release|x64 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -+ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 -+ {5328E0BE-BC0A-4C2A-8CB9-CE00B61B9C4C}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 - {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|Win32.ActiveCfg = Debug|Win32 - {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|Win32.Build.0 = Debug|Win32 -- {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|x64.ActiveCfg = Debug|Win32 -+ {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|x64.ActiveCfg = Debug|x64 -+ {31FB0767-A71F-4575-8379-002D72B8AF86}.Debug|x64.Build.0 = Debug|x64 - {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|Win32.ActiveCfg = Release|Win32 -- {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|x64.ActiveCfg = Release|Win32 -+ {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|x64.ActiveCfg = Release|x64 -+ {31FB0767-A71F-4575-8379-002D72B8AF86}.Ncat Static|x64.Build.0 = Release|x64 - {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.ActiveCfg = Release|Win32 - {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|Win32.Build.0 = Release|Win32 -- {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.ActiveCfg = Release|Win32 -+ {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.ActiveCfg = Release|x64 -+ {31FB0767-A71F-4575-8379-002D72B8AF86}.Release|x64.Build.0 = Release|x64 - {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -+ {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 -+ {31FB0767-A71F-4575-8379-002D72B8AF86}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 - {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|Win32.ActiveCfg = Debug|Win32 - {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|Win32.Build.0 = Debug|Win32 -- {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|x64.ActiveCfg = Debug|Win32 -+ {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|x64.ActiveCfg = Debug|x64 -+ {C1E04411-E021-468B-83F1-CB624BBA7589}.Debug|x64.Build.0 = Debug|x64 - {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|Win32.ActiveCfg = Static|Win32 - {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|Win32.Build.0 = Static|Win32 -- {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|x64.ActiveCfg = Static|Win32 -+ {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|x64.ActiveCfg = Static|x64 -+ {C1E04411-E021-468B-83F1-CB624BBA7589}.Ncat Static|x64.Build.0 = Static|x64 - {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.ActiveCfg = Release|Win32 - {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|Win32.Build.0 = Release|Win32 -- {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.ActiveCfg = Release|Win32 -+ {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.ActiveCfg = Release|x64 -+ {C1E04411-E021-468B-83F1-CB624BBA7589}.Release|x64.Build.0 = Release|x64 - {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -+ {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 -+ {C1E04411-E021-468B-83F1-CB624BBA7589}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|Win32.ActiveCfg = Debug|Win32 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|Win32.Build.0 = Debug|Win32 -- {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|x64.ActiveCfg = Debug|Win32 -+ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|x64.ActiveCfg = Debug|x64 -+ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Debug|x64.Build.0 = Debug|x64 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|Win32.ActiveCfg = Release|Win32 -- {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|x64.ActiveCfg = Release|Win32 -+ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|x64.ActiveCfg = Release|x64 -+ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Ncat Static|x64.Build.0 = Release|x64 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.ActiveCfg = Release|Win32 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|Win32.Build.0 = Release|Win32 -- {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.ActiveCfg = Release|Win32 -+ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.ActiveCfg = Release|x64 -+ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.Release|x64.Build.0 = Release|x64 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -+ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 -+ {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|Win32.ActiveCfg = Debug|Win32 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|Win32.Build.0 = Debug|Win32 -- {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|x64.ActiveCfg = Debug|Win32 -+ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|x64.ActiveCfg = Debug|x64 -+ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Debug|x64.Build.0 = Debug|x64 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|Win32.ActiveCfg = Release|Win32 -- {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|x64.ActiveCfg = Release|Win32 -+ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|x64.ActiveCfg = Release|x64 -+ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Ncat Static|x64.Build.0 = Release|x64 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.ActiveCfg = Release|Win32 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|Win32.Build.0 = Release|Win32 -- {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.ActiveCfg = Release|Win32 -+ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.ActiveCfg = Release|x64 -+ {99157C3F-39F6-4663-99D7-1D9C1484494E}.Release|x64.Build.0 = Release|x64 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -+ {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 -+ {99157C3F-39F6-4663-99D7-1D9C1484494E}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|Win32.ActiveCfg = Debug|Win32 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|Win32.Build.0 = Debug|Win32 -- {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|x64.ActiveCfg = Debug|Win32 -+ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|x64.ActiveCfg = Debug|x64 -+ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Debug|x64.Build.0 = Debug|x64 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|Win32.ActiveCfg = Release|Win32 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|Win32.Build.0 = Release|Win32 -- {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|x64.ActiveCfg = Release|Win32 -+ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|x64.ActiveCfg = Release|x64 -+ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Ncat Static|x64.Build.0 = Release|x64 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.ActiveCfg = Release|Win32 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|Win32.Build.0 = Release|Win32 -- {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.ActiveCfg = Release|Win32 -+ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.ActiveCfg = Release|x64 -+ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.Release|x64.Build.0 = Release|x64 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 - {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|Win32.ActiveCfg = Debug|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|Win32.Build.0 = Debug|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Debug|x64.ActiveCfg = Debug|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|Win32.ActiveCfg = Release|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|Win32.Build.0 = Release|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Ncat Static|x64.ActiveCfg = Release|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|Win32.ActiveCfg = Release|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|Win32.Build.0 = Release|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.Release|x64.ActiveCfg = Release|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {BBF27339-C7B6-4F52-B742-897796C1F13B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|Win32.ActiveCfg = Release|Win32 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|Win32.Build.0 = Release|Win32 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|x64.ActiveCfg = Release|x64 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Ncat Static|x64.Build.0 = Release|x64 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = Release|x64 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 -- {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Debug|Win32.ActiveCfg = Debug|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Debug|Win32.Build.0 = Debug|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Debug|x64.ActiveCfg = Debug|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Ncat Static|Win32.ActiveCfg = Debug|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Ncat Static|Win32.Build.0 = Debug|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Ncat Static|x64.ActiveCfg = Release|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|Win32.ActiveCfg = Release|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|Win32.Build.0 = Release|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.Release|x64.ActiveCfg = Release|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32 -- {ED957342-E43B-496E-92D9-4C76B525BDF5}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|Win32.ActiveCfg = Release|Win32 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|Win32.Build.0 = Release|Win32 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|x64.ActiveCfg = Release|x64 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Ncat Static|x64.Build.0 = Release|x64 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 -- {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 -+ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64 -+ {A7BE3D76-F20C-40C5-8986-DE4028B3B57D}.ReleaseWithoutAsm|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -+ GlobalSection(ExtensibilityGlobals) = postSolution -+ SolutionGuid = {DAA6BF7B-6F78-4BE7-A3FC-3B1BD73676C3} -+ EndGlobalSection - EndGlobal -diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj -index a3abbc6..d5e1977 100644 ---- a/mswin32/nmap.vcxproj -+++ b/mswin32/nmap.vcxproj -@@ -5,10 +5,18 @@ - Debug - Win32 - -+ -+ Debug -+ x64 -+ - - Release - Win32 - -+ -+ Release -+ x64 -+ - - - {361719F0-AB42-4C93-9DE8-7D2144B96625} -@@ -21,12 +29,24 @@ - MultiByte - v120 - -+ -+ Application -+ false -+ MultiByte -+ v120 -+ - - Application - false - MultiByte - v120 - -+ -+ Application -+ false -+ MultiByte -+ v120 -+ - - - -@@ -34,10 +54,18 @@ - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - <_ProjectFileVersion>10.0.30319.1 -@@ -76,7 +104,7 @@ - false - - -- liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibstat.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib -+ liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib - .\Debug\nmap.exe - true - ..\libssh2\win32\Release_dll;lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories) -@@ -91,8 +119,57 @@ - MachineX86 - - -- xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)\..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y --xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(ProjectDir)$(OutDir)" -+ xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y -+ -+ -+ $(IntDir)%(Filename).res -+ -+ -+ -+ -+ .\Debug/nmap.tlb -+ -+ -+ -+ -+ Disabled -+ .;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblinear;..\libssh2\include;..\libz;%(AdditionalIncludeDirectories) -+ WIN32;_CONSOLE;%(PreprocessorDefinitions) -+ ..\libssh2\include;.;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblinear;%(AdditionalIncludeDirectories) -+ WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) -+ false -+ false -+ false -+ EnableFastChecks -+ -+ -+ .\Debug/nmap.pch -+ .\Debug/ -+ .\Debug/ -+ .\Debug/ -+ Level2 -+ true -+ ProgramDatabase -+ CompileAsCpp -+ MultiThreadedDebugDLL -+ false -+ -+ -+ liblua.lib;nsock.lib;pcred.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibd.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib -+ .\Debug\nmap.exe -+ true -+ ..\libssh2\win32\Release_dll;lib;..\liblua\x64\Debug;..\libpcre\x64\Debug;..\nsock\x64\Debug;..\nbase\x64\Debug;..\libdnet-stripped\x64\Debug;..\libnetutil\x64\Debug;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear\x64\Debug;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories) -+ %(IgnoreSpecificDefaultLibraries) -+ packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) -+ true -+ .\Debug/nmap.pdb -+ Console -+ false -+ -+ -+ -+ -+ xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y - - - $(IntDir)%(Filename).res -@@ -121,7 +198,7 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje - CompileAsCpp - - -- liblua.lib;nsock.lib;libpcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlibstat.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libeay32.lib;ssleay32.lib;shell32.lib;libnetutil.lib -+ liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib - .\Release/nmap.exe - true - ..\libssh2\win32\Release_dll;lib;..\liblua;..\libpcre;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories) -@@ -135,8 +212,46 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje - /LTCG %(AdditionalOptions) - - -- xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)\..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y --xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(ProjectDir)$(OutDir)" -+ xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y -+ -+ -+ -+ -+ .\Release/nmap.tlb -+ -+ -+ -+ -+ MaxSpeed -+ OnlyExplicitInline -+ .;..;..\liblua;..\nbase;..\libpcre;..\nsock\include;pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblinear;..\libssh2\include;..\libz;%(AdditionalIncludeDirectories) -+ WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) -+ true -+ true -+ -+ -+ .\Release/nmap.pch -+ .\Release/ -+ .\Release/ -+ .\Release/ -+ true -+ CompileAsCpp -+ -+ -+ liblua.lib;nsock.lib;pcre.lib;nbase.lib;libdnet-stripped.lib;libssh2.lib;zlib.lib;liblinear.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib -+ .\Release/nmap.exe -+ true -+ ..\libssh2\win32\Release_dll;lib;..\liblua\x64\Release;..\libpcre;..\nsock\x64\Release;..\nbase\x64\Release;..\libdnet-stripped\x64\Release;..\libnetutil\x64\Release;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblinear\x64\Release;..\libz\contrib\vstudio\vc11\x86\ZlibStatRelease;%(AdditionalLibraryDirectories) -+ %(IgnoreSpecificDefaultLibraries) -+ packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) -+ .\Release/nmap.pdb -+ Console -+ true -+ true -+ /LTCG %(AdditionalOptions) -+ -+ -+ xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y && xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y && xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y && xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y - - - -@@ -191,7 +306,9 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje - - - Sync -+ Sync - Sync -+ Sync - - - -@@ -251,83 +368,147 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje - - - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - - - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - - - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - - - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - - - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - - - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - - - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - Copying %(Filename) to output directory... -+ Copying %(Filename) to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename)" > nul - - $(TargetDir)%(Filename);%(Outputs) -+ $(TargetDir)%(Filename);%(Outputs) - - - Copying %(Filename).xsl to output directory... -+ Copying %(Filename).xsl to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul - - $(TargetDir)%(Filename).xsl;%(Outputs) -+ $(TargetDir)%(Filename).xsl;%(Outputs) - Copying %(Filename).xsl to output directory... -+ Copying %(Filename).xsl to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename).xsl" > nul - - $(TargetDir)%(Filename).xsl;%(Outputs) -+ $(TargetDir)%(Filename).xsl;%(Outputs) - - - -@@ -339,18 +520,6 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje - {31fb0767-a71f-4575-8379-002d72b8af86} - false - -- -- {5de86c7a-de72-4265-8807-4ca38f94f22a} -- false -- -- -- {ed957342-e43b-496e-92d9-4c76b525bdf5} -- false -- false -- false -- true -- false -- - - {b630c8f7-3138-43e8-89ed-78742fa2ac5f} - false -diff --git a/nbase/nbase.vcxproj b/nbase/nbase.vcxproj -index 948d7c8..b600c7b 100644 ---- a/nbase/nbase.vcxproj -+++ b/nbase/nbase.vcxproj -@@ -5,14 +5,26 @@ - Debug - Win32 - -+ -+ Debug -+ x64 -+ - - Release - Win32 - -+ -+ Release -+ x64 -+ - - Static - Win32 - -+ -+ Static -+ x64 -+ - - - {B630C8F7-3138-43E8-89ED-78742FA2AC5F} -@@ -25,16 +37,31 @@ - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - StaticLibrary - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - StaticLibrary - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - - -@@ -42,14 +69,26 @@ - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - <_ProjectFileVersion>10.0.30319.1 -@@ -76,6 +115,21 @@ - $(OutDir)nbase.lib - - -+ -+ -+ Disabled -+ WIN32;_LIB;%(PreprocessorDefinitions) -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ -+ -+ Level3 -+ ProgramDatabase -+ -+ -+ $(OutDir)nbase.lib -+ -+ - - - /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -@@ -89,6 +143,19 @@ - $(OutDir)nbase.lib - - -+ -+ -+ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -+ WIN32;_LIB;%(PreprocessorDefinitions) -+ -+ -+ Level3 -+ ProgramDatabase -+ -+ -+ $(OutDir)nbase.lib -+ -+ - - - /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -@@ -103,6 +170,20 @@ - $(OutDir)nbase.lib - - -+ -+ -+ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -+ WIN32;_LIB;%(PreprocessorDefinitions) -+ MultiThreaded -+ -+ -+ Level3 -+ ProgramDatabase -+ -+ -+ $(OutDir)nbase.lib -+ -+ - - - -diff --git a/ncat/ncat.vcxproj b/ncat/ncat.vcxproj -index fc44dfa..e066b29 100644 ---- a/ncat/ncat.vcxproj -+++ b/ncat/ncat.vcxproj -@@ -5,14 +5,26 @@ - Debug - Win32 - -+ -+ Debug -+ x64 -+ - - Release - Win32 - -+ -+ Release -+ x64 -+ - - Static - Win32 - -+ -+ Static -+ x64 -+ - - - {C1E04411-E021-468B-83F1-CB624BBA7589} -@@ -25,18 +37,36 @@ - MultiByte - v120 - -+ -+ Application -+ false -+ MultiByte -+ v120 -+ - - Application - false - MultiByte - v120 - -+ -+ Application -+ false -+ MultiByte -+ v120 -+ - - Application - false - MultiByte - v120 - -+ -+ Application -+ false -+ MultiByte -+ v120 -+ - - - -@@ -44,26 +74,41 @@ - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - <_ProjectFileVersion>10.0.30319.1 - .\$(Configuration)\ - .\$(Configuration)\ - true -+ true - .\Release\ - .\Release\ - .\Release\ - .\Release\ - true -+ true - true -+ true - - - -@@ -111,6 +156,51 @@ - xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y - - -+ -+ -+ .\Debug/ncat.tlb -+ -+ -+ -+ -+ Disabled -+ .;..;../nbase;..\nsock\include;..\mswin32\pcap-include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblua;%(AdditionalIncludeDirectories) -+ WIN32;_CONSOLE;%(PreprocessorDefinitions) -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ -+ -+ .\Debug/ncat.pch -+ .\Debug/ -+ .\Debug/ -+ .\Debug/ -+ Level2 -+ true -+ ProgramDatabase -+ CompileAsCpp -+ -+ -+ -+ -+ -+ -+ nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;nsock.lib;advapi32.lib;libcrypto.lib;libssl.lib;liblua.lib -+ .\Debug\ncat.exe -+ true -+ ..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;..\liblua;%(AdditionalLibraryDirectories) -+ %(IgnoreSpecificDefaultLibraries) -+ wpcap.dll;%(DelayLoadDLLs) -+ true -+ .\Debug/ncat.pdb -+ Console -+ false -+ -+ -+ -+ -+ xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y -+ -+ - - - .\Release/ncat.tlb -@@ -151,6 +241,45 @@ - xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y - - -+ -+ -+ .\Release/ncat.tlb -+ -+ -+ -+ -+ MaxSpeed -+ OnlyExplicitInline -+ .;..;../nbase;..\nsock\include;..\mswin32\pcap-include;..\..\nmap-mswin32-aux\OpenSSL\include;..\liblua;%(AdditionalIncludeDirectories) -+ WIN32;_CONSOLE;%(PreprocessorDefinitions) -+ true -+ true -+ -+ -+ .\Release/ncat.pch -+ .\Release/ -+ .\Release/ -+ .\Release/ -+ Level2 -+ true -+ CompileAsCpp -+ -+ -+ nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;advapi32.lib;libcrypto.lib;libssl.lib -+ .\Release/ncat.exe -+ true -+ ..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) -+ %(IgnoreSpecificDefaultLibraries) -+ wpcap.dll;%(DelayLoadDLLs) -+ .\Release/ncat.pdb -+ Console -+ true -+ true -+ -+ -+ xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(Configuration)\" /y -+ -+ - - - .\Release/ncat.tlb -@@ -193,6 +322,47 @@ - - - -+ -+ -+ .\Release/ncat.tlb -+ -+ -+ -+ -+ MaxSpeed -+ OnlyExplicitInline -+ .;..;../nbase;..\nsock\include;..\mswin32\pcap-include;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) -+ WIN32;_CONSOLE;%(PreprocessorDefinitions) -+ true -+ MultiThreaded -+ true -+ -+ -+ .\Release/ncat.pch -+ .\Release/ -+ .\Release/ -+ .\Release/ -+ Level2 -+ true -+ CompileAsCpp -+ -+ -+ nsock.lib;nbase.lib;ws2_32.lib;IPHlpAPI.Lib;advapi32.lib;libssl.lib;libcrypto.lib;user32.lib;gdi32.lib -+ .\Release/ncat.exe -+ true -+ ..\mswin32\lib;..\nsock;..\nbase;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) -+ %(IgnoreSpecificDefaultLibraries) -+ %(DelayLoadDLLs) -+ .\Release/ncat.pdb -+ Console -+ true -+ true -+ -+ -+ -+ -+ -+ - - - -@@ -230,17 +400,29 @@ - - - Copying %(Filename).crt to output directory... -+ Copying %(Filename).crt to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul - - $(TargetDir)%(Filename).crt;%(Outputs) -+ $(TargetDir)%(Filename).crt;%(Outputs) - Copying %(Filename).crt to output directory... -+ Copying %(Filename).crt to output directory... - Copying %(Filename).crt to output directory... -+ Copying %(Filename).crt to output directory... - copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul - - copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul -+ -+ copy /y "%(FullPath)" "$(TargetDir)%(Filename).crt" > nul - - $(TargetDir)%(Filename).crt;%(Outputs) -+ $(TargetDir)%(Filename).crt;%(Outputs) - $(TargetDir)%(Filename).crt;%(Outputs) -+ $(TargetDir)%(Filename).crt;%(Outputs) - - - -diff --git a/nping/nping.vcxproj b/nping/nping.vcxproj -index 57bd4ed..fa7a604 100644 ---- a/nping/nping.vcxproj -+++ b/nping/nping.vcxproj -@@ -5,10 +5,18 @@ - Debug - Win32 - -+ -+ Debug -+ x64 -+ - - Release - Win32 - -+ -+ Release -+ x64 -+ - - - {CDB10BBA-9085-4B9B-AC8F-BA31D3906B36} -@@ -21,12 +29,24 @@ - MultiByte - v120 - -+ -+ Application -+ false -+ MultiByte -+ v120 -+ - - Application - false - MultiByte - v120 - -+ -+ Application -+ false -+ MultiByte -+ v120 -+ - - - -@@ -34,19 +54,29 @@ - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - <_ProjectFileVersion>10.0.30319.1 - .\$(Configuration)\ - .\$(Configuration)\ - true -+ true - .\Release\ - .\Release\ - true -+ true - - - -@@ -93,6 +123,50 @@ - xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y - - -+ -+ -+ .\Debug/nmap.tlb -+ -+ -+ -+ -+ Disabled -+ .;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) -+ WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) -+ false -+ false -+ false -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ -+ -+ .\Debug/nmap.pch -+ .\Debug/ -+ .\Debug/ -+ .\Debug/ -+ Level2 -+ true -+ ProgramDatabase -+ CompileAsCpp -+ -+ -+ nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib -+ .\Debug\nping.exe -+ true -+ ..\mswin32\lib;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) -+ %(IgnoreSpecificDefaultLibraries) -+ packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) -+ true -+ .\Debug/nmap.pdb -+ Console -+ false -+ -+ -+ -+ -+ xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y -+ -+ - - - .\Release/nmap.tlb -@@ -132,6 +206,44 @@ - xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y - - -+ -+ -+ .\Release/nmap.tlb -+ -+ -+ -+ -+ MaxSpeed -+ OnlyExplicitInline -+ .;..;..\mswin32;../nbase;..\nsock\include;..\mswin32\pcap-include;..\libdnet-stripped\include;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) -+ WIN32;_CONSOLE;BPF_MAJOR_VERSION;%(PreprocessorDefinitions) -+ true -+ true -+ -+ -+ .\Release/nping.pch -+ .\Release/ -+ .\Release/ -+ .\Release/ -+ true -+ CompileAsCpp -+ -+ -+ nsock.lib;nbase.lib;libdnet-stripped.lib;ws2_32.lib;IPHlpAPI.Lib;wpcap.lib;packet.lib;advapi32.lib;libssl.lib;libcrypto.lib;shell32.lib;libnetutil.lib -+ .\Release/nping.exe -+ true -+ ..\mswin32\lib;..\nsock;..\nbase;..\libdnet-stripped;../libnetutil;..\..\nmap-mswin32-aux\OpenSSL\lib;%(AdditionalLibraryDirectories) -+ %(IgnoreSpecificDefaultLibraries) -+ packet.dll;wpcap.dll;iphlpapi.dll;%(DelayLoadDLLs) -+ .\Release/nping.pdb -+ Console -+ true -+ true -+ -+ -+ xcopy "..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y -+ -+ - - - -diff --git a/nsock/nsock.vcxproj b/nsock/nsock.vcxproj -index 36feb48..f720258 100644 ---- a/nsock/nsock.vcxproj -+++ b/nsock/nsock.vcxproj -@@ -5,22 +5,42 @@ - DebugNoPcap - Win32 - -+ -+ DebugNoPcap -+ x64 -+ - - Debug - Win32 - -+ -+ Debug -+ x64 -+ - - ReleaseNoPcap - Win32 - -+ -+ ReleaseNoPcap -+ x64 -+ - - Release - Win32 - -+ -+ Release -+ x64 -+ - - Static - Win32 - -+ -+ Static -+ x64 -+ - - - {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} -@@ -33,26 +53,51 @@ - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - StaticLibrary - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - StaticLibrary - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - StaticLibrary - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - StaticLibrary - MultiByte - v120 - -+ -+ StaticLibrary -+ MultiByte -+ v120 -+ - - - -@@ -60,22 +105,42 @@ - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - - -+ -+ -+ -+ - - - <_ProjectFileVersion>10.0.30319.1 -@@ -110,6 +175,25 @@ - $(OutDir)nsock.lib - - -+ -+ -+ Disabled -+ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) -+ WIN32;_LIB;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ -+ -+ Level3 -+ ProgramDatabase -+ CompileAsCpp -+ -+ -+ $(OutDir)nsock.lib -+ -+ - - - /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -@@ -127,6 +211,23 @@ - $(OutDir)nsock.lib - - -+ -+ -+ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -+ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) -+ WIN32;_LIB;%(PreprocessorDefinitions) -+ -+ -+ -+ -+ Level3 -+ ProgramDatabase -+ CompileAsCpp -+ -+ -+ $(OutDir)nsock.lib -+ -+ - - - /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -@@ -145,6 +246,24 @@ - $(OutDir)nsock.lib - - -+ -+ -+ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) -+ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) -+ WIN32;_LIB;%(PreprocessorDefinitions);DISABLE_NSOCK_PCAP -+ -+ -+ MultiThreaded -+ -+ -+ Level3 -+ ProgramDatabase -+ CompileAsCpp -+ -+ -+ $(OutDir)nsock.lib -+ -+ - - - /D "DISABLE_NSOCK_PCAP" %(AdditionalOptions) -@@ -166,9 +285,47 @@ - $(OutDir)nsock.lib - - -+ -+ -+ /D "DISABLE_NSOCK_PCAP" %(AdditionalOptions) -+ Disabled -+ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) -+ WIN32;_LIB;%(PreprocessorDefinitions) -+ -+ -+ EnableFastChecks -+ MultiThreadedDebugDLL -+ -+ -+ Level3 -+ ProgramDatabase -+ CompileAsCpp -+ -+ -+ $(OutDir)nsock.lib -+ -+ - - - /D "_CRT_SECURE_NO_DEPRECATE" -+/D "DISABLE_NSOCK_PCAP" %(AdditionalOptions) -+ ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) -+ WIN32;_LIB;%(PreprocessorDefinitions) -+ -+ -+ -+ -+ Level3 -+ ProgramDatabase -+ CompileAsCpp -+ -+ -+ $(OutDir)nsock.lib -+ -+ -+ -+ -+ /D "_CRT_SECURE_NO_DEPRECATE" - /D "DISABLE_NSOCK_PCAP" %(AdditionalOptions) - ..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;..\..\nmap-mswin32-aux\OpenSSL\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;%(PreprocessorDefinitions) diff --git a/ports/nmap/fix-snprintf.patch b/ports/nmap/fix-snprintf.patch deleted file mode 100644 index aafd1cfe9408ab..00000000000000 --- a/ports/nmap/fix-snprintf.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/libdnet-stripped/include/dnet_winconfig.h b/libdnet-stripped/include/dnet_winconfig.h -index e41907c..82bc595 100644 ---- a/libdnet-stripped/include/dnet_winconfig.h -+++ b/libdnet-stripped/include/dnet_winconfig.h -@@ -277,7 +277,7 @@ int strlcpy(char *, const char *, int); - char *strsep(char **, const char *); - #endif - --#define snprintf _snprintf -+//#define snprintf _snprintf - - /* Without this, Windows will give us all sorts of crap about using functions - like strcpy() even if they are done safely */ -diff --git a/nbase/nbase.h b/nbase/nbase.h -index 0ecd9bc..c0eb395 100644 ---- a/nbase/nbase.h -+++ b/nbase/nbase.h -@@ -359,7 +359,7 @@ extern "C" int vsnprintf (char *, size_t, const char *, va_list); - #define putenv _putenv - - #if !defined(__GNUC__) --#define snprintf _snprintf -+//#define snprintf _snprintf - #endif - - #define strcasecmp _stricmp -diff --git a/nse_libssh2.cc b/nse_libssh2.cc -index bf721b6..1fafe7f 100644 ---- a/nse_libssh2.cc -+++ b/nse_libssh2.cc -@@ -58,7 +58,7 @@ struct ssh_userdata { - - - #if defined(_MSC_VER) && _MSC_VER < 1900 --#define snprintf c99_snprintf -+//#define snprintf c99_snprintf - #define vsnprintf c99_vsnprintf - - __inline int c99_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap) { diff --git a/ports/nmap/fix-ssize_t.patch b/ports/nmap/fix-ssize_t.patch deleted file mode 100644 index 36103a8c246d73..00000000000000 --- a/ports/nmap/fix-ssize_t.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/libdnet-stripped/include/dnet/os.h b/libdnet-stripped/include/dnet/os.h -index 55a21b9..544ebd8 100644 ---- a/libdnet-stripped/include/dnet/os.h -+++ b/libdnet-stripped/include/dnet/os.h -@@ -23,7 +23,11 @@ - typedef u_short uint16_t; - typedef u_int uint32_t; - # ifndef __CYGWIN__ -+#ifdef _WIN64 -+ typedef __int64 ssize_t; -+#else - typedef long ssize_t; -+#endif - # endif - #else - # include diff --git a/ports/nmap/pcap_socket.diff b/ports/nmap/pcap_socket.diff deleted file mode 100644 index 8634911f9ed1f2..00000000000000 --- a/ports/nmap/pcap_socket.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/nse_nsock.cc b/nse_nsock.cc -index 7cbfcd2..cf9d5db 100644 ---- a/nse_nsock.cc -+++ b/nse_nsock.cc -@@ -29,6 +29,9 @@ - - #define DEFAULT_TIMEOUT 30000 - -+#ifdef PCAP_SOCKET -+# undef PCAP_SOCKET -+#endif - /* Upvalues for library variables */ - enum { - NSOCK_POOL = lua_upvalueindex(1), diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake deleted file mode 100644 index b16d8f02be9e72..00000000000000 --- a/ports/nmap/portfile.cmake +++ /dev/null @@ -1,116 +0,0 @@ -# nmap is a tools, so ignor POST_CHECK -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -vcpkg_download_distfile(ARCHIVE - URLS "https://nmap.org/dist/nmap-7.70.tar.bz2" - FILENAME "nmap-7.70.tar.bz2" - SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 -) - -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_extract_source_archive( - SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - fix-snprintf.patch - fix-ssize_t.patch - fix-msvc-prj.patch - ) - list(APPEND DEL_PROJS "libpcap" "libpcre" "libssh2" "libz") - foreach (DEL_PROJ ${DEL_PROJS}) - file(REMOVE_RECURSE "${SOURCE_PATH}/${DEL_PROJ}") - endforeach() - - if(NOT EXISTS "${CURRENT_INSTALLED_DIR}/bin/Packet.dll") - vcpkg_replace_string("${SOURCE_PATH}/mswin32/pcap-include/pcap/export-defs.h" "#define PCAP_API_DEF __declspec(dllimport)" "#define PCAP_API_DEF ") - else() # editable - vcpkg_replace_string("${SOURCE_PATH}/mswin32/pcap-include/pcap/export-defs.h" "#define PCAP_API_DEF " "#define PCAP_API_DEF __declspec(dllimport)") - endif() - - # Clear - vcpkg_execute_required_process( - COMMAND "devenv.exe" - "nmap.sln" - /Clean - WORKING_DIRECTORY ${SOURCE_PATH}/mswin32 - ) - # Uprade - message(STATUS "Upgrade solution...") - vcpkg_execute_required_process( - COMMAND "devenv.exe" - "nmap.sln" - /Upgrade - WORKING_DIRECTORY ${SOURCE_PATH}/mswin32 - LOGNAME upgrade-Packet-${TARGET_TRIPLET} - ) - file(REMOVE_RECURSE "${SOURCE_PATH}/mswin32/Lib") - vcpkg_msbuild_install( - SOURCE_PATH "${SOURCE_PATH}" - PROJECT_SUBPATH mswin32/nmap.vcxproj - PLATFORM ${MSBUILD_PLATFORM} - ADDITIONAL_LIBS Packet.lib wpcap.lib User32.lib Crypt32.lib - ) -else() - set(ENV{LDFLAGS} "$ENV{LDFLAGS} -pthread") - set(OPTIONS --without-nmap-update --with-openssl=${CURRENT_INSTALLED_DIR} --with-libssh2=${CURRENT_INSTALLED_DIR} --with-libz=${CURRENT_INSTALLED_DIR} --with-libpcre=${CURRENT_INSTALLED_DIR}) - message(STATUS "Building Options: ${OPTIONS}") - - # Since nmap makefile has strong relationshop with codes, copy codes to obj path - message(STATUS "Configuring ${TARGET_TRIPLET}-rel") - vcpkg_extract_source_archive(source_path_release - ARCHIVE "${ARCHIVE}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - PATCHES - pcap_socket.diff - ) - - vcpkg_execute_required_process( - COMMAND "./configure" ${OPTIONS} - WORKING_DIRECTORY "${source_path_release}" - LOGNAME config-${TARGET_TRIPLET}-rel - ) - - message(STATUS "Building ${TARGET_TRIPLET}-rel") - vcpkg_execute_required_process( - COMMAND make - WORKING_DIRECTORY "${source_path_release}" - LOGNAME build-${TARGET_TRIPLET}-rel - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-rel") - file(INSTALL "${source_path_release}/nmap" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") - - if (NOT VCPKG_BUILD_TYPE) - # Since nmap makefile has strong relationshop with codes, copy codes to obj path - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") - vcpkg_extract_source_archive(source_path_debug - ARCHIVE "${ARCHIVE}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - PATCHES - pcap_socket.diff - ) - - vcpkg_execute_required_process( - COMMAND "./configure" ${OPTIONS} - WORKING_DIRECTORY ${source_path_debug} - LOGNAME config-${TARGET_TRIPLET}-dbg - ) - - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND make - WORKING_DIRECTORY ${source_path_debug} - LOGNAME build-${TARGET_TRIPLET}-dbg - ) - - message(STATUS "Installing ${TARGET_TRIPLET}-dbg") - file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) - endif() - - set(SOURCE_PATH "${source_path_release}") -endif() - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/nmap/usage b/ports/nmap/usage deleted file mode 100644 index 56722008cea82b..00000000000000 --- a/ports/nmap/usage +++ /dev/null @@ -1,5 +0,0 @@ -The package nmap is compatible with built-in CMake targets: - - find_package(NMAP REQUIRED) - target_link_libraries(main PRIVATE ${NMAP_LIBRARIES}) - target_include_directories(main PRIVATE ${NMAP_INCLUDE_DIRS}) diff --git a/ports/nmap/vcpkg.json b/ports/nmap/vcpkg.json deleted file mode 100644 index fc84c87dabdb04..00000000000000 --- a/ports/nmap/vcpkg.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "nmap", - "version": "7.70", - "port-version": 12, - "description": "A library for scanning network ports.", - "dependencies": [ - { - "name": "libpcap", - "platform": "!windows" - }, - "libssh2", - "lua", - "openssl", - "pcre", - { - "name": "python2", - "platform": "windows" - }, - { - "name": "vcpkg-msbuild", - "host": true, - "platform": "windows" - }, - { - "name": "winpcap", - "platform": "windows" - }, - "zlib" - ] -} diff --git a/ports/onnx-optimizer/fix-cmakelists.patch b/ports/onnx-optimizer/fix-cmakelists.patch index 1dbc271341bf7e..e590b400f8d9a7 100644 --- a/ports/onnx-optimizer/fix-cmakelists.patch +++ b/ports/onnx-optimizer/fix-cmakelists.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0063385..64458ef 100644 +index 0063385..f1522bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,15 @@ project(onnx_optimizer C CXX) @@ -33,6 +33,15 @@ index 0063385..64458ef 100644 file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION) string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION) +@@ -41,7 +48,7 @@ file(GLOB onnx_opt_srcs "onnxoptimizer/*.cc" + list(REMOVE_ITEM onnx_opt_srcs "${PROJECT_SOURCE_DIR}/onnxoptimizer/cpp2py_export.cc") + + onnxopt_add_library(onnx_optimizer ${onnx_opt_srcs}) +-target_link_libraries(onnx_optimizer PUBLIC ${ONNX_TARGET_NAME}) ++target_link_libraries(onnx_optimizer PUBLIC ONNX::onnx ONNX::onnx_proto) + target_include_directories(onnx_optimizer PUBLIC + $ + $ @@ -70,7 +77,7 @@ if(BUILD_ONNX_PYTHON) set(PY_EXT_SUFFIX ".so") endif() @@ -73,3 +82,17 @@ index 6cca9f3..9d79f1a 100644 # Poor man's FetchContent function(add_subdirectory_if_no_target dir target) if (NOT TARGET ${target}) +diff --git a/cmake/ONNXOptimizerConfig.cmake.in b/cmake/ONNXOptimizerConfig.cmake.in +index 72dcc88..c5639c8 100644 +--- a/cmake/ONNXOptimizerConfig.cmake.in ++++ b/cmake/ONNXOptimizerConfig.cmake.in +@@ -3,6 +3,9 @@ + # ONNX_OPTIMIZER_INCLUDE_DIRS - include directories for onnx optimizer + # as well as ONNX Optimizer targets for other cmake libraries to use. + ++include(CMakeFindDependencyMacro) ++find_dependency(onnx CONFIG) ++ + # library version information + set(ONNX_OPTIMIZER_VERSION "@ONNX_OPTIMIZER_VERSION@") + diff --git a/ports/onnx-optimizer/portfile.cmake b/ports/onnx-optimizer/portfile.cmake index 8f8fc1f8505c98..10e8d7fe78ea60 100644 --- a/ports/onnx-optimizer/portfile.cmake +++ b/ports/onnx-optimizer/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onnx/optimizer REF "v${VERSION}" - SHA512 419aeaac60fa27f54708c864a2f907777aaa4de882725c83cade33053dec546ede6f95f7f133b50991e3b9b17e300c1a108729cad00ac99dc5ba5d2982b09737 + SHA512 552d6fa261c3ce2db2e0938a5b5261676335bce9bd828b46a1e2631f3b362c748ae9a6cfe7d62072fc3774b3f506bc54aa5827b52241e6f48d78a08dea1d9316 HEAD_REF master PATCHES fix-cmakelists.patch - remove-outdate-headers.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) diff --git a/ports/onnx-optimizer/remove-outdate-headers.patch b/ports/onnx-optimizer/remove-outdate-headers.patch deleted file mode 100644 index ea1d3f6bf4e617..00000000000000 --- a/ports/onnx-optimizer/remove-outdate-headers.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/onnxoptimizer/optimize.h b/onnxoptimizer/optimize.h -index f25e6c3f..506e2554 100644 ---- a/onnxoptimizer/optimize.h -+++ b/onnxoptimizer/optimize.h -@@ -9,7 +9,6 @@ - - #include "onnx/common/ir.h" - #include "onnx/common/ir_pb_converter.h" --#include "onnx/common/stl_backports.h" - #include "onnx/proto_utils.h" - - #include "onnxoptimizer/pass_manager.h" -diff --git a/onnxoptimizer/pass_registry.h b/onnxoptimizer/pass_registry.h -index 51a2c161..b8dc26f9 100644 ---- a/onnxoptimizer/pass_registry.h -+++ b/onnxoptimizer/pass_registry.h -@@ -12,7 +12,6 @@ - - #include "onnx/common/ir.h" - #include "onnx/common/ir_pb_converter.h" --#include "onnx/common/stl_backports.h" - #include "onnx/proto_utils.h" - #include "onnxoptimizer/passes/adjust_add.h" - #include "onnxoptimizer/passes/adjust_slice_and_matmul.h" diff --git a/ports/onnx-optimizer/vcpkg.json b/ports/onnx-optimizer/vcpkg.json index 3dfc675137b75e..9ca4a5e77a2a0f 100644 --- a/ports/onnx-optimizer/vcpkg.json +++ b/ports/onnx-optimizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "onnx-optimizer", - "version-semver": "0.3.18", + "version-semver": "0.3.19", "description": "Actively maintained ONNX Optimizer", "homepage": "https://github.com/onnx/optimizer", "license": "Apache-2.0", diff --git a/ports/onnx/fix-dependency-protobuf.patch b/ports/onnx/fix-dependency-protobuf.patch index 6ccdac66502656..603f58770ffcf5 100644 --- a/ports/onnx/fix-dependency-protobuf.patch +++ b/ports/onnx/fix-dependency-protobuf.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1295eab..0fb9f17 100644 +index d81ac1d..9f97998 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -126,6 +126,7 @@ if(ONNX_BUILD_TESTS) - include(googletest) +@@ -149,6 +149,7 @@ if(ONNX_BUILD_TESTS) + set(googletest_STATIC_LIBRARIES GTest::gtest) endif() +find_package(protobuf CONFIG REQUIRED) diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index 9d86f8e50793b6..9cab0c6f3d6bc9 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onnx/onnx REF "v${VERSION}" - SHA512 b46a4ab70af88053318eba45251c1f71528f15e45a33042877570e8d857febd3ec66e2e811fcda2105a4f17b84c9a1c6a0aaa22756c3287321b3ea29e83127fd + SHA512 7a9a8493b9c007429629484156487395044506f34e72253640e626351cb623b390750b36af78a290786131e3dcac35f4eb269e8693b594b7ce7cb105bcf9318d PATCHES fix-cmakelists.patch fix-dependency-protobuf.patch diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index 4bff31b70a4210..f2386a485f4918 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,7 +1,6 @@ { "name": "onnx", - "version-semver": "1.15.0", - "port-version": 1, + "version-semver": "1.16.2", "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", "license": "Apache-2.0", diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index bdb6ef1189bf90..6fbb95be8775bf 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,14 +1,21 @@ +vcpkg_download_distfile(ARM64_WINDOWS_UWP_PATCH + URLS "https://patch-diff.githubusercontent.com/raw/OpenMathLib/OpenBLAS/pull/4926.diff?full_index=1" + FILENAME "openblas-fix-arm64-windows-uwp.patch" + SHA512 808d375628499641f1134b4751c9861384b719dae14cf6bd4d9d4b09c9bfd9f8b13b2663e9fa9d09867b5b40817c26387ac659d2f6459d40a46455b2f540d018 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenMathLib/OpenBLAS REF "v${VERSION}" - SHA512 4accc5282244946157b7940211181e011940154ff47855702c68f57a0af2fa5a306f49e47b8c22c02eeff61760c6c220465f05a316a33ee3265bfce65ca4cb84 + SHA512 358301c8a60bedf920c07a110c772feb639e52412bd783789741fd2fd0686aac97e6b17ebcdf01ce48a2a15841058f82df0fee551af952f6e70b58140c055133 HEAD_REF develop PATCHES uwp.patch fix-redefinition-function.patch install-tools.patch gcc14.patch + ${ARM64_WINDOWS_UWP_PATCH} ) find_program(GIT NAMES git git.cmd) @@ -61,6 +68,13 @@ if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") list(APPEND OPENBLAS_EXTRA_OPTIONS -DCORE=GENERIC) endif() +# For emscripten only the riscv64 kernel with riscv64_generic target is supported +if(VCPKG_TARGET_IS_EMSCRIPTEN) + list(APPEND OPENBLAS_EXTRA_OPTIONS + -DEMSCRIPTEN_SYSTEM_PROCESSOR=riscv64 + -DTARGET=RISCV64_GENERIC) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ${conf_opts} diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 09ea8bae950e10..98a777d1e62e2e 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openblas", - "version": "0.3.27", - "port-version": 1, + "version": "0.3.28", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/OpenMathLib/OpenBLAS", "license": "BSD-3-Clause", diff --git a/ports/opencc/fix-dependencies.patch b/ports/opencc/fix-dependencies.patch index 093c0b6f19c3e9..581a993d6a31a3 100644 --- a/ports/opencc/fix-dependencies.patch +++ b/ports/opencc/fix-dependencies.patch @@ -1,42 +1,17 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ee08591..c8c6b61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -185,12 +185,14 @@ if(NOT USE_SYSTEM_MARISA) - message(STATUS "Use bundled marisa library.") - add_subdirectory(deps/marisa-0.2.6) - else() -- find_library(LIBMARISA NAMES marisa) -- if (LIBMARISA) -- message(STATUS "libmarisa found: ${LIBMARISA}") -- else() -- message(FATAL_ERROR "libmarisa not found.") -- endif() -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(marisa REQUIRED IMPORTED_TARGET marisa) -+ # find_library(LIBMARISA NAMES marisa) -+ # if (LIBMARISA) -+ # message(STATUS "libmarisa found: ${LIBMARISA}") -+ # else() -+ # message(FATAL_ERROR "libmarisa not found.") -+ # endif() - endif() - - ######## Subdirectories diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c0a0b10..91b4037 100644 +index 7768c89..70292d6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -114,7 +114,7 @@ configure_file( - add_library(libopencc ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS}) +@@ -115,7 +115,7 @@ add_library(libopencc ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS}) + add_library(OpenCC::OpenCC ALIAS libopencc) set_target_properties(libopencc PROPERTIES POSITION_INDEPENDENT_CODE ON) source_group(libopencc FILES ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS}) -target_link_libraries(libopencc marisa) -+target_link_libraries(libopencc PkgConfig::marisa) - - GENERATE_EXPORT_HEADER( - libopencc -@@ -137,6 +137,21 @@ set_target_properties( ++target_link_libraries(libopencc ${LIBMARISA}) + target_include_directories(libopencc PUBLIC + $ + $ +@@ -144,6 +144,21 @@ set_target_properties( ${OPENCC_VERSION_MAJOR}.${OPENCC_VERSION_MINOR} ) @@ -57,4 +32,4 @@ index c0a0b10..91b4037 100644 + # Installation - install( + if (USE_SYSTEM_MARISA) diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index 01c60daf30e835..7bc8ac5c57ff57 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BYVoid/OpenCC REF "ver.${VERSION}" - SHA512 bfc40bdf1348e6a265b3304ab1e8acee2f4b6ac9c377ff3d8c996435a92dee98c3758503186b4fd424653faf44db339f8a90300e3290c59942ccf04b1bbb2a30 + SHA512 713cf00931d7616994eb455eef3bc893096b5cd6d42b346aa1130591752d9612891ea3ed035bd7bd4ec7df1c90425e86375f5b3337fac11663c656c79a8f33e9 HEAD_REF master PATCHES fix-dependencies.patch @@ -30,6 +30,8 @@ vcpkg_cmake_install( vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencc) + vcpkg_fixup_pkgconfig() set(tool_names "opencc" "opencc_dict" "opencc_phrase_extract") diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json index c2c4f67389a21e..97ecf841ce748e 100644 --- a/ports/opencc/vcpkg.json +++ b/ports/opencc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencc", - "version": "1.1.6", - "port-version": 1, + "version": "1.1.9", "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)", "homepage": "https://github.com/BYVoid/OpenCC", "license": "Apache-2.0", diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index ca7def81b3ed5c..e221f10104a2be 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openexr REF "v${VERSION}" - SHA512 ecc3d8b206bda5e5897ac9cd797a8432b76981de10d49cbb107af2b4108c22186de0dda25a9a43b07e18d641ef71508445d95f659a4ca932e029d48ee029a492 + SHA512 78f237ce5ec6a4f122d0609bf48c2a9dfcb701e3ce5587906050fbf32d2115dae1984e7cce0f554edda0bd7ec35e4c7aacfc3d1dfb51ea8aa9feebb7f2b3db59 HEAD_REF main ) diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index 6b8fd438c2a60a..079323ea15ca95 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openexr", - "version": "3.2.4", + "version": "3.3.1", "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "license": "BSD-3-Clause", diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 3b258e0f307b9a..e191800cc7bf48 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenImageIO REF "v${VERSION}" - SHA512 2d9423e16613a9daa6faa53e2f52ad6af749f07f73251f44720eba468635b70aec97b5aeaac2f67a8b260158808458e5408ced75908b00379eb6640b1413f463 + SHA512 1e24d7ffc3ad65a1fe1f53ae59006de912c0a8d85827d64671fab95350977e22e2d147cf26ffe362646c768747ec11e6f9aeae04ea66030f82ad597adf3135a5 HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 50d4d163281bbf..dd4243aa0e6fe4 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openimageio", - "version": "2.5.14.0", - "port-version": 1, + "version": "2.5.16.0", "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "license": "BSD-3-Clause", diff --git a/ports/openvino/002-fix-onnx.patch b/ports/openvino/002-fix-onnx.patch new file mode 100644 index 00000000000000..7fdbc006a6f0f8 --- /dev/null +++ b/ports/openvino/002-fix-onnx.patch @@ -0,0 +1,26 @@ +diff --git a/src/frontends/onnx/onnx_common/CMakeLists.txt b/src/frontends/onnx/onnx_common/CMakeLists.txt +index d63bce4..116a6e3 100644 +--- a/src/frontends/onnx/onnx_common/CMakeLists.txt ++++ b/src/frontends/onnx/onnx_common/CMakeLists.txt +@@ -30,7 +30,7 @@ target_include_directories(${TARGET_NAME} + + target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime openvino::util) + +-ov_link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx) ++ov_link_system_libraries(${TARGET_NAME} PUBLIC ONNX::onnx ONNX::onnx_proto) + + ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) + +diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake +index 24c4940..8ea7d12 100644 +--- a/thirdparty/dependencies.cmake ++++ b/thirdparty/dependencies.cmake +@@ -479,7 +479,7 @@ endif() + # + + if(ENABLE_OV_ONNX_FRONTEND) +- find_package(ONNX 1.15.0 QUIET COMPONENTS onnx onnx_proto NO_MODULE) ++ find_package(ONNX CONFIG REQUIRED) + + if(ONNX_FOUND) + # conan and vcpkg create imported targets 'onnx' and 'onnx_proto' diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index db0d3a167c2e9e..1ca95d575ab521 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( PATCHES # vcpkg specific patch, because OV creates a file in source tree, which is prohibited 001-disable-tools.patch + 002-fix-onnx.patch HEAD_REF master) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json index d392279863bf67..f43c76336cff7a 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", "version": "2024.4.0", + "port-version": 1, "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ diff --git a/ports/osgearth/blend2d.patch b/ports/osgearth/blend2d.patch deleted file mode 100644 index af00ecf8f12949..00000000000000 --- a/ports/osgearth/blend2d.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/osgEarth/FeatureRasterizer.cpp b/src/osgEarth/FeatureRasterizer.cpp -index 2b823a58f..ecf1cd13f 100644 ---- a/src/osgEarth/FeatureRasterizer.cpp -+++ b/src/osgEarth/FeatureRasterizer.cpp -@@ -487,7 +487,7 @@ namespace osgEarth { - ctx.scale(scale); - ctx.blitImage(BLPoint((double)g->left - GLYPH_PADDING, (double)(-g->top) - GLYPH_PADDING), sprite, glyphRect); - //ctx.blitImage(BLPoint(0, 0), sprite, glyphRect); -- ctx.resetMatrix(); -+ ctx.resetTransform(); - - #if 0 - // Draw the text bounding box -@@ -572,7 +572,7 @@ namespace osgEarth { - ctx.translate(x, y); - ctx.scale(scale); - ctx.blitImage(BLPoint(-iconRect.w / 2.0, -iconRect.h / 2.0), sprite, iconRect); -- ctx.resetMatrix(); -+ ctx.resetTransform(); - } - }); - } diff --git a/ports/osgearth/export-plugins.patch b/ports/osgearth/export-plugins.patch deleted file mode 100644 index e6dcdee3967fbd..00000000000000 --- a/ports/osgearth/export-plugins.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake -index 8fab78376..838dcc581 100644 ---- a/CMakeModules/OsgEarthMacroUtils.cmake -+++ b/CMakeModules/OsgEarthMacroUtils.cmake -@@ -220,9 +220,9 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) - - #the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${VPB_PLUGINS} - IF(WIN32) -- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION bin/${OSG_PLUGINS} ) -+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION plugins/${OSG_PLUGINS} ) - ELSE(WIN32) -- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} ) -+ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION plugins${LIB_POSTFIX}/${OSG_PLUGINS} ) - ENDIF(WIN32) - - IF(OSG_BUILD_PLATFORM_IPHONE) diff --git a/ports/osgearth/find-package.patch b/ports/osgearth/find-package.patch deleted file mode 100644 index 135b1447705ba8..00000000000000 --- a/ports/osgearth/find-package.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cf8245b8b..233390a5f 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -127,9 +127,9 @@ mark_as_advanced(OSGEARTH_ASSUME_SINGLE_GL_CONTEXT) - - # Mobile/GLES: - IF (OSGEARTH_USE_GLES) -- find_package(OpenGLES) -+ find_package(OpenGLES REQUIRED) - ELSE () -- find_package(OpenGL) -+ find_package(OpenGL REQUIRED) - ENDIF (OSGEARTH_USE_GLES) - - -@@ -147,35 +147,54 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") - endif() - - # required --find_package(OSG REQUIRED) -+find_package(OSG NAMES unofficial-osg) -+find_path(OSG_INCLUDE_DIR osg/Version) # For detecting the version and setting the plugin path -+set(OSG_INCLUDE_DIRS "") -+set(OSG_LIBRARY unofficial::osg::osg) -+set(OSGUTIL_LIBRARY unofficial::osg::osgUtil) -+set(OSGDB_LIBRARY unofficial::osg::osgDB) -+set(OSGTEXT_LIBRARY unofficial::osg::osgText) -+set(OSGSIM_LIBRARY unofficial::osg::osgSim) -+set(OSGVIEWER_LIBRARY unofficial::osg::osgViewer) -+set(OSGGA_LIBRARY unofficial::osg::osgViewer) -+set(OSGSHADOW_LIBRARY unofficial::osg::osgShadow) -+set(OSGMANIPULATOR_LIBRARY unofficial::osg::osgManipulator) -+set(OPENTHREADS_LIBRARY unofficial::osg::OpenThreads) - find_package(CURL REQUIRED) - find_package(GDAL REQUIRED) - - # optional --find_package(GEOS) --find_package(Sqlite3) --find_package(Draco) --find_package(BASISU) --find_package(GLEW) --find_package(Protobuf) --find_package(WEBP) --find_package(Blend2D) --find_package(Blosc) -+find_package(GEOS CONFIG REQUIRED) -+set(GEOS_LIBRARY GEOS::geos_c) -+find_package(SQLITE3 NAMES unofficial-sqlite3 REQUIRED) -+set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3) -+find_package(Draco REQUIRED) -+find_package(BASISU REQUIRED) -+find_package(GLEW REQUIRED) -+find_package(Protobuf REQUIRED) -+find_package(WEBP NAMES WebP CONFIG REQUIRED) -+set(WEBP_LIBRARY WebP::webp) -+if(WITH_BLEND2D) -+ find_package(BLEND2D CONFIG REQUIRED) -+ set(BLEND2D_LIBRARY blend2d::blend2d) -+endif() -+find_package(BLOSC REQUIRED) - - if(OSGEARTH_ENABLE_PROFILING) -- find_package(Tracy) -+ find_package(Tracy REQUIRED) - endif() - - if(OSGEARTH_BUILD_ZIP_PLUGIN) -- find_package(LibZip) -+ find_package(libzip CONFIG REQUIRED) -+ set(LIBZIP_LIBRARY libzip::zip) - endif() - - if(OSGEARTH_BUILD_TRITON_NODEKIT) -- find_package(Triton QUIET) -+ find_package(Triton QUIET REQUIRED) - endif() - - if(OSGEARTH_BUILD_SILVERLINING_NODEKIT) -- find_package(SilverLining QUIET) -+ find_package(SilverLining QUIET REQUIRED) - endif() - - # Sqlite enables the MBTiles format: -@@ -221,7 +240,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile - # Duktape is the JavaScript interpreter - SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") - IF (WITH_EXTERNAL_DUKTAPE) -- find_package(Duktape) -+ find_package(Duktape REQUIRED) - ENDIF (WITH_EXTERNAL_DUKTAPE) - - # Whether to install shaders (glsl files). -@@ -232,7 +251,8 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak - # TinyXML is an XML parsing library - SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") - IF (WITH_EXTERNAL_TINYXML) -- find_package(TinyXML) -+ find_package(TINYXML NAMES tinyxml REQUIRED) -+ set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml) - ENDIF (WITH_EXTERNAL_TINYXML) - - # postfix settings for various configs -@@ -307,6 +327,7 @@ IF(OSGEARTH_BUILD_SHARED_LIBS) - SET(OSGEARTH_DYNAMIC_OR_STATIC "SHARED") - ELSE() - SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC") -+ add_definitions(-DOSGEARTH_LIBRARY_STATIC) - ENDIF() - - diff --git a/ports/osgearth/install-plugins.patch b/ports/osgearth/install-plugins.patch new file mode 100644 index 00000000000000..ec9d89b3ed5249 --- /dev/null +++ b/ports/osgearth/install-plugins.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e147e4d1..133940902 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,7 @@ set(OSGEARTH_EMBEDDED_THIRD_PARTY_DIR ${PROJECT_SOURCE_DIR}/src/third_party) + set(INSTALL_RUNTIME_FOLDER "bin${OSGEARTH_INSTALL_FOLDER_SUFFIX}") # executables + set(INSTALL_LIBRARY_FOLDER "bin${OSGEARTH_INSTALL_FOLDER_SUFFIX}") # .dll/.so + set(INSTALL_ARCHIVE_FOLDER "lib${OSGEARTH_INSTALL_FOLDER_SUFFIX}") # .lib/.a +-set(INSTALL_PLUGINS_FOLDER "bin${OSGEARTH_INSTALL_FOLDER_SUFFIX}") # parent folder of OSG plugins folder ++set(INSTALL_PLUGINS_FOLDER "plugins") # parent folder of OSG plugins folder + + include(oe_ios) + include(oe_osx) diff --git a/ports/osgearth/link-libraries.patch b/ports/osgearth/link-libraries.patch deleted file mode 100644 index 19f34fb18c2b23..00000000000000 --- a/ports/osgearth/link-libraries.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake -index 7dd0998..730af85 100644 ---- a/CMakeModules/OsgEarthMacroUtils.cmake -+++ b/CMakeModules/OsgEarthMacroUtils.cmake -@@ -92,6 +92,11 @@ ENDMACRO(DETECT_OSG_VERSION) - - MACRO(LINK_WITH_VARIABLES TRGTNAME) - FOREACH(varname ${ARGN}) -+ string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}") -+ if(DEFINED ${lwv_libraries}) -+ TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}}) -+ continue() -+ endif() - IF(${varname}_DEBUG) - IF(${varname}_RELEASE) - TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}") diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 70f9bccce0af4b..615ae91d0632df 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -2,16 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth REF "osgearth-${VERSION}" - SHA512 f65c31922bebcbf722474a047dc29c8c1ceec9c037b0704811af2627fc2d0a124b6e95888e7d3b9b0e5acc146a88ebf8669e3f864a75a91751c3a4571d05a630 + SHA512 2f764eb1fff21cff57a04eceb73643b372c8b70899114c88cdf9928d525517214959745cb70b99ad3d1def946bfb3f58f16b4969ee4117b7563398f2410ee3e2 HEAD_REF master PATCHES - link-libraries.patch - find-package.patch - remove-tool-debug-suffix.patch remove-lerc-gltf.patch - export-plugins.patch - protobuf.patch - blend2d.patch + install-plugins.patch ) if("tools" IN_LIST FEATURES) @@ -22,8 +17,8 @@ if("tools" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH IMGUI_SOURCE_PATH REPO ocornut/imgui - REF 9e8e5ac36310607012e551bb04633039c2125c87 #docking branch - SHA512 1f1f743833c9a67b648922f56a638a11683b02765d86f14a36bc6c242cc524c4c5c5c0b7356b8053eb923fafefc53f4c116b21fb3fade7664554a1ad3b25e5ff + REF cab7edd135fb8a02b3552e9abe4c312d595e8777 #docking branch + SHA512 26dfe94793bcc7b041c723cfbf2033c32e5050d87b99856746f9f3e7f562db15b9432bf92747db7823acbc6e366dbcb023653692bb5336ce65a98483c4d8232a HEAD_REF master ) @@ -33,16 +28,6 @@ if("tools" IN_LIST FEATURES) file(COPY "${IMGUI_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/third_party/imgui") endif() -file(REMOVE - "${SOURCE_PATH}/CMakeModules/FindBlend2D.cmake" - "${SOURCE_PATH}/CMakeModules/FindGEOS.cmake" - "${SOURCE_PATH}/CMakeModules/FindLibZip.cmake" - "${SOURCE_PATH}/CMakeModules/FindOSG.cmake" - "${SOURCE_PATH}/CMakeModules/FindSqlite3.cmake" - "${SOURCE_PATH}/CMakeModules/FindWEBP.cmake" - "${SOURCE_PATH}/src/osgEarth/tinyxml.h" # https://github.com/gwaldron/osgearth/issues/1002 -) - string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -63,6 +48,7 @@ vcpkg_cmake_configure( -DOSGEARTH_BUILD_PROCEDURAL_NODEKIT=OFF -DOSGEARTH_BUILD_TRITON_NODEKIT=OFF -DOSGEARTH_BUILD_SILVERLINING_NODEKIT=OFF + -DOSGEARTH_BUILD_ZIP_PLUGIN=OFF -DWITH_EXTERNAL_TINYXML=ON -DCMAKE_JOB_POOL_LINK=console # Serialize linking to avoid OOM OPTIONS_DEBUG @@ -72,7 +58,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake/) +vcpkg_cmake_config_fixup() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/osgEarth/Export" "defined( OSGEARTH_LIBRARY_STATIC )" "1") @@ -89,8 +75,7 @@ if("tools" IN_LIST FEATURES) endif() endif() vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_bakefeaturetiles osgearth_boundarygen - osgearth_clamp osgearth_conv osgearth_imgui osgearth_tfs osgearth_toc osgearth_version osgearth_viewer - osgearth_createtile osgearth_mvtindex + osgearth_clamp osgearth_conv osgearth_imgui osgearth_tfs osgearth_version osgearth_viewer AUTO_CLEAN ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") diff --git a/ports/osgearth/protobuf.patch b/ports/osgearth/protobuf.patch deleted file mode 100644 index b05c2f873cd741..00000000000000 --- a/ports/osgearth/protobuf.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake -index ccf209f6a..e961531f8 100644 ---- a/CMakeModules/OsgEarthMacroUtils.cmake -+++ b/CMakeModules/OsgEarthMacroUtils.cmake -@@ -94,28 +94,28 @@ MACRO(LINK_WITH_VARIABLES TRGTNAME) - FOREACH(varname ${ARGN}) - string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}") - if(DEFINED ${lwv_libraries}) -- TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}}) -+ TARGET_LINK_LIBRARIES(${TRGTNAME} PUBLIC ${${lwv_libraries}}) - continue() - endif() - IF(${varname}_DEBUG) - IF(${varname}_RELEASE) -- TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}") -+ TARGET_LINK_LIBRARIES(${TRGTNAME} PUBLIC optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}") - ELSE(${varname}_RELEASE) -- TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}}" debug "${${varname}_DEBUG}") -+ TARGET_LINK_LIBRARIES(${TRGTNAME} PUBLIC optimized "${${varname}}" debug "${${varname}_DEBUG}") - ENDIF(${varname}_RELEASE) - ELSE(${varname}_DEBUG) -- TARGET_LINK_LIBRARIES(${TRGTNAME} ${${varname}} ) -+ TARGET_LINK_LIBRARIES(${TRGTNAME} PUBLIC ${${varname}} ) - ENDIF(${varname}_DEBUG) - ENDFOREACH(varname) - ENDMACRO(LINK_WITH_VARIABLES TRGTNAME) - - MACRO(LINK_INTERNAL TRGTNAME) -- TARGET_LINK_LIBRARIES(${TRGTNAME} ${ARGN}) -+ TARGET_LINK_LIBRARIES(${TRGTNAME} PUBLIC ${ARGN}) - ENDMACRO(LINK_INTERNAL TRGTNAME) - - MACRO(LINK_EXTERNAL TRGTNAME) - FOREACH(LINKLIB ${ARGN}) -- TARGET_LINK_LIBRARIES(${TRGTNAME} "${LINKLIB}" ) -+ TARGET_LINK_LIBRARIES(${TRGTNAME} PUBLIC "${LINKLIB}" ) - ENDFOREACH(LINKLIB) - ENDMACRO(LINK_EXTERNAL TRGTNAME) - -@@ -179,7 +179,7 @@ MACRO(SETUP_LINK_LIBRARIES) - ENDIF(TARGET_LIBRARIES_VARS) - - FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES}) -- TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB}) -+ TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} PUBLIC ${LINKLIB}) - ENDFOREACH(LINKLIB) - ENDMACRO(SETUP_LINK_LIBRARIES) - -diff --git a/src/applications/osgearth_viewerIOS/CMakeLists.txt b/src/applications/osgearth_viewerIOS/CMakeLists.txt -index e66fd25c7..9db76784e 100644 ---- a/src/applications/osgearth_viewerIOS/CMakeLists.txt -+++ b/src/applications/osgearth_viewerIOS/CMakeLists.txt -@@ -1,7 +1,7 @@ - MACRO(LINK_OSG_STATIC_PLUGINS) - FOREACH(LINKLIB ${OSG_STATIC_PLUGINS}) - SET(OSG_PLUGINS_PATH "${OSG_DIR}/lib") -- TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized "${OSG_PLUGINS_PATH}/lib${LINKLIB}.a" debug "${OSG_PLUGINS_PATH}/lib${LINKLIB}${CMAKE_DEBUG_POSTFIX}.a") -+ TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} PUBLIC optimized "${OSG_PLUGINS_PATH}/lib${LINKLIB}.a" debug "${OSG_PLUGINS_PATH}/lib${LINKLIB}${CMAKE_DEBUG_POSTFIX}.a") - ENDFOREACH(LINKLIB) - ENDMACRO(LINK_OSG_STATIC_PLUGINS) - -diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt -index e320eb340..cd711a927 100644 ---- a/src/osgEarth/CMakeLists.txt -+++ b/src/osgEarth/CMakeLists.txt -@@ -943,7 +943,7 @@ IF(Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE) - ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS) - ENDIF() - -- LINK_WITH_VARIABLES(${LIB_NAME} Protobuf_LIBRARIES) -+ TARGET_LINK_LIBRARIES(${LIB_NAME} PUBLIC protobuf::libprotobuf) - ENDIF() - - # ESRI FileGeodatabase? diff --git a/ports/osgearth/remove-lerc-gltf.patch b/ports/osgearth/remove-lerc-gltf.patch index e39fbfab6a4dd2..af191e633522c9 100644 --- a/ports/osgearth/remove-lerc-gltf.patch +++ b/ports/osgearth/remove-lerc-gltf.patch @@ -1,16 +1,16 @@ diff --git a/src/osgEarthDrivers/CMakeLists.txt b/src/osgEarthDrivers/CMakeLists.txt -index 79acbe9c4..89e28b141 100644 +index dd54d0ae8..37b2fbd83 100644 --- a/src/osgEarthDrivers/CMakeLists.txt +++ b/src/osgEarthDrivers/CMakeLists.txt -@@ -31,7 +31,6 @@ add_subdirectory(earth) +@@ -19,7 +19,6 @@ add_subdirectory(earth) add_subdirectory(engine_rex) add_subdirectory(featurefilter_intersect) add_subdirectory(featurefilter_join) -add_subdirectory(gltf) add_subdirectory(kml) - add_subdirectory(mapinspector) - add_subdirectory(monitor) -@@ -61,5 +60,4 @@ endif() + add_subdirectory(script_engine_duktape) + add_subdirectory(sky_gl) +@@ -45,5 +44,4 @@ add_subdirectory(cache_rocksdb) IF(NOT APPLE AND NOT ANDROID) add_subdirectory(fastdxt) diff --git a/ports/osgearth/remove-tool-debug-suffix.patch b/ports/osgearth/remove-tool-debug-suffix.patch deleted file mode 100644 index 24cbb2fe58a900..00000000000000 --- a/ports/osgearth/remove-tool-debug-suffix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake -index 6e0eb46..12388c4 100644 ---- a/CMakeModules/OsgEarthMacroUtils.cmake -+++ b/CMakeModules/OsgEarthMacroUtils.cmake -@@ -364,8 +364,6 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP) - - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}") - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME}) -- SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_OUTPUT_NAME "${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}") -- SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELEASE_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELEASE_POSTFIX}") - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES RELWITHDEBINFO_OUTPUT_NAME "${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}") - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES MINSIZEREL_OUTPUT_NAME "${TARGET_NAME}${CMAKE_MINSIZEREL_POSTFIX}") - diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 9d463e0e609d5d..6c375190011e3f 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,11 +1,10 @@ { "name": "osgearth", - "version": "3.4", - "port-version": 3, + "version": "3.7", "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "license": "LGPL-3.0-or-later", - "supports": "!(arm | x86 | wasm32 | xbox | uwp)", + "supports": "!(arm | x86 | wasm32 | xbox)", "dependencies": [ "basisu", "blosc", @@ -14,7 +13,6 @@ "geos", "glew", "libwebp", - "libzip", "opengl", { "name": "osg", diff --git a/ports/pagmo2/portfile.cmake b/ports/pagmo2/portfile.cmake index 28ff77c219e355..995d9dc41b3e81 100644 --- a/ports/pagmo2/portfile.cmake +++ b/ports/pagmo2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO esa/pagmo2 - REF 27ae9159f4fcd11bb93de0ae8189d15352655b0a # v2.19.0 - SHA512 9f85fe5dbce0542bf3c52918562da9632ec64ee2839d1d2404bf5a6caa4c854c654ca1735c617a15208a597a79a8c28431378e6968335b1c3e9e8d86b6d7d237 + REF "v${VERSION}" + SHA512 9ebe7f63b907607ea5762e56a884be62630efaca3f45d9ba9ad85ca1818d60d09864422bd075c2653aea1a14609fe9ad6520297aee5a00e07fa88df45872cef9 HEAD_REF master PATCHES doxygen.patch diff --git a/ports/pagmo2/vcpkg.json b/ports/pagmo2/vcpkg.json index c301f4ead8c66d..54e644ab03613c 100644 --- a/ports/pagmo2/vcpkg.json +++ b/ports/pagmo2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pagmo2", - "version": "2.19.0", - "port-version": 2, + "version": "2.19.1", "description": "A C++ platform to perform parallel computations of optimization tasks (global and local) via the asynchronous generalized island model.", "homepage": "https://esa.github.io/pagmo2/", "license": "GPL-3.0-or-later OR LGPL-3.0-or-later", diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index c30aea11903f11..81c05ef6996e61 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -4,15 +4,10 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/pango REF "${VERSION}" - SHA512 5de67e711a1f25bd2c741162bb8306ae380d134f95b9103db6e96864d3a1100321ce106d8238dca54e746cd8f1cfdbe50cc407878611d3d09694404f3f128c73 + SHA512 1c5f5f2de778b2ca157a4f3eb8bbbba1a79f5f9d60aac678e9c213005f1d8bedfc027ee5c1cebb07dc0eb8c308c38c37beb05293ef2cbe4ac9a0b481176934bb HEAD_REF master ) -# Fix for https://github.com/microsoft/vcpkg/issues/31573 -# Mimics patch for Gentoo https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f688df5100ef2b88c975ecd40fd343c62e2ab276 -# Silence false positive with GCC 13 and -O3 at least -# https://gitlab.gnome.org/GNOME/pango/-/issues/740 -vcpkg_replace_string("${SOURCE_PATH}/meson.build" "-Werror=array-bounds" "") if("introspection" IN_LIST FEATURES) list(APPEND OPTIONS_DEBUG -Dintrospection=disabled) diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index e61eb9bc0202b1..2e1032198797f4 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pango", - "version": "1.50.14", - "port-version": 4, + "version": "1.54.0", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "license": "LGPL-2.0-or-later", diff --git a/ports/pangolin/devendor-palsigslot.patch b/ports/pangolin/devendor-palsigslot.patch index 4259172d0aec24..4a858e0d8cb819 100644 --- a/ports/pangolin/devendor-palsigslot.patch +++ b/ports/pangolin/devendor-palsigslot.patch @@ -1,5 +1,5 @@ diff --git a/cmake/PangolinConfig.cmake.in b/cmake/PangolinConfig.cmake.in -index f891e34..6fbfc7d 100644 +index 3ceea9d..e5bf9f0 100644 --- a/cmake/PangolinConfig.cmake.in +++ b/cmake/PangolinConfig.cmake.in @@ -12,6 +12,7 @@ SET( Pangolin_LIBRARY "${Pangolin_LIBRARIES}" ) @@ -11,10 +11,10 @@ index f891e34..6fbfc7d 100644 if (UNIX) find_dependency(Threads) diff --git a/components/pango_core/CMakeLists.txt b/components/pango_core/CMakeLists.txt -index 315913d..1d1a1d0 100644 +index e1d931b..6c6ad4d 100644 --- a/components/pango_core/CMakeLists.txt +++ b/components/pango_core/CMakeLists.txt -@@ -44,6 +44,9 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include" +@@ -49,6 +49,9 @@ install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include" DESTINATION ${CMAKE_INSTALL_PREFIX} ) diff --git a/ports/pangolin/ffmpeg-vxmc.patch b/ports/pangolin/ffmpeg-vxmc.patch deleted file mode 100644 index bccc9f16f14899..00000000000000 --- a/ports/pangolin/ffmpeg-vxmc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/components/pango_video/include/pangolin/video/drivers/ffmpeg_common.h -+++ b/components/pango_video/include/pangolin/video/drivers/ffmpeg_common.h -@@ -55,10 +55,6 @@ inline std::string FfmpegFmtToString(const AVPixelFormat fmt) - TEST_PIX_FMT_RETURN(YUVJ420P); - TEST_PIX_FMT_RETURN(YUVJ422P); - TEST_PIX_FMT_RETURN(YUVJ444P); --#ifdef FF_API_XVMC -- TEST_PIX_FMT_RETURN(XVMC_MPEG2_MC); -- TEST_PIX_FMT_RETURN(XVMC_MPEG2_IDCT); --#endif - TEST_PIX_FMT_RETURN(UYVY422); - TEST_PIX_FMT_RETURN(UYYVYY411); - TEST_PIX_FMT_RETURN(BGR8); diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake index 991f49cd49a1f5..74a1f530d0f426 100644 --- a/ports/pangolin/portfile.cmake +++ b/ports/pangolin/portfile.cmake @@ -6,12 +6,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevenlovegrove/Pangolin - REF v0.8 - SHA512 d4ca405097e8c439a4f74495f374bc5d5e4febafcf59ee88d985a8764ed36da1753ca4a3a73476dfb74c7d92df31a99242df6e1b47c648e860eee835a6f4f434 + REF "v${VERSION}" + SHA512 ef2461770def3b0752d23df0c9a0090b733943249404528d0b2ba985d08c9083aabe685e3fd00be08318ea7b90dc38e9735ab004124643619e6cf369d64f6321 HEAD_REF master PATCHES devendor-palsigslot.patch - ffmpeg-vxmc.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/pangolin/vcpkg.json b/ports/pangolin/vcpkg.json index 49438dbecf3178..5d0880c8c236b8 100644 --- a/ports/pangolin/vcpkg.json +++ b/ports/pangolin/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pangolin", - "version": "0.8", - "port-version": 3, + "version": "0.9.2", "description": "Lightweight GUI Library", "homepage": "https://github.com/stevenlovegrove/Pangolin", "license": "MIT", @@ -9,6 +8,7 @@ "dependencies": [ "eigen3", "glew", + "libepoxy", "palsigslot", { "name": "vcpkg-cmake", diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index 47a5e546b6bfa8..82d6c3f9a99d60 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe - SHA512 174148310e9d2fd37c67c3e5f4fd84c66847647732ebed29878e967b44aa87bcf91c304b2193ebf11b8586e458cd13f12d6ceec2fbf33a1aaeb552a100a6307f + REF "${VERSION}" + SHA512 aecf9396edbdd65549603484d1841cd676b197d164ee2979ee5acaf657da4fa9ebc1a59fc8550cfa440ce27794cdc59cdf86a6521e4bda084c0600cb2c92f5cf HEAD_REF 3.x ) diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json index 924de17d12ef42..a22cbe0bdf970f 100644 --- a/ports/pegtl/vcpkg.json +++ b/ports/pegtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pegtl", - "version-semver": "3.2.7", + "version-semver": "3.2.8", "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", "homepage": "https://github.com/taocpp/PEGTL", "license": "MIT", diff --git a/ports/perfetto/portfile.cmake b/ports/perfetto/portfile.cmake index 2be1f7cb3bded1..26a7b38bc032a8 100644 --- a/ports/perfetto/portfile.cmake +++ b/ports/perfetto/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/perfetto REF "v${VERSION}" - SHA512 4aa83f121fdc9c8f8d1bfdb22bfa78a8658352ccef58e0efbfa88dbda5e1bc6bca4a3d2cb45bdc6c91d6cfced0e7df7dce678a034935aa247e0f92bfb6adf2b2 + SHA512 ea7520eaea61f2a73aab3567120a136b5d9570916d7e47f6091cecd10c37428aab564eedd54b3b417ab67ea1b24d479fa5674de9d5b2f2301436eae9c67b5b69 HEAD_REF main ) diff --git a/ports/perfetto/vcpkg.json b/ports/perfetto/vcpkg.json index 41a826af4a5df8..32b3498767ae91 100644 --- a/ports/perfetto/vcpkg.json +++ b/ports/perfetto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "perfetto", - "version": "47.0", + "version": "48.1", "description": "System profiling, app tracing and trace analysis", "homepage": "https://perfetto.dev", "license": "Apache-2.0", diff --git a/ports/plasma-wayland-protocols/portfile.cmake b/ports/plasma-wayland-protocols/portfile.cmake index 31afb78148b343..647fb0f6d19553 100644 --- a/ports/plasma-wayland-protocols/portfile.cmake +++ b/ports/plasma-wayland-protocols/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/plasma-wayland-protocols - REF v1.8.0 - SHA512 5e3cfd6d2d6a6f8dfcf97ef046bd2a671945abf81dc47d452eed4e6e0fde44e98566439cb12b5099adf023cb9ff6257cc97d9fa9bd432946c7687914cb4ee88b + REF "v${VERSION}" + SHA512 3cb5ea1c5c69384181005520c9999b0f1548ec91f2894204ab9a103dd6d76621932f4d6c536664797ab2d24df4e1f182a353bd9be802565ec48dec657cc59276 HEAD_REF master ) diff --git a/ports/plasma-wayland-protocols/vcpkg.json b/ports/plasma-wayland-protocols/vcpkg.json index 201fd0b333b1a2..f93b2bbfd09ed5 100644 --- a/ports/plasma-wayland-protocols/vcpkg.json +++ b/ports/plasma-wayland-protocols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "plasma-wayland-protocols", - "version": "1.8.0", + "version": "1.14.0", "description": "The non-standard Wayland protocols use by KDE Plasma", "homepage": "https://invent.kde.org/libraries/plasma-wayland-protocols/-/tree/master/", "supports": "linux", diff --git a/ports/poselib/portfile.cmake b/ports/poselib/portfile.cmake new file mode 100644 index 00000000000000..a91e46d45d1d82 --- /dev/null +++ b/ports/poselib/portfile.cmake @@ -0,0 +1,25 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PoseLib/PoseLib + REF "v${VERSION}" + SHA512 adc43c4f0fd8544d2c7ef05538696a8ae614837f5e90c31b8b9c8f4b5a11eb773229c22444e01482de697a0f5b3137d4a63a24ba9fcc72b366a347252d3c16b1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DMARCH_NATIVE=OFF + -DWITH_BENCHMARK=OFF + -DPYTHON_PACKAGE=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PoseLib) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/poselib/vcpkg.json b/ports/poselib/vcpkg.json new file mode 100644 index 00000000000000..018d5dcf77ab29 --- /dev/null +++ b/ports/poselib/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "poselib", + "version": "2.0.4", + "description": "Minimal solvers for calibrated camera pose estimation", + "homepage": "https://github.com/PoseLib/PoseLib", + "license": "BSD-3-Clause", + "dependencies": [ + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 968515fd9092d3..f33be86c1f99d0 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 1ea95297f4b8ee1f4eec57817ead67e3d9b2fd7b9721c0ec5d98ab8b041b33b521689f34e874e1a6a305d5a9ed174798ff46c89c397a12169c0f96bc50f2a486 + SHA512 929a4010277bdf7ac7950e1f37b946328ef3da59dafa283db3841236833bde4cb2b734545e7bad8fd104bf4d083f3b50dc4a07d6e07a9fcdde78eda24e20b458 HEAD_REF main PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 19cc691eda1e87..e76852e54e2b3d 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2024.09.30.00", + "version-string": "2024.10.07.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/python3/portfile.cmake b/ports/python3/portfile.cmake index 414a4244f7cc68..7da8fa9bd15374 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -86,8 +86,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython - REF v${PYTHON_VERSION} - SHA512 c2ebe72ce53dd2d59750a7b0bdaf15ebb7ecb6f67d2913a457bf5d32bd0f640815f9496f2fa3ebeac0722264d000735d90d3ffaeac2de1f066b7aee994bf9b24 + REF v${VERSION} + SHA512 411f43495943b8aeec287d4339bac6beb6a7224b0844cc4d48188b208fbbbc6404ad031b6e7a3bed0900baf972c4536a54f4da1ab39202f4f405a188ca04ae07 HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 8918f1d9212001..50b1b51d2af37c 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "python3", - "version": "3.11.8", - "port-version": 5, + "version": "3.11.10", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index 4c3a2bdcce6de8..dda00336f9a46e 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib REF "v${VERSION}" - SHA512 5017548669fec649a9324298d828e11e44b9fb12924f5bfebbe90d2893bd02c627c38f7e8516416d894ab82f3fa3c77cba2a2ba09a25c19dc0efa130a3dba72c + SHA512 5c8cf1cc28a23d6586a542746ac61264dfdbe88c5a92a1292dfe19fadcdb23729fbbdca44da2fdd2917a48f0ba864c79c525d4e9ac5bbaef58e03a7ddaa177b0 HEAD_REF master ) diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index b734e6ca1910f9..69baacd8a93a1a 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quantlib", - "version": "1.35", + "version": "1.36", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", "license": "BSD-3-Clause", diff --git a/ports/rapidcsv/portfile.cmake b/ports/rapidcsv/portfile.cmake index cccba30ed0ab61..ca72327205462c 100644 --- a/ports/rapidcsv/portfile.cmake +++ b/ports/rapidcsv/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO d99kris/rapidcsv REF "v${VERSION}" - SHA512 1bf6c74f4c2a5f2524cb174a5c67c655678eb849217e4ee38b3c10a5361b85734161ce91509882c424a3ad691b72cd211cad9a471afa370cf307fad8f9a14df7 + SHA512 8fb03ad7e3b53f01c568deb7705a7185a66cfc1eb0245b0165d580a8f60a8972197cd5eac3cda115d9bbb3c06c89de25a84acad62d13d6ffb366d3f1155a1b9c HEAD_REF master ) diff --git a/ports/rapidcsv/vcpkg.json b/ports/rapidcsv/vcpkg.json index 0a566cadbc24e7..42fdacc66ead39 100644 --- a/ports/rapidcsv/vcpkg.json +++ b/ports/rapidcsv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rapidcsv", - "version": "8.83", + "version": "8.84", "description": "Rapidcsv is a C++ header-only library for CSV parsing.", "homepage": "https://github.com/d99kris/rapidcsv/", "license": "BSD-3-Clause", diff --git a/ports/reproc/fix-gcc13-build-error.patch b/ports/reproc/fix-gcc13-build-error.patch deleted file mode 100644 index cf464b531b5c32..00000000000000 --- a/ports/reproc/fix-gcc13-build-error.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/reproc++/include/reproc++/reproc.hpp b/reproc++/include/reproc++/reproc.hpp -index ab6f139..d4b370f 100644 ---- a/reproc++/include/reproc++/reproc.hpp -+++ b/reproc++/include/reproc++/reproc.hpp -@@ -88,18 +88,18 @@ struct redirect { - - struct options { - struct { -- env::type behavior; -+ reproc::env::type behavior; - /*! Implicitly converts from any STL container of string pairs to the - environment format expected by `reproc_start`. */ -- class env extra; -+ reproc::env extra; - } env = {}; - - const char *working_directory = nullptr; - - struct { -- redirect in; -- redirect out; -- redirect err; -+ struct redirect in; -+ struct redirect out; -+ struct redirect err; - bool parent; - bool discard; - FILE *file; diff --git a/ports/reproc/portfile.cmake b/ports/reproc/portfile.cmake index c8c9f384571d95..ff6d6fded92469 100644 --- a/ports/reproc/portfile.cmake +++ b/ports/reproc/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaanDeMeyer/reproc REF "v${VERSION}" - SHA512 c592521960f1950d626261738091d25efdf764ee1a0c72a58c28c66eaebf6073b2c978f1dc2c8dbe89b0be7ec1629a3a45cb1fafa0ebe21b5df8d4d27c992675 + SHA512 d6c8abfc4fbef894310f4ad6250ddf269279bce13954ba6bc0147e0bf7e08f5a5e924ba079205881d6bf1dfe865e5f4389517d6d3bbafdede24ed328c549a991 HEAD_REF main - PATCHES - fix-gcc13-build-error.patch #Please remove it in the next release version ) vcpkg_cmake_configure( diff --git a/ports/reproc/vcpkg.json b/ports/reproc/vcpkg.json index 4326597ed8e4bc..347effc2b58697 100644 --- a/ports/reproc/vcpkg.json +++ b/ports/reproc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "reproc", - "version": "14.2.4", - "port-version": 2, + "version": "14.2.5", "description": "Cross-platform (C99/C++11) process library", "homepage": "https://github.com/DaanDeMeyer/reproc", "supports": "!uwp", diff --git a/ports/simd/portfile.cmake b/ports/simd/portfile.cmake index b29fe1e5cf3d0a..ddf814f2b5d320 100644 --- a/ports/simd/portfile.cmake +++ b/ports/simd/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ermig1979/Simd REF "v${VERSION}" - SHA512 663fa32e1952c67814e62a697e29f8e4589a444f927130dd8e8fed909ff303d731c7de647d45e43312f35515772a8b8557fe417895d7ec03d0e9977bc3a1b3ee + SHA512 b490d1ea42cf5fa3d5a6ccf5f62c2f2f661c8e413d6a11d5caf384c9b4b6d0cda2c76499f03711a492c83cd56fbf685f58fb6626579d18053158d084a8ce74df HEAD_REF master PATCHES fix-platform-detection.patch diff --git a/ports/simd/vcpkg.json b/ports/simd/vcpkg.json index 9811e94f1f2cab..94a32c70c0d920 100644 --- a/ports/simd/vcpkg.json +++ b/ports/simd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simd", - "version": "6.1.140", + "version": "6.1.142", "description": "Simd image processing and machine learning library, designed for C and C++ programmers", "homepage": "https://github.com/ermig1979/Simd", "license": "MIT", diff --git a/ports/simdutf/portfile.cmake b/ports/simdutf/portfile.cmake index ba4ae54b970809..b8f1e65cac83a2 100644 --- a/ports/simdutf/portfile.cmake +++ b/ports/simdutf/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdutf/simdutf REF "v${VERSION}" - SHA512 6a248214208602739975b7b6e50ffff3acc11ba37b9f0493a6b498a64520bd4f6cb4cfa51076a9d5b07cb749d073ba0d16df246308b196e1fea672f30c40a3e5 + SHA512 57748cadd07a265e7297408f20ab7a7e899f8676972027b09b168464f7b68de82790a6877bfad8197501be95a754b18458be4c36740bafb7e0a32630c7bd1d2d HEAD_REF master ) diff --git a/ports/simdutf/vcpkg.json b/ports/simdutf/vcpkg.json index 33b58b254aa618..f6b91bcbaef4ec 100644 --- a/ports/simdutf/vcpkg.json +++ b/ports/simdutf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdutf", - "version-semver": "5.5.0", + "version-semver": "5.6.0", "description": "Unicode validation and transcoding at billions of characters per second", "homepage": "https://github.com/simdutf/simdutf", "dependencies": [ diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 9afb39554f8187..9984aa9042e35d 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -262,7 +262,9 @@ vcpkg_cmake_get_vars(cmake_vars_file) include("${cmake_vars_file}") if(VCPKG_TARGET_IS_WINDOWS) string(REGEX REPLACE "[\\]\$" "" WIN_VC "$ENV{VCINSTALLDIR}") + string(REGEX REPLACE "[\\]\$" "" WIN_SDK "$ENV{WindowsSdkDir}") string(APPEND OPTIONS " win_vc=\"${WIN_VC}\"") + string(APPEND OPTIONS " win_sdk=\"${WIN_SDK}\"") elseif(VCPKG_TARGET_IS_ANDROID) string(APPEND OPTIONS " ndk=\"${VCPKG_DETECTED_CMAKE_ANDROID_NDK}\" ndk_api=${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}") else() diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 41dbca8ca2d861..349b94a55bcf98 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "skia", "version": "129", - "port-version": 1, + "port-version": 2, "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index d1e797d695e3a0..ea7eae901ae9c9 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO libtiff/libtiff REF "v${VERSION}" - SHA512 ef2f1d424219d9e245069b7d23e78f5e817cf6ee516d46694915ab6c8909522166f84997513d20a702f4e52c3f18467813935b328fafa34bea5156dee00f66fa + SHA512 924bcd0fe19c03f65ffc068719371ab582057bf95c3847efd3bd03eaff1eb409ec3f22c9d373fafd9f993dd031a161850f0db082cb7068195c7c5c564fa222fc HEAD_REF master PATCHES FindCMath.patch prefer-config.diff - requires-lerc.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -74,9 +73,22 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRE if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES + fax2ps + fax2tiff + pal2rgb + ppm2tiff + raw2tiff + tiff2bw + tiff2pdf + tiff2ps + tiff2rgba + tiffcmp tiffcp + tiffcrop + tiffdither tiffdump tiffinfo + tiffmedian tiffset tiffsplit AUTO_CLEAN diff --git a/ports/tiff/prefer-config.diff b/ports/tiff/prefer-config.diff index 19f520acd2c7d6..340968d7e1ea35 100644 --- a/ports/tiff/prefer-config.diff +++ b/ports/tiff/prefer-config.diff @@ -1,5 +1,5 @@ diff --git a/cmake/LERCCodec.cmake b/cmake/LERCCodec.cmake -index 54504ca..8dc8e1b 100644 +index 54504ca..3e04997 100644 --- a/cmake/LERCCodec.cmake +++ b/cmake/LERCCodec.cmake @@ -25,7 +25,10 @@ @@ -40,3 +40,16 @@ index 3fac861..2957aa3 100644 if(ZSTD_FOUND) if(TARGET zstd::libzstd_shared) +diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt +index a8aa0c3..d5b9b25 100755 +--- a/libtiff/CMakeLists.txt ++++ b/libtiff/CMakeLists.txt +@@ -163,7 +163,7 @@ if(JBIG_SUPPORT) + endif() + if(LERC_SUPPORT) + target_link_libraries(tiff PRIVATE LERC::LERC) +- if(LERC_VERSION_STRING VERSION_GREATER_EQUAL "4.0") ++ if(1) + if(NOT BUILD_SHARED_LIBS) + set_target_properties(tiff PROPERTIES COMPILE_DEFINITIONS LERC_STATIC) + endif() diff --git a/ports/tiff/requires-lerc.patch b/ports/tiff/requires-lerc.patch deleted file mode 100644 index 5f3a3d13c4da12..00000000000000 --- a/ports/tiff/requires-lerc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libtiff/CMakeLists.txt b/libtiff/CMakeLists.txt -index 9c8024e..baee592 100755 ---- a/libtiff/CMakeLists.txt -+++ b/libtiff/CMakeLists.txt -@@ -148,7 +148,7 @@ if(JBIG_SUPPORT) - endif() - if(LERC_SUPPORT) - target_link_libraries(tiff PRIVATE LERC::LERC) -- list(APPEND tiff_libs_private_list "${LERC_LIBRARY}") -+ string(APPEND tiff_requires_private " Lerc") - if(NOT BUILD_SHARED_LIBS) - set_target_properties(tiff PROPERTIES COMPILE_DEFINITIONS LERC_STATIC) - endif() diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 0bcbd1a5dd5822..ab012f0cbaae74 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tiff", - "version": "4.6.0", - "port-version": 5, + "version": "4.7.0", "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": "libtiff", diff --git a/ports/tobias-loew-flags/add-install-configuration.patch b/ports/tobias-loew-flags/add-install-configuration.patch new file mode 100644 index 00000000000000..02e67101374ee0 --- /dev/null +++ b/ports/tobias-loew-flags/add-install-configuration.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78d96ff..3215aca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,39 @@ endif() + ################################################## + add_library(boost_flags INTERFACE) + #target_include_directories(boost_flags PUBLIC ${Boost_INCLUDE_DIRS}) +-target_include_directories(boost_flags INTERFACE ${CMAKE_SOURCE_DIR}/include) ++target_include_directories(boost_flags ++ INTERFACE ++ $ ++ $ ++ ) ++set_target_properties(boost_flags PROPERTIES ++ EXPORT_NAME flags ++) ++include(CMakePackageConfigHelpers) ++ ++configure_package_config_file( ++ cmake/unofficial-tobias-loew-flags-config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-tobias-loew-flags-config.cmake" ++ INSTALL_DESTINATION share/unofficial-tobias-loew-flags/ ++ NO_CHECK_REQUIRED_COMPONENTS_MACRO) ++ ++# Install. ++install(TARGETS boost_flags EXPORT unofficial-tobias-loew-flags) ++ ++install( ++ EXPORT unofficial-tobias-loew-flags ++ NAMESPACE unofficial::tobias-loew-flags:: ++ FILE unofficial-tobias-loew-flags-targets.cmake ++ DESTINATION share/unofficial-tobias-loew-flags/) ++ ++install(DIRECTORY include/boost DESTINATION include) ++ ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-tobias-loew-flags-config.cmake" ++ DESTINATION share/unofficial-tobias-loew-flags) ++ ++if(0) + if (Boost_FOUND) + target_include_directories(boost_flags INTERFACE ${Boost_INCLUDE_DIRS}) + endif() +@@ -79,4 +111,5 @@ endif() + # Subdirectories + ################################################## + add_subdirectory(test) ++endif() + # add_subdirectory(example) +diff --git a/cmake/unofficial-tobias-loew-flags-config.cmake.in b/cmake/unofficial-tobias-loew-flags-config.cmake.in +new file mode 100644 +index 0000000..9a784e1 +--- /dev/null ++++ b/cmake/unofficial-tobias-loew-flags-config.cmake.in +@@ -0,0 +1,5 @@ ++ ++@PACKAGE_INIT@ ++ ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-tobias-loew-flags-targets.cmake") ++ diff --git a/ports/tobias-loew-flags/portfile.cmake b/ports/tobias-loew-flags/portfile.cmake new file mode 100644 index 00000000000000..fa9806ccd8d90c --- /dev/null +++ b/ports/tobias-loew-flags/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tobias-loew/flags + REF 7a3cb950b79e7ab596ae22da30fa685c70ef497b + SHA512 a7835c3508830c1e215c301588ca26be84a6e1ca6ed4bfb5a3225bb390bf0637ac368bd7214e56809b24f6ac26a9e6f9478adf03d8e9140c2bd430c88f1c8f26 + HEAD_REF main + PATCHES add-install-configuration.patch +) + +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/tobias-loew-flags/vcpkg.json b/ports/tobias-loew-flags/vcpkg.json new file mode 100644 index 00000000000000..36a79459413c1b --- /dev/null +++ b/ports/tobias-loew-flags/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "tobias-loew-flags", + "version-date": "2024-09-10", + "description": "type-safe bitwise operations in C++, to be proposed for Boost", + "homepage": "https://tobias-loew.github.io/flags/doc/html/flags.html", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/triangle/CMakeLists.txt b/ports/triangle/CMakeLists.txt index 6157c00f37e2b6..4ee1382b23c1ae 100644 --- a/ports/triangle/CMakeLists.txt +++ b/ports/triangle/CMakeLists.txt @@ -1,45 +1,47 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5...3.30) project(triangle) -include(GNUInstallDirs) - -add_library(triangleLib triangle.c exports.def) -add_executable(triangle triangle.c) - -target_compile_definitions(triangleLib PRIVATE -DTRILIBRARY -DANSI_DECLARATORS) -target_compile_definitions(triangle PRIVATE -DANSI_DECLARATORS) -if(WIN32) - target_compile_definitions(triangleLib PRIVATE -DNO_TIMER) - target_compile_definitions(triangle PRIVATE -DNO_TIMER) -endif() - -if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - target_link_libraries(triangle m) -endif() - -target_include_directories(triangleLib PUBLIC - $ -) +option(BUILD_TOOL "Build the command line tool" OFF) -set_target_properties(triangleLib PROPERTIES POSITION_INDEPENDENT_CODE ON) - -set_target_properties(triangleLib PROPERTIES PUBLIC_HEADER - "${CMAKE_SOURCE_DIR}/triangle.h" -) - -set_target_properties(triangleLib PROPERTIES OUTPUT_NAME "triangle") +include(GNUInstallDirs) -install(TARGETS triangleLib EXPORT triangleTargets +add_library(triangle triangle.c exports.def) +set_target_properties(triangle PROPERTIES PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/triangle.h") +target_compile_definitions(triangle PRIVATE -DTRILIBRARY) + +add_executable(triangle_exe triangle.c) +set_target_properties(triangle_exe PROPERTIES OUTPUT_NAME "triangle") + +foreach(target IN ITEMS triangle triangle_exe) + target_compile_definitions(${target} PRIVATE -DANSI_DECLARATORS) + target_include_directories(${target} PUBLIC + "$" + "$" + ) + if(WIN32) + target_compile_definitions(${target} PRIVATE -DNO_TIMER) + endif() + if(UNIX AND NOT APPLE AND NOT ANDROID) + target_link_libraries(${target} PRIVATE m) + endif() +endforeach() + +install(TARGETS triangle + EXPORT triangle-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) -install(TARGETS triangle DESTINATION tools/triangle) - -install(EXPORT triangleTargets - FILE triangleConfig.cmake - NAMESPACE triangle:: - DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/triangle" +install(EXPORT triangle-targets + FILE unofficial-triangle-config.cmake + NAMESPACE unofficial::triangle:: + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-triangle" ) + +if(BUILD_TOOL) + install(TARGETS triangle_exe DESTINATION tools/triangle) +else() + set_target_properties(triangle_exe PROPERTIES EXCLUDE_FROM_ALL 1) +endif() diff --git a/ports/triangle/portfile.cmake b/ports/triangle/portfile.cmake index 505b3d4dd48f8a..630b2dd27bb786 100644 --- a/ports/triangle/portfile.cmake +++ b/ports/triangle/portfile.cmake @@ -11,21 +11,31 @@ vcpkg_extract_source_archive( PATCHES "enable_64bit_architecture.patch" ) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}") +vcpkg_check_features(OUT_FEATURE_OPTIONS options + FEATURES + tool BUILD_TOOL +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${options} + OPTIONS_DEBUG + -DBUILD_TOOL=OFF ) vcpkg_cmake_install() - vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-triangle) -vcpkg_cmake_config_fixup() +# migration polyfill +file(COPY "${CURRENT_PORT_DIR}/triangleConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/triangle") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/triangle") file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/triangle/triangleConfig.cmake b/ports/triangle/triangleConfig.cmake new file mode 100644 index 00000000000000..531d1368de9771 --- /dev/null +++ b/ports/triangle/triangleConfig.cmake @@ -0,0 +1,6 @@ +file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) +message(WARNING "find_package(${CMAKE_FIND_PACKAGE_NAME}) is deprecated.\n${usage}") + +include(CMakeFindDependencyMacro) +find_dependency(unofficial-triangle) +add_library(triangleLib ALIAS unofficial::triangle::triangle) diff --git a/ports/triangle/usage b/ports/triangle/usage new file mode 100644 index 00000000000000..b065965b6885d2 --- /dev/null +++ b/ports/triangle/usage @@ -0,0 +1,4 @@ +triangle provides CMake targets: + + find_package(unofficial-triangle CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::triangle::triangle) diff --git a/ports/triangle/vcpkg.json b/ports/triangle/vcpkg.json index 76376bf5d5cbbd..a4eaefac2c8fe4 100644 --- a/ports/triangle/vcpkg.json +++ b/ports/triangle/vcpkg.json @@ -1,9 +1,10 @@ { "name": "triangle", "version": "1.6", - "port-version": 3, + "port-version": 4, "description": "A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.", "homepage": "http://www.cs.cmu.edu/~quake/triangle.html", + "license": null, "supports": "!uwp", "dependencies": [ { @@ -14,5 +15,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "tool": { + "description": "Build the command line tool." + } + } } diff --git a/ports/vcpkg-get-python-packages/vcpkg.json b/ports/vcpkg-get-python-packages/vcpkg.json index 8d7870ca009887..4590bd8cde6f5e 100644 --- a/ports/vcpkg-get-python-packages/vcpkg.json +++ b/ports/vcpkg-get-python-packages/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-get-python-packages", - "version-date": "2024-01-24", + "version-date": "2024-09-29", "documentation": "https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_get_python_packages", "license": "MIT", "supports": "native" diff --git a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake index fdda6cfe80ede1..73e9bc049f3676 100644 --- a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake +++ b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake @@ -18,10 +18,6 @@ function(x_vcpkg_get_python_packages) endif() endif() - if(arg_PYTHON_VERSION STREQUAL "3") - set(PYTHON_VERSION_MINOR 11) - endif() - if(NOT DEFINED arg_OUT_PYTHON_VAR) set(arg_OUT_PYTHON_VAR "PYTHON${arg_PYTHON_VERSION}") endif() @@ -42,8 +38,8 @@ function(x_vcpkg_get_python_packages) vcpkg_from_github( OUT_SOURCE_PATH PYFILE_PATH REPO pypa/get-pip - REF 38e54e5de07c66e875c11a1ebbdb938854625dd8 #2022-03-07 - SHA512 431a9f66618a2f251db3a8c3311e7fc3af3ff7364ec1d14a99f1b9c237646b6146cef8b9471d83e1086dba2ed448bccc48d99b2bb375e4235d78e76d9970d3e5 + REF 24.2 + SHA512 7bcbc841564b7fc3cd2c109b9d3cfd34d853508edc9e040e9615fc0f9f18f74c7826d53671f65fa1abda3fd29a0a3f9f6114d9e9bdd6d120175ac207fd7ce321 ) vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/public/get-pip.py" --no-warn-script-location WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" @@ -75,8 +71,9 @@ function(x_vcpkg_get_python_packages) file(MAKE_DIRECTORY "${python_dir}/DLLs") set(python_sub_path /Scripts) set(python_venv virtualenv) - if(EXISTS "${python_dir}/python3${PYTHON_VERSION_MINOR}.zip") - file(COPY "${python_dir}/python3${PYTHON_VERSION_MINOR}.zip" DESTINATION "${venv_path}/Scripts") + file(GLOB python_zipped_stdlib "${python_dir}/python3*.zip") + if(python_zipped_stdlib) + file(COPY ${python_zipped_stdlib} DESTINATION "${venv_path}/Scripts") endif() set(python_venv_options "--app-data" "${venv_path}/data") else() diff --git a/ports/vxl/file_formats.diff b/ports/vxl/file_formats.diff index 2c6a1c58990d02..69455156b99479 100644 --- a/ports/vxl/file_formats.diff +++ b/ports/vxl/file_formats.diff @@ -1,5 +1,5 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 3483f9c..5040676 100644 +index 88daf27..a47c183 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -60,6 +60,10 @@ if(VXL_BUILD_CORE_IMAGING) @@ -13,11 +13,24 @@ index 3483f9c..5040676 100644 endif() +diff --git a/core/vpgl/algo/CMakeLists.txt b/core/vpgl/algo/CMakeLists.txt +index 9ec767a..fda53dc 100644 +--- a/core/vpgl/algo/CMakeLists.txt ++++ b/core/vpgl/algo/CMakeLists.txt +@@ -32,7 +32,7 @@ set( vpgl_algo_sources + vpgl_equi_rectification.h vpgl_equi_rectification.cxx + ) + include(${VXL_CMAKE_DIR}/FindTIFF.cmake) +-if(TIFF_FOUND) ++if(VXL_BUILD_CORE_IMAGING) + include_directories(${TIFF_INCLUDE_DIR}) + include( ${VXL_CMAKE_DIR}/FindGEOTIFF.cmake) + if(GEOTIFF_FOUND) diff --git a/core/vpgl/file_formats/CMakeLists.txt b/core/vpgl/file_formats/CMakeLists.txt -index cd33c8e..e2501d3 100644 +index d23a2f2..6c933f0 100644 --- a/core/vpgl/file_formats/CMakeLists.txt +++ b/core/vpgl/file_formats/CMakeLists.txt -@@ -8,7 +8,7 @@ set( vpgl_file_formats_sources +@@ -9,7 +9,7 @@ set( vpgl_file_formats_sources ) include(${VXL_CMAKE_DIR}/FindTIFF.cmake) diff --git a/ports/vxl/int_64.diff b/ports/vxl/int_64.diff deleted file mode 100644 index f7da27905149b9..00000000000000 --- a/ports/vxl/int_64.diff +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/core/vsl/Templates/vsl_vector_io+uint_64-.cxx b/core/vsl/Templates/vsl_vector_io+uint_64-.cxx -index 8807c44..a8090ca 100644 ---- a/core/vsl/Templates/vsl_vector_io+uint_64-.cxx -+++ b/core/vsl/Templates/vsl_vector_io+uint_64-.cxx -@@ -1,6 +1,6 @@ - #include - --#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_IS_LONG_LONG ) -+#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG ) - #include - VSL_VECTOR_IO_INSTANTIATE(vxl_uint_64); - -diff --git a/core/vsl/vsl_binary_explicit_io.h b/core/vsl/vsl_binary_explicit_io.h -index 9ff669f..87fff4f 100644 ---- a/core/vsl/vsl_binary_explicit_io.h -+++ b/core/vsl/vsl_binary_explicit_io.h -@@ -141,7 +141,7 @@ macro (int); - macro (unsigned int); - macro (long); - macro (unsigned long); --#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG ) -+#if VXL_HAS_INT_64 && ! ( VXL_INT_64_IS_LONG ) - macro (vxl_int_64); - macro (vxl_uint_64); - #endif -@@ -486,7 +486,7 @@ inline std::size_t vsl_convert_from_arbitrary_length(const unsigned char* buffer - - ///////////////////////////////////////////////////////////////////////// - --#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG ) -+#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG ) - - //: Decode a buffer of arbitrary length integers - // Converts from the integers from the arbitrary length format into -diff --git a/core/vsl/vsl_binary_io.cxx b/core/vsl/vsl_binary_io.cxx -index c36142b..af76327 100644 ---- a/core/vsl/vsl_binary_io.cxx -+++ b/core/vsl/vsl_binary_io.cxx -@@ -65,7 +65,7 @@ MACRO_MAKE_INTEGER_READ_WRITE(short); - MACRO_MAKE_INTEGER_READ_WRITE(unsigned short); - MACRO_MAKE_INTEGER_READ_WRITE(long); - MACRO_MAKE_INTEGER_READ_WRITE(unsigned long); --#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG) -+#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG ) - MACRO_MAKE_INTEGER_READ_WRITE(vxl_int_64); - MACRO_MAKE_INTEGER_READ_WRITE(vxl_uint_64); - #endif -diff --git a/core/vsl/vsl_binary_io.h b/core/vsl/vsl_binary_io.h -index d38478a..1a68137 100644 ---- a/core/vsl/vsl_binary_io.h -+++ b/core/vsl/vsl_binary_io.h -@@ -376,7 +376,7 @@ void vsl_b_read(vsl_b_istream& is,unsigned long& n ); - inline void vsl_print_summary(std::ostream& os, unsigned long n ) - { os << n; } - --#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG || VXL_INT_64_IS_LONGLONG ) -+#if VXL_HAS_INT_64 && !( VXL_INT_64_IS_LONG ) - - //: Write to vsl_b_ostream - void vsl_b_write(vsl_b_ostream& os,vxl_int_64 n ); diff --git a/ports/vxl/mingw.diff b/ports/vxl/mingw.diff index 6c19e622231163..134c96fb96c9d2 100644 --- a/ports/vxl/mingw.diff +++ b/ports/vxl/mingw.diff @@ -1,13 +1,13 @@ diff --git a/core/vul/vul_temp_filename.cxx b/core/vul/vul_temp_filename.cxx -index 87649e8..1fb263a 100644 +index 4921a04..731fee0 100644 --- a/core/vul/vul_temp_filename.cxx +++ b/core/vul/vul_temp_filename.cxx @@ -11,7 +11,7 @@ - #if defined (_MSC_VER) || defined(__MINGW32__) + #if defined(_MSC_VER) || defined(__MINGW32__) --# include -+# include +-# include ++# include #else - #if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__) - // Helper functions for Unix + # if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__) + // Helper functions for Unix diff --git a/ports/vxl/omit-broken-install.diff b/ports/vxl/omit-broken-install.diff deleted file mode 100644 index 7908499e936488..00000000000000 --- a/ports/vxl/omit-broken-install.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vcl/CMakeLists.txt b/vcl/CMakeLists.txt -index dd83858..243d57b 100644 ---- a/vcl/CMakeLists.txt -+++ b/vcl/CMakeLists.txt -@@ -115,7 +115,7 @@ vxl_configure_file(${CMAKE_CURRENT_LIST_DIR}/vcl_where_root_dir.h.in ${PROJECT_B - - include_directories(${PROJECT_BINARY_DIR}) - set( vcl_sources -- vcl_legacy_aliases.h ${VCL_COMPILER_DETECTION_HEADER} -+ vcl_legacy_aliases.h - vcl_deprecated.cxx vcl_deprecated.h - - vcl_cmath.h diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake index 3ed0d08d432f89..baabb933dbc6f6 100644 --- a/ports/vxl/portfile.cmake +++ b/ports/vxl/portfile.cmake @@ -6,18 +6,16 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vxl/vxl - REF dac1c7ed8e183e9c6de8b928c8b0294a7bd1d8ee # v2.0.2 - SHA512 4c6f6dcd793a50cbbc9c7f61c561ed4a747ded67e3dceb09792998c0f0d4294445a441fed668d59297560f196274b1c25593ce67b0aa7597cbb773328e8612c0 + REF v${VERSION} + SHA512 0b33e12557315058e7786c2049af3b01f1208e50660ccbc45f4d9a4dba4eeadfa5e3125380d8781eed2a9abf1d153ffb71c416ed2d196ab4194f5b3722fe6f2b HEAD_REF master PATCHES cmake-package.diff devendor.diff disable-tests.diff file_formats.diff - int_64.diff limits.diff mingw.diff - omit-broken-install.diff openjpeg.diff ) file(GLOB_RECURSE vendored_sources "${SOURCE_PATH}/v3p/*.c" "${SOURCE_PATH}/v3p/*.cpp" "${SOURCE_PATH}/v3p/*.cxx") diff --git a/ports/vxl/vcpkg.json b/ports/vxl/vcpkg.json index a071e27108333a..89ef75ce46b74d 100644 --- a/ports/vxl/vcpkg.json +++ b/ports/vxl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vxl", - "version": "2.0.2", - "port-version": 7, + "version": "3.5.0", "description": "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.", "homepage": "https://vxl.github.io/", "license": null, diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 9bade9e232d6cb..5036dc4156027e 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 1c6daf763ab8bcefec2c3798743e4979f812ec630bcb252afa333f8df90a96c7c6f8f05c30b2f970ade45e8419bc09633f355ce66114a8a337b3ddbf7b4b6443 + SHA512 cb64738645c5af63bd4a06112d3ddcee557ca426127f569fc360183fc5893c88049a9ac60212f6187f283f02911e48ef718fb1b5ba41b665ab2bdc312aeb4356 HEAD_REF main PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index 7ed115749557c3..47fc0ee65ac483 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2024.09.30.00", + "version-string": "2024.10.07.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/ports/zoe/portfile.cmake b/ports/zoe/portfile.cmake index 241481ea22c27b..c7acf8e74c9ff5 100644 --- a/ports/zoe/portfile.cmake +++ b/ports/zoe/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO winsoft666/zoe HEAD_REF master REF "v${VERSION}" - SHA512 17c3747f4afd7574b0c9f123dee98fc8cad4b37d5fbe1234850778753c3a550df42530574c4ad053fb77813bbe6e9b0bb4cc82aa0b505b2e82abe7f158d602bb + SHA512 301a3b6797d1bd3370c18e20c58235a53b8a67aa46ba3c9fdc0db549755fb6ae3a0de749cc3f076f3dd4d556169c4ba2d040abb632f7bc302a449a0b7ea65eb2 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZOE_BUILD_SHARED_LIBS) diff --git a/ports/zoe/vcpkg.json b/ports/zoe/vcpkg.json index 44071aeee1f83a..ae2a0e9ea31b11 100644 --- a/ports/zoe/vcpkg.json +++ b/ports/zoe/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zoe", - "version": "3.1", + "version": "3.2", "maintainers": "winsoft666 ", "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.", "homepage": "https://github.com/winsoft666/zoe", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fe6bc65800c5c8..f503a1ac1a3d35 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -51,8 +51,6 @@ allegro5:x64-android=fail apr:arm-neon-android=fail apr:arm64-android=fail apr:x64-android=fail -# Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h -apr:arm64-windows=fail apsi:arm-neon-android=fail apsi:x64-android=fail # Broken with CUDA 12; needs update to 3.8.3 and https://github.com/arrayfire/arrayfire/issues/3349 fixed @@ -303,11 +301,6 @@ discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail discordcoreapi:x64-linux=skip # cause linux CI to hang https://github.com/microsoft/vcpkg/pull/40229 discordcoreapi:x64-osx=fail -# failed with dependency https://github.com/RealTimeChris/DiscordCoreAPI/issues/45 -discordcoreapi:x64-uwp=fail -discordcoreapi:x64-windows=fail -discordcoreapi:x64-windows-static=fail -discordcoreapi:x64-windows-static-md=fail discount:x64-android=fail eathread:x64-android=fail ecal:arm-neon-android=fail @@ -489,8 +482,10 @@ intelrdfpmathlib:arm64-android=fail intelrdfpmathlib:x64-android=fail irrlicht:x64-android=fail isal:x64-android=fail +# Failing on try_run() in cross builds itk:arm-neon-android=fail itk:arm64-android=fail +itk:arm64-windows=fail itk:x64-android=fail jaeger-client-cpp:arm-neon-android=fail jaeger-client-cpp:x64-android=fail @@ -783,9 +778,6 @@ netcdf-c:x64-android=fail netcdf-cxx4:x64-windows-static-md=fail ngspice:x64-android=fail ngspice:x64-windows-static=fail -nmap:arm-neon-android=fail -nmap:arm64-android=fail -nmap:x64-android=fail nrf-ble-driver:arm-neon-android=fail nrf-ble-driver:arm64-android=fail nrf-ble-driver:x64-android=fail @@ -1350,7 +1342,7 @@ vcpkg-ci-sqlpp11:x86-windows=pass vcpkg-ci-vxl:arm-neon-android=pass vcpkg-ci-vxl:arm64-android=pass vcpkg-ci-vxl:arm64-windows=pass -vcpkg-ci-vxl:x64-android=fail +vcpkg-ci-vxl:x64-android=pass vcpkg-ci-vxl:x64-linux=pass vcpkg-ci-vxl:x64-osx=pass vcpkg-ci-vxl:x64-windows=pass diff --git a/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake b/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake index beca9848242247..e881bfe959b942 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake @@ -1,6 +1,6 @@ set(program_name patchelf) -set(program_version 0.14.5) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(program_version 0.14.5) vcpkg_execute_in_download_mode(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) if(HOST_ARCH STREQUAL "aarch64") set(patchelf_platform "aarch64") @@ -16,4 +16,15 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(download_urls "https://github.com/NixOS/patchelf/releases/download/${program_version}/${download_filename}") set(tool_subdirectory "${program_version}-${patchelf_platform}-linux") set(paths_to_search "${DOWNLOADS}/tools/patchelf/${program_version}-${patchelf_platform}-linux/bin") +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + set(patchelf_host "win32") + set(program_version 0.18.0) + set(download_sha512 +"19d24f64bea6d6236292455a09695d289ddca71433a0ccaf372f57da80a4cde5db1c375ac8e29a41ac1f0676b7d3b56ce5b2baf39e58369c4f741b612db51044") + set(download_filename "${program_name}-${patchelf_host}-${program_version}.exe") + set(download_urls "https://github.com/NixOS/patchelf/releases/download/${program_version}/${download_filename}") + set(tool_subdirectory "${program_version}-${patchelf_host}") + set(paths_to_search "${DOWNLOADS}/tools/patchelf/${program_version}-${patchelf_host}/") + set(raw_executable ON) + set(rename_binary_to "patchelf.exe") endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake index cd2d4e4a075675..e740918567fe66 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake @@ -1,6 +1,6 @@ if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.11.8) + set(program_version 3.12.7) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(build_arch $ENV{PROCESSOR_ARCHITEW6432}) else() @@ -8,23 +8,31 @@ if(CMAKE_HOST_WIN32) endif() if(build_arch MATCHES "^(ARM|arm)64$") set(tool_subdirectory "python-${program_version}-arm64") + # https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-arm64.zip set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-arm64.zip") set(download_filename "python-${program_version}-embed-arm64.zip") - set(download_sha512 42b820e34c4a77fe928e0af395292d804dcbf7e1132cf353ce6ce23435a687ec580f03ccbf3cd94d98c9dc5ac951f8ca64dbd65cded7ef1d675a39d63f8ace8d) + set(download_sha512 D1D1183682D20AC057C45BF2AD264B6568CDEB54A1502823C76A2448386CAEF79A3AB9EA8FF57A5C023D432590FCCB5E3E9980F8760CD9BAAC5A2A82BA240D73) elseif(build_arch MATCHES "(amd|AMD)64") set(tool_subdirectory "python-${program_version}-x64") + # https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-amd64.zip set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip") set(download_filename "python-${program_version}-embed-amd64.zip") - set(download_sha512 da5f01e94d3505eebdfd4d2e70d9cf494925199024479cc29ef144567906b2e8ad55a855b199a755318f5fb9a260f21b987a5fc85f31acf631af4b677921251d) + set(download_sha512 2F67A8487A9EDECE26B73AAB27E75249E538938AD976D371A9411B54DBAE20AFEAC82B406AD4EEEE38B1CF6F407E7620679D30C0FFF82EC8E8AE62268C322D59) else() set(tool_subdirectory "python-${program_version}-x86") + # https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-win32.zip set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") set(download_filename "python-${program_version}-embed-win32.zip") - set(download_sha512 c88ef02f0860000dbc59361cfe051e3e8dc7d208ed39bb5bc20a3e8b8711b578926e281a11941787ea61b2ef05b945ab3133322dcb85b916f79ac4ada57f6309) + set(download_sha512 15542080E0CC25C574391218107FE843006E8C5A7161D1CD48CF14A3C47155C0244587273D9C747F35B15EA17676869ECCE079214824214C1A62ABFC86AD9F9B) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") - vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python311._pth) + + # We want to be able to import stuff from outside of this embeddable package. + # https://docs.python.org/3/library/sys_path_init.html#pth-files + string(REGEX MATCH "^3\\.[0-9]+" _python_version_plain "${program_version}") + string(REPLACE "." "" _python_version_plain "${_python_version_plain}") + vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm "python${_python_version_plain}._pth") else() set(program_name python3) set(brew_package_name "python") diff --git a/scripts/test_ports/vcpkg-ci-vxl/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-vxl/project/CMakeLists.txt index 6d11f33f644df9..2ac14a1c508563 100644 --- a/scripts/test_ports/vcpkg-ci-vxl/project/CMakeLists.txt +++ b/scripts/test_ports/vcpkg-ci-vxl/project/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.7) project(vnl-test CXX) +if(APPLE) + set(CMAKE_CXX_STANDARD "11") +endif() + find_package(VXL CONFIG REQUIRED) # The use file doesn't only set variables, diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 81f990cd17d591..f5be75dc68ae10 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,18 +1,18 @@ - 3.11.8 + 3.12.7 python.exe - https://www.python.org/ftp/python/3.11.8/python-3.11.8-embed-win32.zip - c88ef02f0860000dbc59361cfe051e3e8dc7d208ed39bb5bc20a3e8b8711b578926e281a11941787ea61b2ef05b945ab3133322dcb85b916f79ac4ada57f6309 - python-3.11.8-embed-win32.zip + https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-win32.zip + 15542080e0cc25c574391218107fe843006e8c5a7161d1cd48cf14a3c47155c0244587273d9c747f35b15ea17676869ecce079214824214c1a62abfc86ad9f9b + python-3.12.7-embed-win32.zip - 3.11.8 + 3.12.7 tools\python.exe - https://www.nuget.org/api/v2/package/python/3.11.8 - 8c1abd622fb2795fb87ab5208764fe13f7f4d69f2283b4237ea47b7c14b0989b5b4169f1ac1d3b1f417c6c2cc3d85ce151370dae8efc807c93e57cd67fa3c8cf - python-3.11.8.nupkg.zip + https://www.nuget.org/api/v2/package/python/3.12.7 + 6d5cac329808e31d4d8d593da6eeaa9ea4ec0296679335e7b7811f6c6fa6cbb96948d2f7845071798c6f73f83852dd731dc2b0fda48c520b9bec8a86cc56134e + python-3.12.7.nupkg.zip 3.30.1 diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 479edb6b02ba28..b3bb8f5d0e8b5f 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0066f657df214848cbfd6b991e8ff4a52902e81b", + "version-semver": "3.9.5", + "port-version": 17 + }, { "git-tree": "1644c99e45b2364ea36c0307b4d7171f4717ccdc", "version-semver": "3.9.5", diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 72e6287755fd26..180bb00f4e7747 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfa11d3e5058b640b37c1a6845dbc2980496a7c8", + "version": "1.7.5", + "port-version": 2 + }, { "git-tree": "499cf5fc0959f4a049ec72f0f556400e7191ffd3", "version": "1.7.5", diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json index ea7f625728b7d9..095e29300cdf5c 100644 --- a/versions/a-/async-mqtt.json +++ b/versions/a-/async-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf72e6ffff6a04a7970fdd233aed561027fbb8b7", + "version": "9.0.2", + "port-version": 0 + }, { "git-tree": "3eead09afc69661d7dbe73007276c04c7d239346", "version": "9.0.1", diff --git a/versions/a-/aurora-au.json b/versions/a-/aurora-au.json new file mode 100644 index 00000000000000..c6497455435ef1 --- /dev/null +++ b/versions/a-/aurora-au.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dbea0dd2b0494c189b944e96b477192d37461bb9", + "version-semver": "0.3.5", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index 9224b67fb4a946..77f9f9a84832b5 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ca8ab15e996d475016dcb8a29cf3558fc4f6568", + "version": "0.9.30", + "port-version": 0 + }, { "git-tree": "e173deb74e242d11e66bac664774195ccc14e5db", "version": "0.9.28", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 4bb72618309601..1fa6667cbb47dc 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be003f23440ed5c0e3ff419e1769faf15e943227", + "version": "1.11.428", + "port-version": 0 + }, { "git-tree": "ac4b4f695502882bdb0f8ae2711ebc997680d6c4", "version": "1.11.420", diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json index 60e1a19f6fade9..f29fed1b0e3c26 100644 --- a/versions/a-/azure-core-amqp-cpp.json +++ b/versions/a-/azure-core-amqp-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbf82106a42fe16154f3bcb57d4f49d560f91ccd", + "version-semver": "1.0.0-beta.11", + "port-version": 1 + }, { "git-tree": "4782abe977ab163588fd6dcdc1f38b01739d4a0c", "version-semver": "1.0.0-beta.11", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index d7eeda6afb06af..cba35dfae44967 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f937bf0444060d596ffb2693a71640086939a542", + "version-semver": "1.14.0", + "port-version": 1 + }, { "git-tree": "fb70bf821b5752b8e8bc942945aea223ad4960dc", "version-semver": "1.14.0", diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json index 7f5478b7cc647e..10b1209bdebc2c 100644 --- a/versions/a-/azure-core-tracing-opentelemetry-cpp.json +++ b/versions/a-/azure-core-tracing-opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "787e5bf9dd2696add1ff8d3bea711b9611c15c43", + "version-semver": "1.0.0-beta.4", + "port-version": 5 + }, { "git-tree": "50af7ca57ee7e96f6d9c772f3f2e4032bfae4d2a", "version-semver": "1.0.0-beta.4", diff --git a/versions/a-/azure-data-tables-cpp.json b/versions/a-/azure-data-tables-cpp.json index e58eb91733563c..cc7e7006aafa3a 100644 --- a/versions/a-/azure-data-tables-cpp.json +++ b/versions/a-/azure-data-tables-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c8fd7ca261ef5f849f5e802432971d026b73529", + "version-semver": "1.0.0-beta.4", + "port-version": 1 + }, { "git-tree": "25bfcc3d875731c2dfac231c9468ff0d02ef774e", "version-semver": "1.0.0-beta.4", diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json index 3eb010e7a04779..14c321765f850e 100644 --- a/versions/a-/azure-identity-cpp.json +++ b/versions/a-/azure-identity-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc15d56f69b1832146f5625ef9b18000febf8341", + "version-semver": "1.10.0", + "port-version": 2 + }, { "git-tree": "e34818074344451c91bda6706bf359f84a3b69b8", "version-semver": "1.10.0", diff --git a/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json index 861c32745e0b55..137923c2c8b355 100644 --- a/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56d7d109e00a8bb0d208eb212840290cdadd4cc6", + "version-semver": "1.0.0-beta.1", + "port-version": 4 + }, { "git-tree": "8bdfa6fd4defa1e8e62bdaad4e75a9992f40c083", "version-semver": "1.0.0-beta.1", diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index b646b5665741d7..3902c8592645dd 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20acc123d4bc4b1499ba80cefbf27648204dba78", + "version-semver": "1.0.0-beta.9", + "port-version": 2 + }, { "git-tree": "77827efdc37ee6717125e6516b9ebfb8f2bc90d7", "version-semver": "1.0.0-beta.9", diff --git a/versions/a-/azure-security-attestation-cpp.json b/versions/a-/azure-security-attestation-cpp.json index cfefc8a15d2c5c..8b8055710dc73d 100644 --- a/versions/a-/azure-security-attestation-cpp.json +++ b/versions/a-/azure-security-attestation-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa1f9163cca2993354c108a3f9b3dfcf561635f0", + "version-semver": "1.1.0", + "port-version": 6 + }, { "git-tree": "88c5e0b80d5cd580969d5c807b7ce06d7f2cda25", "version-semver": "1.1.0", diff --git a/versions/a-/azure-security-keyvault-administration-cpp.json b/versions/a-/azure-security-keyvault-administration-cpp.json index 27d1f1cf38fb63..24d934348dfdf2 100644 --- a/versions/a-/azure-security-keyvault-administration-cpp.json +++ b/versions/a-/azure-security-keyvault-administration-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6ee89f64c55c1202b7d71fd7551916ea5e62d93", + "version-semver": "4.0.0-beta.5", + "port-version": 1 + }, { "git-tree": "981cd5dab70bbcf44130dfe094e96d3ce5095b15", "version-semver": "4.0.0-beta.5", diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json index 7ba5c0ecdddd54..47dc4d2499f554 100644 --- a/versions/a-/azure-security-keyvault-certificates-cpp.json +++ b/versions/a-/azure-security-keyvault-certificates-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04bc0d3763fbdd8773ae5ef3f00107f3a2bb3c70", + "version-semver": "4.2.1", + "port-version": 3 + }, { "git-tree": "75bd228566d927e22eec5b51aae2c71dc3d05e3f", "version-semver": "4.2.1", diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index 85ef91b009b046..99fd3e5b1a61ac 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4afe6efdcdc0e5df2c45c177a8ad5f4815fb98b2", + "version-semver": "4.4.1", + "port-version": 3 + }, { "git-tree": "5e08ec294ffa70534153ce3b9275f98d042603cb", "version-semver": "4.4.1", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json index 2a3f965f070e53..b1d600e844e460 100644 --- a/versions/a-/azure-security-keyvault-secrets-cpp.json +++ b/versions/a-/azure-security-keyvault-secrets-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59fc00624617f87b2f6cc2001dc559d87b78c604", + "version-semver": "4.2.1", + "port-version": 3 + }, { "git-tree": "dd50aa8c678a3b44cfe156c2585bf3e55c0d3fda", "version-semver": "4.2.1", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 9747346d309577..bbdd070aa4d17e 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd9abe94e013e42493479d573f7e7d60a89c5821", + "version-semver": "12.13.0", + "port-version": 1 + }, { "git-tree": "27ed64e60e120ebfed0bed577860888f7754e0c3", "version-semver": "12.13.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 2140e5fa5b5005..99d17f8c6fc4f0 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a200d88271a1801801abee4e06da137e698cbcec", + "version-semver": "12.8.0", + "port-version": 1 + }, { "git-tree": "477f43d417586ff593070b38902ad8229b39c739", "version-semver": "12.8.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index c35c7cade1f042..e5be1b5fd9a046 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4932548d090f0897b607b71e7c41720cc975970a", + "version-semver": "12.12.0", + "port-version": 1 + }, { "git-tree": "f404dcc173c1e702263bfb6611b40d69a307514d", "version-semver": "12.12.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index fdc8295d8afd62..c4dd03a0a67bcb 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dbe687f016f7747967b99e26138e09ff1a098767", + "version-semver": "12.11.0", + "port-version": 1 + }, { "git-tree": "5518255fb2a9d5ebb314b7e7e404512472e7a8d3", "version-semver": "12.11.0", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index 681766bfcdc989..91b28e06ed3266 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb06e818a33a9970e3475d03b339f87ef17f8039", + "version-semver": "12.4.0", + "port-version": 1 + }, { "git-tree": "1d0d8497e675a161121ec372e1c98877f6dffcac", "version-semver": "12.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1546eb599a3163..ae0292a8941953 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -34,7 +34,7 @@ }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 16 + "port-version": 17 }, "ada-url": { "baseline": "2.9.2", @@ -170,7 +170,7 @@ }, "apr": { "baseline": "1.7.5", - "port-version": 1 + "port-version": 2 }, "apr-util": { "baseline": "1.6.3", @@ -289,7 +289,7 @@ "port-version": 0 }, "async-mqtt": { - "baseline": "9.0.1", + "baseline": "9.0.2", "port-version": 0 }, "async-simple": { @@ -356,6 +356,10 @@ "baseline": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", "port-version": 2 }, + "aurora-au": { + "baseline": "0.3.5", + "port-version": 0 + }, "autobahn": { "baseline": "20.8.1", "port-version": 2 @@ -393,7 +397,7 @@ "port-version": 0 }, "aws-c-common": { - "baseline": "0.9.28", + "baseline": "0.9.30", "port-version": 0 }, "aws-c-compression": { @@ -437,7 +441,7 @@ "port-version": 0 }, "aws-sdk-cpp": { - "baseline": "1.11.420", + "baseline": "1.11.428", "port-version": 0 }, "azmq": { @@ -450,23 +454,23 @@ }, "azure-core-amqp-cpp": { "baseline": "1.0.0-beta.11", - "port-version": 0 + "port-version": 1 }, "azure-core-cpp": { "baseline": "1.14.0", - "port-version": 0 + "port-version": 1 }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", - "port-version": 4 + "port-version": 5 }, "azure-data-tables-cpp": { "baseline": "1.0.0-beta.4", - "port-version": 0 + "port-version": 1 }, "azure-identity-cpp": { "baseline": "1.10.0", - "port-version": 1 + "port-version": 2 }, "azure-iot-sdk-c": { "baseline": "2024-08-12", @@ -482,39 +486,39 @@ }, "azure-messaging-eventhubs-checkpointstore-blob-cpp": { "baseline": "1.0.0-beta.1", - "port-version": 3 + "port-version": 4 }, "azure-messaging-eventhubs-cpp": { "baseline": "1.0.0-beta.9", - "port-version": 1 + "port-version": 2 }, "azure-security-attestation-cpp": { "baseline": "1.1.0", - "port-version": 5 + "port-version": 6 }, "azure-security-keyvault-administration-cpp": { "baseline": "4.0.0-beta.5", - "port-version": 0 + "port-version": 1 }, "azure-security-keyvault-certificates-cpp": { "baseline": "4.2.1", - "port-version": 2 + "port-version": 3 }, "azure-security-keyvault-keys-cpp": { "baseline": "4.4.1", - "port-version": 2 + "port-version": 3 }, "azure-security-keyvault-secrets-cpp": { "baseline": "4.2.1", - "port-version": 2 + "port-version": 3 }, "azure-storage-blobs-cpp": { "baseline": "12.13.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-common-cpp": { "baseline": "12.8.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-cpp": { "baseline": "7.5.0", @@ -522,15 +526,15 @@ }, "azure-storage-files-datalake-cpp": { "baseline": "12.12.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-files-shares-cpp": { "baseline": "12.11.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-queues-cpp": { "baseline": "12.4.0", - "port-version": 0 + "port-version": 1 }, "azure-uamqp-c": { "baseline": "2024-08-12", @@ -2289,8 +2293,8 @@ "port-version": 0 }, "directxmath": { - "baseline": "2024-02-14", - "port-version": 1 + "baseline": "2024-10-15", + "port-version": 0 }, "directxmesh": { "baseline": "2024-09-04", @@ -2325,7 +2329,7 @@ "port-version": 4 }, "discordcoreapi": { - "baseline": "2.0.6", + "baseline": "2.0.7", "port-version": 0 }, "discount": { @@ -2345,8 +2349,8 @@ "port-version": 0 }, "dlib": { - "baseline": "19.24", - "port-version": 4 + "baseline": "19.24.6", + "port-version": 0 }, "dlpack": { "baseline": "0.8", @@ -2637,8 +2641,8 @@ "port-version": 1 }, "fakeit": { - "baseline": "2.4.0", - "port-version": 3 + "baseline": "2.4.1", + "port-version": 0 }, "fameta-counter": { "baseline": "2021-02-13", @@ -2673,7 +2677,7 @@ "port-version": 5 }, "fastdds": { - "baseline": "3.0.1", + "baseline": "3.1.0", "port-version": 0 }, "fastfeat": { @@ -2709,7 +2713,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2024.09.30.00", + "baseline": "2024.10.07.00", "port-version": 0 }, "fcl": { @@ -2730,10 +2734,10 @@ }, "ffmpeg": { "baseline": "7.0.2", - "port-version": 4 + "port-version": 5 }, "ffnvcodec": { - "baseline": "12.1.14.0", + "baseline": "12.2.72.0", "port-version": 0 }, "fftw3": { @@ -2757,7 +2761,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2024.09.30.00", + "baseline": "2024.10.07.00", "port-version": 0 }, "flagpp": { @@ -2841,7 +2845,7 @@ "port-version": 1 }, "folly": { - "baseline": "2024.09.30.00", + "baseline": "2024.10.07.00", "port-version": 0 }, "font-chef": { @@ -3005,17 +3009,13 @@ "port-version": 0 }, "gdal": { - "baseline": "3.9.2", + "baseline": "3.9.3", "port-version": 0 }, "gdcm": { - "baseline": "3.0.23", + "baseline": "3.0.24", "port-version": 0 }, - "gdcm2": { - "baseline": "deprecated", - "port-version": 1 - }, "gdk-pixbuf": { "baseline": "2.42.12", "port-version": 1 @@ -3126,7 +3126,7 @@ }, "glib": { "baseline": "2.80.0", - "port-version": 0 + "port-version": 1 }, "glib-networking": { "baseline": "2.78.0", @@ -3845,7 +3845,7 @@ "port-version": 0 }, "json-rpc-cxx": { - "baseline": "0.3.1", + "baseline": "0.3.2", "port-version": 0 }, "json-schema-validator": { @@ -3873,7 +3873,7 @@ "port-version": 0 }, "jsonifier": { - "baseline": "0.9.96", + "baseline": "0.9.97", "port-version": 0 }, "jsonnet": { @@ -4273,7 +4273,7 @@ "port-version": 5 }, "libarchive": { - "baseline": "3.7.6", + "baseline": "3.7.7", "port-version": 0 }, "libass": { @@ -4293,8 +4293,8 @@ "port-version": 0 }, "libavif": { - "baseline": "1.0.4", - "port-version": 2 + "baseline": "1.1.1", + "port-version": 0 }, "libb2": { "baseline": "0.98.1", @@ -4448,6 +4448,10 @@ "baseline": "1.2.6", "port-version": 2 }, + "libedit": { + "baseline": "2024-08-08", + "port-version": 0 + }, "libenvpp": { "baseline": "1.4.1", "port-version": 0 @@ -4801,7 +4805,7 @@ "port-version": 0 }, "libmupdf": { - "baseline": "1.23.11", + "baseline": "1.24.10", "port-version": 0 }, "libmysofa": { @@ -4821,7 +4825,7 @@ "port-version": 0 }, "libnick": { - "baseline": "2024.9.2", + "baseline": "2024.10.0", "port-version": 0 }, "libnoise": { @@ -5012,6 +5016,10 @@ "baseline": "2019-11-11", "port-version": 4 }, + "librtpi": { + "baseline": "1.0.0", + "port-version": 1 + }, "librttopo": { "baseline": "1.1.0", "port-version": 8 @@ -5178,7 +5186,7 @@ }, "libtorch": { "baseline": "2.1.2", - "port-version": 6 + "port-version": 7 }, "libtorrent": { "baseline": "2.0.10", @@ -5253,7 +5261,7 @@ "port-version": 14 }, "libuv": { - "baseline": "1.49.0", + "baseline": "1.49.1", "port-version": 0 }, "libuvc": { @@ -5717,7 +5725,7 @@ "port-version": 0 }, "mapbox-polylabel": { - "baseline": "1.1.0", + "baseline": "2.0.1", "port-version": 0 }, "mapbox-variant": { @@ -5941,7 +5949,7 @@ "port-version": 0 }, "mlpack": { - "baseline": "4.4.0", + "baseline": "4.5.0", "port-version": 0 }, "mman": { @@ -6081,7 +6089,7 @@ "port-version": 0 }, "msgpack-c": { - "baseline": "6.0.0", + "baseline": "6.1.0", "port-version": 0 }, "msgpack11": { @@ -6121,7 +6129,7 @@ "port-version": 1 }, "mujs": { - "baseline": "1.3.4", + "baseline": "1.3.5", "port-version": 0 }, "munit": { @@ -6141,7 +6149,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2024.09.30.00", + "baseline": "2024.10.07.00", "port-version": 0 }, "mygui": { @@ -6281,7 +6289,7 @@ "port-version": 4 }, "nghttp2": { - "baseline": "1.62.1", + "baseline": "1.63.0", "port-version": 0 }, "nghttp2-asio": { @@ -6317,12 +6325,8 @@ "port-version": 1 }, "nlopt": { - "baseline": "2.7.1", - "port-version": 1 - }, - "nmap": { - "baseline": "7.70", - "port-version": 12 + "baseline": "2.8.0", + "port-version": 0 }, "nmslib": { "baseline": "2.1.1", @@ -6533,11 +6537,11 @@ "port-version": 0 }, "onnx": { - "baseline": "1.15.0", - "port-version": 1 + "baseline": "1.16.2", + "port-version": 0 }, "onnx-optimizer": { - "baseline": "0.3.18", + "baseline": "0.3.19", "port-version": 0 }, "onnxruntime-gpu": { @@ -6565,16 +6569,16 @@ "port-version": 2 }, "openblas": { - "baseline": "0.3.27", - "port-version": 1 + "baseline": "0.3.28", + "port-version": 0 }, "opencascade": { "baseline": "7.8.1", "port-version": 1 }, "opencc": { - "baseline": "1.1.6", - "port-version": 1 + "baseline": "1.1.9", + "port-version": 0 }, "opencensus-cpp": { "baseline": "2021-08-26", @@ -6617,7 +6621,7 @@ "port-version": 1 }, "openexr": { - "baseline": "3.2.4", + "baseline": "3.3.1", "port-version": 0 }, "openfbx": { @@ -6645,8 +6649,8 @@ "port-version": 4 }, "openimageio": { - "baseline": "2.5.14.0", - "port-version": 1 + "baseline": "2.5.16.0", + "port-version": 0 }, "openjpeg": { "baseline": "2.5.2", @@ -6730,7 +6734,7 @@ }, "openvino": { "baseline": "2024.4.0", - "port-version": 0 + "port-version": 1 }, "openvpn3": { "baseline": "3.10", @@ -6781,8 +6785,8 @@ "port-version": 3 }, "osgearth": { - "baseline": "3.4", - "port-version": 3 + "baseline": "3.7", + "port-version": 0 }, "osmanip": { "baseline": "4.6.1", @@ -6805,8 +6809,8 @@ "port-version": 4 }, "pagmo2": { - "baseline": "2.19.0", - "port-version": 2 + "baseline": "2.19.1", + "port-version": 0 }, "paho-mqtt": { "baseline": "1.3.13", @@ -6821,12 +6825,12 @@ "port-version": 0 }, "pango": { - "baseline": "1.50.14", - "port-version": 4 + "baseline": "1.54.0", + "port-version": 0 }, "pangolin": { - "baseline": "0.8", - "port-version": 3 + "baseline": "0.9.2", + "port-version": 0 }, "pangomm": { "baseline": "2.50.1", @@ -6909,7 +6913,7 @@ "port-version": 0 }, "pegtl": { - "baseline": "3.2.7", + "baseline": "3.2.8", "port-version": 0 }, "pegtl-2": { @@ -6917,7 +6921,7 @@ "port-version": 3 }, "perfetto": { - "baseline": "47.0", + "baseline": "48.1", "port-version": 0 }, "pffft": { @@ -6981,7 +6985,7 @@ "port-version": 0 }, "plasma-wayland-protocols": { - "baseline": "1.8.0", + "baseline": "1.14.0", "port-version": 0 }, "platform-folders": { @@ -7116,6 +7120,10 @@ "baseline": "239", "port-version": 0 }, + "poselib": { + "baseline": "2.0.4", + "port-version": 0 + }, "ppconsul": { "baseline": "0.5", "port-version": 5 @@ -7189,7 +7197,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2024.09.30.00", + "baseline": "2024.10.07.00", "port-version": 0 }, "psimd": { @@ -7253,8 +7261,8 @@ "port-version": 7 }, "python3": { - "baseline": "3.11.8", - "port-version": 5 + "baseline": "3.11.10", + "port-version": 0 }, "qca": { "baseline": "2.3.7", @@ -7673,7 +7681,7 @@ "port-version": 0 }, "quantlib": { - "baseline": "1.35", + "baseline": "1.36", "port-version": 0 }, "quaternions": { @@ -7741,7 +7749,7 @@ "port-version": 0 }, "rapidcsv": { - "baseline": "8.83", + "baseline": "8.84", "port-version": 0 }, "rapidfuzz": { @@ -7857,8 +7865,8 @@ "port-version": 1 }, "reproc": { - "baseline": "14.2.4", - "port-version": 2 + "baseline": "14.2.5", + "port-version": 0 }, "rest-rpc": { "baseline": "0.12", @@ -8309,7 +8317,7 @@ "port-version": 1 }, "simd": { - "baseline": "6.1.140", + "baseline": "6.1.142", "port-version": 0 }, "simde": { @@ -8321,7 +8329,7 @@ "port-version": 0 }, "simdutf": { - "baseline": "5.5.0", + "baseline": "5.6.0", "port-version": 0 }, "simonbrunel-qtpromise": { @@ -8354,7 +8362,7 @@ }, "skia": { "baseline": "129", - "port-version": 1 + "port-version": 2 }, "skyr-url": { "baseline": "1.13.0", @@ -8865,8 +8873,8 @@ "port-version": 2 }, "tiff": { - "baseline": "4.6.0", - "port-version": 5 + "baseline": "4.7.0", + "port-version": 0 }, "tinkerforge": { "baseline": "2.1.25", @@ -9008,6 +9016,10 @@ "baseline": "2019-10-14", "port-version": 1 }, + "tobias-loew-flags": { + "baseline": "2024-09-10", + "port-version": 0 + }, "toml11": { "baseline": "4.2.0", "port-version": 0 @@ -9054,7 +9066,7 @@ }, "triangle": { "baseline": "1.6", - "port-version": 3 + "port-version": 4 }, "triton": { "baseline": "2023-08-16", @@ -9289,7 +9301,7 @@ "port-version": 0 }, "vcpkg-get-python-packages": { - "baseline": "2024-01-24", + "baseline": "2024-09-29", "port-version": 0 }, "vcpkg-gfortran": { @@ -9485,8 +9497,8 @@ "port-version": 0 }, "vxl": { - "baseline": "2.0.2", - "port-version": 7 + "baseline": "3.5.0", + "port-version": 0 }, "wabt": { "baseline": "1.0.36", @@ -9497,7 +9509,7 @@ "port-version": 5 }, "wangle": { - "baseline": "2024.09.30.00", + "baseline": "2024.10.07.00", "port-version": 0 }, "wasmedge": { @@ -9889,7 +9901,7 @@ "port-version": 0 }, "zoe": { - "baseline": "3.1", + "baseline": "3.2", "port-version": 0 }, "zookeeper": { diff --git a/versions/d-/directxmath.json b/versions/d-/directxmath.json index 6b2344f3401fc6..0252064b1c8ba0 100644 --- a/versions/d-/directxmath.json +++ b/versions/d-/directxmath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b842f51d9302c1c46491b4481947be89005c3936", + "version-date": "2024-10-15", + "port-version": 0 + }, { "git-tree": "785a609b10fad1343aea267a513e8bbd49334fb0", "version-date": "2024-02-14", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index e1c6e62ff0d187..1982660999d533 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3a2a5137d39b32f98a88f4e454b885a6097929f", + "version": "2.0.7", + "port-version": 0 + }, { "git-tree": "cf7406d145c55d85306226b283a9d7b3224e62c2", "version": "2.0.6", diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json index 8c4fb978506e2b..610f244fd6060b 100644 --- a/versions/d-/dlib.json +++ b/versions/d-/dlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ec140618bd63da01f52b9904b02d03e8b6b1256", + "version": "19.24.6", + "port-version": 0 + }, { "git-tree": "f9c3d8205c42c8450e81864a313021ff76efec5f", "version": "19.24", diff --git a/versions/f-/fakeit.json b/versions/f-/fakeit.json index 9500db65bcf179..2a1e0456520aa4 100644 --- a/versions/f-/fakeit.json +++ b/versions/f-/fakeit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dee32d1fc08039620e6ba6e8b64e87d5da500200", + "version": "2.4.1", + "port-version": 0 + }, { "git-tree": "199349d27860bb252a22a7bad0eb76b9fb61acdc", "version": "2.4.0", diff --git a/versions/f-/fastdds.json b/versions/f-/fastdds.json index d209b8115be48a..b57bea478cfaf1 100644 --- a/versions/f-/fastdds.json +++ b/versions/f-/fastdds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d63c40face8c3e65be51da586f4aaee1d79a138", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "6ff9b97e272f2c114ff8da8e63e5a04426f49722", "version": "3.0.1", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 1aab9eb2e2e0a1..daa8f1f2731b4a 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc4c75751db768dfccfdf9dc0cd45b5f38e3ab18", + "version-string": "2024.10.07.00", + "port-version": 0 + }, { "git-tree": "6da859410d8da42d16572b238e77f3a03c7e41f3", "version-string": "2024.09.30.00", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index b3bb62a508e3dc..efe1fd13a1e92a 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4bc112c6581274674b70429dacd87e5d0715ac4", + "version": "7.0.2", + "port-version": 5 + }, { "git-tree": "5acfbf7401c2c1e3b37db1b2c0cd11de7c3da29e", "version": "7.0.2", diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index 797f274dd4f9bc..6dce36478205ba 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cbb2a7f0ed07795c560971fddd1c6021c37fbfb", + "version": "12.2.72.0", + "port-version": 0 + }, { "git-tree": "95b6f37a43dab098bf4be5c84e15e47a86cf7960", "version": "12.1.14.0", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index e17255e99619c5..25305e8994440c 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f9b145acd04fdea428cd27b7fca22d37b2f1e80", + "version-string": "2024.10.07.00", + "port-version": 0 + }, { "git-tree": "9400166b4d4bb78fb5d4fa643b2ce5dde98f1ae9", "version-string": "2024.09.30.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index a76045307d344c..730de528282725 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1728c51eda0e3195c97dfdb580113f5a29d267c", + "version-string": "2024.10.07.00", + "port-version": 0 + }, { "git-tree": "89e5d57a4e801e9f33fd775484532fca2fe50a23", "version-string": "2024.09.30.00", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index eae1976bb6cbf4..61063f992ef500 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5682e9626c47a26f37e7578c3df847ddc3fe11c", + "version-semver": "3.9.3", + "port-version": 0 + }, { "git-tree": "577a6058af6d99bdbea12c6988d7d7fc991a087b", "version-semver": "3.9.2", diff --git a/versions/g-/gdcm.json b/versions/g-/gdcm.json index 5367b61122e1d3..ef3a3d41317023 100644 --- a/versions/g-/gdcm.json +++ b/versions/g-/gdcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a261e8eb0faf299319bdb0ecfc4ebf76a449bc19", + "version": "3.0.24", + "port-version": 0 + }, { "git-tree": "ddb9b48dc350a6e3a539a8d6e43e5416955d1de5", "version": "3.0.23", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 7aeea85bc76bfe..97e17ffb23efbf 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3898752019d0ae61bd13a758b603325c152aec87", + "version": "2.80.0", + "port-version": 1 + }, { "git-tree": "98c1acbee23caa1307827ce7d8e4f6e38954e560", "version": "2.80.0", diff --git a/versions/j-/json-rpc-cxx.json b/versions/j-/json-rpc-cxx.json index b28d568205e192..93f7b7026315fd 100644 --- a/versions/j-/json-rpc-cxx.json +++ b/versions/j-/json-rpc-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1470b7bf2e3b95a53d6f8ec3aceadc30cab7f25", + "version": "0.3.2", + "port-version": 0 + }, { "git-tree": "e5c4ccb3e679891167fa7d4b6a14ac5dbae14c40", "version": "0.3.1", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 164e6138ede447..2e819d4c44a464 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfff3ea4e35d5d5df9f66101829cfe766e5b6f66", + "version": "0.9.97", + "port-version": 0 + }, { "git-tree": "8f2f2b25b98924de736300a7cefc6ff2f3e07449", "version": "0.9.96", diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index d6d4be96dd3976..5152268609760f 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d00f1e4f90cc54f34e5868664bf6e876146a13b", + "version": "3.7.7", + "port-version": 0 + }, { "git-tree": "a94a1fd179074afb51ffee84b6245b592adea223", "version": "3.7.6", diff --git a/versions/l-/libavif.json b/versions/l-/libavif.json index 2b4c1a1231a29a..975aa578ab7baf 100644 --- a/versions/l-/libavif.json +++ b/versions/l-/libavif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad9d36286110339f45b585a1bbb330273c04edad", + "version-semver": "1.1.1", + "port-version": 0 + }, { "git-tree": "30218a66d9e44d06cd55a1e7d29e501ceeba42da", "version-semver": "1.0.4", diff --git a/versions/l-/libedit.json b/versions/l-/libedit.json new file mode 100644 index 00000000000000..70448e3b27285c --- /dev/null +++ b/versions/l-/libedit.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "56b7b25793f17cac55a48c44958b26f6ca8440d5", + "version-date": "2024-08-08", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libmupdf.json b/versions/l-/libmupdf.json index 8a2536c2e1601a..8a68fe0c78f4e1 100644 --- a/versions/l-/libmupdf.json +++ b/versions/l-/libmupdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc4b20674350d09f28dfe7af3c520f16fc06e25a", + "version": "1.24.10", + "port-version": 0 + }, { "git-tree": "ea6f82cee63a1056bfa2d88f5e7d0dbee3f64a5f", "version": "1.23.11", diff --git a/versions/l-/libnick.json b/versions/l-/libnick.json index 818b0b7746b607..94a3ef76d07682 100644 --- a/versions/l-/libnick.json +++ b/versions/l-/libnick.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0262401911d577088634f62e69b4771b5b63cd4f", + "version": "2024.10.0", + "port-version": 0 + }, { "git-tree": "fb991611c3568914d479f4b086445eee0b5d3fb1", "version": "2024.9.2", diff --git a/versions/l-/librtpi.json b/versions/l-/librtpi.json new file mode 100644 index 00000000000000..b23bb4e76165ed --- /dev/null +++ b/versions/l-/librtpi.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "a224c4751a43ecde77210db70bc9f0b233a1b9c0", + "version": "1.0.0", + "port-version": 1 + }, + { + "git-tree": "ccd041402709075b83bb6a23ff2c85ce6c8358ac", + "version": "1.0.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json index d9d120d0db3d46..a2385e25f38450 100644 --- a/versions/l-/libtorch.json +++ b/versions/l-/libtorch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e738e2da09a82affc4bf4090d8c672579364231b", + "version": "2.1.2", + "port-version": 7 + }, { "git-tree": "12485495c895b105a0b0a35558edce15579a5a98", "version": "2.1.2", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 469072688e777b..960f07fc2327b6 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81bdbea50fcae6cbb7589016444ef5d7eb0cd00b", + "version-semver": "1.49.1", + "port-version": 0 + }, { "git-tree": "d8421eb2714bd3fecadc7daf7d517212e4ae1aff", "version-semver": "1.49.0", diff --git a/versions/m-/mapbox-polylabel.json b/versions/m-/mapbox-polylabel.json index 34bc4b1d0c576a..8789ab52f952d4 100644 --- a/versions/m-/mapbox-polylabel.json +++ b/versions/m-/mapbox-polylabel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30aabfde477fb58bc66d51f63f397df6bfdbe779", + "version-semver": "2.0.1", + "port-version": 0 + }, { "git-tree": "a86cf026fe463d091c7652931b4d521395baac59", "version-semver": "1.1.0", diff --git a/versions/m-/mlpack.json b/versions/m-/mlpack.json index 21a49d4bfdfa40..3a52c976c37d2a 100644 --- a/versions/m-/mlpack.json +++ b/versions/m-/mlpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8467e71cd0c010cc0e0831c2111cef62124e592a", + "version": "4.5.0", + "port-version": 0 + }, { "git-tree": "855456d472a81eca48e1c5de4918d5b94023d7ed", "version": "4.4.0", diff --git a/versions/m-/msgpack-c.json b/versions/m-/msgpack-c.json index 601789ac695fff..b7ec2910ebd5f8 100644 --- a/versions/m-/msgpack-c.json +++ b/versions/m-/msgpack-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c8acb24165351f4d83c4d56af97277d0be4f77a", + "version": "6.1.0", + "port-version": 0 + }, { "git-tree": "eb07de381e11c13f6d4aa2e2b151efb2d405b85e", "version": "6.0.0", diff --git a/versions/m-/mujs.json b/versions/m-/mujs.json index 213bbe01fcd7f7..57f7d98b58cf52 100644 --- a/versions/m-/mujs.json +++ b/versions/m-/mujs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d748fcfc280df74e27192ebcc5e48dc7205196b", + "version": "1.3.5", + "port-version": 0 + }, { "git-tree": "53b186c7b1e38b01d6b6aa138d30c9d12358013a", "version": "1.3.4", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index b1438cf23c16de..cd56cba4695055 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "884696ea9ad9078cb5235e9bae639fc789ce7a1c", + "version-string": "2024.10.07.00", + "port-version": 0 + }, { "git-tree": "324132fd5e76f2c4eebe3aecf33ffadc12c1e368", "version-string": "2024.09.30.00", diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index f801e8fc9b2099..946041e4da7101 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d9278b741469a7eaf10d708393e589cc7edd386", + "version": "1.63.0", + "port-version": 0 + }, { "git-tree": "c7fd11835e7bcb267322ba09d92db75819881dd7", "version": "1.62.1", diff --git a/versions/n-/nlopt.json b/versions/n-/nlopt.json index 94bcd118ed947e..59c5e5ca1920ad 100644 --- a/versions/n-/nlopt.json +++ b/versions/n-/nlopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0dbd73eab52939902cb59e522ba571bc724bc7fb", + "version": "2.8.0", + "port-version": 0 + }, { "git-tree": "a83b7384132bb8eb542186bfe52258577f62897b", "version": "2.7.1", diff --git a/versions/o-/onnx-optimizer.json b/versions/o-/onnx-optimizer.json index 8833f7dc14c161..21ff564b1714cc 100644 --- a/versions/o-/onnx-optimizer.json +++ b/versions/o-/onnx-optimizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "126bfc519dc0c50fc52ed0b19a0bd88663bae87f", + "version-semver": "0.3.19", + "port-version": 0 + }, { "git-tree": "e574f424edd5d2fd9ca36c5058f96163d9018725", "version-semver": "0.3.18", diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index 014174c60c042d..5914427a3a7b4b 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57d8f77c2964232239ba10b3f2ebf16698486d9a", + "version-semver": "1.16.2", + "port-version": 0 + }, { "git-tree": "69ad297b15bb801f74d50be6e5d290eab7573be4", "version-semver": "1.15.0", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 7ec0d945d732d7..4baac016623924 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ea117557042e4d6a0ee7659828c44938e322ee3", + "version": "0.3.28", + "port-version": 0 + }, { "git-tree": "a11cdf69c9d9071c73f8d88458aa8b09c597d695", "version": "0.3.27", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index 68077106d27851..f87b1ead862791 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6bdb1f36889a641312f0f0dc91e8be0d800dcd5", + "version": "1.1.9", + "port-version": 0 + }, { "git-tree": "85a9b30209f5cd7460d2be2c8e1cc206fab66aaa", "version": "1.1.6", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index d23a6e9bd3024d..802f5a24c50ca9 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ab34082f7f52c635b1b003367190f0e3c58966f", + "version": "3.3.1", + "port-version": 0 + }, { "git-tree": "e923ca0019af5626449e2712f054c608a3198ecc", "version": "3.2.4", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 8ce3126ba3c9f4..6a0b09ed921652 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80b1b56e35349c234510ff58abf197eb9cad7a3c", + "version": "2.5.16.0", + "port-version": 0 + }, { "git-tree": "59dd4d494969cad63902ddaeca3dad341b918fd0", "version": "2.5.14.0", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index cce2b4c1a73515..1798fe8704dc8e 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "668983aa79f507592885fa2ef91fb0dbd1e4a495", + "version": "2024.4.0", + "port-version": 1 + }, { "git-tree": "e65d1d305cc744e9ff5d96358695cbfe22deb8c3", "version": "2024.4.0", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 19a9b367033cab..57d55c103e0d42 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e1ce5962bfd4e49b5609952197378fcf89e1ab3", + "version": "3.7", + "port-version": 0 + }, { "git-tree": "3429fc472870b99752ea2dc1fe8b7df7f4ebedaf", "version": "3.4", diff --git a/versions/p-/pagmo2.json b/versions/p-/pagmo2.json index 1eef6114274a66..ea6729174adbab 100644 --- a/versions/p-/pagmo2.json +++ b/versions/p-/pagmo2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "299fff9dc6a18da12c34fe585137b7787b4c90f2", + "version": "2.19.1", + "port-version": 0 + }, { "git-tree": "ebff91665e8cced80124a56db196cd800cd02f79", "version": "2.19.0", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 3a32719f10271c..3b7a731268df73 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac54330a51296954a9479f950666df455bffb07a", + "version": "1.54.0", + "port-version": 0 + }, { "git-tree": "e2a88ce998fab5ed3f3a2edf817f32734c78187b", "version": "1.50.14", diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json index df3febd519d565..95540496275374 100644 --- a/versions/p-/pangolin.json +++ b/versions/p-/pangolin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71d44252a59ed3737ec204b4789bcd2d30d5e621", + "version": "0.9.2", + "port-version": 0 + }, { "git-tree": "92ce228116d887cc4f381fadcc85ac3fccdea5ef", "version": "0.8", diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index 66ce733e78b5ac..26f8901e651cc8 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a26e3e871ca672ff3c3b6add5f23d485612bfd73", + "version-semver": "3.2.8", + "port-version": 0 + }, { "git-tree": "ee1dbb5f06f7dee38ef4a535efcbe4488556d349", "version-semver": "3.2.7", diff --git a/versions/p-/perfetto.json b/versions/p-/perfetto.json index 4c738b049e31b1..960ae2a02cec63 100644 --- a/versions/p-/perfetto.json +++ b/versions/p-/perfetto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8151fa8ee7a8dce0abcb638986d56165b61d72a5", + "version": "48.1", + "port-version": 0 + }, { "git-tree": "a21f08b9f5fbf6b716698ed7a1499f61eadca1f3", "version": "47.0", diff --git a/versions/p-/plasma-wayland-protocols.json b/versions/p-/plasma-wayland-protocols.json index 33cee2e364d787..5c8795e8bfbb12 100644 --- a/versions/p-/plasma-wayland-protocols.json +++ b/versions/p-/plasma-wayland-protocols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5de80e9722055b7a9df78a6986f82ed6b5e0a44", + "version": "1.14.0", + "port-version": 0 + }, { "git-tree": "3a8a656179e4f748a1249ea2b242ea9798ec9501", "version": "1.8.0", diff --git a/versions/p-/poselib.json b/versions/p-/poselib.json new file mode 100644 index 00000000000000..20360d38c4fdef --- /dev/null +++ b/versions/p-/poselib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "adf31292beb503a1ff13f6ecffd2697c0f56bbe2", + "version": "2.0.4", + "port-version": 0 + } + ] +} diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 93b09a7300056b..a807e3b642f8fc 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf5f1d578553c2ec1665a45b4e34bcf3229c3e6f", + "version-string": "2024.10.07.00", + "port-version": 0 + }, { "git-tree": "7a85641a8010a78d432738f559b0b88ac77223b6", "version-string": "2024.09.30.00", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 84dabbd2885fd7..9455c9434ca12c 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62c1ff180dae6af1ba4aff966bd87f9683c6d8f1", + "version": "3.11.10", + "port-version": 0 + }, { "git-tree": "cd869d19271e7b865248145bb3e14093faa1b687", "version": "3.11.8", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 48341fa7d42f79..00281a94d60458 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23781cb492d79ad899f97d89b7479e978c52b71d", + "version": "1.36", + "port-version": 0 + }, { "git-tree": "b0dfe33379e9412c9ef411bdd5505d76728b8a61", "version": "1.35", diff --git a/versions/r-/rapidcsv.json b/versions/r-/rapidcsv.json index 33992c94f57c33..6080a585ddb009 100644 --- a/versions/r-/rapidcsv.json +++ b/versions/r-/rapidcsv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62b6074da263ca7864da9eb1e26d0ed4b9e00412", + "version": "8.84", + "port-version": 0 + }, { "git-tree": "478468828d67563a15d2f68d5999a28064538e46", "version": "8.83", diff --git a/versions/r-/reproc.json b/versions/r-/reproc.json index f733405338dc24..a20bb3176ddc5e 100644 --- a/versions/r-/reproc.json +++ b/versions/r-/reproc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b844bd7e62dcad31cd5a38a38416f1d03a017e08", + "version": "14.2.5", + "port-version": 0 + }, { "git-tree": "6fc63b3c029742441d22a288db9f37f5e016abbe", "version": "14.2.4", diff --git a/versions/s-/simd.json b/versions/s-/simd.json index 544c3e72811750..4cda497a78ee28 100644 --- a/versions/s-/simd.json +++ b/versions/s-/simd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24ebd0c319f5bd2bc39ba4bc1e4614ed5d074dc1", + "version": "6.1.142", + "port-version": 0 + }, { "git-tree": "5303b811a40f05901a1d01677f3d2c5ec74a9834", "version": "6.1.140", diff --git a/versions/s-/simdutf.json b/versions/s-/simdutf.json index b7006750c04998..b4753862f151e5 100644 --- a/versions/s-/simdutf.json +++ b/versions/s-/simdutf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dfd21350acbdb178c047a22b31d18e58017f7b4", + "version-semver": "5.6.0", + "port-version": 0 + }, { "git-tree": "d46df0fe18299316eccfdef76fea84b91c235609", "version-semver": "5.5.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 2e7b10bd0b4150..469be4cb5fa4ae 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "942c0f5227b85eb96fad153a7b57c12debb33b4c", + "version": "129", + "port-version": 2 + }, { "git-tree": "886519547ba2addf980c4c567bca7f4c4d686d2f", "version": "129", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index f561340d173dfc..c0dc51794915e3 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54c1c045d21157ce32df8a1c8b7b9d57b0d5d6ce", + "version": "4.7.0", + "port-version": 0 + }, { "git-tree": "6a3bae487fe89087457e2a391ee9720d68393616", "version": "4.6.0", diff --git a/versions/t-/tobias-loew-flags.json b/versions/t-/tobias-loew-flags.json new file mode 100644 index 00000000000000..80f5eec7a430b5 --- /dev/null +++ b/versions/t-/tobias-loew-flags.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2de8995b035f3c2fa68d55eaec02d657c835cfbd", + "version-date": "2024-09-10", + "port-version": 0 + } + ] +} diff --git a/versions/t-/triangle.json b/versions/t-/triangle.json index 734d6ae2a99d63..18b4f7cbb790ed 100644 --- a/versions/t-/triangle.json +++ b/versions/t-/triangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd79d7af32634104384879113cbf1158b1e72a8f", + "version": "1.6", + "port-version": 4 + }, { "git-tree": "b751d577254b617b208ac8e1e828be1a539f8123", "version": "1.6", diff --git a/versions/v-/vcpkg-get-python-packages.json b/versions/v-/vcpkg-get-python-packages.json index 7733d854847d93..d375b4b185abde 100644 --- a/versions/v-/vcpkg-get-python-packages.json +++ b/versions/v-/vcpkg-get-python-packages.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7d017ccabcaf02739662b60cc1000b8489acb22", + "version-date": "2024-09-29", + "port-version": 0 + }, { "git-tree": "9205135e78e0cad47fd43c2f7abada1f4fbbdbaa", "version-date": "2024-01-24", diff --git a/versions/v-/vxl.json b/versions/v-/vxl.json index a8ebd43cdd53e4..cf5c079f0b4d2c 100644 --- a/versions/v-/vxl.json +++ b/versions/v-/vxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5678400bc3c92ba662f6678f51dc6ee1e1d6ece0", + "version": "3.5.0", + "port-version": 0 + }, { "git-tree": "53a9a629f70fb7bb7e488b889b1608eac9d3411e", "version": "2.0.2", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 30eae47a32c842..0a0f2b51371968 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dce0e6d225710b3ecd5811bb83d804ea740281c0", + "version-string": "2024.10.07.00", + "port-version": 0 + }, { "git-tree": "b3251636a753439c991c79c231043f2da637df24", "version-string": "2024.09.30.00", diff --git a/versions/z-/zoe.json b/versions/z-/zoe.json index 1960adc005f816..805c487ec83536 100644 --- a/versions/z-/zoe.json +++ b/versions/z-/zoe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b7e65e0b7e646b34389eea8920e47e2726cfdf6", + "version": "3.2", + "port-version": 0 + }, { "git-tree": "fdba4d3af7c15a74f48c218c3aa2efce33972d86", "version": "3.1",