diff --git a/ports/ade/portfile.cmake b/ports/ade/portfile.cmake index 9f54cfa2f158ee..ccfb82cafe2c18 100644 --- a/ports/ade/portfile.cmake +++ b/ports/ade/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/ade REF "v${VERSION}" - SHA512 5ee9a13b8bff062fc742d117dc0315bb5d6ff2c747ce5c7df0c233870506ec5f2afbd2852fc3d6bb28b86426013fd7fdf0a1e49164f7cd644e78443904dc8711 + SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348 HEAD_REF master ) diff --git a/ports/ade/vcpkg.json b/ports/ade/vcpkg.json index 3bc942ef8a9d87..9e3a46646d214d 100644 --- a/ports/ade/vcpkg.json +++ b/ports/ade/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ade", - "version-string": "0.1.2c", + "version-string": "0.1.2d", "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.", "dependencies": [ { diff --git a/ports/ankurvdev-embedresource/portfile.cmake b/ports/ankurvdev-embedresource/portfile.cmake new file mode 100644 index 00000000000000..bbc240b32f0e65 --- /dev/null +++ b/ports/ankurvdev-embedresource/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ankurvdev/embedresource + REF "v${VERSION}" + SHA512 96d2208fd5d654dad5662968296fa363cea0a935fec8474b780717c9303d2dd763833370bcdf02d6d63e264368b0955fa1f13c6e55685280df5fdaf9e72b8c9f + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +vcpkg_copy_tools(TOOL_NAMES embedresource AUTO_CLEAN) + +file(READ "${CURRENT_PACKAGES_DIR}/share/embedresource/EmbedResourceConfig.cmake" config_contents) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/embedresource/EmbedResourceConfig.cmake" +"find_program( + EMBEDRESOURCE_EXECUTABLE embedresource + PATHS + \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/${PORT}\" + NO_DEFAULT_PATH + REQUIRED) +${config_contents}" +) diff --git a/ports/ankurvdev-embedresource/vcpkg.json b/ports/ankurvdev-embedresource/vcpkg.json new file mode 100644 index 00000000000000..46ee2fa030eb45 --- /dev/null +++ b/ports/ankurvdev-embedresource/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ankurvdev-embedresource", + "version": "0.0.10", + "description": "Cross Platform Resource Embedding", + "homepage": "https://github.com/ankurvdev/embedresource", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "ankurvdev-embedresource", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/asiosdk/portfile.cmake b/ports/asiosdk/portfile.cmake index 9807a4c2699538..3d3c2415a36456 100644 --- a/ports/asiosdk/portfile.cmake +++ b/ports/asiosdk/portfile.cmake @@ -1,29 +1,32 @@ -set(VERSION 2.3.3) - vcpkg_download_distfile(ARCHIVE URLS "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip" - FILENAME "asiosdk_2.3.3_2019-06-14-eac6c1a57829.zip" - SHA512 eac6c1a57829b7f722a681c54b2f6469d54695523f08f727d0dd6744dcd7fce4f3249c57689bb15ed7a8bcb912833b226439d800913e122e0ef9ab73672f6542 + FILENAME "asiosdk_2.3.3_2019-06-14-d74c0bc09162.zip" + SHA512 d74c0bc09162640a377aaab2f2ce716f9ee7a6ef8d1aa1aa6bc223a4748c60fa900cc77b1cf6db66f8a4064a074b31a71d75cccc7de3634347865238d9c039af ) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} - SOURCE_BASE ${VERSION} + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${VERSION}" ) -file(INSTALL ${SOURCE_PATH}/asio/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/asio) -file(INSTALL ${SOURCE_PATH}/common/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/common) -file(INSTALL ${SOURCE_PATH}/driver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/driver) -file(INSTALL ${SOURCE_PATH}/host/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/host) -file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/changes.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement 2.0.1 - 2019.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${SOURCE_PATH}/ASIO SDK 2.3.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/asio/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/asio") +file(INSTALL "${SOURCE_PATH}/common/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/common") +file(INSTALL "${SOURCE_PATH}/driver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/driver") +file(INSTALL "${SOURCE_PATH}/host/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/host") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/readme.txt") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file( + INSTALL + "${SOURCE_PATH}/changes.txt" + "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" + "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement V2.0.3 - 2023.pdf" + "${SOURCE_PATH}/ASIO SDK 2.3.pdf" + "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION + "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/asiosdk/usage b/ports/asiosdk/usage index 1afa2ae84df3dc..3827cfa3df0e46 100644 --- a/ports/asiosdk/usage +++ b/ports/asiosdk/usage @@ -1,4 +1,4 @@ The package asiosdk provides CMake integration: find_package(asiosdk REQUIRED) - target_include_directories( PRIVATE ${ASIOSDK_INCLUDE_DIRS}) + target_include_directories(main PRIVATE ${ASIOSDK_INCLUDE_DIR}) diff --git a/ports/asiosdk/vcpkg.json b/ports/asiosdk/vcpkg.json index 0d85c574fe95a5..dc44bde07c4aa9 100644 --- a/ports/asiosdk/vcpkg.json +++ b/ports/asiosdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "asiosdk", "version": "2.3.3", - "port-version": 6, + "port-version": 7, "description": "ASIO is a low latency audio API from Steinberg.", "homepage": "https://www.steinberg.net/en/company/developers.html", "supports": "windows & !(arm | uwp)" diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index 6d4a878722f5b9..a58ff88da38535 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -80,7 +80,7 @@ index 6551dcb..0796448 100644 +find_dependency(pugixml CONFIG) +if(NOT @BUILD_SHARED_LIBS@) + find_dependency(kubazip CONFIG) -+ find_dependency(minizip CONFIG) ++ find_dependency(unofficial-minizip CONFIG) + #find_dependency(openddlparser CONFIG) + find_dependency(poly2tri CONFIG) + find_dependency(polyclipping CONFIG) @@ -268,7 +268,8 @@ index 5339454..45e07c0 100644 - hunter_add_package(minizip) +IF(1) + #hunter_add_package(minizip) - find_package(minizip CONFIG REQUIRED) +- find_package(minizip CONFIG REQUIRED) ++ find_package(unofficial-minizip CONFIG REQUIRED) ELSE() SET( unzip_SRCS @@ -969,9 +969,9 @@ ENDIF() @@ -383,7 +384,8 @@ index 5339454..45e07c0 100644 + ${OPENDDL_PARSER_LIBRARIES} - #poly2tri::poly2tri + poly2tri::poly2tri - minizip::minizip +- minizip::minizip ++ unofficial::minizip::minizip - ZLIB::zlib - RapidJSON::rapidjson + ZLIB::ZLIB diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json index 72899aa58a2b48..0ff10c38c4ebd1 100644 --- a/ports/assimp/vcpkg.json +++ b/ports/assimp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "assimp", "version": "5.3.1", + "port-version": 2, "description": "The Open Asset import library", "homepage": "https://github.com/assimp/assimp", "license": "BSD-3-Clause", diff --git a/ports/atl/portfile.cmake b/ports/atl/portfile.cmake new file mode 100644 index 00000000000000..61a207f7bfbaae --- /dev/null +++ b/ports/atl/portfile.cmake @@ -0,0 +1,10 @@ +find_path(ATLBASE_H + NAMES atlbase.h + PATHS $ENV{INCLUDE} +) + +if(NOT ATLBASE_H) + message(FATAL_ERROR "Unable to locate 'atlbase.h'. Ensure you have installed the Active Template Library (ATL) component of Visual Studio.") +endif() + +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/atl/vcpkg.json b/ports/atl/vcpkg.json new file mode 100644 index 00000000000000..cd2350eb2bcd74 --- /dev/null +++ b/ports/atl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "atl", + "version": "0", + "description": "A stub package that ensures Visual Studio has Active Template Library (ATL) installed.", + "supports": "windows" +} diff --git a/ports/atlmfc/vcpkg.json b/ports/atlmfc/vcpkg.json index 6b9eea357c7951..40f1377957854d 100644 --- a/ports/atlmfc/vcpkg.json +++ b/ports/atlmfc/vcpkg.json @@ -1,7 +1,10 @@ { "name": "atlmfc", "version": "0", - "port-version": 2, - "description": "a stub package that ensures VS has ATL/MFC installed.", - "supports": "windows" + "port-version": 3, + "description": "A stub package that ensures Visual Studio has ATL/MFC installed.", + "supports": "windows", + "dependencies": [ + "atl" + ] } diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake deleted file mode 100644 index 27b93c24bc7575..00000000000000 --- a/ports/aws-sdk-cpp/compute_build_only.cmake +++ /dev/null @@ -1,1090 +0,0 @@ -# Automatically generated by generateFeatures.ps1 -if("access-management" IN_LIST FEATURES) - list(APPEND BUILD_ONLY access-management) -endif() -if("accessanalyzer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY accessanalyzer) -endif() -if("account" IN_LIST FEATURES) - list(APPEND BUILD_ONLY account) -endif() -if("acm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY acm) -endif() -if("acm-pca" IN_LIST FEATURES) - list(APPEND BUILD_ONLY acm-pca) -endif() -if("alexaforbusiness" IN_LIST FEATURES) - list(APPEND BUILD_ONLY alexaforbusiness) -endif() -if("amp" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amp) -endif() -if("amplify" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amplify) -endif() -if("amplifybackend" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amplifybackend) -endif() -if("amplifyuibuilder" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amplifyuibuilder) -endif() -if("apigateway" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apigateway) -endif() -if("apigatewaymanagementapi" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apigatewaymanagementapi) -endif() -if("apigatewayv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apigatewayv2) -endif() -if("appconfig" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appconfig) -endif() -if("appconfigdata" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appconfigdata) -endif() -if("appfabric" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appfabric) -endif() -if("appflow" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appflow) -endif() -if("appintegrations" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appintegrations) -endif() -if("application-autoscaling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY application-autoscaling) -endif() -if("application-insights" IN_LIST FEATURES) - list(APPEND BUILD_ONLY application-insights) -endif() -if("applicationcostprofiler" IN_LIST FEATURES) - list(APPEND BUILD_ONLY applicationcostprofiler) -endif() -if("appmesh" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appmesh) -endif() -if("apprunner" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apprunner) -endif() -if("appstream" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appstream) -endif() -if("appsync" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appsync) -endif() -if("arc-zonal-shift" IN_LIST FEATURES) - list(APPEND BUILD_ONLY arc-zonal-shift) -endif() -if("athena" IN_LIST FEATURES) - list(APPEND BUILD_ONLY athena) -endif() -if("auditmanager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY auditmanager) -endif() -if("autoscaling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY autoscaling) -endif() -if("autoscaling-plans" IN_LIST FEATURES) - list(APPEND BUILD_ONLY autoscaling-plans) -endif() -if("awsmigrationhub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY AWSMigrationHub) -endif() -if("awstransfer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY awstransfer) -endif() -if("backup" IN_LIST FEATURES) - list(APPEND BUILD_ONLY backup) -endif() -if("backup-gateway" IN_LIST FEATURES) - list(APPEND BUILD_ONLY backup-gateway) -endif() -if("backupstorage" IN_LIST FEATURES) - list(APPEND BUILD_ONLY backupstorage) -endif() -if("batch" IN_LIST FEATURES) - list(APPEND BUILD_ONLY batch) -endif() -if("billingconductor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY billingconductor) -endif() -if("braket" IN_LIST FEATURES) - list(APPEND BUILD_ONLY braket) -endif() -if("budgets" IN_LIST FEATURES) - list(APPEND BUILD_ONLY budgets) -endif() -if("ce" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ce) -endif() -if("chime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime) -endif() -if("chime-sdk-identity" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-identity) -endif() -if("chime-sdk-media-pipelines" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-media-pipelines) -endif() -if("chime-sdk-meetings" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-meetings) -endif() -if("chime-sdk-messaging" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-messaging) -endif() -if("chime-sdk-voice" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-voice) -endif() -if("cleanrooms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cleanrooms) -endif() -if("cloud9" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloud9) -endif() -if("cloudcontrol" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudcontrol) -endif() -if("clouddirectory" IN_LIST FEATURES) - list(APPEND BUILD_ONLY clouddirectory) -endif() -if("cloudformation" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudformation) -endif() -if("cloudfront" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudfront) -endif() -if("cloudhsm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudhsm) -endif() -if("cloudhsmv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudhsmv2) -endif() -if("cloudsearch" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudsearch) -endif() -if("cloudsearchdomain" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudsearchdomain) -endif() -if("cloudtrail" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudtrail) -endif() -if("cloudtrail-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudtrail-data) -endif() -if("codeartifact" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeartifact) -endif() -if("codebuild" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codebuild) -endif() -if("codecatalyst" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codecatalyst) -endif() -if("codecommit" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codecommit) -endif() -if("codedeploy" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codedeploy) -endif() -if("codeguru-reviewer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeguru-reviewer) -endif() -if("codeguru-security" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeguru-security) -endif() -if("codeguruprofiler" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeguruprofiler) -endif() -if("codepipeline" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codepipeline) -endif() -if("codestar" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codestar) -endif() -if("codestar-connections" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codestar-connections) -endif() -if("codestar-notifications" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codestar-notifications) -endif() -if("cognito-identity" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cognito-identity) -endif() -if("cognito-idp" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cognito-idp) -endif() -if("cognito-sync" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cognito-sync) -endif() -if("comprehend" IN_LIST FEATURES) - list(APPEND BUILD_ONLY comprehend) -endif() -if("comprehendmedical" IN_LIST FEATURES) - list(APPEND BUILD_ONLY comprehendmedical) -endif() -if("compute-optimizer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY compute-optimizer) -endif() -if("config" IN_LIST FEATURES) - list(APPEND BUILD_ONLY config) -endif() -if("connect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connect) -endif() -if("connect-contact-lens" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connect-contact-lens) -endif() -if("connectcampaigns" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connectcampaigns) -endif() -if("connectcases" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connectcases) -endif() -if("connectparticipant" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connectparticipant) -endif() -if("controltower" IN_LIST FEATURES) - list(APPEND BUILD_ONLY controltower) -endif() -if("cur" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cur) -endif() -if("customer-profiles" IN_LIST FEATURES) - list(APPEND BUILD_ONLY customer-profiles) -endif() -if("databrew" IN_LIST FEATURES) - list(APPEND BUILD_ONLY databrew) -endif() -if("dataexchange" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dataexchange) -endif() -if("datapipeline" IN_LIST FEATURES) - list(APPEND BUILD_ONLY datapipeline) -endif() -if("datasync" IN_LIST FEATURES) - list(APPEND BUILD_ONLY datasync) -endif() -if("dax" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dax) -endif() -if("detective" IN_LIST FEATURES) - list(APPEND BUILD_ONLY detective) -endif() -if("devicefarm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY devicefarm) -endif() -if("devops-guru" IN_LIST FEATURES) - list(APPEND BUILD_ONLY devops-guru) -endif() -if("directconnect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY directconnect) -endif() -if("discovery" IN_LIST FEATURES) - list(APPEND BUILD_ONLY discovery) -endif() -if("dlm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dlm) -endif() -if("dms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dms) -endif() -if("docdb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY docdb) -endif() -if("docdb-elastic" IN_LIST FEATURES) - list(APPEND BUILD_ONLY docdb-elastic) -endif() -if("drs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY drs) -endif() -if("ds" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ds) -endif() -if("dynamodb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dynamodb) -endif() -if("dynamodbstreams" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dynamodbstreams) -endif() -if("ebs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ebs) -endif() -if("ec2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ec2) -endif() -if("ec2-instance-connect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ec2-instance-connect) -endif() -if("ecr" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ecr) -endif() -if("ecr-public" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ecr-public) -endif() -if("ecs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ecs) -endif() -if("eks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY eks) -endif() -if("elastic-inference" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elastic-inference) -endif() -if("elasticache" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticache) -endif() -if("elasticbeanstalk" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticbeanstalk) -endif() -if("elasticfilesystem" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticfilesystem) -endif() -if("elasticloadbalancing" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticloadbalancing) -endif() -if("elasticloadbalancingv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticloadbalancingv2) -endif() -if("elasticmapreduce" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticmapreduce) -endif() -if("elastictranscoder" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elastictranscoder) -endif() -if("email" IN_LIST FEATURES) - list(APPEND BUILD_ONLY email) -endif() -if("emr-containers" IN_LIST FEATURES) - list(APPEND BUILD_ONLY emr-containers) -endif() -if("emr-serverless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY emr-serverless) -endif() -if("entityresolution" IN_LIST FEATURES) - list(APPEND BUILD_ONLY entityresolution) -endif() -if("es" IN_LIST FEATURES) - list(APPEND BUILD_ONLY es) -endif() -if("eventbridge" IN_LIST FEATURES) - list(APPEND BUILD_ONLY eventbridge) -endif() -if("events" IN_LIST FEATURES) - list(APPEND BUILD_ONLY events) -endif() -if("evidently" IN_LIST FEATURES) - list(APPEND BUILD_ONLY evidently) -endif() -if("finspace" IN_LIST FEATURES) - list(APPEND BUILD_ONLY finspace) -endif() -if("finspace-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY finspace-data) -endif() -if("firehose" IN_LIST FEATURES) - list(APPEND BUILD_ONLY firehose) -endif() -if("fis" IN_LIST FEATURES) - list(APPEND BUILD_ONLY fis) -endif() -if("fms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY fms) -endif() -if("forecast" IN_LIST FEATURES) - list(APPEND BUILD_ONLY forecast) -endif() -if("forecastquery" IN_LIST FEATURES) - list(APPEND BUILD_ONLY forecastquery) -endif() -if("frauddetector" IN_LIST FEATURES) - list(APPEND BUILD_ONLY frauddetector) -endif() -if("fsx" IN_LIST FEATURES) - list(APPEND BUILD_ONLY fsx) -endif() -if("gamelift" IN_LIST FEATURES) - list(APPEND BUILD_ONLY gamelift) -endif() -if("gamesparks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY gamesparks) -endif() -if("glacier" IN_LIST FEATURES) - list(APPEND BUILD_ONLY glacier) -endif() -if("globalaccelerator" IN_LIST FEATURES) - list(APPEND BUILD_ONLY globalaccelerator) -endif() -if("glue" IN_LIST FEATURES) - list(APPEND BUILD_ONLY glue) -endif() -if("grafana" IN_LIST FEATURES) - list(APPEND BUILD_ONLY grafana) -endif() -if("greengrass" IN_LIST FEATURES) - list(APPEND BUILD_ONLY greengrass) -endif() -if("greengrassv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY greengrassv2) -endif() -if("groundstation" IN_LIST FEATURES) - list(APPEND BUILD_ONLY groundstation) -endif() -if("guardduty" IN_LIST FEATURES) - list(APPEND BUILD_ONLY guardduty) -endif() -if("health" IN_LIST FEATURES) - list(APPEND BUILD_ONLY health) -endif() -if("healthlake" IN_LIST FEATURES) - list(APPEND BUILD_ONLY healthlake) -endif() -if("honeycode" IN_LIST FEATURES) - list(APPEND BUILD_ONLY honeycode) -endif() -if("iam" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iam) -endif() -if("identity-management" IN_LIST FEATURES) - list(APPEND BUILD_ONLY identity-management) -endif() -if("identitystore" IN_LIST FEATURES) - list(APPEND BUILD_ONLY identitystore) -endif() -if("imagebuilder" IN_LIST FEATURES) - list(APPEND BUILD_ONLY imagebuilder) -endif() -if("importexport" IN_LIST FEATURES) - list(APPEND BUILD_ONLY importexport) -endif() -if("inspector" IN_LIST FEATURES) - list(APPEND BUILD_ONLY inspector) -endif() -if("inspector2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY inspector2) -endif() -if("internetmonitor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY internetmonitor) -endif() -if("iot" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot) -endif() -if("iot-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot-data) -endif() -if("iot-jobs-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot-jobs-data) -endif() -if("iot-roborunner" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot-roborunner) -endif() -if("iot1click-devices" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot1click-devices) -endif() -if("iot1click-projects" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot1click-projects) -endif() -if("iotanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotanalytics) -endif() -if("iotdeviceadvisor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotdeviceadvisor) -endif() -if("iotevents" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotevents) -endif() -if("iotevents-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotevents-data) -endif() -if("iotfleethub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotfleethub) -endif() -if("iotfleetwise" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotfleetwise) -endif() -if("iotsecuretunneling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotsecuretunneling) -endif() -if("iotsitewise" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotsitewise) -endif() -if("iotthingsgraph" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotthingsgraph) -endif() -if("iottwinmaker" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iottwinmaker) -endif() -if("iotwireless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotwireless) -endif() -if("ivs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ivs) -endif() -if("ivs-realtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ivs-realtime) -endif() -if("ivschat" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ivschat) -endif() -if("kafka" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kafka) -endif() -if("kafkaconnect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kafkaconnect) -endif() -if("kendra" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kendra) -endif() -if("kendra-ranking" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kendra-ranking) -endif() -if("keyspaces" IN_LIST FEATURES) - list(APPEND BUILD_ONLY keyspaces) -endif() -if("kinesis" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis) -endif() -if("kinesis-video-archived-media" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-archived-media) -endif() -if("kinesis-video-media" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-media) -endif() -if("kinesis-video-signaling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-signaling) -endif() -if("kinesis-video-webrtc-storage" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-webrtc-storage) -endif() -if("kinesisanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesisanalytics) -endif() -if("kinesisanalyticsv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesisanalyticsv2) -endif() -if("kinesisvideo" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesisvideo) -endif() -if("kms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kms) -endif() -if("lakeformation" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lakeformation) -endif() -if("lambda" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lambda) -endif() -if("lex" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lex) -endif() -if("lex-models" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lex-models) -endif() -if("lexv2-models" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lexv2-models) -endif() -if("lexv2-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lexv2-runtime) -endif() -if("license-manager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY license-manager) -endif() -if("license-manager-linux-subscriptions" IN_LIST FEATURES) - list(APPEND BUILD_ONLY license-manager-linux-subscriptions) -endif() -if("license-manager-user-subscriptions" IN_LIST FEATURES) - list(APPEND BUILD_ONLY license-manager-user-subscriptions) -endif() -if("lightsail" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lightsail) -endif() -if("location" IN_LIST FEATURES) - list(APPEND BUILD_ONLY location) -endif() -if("logs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY logs) -endif() -if("lookoutequipment" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lookoutequipment) -endif() -if("lookoutmetrics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lookoutmetrics) -endif() -if("lookoutvision" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lookoutvision) -endif() -if("m2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY m2) -endif() -if("machinelearning" IN_LIST FEATURES) - list(APPEND BUILD_ONLY machinelearning) -endif() -if("macie" IN_LIST FEATURES) - list(APPEND BUILD_ONLY macie) -endif() -if("macie2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY macie2) -endif() -if("managedblockchain" IN_LIST FEATURES) - list(APPEND BUILD_ONLY managedblockchain) -endif() -if("managedblockchain-query" IN_LIST FEATURES) - list(APPEND BUILD_ONLY managedblockchain-query) -endif() -if("marketplace-catalog" IN_LIST FEATURES) - list(APPEND BUILD_ONLY marketplace-catalog) -endif() -if("marketplace-entitlement" IN_LIST FEATURES) - list(APPEND BUILD_ONLY marketplace-entitlement) -endif() -if("marketplacecommerceanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY marketplacecommerceanalytics) -endif() -if("mediaconnect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediaconnect) -endif() -if("mediaconvert" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediaconvert) -endif() -if("medialive" IN_LIST FEATURES) - list(APPEND BUILD_ONLY medialive) -endif() -if("mediapackage" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediapackage) -endif() -if("mediapackage-vod" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediapackage-vod) -endif() -if("mediapackagev2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediapackagev2) -endif() -if("mediastore" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediastore) -endif() -if("mediastore-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediastore-data) -endif() -if("mediatailor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediatailor) -endif() -if("medical-imaging" IN_LIST FEATURES) - list(APPEND BUILD_ONLY medical-imaging) -endif() -if("memorydb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY memorydb) -endif() -if("meteringmarketplace" IN_LIST FEATURES) - list(APPEND BUILD_ONLY meteringmarketplace) -endif() -if("mgn" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mgn) -endif() -if("migration-hub-refactor-spaces" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migration-hub-refactor-spaces) -endif() -if("migrationhub-config" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migrationhub-config) -endif() -if("migrationhuborchestrator" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migrationhuborchestrator) -endif() -if("migrationhubstrategy" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migrationhubstrategy) -endif() -if("mobile" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mobile) -endif() -if("monitoring" IN_LIST FEATURES) - list(APPEND BUILD_ONLY monitoring) -endif() -if("mq" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mq) -endif() -if("mturk-requester" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mturk-requester) -endif() -if("mwaa" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mwaa) -endif() -if("neptune" IN_LIST FEATURES) - list(APPEND BUILD_ONLY neptune) -endif() -if("neptunedata" IN_LIST FEATURES) - list(APPEND BUILD_ONLY neptunedata) -endif() -if("network-firewall" IN_LIST FEATURES) - list(APPEND BUILD_ONLY network-firewall) -endif() -if("networkmanager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY networkmanager) -endif() -if("nimble" IN_LIST FEATURES) - list(APPEND BUILD_ONLY nimble) -endif() -if("oam" IN_LIST FEATURES) - list(APPEND BUILD_ONLY oam) -endif() -if("omics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY omics) -endif() -if("opensearch" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opensearch) -endif() -if("opensearchserverless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opensearchserverless) -endif() -if("opsworks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opsworks) -endif() -if("opsworkscm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opsworkscm) -endif() -if("organizations" IN_LIST FEATURES) - list(APPEND BUILD_ONLY organizations) -endif() -if("osis" IN_LIST FEATURES) - list(APPEND BUILD_ONLY osis) -endif() -if("outposts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY outposts) -endif() -if("panorama" IN_LIST FEATURES) - list(APPEND BUILD_ONLY panorama) -endif() -if("payment-cryptography" IN_LIST FEATURES) - list(APPEND BUILD_ONLY payment-cryptography) -endif() -if("payment-cryptography-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY payment-cryptography-data) -endif() -if("pca-connector-ad" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pca-connector-ad) -endif() -if("personalize" IN_LIST FEATURES) - list(APPEND BUILD_ONLY personalize) -endif() -if("personalize-events" IN_LIST FEATURES) - list(APPEND BUILD_ONLY personalize-events) -endif() -if("personalize-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY personalize-runtime) -endif() -if("pi" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pi) -endif() -if("pinpoint" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pinpoint) -endif() -if("pinpoint-email" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pinpoint-email) -endif() -if("pinpoint-sms-voice-v2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pinpoint-sms-voice-v2) -endif() -if("pipes" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pipes) -endif() -if("polly" IN_LIST FEATURES) - list(APPEND BUILD_ONLY polly) -endif() -if("pricing" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pricing) -endif() -if("privatenetworks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY privatenetworks) -endif() -if("proton" IN_LIST FEATURES) - list(APPEND BUILD_ONLY proton) -endif() -if("qldb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY qldb) -endif() -if("qldb-session" IN_LIST FEATURES) - list(APPEND BUILD_ONLY qldb-session) -endif() -if("queues" IN_LIST FEATURES) - list(APPEND BUILD_ONLY queues) -endif() -if("quicksight" IN_LIST FEATURES) - list(APPEND BUILD_ONLY quicksight) -endif() -if("ram" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ram) -endif() -if("rbin" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rbin) -endif() -if("rds" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rds) -endif() -if("rds-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rds-data) -endif() -if("redshift" IN_LIST FEATURES) - list(APPEND BUILD_ONLY redshift) -endif() -if("redshift-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY redshift-data) -endif() -if("redshift-serverless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY redshift-serverless) -endif() -if("rekognition" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rekognition) -endif() -if("resiliencehub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resiliencehub) -endif() -if("resource-explorer-2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resource-explorer-2) -endif() -if("resource-groups" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resource-groups) -endif() -if("resourcegroupstaggingapi" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resourcegroupstaggingapi) -endif() -if("robomaker" IN_LIST FEATURES) - list(APPEND BUILD_ONLY robomaker) -endif() -if("rolesanywhere" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rolesanywhere) -endif() -if("route53" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53) -endif() -if("route53-recovery-cluster" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53-recovery-cluster) -endif() -if("route53-recovery-control-config" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53-recovery-control-config) -endif() -if("route53-recovery-readiness" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53-recovery-readiness) -endif() -if("route53domains" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53domains) -endif() -if("route53resolver" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53resolver) -endif() -if("rum" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rum) -endif() -if("s3" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3) -endif() -if("s3-crt" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3-crt) -endif() -if("s3-encryption" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3-encryption) -endif() -if("s3control" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3control) -endif() -if("s3outposts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3outposts) -endif() -if("sagemaker" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker) -endif() -if("sagemaker-a2i-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-a2i-runtime) -endif() -if("sagemaker-edge" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-edge) -endif() -if("sagemaker-featurestore-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-featurestore-runtime) -endif() -if("sagemaker-geospatial" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-geospatial) -endif() -if("sagemaker-metrics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-metrics) -endif() -if("sagemaker-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-runtime) -endif() -if("savingsplans" IN_LIST FEATURES) - list(APPEND BUILD_ONLY savingsplans) -endif() -if("scheduler" IN_LIST FEATURES) - list(APPEND BUILD_ONLY scheduler) -endif() -if("schemas" IN_LIST FEATURES) - list(APPEND BUILD_ONLY schemas) -endif() -if("sdb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sdb) -endif() -if("secretsmanager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY secretsmanager) -endif() -if("securityhub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY securityhub) -endif() -if("securitylake" IN_LIST FEATURES) - list(APPEND BUILD_ONLY securitylake) -endif() -if("serverlessrepo" IN_LIST FEATURES) - list(APPEND BUILD_ONLY serverlessrepo) -endif() -if("service-quotas" IN_LIST FEATURES) - list(APPEND BUILD_ONLY service-quotas) -endif() -if("servicecatalog" IN_LIST FEATURES) - list(APPEND BUILD_ONLY servicecatalog) -endif() -if("servicecatalog-appregistry" IN_LIST FEATURES) - list(APPEND BUILD_ONLY servicecatalog-appregistry) -endif() -if("servicediscovery" IN_LIST FEATURES) - list(APPEND BUILD_ONLY servicediscovery) -endif() -if("sesv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sesv2) -endif() -if("shield" IN_LIST FEATURES) - list(APPEND BUILD_ONLY shield) -endif() -if("signer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY signer) -endif() -if("simspaceweaver" IN_LIST FEATURES) - list(APPEND BUILD_ONLY simspaceweaver) -endif() -if("sms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sms) -endif() -if("sms-voice" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sms-voice) -endif() -if("snow-device-management" IN_LIST FEATURES) - list(APPEND BUILD_ONLY snow-device-management) -endif() -if("snowball" IN_LIST FEATURES) - list(APPEND BUILD_ONLY snowball) -endif() -if("sns" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sns) -endif() -if("sqs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sqs) -endif() -if("ssm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm) -endif() -if("ssm-contacts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm-contacts) -endif() -if("ssm-incidents" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm-incidents) -endif() -if("ssm-sap" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm-sap) -endif() -if("sso" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sso) -endif() -if("sso-admin" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sso-admin) -endif() -if("sso-oidc" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sso-oidc) -endif() -if("states" IN_LIST FEATURES) - list(APPEND BUILD_ONLY states) -endif() -if("storagegateway" IN_LIST FEATURES) - list(APPEND BUILD_ONLY storagegateway) -endif() -if("sts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sts) -endif() -if("support" IN_LIST FEATURES) - list(APPEND BUILD_ONLY support) -endif() -if("support-app" IN_LIST FEATURES) - list(APPEND BUILD_ONLY support-app) -endif() -if("swf" IN_LIST FEATURES) - list(APPEND BUILD_ONLY swf) -endif() -if("synthetics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY synthetics) -endif() -if("text-to-speech" IN_LIST FEATURES) - list(APPEND BUILD_ONLY text-to-speech) -endif() -if("textract" IN_LIST FEATURES) - list(APPEND BUILD_ONLY textract) -endif() -if("timestream-query" IN_LIST FEATURES) - list(APPEND BUILD_ONLY timestream-query) -endif() -if("timestream-write" IN_LIST FEATURES) - list(APPEND BUILD_ONLY timestream-write) -endif() -if("tnb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY tnb) -endif() -if("transcribe" IN_LIST FEATURES) - list(APPEND BUILD_ONLY transcribe) -endif() -if("transcribestreaming" IN_LIST FEATURES) - list(APPEND BUILD_ONLY transcribestreaming) -endif() -if("transfer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY transfer) -endif() -if("translate" IN_LIST FEATURES) - list(APPEND BUILD_ONLY translate) -endif() -if("verifiedpermissions" IN_LIST FEATURES) - list(APPEND BUILD_ONLY verifiedpermissions) -endif() -if("voice-id" IN_LIST FEATURES) - list(APPEND BUILD_ONLY voice-id) -endif() -if("vpc-lattice" IN_LIST FEATURES) - list(APPEND BUILD_ONLY vpc-lattice) -endif() -if("waf" IN_LIST FEATURES) - list(APPEND BUILD_ONLY waf) -endif() -if("waf-regional" IN_LIST FEATURES) - list(APPEND BUILD_ONLY waf-regional) -endif() -if("wafv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY wafv2) -endif() -if("wellarchitected" IN_LIST FEATURES) - list(APPEND BUILD_ONLY wellarchitected) -endif() -if("wisdom" IN_LIST FEATURES) - list(APPEND BUILD_ONLY wisdom) -endif() -if("workdocs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workdocs) -endif() -if("worklink" IN_LIST FEATURES) - list(APPEND BUILD_ONLY worklink) -endif() -if("workmail" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workmail) -endif() -if("workmailmessageflow" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workmailmessageflow) -endif() -if("workspaces" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workspaces) -endif() -if("workspaces-web" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workspaces-web) -endif() -if("xray" IN_LIST FEATURES) - list(APPEND BUILD_ONLY xray) -endif() diff --git a/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch b/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch new file mode 100644 index 00000000000000..c2d98030136e81 --- /dev/null +++ b/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch @@ -0,0 +1,10 @@ +diff --git a/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt b/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt +index a8a888d..574b985 100644 +--- a/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt ++++ b/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_project(aws-cpp-sdk-AWSMigrationHub "C++ SDK for the AWS AWSMigrationHub service" aws-cpp-sdk-core) ++add_project(aws-cpp-sdk-awsmigrationhub "C++ SDK for the AWS AWSMigrationHub service" aws-cpp-sdk-core) + + file(GLOB AWS_AWSMIGRATIONHUB_HEADERS + "include/aws/AWSMigrationHub/*.h" diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1 index f10ee40e7a2bc5..d0f9a5aba7229e 100644 --- a/ports/aws-sdk-cpp/generateFeatures.ps1 +++ b/ports/aws-sdk-cpp/generateFeatures.ps1 @@ -1,85 +1,73 @@ -[CmdletBinding()] -param( - [Parameter(Mandatory=$true)][string]$SourcesRef, - [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot, - [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg" -) - -$ErrorActionPreference = "Stop" - -$ManifestIn = "$PortDirectory/vcpkg.in.json" -$ManifestOut = "$PortDirectory/vcpkg.json" -$CMakeFragmentFile = "$PortDirectory/compute_build_only.cmake" - -$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef" -if (-not (Test-Path $ExtractedSources)) { - if (Test-Path "$ExtractedSources.tmp") { - Remove-Item -Force "$ExtractedSources.tmp" - } - git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host - git -c "$ExtractedSources.tmp" checkout $SourcesRef - Move-Item "$ExtractedSources.tmp" "$ExtractedSources" -} -Write-Host "Using sources directory: $ExtractedSources" - - -$subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name - -$manifest = Get-Content $ManifestIn | ConvertFrom-Json -$manifest | Add-Member ` - -NotePropertyName '$note' ` - -NotePropertyValue 'Automatically generated by generateFeatures.ps1' -$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{} - -$cmakefragmenttext = @("# Automatically generated by generateFeatures.ps1") - -function GetDescription($dir, $modulename) -{ - if (Test-Path "$dir\CMakeLists.txt") - { - $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"") - if ($descs.count -eq 1) { - $desc = $descs[0].Matches.Value -replace "`"","" - "$desc" - } - else { "C++ SDK for the AWS $modulename service" } - } - else { "C++ SDK for the AWS $modulename service" } -} - -$featureDependencies = @{} -Select-String -Path "$ExtractedSources\cmake\sdksCommon.cmake" -Pattern "list\(APPEND SDK_DEPENDENCY_LIST `"([\w-]+):([\w-,]+)`"\)" -AllMatches ` -| ForEach-Object { $_.Matches } ` -| ForEach-Object { $featureDependencies[$_.Groups[1].Value] = @($_.Groups[2].Value -split "," ` -| Where-Object { $_ -ne "core" }) } - -foreach ($subfolder in $subfolders) -{ - $modulename = $subfolder.name -replace "^aws-cpp-sdk-","" - if ($modulename -match "-tests`$") { continue } - if ($modulename -match "-sample`$") { continue } - if ($modulename -eq "core") { continue } - - $lowermodulename = $modulename.ToLower() - - $featureObj = @{ description = (GetDescription $subfolder $modulename) } - - if ($featureDependencies.ContainsKey($lowermodulename)) { - $featureObj.dependencies = ,@{ name = "aws-sdk-cpp"; "default-features" = $false; "features" = $featureDependencies[$lowermodulename] } - } - - $manifest.features.Add("$lowermodulename", $featureObj) - - $cmakefragmenttext += @( - "if(`"$lowermodulename`" IN_LIST FEATURES)", - " list(APPEND BUILD_ONLY $modulename)", - "endif()" - ) -} - -[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest)) - -Write-Verbose ($cmakefragmenttext -join "`n") -[IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n") - -& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut +[CmdletBinding()] +param( + [Parameter(Mandatory=$true)][string]$SourcesRef, + [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot, + [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg" +) + +$ErrorActionPreference = "Stop" + +$ManifestIn = "$PortDirectory/vcpkg.in.json" +$ManifestOut = "$PortDirectory/vcpkg.json" + +$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef" +if (-not (Test-Path $ExtractedSources)) { + if (Test-Path "$ExtractedSources.tmp") { + Remove-Item -Force "$ExtractedSources.tmp" + } + git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host + git -c "$ExtractedSources.tmp" checkout $SourcesRef + Move-Item "$ExtractedSources.tmp" "$ExtractedSources" +} +Write-Host "Using sources directory: $ExtractedSources" + + +$subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name + +$manifest = Get-Content $ManifestIn | ConvertFrom-Json +$manifest | Add-Member ` + -NotePropertyName '$note' ` + -NotePropertyValue 'Automatically generated by generateFeatures.ps1' +$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{} + +function GetDescription($dir, $modulename) +{ + if (Test-Path "$dir\CMakeLists.txt") + { + $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"") + if ($descs.count -eq 1) { + $desc = $descs[0].Matches.Value -replace "`"","" + "$desc" + } + else { "C++ SDK for the AWS $modulename service" } + } + else { "C++ SDK for the AWS $modulename service" } +} + +$featureDependencies = @{} +Select-String -Path "$ExtractedSources\cmake\sdksCommon.cmake" -Pattern "list\(APPEND SDK_DEPENDENCY_LIST `"([\w-]+):([\w-,]+)`"\)" -AllMatches ` +| ForEach-Object { $_.Matches } ` +| ForEach-Object { $featureDependencies[$_.Groups[1].Value] = @($_.Groups[2].Value -split "," ` +| Where-Object { $_ -ne "core" }) } + +foreach ($subfolder in $subfolders) +{ + $modulename = $subfolder.name -replace "^aws-cpp-sdk-","" + if ($modulename -match "-tests`$") { continue } + if ($modulename -match "-sample`$") { continue } + if ($modulename -eq "core") { continue } + + $lowermodulename = $modulename.ToLower() + + $featureObj = @{ description = (GetDescription $subfolder $modulename) } + + if ($featureDependencies.ContainsKey($lowermodulename)) { + $featureObj.dependencies = ,@{ name = "aws-sdk-cpp"; "default-features" = $false; "features" = $featureDependencies[$lowermodulename] } + } + + $manifest.features.Add("$lowermodulename", $featureObj) +} + +[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest)) + +& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index cc455a92c9d765..e66073eb24af2d 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -1,101 +1,100 @@ -vcpkg_buildpath_length_warning(37) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO aws/aws-sdk-cpp - REF "${VERSION}" +vcpkg_buildpath_length_warning(37) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aws/aws-sdk-cpp + REF "${VERSION}" SHA512 63de900870e9bec23d42e9458e0e9b1579a9e2dc7b0f404eae1b0dd406898b6d6841c5e2f498710b3828f212705437da3a2fe94813a6c3a842945100a05ae368 - PATCHES - patch-relocatable-rpath.patch - fix-aws-root.patch - lock-curl-http-and-tls-settings.patch -) - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) - -set(EXTRA_ARGS) -if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) - set(rpath "@loader_path") -elseif (VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" - "-DGIT_EXECUTABLE=--invalid-git-executable--" - "-DGIT_FOUND=TRUE" - "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" - "-DANDROID_BUILD_ZLIB=FALSE" - "-DANDROID_BUILD_CURL=FALSE" - "-DANDROID_BUILD_OPENSSL=FALSE" - ) -else() - set(rpath "\$ORIGIN") -endif() - -set(BUILD_ONLY core) -include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE - OPTIONS - ${EXTRA_ARGS} - "-DENABLE_UNITY_BUILD=ON" - "-DENABLE_TESTING=OFF" - "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" - "-DBUILD_ONLY=${BUILD_ONLY}" - "-DBUILD_DEPS=OFF" - "-DBUILD_SHARED_LIBS=OFF" - "-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF" - "-DCMAKE_INSTALL_RPATH=${rpath}" - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files -) -vcpkg_cmake_install() - -foreach(TARGET IN LISTS BUILD_ONLY) - vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -endforeach() -vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK") - -vcpkg_copy_pdbs() - -file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake") -foreach(AWS_TARGET IN LISTS AWS_TARGETS) - file(READ ${AWS_TARGET} _contents) - string(REGEX REPLACE - "bin\\/([A-Za-z0-9_.-]+\\.lib)" - "lib/\\1" - _contents "${_contents}") - file(WRITE ${AWS_TARGET} "${_contents}") -endforeach() - -file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake") -list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$") -foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) - file(READ "${AWS_CONFIG}" _contents) - file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}") -endforeach() - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/nuget" - "${CURRENT_PACKAGES_DIR}/debug/nuget" -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) - if(LIB_FILES) - file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(REMOVE ${LIB_FILES}) - endif() - file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) - if(DEBUG_LIB_FILES) - file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(REMOVE ${DEBUG_LIB_FILES}) - endif() - - file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") -endif() - -configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + PATCHES + patch-relocatable-rpath.patch + fix-aws-root.patch + lock-curl-http-and-tls-settings.patch + fix-awsmigrationhub-build.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) + +set(EXTRA_ARGS) +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +elseif (VCPKG_TARGET_IS_ANDROID) + set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" + "-DGIT_EXECUTABLE=--invalid-git-executable--" + "-DGIT_FOUND=TRUE" + "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" + "-DANDROID_BUILD_ZLIB=FALSE" + "-DANDROID_BUILD_CURL=FALSE" + "-DANDROID_BUILD_OPENSSL=FALSE" + ) +else() + set(rpath "\$ORIGIN") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${EXTRA_ARGS} + "-DENABLE_UNITY_BUILD=ON" + "-DENABLE_TESTING=OFF" + "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" + "-DBUILD_ONLY=${FEATURES}" + "-DBUILD_DEPS=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF" + "-DCMAKE_INSTALL_RPATH=${rpath}" + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) +vcpkg_cmake_install() + +foreach(TARGET IN LISTS FEATURES) + vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() +vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK") + +vcpkg_copy_pdbs() + +file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake") +foreach(AWS_TARGET IN LISTS AWS_TARGETS) + file(READ ${AWS_TARGET} _contents) + string(REGEX REPLACE + "bin\\/([A-Za-z0-9_.-]+\\.lib)" + "lib/\\1" + _contents "${_contents}") + file(WRITE ${AWS_TARGET} "${_contents}") +endforeach() + +file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake") +list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$") +foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) + file(READ "${AWS_CONFIG}" _contents) + file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}") +endforeach() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/nuget" + "${CURRENT_PACKAGES_DIR}/debug/nuget" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) + if(LIB_FILES) + file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(REMOVE ${LIB_FILES}) + endif() + file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) + if(DEBUG_LIB_FILES) + file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(REMOVE ${DEBUG_LIB_FILES}) + endif() + + file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") +endif() + +configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage index c526d2c456125d..37e1f617b2cb38 100644 --- a/ports/aws-sdk-cpp/usage +++ b/ports/aws-sdk-cpp/usage @@ -1,12 +1,12 @@ -The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: - - When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user. - find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) - target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) - - OR - - find_package(aws-cpp-sdk-core REQUIRED) - target_include_directories(main PRIVATE aws-cpp-sdk-core) - target_link_libraries(main PRIVATE aws-cpp-sdk-core) +The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: + + When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user. + find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) + target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) + + OR + + find_package(aws-cpp-sdk-core REQUIRED) + target_include_directories(main PRIVATE aws-cpp-sdk-core) + target_link_libraries(main PRIVATE aws-cpp-sdk-core) diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json index a16daf2387efc0..a618a77d864b7f 100644 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ b/ports/aws-sdk-cpp/vcpkg.in.json @@ -1,37 +1,38 @@ -{ - "name": "aws-sdk-cpp", - "version": "1.11.160", - "description": "AWS SDK for C++", - "homepage": "https://github.com/aws/aws-sdk-cpp", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-crt-cpp", - { - "name": "curl", - "default-features": false, - "features": [ - "ssl" - ], - "platform": "!uwp & !windows" - }, - { - "name": "openssl", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ], - "default-features": [ - "dynamodb", - "kinesis", - "s3" - ] -} \ No newline at end of file +{ + "name": "aws-sdk-cpp", + "version": "1.11.160", + "port-version": 1, + "description": "AWS SDK for C++", + "homepage": "https://github.com/aws/aws-sdk-cpp", + "license": "Apache-2.0", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-crt-cpp", + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ], + "platform": "!uwp & !windows" + }, + { + "name": "openssl", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "dynamodb", + "kinesis", + "s3" + ] +} diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 1a3e214bc10300..138894a9eec944 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.11.169", + "port-version": 2, "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 76e2e05910924e..da4284a422fcc7 100644 --- a/ports/azure-core-amqp-cpp/portfile.cmake +++ b/ports/azure-core-amqp-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core-amqp_1.0.0-beta.3 - SHA512 93af776c164942584025fdca8493a9ac6145bba5afc061d2d9a8976c887e818baef3b8797b56fc5278c5e01875dc8813b94f3919d581a5b8e660f6ca27ecd702 + REF azure-core-amqp_1.0.0-beta.4 + SHA512 c8bc1e73e8f2a31ace636a5193e4909d1f673efb5f62c5cb27dbbe379ad77387bfecd862efb635c335044a6e7e1726a0ba39fba8713d97b0e80e239f9d92e3a7 ) if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp") diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json index 03df1ddc8b09a6..b9a6f43b391d02 100644 --- a/ports/azure-core-amqp-cpp/vcpkg.json +++ b/ports/azure-core-amqp-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-core-amqp-cpp", - "version-semver": "1.0.0-beta.3", - "port-version": 1, + "version-semver": "1.0.0-beta.4", "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 9478984a157c6f..09167adbce06b4 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.10.2 - SHA512 ab942af0764eb1352fe65582bcf3e06a7f75853796e47ed32f5ae485e1042e55ace7fc1dc1daf80c0a53813f6daa2377b03ed09527808d52d486c5bbd71b3fa3 + REF azure-core_1.10.3 + SHA512 b3705cf757a14693f65a5ea4a43cc3c5f8377b3156ef24869bd664e9e8b25797fd21107ad543db476335bbb2389687cc1ed8fb8fe1010bb9b5a0eb406f3c0d59 ) vcpkg_check_features( @@ -28,6 +28,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF + -DNO_AUTOMATIC_TRANSPORT_BUILD=ON ) vcpkg_cmake_install() diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index fe7e5385313180..3433f153303027 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-core-cpp", - "version-semver": "1.10.2", - "port-version": 5, + "version-semver": "1.10.3", + "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++." @@ -20,10 +20,6 @@ { "name": "vcpkg-cmake-config", "host": true - }, - { - "name": "wil", - "platform": "windows" } ], "default-features": [ @@ -69,7 +65,14 @@ }, "winhttp": { "description": "WinHTTP HTTP transport implementation", - "supports": "windows" + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false + }, + "wil" + ] } } } diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake new file mode 100644 index 00000000000000..0cb708f1afb333 --- /dev/null +++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-messaging-eventhubs-checkpointstore-blob_1.0.0-beta.1 + SHA512 7c55eda0c04bbc57729a7b479d8d5874b0e06927aff1916833520a3a944e63b6fceabd3565fd91549ec00157f2c4af5a87a6a2db55a5c24df611cd96572f9a08 +) + +if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob" "${SOURCE_PATH}/sdk/eventhubs/_") + file(RENAME "${SOURCE_PATH}/sdk/eventhubs" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/_/_/_" + OPTIONS + -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json new file mode 100644 index 00000000000000..77fe967455bfc6 --- /dev/null +++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "azure-messaging-eventhubs-checkpointstore-blob-cpp", + "version-semver": "1.0.0-beta.1", + "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." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-amqp-cpp", + "default-features": false, + "version>=": "1.0.0-beta.2" + }, + { + "name": "azure-messaging-eventhubs-cpp", + "default-features": false, + "version>=": "1.0.0-beta.2" + }, + { + "name": "azure-storage-blobs-cpp", + "default-features": false, + "version>=": "12.8.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake index 2eac053723aa4d..1e2f17d19e857e 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-messaging-eventhubs_1.0.0-beta.2 - SHA512 3677edf50218c39e378a968661c0ec0600b8760d3af33f204f3267e104449c0aef42b9520cb63b5e5810b89bf91f06979d009ffdd6d6d04d2c14e1a21f0e111f + REF azure-messaging-eventhubs_1.0.0-beta.3 + SHA512 0ad0e02755eba07408c6a837a742c0e58890a4b5f281709e1d84ea59a378c0a013068428d99e81d4972172760a3fb55a6026d34d8a558a5747c48a6b3f85e664 ) if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs") diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json index 4270cac3735138..521ce83e32249d 100644 --- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-messaging-eventhubs-cpp", - "version-semver": "1.0.0-beta.2", - "port-version": 1, + "version-semver": "1.0.0-beta.3", "description": [ "Microsoft Azure Messaging Event Hubs SDK for C++", "This library provides Azure Messaging Event Hubs SDK." @@ -14,11 +13,6 @@ "default-features": false, "version>=": "1.0.0-beta.2" }, - { - "name": "azure-storage-blobs-cpp", - "default-features": false, - "version>=": "12.8.0" - }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/baresip-libre/wip.patch b/ports/baresip-libre/fix-static-library-build.patch similarity index 79% rename from ports/baresip-libre/wip.patch rename to ports/baresip-libre/fix-static-library-build.patch index 260a640cf9f479..9a5ec2088491df 100644 --- a/ports/baresip-libre/wip.patch +++ b/ports/baresip-libre/fix-static-library-build.patch @@ -1,6 +1,6 @@ -diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt ---- re-3.3.0-orig/CMakeLists.txt 2023-07-05 08:55:20.000000000 +0200 -+++ re-3.3.0/CMakeLists.txt 2023-10-02 13:08:47.000000000 +0200 +diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.txt +--- re-3.4.0-orig/CMakeLists.txt 2023-08-09 09:53:10.000000000 +0200 ++++ re-3.4.0/CMakeLists.txt 2023-10-04 08:48:23.000000000 +0200 @@ -93,7 +93,7 @@ endif() @@ -9,14 +9,17 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt +include("${CMAKE_CURRENT_LIST_DIR}/cmake/re-config.cmake") list(APPEND RE_DEFINITIONS - -DVERSION="${PROJECT_VERSION_FULL}" -@@ -696,11 +696,14 @@ + -DRE_VERSION="${PROJECT_VERSION_FULL}" +@@ -694,7 +694,7 @@ if(LIBRE_BUILD_STATIC) list(APPEND RE_INSTALL_TARGETS re) add_library(re STATIC $) - target_link_libraries(re PUBLIC ${LINKLIBS}) + target_link_libraries(re PRIVATE ${LINKLIBS}) - add_library(libre::re ALIAS re) + target_include_directories(re PUBLIC + $ + ) +@@ -702,6 +702,9 @@ if(MSVC) set_target_properties(re PROPERTIES OUTPUT_NAME "re-static") @@ -26,7 +29,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt endif() endif() -@@ -713,6 +716,28 @@ +@@ -714,6 +717,28 @@ add_subdirectory(packaging) endif() @@ -55,7 +58,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt configure_file(packaging/libre.pc.in libre.pc @ONLY) -@@ -724,6 +749,9 @@ +@@ -725,6 +750,9 @@ install(TARGETS ${RE_INSTALL_TARGETS} EXPORT libre @@ -65,7 +68,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -@@ -742,7 +770,9 @@ +@@ -743,7 +771,9 @@ install(EXPORT libre DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre @@ -75,7 +78,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt ) if(LIBRE_BUILD_SHARED) -@@ -754,12 +784,8 @@ +@@ -755,12 +785,8 @@ ) endif() @@ -90,9 +93,9 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre COMPONENT Development ) -diff -Naur re-3.3.0-orig/cmake/libre-config.cmake re-3.3.0/cmake/libre-config.cmake ---- re-3.3.0-orig/cmake/libre-config.cmake 2023-07-05 08:55:20.000000000 +0200 -+++ re-3.3.0/cmake/libre-config.cmake 2023-10-02 13:08:47.000000000 +0200 +diff -Naur --exclude='*.rej' re-3.4.0-orig/cmake/libre-config.cmake re-3.4.0/cmake/libre-config.cmake +--- re-3.4.0-orig/cmake/libre-config.cmake 2023-08-09 09:53:10.000000000 +0200 ++++ re-3.4.0/cmake/libre-config.cmake 2023-10-03 10:01:11.000000000 +0200 @@ -1 +1,23 @@ -include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake") +if("@LIBRE_BUILD_STATIC@") @@ -118,9 +121,9 @@ diff -Naur re-3.3.0-orig/cmake/libre-config.cmake re-3.3.0/cmake/libre-config.cm + set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re) + endif() +endif() -diff -Naur re-3.3.0-orig/packaging/libre.pc.in re-3.3.0/packaging/libre.pc.in ---- re-3.3.0-orig/packaging/libre.pc.in 2023-07-05 08:55:20.000000000 +0200 -+++ re-3.3.0/packaging/libre.pc.in 2023-10-02 13:08:47.000000000 +0200 +diff -Naur --exclude='*.rej' re-3.4.0-orig/packaging/libre.pc.in re-3.4.0/packaging/libre.pc.in +--- re-3.4.0-orig/packaging/libre.pc.in 2023-08-09 09:53:10.000000000 +0200 ++++ re-3.4.0/packaging/libre.pc.in 2023-10-03 10:01:11.000000000 +0200 @@ -7,6 +7,7 @@ Description: @CMAKE_PROJECT_DESCRIPTION@ Version: @PROJECT_VERSION@ diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake index a3f84372067133..dd7e59ba327336 100644 --- a/ports/baresip-libre/portfile.cmake +++ b/ports/baresip-libre/portfile.cmake @@ -6,10 +6,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baresip/re REF "v${VERSION}" - SHA512 9813f66e73df80e00f1947c8c2af0f9dc6afe8d197a453b622458f80d522edd5b420bfc783161d311b36936947764a7a1733038c121210ab65f8621a3502d372 + SHA512 97ea35e4d4f36a9b3e47bb942497d495247e01106bcceef98fba4ab8e36061acaca88d12568990f9c8014b1061941ea5e2c6e8c0287e6dcd83a60a70400b083d HEAD_REF main PATCHES - wip.patch + fix-static-library-build.patch use-c11.patch ) diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index deca1cb2fd4488..2b18d71d635312 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,6 +1,6 @@ { "name": "baresip-libre", - "version": "3.3.0", + "version": "3.4.0", "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/ports/basisu/fix-add-libgen-mingw.patch b/ports/basisu/fix-add-libgen-mingw.patch deleted file mode 100644 index 5bac12ed7a8a44..00000000000000 --- a/ports/basisu/fix-add-libgen-mingw.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/encoder/basisu_enc.h b/src/encoder/basisu_enc.h -index 468f43b..02ec3c4 100644 ---- a/src/encoder/basisu_enc.h -+++ b/src/encoder/basisu_enc.h -@@ -24,7 +24,7 @@ - #include - #include - --#ifndef _WIN32 -+#if !defined(_WIN32) || defined(__MINGW32__) - #include - #endif - diff --git a/ports/basisu/fix-addostream.patch b/ports/basisu/fix-addostream.patch deleted file mode 100644 index cd9308bf59549a..00000000000000 --- a/ports/basisu/fix-addostream.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/encoder/basisu_enc.h b/src/encoder/basisu_enc.h -index 05656da..468f43b 100644 ---- a/src/encoder/basisu_enc.h -+++ b/src/encoder/basisu_enc.h -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #ifndef _WIN32 - #include diff --git a/ports/basisu/portfile.cmake b/ports/basisu/portfile.cmake index fa152cb8e5969c..b1ffe4326d7860 100644 --- a/ports/basisu/portfile.cmake +++ b/ports/basisu/portfile.cmake @@ -1,12 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO jherico/basis_universal - REF 497875f756ed0e3eb62e0ff08d55c62242f4be74 - SHA512 2293b78620a7ed510dbecf48bcae5f4b8524fe9020f864c8e79cf94ea9d95d51dddf83a5b4ea29cc95db19f87137bfef1cb68b7fbc6387e08bb42898d81c9303 + REPO BinomialLLC/basis_universal + REF "${VERSION}" + SHA512 7f7dd62741b4a3e13050233a2ed751e6108cde9eab7b05ea5882ded6ab49fe181cc30e795cf73f8fa625a71e77ae891fda5ea84e20b632b1397844d6539715b3 HEAD_REF master - PATCHES - fix-addostream.patch - fix-add-libgen-mingw.patch ) vcpkg_cmake_configure( @@ -19,9 +16,9 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tools(TOOL_NAMES "basisu_tool" AUTO_CLEAN) - +vcpkg_copy_tools(TOOL_NAMES "basisu" AUTO_CLEAN) +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Remove unnecessary files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/basisu/vcpkg.json b/ports/basisu/vcpkg.json index 6cc7efe2f302a9..59a53779de1b78 100644 --- a/ports/basisu/vcpkg.json +++ b/ports/basisu/vcpkg.json @@ -1,10 +1,10 @@ { "name": "basisu", - "version": "1.11", - "port-version": 7, + "version": "1.16.4", "description": "Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats.", "homepage": "https://github.com/BinomialLLC/basis_universal", "license": "Apache-2.0", + "supports": "!android & !arm", "dependencies": [ "lodepng", { diff --git a/ports/better-enums/portfile.cmake b/ports/better-enums/portfile.cmake new file mode 100644 index 00000000000000..8b4a534a62903f --- /dev/null +++ b/ports/better-enums/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aantron/better-enums + REF ${VERSION} + SHA512 5997c74932803fb96beabbe029d80f6fdeab7c46f781a4e11ef775242d294dfd82ca05cac99787dd68a622db62510fd5533e9c0e85a62c7792c0dbe6237af6d9 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/enum.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/better-enums") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/better-enums/vcpkg.json b/ports/better-enums/vcpkg.json new file mode 100644 index 00000000000000..062b0d58da6ff5 --- /dev/null +++ b/ports/better-enums/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "better-enums", + "version": "0.11.3", + "description": "C++ compile-time enum to string, iteration, in a single header file.", + "homepage": "http://aantron.github.io/better-enums/", + "license": "BSD-2-Clause" +} diff --git a/ports/bext-mp/fix-build-flags.patch b/ports/bext-mp/fix-build-flags.patch new file mode 100644 index 00000000000000..960dfa20967b30 --- /dev/null +++ b/ports/bext-mp/fix-build-flags.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index deaa67c..fb82294 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,10 +34,10 @@ target_sources(mp + if(PROJECT_IS_TOP_LEVEL) + if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + target_compile_options(mp INTERFACE +- $) ++ $) + target_link_options(mp INTERFACE $) + elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") +- target_compile_options(mp INTERFACE $) ++ target_compile_options(mp INTERFACE $) + endif() + endif() + diff --git a/ports/bext-mp/portfile.cmake b/ports/bext-mp/portfile.cmake new file mode 100644 index 00000000000000..0adc5fa237b6ad --- /dev/null +++ b/ports/bext-mp/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boost-ext/mp + REF d2dbdf89e543624be8351fd52308a9cf73374dbc + SHA512 15d56bf0dca2e4bfb9128b8552a6aa01ed6b1431ab9c152ed51473f6fa237c31fbf3d5baa22523e3786d14fd716acb5436ed26fe89d46812ba9375e2417bc67a + HEAD_REF main + PATCHES fix-build-flags.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME mp CONFIG_PATH "share/cmake/mp-0.0.1") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/bext-mp/usage b/ports/bext-mp/usage new file mode 100644 index 00000000000000..247e07999037b4 --- /dev/null +++ b/ports/bext-mp/usage @@ -0,0 +1,5 @@ +The package bext-mp provides CMake targets: + + find_package(mp CONFIG REQUIRED) + target_link_libraries(main PRIVATE Boost::mp) + set_property(TARGET main PROPERTY CXX_EXTENSIONS OFF) diff --git a/ports/bext-mp/vcpkg.json b/ports/bext-mp/vcpkg.json new file mode 100644 index 00000000000000..413416c11b40cf --- /dev/null +++ b/ports/bext-mp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "bext-mp", + "version-date": "2023-03-02", + "description": "C++20 ~~Template~~ Meta-Programming", + "homepage": "https://boost-ext.github.io/mp/", + "license": "BSL-1.0", + "supports": "!windows | mingw", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/bext-wintls/portfile.cmake b/ports/bext-wintls/portfile.cmake index 14ac5c893e4698..81b1aebb0cf9c6 100644 --- a/ports/bext-wintls/portfile.cmake +++ b/ports/bext-wintls/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO laudrup/boost-wintls - REF v0.9.5 - SHA512 5b6a88d64225c0f065d18f65319d44b90eb594431c53d9fbff72edfe2fc909613a966062b5636db7a3d0e36a389a0948dada0fbfa61b21b7b52b1af952d93071 + REF "v${VERSION}" + SHA512 b2973148f53f036108783ea6c30fca5f5055efc3676a9df2d1bf527399f757ac2f319f8637646904820e5280a8be48cf8369a3d2b6a3879afc0aa4463c77ea06 HEAD_REF master ) file(COPY "${SOURCE_PATH}/include/boost/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost/") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/bext-wintls/vcpkg.json b/ports/bext-wintls/vcpkg.json index cb39e3137c97f7..80327ea1ab7200 100644 --- a/ports/bext-wintls/vcpkg.json +++ b/ports/bext-wintls/vcpkg.json @@ -1,18 +1,10 @@ { "name": "bext-wintls", - "version": "0.9.5", + "version": "0.9.7", "description": "Native Windows TLS stream wrapper for use with boost::asio", "homepage": "https://github.com/laudrup/boost-wintls", - "supports": "windows", + "supports": "windows | mingw", "dependencies": [ - "boost-asio", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } + "boost-asio" ] } diff --git a/ports/bfgroup-lyra/portfile.cmake b/ports/bfgroup-lyra/portfile.cmake index 1dcab723d4a094..e25fdd975d73e0 100644 --- a/ports/bfgroup-lyra/portfile.cmake +++ b/ports/bfgroup-lyra/portfile.cmake @@ -1,21 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bfgroup/Lyra - REF 1.6 - SHA512 e357fd0e925b67a51ad7232035ac66842676837baebf7a69eb416807b11400c283d098a22bf3ae27ce904700c5b849953ede1873d6535a8b34c4704ebcb09748 - HEAD_REF master + REF "${VERSION}" + SHA512 643c25fbe996af2e888eacb99a715e3d420dbfc21d48756703cf301ab6ba0d1f8eea1cd0764bd5c173d2ddcef7c799448d8c3a77676024205163305e1363d461 + HEAD_REF release ) +set(VCPKG_BUILD_TYPE release) # header-only port + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) + vcpkg_cmake_install() vcpkg_cmake_config_fixup( PACKAGE_NAME lyra CONFIG_PATH share/lyra/cmake ) -# Library is header-only, so no debug content. -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/bfgroup-lyra/usage b/ports/bfgroup-lyra/usage new file mode 100644 index 00000000000000..92538aa1d98871 --- /dev/null +++ b/ports/bfgroup-lyra/usage @@ -0,0 +1,4 @@ +bfgroup-lyra provides CMake targets: + + find_package(lyra CONFIG REQUIRED) + target_link_libraries(main PRIVATE bfg::lyra) diff --git a/ports/bfgroup-lyra/vcpkg.json b/ports/bfgroup-lyra/vcpkg.json index c7189d7d806a2e..25a353bd9e7632 100644 --- a/ports/bfgroup-lyra/vcpkg.json +++ b/ports/bfgroup-lyra/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bfgroup-lyra", - "version": "1.6", + "version": "1.6.1", "description": "A simple to use, composable, command line parser for C++ 11 and beyond", "homepage": "https://bfgroup.github.io/Lyra/", "license": "BSL-1.0", diff --git a/ports/boost-iostreams/b2-options.cmake b/ports/boost-iostreams/b2-options.cmake index b95c08db023ba5..5b24d9d6ddb2b0 100644 --- a/ports/boost-iostreams/b2-options.cmake +++ b/ports/boost-iostreams/b2-options.cmake @@ -40,12 +40,12 @@ if("zlib" IN_LIST FEATURES) list(APPEND B2_OPTIONS -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" ) - # Overwride debug library name - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - if(WIN32) + # Overwride windows library names + if(WIN32) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") set(ZLIB_NAME zlibd) else() - set(ZLIB_NAME z) + set(ZLIB_NAME zlib) # for mingw endif() list(APPEND B2_OPTIONS -sZLIB_NAME=${ZLIB_NAME} diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 935e3e2cb008c9..98ed0e15fcf1f4 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iostreams", "version": "1.83.0", + "port-version": 1, "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", diff --git a/ports/boringssl/install-pc-files.cmake b/ports/boringssl/install-pc-files.cmake index 262a533a8ba7b8..47eab26cdc6a44 100644 --- a/ports/boringssl/install-pc-files.cmake +++ b/ports/boringssl/install-pc-files.cmake @@ -3,6 +3,8 @@ function(install_pc_file name pc_data) if (NOT VCPKG_TARGET_IS_WINDOWS) string(REPLACE "-lcrypt32" "" pc_data "${pc_data}") string(REPLACE "-lws2_32" "" pc_data "${pc_data}") + string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}") + string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}") elseif (NOT VCPKG_TARGET_IS_MINGW) string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}") string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}") @@ -11,12 +13,14 @@ function(install_pc_file name pc_data) configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}") - string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}") - else() - string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}") - string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}") + if(VCPKG_TARGET_IS_WINDOWS) + if (NOT VCPKG_TARGET_IS_MINGW) + string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}") + string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}") + else() + string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}") + string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}") + endif() endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY) endif() diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index dee6ccd95e256f..6fb4c9c80a790c 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -26,11 +26,15 @@ vcpkg_from_github( 0003-fix-shared-symbol-visibility.patch ) +if(VCPKG_TARGET_IS_WINDOWS) + # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix. + set(CMAKE_CONFIGURE_OPTIONS_DEBUG "-DCMAKE_DEBUG_POSTFIX=d") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG - # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix. - -DCMAKE_DEBUG_POSTFIX=d + ${CMAKE_CONFIGURE_OPTIONS_DEBUG} ) vcpkg_cmake_install() diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json index c47b1bcc45b4c0..6dc9f6b02db09e 100644 --- a/ports/boringssl/vcpkg.json +++ b/ports/boringssl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boringssl", - "version-date": "2023-09-25", + "version-date": "2023-10-13", "description": "BoringSSL is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", diff --git a/ports/botan/arm64-windows.patch b/ports/botan/arm64-windows.patch deleted file mode 100644 index 54f98b7a9dfb8b..00000000000000 --- a/ports/botan/arm64-windows.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/lib/utils/mul128.h b/src/lib/utils/mul128.h -index 8cdaae2..54bb670 100644 ---- a/src/lib/utils/mul128.h -+++ b/src/lib/utils/mul128.h -@@ -39,10 +39,15 @@ namespace Botan { - #elif defined(BOTAN_BUILD_COMPILER_IS_MSVC) && defined(BOTAN_TARGET_CPU_HAS_NATIVE_64BIT) - - #include --#pragma intrinsic(_umul128) -- --#define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \ -+#if defined(_M_ARM64) -+ #pragma intrinsic(__umulh) -+ #define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \ -+ do { *lo = a * b; *hi = __umulh(a, b); } while(0) -+#else -+ #pragma intrinsic(_umul128) -+ #define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \ - do { *lo = _umul128(a, b, hi); } while(0) -+#endif - - #elif defined(BOTAN_USE_GCC_INLINE_ASM) - diff --git a/ports/botan/fix-generate-build-path.patch b/ports/botan/fix-generate-build-path.patch deleted file mode 100644 index 455c1f1391897c..00000000000000 --- a/ports/botan/fix-generate-build-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.py b/configure.py -index 89f87d4..ba7914f 100644 ---- a/configure.py -+++ b/configure.py -@@ -2076,7 +2076,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, - 'maintainer_mode': options.maintainer_mode, - - 'out_dir': build_dir, -- 'build_dir': build_paths.build_dir, -+ 'build_dir': os.path.abspath(build_paths.build_dir), - - 'doc_stamp_file': os.path.join(build_paths.build_dir, 'doc.stamp'), - 'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'), diff --git a/ports/botan/fix-objectfile-list.patch b/ports/botan/fix-objectfile-list.patch deleted file mode 100644 index b76c5fd7985377..00000000000000 --- a/ports/botan/fix-objectfile-list.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/configure.py b/configure.py -index 2474860a5..7d320d470 100755 ---- a/configure.py -+++ b/configure.py -@@ -1821,13 +1821,12 @@ def yield_objectfile_list(sources, obj_dir, obj_suffix, options): - - for src in sources: - (directory, filename) = os.path.split(os.path.normpath(src)) -- parts = directory.split(os.sep) -+ parts_in_src = directory.split(os.sep + 'src' + os.sep) -+ parts = [] - -- if 'src' in parts: -- parts = parts[parts.index('src')+2:] -- elif options.amalgamation and filename.find(options.name_amalgamation) != -1: -- parts = [] -- else: -+ if len(parts_in_src) > 1: -+ parts = [ 'src' ] + parts_in_src[-1].split(os.sep) -+ elif not options.amalgamation or filename.find(options.name_amalgamation) == -1: - raise InternalError("Unexpected file '%s/%s'" % (directory, filename)) - - if parts != []: diff --git a/ports/botan/pkgconfig.patch b/ports/botan/pkgconfig.patch index 95f74c2805ae1b..1f4b921e6cccce 100644 --- a/ports/botan/pkgconfig.patch +++ b/ports/botan/pkgconfig.patch @@ -1,5 +1,5 @@ diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in -index 7139436..81214fe 100644 +index c18b522..a5722c9 100644 --- a/src/build-data/botan.pc.in +++ b/src/build-data/botan.pc.in @@ -1,7 +1,7 @@ @@ -11,4 +11,4 @@ index 7139436..81214fe 100644 +includedir=${prefix}/include Name: Botan - Description: Crypto and TLS for C++11 + Description: Crypto and TLS for Modern C++ diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index fe71f942239e34..7d265ba541360a 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -3,16 +3,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan REF "${VERSION}" - SHA512 0f99ef4026e5180dd65dc0e935ba2cabaf750862c651699294b3521053463b7e65a90847fef6f0d640eb9f9eb5efce64b13e999aa9c215310998817d13bd5332 + SHA512 fb6be83b0292bb28319061721fe10ea16776a942b381780a8d4bece9b86e3525a0f533e3572e54c6498b08c4dc421a746bff8f0302f3ea0d810e266811331a65 HEAD_REF master PATCHES - fix-generate-build-path.patch embed-debug-info.patch - arm64-windows.patch pkgconfig.patch verbose-install.patch configure-zlib.patch - fix-objectfile-list.patch # https://github.com/randombit/botan/pull/3069 ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}") @@ -147,13 +144,13 @@ else() vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN) endif() -file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-3/botan" "${CURRENT_PACKAGES_DIR}/include/botan") if(pkgconfig_requires) list(JOIN pkgconfig_requires ", " pkgconfig_requires) - file(APPEND "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc" "Requires.private: ${pkgconfig_requires}") + file(APPEND "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-3.pc" "Requires.private: ${pkgconfig_requires}") if(NOT VCPKG_BUILD_TYPE) - file(APPEND "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc" "Requires.private: ${pkgconfig_requires}") + file(APPEND "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-3.pc" "Requires.private: ${pkgconfig_requires}") endif() endif() vcpkg_fixup_pkgconfig() @@ -161,7 +158,7 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/include/botan-2" + "${CURRENT_PACKAGES_DIR}/include/botan-3" ) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "") @@ -169,4 +166,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BO vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--prefix=${CURRENT_PACKAGES_DIR}" "") -file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt") diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index d8f0e4e72536a0..067569ba68f380 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,6 @@ { "name": "botan", - "version": "2.19.3", - "port-version": 2, + "version": "3.1.1", "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", diff --git a/ports/botan/verbose-install.patch b/ports/botan/verbose-install.patch index 6b1e4672984049..4f6101e10b1217 100644 --- a/ports/botan/verbose-install.patch +++ b/ports/botan/verbose-install.patch @@ -1,13 +1,13 @@ diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in -index 4839112..5102933 100644 +index 1d50a31..64789a5 100644 --- a/src/build-data/makefile.in +++ b/src/build-data/makefile.in -@@ -58,7 +58,7 @@ distclean: +@@ -61,7 +61,7 @@ distclean: "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/cleanup.py" --build-dir="%{build_dir}" --distclean install: %{install_targets} -- "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --prefix="%{prefix}" --build-dir="%{build_dir}" --bindir="%{bindir}" --libdir="%{libdir}" --docdir="%{docdir}" --includedir="%{includedir}" -+ "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --prefix="%{prefix}" --build-dir="%{build_dir}" --bindir="%{bindir}" --libdir="%{libdir}" --docdir="%{docdir}" --includedir="%{includedir}" --verbose +- "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --build-dir="%{build_dir}" ++ "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --build-dir="%{build_dir}" --verbose check: tests "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/check.py" --build-dir="%{build_dir}" diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json index 5dd65371d87714..28c75a24edc83f 100644 --- a/ports/breakpad/vcpkg.json +++ b/ports/breakpad/vcpkg.json @@ -1,14 +1,14 @@ { "name": "breakpad", "version-date": "2022-07-12", - "port-version": 5, + "port-version": 6, "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", "license": "BSD-3-Clause", "supports": "!uwp & (!windows | !arm) & (!windows | !arm64)", "dependencies": [ { - "name": "atlmfc", + "name": "atl", "platform": "windows" }, "libdisasm", diff --git a/ports/brotli/emscripten.patch b/ports/brotli/emscripten.patch new file mode 100644 index 00000000000000..24696d73eb864d --- /dev/null +++ b/ports/brotli/emscripten.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0589fc1..9b32b60 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -153,10 +153,8 @@ foreach(lib ${BROTLI_LIBRARIES_CORE}) + set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$" $) + endforeach() + +-if(NOT BROTLI_EMSCRIPTEN) + target_link_libraries(brotlidec brotlicommon) + target_link_libraries(brotlienc brotlicommon) +-endif() + + # For projects stuck on older versions of CMake, this will set the + # BROTLI_INCLUDE_DIRS and BROTLI_LIBRARIES variables so they still diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake index 5b42104792ba46..461b4f60bd333c 100644 --- a/ports/brotli/portfile.cmake +++ b/ports/brotli/portfile.cmake @@ -8,14 +8,13 @@ vcpkg_from_github( install.patch fix-arm-uwp.patch pkgconfig.patch + emscripten.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBROTLI_DISABLE_TESTS=ON - # Required for wasm32-emscripten triplet to avoid "install" being turned off - -DBROTLI_EMSCRIPTEN=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -23,7 +22,14 @@ vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -vcpkg_copy_tools(TOOL_NAMES "brotli" SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/brotli") + +# Under emscripten the brotli executable tool is produced with .js extension but vcpkg_copy_tools +# has no special behaviour in this case and searches for the tool name with no extension +if(VCPKG_TARGET_IS_EMSCRIPTEN) + set(TOOL_SUFFIX ".js" ) +endif() + +vcpkg_copy_tools(TOOL_NAMES "brotli${TOOL_SUFFIX}" SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/brotli") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/brotli/vcpkg.json b/ports/brotli/vcpkg.json index 40e5196f861074..1be0e557464f9a 100644 --- a/ports/brotli/vcpkg.json +++ b/ports/brotli/vcpkg.json @@ -1,6 +1,7 @@ { "name": "brotli", "version": "1.1.0", + "port-version": 1, "description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.", "homepage": "https://github.com/google/brotli", "license": "MIT", diff --git a/ports/caf/fix_cxx17.patch b/ports/caf/fix_cxx17.patch index 18094c07ba9c11..ba7d2e3ab7b026 100644 --- a/ports/caf/fix_cxx17.patch +++ b/ports/caf/fix_cxx17.patch @@ -1,8 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed753b9..5dc80c2 100644 --- a/CMakeLists.txt -+++ a/CMakeLists.txt -@@ -115,3 +115,4 @@ -+target_compile_features(caf_internal INTERFACE cxx_std_17) - # TODO: simply set CXX_STANDARD when switching to CMake ≥ 3.9.6 --if(NOT CMAKE_CROSSCOMPILING) -+if(0) - try_compile(caf_has_cxx_17 ++++ b/CMakeLists.txt +@@ -131,7 +131,7 @@ endif() + + if(NOT DEFINED CAF_USE_STD_FORMAT) + set(CAF_USE_STD_FORMAT OFF CACHE BOOL "Enable std::format support" FORCE) +- if(NOT CMAKE_CROSSCOMPILING) ++ if(0) + set(snippet "#include + #include + int main() { std::cout << std::format(\"{}\", \"ok\"); }") +@@ -177,7 +177,6 @@ endif() + + # -- create the libcaf_test target ahead of time for caf_core ------------------ + +-add_library(libcaf_test) + + # -- add uninstall target if it does not exist yet ----------------------------- + +@@ -289,8 +288,6 @@ function(caf_add_component name) + string(REPLACE "/" "-" test_name "${test_path}/${test_name}-test") + add_executable("${test_name}" ${source_file} + $) +- target_link_libraries(${test_name} PRIVATE libcaf_test +- ${CAF_ADD_COMPONENT_DEPENDENCIES}) + target_include_directories(${test_name} PRIVATE + "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_BINARY_DIR}") +@@ -314,8 +311,6 @@ function(caf_add_component name) + add_executable(${tst_bin_target} + ${CAF_ADD_COMPONENT_LEGACY_TEST_SOURCES} + $) +- target_link_libraries(${tst_bin_target} PRIVATE libcaf_test +- ${CAF_ADD_COMPONENT_DEPENDENCIES}) + target_include_directories(${tst_bin_target} PRIVATE + "${CMAKE_CURRENT_SOURCE_DIR}/tests/legacy") + if(CAF_ADD_COMPONENT_LEGACY_TEST_SUITES) +@@ -373,7 +368,6 @@ endfunction() + + add_subdirectory(libcaf_core) + +-add_subdirectory(libcaf_test) + + if(CAF_ENABLE_NET_MODULE) + add_subdirectory(libcaf_net) diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake index 245e17fee2bd79..4732ed6680e232 100644 --- a/ports/caf/portfile.cmake +++ b/ports/caf/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO actor-framework/actor-framework - REF bac5b8b24a62ff2a818de1b08f6f31f897e42222 # 0.19.1 - SHA512 c61f3cce4d4707f19db8c1b1a8b2c4655335a7a29c77a0c9692775c9fcdc90d6dce75d3122804c31cf66c47f37d3a3674ad18df67d1204c7f52eb4740ff766af + REF "${VERSION}" + SHA512 97766b5b0a4db96b03be77c1ffd2198cc5536c09e2a06bb6fcff023ee78692f2c23ad213dc9698d6abfe950c61c4a2565bbfdfe871652cef816829e83d16ceab HEAD_REF master PATCHES fix_dependency.patch diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json index f0f6c8088189f1..ee9c04d1e9ddab 100644 --- a/ports/caf/vcpkg.json +++ b/ports/caf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "caf", - "version": "0.19.1", + "version": "0.19.3", "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.", "homepage": "https://github.com/actor-framework/actor-framework", "license": "BSD-3-Clause", diff --git a/ports/canvas-ity/portfile.cmake b/ports/canvas-ity/portfile.cmake new file mode 100644 index 00000000000000..a76c0df3ccc4c4 --- /dev/null +++ b/ports/canvas-ity/portfile.cmake @@ -0,0 +1,13 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO a-e-k/canvas_ity + REF fc5c115d8ca8be0cf81c2247270cc955f78b6138 + SHA512 19560fa09e8a8eeb09c05b26cf562dc506e6c88e1e66767a2214d2310188cb52ffe03294bd6448531703bd972e2a1995446a3cc20684c9d617ebe65ac93dd37a + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/src/canvas_ity.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/canvas-ity/vcpkg.json b/ports/canvas-ity/vcpkg.json new file mode 100644 index 00000000000000..75afea2efad6d0 --- /dev/null +++ b/ports/canvas-ity/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "canvas-ity", + "version": "1.0", + "description": "A tiny, single-header -like 2D rasterizer for C++", + "homepage": "https://github.com/a-e-k/canvas_ity", + "license": "ISC" +} diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 7d796d09e62399..78a5f9aafe1684 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -15,7 +15,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(additional_options NO_TOOLCHAIN_PROPS) # don't know how to fix the linker error about __guard_check_icall_thunk endif() - set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(PLATFORM_ARG PLATFORM x86) # it's x86, not Win32 in sln file endif() @@ -25,7 +24,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) PROJECT_SUBPATH Build/Chakra.Core.sln OPTIONS "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" - "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" ${PLATFORM_ARG} ${additional_options} ) diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index e6fffb3c709c94..a296ca9ff4945e 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,11 +1,11 @@ { "name": "chakracore", "version-date": "2022-11-09", - "port-version": 4, + "port-version": 5, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", "license": "MIT", - "supports": "!osx & !uwp & (linux | (!static & !staticcrt))", + "supports": "!osx & !uwp & (linux | !static)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/check/linkage.patch b/ports/check/linkage.patch new file mode 100644 index 00000000000000..3c18c522f3c03c --- /dev/null +++ b/ports/check/linkage.patch @@ -0,0 +1,20 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4a02dbe..3e147e4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -188,7 +188,14 @@ target_include_directories(checkShared + ) + + if(NOT THIS_IS_SUBPROJECT) +- install(TARGETS check checkShared ++ if(BUILD_SHARED_LIBS) ++ set(lib checkShared) ++ set_target_properties(check PROPERTIES EXCLUDE_FROM_ALL 1) ++ else() ++ set(lib check) ++ set_target_properties(checkShared PROPERTIES EXCLUDE_FROM_ALL 1) ++ endif() ++ install(TARGETS ${lib} + EXPORT check-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link diff --git a/ports/check/portfile.cmake b/ports/check/portfile.cmake index 1d0920ddb07f37..3033360ad95ea7 100644 --- a/ports/check/portfile.cmake +++ b/ports/check/portfile.cmake @@ -4,33 +4,33 @@ vcpkg_from_github( REF 11970a7e112dfe243a2e68773f014687df2900e8 # 0.15.2 SHA512 210c9617fa1c1ce16bef983b0e6cb587b1774c3f7ce27a53ca7799642dc7a14be8de567d69dc0e57845684c6f7991d772c73654f63c8755afda3b37a35c7156e HEAD_REF master - PATCHES fix-lib-path.patch + PATCHES + fix-lib-path.patch + linkage.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCHECK_ENABLE_TESTS=OFF -DBUILD_TESTING=OFF -DCHECK_ENABLE_GCOV=OFF - -DENABLE_MEMORY_LEAKING_TESTS=OFF + -DCHECK_ENABLE_TESTS=OFF -DCHECK_ENABLE_TIMEOUT_TESTS=OFF + -DENABLE_MEMORY_LEAKING_TESTS=OFF + -DINSTALL_CHECKMK=OFF ) vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/check) - vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/check) +vcpkg_fixup_pkgconfig() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/check.h" "#define CK_DLL_EXP" "#define CK_DLL_EXP __declspec(dllimport)") endif() -# cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -vcpkg_fixup_pkgconfig() - -file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LESSER") diff --git a/ports/check/usage b/ports/check/usage new file mode 100644 index 00000000000000..a511e134c93d19 --- /dev/null +++ b/ports/check/usage @@ -0,0 +1,4 @@ +check provides CMake targets: + + find_package(check CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,Check::check,Check::checkShared>) diff --git a/ports/check/vcpkg.json b/ports/check/vcpkg.json index 94886bedac951d..dbc06c330762c6 100644 --- a/ports/check/vcpkg.json +++ b/ports/check/vcpkg.json @@ -1,7 +1,7 @@ { "name": "check", "version": "0.15.2", - "port-version": 4, + "port-version": 5, "description": "A unit testing framework for C", "homepage": "https://github.com/libcheck/check", "license": "LGPL-2.1-only", diff --git a/ports/civetweb/pkgconfig.patch b/ports/civetweb/pkgconfig.patch new file mode 100644 index 00000000000000..4c23cbff5ed92f --- /dev/null +++ b/ports/civetweb/pkgconfig.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5368c0..c297861 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -614,6 +614,10 @@ configure_package_config_file( + PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CIVETWEB_ENABLE_CXX + ) + ++set(PROJECT_VERSION "${VERSION}") ++if(CIVETWEB_ENABLE_SSL) ++ set(REQUIRES_OPENSSL openssl) ++endif() + configure_file( + cmake/${PROJECT_NAME}.pc.in + ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc +@@ -629,13 +633,13 @@ configure_file( + install( + FILES + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + ) + + install( + FILES + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-cpp.pc" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + ) + + write_basic_package_version_file(${PROJECT_NAME}-config-version.cmake +diff --git a/cmake/civetweb-cpp.pc.in b/cmake/civetweb-cpp.pc.in +index ca1232c..495da46 100644 +--- a/cmake/civetweb-cpp.pc.in ++++ b/cmake/civetweb-cpp.pc.in +@@ -10,3 +10,4 @@ Requires: + Libs: -L${libdir} -l@PROJECT_NAME@-cpp + Cflags: -I${includedir} + ++Requires.private: civetweb +diff --git a/cmake/civetweb.pc.in b/cmake/civetweb.pc.in +index 27cea8f..0826f61 100644 +--- a/cmake/civetweb.pc.in ++++ b/cmake/civetweb.pc.in +@@ -11,3 +11,4 @@ Libs: -L${libdir} -l@PROJECT_NAME@ + Cflags: -I${includedir} + + ++Requires.private: @REQUIRES_OPENSSL@ diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index 8387cac907ec16..35cc9d163592b4 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO civetweb/civetweb @@ -9,7 +7,9 @@ vcpkg_from_github( PATCHES disable_warnings.patch # cl will simply ignore the other invalid options. fix-fseeko.patch + pkgconfig.patch ) +file(REMOVE_RECURSE "${SOURCE_PATH}/src/third_party") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -31,22 +31,23 @@ vcpkg_cmake_configure( -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF -DCIVETWEB_ENABLE_WEBSOCKETS=ON -DCIVETWEB_ALLOW_WARNINGS=ON + "-DVERSION=${VERSION}" ${FEATURE_OPTIONS} ) vcpkg_cmake_install() - +vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/civetweb) +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/civetweb.h" "defined(CIVETWEB_DLL_IMPORTS)" 1) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/CivetServer.h" "defined(CIVETWEB_CXX_DLL_IMPORTS)" 1) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/civetweb.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/civetweb.pc") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/civetweb-cpp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/civetweb-cpp.pc") -vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/civetweb/usage b/ports/civetweb/usage new file mode 100644 index 00000000000000..287a2ff668b201 --- /dev/null +++ b/ports/civetweb/usage @@ -0,0 +1,4 @@ +civetweb provides CMake targets: + + find_package(civetweb CONFIG REQUIRED) + target_link_libraries(main PRIVATE civetweb::civetweb) diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json index ab5c083e912a1e..9c097815586cf3 100644 --- a/ports/civetweb/vcpkg.json +++ b/ports/civetweb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "civetweb", "version": "1.16", + "port-version": 1, "description": "Easy to use, powerful, C/C++ embeddable web server.", "homepage": "https://github.com/civetweb/civetweb", "supports": "!uwp", diff --git a/ports/clickhouse-cpp/fix-deps-and-build-type.patch b/ports/clickhouse-cpp/fix-deps-and-build-type.patch index 25717855aa05d9..06d29de1b90118 100644 --- a/ports/clickhouse-cpp/fix-deps-and-build-type.patch +++ b/ports/clickhouse-cpp/fix-deps-and-build-type.patch @@ -1,88 +1,42 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31cd8a5..d8ee404 100644 +index aed0d85..b5f36e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -29,11 +29,12 @@ PROJECT (CLICKHOUSE-CLIENT) - INCLUDE_DIRECTORIES (.) - INCLUDE_DIRECTORIES (contrib) +@@ -63,21 +63,21 @@ PROJECT (CLICKHOUSE-CLIENT) + ENDIF () + + IF (WITH_SYSTEM_ABSEIL) +- FIND_PACKAGE(absl REQUIRED) ++ FIND_PACKAGE(absl CONFIG REQUIRED) + ELSE () + INCLUDE_DIRECTORIES (contrib/absl) + SUBDIRS (contrib/absl/absl) + ENDIF () -+ find_package(absl CONFIG REQUIRED) -+ find_package(cityhash CONFIG REQUIRED) -+ find_package(lz4 CONFIG REQUIRED) -+ - SUBDIRS ( - clickhouse -- contrib/absl -- contrib/cityhash -- contrib/lz4 - ) + IF (WITH_SYSTEM_LZ4) +- FIND_PACKAGE(lz4 REQUIRED) ++ FIND_PACKAGE(lz4 CONFIG REQUIRED) + ELSE () + INCLUDE_DIRECTORIES (contrib/lz4/lz4) + SUBDIRS (contrib/lz4/lz4) + ENDIF () - IF (BUILD_BENCHMARK) + IF (WITH_SYSTEM_CITYHASH) +- FIND_PACKAGE(cityhash REQUIRED) ++ FIND_PACKAGE(cityhash CONFIG REQUIRED) + ELSE () + INCLUDE_DIRECTORIES (contrib/cityhash/cityhash) + SUBDIRS (contrib/cityhash/cityhash) diff --git a/clickhouse/CMakeLists.txt b/clickhouse/CMakeLists.txt -index d96ff88..ad1cb0d 100644 +index 67663ec..e67ba81 100644 --- a/clickhouse/CMakeLists.txt +++ b/clickhouse/CMakeLists.txt -@@ -36,19 +36,21 @@ IF (WITH_OPENSSL) - LIST(APPEND clickhouse-cpp-lib-src base/sslsocket.cpp) - ENDIF () - --ADD_LIBRARY (clickhouse-cpp-lib SHARED ${clickhouse-cpp-lib-src}) --SET_TARGET_PROPERTIES(clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX) --TARGET_LINK_LIBRARIES (clickhouse-cpp-lib -- absl-lib -- cityhash-lib -- lz4-lib --) -- --ADD_LIBRARY (clickhouse-cpp-lib-static STATIC ${clickhouse-cpp-lib-src}) --TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static -- absl-lib -- cityhash-lib -- lz4-lib -+set(LIB_NAME "") -+ -+if(BUILD_SHARED_LIBS) -+ ADD_LIBRARY (clickhouse-cpp-lib SHARED ${clickhouse-cpp-lib-src}) -+ SET_TARGET_PROPERTIES(clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX) -+ set(LIB_NAME "clickhouse-cpp-lib") -+else() -+ ADD_LIBRARY (clickhouse-cpp-lib-static STATIC ${clickhouse-cpp-lib-src}) -+ set(LIB_NAME "clickhouse-cpp-lib-static") -+endif() -+ -+TARGET_LINK_LIBRARIES ("${LIB_NAME}" -+ absl::base absl::numeric +@@ -42,7 +42,7 @@ ADD_LIBRARY (clickhouse-cpp-lib ${clickhouse-cpp-lib-src}) + SET_TARGET_PROPERTIES (clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX) + TARGET_LINK_LIBRARIES (clickhouse-cpp-lib + absl::int128 +- cityhash::cityhash + cityhash -+ lz4::lz4 + lz4::lz4 ) - - IF (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -@@ -68,12 +70,11 @@ IF (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - # /usr/bin/ld: CMakeFiles/simple-test.dir/main.cpp.o: undefined reference to symbol '_Unwind_Resume@@GCC_3.0' - # /usr/bin/ld: /lib/x86_64-linux-gnu/libgcc_s.so.1: error adding symbols: DSO missing from command line - # FIXME: that workaround breaks clang build on mingw -- TARGET_LINK_LIBRARIES (clickhouse-cpp-lib gcc_s) -- TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static gcc_s) -+ TARGET_LINK_LIBRARIES (${LIB_NAME} gcc_s) - ENDIF () - ENDIF () - --INSTALL (TARGETS clickhouse-cpp-lib clickhouse-cpp-lib-static -+INSTALL (TARGETS ${LIB_NAME} - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - ) -@@ -123,11 +124,9 @@ INSTALL(FILES types/type_parser.h DESTINATION include/clickhouse/types/) - INSTALL(FILES types/types.h DESTINATION include/clickhouse/types/) - - IF (WITH_OPENSSL) -- TARGET_LINK_LIBRARIES (clickhouse-cpp-lib OpenSSL::SSL) -- TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static OpenSSL::SSL) -+ TARGET_LINK_LIBRARIES (${LIB_NAME} OpenSSL::SSL) - ENDIF () - - IF (WIN32 OR MINGW) -- TARGET_LINK_LIBRARIES (clickhouse-cpp-lib wsock32 ws2_32) -- TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static wsock32 ws2_32) -+ TARGET_LINK_LIBRARIES (${LIB_NAME} wsock32 ws2_32) - ENDIF () + TARGET_INCLUDE_DIRECTORIES (clickhouse-cpp-lib diff --git a/ports/clickhouse-cpp/fix-timeval.patch b/ports/clickhouse-cpp/fix-timeval.patch new file mode 100644 index 00000000000000..0e4e9a97f627d0 --- /dev/null +++ b/ports/clickhouse-cpp/fix-timeval.patch @@ -0,0 +1,17 @@ +diff --git a/clickhouse/base/socket.cpp b/clickhouse/base/socket.cpp +index 48e90c7..73503fb 100644 +--- a/clickhouse/base/socket.cpp ++++ b/clickhouse/base/socket.cpp +@@ -129,10 +129,10 @@ void SetNonBlock(SOCKET fd, bool value) { + + void SetTimeout(SOCKET fd, const SocketTimeoutParams& timeout_params) { + #if defined(_unix_) +- timeval recv_timeout{ timeout_params.recv_timeout.count() / 1000, static_cast(timeout_params.recv_timeout.count() % 1000 * 1000) }; ++ timeval recv_timeout{ static_cast(timeout_params.recv_timeout.count() / 1000), static_cast(timeout_params.recv_timeout.count() % 1000 * 1000) }; + auto recv_ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &recv_timeout, sizeof(recv_timeout)); + +- timeval send_timeout{ timeout_params.send_timeout.count() / 1000, static_cast(timeout_params.send_timeout.count() % 1000 * 1000) }; ++ timeval send_timeout{ static_cast(timeout_params.send_timeout.count() / 1000), static_cast(timeout_params.send_timeout.count() % 1000 * 1000) }; + auto send_ret = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &send_timeout, sizeof(send_timeout)); + + if (recv_ret == -1 || send_ret == -1) { diff --git a/ports/clickhouse-cpp/fix-uwp.patch b/ports/clickhouse-cpp/fix-uwp.patch deleted file mode 100644 index 9de582c50ee130..00000000000000 --- a/ports/clickhouse-cpp/fix-uwp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/clickhouse/base/socket.cpp b/clickhouse/base/socket.cpp -index c6dc920..43bbd02 100644 ---- a/clickhouse/base/socket.cpp -+++ b/clickhouse/base/socket.cpp -@@ -27,7 +27,7 @@ char const* windowsErrorCategory::name() const noexcept { - - std::string windowsErrorCategory::message(int c) const { - char error[UINT8_MAX]; -- auto len = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, static_cast(c), 0, error, sizeof(error), nullptr); -+ auto len = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, static_cast(c), 0, error, sizeof(error), nullptr); - if (len == 0) { - return "unknown"; - } diff --git a/ports/clickhouse-cpp/portfile.cmake b/ports/clickhouse-cpp/portfile.cmake index 4bee29618e63ce..f1462829fc886a 100644 --- a/ports/clickhouse-cpp/portfile.cmake +++ b/ports/clickhouse-cpp/portfile.cmake @@ -5,12 +5,12 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ClickHouse/clickhouse-cpp - REF v2.2.1 - SHA512 cf9f14e6bdbf2b739a25004c8f30ef8057cf4afa618c91fc2672059869cbbbdafb72f3027863b3f731f7f2cc239d5690e5e87301bf7930b79fe71d7a4ae3f833 + REF "v${VERSION}" + SHA512 2719c034a2dc2de7e992aa17859ea437551bfe89395e6a708a4549ed274f366aee0c0f0bcd90a690c15f5361a8f8198bb4f1d7d986da98c1d632489bcfb8bdd0 HEAD_REF master PATCHES fix-deps-and-build-type.patch - fix-uwp.patch + fix-timeval.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -20,7 +20,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DWITH_SYSTEM_ABSEIL=ON + -DWITH_SYSTEM_LZ4=ON + -DWITH_SYSTEM_CITYHASH=ON ) vcpkg_cmake_install() diff --git a/ports/clickhouse-cpp/vcpkg.json b/ports/clickhouse-cpp/vcpkg.json index 0664536ae0a10f..9d38dc50ec648e 100644 --- a/ports/clickhouse-cpp/vcpkg.json +++ b/ports/clickhouse-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "clickhouse-cpp", - "version": "2.2.1", + "version": "2.4.0", "description": "C++ client for Yandex ClickHouse", "homepage": "https://github.com/ClickHouse/clickhouse-cpp", "license": "Apache-2.0", diff --git a/ports/colmap/fix-dependencies.patch b/ports/colmap/fix-dependencies.patch deleted file mode 100644 index 5483b3087dd249..00000000000000 --- a/ports/colmap/fix-dependencies.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeLists.txt.orig 2023-03-12 19:26:41.000000000 +0100 -+++ CMakeLists.txt 2023-03-27 11:27:43.840624719 +0200 -@@ -99,14 +99,17 @@ - - find_package(Eigen3 REQUIRED) - --find_package(FreeImage REQUIRED) -+find_package(FreeImage CONFIG REQUIRED) -+set(FREEIMAGE_LIBRARIES freeimage::FreeImage) - - find_package(FLANN REQUIRED) - find_package(LZ4 REQUIRED) - --find_package(Metis REQUIRED) -+find_package(metis CONFIG REQUIRED) -+set(METIS_LIBRARIES metis) - --find_package(Glog REQUIRED) -+find_package(glog CONFIG REQUIRED) -+set(GLOG_LIBRARIES glog::glog) - - find_package(SQLite3 REQUIRED) - diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 399f54daa02dab..e54cbdafc75332 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -1,13 +1,11 @@ -set(COLMAP_REF "30da037ce19bdceb6d239c45342fadb221bdabb2") # 3.8 with bugfixes +set(COLMAP_REF "9c704e89ff0a80e797725e112011f9f69e5aa28f") # Oct 1, 2023 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO colmap/colmap REF "${COLMAP_REF}" - SHA512 2aad3c39efee025bebdbec41215f32968c3a63e160f9e7de0a6a2bf2d2c96bb1c20af0e10173d1d81ed4712e58fd97e7c8aabef8f9c47cc542d89b14c6ae420d - HEAD_REF dev - PATCHES - fix-dependencies.patch + SHA512 6ece735c403304c14887cd9b2b13a7e36bf07155fa959748c09d74854e0da6338766c11e6a371c26f983ccdb29f93b2600d685c907a5a137fe20d798b26805d8 + HEAD_REF main ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) @@ -74,7 +72,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/include/colmap/exe" - "${CURRENT_PACKAGES_DIR}/include/colmap/lib/Graclus/multilevelLib" "${CURRENT_PACKAGES_DIR}/include/colmap/tools" "${CURRENT_PACKAGES_DIR}/include/colmap/ui/media" "${CURRENT_PACKAGES_DIR}/include/colmap/ui/shaders" diff --git a/ports/colmap/usage b/ports/colmap/usage index b71316b3cf81a3..75f933163f7c14 100644 --- a/ports/colmap/usage +++ b/ports/colmap/usage @@ -7,4 +7,4 @@ For example, under Windows, execute COLMAP as: The package colmap provides CMake integration: find_package(COLMAP REQUIRED) - target_link_libraries(main ${COLMAP_LIBRARIES}) + target_link_libraries(main colmap::colmap) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index 1f54a343ed6938..8ce753f8bdd57f 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,10 +1,10 @@ { "name": "colmap", - "version-date": "2023-03-12", - "port-version": 1, + "version-date": "2023-10-01", "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", + "supports": "(linux | (windows & !static) | osx) & (x86 | x64)", "dependencies": [ "boost-filesystem", "boost-graph", @@ -18,12 +18,7 @@ "suitesparse" ] }, - { - "name": "cgal", - "features": [ - "qt" - ] - }, + "cgal", "eigen3", "flann", "freeimage", @@ -32,7 +27,6 @@ "glog", "qt5-base", "sqlite3", - "suitesparse", { "name": "vcpkg-cmake", "host": true @@ -56,7 +50,10 @@ ] }, "tests": { - "description": "Build all tests." + "description": "Build all tests.", + "dependencies": [ + "gtest" + ] } } } diff --git a/ports/corrade/clang-16.patch b/ports/corrade/clang-16.patch new file mode 100644 index 00000000000000..a6e6fe1dff3670 --- /dev/null +++ b/ports/corrade/clang-16.patch @@ -0,0 +1,32 @@ +diff --git a/src/Corrade/Utility/StlForwardArray.h b/src/Corrade/Utility/StlForwardArray.h +index 0e78d61..363fafb 100644 +--- a/src/Corrade/Utility/StlForwardArray.h ++++ b/src/Corrade/Utility/StlForwardArray.h +@@ -55,7 +55,11 @@ possible or is unknown is equivalent to @cpp #include @ce. + + #ifdef CORRADE_TARGET_LIBCXX + /* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L223 */ ++#if _LIBCPP_VERSION < 160000 + #include <__tuple> ++#else ++#include <__fwd/array.h> ++#endif + #elif defined(CORRADE_TARGET_DINKUMWARE) + /* MSVC has it defined next to std::pair */ + #include +diff --git a/src/Corrade/Utility/StlForwardTuple.h b/src/Corrade/Utility/StlForwardTuple.h +index 5701bc0..3292ec8 100644 +--- a/src/Corrade/Utility/StlForwardTuple.h ++++ b/src/Corrade/Utility/StlForwardTuple.h +@@ -55,7 +55,11 @@ is equivalent to @cpp #include @ce. + + #ifdef CORRADE_TARGET_LIBCXX + /* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L163 */ ++#if _LIBCPP_VERSION < 160000 + #include <__tuple> ++#else ++#include <__fwd/tuple.h> ++#endif + #elif defined(CORRADE_TARGET_LIBSTDCXX) + /* https://github.com/gcc-mirror/gcc/blob/c014d57d57a03e6061a57fa8534e90979567392b/libstdc%2B%2B-v3/include/std/type_traits#L2465-L2466 */ + #include diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index f50ef191f95422..964212a69e1c40 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-vs2019.patch build-corrade-rc-always.patch + clang-16.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json index e34df643ecfd23..60dd63aead3727 100644 --- a/ports/corrade/vcpkg.json +++ b/ports/corrade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 6, + "port-version": 7, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", "dependencies": [ diff --git a/ports/cpp-async/portfile.cmake b/ports/cpp-async/portfile.cmake index 0665aa2b363bee..a67b9aa14df5e3 100644 --- a/ports/cpp-async/portfile.cmake +++ b/ports/cpp-async/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cpp-async REF "v${VERSION}" - SHA512 9e28fd158e8caf0220fa28606d209ccf5e1f70dee5c2d059619e924615e379edafa9b18d642315b0fc64f41528573f3d10fb83b093ba1959466aaae43539ffe1 + SHA512 6351329db0b485ae26bda74fe78bfbd0890a46e6f89325a953b058f88da4826a139d0ae90d75411680e1ee3c13c3c02f30907653e3643bd0b9556a4be7ea6707 HEAD_REF main ) diff --git a/ports/cpp-async/vcpkg.json b/ports/cpp-async/vcpkg.json index e6f0a1fdc271cc..9c442ddd1d5beb 100644 --- a/ports/cpp-async/vcpkg.json +++ b/ports/cpp-async/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-async", - "version": "1.0.1", + "version": "1.1.0", "description": "Support types and functions for C++20 coroutines", "homepage": "https://github.com/microsoft/cpp-async", "license": "MIT" diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index 47f2671df9fd9b..07435654e3ccbe 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib REF "v${VERSION}" - SHA512 fac8fd1730e7f828053c61924d3ff9b660ad3cb385aa7a506c50c1ed1ca9820fb07691e28e03effcc60e391ecb78727108f1fdbe8b428917ab494738bed86d78 + SHA512 6e995502e0cfd9953044207fabce29a3d6de49e79464b6bf89e1a9e667dc66fe1972c38d6428ad8e8fb96236e85b2d9ac60cbb58b4de03e8f837a9122151a706 HEAD_REF master PATCHES fix-find-brotli.patch diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index 44fe9e99cb514a..ef068b6e3425b5 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.14.0", + "version": "0.14.1", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib", "license": "MIT", diff --git a/ports/cpp-sort/portfile.cmake b/ports/cpp-sort/portfile.cmake new file mode 100644 index 00000000000000..5799c213abcafd --- /dev/null +++ b/ports/cpp-sort/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Morwenn/cpp-sort + REF "${VERSION}" + SHA512 85d9f68ff64ff23769c66d28153273e2072b2c12f2f94bb058afebc1fb68d852734d3907a51704212d795bff71f327de3497232ba3619179bbaa141ab55b2452 + HEAD_REF 1.x.y-develop +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCPPSORT_BUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/cpp-sort") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/cpp-sort/vcpkg.json b/ports/cpp-sort/vcpkg.json new file mode 100644 index 00000000000000..5c119d0dd8cd0c --- /dev/null +++ b/ports/cpp-sort/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cpp-sort", + "version": "1.15.0", + "description": "Sorting algorithms & related tools for C++14", + "homepage": "https://github.com/Morwenn/cpp-sort/", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/cppdap/portfile.cmake b/ports/cppdap/portfile.cmake new file mode 100644 index 00000000000000..f4f08875570bd6 --- /dev/null +++ b/ports/cppdap/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/cppdap + REF "dap-${VERSION}" + SHA512 36f31cf7b90190820f5a5b7df679a3ca1a4f51b58a7a4c46f85c7b55b0ad9dbeba3436992b5eb8a3fd4499fc38bbf2b16f834f5f1989717f151abf13c262c747 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCPPDAP_USE_EXTERNAL_NLOHMANN_JSON_PACKAGE=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/cppdap") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/cppdap/vcpkg.json b/ports/cppdap/vcpkg.json new file mode 100644 index 00000000000000..6e9563e80a53f0 --- /dev/null +++ b/ports/cppdap/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "cppdap", + "version-semver": "1.58.0-a", + "description": "A C++11 library (\"SDK\") implementation of the Debug Adapter Protocol, providing an API for implementing a DAP client or server.", + "homepage": "https://github.com/google/cppdap", + "license": "Apache-2.0", + "dependencies": [ + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index c535bad18c88c8..ad7b3cc77aad5c 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES werror.patch fix_strnicmp.patch + remove-wx.patch ) #nowide download @@ -36,7 +37,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup() # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # CppMicroServices uses a custom resource compiler to compile resources # the zipped resources are then appended to the target which cause the linker to crash diff --git a/ports/cppmicroservices/remove-wx.patch b/ports/cppmicroservices/remove-wx.patch new file mode 100644 index 00000000000000..dadae53f59804a --- /dev/null +++ b/ports/cppmicroservices/remove-wx.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2bec34f..801d049 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -511,7 +511,7 @@ if(MSVC) + set(US_ENABLE_ASAN OFF) + endif() + +- set(US_CXX_FLAGS "/MP /WX /D${msvc_version_define} ${US_CXX_FLAGS}") ++ set(US_CXX_FLAGS "/MP /D${msvc_version_define} ${US_CXX_FLAGS}") + else() + + # If not cross-compiling, turn on Stack Smashing Protection. diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json index 54b0e6e64c42bd..4a7a4be789cdcb 100644 --- a/ports/cppmicroservices/vcpkg.json +++ b/ports/cppmicroservices/vcpkg.json @@ -1,8 +1,10 @@ { "name": "cppmicroservices", "version": "3.7.6", + "port-version": 1, "description": "An OSGi-like C++ dynamic module system and service registry", "homepage": "https://github.com/CppMicroServices/CppMicroServices", + "license": "Apache-2.0", "dependencies": [ "gtest", { diff --git a/ports/cpptoml/portfile.cmake b/ports/cpptoml/portfile.cmake index 5ec1093639f5ce..0a3472ed39aa86 100644 --- a/ports/cpptoml/portfile.cmake +++ b/ports/cpptoml/portfile.cmake @@ -1,14 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skystrife/cpptoml - REF fededad7169e538ca47e11a9ee9251bc361a9a65 - SHA512 2ec50f4585bca33bb343170470048a7d7e7902f1ffa5709cf84ddf9f53a899ff1cc9ffa49e059f6dad93d13823c4d2661bc8109e4356078cdbdfef1a2be6a622 + REF "v${VERSION}" + SHA512 14edce576514d53a7e13562d7f8d2b66ea2b95f44038396c0e26232ec81783042ebecec31ee272a99afef96d5c8582a8e81ea5167a787844b98de6ee6f545cc5 HEAD_REF master ) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS -DENABLE_LIBCXX=OFF) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${OPTIONS} -DCPPTOML_BUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) diff --git a/ports/cpptoml/vcpkg.json b/ports/cpptoml/vcpkg.json index 6a8034e969a73e..af9a005189b532 100644 --- a/ports/cpptoml/vcpkg.json +++ b/ports/cpptoml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpptoml", "version": "0.1.1", - "port-version": 3, + "port-version": 4, "description": "A header-only library for parsing TOML configuration files.", "homepage": "https://github.com/skystrife/cpptoml", "license": "MIT", diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch index 9d666553d6be4c..116321b0b2c583 100644 --- a/ports/cpr/001-cpr-config.patch +++ b/ports/cpr/001-cpr-config.patch @@ -1,15 +1,15 @@ diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index 66fc9eb..cc00c72 100644 +index 52787f5..aa3687d 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt -@@ -30,6 +30,10 @@ set_target_properties(cpr - VERSION ${${PROJECT_NAME}_VERSION} - SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) - +@@ -46,6 +46,10 @@ set_target_properties(cpr + VERSION ${${PROJECT_NAME}_VERSION} + SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) + +if (NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) +endif() + # Import GNU common install directory variables include(GNUInstallDirs) - + diff --git a/ports/cpr/disable_werror.patch b/ports/cpr/disable_werror.patch index 48803b8e34507f..1fc1be1a0e48a6 100644 --- a/ports/cpr/disable_werror.patch +++ b/ports/cpr/disable_werror.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb7c5f042..a5bc0b942 100644 +index 68b5343..fce2518 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -71,7 +71,7 @@ if(CPR_ENABLE_CPPCHECK) +@@ -103,7 +103,7 @@ if(CPR_ENABLE_CPPCHECK) include(cmake/cppcheck.cmake) endif() - + -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") +if (1) else() diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index bd106bb2bfeeb5..1ccdc3f5cd9ac9 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF 0445800cd2cace404ac37eb3e78ec5d1431a4f30 #1.10.2 - SHA512 77723343b2ce89a10b8622cf54127edd6639412e3d457caed31b4fa1d3935d79846b4be695c327001fc2228313591e320c9080dbf8c09e3b69265f81641b9973 + REF ${VERSION} + SHA512 5e2fe69d5b4dfaa67f636098c8da904b43a22b21cc78bc52446e572ea47f492ce1de0f47fdc2cf34207729ccf007449278f218d8cdeef21f0b98356bca2e5e49 HEAD_REF master PATCHES 001-cpr-config.patch @@ -18,7 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DCPR_BUILD_TESTS=OFF -DCPR_FORCE_USE_SYSTEM_CURL=ON ${FEATURE_OPTIONS} diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 2f23201989e9eb..3cdf6d02f6964d 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpr", - "version-semver": "1.10.2+3", + "version-semver": "1.10.5", + "port-version": 1, "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", "license": "MIT", diff --git a/ports/cryptopp/fix-git-branch.patch b/ports/cryptopp/fix-git-branch.patch deleted file mode 100644 index d3d03c2785b3b5..00000000000000 --- a/ports/cryptopp/fix-git-branch.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b0ee7a2..ad24d32 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -214,11 +214,8 @@ else() - endif() - endif() - --if (Git_FOUND) -- execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD -- WORKING_DIRECTORY ${cryptopp-cmake_SOURCE_DIR} -- OUTPUT_VARIABLE cryptopp_GIT_BRANCH) -- string(STRIP ${cryptopp_GIT_BRANCH} cryptopp_GIT_BRANCH) -+if(CRTPTOPP_GIT_BRANCH) -+ set(cryptopp_GIT_BRANCH ${CRTPTOPP_GIT_BRANCH}) - else() - set(cryptopp_GIT_BRANCH "master") - endif() diff --git a/ports/cryptopp/patch.patch b/ports/cryptopp/patch.patch index de8d7cd1b9ba55..5e168d2fe2efc8 100644 --- a/ports/cryptopp/patch.patch +++ b/ports/cryptopp/patch.patch @@ -1,8 +1,8 @@ diff --git a/config_cxx.h b/config_cxx.h -index 03153ba..6d9187d 100644 +index ffd57ad..353d7ce 100644 --- a/config_cxx.h +++ b/config_cxx.h -@@ -214,7 +214,7 @@ +@@ -217,7 +217,7 @@ // Also see https://github.com/weidai11/cryptopp/issues/980. I'm not sure what // to do when the compiler defines __cpp_lib_uncaught_exceptions but the platform // does not support std::uncaught_exceptions. What was Apple thinking??? @@ -12,18 +12,18 @@ index 03153ba..6d9187d 100644 # if __cpp_lib_uncaught_exceptions >= 201411L # define CRYPTOPP_CXX17_UNCAUGHT_EXCEPTIONS 1 diff --git a/config_os.h b/config_os.h -index da27de22..9703f77d 100644 +index 0994563..4546585 100644 --- a/config_os.h +++ b/config_os.h @@ -29,7 +29,7 @@ // https://www.cryptopp.com/wiki/Release_Process#Self_Tests // The problems with Clang pretending to be other compilers is // discussed at http://github.com/weidai11/cryptopp/issues/147. --#if (defined(_MSC_VER) && defined(__clang__) && \ -+#if (defined(_MSC_VER) && _MSC_VER < 1930 && defined(__clang__) && \ - !(defined( __clang_analyzer__)) && !defined(__INTEL_LLVM_COMPILER)) +-#if (defined(_MSC_VER) && defined(__clang__)) ++#if (defined(_MSC_VER) && _MSC_VER < 1930 && defined(__clang__)) # error: "Unsupported configuration" #endif + @@ -126,6 +126,7 @@ #endif diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index 175d224954425a..f68cd038d8417f 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -1,19 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +string(REPLACE "." "_" CRYPTOPP_VERSION "${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO abdes/cryptopp-cmake - REF f857b775bcb4ff24e4993d85cce811587f8b0616 #CRYPTOPP_8_8_0 - SHA512 a33ef3393d051776672ecc15987dd55d848cb501f0d8cc19b411df49b47c1762469a0cb96a26132b154fa9c6ce36126f041f940e8c2f3651884b0d041dea580e + REF "CRYPTOPP_${CRYPTOPP_VERSION}" + SHA512 3ec33b107ab627a514e1ebbc4b6522ee8552525f36730d9b5feb85e61ba7fc24fd36eb6050e328c6789ff60d47796beaa8eebf7dead787a34395294fae9bb733 HEAD_REF master - PATCHES fix-git-branch.patch ) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO weidai11/cryptopp - REF 4d0cad5401d1a2c998b314bc89288c9620d3021d #CRYPTOPP_8_8_0 - SHA512 2e7885c0ee2666113ca1129f4b420be50b5edc9de0d817da0ee959c6d7595cda6b173dbb8e830c57078f9ccb449c357a75b029645886e8e3b7bcd338ac3d8b17 + REF "CRYPTOPP_${CRYPTOPP_VERSION}" + SHA512 28a67141155c9c15e3e6a2173b3a8487cc38a2a2ade73bf4a09814ca541be6b06e9a501be26f7e2f42a2f80df21b076aa5d8ad4224dc0a1f8d7f3b24deae465e HEAD_REF master PATCHES patch.patch ) @@ -57,7 +57,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCRYPTOPP_SOURCES=${SOURCE_PATH} - -DCRTPTOPP_GIT_BRANCH=${VERSION} -DCRYPTOPP_BUILD_SHARED=OFF -DBUILD_STATIC=ON -DCRYPTOPP_BUILD_TESTING=OFF diff --git a/ports/cryptopp/vcpkg.json b/ports/cryptopp/vcpkg.json index c56814239f6599..e3706c6c2fb6bb 100644 --- a/ports/cryptopp/vcpkg.json +++ b/ports/cryptopp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cryptopp", - "version": "8.8.0", + "version": "8.9.0", "description": "Crypto++ is a free C++ class library of cryptographic schemes.", "homepage": "https://github.com/weidai11/cryptopp", "license": "BSL-1.0", diff --git a/ports/cub/fix-usage.patch b/ports/cub/fix-usage.patch index 56801fdb9ef2d3..353818cb7ff3e7 100644 --- a/ports/cub/fix-usage.patch +++ b/ports/cub/fix-usage.patch @@ -1,24 +1,12 @@ diff --git a/cub/cmake/cub-config.cmake b/cub/cmake/cub-config.cmake -index 3d7f64b..213a95e 100644 +index ebe40ef..884ce65 100644 --- a/cub/cmake/cub-config.cmake +++ b/cub/cmake/cub-config.cmake -@@ -8,6 +8,7 @@ if (TARGET CUB::CUB) - return() - endif() +@@ -11,6 +11,7 @@ endif() + # Minimum supported libcudacxx version: + set(cub_libcudacxx_version 1.8.0) +include("${CMAKE_CURRENT_LIST_DIR}/cub-header-search.cmake") function(_cub_declare_interface_alias alias_name ugly_name) # 1) Only IMPORTED and ALIAS targets can be placed in a namespace. # 2) When an IMPORTED library is linked to another target, its include -diff --git a/cub/cmake/cub-header-search.cmake.in b/cub/cmake/cub-header-search.cmake.in -index 2a46606..d2c38ef 100644 ---- a/cub/cmake/cub-header-search.cmake.in -+++ b/cub/cmake/cub-header-search.cmake.in -@@ -3,6 +3,6 @@ unset(_CUB_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search - find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh - NO_DEFAULT_PATH # Only search explicit paths below: - PATHS -- "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree -+ "${CMAKE_CURRENT_LIST_DIR}/../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree - ) - set_property(CACHE _CUB_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL) diff --git a/ports/cub/portfile.cmake b/ports/cub/portfile.cmake index 69f73ad63c896f..9049648f0d3c02 100644 --- a/ports/cub/portfile.cmake +++ b/ports/cub/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVlabs/cub - REF ed040d585c3237d706973d7ad290bfee40958270 #v1.16.0 - SHA512 81e0bacb0aa4ee7a1c86f3c12e3135a133579678d3530e0e0b8310f716d0355e5096925ac6de5865140a7aac08d974ea5169d47e34951b932a23965f74fe4ee6 + REF "${VERSION}" + SHA512 f88fdf80c81b8b5d3d09797bf5e9a9e82e1365950b358e0ffc2141b465646c2054ce7e6a30ae07735fbaa69d07c9a8e9bab57c8ddb8a0db8426b27eadd045197 HEAD_REF master PATCHES fix-usage.patch ) diff --git a/ports/cub/vcpkg.json b/ports/cub/vcpkg.json index f6988759ffe79b..2162ca5a631e5e 100644 --- a/ports/cub/vcpkg.json +++ b/ports/cub/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cub", - "version": "1.16.0", + "version": "2.1.0", "description": "CUB is a flexible library of cooperative threadblock primitives and other utilities for CUDA kernel programming", "homepage": "https://github.com/NVIDIA/cub", "license": "BSD-3-Clause", diff --git a/ports/cubeb/portfile.cmake b/ports/cubeb/portfile.cmake index f8e9b2ba4080c1..f6758162740a97 100644 --- a/ports/cubeb/portfile.cmake +++ b/ports/cubeb/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_cmake_configure( -DUSE_SANITIZERS=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF + -DDOXYGEN_EXECUTABLE= # Prevents the generation of documentation ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cubeb) diff --git a/ports/cubeb/vcpkg.json b/ports/cubeb/vcpkg.json index 252c918e5fd7f7..74a0756b215f1b 100644 --- a/ports/cubeb/vcpkg.json +++ b/ports/cubeb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cubeb", "version-date": "2023-09-26", + "port-version": 1, "description": "Cross platform audio library", "homepage": "https://github.com/mozilla/cubeb", "license": "ISC", diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index fd176d8e3d9aad..7e2cf7cd909f58 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -1,15 +1,24 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 9bb8f0b..7678f43 100644 +index 6f84919..b838245 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -216,6 +216,10 @@ if(BUILD_SHARED_LIBS) - $) - endif() - -+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ set_property(TARGET ${LIB_SELECTED} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") -+endif() -+ - add_library(${LIB_NAME} ALIAS ${LIB_SELECTED}) - add_library(${PROJECT_NAME}::${LIB_NAME} ALIAS ${LIB_SELECTED}) - +@@ -162,6 +162,9 @@ if(BUILD_STATIC_LIBS) + INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE + INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) + endif() ++ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") ++ endif() + if(CMAKEVERSION AND CMAKESONAME) + set_target_properties(${LIB_STATIC} PROPERTIES + VERSION ${CMAKEVERSION} SOVERSION ${CMAKESONAME}) +@@ -197,6 +200,9 @@ if(BUILD_SHARED_LIBS) + INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE + INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) + endif() ++ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") ++ endif() + if(CMAKEVERSION AND CMAKESONAME) + set_target_properties(${LIB_SHARED} PROPERTIES + VERSION ${CMAKEVERSION} SOVERSION ${CMAKESONAME}) diff --git a/ports/curl/0005_remove_imp_suffix.patch b/ports/curl/0005_remove_imp_suffix.patch index a5367056953852..5fe94196a5789e 100644 --- a/ports/curl/0005_remove_imp_suffix.patch +++ b/ports/curl/0005_remove_imp_suffix.patch @@ -1,8 +1,8 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 7678f43..00f61f8 100644 +index b838245..3199160 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -105,7 +105,6 @@ endif() +@@ -92,7 +92,6 @@ endif() if(WIN32 AND NOT IMPORT_LIB_SUFFIX AND CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL CMAKE_IMPORT_LIBRARY_SUFFIX) diff --git a/ports/curl/0012-fix-dependency-idn2.patch b/ports/curl/0012-fix-dependency-idn2.patch index 9db27979e1aa12..c0efbba3a208c7 100644 --- a/ports/curl/0012-fix-dependency-idn2.patch +++ b/ports/curl/0012-fix-dependency-idn2.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f6de81..6702845 100644 +index 1b19c68..bb5fba9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -632,6 +632,7 @@ endif() +@@ -839,7 +839,8 @@ endif() # Check for idn2 option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) if(USE_LIBIDN2) diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch index 21eab0933baf2d..aad6ed9c2a0492 100644 --- a/ports/curl/0020-fix-pc-file.patch +++ b/ports/curl/0020-fix-pc-file.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b2e428..ea430f4 100644 +index bb5fba9..9919fd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1505,7 +1505,9 @@ set(includedir "\${prefix}/include") +@@ -1624,7 +1624,9 @@ set(includedir "\${prefix}/include") set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") set(LIBCURL_LIBS "") set(libdir "${CMAKE_INSTALL_PREFIX}/lib") diff --git a/ports/curl/0022-deduplicate-libs.patch b/ports/curl/0022-deduplicate-libs.patch index ac447ea8152500..aa47329589d352 100644 --- a/ports/curl/0022-deduplicate-libs.patch +++ b/ports/curl/0022-deduplicate-libs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a35ee52..ee133d5 100644 +index 9919fd3..7e513f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1611,6 +1611,7 @@ if(BUILD_SHARED_LIBS) +@@ -1654,6 +1654,7 @@ if(BUILD_SHARED_LIBS) else() set(ENABLE_SHARED "no") set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}") diff --git a/ports/curl/cmake-config.patch b/ports/curl/cmake-config.patch index d80042c990c329..39b7d28316f6b0 100644 --- a/ports/curl/cmake-config.patch +++ b/ports/curl/cmake-config.patch @@ -1,8 +1,8 @@ diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in -index 056907c4f..56f7c9dd9 100644 +index c89c686..2f39949 100644 --- a/CMake/curl-config.cmake.in +++ b/CMake/curl-config.cmake.in -@@ -35,4 +35,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +@@ -45,4 +45,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") check_required_components("@PROJECT_NAME@") # Alias for either shared or static library diff --git a/ports/curl/dependencies.patch b/ports/curl/dependencies.patch index 80b5dba45a658d..affbc5ec3063f7 100644 --- a/ports/curl/dependencies.patch +++ b/ports/curl/dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in -index dbe4ed2..edf87fa 100644 +index 056907c..c89c686 100644 --- a/CMake/curl-config.cmake.in +++ b/CMake/curl-config.cmake.in -@@ -31,5 +31,15 @@ if(@USE_ZLIB@) +@@ -31,6 +31,16 @@ if(@USE_ZLIB@) find_dependency(ZLIB @ZLIB_VERSION_MAJOR@) endif() @@ -18,11 +18,12 @@ index dbe4ed2..edf87fa 100644 + include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") check_required_components("@PROJECT_NAME@") + diff --git a/CMakeLists.txt b/CMakeLists.txt -index ad3a63d..917cdbf 100644 +index 049ac34..cc0fe19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -151,7 +151,8 @@ set(CURL_LIBS "") +@@ -178,7 +178,8 @@ set(CURL_LIBS "") if(ENABLE_ARES) set(USE_ARES 1) @@ -32,7 +33,7 @@ index ad3a63d..917cdbf 100644 list(APPEND CURL_LIBS ${CARES_LIBRARY}) endif() -@@ -524,7 +525,9 @@ endif() +@@ -590,7 +591,9 @@ endif() option(CURL_BROTLI "Set to ON to enable building curl with brotli support." OFF) set(HAVE_BROTLI OFF) if(CURL_BROTLI) @@ -43,7 +44,7 @@ index ad3a63d..917cdbf 100644 if(BROTLI_FOUND) set(HAVE_BROTLI ON) set(CURL_LIBS "${BROTLI_LIBRARIES};${CURL_LIBS}") # For 'ld' linker. Emulate `list(PREPEND ...)` to stay compatible with ++ COMMAND $,${DROGON_CTL_TOOL},$> + ARGS + create + view diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 3aa87b8cf7373c..54d7508872743f 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -9,8 +9,14 @@ vcpkg_from_github( 0002-drogon-config.patch 0003-deps-redis.patch 0004-drogon-ctl.patch + 0005-drogon-cross-compile.patch ) +set(DROGON_CTL_TOOL "") +if(VCPKG_CROSSCOMPILING) + set(DROGON_CTL_TOOL "${CURRENT_HOST_INSTALLED_DIR}/tools/drogon/drogon_ctl${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -33,7 +39,8 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON -DUSE_SUBMODULE=OFF - ${FEATURE_OPTIONS} + "-DDROGON_CTL_TOOL=${DROGON_CTL_TOOL}" + ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_Boost ) diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index f6ef00d672315a..a23057c4dc9508 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,6 +1,7 @@ { "name": "drogon", "version": "1.8.7", + "port-version": 1, "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", "homepage": "https://github.com/an-tao/drogon", "documentation": "https://drogon.docsforge.com/master/overview/", @@ -26,7 +27,17 @@ ], "features": { "ctl": { - "description": "Build drogon_ctl tool." + "description": "Build drogon_ctl tool.", + "dependencies": [ + { + "name": "drogon", + "host": true, + "default-features": false, + "features": [ + "ctl" + ] + } + ] }, "mysql": { "description": "Support reading and writing from/to MySQL databases.", diff --git a/ports/enkits/portfile.cmake b/ports/enkits/portfile.cmake new file mode 100644 index 00000000000000..c55f6279885fb2 --- /dev/null +++ b/ports/enkits/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dougbinks/enkiTS + REF "v${VERSION}" + SHA512 72a05058caef8d6a33cd70500aeaf05cc61521721697969d4845279b5a79b63e7a6a3f3971c5eff2776e5575720b58252e9d251ef565c2123275a3e8540948db + HEAD_REF master + PATCHES + update_install.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENKITS_BUILD_C_INTERFACE=ON + -DENKITS_BUILD_EXAMPLES=OFF + -DENKITS_BUILD_SHARED=${BUILD_SHARED} + -DENKITS_INSTALL=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +# Must specify args due to case sensitivity on some filesystems +vcpkg_cmake_config_fixup(PACKAGE_NAME enkiTS CONFIG_PATH share/enkiTS) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/enkits/update_install.patch b/ports/enkits/update_install.patch new file mode 100644 index 00000000000000..3596a0b2f30eee --- /dev/null +++ b/ports/enkits/update_install.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f8572e..f42ec18 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0) + + project( enkiTS ) + ++include(GNUInstallDirs) ++ + option( ENKITS_BUILD_C_INTERFACE "Build C interface" ON ) + option( ENKITS_BUILD_EXAMPLES "Build example applications" ON ) + option( ENKITS_BUILD_SHARED "Build shared library" OFF ) +@@ -59,9 +61,17 @@ if( UNIX ) + target_link_libraries( enkiTS ${CMAKE_THREAD_LIBS_INIT} ) + endif() + ++target_include_directories(enkiTS PUBLIC "$") + if( ENKITS_INSTALL ) +- install(TARGETS enkiTS DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/enkiTS") +- install(FILES ${ENKITS_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/enkiTS") ++ install( ++ TARGETS enkiTS ++ EXPORT enkiTS-config ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(FILES ${ENKITS_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ install( ++ EXPORT enkiTS-config ++ NAMESPACE enkiTS:: ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/enkiTS) + endif() + + if( UNIX ) diff --git a/ports/enkits/usage b/ports/enkits/usage new file mode 100644 index 00000000000000..ffb68ab7f4b180 --- /dev/null +++ b/ports/enkits/usage @@ -0,0 +1,4 @@ + enkits provides CMake targets: + + find_package(enkiTS CONFIG REQUIRED) + target_link_libraries(main PRIVATE enkiTS::enkiTS) diff --git a/ports/enkits/vcpkg.json b/ports/enkits/vcpkg.json new file mode 100644 index 00000000000000..139253fec4b6a0 --- /dev/null +++ b/ports/enkits/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "enkits", + "version": "1.11", + "description": "A permissively licensed C and C++ Task Scheduler for creating parallel programs.", + "homepage": "https://github.com/dougbinks/enkiTS", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ezc3d/portfile.cmake b/ports/ezc3d/portfile.cmake index 8a334db2a861a3..66e55e1204d9f8 100644 --- a/ports/ezc3d/portfile.cmake +++ b/ports/ezc3d/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pyomeca/ezc3d - REF Release_1.4.7 - SHA512 ba234be76b5d95b9527952c7e1bf67d9725fc280bf991f45e7cbd68f1aeeab7e963c8c4d928e720d02ebc02ec2b0e41f1c28036cd728ccb4c5a77c6fa81a74ad + REF "Release_${VERSION}" + SHA512 19f2602be04ea4b0d65d7c26cc6b5c687f65ef5bceae104d7bcddec1e8db05cc65db2cb37ac8133b7bbda99cd097ead08fd7dcdaf470f710f5cc68cd73edb150 HEAD_REF dev ) @@ -16,11 +16,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_config_fixup(CONFIG_PATH "CMake") -else() - vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ezc3d") -endif() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ezc3d") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/ezc3d/vcpkg.json b/ports/ezc3d/vcpkg.json index aa503641fcd709..2fe5ec54ca360d 100644 --- a/ports/ezc3d/vcpkg.json +++ b/ports/ezc3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ezc3d", - "version": "1.4.7", + "version": "1.5.0", "description": "C3D reader/writer", "homepage": "https://github.com/pyomeca/ezc3d", "license": "MIT", diff --git a/ports/fann/fix-build_type.patch b/ports/fann/fix-build_type.patch new file mode 100644 index 00000000000000..14af5c8fd97665 --- /dev/null +++ b/ports/fann/fix-build_type.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c35ea2..fafd904 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,7 +68,6 @@ set (FANN_VERSION_MINOR 2) + set (FANN_VERSION_PATCH 0) + set (FANN_VERSION_STRING ${FANN_VERSION_MAJOR}.${FANN_VERSION_MINOR}.${FANN_VERSION_PATCH}) + +-option(BUILD_SHARED_LIBS "build shared/static libs" ON) + + INCLUDE(DefineInstallationPaths) + diff --git a/ports/fann/fix-installation.patch b/ports/fann/fix-installation.patch index 270f0877a42fe7..3a7dae2bd628c3 100644 --- a/ports/fann/fix-installation.patch +++ b/ports/fann/fix-installation.patch @@ -1,70 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 12ea06c..6c33c25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -156,10 +156,5 @@ install (FILES + + ################# compile tests ################ + +-ADD_SUBDIRECTORY( lib/googletest ) +- +-if(COMPILER_SUPPORTS_CXX11) +- ADD_SUBDIRECTORY( tests ) +-endif() + + ENDIF() diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake -index 644cf1b..81e7c74 100644 +index 2969533..e70c4b7 100644 --- a/cmake/Modules/DefineInstallationPaths.cmake +++ b/cmake/Modules/DefineInstallationPaths.cmake -@@ -3,7 +3,7 @@ if (UNIX) - MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME") - SET(APPLICATION_NAME ${PROJECT_NAME}) - ENDIF (NOT APPLICATION_NAME) -- -+if (0) - # Suffix for Linux - SET(LIB_SUFFIX - CACHE STRING "Define suffix of directory name (32/64)" -@@ -122,9 +122,10 @@ if (UNIX) - CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)" - FORCE - ) -+endif() - endif (UNIX) +@@ -127,7 +127,7 @@ if (UNIX OR MINGW OR WIN32) + set (PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "pkgconfig dir" FORCE) + endif () --if (WIN32) +-if (MSCV) +if (0) # Same same SET(BIN_INSTALL_DIR .) SET(SBIN_INSTALL_DIR .) -@@ -134,5 +135,5 @@ if (WIN32) +@@ -137,5 +137,5 @@ if (MSCV) SET(ICON_INSTALL_DIR .) SET(SOUND_INSTALL_DIR .) SET(LOCALE_INSTALL_DIR lang) --endif (WIN32) -+endif (0) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fade00c..a4e6c3f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -14,7 +14,7 @@ floatfann.c - ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS}) - - SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) --INSTALL(TARGETS floatfann DESTINATION ${LIB_INSTALL_DIR} ) -+INSTALL(TARGETS floatfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) - - - ########### next target ############### -@@ -26,7 +26,7 @@ doublefann.c - ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS}) - - SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) --INSTALL(TARGETS doublefann DESTINATION ${LIB_INSTALL_DIR} ) -+INSTALL(TARGETS doublefann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) - - - ########### next target ############### -@@ -38,7 +38,7 @@ fixedfann.c - ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS}) - - SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) --INSTALL(TARGETS fixedfann DESTINATION ${LIB_INSTALL_DIR} ) -+INSTALL(TARGETS fixedfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) - - - ########### next target ############### -@@ -50,5 +50,5 @@ floatfann.c - ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS}) - - SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) --INSTALL(TARGETS fann DESTINATION ${LIB_INSTALL_DIR} ) -+INSTALL(TARGETS fann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +-endif (MSCV) ++endif () diff --git a/ports/fann/fix-uwp-build.patch b/ports/fann/fix-uwp-build.patch index dd42358bd4d38b..bcd12e1f0bc16b 100644 --- a/ports/fann/fix-uwp-build.patch +++ b/ports/fann/fix-uwp-build.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b91f6fb..22c39d7 100644 +index 6c33c25..2c35ea2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,6 +22,10 @@ SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig) +@@ -82,6 +82,10 @@ configure_file (cmake/fann.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/fann.pc @ONLY) - INSTALL_FILES( ${PKGCONFIG_INSTALL_DIR} FILES fann.pc ) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/fann.pc DESTINATION ${PKGCONFIG_INSTALL_DIR}) +if (MSVC) + add_compile_options(/wd4996) diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake index b74433baf2f656..b1829693e87ebc 100644 --- a/ports/fann/portfile.cmake +++ b/ports/fann/portfile.cmake @@ -1,12 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libfann/fann - REF 2.2.0 - SHA512 b307539a39d93078a489710ac77aa8c6e324f3cf5ef80299ce257d10c043913764abef83aceac5278a5bd243b1ee245b4e8331a9e13c774aa63c9cb604f86bdd + REF 8409b42d308bf9428b9d3e60927595e53a797bbc + SHA512 4ad66808d7c88911d4c6d63368240ece2d0cbc73d89a95d32261b95dc551c47c46b3a34cc81b8cb0e03fe3f9ea61cb304e028780357bcf332d660824b066fd1e HEAD_REF master PATCHES fix-installation.patch fix-uwp-build.patch + fix-build_type.patch + remove-nouse-target.patch ) set(INSTALL_BASE_DIR_DBG "${CURRENT_PACKAGES_DIR}/debug") @@ -17,10 +19,11 @@ vcpkg_cmake_configure( OPTIONS_DEBUG -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin - -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin + -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/lib -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/tools/${PORT} -DXDG_APPS_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT} -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT} + -DINCLUDE_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/include -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT} -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT} -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/doc @@ -32,10 +35,11 @@ vcpkg_cmake_configure( OPTIONS_RELEASE -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/bin -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/sbin - -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/bin + -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/lib -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/tools/${PORT} -DXDG_APPS_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT} -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT} + -DINCLUDE_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/include -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT} -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT} -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/doc @@ -52,10 +56,9 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/fann/remove-nouse-target.patch b/ports/fann/remove-nouse-target.patch new file mode 100644 index 00000000000000..82a26667900b14 --- /dev/null +++ b/ports/fann/remove-nouse-target.patch @@ -0,0 +1,85 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ac3ff73..2fb9a59 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,15 +23,12 @@ SET(floatfann_LIB_SRCS + floatfann.c + ) + +-ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS}) +-ADD_LIBRARY(floatfann_static STATIC ${floatfann_LIB_SRCS}) ++ADD_LIBRARY(floatfann ${floatfann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(floatfann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(floatfann_static PROPERTIES OUTPUT_NAME floatfann) + endif(UNIX) +-INSTALL(TARGETS floatfann floatfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS floatfann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) + +@@ -42,15 +39,12 @@ SET(doublefann_LIB_SRCS + doublefann.c + ) + +-ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS}) +-ADD_LIBRARY(doublefann_static STATIC ${doublefann_LIB_SRCS}) ++ADD_LIBRARY(doublefann ${doublefann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(doublefann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(doublefann_static PROPERTIES OUTPUT_NAME doublefann) + endif(UNIX) +-INSTALL(TARGETS doublefann doublefann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS doublefann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) + +@@ -61,20 +55,16 @@ SET(fixedfann_LIB_SRCS + fixedfann.c + ) + +-ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS}) +-ADD_LIBRARY(fixedfann_static STATIC ${fixedfann_LIB_SRCS}) ++ADD_LIBRARY(fixedfann ${fixedfann_LIB_SRCS}) + + if(NOT MSVC) + TARGET_LINK_LIBRARIES(fixedfann m) +-TARGET_LINK_LIBRARIES(fixedfann_static m) + endif(NOT MSVC) + + SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES OUTPUT_NAME fixedfann) + endif(UNIX) +-INSTALL(TARGETS fixedfann fixedfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS fixedfann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) + +@@ -85,19 +75,15 @@ SET(fann_LIB_SRCS + floatfann.c + ) + +-ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS}) +-ADD_LIBRARY(fann_static STATIC ${fann_LIB_SRCS}) ++ADD_LIBRARY(fann ${fann_LIB_SRCS}) + + if(NOT MSVC) + TARGET_LINK_LIBRARIES(fann m) +-TARGET_LINK_LIBRARIES(fann_static m) + endif(NOT MSVC) + + SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(fann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(fann_static PROPERTIES OUTPUT_NAME fann) + endif(UNIX) +-INSTALL(TARGETS fann fann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS fann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ports/fann/vcpkg.json b/ports/fann/vcpkg.json index 03f16620c3fae4..0441b07ee396b9 100644 --- a/ports/fann/vcpkg.json +++ b/ports/fann/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fann", - "version": "2.2.0", - "port-version": 3, + "version-date": "2023-01-26", "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.", "homepage": "https://github.com/libfann/fann", "license": "LGPL-2.1-only", @@ -9,6 +8,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/fastrtps/fix_thread.patch b/ports/fastrtps/fix_thread.patch new file mode 100644 index 00000000000000..075a940cfd4276 --- /dev/null +++ b/ports/fastrtps/fix_thread.patch @@ -0,0 +1,40 @@ +diff --git a/include/fastrtps/utils/TimedMutex.hpp b/include/fastrtps/utils/TimedMutex.hpp +index 8d5d968..7ba3e00 100644 +--- a/include/fastrtps/utils/TimedMutex.hpp ++++ b/include/fastrtps/utils/TimedMutex.hpp +@@ -23,10 +23,14 @@ + #include + + #if defined(_WIN32) ++#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528 ++#include ++#else + #include + extern int clock_gettime( + int, + struct timespec* tv); ++#endif // if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528 + #elif _GTHREAD_USE_MUTEX_TIMEDLOCK + #include + #else +@@ -37,6 +41,11 @@ namespace eprosima { + namespace fastrtps { + + #if defined(_WIN32) ++ ++#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528 ++using TimedMutex = std::timed_mutex; ++using RecursiveTimedMutex = std::recursive_timed_mutex; ++#else + class TimedMutex + { + public: +@@ -182,6 +191,8 @@ private: + + _Mtx_t mutex_; + }; ++#endif // if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528 ++ + #elif _GTHREAD_USE_MUTEX_TIMEDLOCK || !defined(__unix__) + using TimedMutex = std::timed_mutex; + using RecursiveTimedMutex = std::recursive_timed_mutex; diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 719e47f87c1823..cbceacd732f82c 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-find-package-asio.patch disable-symlink.patch fix-xtime.patch + fix_thread.patch #https://github.com/eProsima/Fast-DDS/pull/3904 ) vcpkg_cmake_configure( diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json index a82d7a8c3c298f..130260655fd4d7 100644 --- a/ports/fastrtps/vcpkg.json +++ b/ports/fastrtps/vcpkg.json @@ -1,10 +1,11 @@ { "name": "fastrtps", "version": "2.7.0", - "port-version": 3, + "port-version": 4, "description": "Eprosima Fast RTPS is a C++ implementation of 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", + "supports": "!uwp", "dependencies": [ "asio", "fastcdr", diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1754fcbff6887a..b4f29767b61764 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -33,18 +33,9 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") vcpkg_add_to_path("${NASM_EXE_PATH}") endif() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - #We're assuming that if we're building for Windows we're using MSVC - set(INCLUDE_VAR "INCLUDE") - set(LIB_PATH_VAR "LIB") -else() - set(INCLUDE_VAR "CPATH") - set(LIB_PATH_VAR "LIBRARY_PATH") -endif() - set(OPTIONS "--enable-pic --disable-doc --enable-debug --enable-runtime-cpudetect --disable-autodetect") -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_HOST_IS_WINDOWS) vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake1.16) set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe") vcpkg_add_to_path("${MSYS_ROOT}/usr/share/automake-1.16") @@ -94,8 +85,6 @@ string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " -I \"${CURRENT_INSTALLED_DIR}/inc ## Setup vcpkg toolchain -set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}") - set(prog_env "") if(VCPKG_DETECTED_CMAKE_C_COMPILER) @@ -574,8 +563,12 @@ message(STATUS "Building Options: ${OPTIONS}") # Release build if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if (VCPKG_DETECTED_MSVC) + set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-ldflags=-libpath:\"${CURRENT_INSTALLED_DIR}/lib\"") + else() + set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-ldflags=-L\"${CURRENT_INSTALLED_DIR}/lib\"") + endif() message(STATUS "Building Release Options: ${OPTIONS_RELEASE}") - set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}") set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") message(STATUS "Building ${PORT} for Release") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") @@ -611,8 +604,12 @@ endif() # Debug build if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if (VCPKG_DETECTED_MSVC) + set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-ldflags=-libpath:\"${CURRENT_INSTALLED_DIR}/debug/lib\"") + else() + set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-ldflags=-L\"${CURRENT_INSTALLED_DIR}/debug/lib\"") + endif() message(STATUS "Building Debug Options: ${OPTIONS_DEBUG}") - set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}") set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig") message(STATUS "Building ${PORT} for Debug") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 756faa756d8060..1afb1c802817dc 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffmpeg", "version": "6.0", + "port-version": 2, "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." @@ -338,7 +339,6 @@ }, "dav1d": { "description": "AV1 decoding via libdav1d", - "supports": "!osx", "dependencies": [ "dav1d" ] diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 035dd3e118a9cd..1255301e1a438a 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 d32628828eacc42646887de5a72a593ea42158d5f09e4ed789f86dff60f98f5be45c3a4a049c2b1173e2ab4da0313f544271eacd8f14a8c561815c51eebf8529 + SHA512 0931777bf7b43cd86a882bb3172ee8ce6294495eee010edc08afb33d09440280b46b2453395c69ac023f4f6d8a0600097c4b1797666c9094e1ae394659017853 HEAD_REF master ) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index aafd2b6ada46b0..22f8d345848822 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "3.2.7", + "version": "3.2.8", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 2b35e1fab138c2..489b047671fe6c 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -20,7 +20,8 @@ vcpkg_configure_meson( -Dcache-build=disabled -Dtests=disabled ) -#https://www.freedesktop.org/software/fontconfig/fontconfig-user.html + +# https://www.freedesktop.org/software/fontconfig/fontconfig-user.html # Adding OPTIONS for e.g. baseconfig-dir etc. won't work since meson will try to install into those dirs! # Since adding OPTIONS does not work use a replacement in the generated config.h instead set(replacement "") @@ -29,9 +30,11 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h") vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}" "${replacement}") +vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"") if(NOT VCPKG_BUILD_TYPE) set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.h") vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}/debug" "${replacement}") + vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"") endif() vcpkg_install_meson(ADD_BIN_TO_PATH) diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 25f9d8d3b3769e..1a4c499ea8ac7f 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fontconfig", "version": "2.14.2", + "port-version": 1, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "license": "MIT", diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 3ddf916eebfdd4..07f27f062a6b83 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( fix-gdal-target-interfaces.patch libkml.patch fix-jpeg.patch + upstream-b5858ed.diff ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") diff --git a/ports/gdal/upstream-b5858ed.diff b/ports/gdal/upstream-b5858ed.diff new file mode 100644 index 00000000000000..9c31afcc2df6c0 --- /dev/null +++ b/ports/gdal/upstream-b5858ed.diff @@ -0,0 +1,21 @@ +diff --git a/frmts/gtiff/geotiff.cpp b/frmts/gtiff/geotiff.cpp +index ed79c0972e0..33846d66513 100644 +--- a/frmts/gtiff/geotiff.cpp ++++ b/frmts/gtiff/geotiff.cpp +@@ -2886,8 +2886,16 @@ static void ThreadDecompressionFunc(void *pData) + psJob->nXBlock, psJob->nYBlock); + if (apoBlocks[i] == nullptr) + { ++ // Temporary disabling of dirty block fushing, otherwise ++ // we can be in a deadlock situation, where the ++ // GTiffDataset::SubmitCompressionJob() method waits for jobs ++ // to be finished, that can't finish (actually be started) ++ // because this task and its siblings are taking all the ++ // available workers allowed by the global thread pool. ++ GDALRasterBlock::EnterDisableDirtyBlockFlush(); + apoBlocks[i] = poDS->GetRasterBand(iBand)->GetLockedBlockRef( + psJob->nXBlock, psJob->nYBlock, TRUE); ++ GDALRasterBlock::LeaveDisableDirtyBlockFlush(); + if (apoBlocks[i] == nullptr) + return false; + } diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index e66cb60ca46e84..2001a0c25ab0c8 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.7.2", + "port-version": 1, "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/ginkgo/portfile.cmake b/ports/ginkgo/portfile.cmake index c8080e7670f224..a17f906d0df3a3 100644 --- a/ports/ginkgo/portfile.cmake +++ b/ports/ginkgo/portfile.cmake @@ -1,23 +1,20 @@ -vcpkg_download_distfile(WINDOWS_SYMBOLS_PATCH - URLS https://github.com/ginkgo-project/ginkgo/commit/7481b2fffb51d73492ef9017045450b29b820f81.diff?full_index=1 - FILENAME 7481b2fffb51d73492ef9017045450b29b820f81.diff - SHA512 f2997dc1af55db2a152092b70097238af77d7345329b9033a19301cfc4d8d494c5c41fbbd9a63b3303697764fc5f799dfe93647bafbbefae8981a978ecaa6a68 -) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ginkgo-project/ginkgo - REF v1.4.0 - SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807 + REF "v${VERSION}" + SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50 HEAD_REF master - PATCHES - ${WINDOWS_SYMBOLS_PATCH} ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES openmp GINKGO_BUILD_OMP cuda GINKGO_BUILD_CUDA + mpi GINKGO_BUILD_MPI ) vcpkg_cmake_configure( @@ -33,7 +30,6 @@ vcpkg_cmake_configure( -DGINKGO_DEVEL_TOOLS=OFF -DGINKGO_SKIP_DEPENDENCY_UPDATE=ON -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON - -DGinkgo_NAME=ginkgo ${FEATURE_OPTIONS} ) @@ -41,12 +37,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ginkgo) vcpkg_fixup_pkgconfig() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" [[string(REPLACE "lib/cmake/Ginkgo" "" GINKGO_INSTALL_PREFIX "${GINKGO_CONFIG_FILE_PATH}")]] "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "GINKGO_INSTALL_PREFIX" "_IMPORT_PREFIX") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo\"" "/share/ginkgo\"") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo/Modules\"" "/share/ginkgo/Modules/Modules\"") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "\"${SOURCE_PATH}/cmake/Modules/\"" "") - file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/ginkgo/vcpkg.json b/ports/ginkgo/vcpkg.json index 76d755a4764834..73aa6817f96ca1 100644 --- a/ports/ginkgo/vcpkg.json +++ b/ports/ginkgo/vcpkg.json @@ -1,10 +1,10 @@ { "name": "ginkgo", - "version-semver": "1.4.0", - "port-version": 2, + "version-semver": "1.6.0", "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows.", "homepage": "https://github.com/ginkgo-project/ginkgo", "license": "BSD-3-Clause", + "supports": "!(x86 | android)", "dependencies": [ { "name": "vcpkg-cmake", @@ -22,6 +22,12 @@ "cuda" ] }, + "mpi": { + "description": "Build the distributed MPI backend of Ginkgo", + "dependencies": [ + "mpi" + ] + }, "openmp": { "description": "Build the OpenMP backend of Ginkgo" } diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 0dd851dc8372ef..e63098bb3b21e7 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 f9730a9b572d50f4d7f50cb7d8584d3c1169ecf34e58017e96cc581de066e864fa5551f6a8d32aaf1a99ddbcebe3b3cbc2961b77a9b33dc83fb75f4558007531 + SHA512 c4f89aa0fd28a821f977a7b363985ba6a88b54a22d76beea27d2750d3d912a46092ed436b010f679237a83f6375d2fba7c4e54cbf4650f2ba1e7bdf7b1804c59 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 4cc1225c8df4c2..3be32bbcc849a9 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.5.1", + "version": "1.5.4", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/ports/glib/fix-build-race-on-gio.patch b/ports/glib/fix-build-race-on-gio.patch deleted file mode 100644 index 2d2c01b1bb3107..00000000000000 --- a/ports/glib/fix-build-race-on-gio.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/gio/kqueue/meson.build b/gio/kqueue/meson.build -index 7447e56..f3e573f 100644 ---- a/gio/kqueue/meson.build -+++ b/gio/kqueue/meson.build -@@ -10,6 +10,7 @@ kqueue_lib = static_library('kqueue', - include_directories : [configinc, glibinc], - dependencies : [ - gioenumtypes_dep, -+ libglib_dep, - gmodule_inc_dep, - ], - gnu_symbol_visibility : 'hidden', -diff --git a/gio/win32/meson.build b/gio/win32/meson.build -index 08be6b0..6699f10 100644 ---- a/gio/win32/meson.build -+++ b/gio/win32/meson.build -@@ -13,6 +13,7 @@ giowin32_lib = static_library('giowin32', - dependencies : [ - libintl, - gioenumtypes_dep, -+ libglib_dep, - gmodule_inc_dep, - ], - gnu_symbol_visibility : 'hidden', diff --git a/ports/glib/libintl.patch b/ports/glib/libintl.patch index 6e966aab2d2b0a..e62c5667218c7f 100644 --- a/ports/glib/libintl.patch +++ b/ports/glib/libintl.patch @@ -1,14 +1,14 @@ diff --git a/meson.build b/meson.build -index f44fa2d4e..d465253af 100644 --- a/meson.build +++ b/meson.build -@@ -2088,9 +2088,9 @@ +@@ -2134,10 +2135,10 @@ libz_dep = dependency('zlib') # proxy-libintl subproject. # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible # implementations. This could be extended if issues are found in some platforms. -libintl_deps = [] --libintl = dependency('intl', required: false, allow_fallback: false) --if libintl.found() + libintl_prefix = '#include ' +-libintl = dependency('intl', required: false) +-if libintl.found() and libintl.type_name() != 'internal' +libintl = dependency('Intl', method:'cmake', required: true) +libintl_deps = [libintl] +if false diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index c36828c4438f86..bc4fe0601efe44 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -2,7 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(GLIB_ARCHIVE URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz" FILENAME "glib-${VERSION}.tar.xz" - SHA512 190a98e9a0ebb802a31b511e95725ed1fec9d750aed6bd87f14f3047d1f1d79458be3fa954fd6eb9af9f481a8deeaae73c95c990f5aa002a4b1166372ed4c4f1 + SHA512 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -10,7 +10,7 @@ vcpkg_extract_source_archive(SOURCE_PATH PATCHES use-libiconv-on-windows.patch libintl.patch - fix-build-race-on-gio.patch # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3512 + suppress-libelf-dependency.patch ) if(APPLE) diff --git a/ports/glib/suppress-libelf-dependency.patch b/ports/glib/suppress-libelf-dependency.patch new file mode 100644 index 00000000000000..cf14dd5771e466 --- /dev/null +++ b/ports/glib/suppress-libelf-dependency.patch @@ -0,0 +1,12 @@ +diff --git a/gio/meson.build b/gio/meson.build +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -935,7 +935,7 @@ endif + # Dependencies used by executables below + have_libelf = false + libelf = dependency('libelf', version : '>= 0.8.12', required : false) +-if libelf.found() ++if false + have_libelf = true + else + # This fallback is necessary on *BSD. elfutils isn't the only libelf diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 01f38b57d3c5ee..da1c7406f5d19a 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glib", - "version": "2.76.5", + "version": "2.78.0", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index a3e5e2e8c92184..133c81ec6e7ccf 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO g-truc/glm - REF 5c46b9c07008ae65cb81ab79cd677ecc1934b903 # commit on 2023-06-08 - SHA512 17315dd05059accf3d4084d35dd037d4001f88a1d91da9a6fd5cedecab652c8bef8efa89cd45e21cd227f964a03408401edc2384c22e50caa449abf71b23fd6a + REF bf71a834948186f4097caa076cd2663c69a10e1e #v0.9.9.8 + SHA512 226266c02af616a96fb19ee32cf3f98347daa43a4fde5d618d36b38709dce1280de126c542524d40725ecf70359edcc5b60660554c65ce246514501fb4c9c87c HEAD_REF master ) @@ -19,5 +19,5 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/copying.txt") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +# Put the license file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/copying.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glm/usage b/ports/glm/usage deleted file mode 100644 index 95602ece2bad5c..00000000000000 --- a/ports/glm/usage +++ /dev/null @@ -1,4 +0,0 @@ -glm provides CMake targets: - - find_package(glm CONFIG REQUIRED) - target_link_libraries(main PRIVATE glm::glm) diff --git a/ports/glm/vcpkg.json b/ports/glm/vcpkg.json index 91bf95e6b0618b..a81138c051cc8f 100644 --- a/ports/glm/vcpkg.json +++ b/ports/glm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glm", - "version-date": "2023-06-08", + "version": "0.9.9.8", + "port-version": 2, "description": "OpenGL Mathematics (GLM)", "homepage": "https://glm.g-truc.net", "license": "MIT", diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 7353c7d4afbfeb..ab346cf30d0f62 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -20,7 +20,7 @@ if (ENABLE_GLSLANG_BINARIES) vcpkg_add_to_path("${PYTHON_PATH}") endif () -if (WIN32) +if (VCPKG_TARGET_IS_WINDOWS) set(PLATFORM_OPTIONS "-DOVERRIDE_MSVCCRT=OFF") endif () @@ -46,6 +46,9 @@ vcpkg_copy_pdbs() if (ENABLE_GLSLANG_BINARIES) vcpkg_copy_tools(TOOL_NAMES glslangValidator spirv-remap AUTO_CLEAN) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools(TOOL_NAMES glslang AUTO_CLEAN) + endif() endif () file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 159c4240c61a63..432d78ae07de23 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glslang", "version": "13.0.0", + "port-version": 1, "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 011d6b0e27cba4..ceec57ecdd10d3 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,13 +4,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF "v${VERSION}" - SHA512 225202a8e799f630f0b07c392bf305c28e21b99ef8dc5a670238a6d08e0e2816cd8ca1c43d7b252bcf5d289f875e64c16413085f63663265169807fd59977e43 + SHA512 a3d84785b024e31e909592bca5a6589873bcd342848fae9520a9e7715bcb736db71184eeedbcbf6086105e6145937cabdd731a80879fd177f80895fdf09c3b46 HEAD_REF main PATCHES support_absl_cxx17.patch ) -vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") +if ("grpc-common" IN_LIST FEATURES) + vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") +endif () set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}") list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core") @@ -65,7 +67,7 @@ foreach(feature IN LISTS FEATURES) endforeach() # These packages are automatically installed depending on what features are # enabled. -foreach(suffix common googleapis grpc_utils rest_internal opentelemetry dialogflow_cx dialogflow_es) +foreach(suffix common googleapis grpc_utils rest_internal rest_protobuf_internal dialogflow_cx dialogflow_es) set(config_path "lib/cmake/google_cloud_cpp_${suffix}") if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") continue() diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 8c5c49b540e3f4..0fc6206bfaafe6 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,13 +1,14 @@ { "name": "google-cloud-cpp", - "version": "2.15.1", + "version": "2.17.0", + "port-version": 1, "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ "abseil", - "grpc", + "openssl", { "name": "vcpkg-cmake", "host": true @@ -319,6 +320,19 @@ } ] }, + "compute": { + "description": "Compute Engine C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common", + "rest-common" + ] + } + ] + }, "confidentialcomputing": { "description": "Confidential Computing API C++ Client Library", "dependencies": [ @@ -331,6 +345,18 @@ } ] }, + "config": { + "description": "Infrastructure Manager API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "connectors": { "description": "Connectors API C++ Client Library", "dependencies": [ @@ -572,20 +598,6 @@ } ] }, - "experimental-opentelemetry": { - "description": "OpenTelemetry C++ GCP Exporter Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "rest-common", - "trace" - ] - }, - "opentelemetry-cpp" - ] - }, "experimental-storage-grpc": { "description": "The GCS+gRPC plugin", "dependencies": [ @@ -830,6 +842,18 @@ } ] }, + "netapp": { + "description": "NetApp API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "networkconnectivity": { "description": "Network Connectivity API C++ Client Library", "dependencies": [ @@ -878,6 +902,32 @@ } ] }, + "oauth2": { + "description": "OAuth2 Access Token Generation Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "rest-common" + ] + } + ] + }, + "opentelemetry": { + "description": "OpenTelemetry C++ GCP Exporter Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "rest-common", + "trace" + ] + }, + "opentelemetry-cpp" + ] + }, "optimization": { "description": "Cloud Optimization API C++ Client Library", "dependencies": [ diff --git a/ports/gpgme/disable-tests.patch b/ports/gpgme/disable-tests.patch deleted file mode 100644 index c7158508f82eb9..00000000000000 --- a/ports/gpgme/disable-tests.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b05747aea79083106b27ac7d829db3e65e192682 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Thu, 29 Oct 2020 13:23:56 -0400 -Subject: [PATCH] cpp,python: Respect --disable-gpg-test for tests - -* lang/cpp/Makefile.am: Respect --disable-gpg-test -* lang/python/Makefile.am: Respect --disable-gpg-test - -This is similar to the qt that had it already enabled ---- - lang/cpp/Makefile.am | 8 +++++++- - lang/python/Makefile.am | 8 +++++++- - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/lang/cpp/Makefile.am b/lang/cpp/Makefile.am -index 724da6ca..70ca7462 100644 ---- a/lang/cpp/Makefile.am -+++ b/lang/cpp/Makefile.am -@@ -18,6 +18,12 @@ - # License along with this program; if not, see . - # SPDX-License-Identifier: LGPL-2.1-or-later - --SUBDIRS = src tests -+if RUN_GPG_TESTS -+tests = tests -+else -+tests = -+endif -+ -+SUBDIRS = src ${tests} - - EXTRA_DIST = README -diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am -index 845b7b17..68b98e8e 100644 ---- a/lang/python/Makefile.am -+++ b/lang/python/Makefile.am -@@ -23,7 +23,13 @@ EXTRA_DIST = \ - gpgme.i \ - helpers.c helpers.h private.h - --SUBDIRS = . tests examples doc src -+if RUN_GPG_TESTS -+tests = tests -+else -+tests = -+endif -+ -+SUBDIRS = . ${tests} examples doc src - - .PHONY: prepare - prepare: copystamp diff --git a/ports/gpgme/fix-c++11.patch b/ports/gpgme/fix-c++11.patch deleted file mode 100644 index d8b68e7757c294..00000000000000 --- a/ports/gpgme/fix-c++11.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp -index 06258729..0a7ad03d 100644 ---- a/lang/cpp/src/importresult.cpp -+++ b/lang/cpp/src/importresult.cpp -@@ -152,17 +152,17 @@ void GpgME::ImportResult::mergeWith(const ImportResult &other) - } - // was this key also considered during the first import - const auto consideredInFirstImports = -- std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const auto i) { -+ std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const gpgme_import_status_t i) { - return i->fpr && !strcmp(i->fpr, fpr); - }); - // did we see this key already in the list of keys of the other import - const auto consideredInPreviousOtherImports = -- std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) { -+ std::any_of(std::begin(other.d->imports), it, [fpr](const gpgme_import_status_t i) { - return i->fpr && !strcmp(i->fpr, fpr); - }); - // was anything added to this key during the other import - const auto changedInOtherImports = -- std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const auto i) { -+ std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const gpgme_import_status_t i) { - return i->fpr && !strcmp(i->fpr, fpr) && (i->status != 0); - }); - if (consideredInFirstImports && !consideredInPreviousOtherImports) { -@@ -177,15 +177,15 @@ void GpgME::ImportResult::mergeWith(const ImportResult &other) - - // now do the same for the secret key counts - const auto secretKeyConsideredInFirstImports = -- std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const auto i) { -+ std::any_of(std::begin(d->imports), std::end(d->imports), [fpr](const gpgme_import_status_t i) { - return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET); - }); - const auto secretKeyConsideredInPreviousOtherImports = -- std::any_of(std::begin(other.d->imports), it, [fpr](const auto i) { -+ std::any_of(std::begin(other.d->imports), it, [fpr](const gpgme_import_status_t i) { - return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET); - }); - const auto secretKeyChangedInOtherImports = -- std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const auto i) { -+ std::any_of(std::begin(other.d->imports), std::end(other.d->imports), [fpr](const gpgme_import_status_t i) { - return i->fpr && !strcmp(i->fpr, fpr) && (i->status & GPGME_IMPORT_SECRET) && (i->status != GPGME_IMPORT_SECRET); - }); - if (secretKeyConsideredInFirstImports && !secretKeyConsideredInPreviousOtherImports) { -@@ -204,7 +204,7 @@ void GpgME::ImportResult::mergeWith(const ImportResult &other) - d->imports.reserve(d->imports.size() + other.d->imports.size()); - std::transform(std::begin(other.d->imports), std::end(other.d->imports), - std::back_inserter(d->imports), -- [](const auto import) { -+ [](const gpgme_import_status_t import) { - gpgme_import_status_t copy = new _gpgme_import_status{*import}; - if (import->fpr) { - copy->fpr = strdup(import->fpr); --- -2.11.0 - diff --git a/ports/gpgme/portfile.cmake b/ports/gpgme/portfile.cmake index 444283228b4643..e50242bce6a8c9 100644 --- a/ports/gpgme/portfile.cmake +++ b/ports/gpgme/portfile.cmake @@ -1,20 +1,16 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_download_distfile(tarball URLS "https://gnupg.org/ftp/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2" "https://mirrors.dotsrc.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2" "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2" FILENAME "gpgme-${VERSION}.tar.bz2" - SHA512 c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac + SHA512 17053053fa885f01416433e43072ac716b5d5db0c3edf45b2d6e90e6384d127626e6ae3ce421abba8f449f5ca7e8963f3d62f3565d295847170bc998d1ec1a70 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${tarball}" PATCHES - disable-tests.patch disable-docs.patch - fix-c++11.patch # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=f02c20cc9c5756690b07abfd02a43533547ba2ef ) vcpkg_list(SET LANGUAGES) @@ -31,22 +27,30 @@ vcpkg_configure_make( --disable-gpgsm-test --disable-g13-test --enable-languages=${LANGUAGES} - --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error - --with-libassuan-prefix=${CURRENT_INSTALLED_DIR}/tools/libassuan + GPG_ERROR_CONFIG=/ # fake absolute path; gpgrt-config is used instead + OPTIONS_RELEASE + "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config" + OPTIONS_DEBUG + "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config" ) vcpkg_install_make() -# CMake config needs work for linkage and build type -# vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Gpgmepp PACKAGE_NAME Gpgmepp) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") vcpkg_copy_pdbs() -# We have no dependency on glib, so remove this extra .pc file + +# This port doesn't support the windows-only glib integration. file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gpgme-glib.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gpgme-glib.pc") vcpkg_fixup_pkgconfig() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") -if (NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gpgme/debug/bin/gpgme-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +# CMake config needs work for linkage and build type. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") + +set(install_prefix "${CURRENT_INSTALLED_DIR}") +if(VCPKG_HOST_IS_WINDOWS) + string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" install_prefix "${install_prefix}") +endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/gpgme-config" "${install_prefix}" "`dirname $0`/../../..") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/gpgme-config" "${install_prefix}" "`dirname $0`/../../../..") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/gpgme/vcpkg.json b/ports/gpgme/vcpkg.json index e8d84c4b9eac39..243f60fd106977 100644 --- a/ports/gpgme/vcpkg.json +++ b/ports/gpgme/vcpkg.json @@ -1,17 +1,13 @@ { "name": "gpgme", - "version": "1.18.0", + "version": "1.22.0", "description": "A library designed to make access to GnuPG easier for applications", - "homepage": "https://gnupg.org/software/gpgme/index.html", + "homepage": "https://gnupg.org/software/gpgme/", "license": null, "supports": "!windows | mingw", "dependencies": [ "libassuan", - "libgpg-error", - { - "name": "vcpkg-cmake-config", - "host": true - } + "libgpg-error" ], "default-features": [ "cpp" diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake index 966004560681a4..d9962c243dcd7e 100644 --- a/ports/graphviz/portfile.cmake +++ b/ports/graphviz/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_from_gitlab( if(VCPKG_TARGET_IS_OSX) message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with brew install libtool") elseif(VCPKG_TARGET_IS_LINUX) - message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with apt-get install libtool") + message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be install with `apt-get install libtool` on Ubuntu systems or `dnf install libtool-ltdl-devel` on Fedora systems") endif() vcpkg_list(SET OPTIONS) diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json index ad63d6c76850df..292d248e75bd03 100644 --- a/ports/graphviz/vcpkg.json +++ b/ports/graphviz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphviz", "version-semver": "9.0.0", - "port-version": 1, + "port-version": 2, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", "license": "EPL-1.0", diff --git a/ports/gstreamer/base-must-be-enabled.patch b/ports/gstreamer/base-must-be-enabled.patch new file mode 100644 index 00000000000000..5a4d3abeb32107 --- /dev/null +++ b/ports/gstreamer/base-must-be-enabled.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 6d07929..df015cb 100644 +--- a/meson.build ++++ b/meson.build +@@ -159,7 +159,7 @@ foreach sp : subprojects + subproj = subproject(project_name, required: is_required, default_options: default_options) + endif + +- if project_name == 'gst-plugins-base' ++ if project_name == 'gst-plugins-base' and subproj.found() + gst_base_orc_req = subproj.get_variable('orc_req', '') + if gst_base_orc_req != orc_req + error('orc_req is "@0@" but it should be "@1@" from subprojects/gst-plugins-base/meson.build' diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 053394f14a3393..099427ba6a2606 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -5,12 +5,12 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_from_gitlab( - GITLAB_URL https://gitlab.freedesktop.org/ + GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO gstreamer/gstreamer - REF ${VERSION} + REF "${VERSION}" SHA512 0d69896d0a83452320df0d0f56c710df1365a259cd3f48dc7cd4df18d45b27caea7174aafa15ae5eb8637ccdef192c1047185b369b7232db4eaacbc57ffaaa22 - HEAD_REF master + HEAD_REF main PATCHES fix-clang-cl.patch fix-clang-cl-gstreamer.patch @@ -21,6 +21,7 @@ vcpkg_from_gitlab( gstreamer-disable-no-unused.patch srtp_fix.patch fix-bz2-windows-debug-dependency.patch + base-must-be-enabled.patch ${PATCHES} ) @@ -93,6 +94,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libde265 gst-plugins-bad:libde265 microdns gst-plugins-bad:microdns modplug gst-plugins-bad:modplug + nvcodec gst-plugins-bad:nvcodec openal gst-plugins-bad:openal openh264 gst-plugins-bad:openh264 openjpeg gst-plugins-bad:openjpeg @@ -248,7 +250,6 @@ vcpkg_configure_meson( -Dgst-plugins-bad:msdk=disabled -Dgst-plugins-bad:musepack=disabled -Dgst-plugins-bad:neon=disabled - -Dgst-plugins-bad:nvcodec=disabled -Dgst-plugins-bad:onnx=disabled # libonnxruntime not found -Dgst-plugins-bad:openaptx=disabled -Dgst-plugins-bad:opencv=disabled # opencv not found diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 105d02517385e9..4eeaa88aee41ec 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.22.5", - "port-version": 1, + "port-version": 4, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -422,6 +422,19 @@ } ] }, + "nvcodec": { + "description": "Enable support for the NVCODEC encoders and decoders", + "supports": "!uwp", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, "ogg": { "description": "Enable support for the Ogg container format (commonly used by Vorbis, Theora and flac)", "dependencies": [ diff --git a/ports/gts/CMakeLists.txt b/ports/gts/CMakeLists.txt index 295c0c6f7e31d5..b25af8fda8f8f8 100644 --- a/ports/gts/CMakeLists.txt +++ b/ports/gts/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.14) -project(gts C) +project(gts VERSION "${VERSION}" LANGUAGES C) find_package(PkgConfig REQUIRED) pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET) @@ -8,17 +8,21 @@ pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET) if(WIN32) add_definitions(-DNATIVE_WIN32 -D_USE_MATH_DEFINES) else() - add_definitions(-DHAVE_FPU_CONTROL_H) + include(CheckIncludeFile) + check_include_file("fpu_control.h" HAVE_FPU_CONTROL_H) + if(HAVE_FPU_CONTROL_H) + add_definitions(-DHAVE_FPU_CONTROL_H) + endif() endif() add_definitions( -DGTS_COMPILATION - -DGTS_MAJOR_VERSION=0 - -DGTS_MINOR_VERSION=7 - -DGTS_MICRO_VERSION=6 + -DGTS_MAJOR_VERSION=${PROJECT_VERSION_MAJOR} + -DGTS_MINOR_VERSION=${PROJECT_VERSION_MINOR} + -DGTS_MICRO_VERSION=${PROJECT_VERSION_PATCH} -DGTS_INTERFACE_AGE=1 -DGTS_BINARY_AGE=1 - -DGTS_VERSION=${GTS_MAJOR_VERSION}.${GTS_MINOR_VERSION}.${GTS_MICRO_VERSION} + -DGTS_VERSION=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} ) file(GLOB src src/*.c src/gts.def) diff --git a/ports/gts/fix-dllexport_2.patch b/ports/gts/fix-dllexport_2.patch deleted file mode 100644 index 52ad11cce6c983..00000000000000 --- a/ports/gts/fix-dllexport_2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gts.h b/src/gts.h -index 1b76915..ae1d888 100644 ---- a/src/gts.h -+++ b/src/gts.h -@@ -38,7 +38,7 @@ extern "C" { - * we prefix variable declarations so they can - * properly get exported in windows dlls. - */ --#ifdef NATIVE_WIN32 -+#if 1 - # ifdef GTS_COMPILATION - # define GTS_C_VAR __declspec(dllexport) - # else /* not GTS_COMPILATION */ diff --git a/ports/gts/fix_missing_extern.patch b/ports/gts/fix_missing_extern.patch deleted file mode 100644 index 0e798c48efbeda..00000000000000 --- a/ports/gts/fix_missing_extern.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gts.h b/src/gts.h -index 1b7691531..1e87167bc 100644 ---- a/src/gts.h -+++ b/src/gts.h -@@ -40,7 +40,7 @@ extern "C" { - */ - #if 1 - # ifdef GTS_COMPILATION --# define GTS_C_VAR __declspec(dllexport) -+# define GTS_C_VAR extern __declspec(dllexport) - # else /* not GTS_COMPILATION */ - # define GTS_C_VAR extern __declspec(dllimport) - # endif /* not GTS_COMPILATION */ diff --git a/ports/gts/portfile.cmake b/ports/gts/portfile.cmake index 2f31dcd49af0ad..4695d9e8f777f8 100644 --- a/ports/gts/portfile.cmake +++ b/ports/gts/portfile.cmake @@ -1,16 +1,11 @@ -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(patches fix-dllexport.patch) -elseif(VCPKG_TARGET_IS_WINDOWS) - set(patches fix-dllexport_2.patch fix_missing_extern.patch) -endif() - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO gts/gts REF 0.7.6 FILENAME gts-0.7.6.tar.gz SHA512 645123b72dba3d04dad3c5d936d7e55947826be0fb25e84595368919b720deccddceb7c3b30865a5a40f2458254c2af793b7c014e6719cf07e7f8e6ff30890f8 - PATCHES ${patches} + PATCHES + fix-dllexport.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") @@ -21,14 +16,14 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + "-DVERSION=${VERSION}" ) vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/gts/usage b/ports/gts/usage index ccd803ef83d9b9..f3acd8605493f6 100644 --- a/ports/gts/usage +++ b/ports/gts/usage @@ -1,6 +1,5 @@ -The port gts supports consumption from CMake: +gts can be imported via CMake FindPkgConfig module: find_package(PkgConfig REQUIRED) - pkg_check_modules(GTS gts REQUIRED) - target_compile_options(main PRIVATE ${GTS_CFLAGS}) - target_link_libraries(main PRIVATE ${GTS_LDFLAGS}) + pkg_check_modules(GTS gts REQUIRED IMPORTED_TARGET) + target_link_libraries(main PRIVATE PkgConfig::GTS) diff --git a/ports/gts/vcpkg.json b/ports/gts/vcpkg.json index 3b5549f3aa1e3e..8686fb09e7b255 100644 --- a/ports/gts/vcpkg.json +++ b/ports/gts/vcpkg.json @@ -1,10 +1,10 @@ { "name": "gts", "version": "0.7.6", - "port-version": 7, + "port-version": 8, "description": "3D surfaces meshed with interconnected triangles", - "homepage": "http://gts.sourceforge.net/", - "supports": "!osx", + "homepage": "https://gts.sourceforge.net/", + "license": "LGPL-2.0-or-later", "dependencies": [ "glib", { diff --git a/ports/gz-cmake3/dependencies.patch b/ports/gz-cmake3/dependencies.patch new file mode 100644 index 00000000000000..169f24dd02b7f7 --- /dev/null +++ b/ports/gz-cmake3/dependencies.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/FindGzBullet.cmake b/cmake/FindGzBullet.cmake +--- a/cmake/FindGzBullet.cmake ++++ b/cmake/FindGzBullet.cmake +@@ -30,16 +30,17 @@ + + # Bullet. Force MODULE mode to use the FindBullet.cmake file distributed with + # CMake. Otherwise, we may end up using the BulletConfig.cmake file distributed + # with Bullet, which uses relative paths and may break transitive dependencies. +-find_package(Bullet MODULE ${gz_quiet_arg}) ++find_package(Bullet CONFIG REQUIRED) + + set(GzBullet_FOUND false) + # create Bullet target + if(BULLET_FOUND) + set(GzBullet_FOUND true) + + gz_import_target(GzBullet ++ INTERFACE + TARGET_NAME GzBullet::GzBullet + LIB_VAR BULLET_LIBRARIES + INCLUDE_VAR BULLET_INCLUDE_DIRS + ) diff --git a/ports/gz-cmake3/portfile.cmake b/ports/gz-cmake3/portfile.cmake index 1a881c4eb7d9a3..6694814e3cac04 100644 --- a/ports/gz-cmake3/portfile.cmake +++ b/ports/gz-cmake3/portfile.cmake @@ -1,11 +1,13 @@ set(PACKAGE_NAME cmake) -ignition_modular_library(NAME ${PACKAGE_NAME} - REF ${PORT}_${VERSION} - VERSION ${VERSION} - SHA512 99fb6a137b8a913b49e7881e9b2c96ca1ae03fb48cfa30f635a69396ccb0eb108abb8a925fd85dc46f3b10f88758675da53eb6cae3325eabeac5e6bee6f54d91 - PATCHES - ) +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 30cf5aa69674bdc1a99762fc45d134b99da5e2faf846749392697ae41463a5304a43022bb0c2ca1b373af4171135d686fdd736573fe6e1cc26dc2cecc8333e69 + PATCHES + dependencies.patch +) # Install custom usage configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json index e2e444dd5fe50f..37aa11321babc0 100644 --- a/ports/gz-cmake3/vcpkg.json +++ b/ports/gz-cmake3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gz-cmake3", - "version": "3.0.1", + "version": "3.4.1", + "port-version": 1, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/gz-math7/portfile.cmake b/ports/gz-math7/portfile.cmake index f64aa64517f3cc..3891614c7c1eec 100644 --- a/ports/gz-math7/portfile.cmake +++ b/ports/gz-math7/portfile.cmake @@ -4,7 +4,7 @@ ignition_modular_library( NAME "${PACKAGE_NAME}" REF "${PORT}_${VERSION}" VERSION "${VERSION}" - SHA512 84617eeb6840b0bad8f94c38e8af11bf010c2e3166042541d0d79c44f60a70ee6fde395b2a1b801abedb36aa024f7fb14bbb993eb7be2949c72d8756ba4b3196 + SHA512 6d6e7c298f927110060882457f4ea379292f013b577f83a3a6f1fd68fc9cd7ea0bbef82cc0b9279373ab7af6e66f6ea2d8995669fa7d6d1fff13f8b8c857a6ed OPTIONS -DSKIP_SWIG=ON -DSKIP_PYBIND11=ON diff --git a/ports/gz-math7/vcpkg.json b/ports/gz-math7/vcpkg.json index 9eb5c8cdcfc1a2..762e221fb5974b 100644 --- a/ports/gz-math7/vcpkg.json +++ b/ports/gz-math7/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gz-math7", - "version": "7.0.2", - "port-version": 1, + "version": "7.3.0", "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", "license": null, diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index 34e9f9ba5ffba2..54ff0b5a6e0bb4 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO halide/Halide - REF "v${VERSION}" - SHA512 4fc5253ad0e8fca2fd347ef139c8c150e2fb5dd2351da2b13adb9e00530a9d55943bc4952c1d42706a9ffbb57f81ed2854536d9e2f32dfab0dfc741696cc7e61 + REF 6569a831f2ee7f1a2e3d809c36fb92514d710c44 + SHA512 48c5a000719835d5119fd2c50b026c9125aeab4021641d2891b89ac8da3ec7c02c5f86837779dcae6e6bc8d929f6a182045bebe7e0990e33844b4d52f21df519 HEAD_REF main ) @@ -18,11 +18,11 @@ vcpkg_check_features( target-opengl-compute TARGET_OPENGLCOMPUTE target-hexagon TARGET_HEXAGON target-metal TARGET_METAL - target-mips TARGET_MIPS target-nvptx TARGET_NVPTX target-opencl TARGET_OPENCL target-powerpc TARGET_POWERPC target-riscv TARGET_RISCV + target-webassembly TARGET_WEBASSEMBLY target-x86 TARGET_X86 ) @@ -36,6 +36,7 @@ vcpkg_cmake_configure( -DWITH_TESTS=OFF -DWITH_TUTORIALS=OFF -DWITH_UTILS=OFF + -DWITH_SERIALIZATION=OFF # Disable experimental serializer -DCMAKE_INSTALL_LIBDIR=bin "-DCMAKE_INSTALL_DATADIR=share/${PORT}" "-DHalide_INSTALL_CMAKEDIR=share/${PORT}" diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json index c1762d39f32d3d..7b541db5860953 100644 --- a/ports/halide/vcpkg.json +++ b/ports/halide/vcpkg.json @@ -1,6 +1,7 @@ { "name": "halide", "version": "16.0.0", + "port-version": 1, "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", "homepage": "https://github.com/halide/Halide", "license": "MIT", @@ -81,12 +82,12 @@ "target-d3d12compute", "target-hexagon", "target-metal", - "target-mips", "target-nvptx", "target-opencl", "target-opengl-compute", "target-powerpc", "target-riscv", + "target-webassembly", "target-x86" ] } @@ -134,18 +135,6 @@ "target-metal": { "description": "Include Metal target" }, - "target-mips": { - "description": "Include Mips target", - "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "target-mips" - ] - } - ] - }, "target-nvptx": { "description": "Include NVPTX target", "dependencies": [ @@ -188,6 +177,18 @@ } ] }, + "target-webassembly": { + "description": "Include WebAssembly target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-webassembly" + ] + } + ] + }, "target-x86": { "description": "Include X86 target", "dependencies": [ diff --git a/ports/harfbuzz/fix-win32-build.patch b/ports/harfbuzz/fix-win32-build.patch new file mode 100644 index 00000000000000..f8551e3aff1c4a --- /dev/null +++ b/ports/harfbuzz/fix-win32-build.patch @@ -0,0 +1,26 @@ +diff --git a/src/meson.build b/src/meson.build +index 87e8962..bdfa797 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -387,6 +387,11 @@ hb_subset_sources = files( + 'hb-subset.hh', + ) + ++extra_hb_cpp_args = [] ++if cpp.get_argument_syntax() == 'msvc' ++ extra_hb_cpp_args += ['/bigobj'] ++endif ++ + hb_subset_headers = files( + 'hb-subset.h', + 'hb-subset-repacker.h' +@@ -559,8 +564,7 @@ defs_list = [harfbuzz_def] + + version = '0.@0@.0'.format(hb_version_int) + +-extra_hb_cpp_args = [] +-if cpp.get_define('_MSC_FULL_VER') != '' ++if cpp.get_argument_syntax() == 'msvc' + if get_option('default_library') != 'static' + extra_hb_cpp_args += '-DHB_DLL_EXPORT' + endif diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index fbdbc608717321..09d9777cf882e5 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF ${VERSION} SHA512 23d6abbd270885d7ae1ebb3c981f0c331a48d891e23caffe9e254f5e7e205bb0348add7b371526166a49b336f8076f92c11ef76ca81f48a6fd9f58812ec96d79 HEAD_REF master + PATCHES + fix-win32-build.patch ) if("icu" IN_LIST FEATURES) @@ -28,6 +30,11 @@ else() list(APPEND FEATURE_OPTIONS -Dglib=disabled) list(APPEND FEATURE_OPTIONS -Dgobject=disabled) endif() +if("cairo" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dcairo=enabled) # Enable Cairo graphics library support +else() + list(APPEND FEATURE_OPTIONS -Dcairo=disabled) +endif() list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers #if(VCPKG_TARGET_IS_WINDOWS) #link errors in qt5-base. probably requires changes to the pc files generated by meson @@ -51,7 +58,6 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -Dcairo=disabled # Use Cairo graphics library -Ddocs=disabled # Generate documentation with gtk-doc -Dtests=disabled -Dbenchmark=disabled @@ -94,6 +100,9 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/harfbuzzConfig.cmake.in" vcpkg_list(SET TOOL_NAMES) if("glib" IN_LIST FEATURES) vcpkg_list(APPEND TOOL_NAMES hb-subset hb-shape hb-ot-shape-closure hb-info) + if("cairo" IN_LIST FEATURES) + vcpkg_list(APPEND TOOL_NAMES hb-view) + endif() endif() if(TOOL_NAMES) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index ffd73c02a54e26..022969c466c700 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "harfbuzz", "version": "8.2.1", + "port-version": 3, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", @@ -20,6 +21,18 @@ } ], "features": { + "cairo": { + "description": "Enable Cairo graphics library support", + "dependencies": [ + { + "name": "cairo", + "default-features": false, + "features": [ + "freetype" + ] + } + ] + }, "coretext": { "description": "Enable CoreText shaper backend on macOS", "supports": "osx" diff --git a/ports/hdf5/hdf5_config.patch b/ports/hdf5/hdf5_config.patch index 65209dd48b3998..9055a080b24a22 100644 --- a/ports/hdf5/hdf5_config.patch +++ b/ports/hdf5/hdf5_config.patch @@ -2,29 +2,20 @@ diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake. index 1a3fb7bbf2..79081ce040 100644 --- a/config/cmake/hdf5-config.cmake.in +++ b/config/cmake/hdf5-config.cmake.in -@@ -56,7 +56,10 @@ set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@") - #----------------------------------------------------------------------------- - # Dependencies - #----------------------------------------------------------------------------- -+include(CMakeFindDependencyMacro) -+ - if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL) -+ find_dependency(MPI) - set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_DIRS@") - set (${HDF5_PACKAGE_NAME}_MPI_C_LIBRARIES "@MPI_C_LIBRARIES@") - if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN) -@@ -114,11 +117,11 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR @HDF5_VERSION_MINOR@) +@@ -120,12 +114,17 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR @HDF5_VERSION_MINOR@) + # Don't include targets if this file is being picked up by another # project which has already built hdf5 as a subproject #----------------------------------------------------------------------------- ++include(CMakeFindDependencyMacro) if (NOT TARGET "@HDF5_PACKAGE@") -- if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) -- include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) -+ if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT) + if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) + include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) ++ elseif (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT) + find_dependency(ZLIB) endif () -- if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) -- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) -+ if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT) + if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) + include (@PACKAGE_SHARE_INSTALL_DIR@/@LIBAEC_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) ++ elseif (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT) + find_dependency(szip) endif () include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake) diff --git a/ports/hdf5/pkgconfig-link-order.patch b/ports/hdf5/pkgconfig-link-order.patch deleted file mode 100644 index a3bcbb08005cf8..00000000000000 --- a/ports/hdf5/pkgconfig-link-order.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/config/libhdf5.pc.in b/config/libhdf5.pc.in -index 4a2ebaa..3cb42d2 100644 ---- a/config/libhdf5.pc.in -+++ b/config/libhdf5.pc.in -@@ -10,5 +10,5 @@ Version: @_PKG_CONFIG_VERSION@ - Cflags: -I${includedir} - Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@ - Requires: @_PKG_CONFIG_REQUIRES@ --Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@ -+Libs.private: @_PKG_CONFIG_LIBS@ @_PKG_CONFIG_LIBS_PRIVATE@ - Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@ diff --git a/ports/hdf5/pkgconfig-requires.patch b/ports/hdf5/pkgconfig-requires.patch index 4dd70d12129195..a1e8470e097951 100644 --- a/ports/hdf5/pkgconfig-requires.patch +++ b/ports/hdf5/pkgconfig-requires.patch @@ -2,22 +2,22 @@ diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index 141ab44..66b7efa 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake -@@ -74,6 +74,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT) - set (H5_ZLIB_HEADER "zlib.h") - set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR}) - set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR}) -+ set (zlib_PC_LIBS_PRIVATE "${ZLIB_LIBRARIES}") +@@ -95,6 +95,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT) + set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR}) + set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR}) + set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES}) ++ set (zlib_PC_LIBS_PRIVATE "${ZLIB_LIBRARIES}") + endif () else () - if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") - EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT}) -@@ -134,6 +135,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT) - else() - set(SZIP_STATIC_LIBRARY szip-static) - endif() -+ set(szip_PC_LIBS_PRIVATE "${SZIP_STATIC_LIBRARY}") - else () - if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") - EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING}) + if (BUILD_ZLIB_WITH_FETCHCONTENT) +@@ -148,6 +148,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT) + if (TARGET szip-shared) + set(SZIP_LIBRARIES szip-shared) + endif() ++ set(szip_PC_LIBS_PRIVATE "${SZIP_LIBRARIES}") + if (NOT SZIP_FOUND) + find_package (SZIP) # Legacy find + endif () diff --git a/CMakeLists.txt b/CMakeLists.txt index b75fdd2..a2e88fd 100644 --- a/CMakeLists.txt @@ -44,128 +44,16 @@ index 1af513b47..05d56ccce 100644 if (WIN32) set (CMAKE_DEBUG_POSTFIX "_D") else () -diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 835d422..9a7176f 100644 ---- a/c++/src/CMakeLists.txt -+++ b/c++/src/CMakeLists.txt -@@ -188,10 +188,10 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") - if (NOT ONLY_SHARED_LIBS) -- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}") -+ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - if (BUILD_SHARED_LIBS) -- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}") -+ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}") - -diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt -index e59a829..8da64dd 100644 ---- a/fortran/src/CMakeLists.txt -+++ b/fortran/src/CMakeLists.txt -@@ -549,13 +549,13 @@ - set (_PKG_CONFIG_LIBS_PRIVATE) - - if (NOT ONLY_SHARED_LIBS) -- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_F90_LIB_CORENAME}") -+ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - if (BUILD_SHARED_LIBS) -- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}") -+ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}") - - configure_file ( -diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt -index c516df1..89bd31f 100644 ---- a/hl/c++/src/CMakeLists.txt -+++ b/hl/c++/src/CMakeLists.txt -@@ -99,13 +99,13 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") - set (_PKG_CONFIG_LIBS_PRIVATE) - - if (NOT ONLY_SHARED_LIBS) -- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}") -+ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - if (BUILD_SHARED_LIBS) -- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}") -+ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}") - - configure_file ( -diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt -index 973299f..8eadfe5 100644 ---- a/hl/fortran/src/CMakeLists.txt -+++ b/hl/fortran/src/CMakeLists.txt -@@ -334,11 +334,11 @@ - if (NOT ONLY_SHARED_LIBS) -- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") -+ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - if (BUILD_SHARED_LIBS) -- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") -+ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}") - - configure_file ( -diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt -index 7678de8..2d398cc 100644 ---- a/hl/src/CMakeLists.txt -+++ b/hl/src/CMakeLists.txt -@@ -132,11 +132,11 @@ - if (NOT ONLY_SHARED_LIBS) -- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}") -+ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - if (BUILD_SHARED_LIBS) -- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}") -+ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - --set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") --set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME} = ${HDF5_PACKAGE_VERSION}") -+set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}") -+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}") - - configure_file ( diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b3c2226..ea80d60 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -1321,14 +1321,23 @@ foreach (libs ${LINK_LIBS} ${LINK_COMP_LIBS}) - endforeach () - - if (NOT ONLY_SHARED_LIBS) -- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}") -+ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") - endif () - if (BUILD_SHARED_LIBS) -- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}") -+ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") +@@ -1321,6 +1321,16 @@ foreach (libs ${LINK_LIBS} ${LINK_COMP_LIBS}) endif () set (_PKG_CONFIG_REQUIRES) - set (_PKG_CONFIG_REQUIRES_PRIVATE) -+set(_PKG_CONFIG_LIBS_PRIVATE " ${_PKG_CONFIG_LIBS_PRIVATE} ") ++set (_PKG_CONFIG_REQUIRES_PRIVATE) ++set (_PKG_CONFIG_LIBS_PRIVATE " ${_PKG_CONFIG_LIBS_PRIVATE} ") +foreach(_module IN ITEMS ompi-c szip zlib) + if(${_module}_PC_LIBS_PRIVATE) + foreach(_lib IN LISTS ${_module}_PC_LIBS_PRIVATE) diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index f549b3cd9d7d5f..77d4c6aa150806 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -1,21 +1,21 @@ # highfive should be updated together with hdf5 +string(REPLACE "." "_" hdf5_ref "hdf5-${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HDFGroup/hdf5 - REF hdf5-1_14_0 - SHA512 b4f694739a12220291d0704beb1cd29c05428af40b8dd89cef0ebf52ee4aecad7350b798a0deca2d30a4f32e7aaa49a9169464760a11339fa40da6a3dd0af49e + REF "${hdf5_ref}" + SHA512 9b44993bcdc1493a22da61c77a1bd962c0088ff8e7fb75c00568617386cfc296a73bbdae79c05847109bf1984e95660bbe459f8a96950f6cf71002800eed23f8 HEAD_REF develop PATCHES hdf5_config.patch szip.patch pkgconfig-requires.patch - pkgconfig-link-order.patch ) set(ALLOW_UNSUPPORTED OFF) if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES) - message(WARNING "Feature 'Parallel' and 'cpp' are mutually exclusive, enable feature ALLOW_UNSUPPORTED automatically to enable them both.") + message(WARNING "Feature 'Parallel' and 'cpp' are mutually exclusive, enabling option ALLOW_UNSUPPORTED automatically to enable them both.") set(ALLOW_UNSUPPORTED ON) endif() @@ -47,8 +47,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS map HDF5_ENABLE_MAP_API ) -file(REMOVE "${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake")#Outdated; does not find debug szip - if("tools" IN_LIST FEATURES AND VCPKG_CRT_LINKAGE STREQUAL "static") list(APPEND FEATURE_OPTIONS -DBUILD_STATIC_EXECS=ON) endif() @@ -70,8 +68,8 @@ vcpkg_cmake_configure( -DHDF5_INSTALL_CMAKE_DIR=share/hdf5 -DHDF_PACKAGE_NAMESPACE:STRING=hdf5:: -DHDF5_MSVC_NAMING_CONVENTION=OFF - -DSZIP_USE_EXTERNAL=ON -DALLOW_UNSUPPORTED=${ALLOW_UNSUPPORTED} + -DCMAKE_DISABLE_FIND_PACKAGE_libaec=ON OPTIONS_RELEASE -DCMAKE_DEBUG_POSTFIX= # For lib name in pkgconfig files ) @@ -165,8 +163,8 @@ if("parallel" IN_LIST FEATURES) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") endif() -file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/H5public.h" "#define H5public_H" "#define H5public_H\n#ifndef H5_BUILT_AS_DYNAMIC_LIB\n#define H5_BUILT_AS_DYNAMIC_LIB\n#endif\n") endif() + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/hdf5/szip.patch b/ports/hdf5/szip.patch index 98702bbdcfbadc..2646ede7ed4425 100644 --- a/ports/hdf5/szip.patch +++ b/ports/hdf5/szip.patch @@ -2,20 +2,17 @@ diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index d5f801e..141ab44 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake -@@ -124,6 +124,16 @@ if (HDF5_ENABLE_SZIP_SUPPORT) - set (H5_HAVE_LIBSZ 1) - set (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR}) - set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIRS} ${SZIP_INCLUDE_DIR}) -+ elseif(1) -+ find_package(szip CONFIG REQUIRED) -+ set(SZIP_INCLUDE_DIRS "") -+ # SZIP_STATIC_LIBRARY will be used in linking, in cmake and in pkgconfig, -+ # but the actual linkage doesn't matter. -+ if (TARGET szip-shared) -+ set(SZIP_STATIC_LIBRARY szip-shared) -+ else() -+ set(SZIP_STATIC_LIBRARY szip-static) -+ endif() - else () - if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") - EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING}) +@@ -142,7 +142,12 @@ if (HDF5_ENABLE_SZIP_SUPPORT) + set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES}) + endif () + if (NOT SZIP_FOUND) +- find_package (SZIP NAMES ${LIBAEC_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) ++ find_package(SZIP NAMES szip REQUIRED) ++ set(SZIP_INCLUDE_DIR "") ++ set(SZIP_LIBRARIES szip-static) ++ if (TARGET szip-shared) ++ set(SZIP_LIBRARIES szip-shared) ++ endif() + if (NOT SZIP_FOUND) + find_package (SZIP) # Legacy find + endif () diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 25cf4b8f0b857a..25e584f1bd3c13 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hdf5", - "version": "1.14.0", - "port-version": 1, + "version": "1.14.2", "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "license": "BSD-3-Clause", diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index f43cec6b25201d..898ef233a9a792 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -1,4 +1,3 @@ - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BlueBrain/HighFive @@ -18,20 +17,23 @@ vcpkg_check_features( eigen3 HIGHFIVE_USE_EIGEN ) +if(HDF5_WITH_PARALLEL) + message(STATUS "${HDF5_WITH_PARALLEL} Enabling HIGHFIVE_PARALLEL_HDF5.") + list(APPEND FEATURE_OPTIONS "-DHIGHFIVE_PARALLEL_HDF5=ON") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DHIGHFIVE_EXAMPLES=OFF -DHIGHFIVE_BUILD_DOCS=OFF + -DCMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE=PRE_TEST + MAYBE_UNUSED_VARIABLES + CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE ) -set(add_bin "") -if("tests" IN_LIST FEATURES) - set(add_bin ADD_BIN_TO_PATH) # Seems to run tests as part of the build? -endif() - -vcpkg_cmake_install(${add_bin}) +vcpkg_cmake_install() if("tests" IN_LIST FEATURES) vcpkg_copy_tools( @@ -43,10 +45,13 @@ if("tests" IN_LIST FEATURES) ) endif() -# Use PACKAGE_NAME to avoid folder HighFive and highfive are exist at same time -vcpkg_cmake_config_fixup(PACKAGE_NAME HighFive CONFIG_PATH share/HighFive/CMake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/HighFive/CMake) +if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/HighFive/HighFiveConfig.cmake") + # left over with mixed case + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/HighFive") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/highfive/usage b/ports/highfive/usage new file mode 100644 index 00000000000000..336af87bcce28c --- /dev/null +++ b/ports/highfive/usage @@ -0,0 +1,4 @@ +highfive provides CMake targets: + + find_package(HighFive CONFIG REQUIRED) + target_link_libraries(main PRIVATE HighFive) diff --git a/ports/highfive/vcpkg.json b/ports/highfive/vcpkg.json index d88bb0f980cb70..614555560360cf 100644 --- a/ports/highfive/vcpkg.json +++ b/ports/highfive/vcpkg.json @@ -1,11 +1,15 @@ { "name": "highfive", "version": "2.7.1", + "port-version": 1, "description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5", "homepage": "https://github.com/BlueBrain/HighFive", "license": "BSL-1.0", "dependencies": [ - "hdf5", + { + "name": "hdf5", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/highs/fix-cmake-output.patch b/ports/highs/fix-cmake-output.patch index 9561f0cb442d28..614bbe67a6276a 100644 --- a/ports/highs/fix-cmake-output.patch +++ b/ports/highs/fix-cmake-output.patch @@ -10,15 +10,11 @@ index 605a1e2..148c006 100644 return 0; }" HIGHS_HAVE_BITSCAN_REVERSE) -@@ -568,9 +569,9 @@ else(FAST_BUILD) - endif() - +@@ -570,7 +572,6 @@ else(FAST_BUILD) # Add tests in examples/tests -- add_subdirectory(examples) -+ #add_subdirectory(examples) + add_subdirectory(examples) - add_subdirectory(app) -+ #add_subdirectory(app) if(EXP) add_executable(doctest) diff --git a/ports/highs/fix-compiler.patch b/ports/highs/fix-compiler.patch new file mode 100644 index 00000000000000..e186e405a87a84 --- /dev/null +++ b/ports/highs/fix-compiler.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 605a1e275..47233aa10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,7 @@ + cmake_minimum_required(VERSION 3.15) + + # set preference for clang compiler and intel compiler over gcc and other compilers ++if(0) + include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL) + include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL) + set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES}) +@@ -12,6 +13,7 @@ set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES}) + include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL) + include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL) + set(CMAKE_CXX_COMPILER_NAMES clang++ icpc c++ ${CMAKE_CXX_COMPILER_NAMES}) ++endif() + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + diff --git a/ports/highs/portfile.cmake b/ports/highs/portfile.cmake index 4e96d0a52786ce..3e20aa9394fdce 100644 --- a/ports/highs/portfile.cmake +++ b/ports/highs/portfile.cmake @@ -2,18 +2,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ERGO-Code/HiGHS REF "v${VERSION}" - SHA512 9229d2e960354b8b8fd45588cd4eec7e54826ee6f3939ac691d7b2b6eb0580a66a3a2649c940a3869f58dbbcf08fdd9641919fc92666948c62e70c4bce8ac130 + SHA512 9229d2e960354b8b8fd45588cd4eec7e54826ee6f3939ac691d7b2b6eb0580a66a3a2649c940a3869f58dbbcf08fdd9641919fc92666948c62e70c4bce8ac130 HEAD_REF master PATCHES fix-hconfig-path.patch fix-cmake-output.patch fix-threads.patch + fix-compiler.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFAST_BUILD=ON + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON ) vcpkg_cmake_install() @@ -22,4 +26,3 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/highs") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/highs/usage b/ports/highs/usage deleted file mode 100644 index 7d0fbe7170cab1..00000000000000 --- a/ports/highs/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package highs is compatible with built-in CMake targets: - - find_package(highs REQUIRED) - target_link_libraries(main PRIVATE highs::highs) diff --git a/ports/highs/vcpkg.json b/ports/highs/vcpkg.json index bbf340a4dba13c..dc140d715eaf9d 100644 --- a/ports/highs/vcpkg.json +++ b/ports/highs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "highs", "version": "1.6.0", + "port-version": 1, "description": "High performance library to solve linear, mixed-integer, and convex quadratic optimization problems.", "homepage": "https://highs.dev", "license": "MIT", diff --git a/ports/hypre/portfile.cmake b/ports/hypre/portfile.cmake index 720a3e97fcad0b..145f8ecc66e422 100644 --- a/ports/hypre/portfile.cmake +++ b/ports/hypre/portfile.cmake @@ -14,6 +14,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" HYPRE_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/src" + DISABLE_PARALLEL_CONFIGURE # See 'Autogenerate csr_spgemm_device_numer$ files' OPTIONS -DHYPRE_SHARED=${HYPRE_SHARED} -DHYPRE_ENABLE_HYPRE_BLAS=OFF diff --git a/ports/hypre/vcpkg.json b/ports/hypre/vcpkg.json index 42548e93a07f44..396c5c364f9852 100644 --- a/ports/hypre/vcpkg.json +++ b/ports/hypre/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hypre", "version": "2.29.0", + "port-version": 1, "description": "Parallel solvers for sparse linear systems featuring multigrid methods", "homepage": "https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods", "dependencies": [ diff --git a/ports/idyntree/portfile.cmake b/ports/idyntree/portfile.cmake index 44b6a16f0c88e8..412b44a5a200ec 100644 --- a/ports/idyntree/portfile.cmake +++ b/ports/idyntree/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO robotology/idyntree REF "v${VERSION}" - SHA512 4f3b0f14c4b280c3cf1f2d232e40b4ebebbccf241d31e6fdda94a7e2be8b245373c13ef9c99aa6424a37e56e927ef62d38961d02a1b11585a905d4bef47e3045 + SHA512 1861ed193789559354bcfa81183b2bcc985dde2d71c114d369e01c37268e64624f50a1c416f48392dc5b9230e0bfc576bd5714f4d4368994df4dffc4623d989a HEAD_REF master ) @@ -51,5 +51,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" ) -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.LGPL2" "${SOURCE_PATH}/LICENSE.LGPL3") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/idyntree/vcpkg.json b/ports/idyntree/vcpkg.json index 63cef5be4f22a4..14f0d389a6c60f 100644 --- a/ports/idyntree/vcpkg.json +++ b/ports/idyntree/vcpkg.json @@ -1,10 +1,9 @@ { "name": "idyntree", - "version": "9.0.0", - "port-version": 1, + "version": "10.0.0", "description": "Multibody Dynamics Library designed for Free Floating Robots.", "homepage": "https://github.com/robotology/idyntree", - "license": "LGPL-2.1-or-later", + "license": "BSD-3-Clause", "supports": "!xbox", "dependencies": [ "eigen3", diff --git a/ports/imgui-node-editor/portfile.cmake b/ports/imgui-node-editor/portfile.cmake index 031750bc8e214a..22666dbb9a70c2 100644 --- a/ports/imgui-node-editor/portfile.cmake +++ b/ports/imgui-node-editor/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thedmd/imgui-node-editor REF v${VERSION} - SHA512 7dbc34a7af1554a7e683e0b55d18fc08cf5832bf5d6a57a30820e7ef98a6fbb5a65a7287f6250d3b6f47b89ac0499f51fbe19d9c11850e26f74e3b0e806abb1b + SHA512 83573b6ed776095837373bc95be1c1f5b85e9c5fae2145647f9cb6fdc17d3889edce716ac9e27c1bbde56f00803a66db98ca856910e6e0ce8714d3c5ce3f7c3f HEAD_REF master ) diff --git a/ports/imgui-node-editor/vcpkg.json b/ports/imgui-node-editor/vcpkg.json index b03295a303b02b..9cbd3a3915e131 100644 --- a/ports/imgui-node-editor/vcpkg.json +++ b/ports/imgui-node-editor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui-node-editor", - "version": "0.9.2", + "version": "0.9.3", "description": "Node Editor built using Dear ImGui", "homepage": "https://github.com/thedmd/imgui-node-editor", "license": "MIT", diff --git a/ports/immer/fix-ExportConfigVersion.patch b/ports/immer/fix-ExportConfigVersion.patch deleted file mode 100644 index 39869fa95aaf89..00000000000000 --- a/ports/immer/fix-ExportConfigVersion.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a8cfbd3..84c89a0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -96,6 +96,14 @@ target_include_directories(immer INTERFACE - $ - $) - install(TARGETS immer EXPORT ImmerConfig) -+ -+include(CMakePackageConfigHelpers) -+write_basic_package_version_file( -+ "${CMAKE_CURRENT_BINARY_DIR}/ImmerConfigVersion.cmake" -+ VERSION ${PROJECT_VERSION} -+ COMPATIBILITY SameMajorVersion ) -+ -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ImmerConfigVersion.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Immer" ) - install(EXPORT ImmerConfig DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Immer") - install(DIRECTORY immer DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake index 50abde6309ecfd..93da11ed25462b 100644 --- a/ports/immer/portfile.cmake +++ b/ports/immer/portfile.cmake @@ -4,10 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arximboldi/immer REF "v${VERSION}" - SHA512 fc34242d36efdb9faa1f22ccc7591c1ace34c2b383e1266a290346baedc154e3d4a682d6dd5094460b75e123347194710072e996d19165cc5fd23c922fdfc4e8 + SHA512 3a9aafeb5daad1881d00fb999b78f86b1c8f0e8ef2d6befe9025d8eea10392557ce7186f14878b36cbce0f2f5d38c8ffb39c9115a9496803acfc0ef2289f5cbf HEAD_REF master - PATCHES - fix-ExportConfigVersion.patch # Upstream PR https://github.com/arximboldi/immer/pull/250 has been merged, this patch need to be removed in next update. ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/immer/vcpkg.json b/ports/immer/vcpkg.json index 742a5e188b0fc3..54edb533c57809 100644 --- a/ports/immer/vcpkg.json +++ b/ports/immer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "immer", - "version": "0.8.0", - "port-version": 1, + "version": "0.8.1", "description": "Postmodern immutable and persistent data structures for C++", "homepage": "https://sinusoid.es/immer/", "license": "BSL-1.0", diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake index ae77841c966c9a..458f19ac958fe6 100644 --- a/ports/ismrmrd/portfile.cmake +++ b/ports/ismrmrd/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ismrmrd/ismrmrd - REF v1.13.2 - SHA512 8bfdceedefa7dae6cc047e9498f30d3e763f5ab8aa3726f0dc0b2ac086c00a0fddee9c6feadcf4b41c55c692230e8db596cdfc8d79af29c704b79bbad270187b + REF "v${VERSION}" + SHA512 cbd34cfbcc16e898f44c00888bc605d01e6a915b6c02454630a61c92b6179d727affb1ffeebc7d14da5aac189f929f5d36a6fd7ab68a73cb963ee4a233fba056 HEAD_REF master PATCHES ${WIN32_INCLUDE_STDDEF_PATCH} diff --git a/ports/ismrmrd/vcpkg.json b/ports/ismrmrd/vcpkg.json index f560844d7195b3..3b9062913e68b6 100644 --- a/ports/ismrmrd/vcpkg.json +++ b/ports/ismrmrd/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ismrmrd", - "version": "1.13.2", - "port-version": 1, + "version": "1.13.7", "description": "ISMRM Raw Data Format", "homepage": "https://github.com/ismrmrd/ismrmrd", "license": "BSD-3-Clause", diff --git a/ports/itk/cxx17.patch b/ports/itk/cxx17.patch new file mode 100644 index 00000000000000..65df5d6f8d6b4a --- /dev/null +++ b/ports/itk/cxx17.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/ITKInitializeCXXStandard.cmake b/CMake/ITKInitializeCXXStandard.cmake +index 5345230b..a9ca48c3 100644 +--- a/CMake/ITKInitializeCXXStandard.cmake ++++ b/CMake/ITKInitializeCXXStandard.cmake +@@ -1,6 +1,6 @@ + ## Set the default target properties for ITK + if(NOT CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 14) # Supported values are 14, 17, 20, and 23. ++ set(CMAKE_CXX_STANDARD 17) # Supported values are 14, 17, 20, and 23. + endif() + if(NOT CMAKE_CXX_STANDARD_REQUIRED) + set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 72d23133170d62..3604a1db86431c 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO InsightSoftwareConsortium/ITK - REF 95800fd4d4b08678a6c0ebb63eb242893025b660 #5.2.1 - SHA512 fe703bc6ed681cb9983d7d6e21c8ffa7650337e470c09a7241de58a463c23e315516b1a81a18c14f682706056a0ec66932b63d2e24945bdcea03169bc1122bb2 + REF "v${VERSION}" + SHA512 48e38864d7cd20b4ff23cfca1a29b4cbf453ce842e037ca473ce5c7e9a5b1c0bf6b12e4c544c812bff2b4bb9feca409587175b6570929c9ac172cb4402d679da HEAD_REF master PATCHES double-conversion.patch @@ -15,6 +15,7 @@ vcpkg_from_github( opencl.patch use-the-lrintf-intrinsic.patch dont-build-gtest.patch + cxx17.patch # See https://github.com/InsightSoftwareConsortium/ITK/issues/4213#issuecomment-1722547712 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index e81f2229e03cb0..24ace7568eb606 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "itk", - "version": "5.2.1", - "port-version": 5, + "version-string": "5.3rc02", "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "license": "Apache-2.0", diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake index 84c1a54616361c..aaed28616a3e45 100644 --- a/ports/jsoncpp/portfile.cmake +++ b/ports/jsoncpp/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_cmake_configure( -DJSONCPP_WITH_CMAKE_PACKAGE=ON -DBUILD_STATIC_LIBS=${JSONCPP_STATIC} -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT} - -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF + -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_EXAMPLE=OFF @@ -30,3 +30,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/jsoncpp/vcpkg.json b/ports/jsoncpp/vcpkg.json index f9daea0f09a9a7..b7e65e6f7760a6 100644 --- a/ports/jsoncpp/vcpkg.json +++ b/ports/jsoncpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "jsoncpp", "version": "1.9.5", + "port-version": 1, "description": "jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.", "homepage": "https://github.com/open-source-parsers/jsoncpp", "dependencies": [ diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index cd1f9563ea302c..1556a53bc03da2 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 6cc28660c8dd9a5e299d8ebcc2c26d1859925b00e58db96351a17a12934df78b1e1a2d3b26fccdee0e2bbb46a13e26dbae7149a80611b02bc69aad6874c11df2 + SHA512 1e51b64a802437674d87a6a61396b2e3878fece954be8560b6ef8fc58a6180c82c3e0f7d922c77c881dd3029f83866842fa146501f961faff3aa3072dadd5e1b HEAD_REF main ) diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index 130ad4cb40a649..6038fd9b901e13 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,10 +1,10 @@ { "name": "jsonifier", - "version": "0.9.8", + "version": "0.9.9", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", - "supports": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (osx & x64)", + "supports": "(windows & x64 & !xbox) | (linux & x64) | (osx & x64)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/kealib/hdf5_include.patch b/ports/kealib/hdf5_include.patch index 19598c56ba5789..9c8d0547a2bdcd 100644 --- a/ports/kealib/hdf5_include.patch +++ b/ports/kealib/hdf5_include.patch @@ -1,5 +1,5 @@ diff --git a/include/libkea/KEAAttributeTable.h b/include/libkea/KEAAttributeTable.h -index 95a5d7f..fbfebc1 100644 +index 3991ffb..ddc314f 100644 --- a/include/libkea/KEAAttributeTable.h +++ b/include/libkea/KEAAttributeTable.h @@ -37,7 +37,7 @@ @@ -12,7 +12,7 @@ index 95a5d7f..fbfebc1 100644 #include "libkea/KEACommon.h" #include "libkea/KEAException.h" diff --git a/include/libkea/KEAAttributeTableFile.h b/include/libkea/KEAAttributeTableFile.h -index 9987a7c..39dbb21 100644 +index 902f485..245e068 100644 --- a/include/libkea/KEAAttributeTableFile.h +++ b/include/libkea/KEAAttributeTableFile.h @@ -35,7 +35,7 @@ @@ -25,7 +25,7 @@ index 9987a7c..39dbb21 100644 #include "libkea/KEACommon.h" #include "libkea/KEAException.h" diff --git a/include/libkea/KEAAttributeTableInMem.h b/include/libkea/KEAAttributeTableInMem.h -index b4f7fad..6a8a8b7 100644 +index 7df369a..28018cc 100644 --- a/include/libkea/KEAAttributeTableInMem.h +++ b/include/libkea/KEAAttributeTableInMem.h @@ -35,7 +35,7 @@ @@ -38,7 +38,7 @@ index b4f7fad..6a8a8b7 100644 #include "libkea/KEACommon.h" #include "libkea/KEAException.h" diff --git a/include/libkea/KEACommon.h b/include/libkea/KEACommon.h -index 3175c93..67b02a2 100644 +index cb8a577..a6fbfca 100644 --- a/include/libkea/KEACommon.h +++ b/include/libkea/KEACommon.h @@ -38,7 +38,7 @@ @@ -48,10 +48,10 @@ index 3175c93..67b02a2 100644 -#include "H5Cpp.h" +#include - // MSVC 2008 uses different names.... - #ifdef _MSC_VER + #include + diff --git a/include/libkea/KEAImageIO.h b/include/libkea/KEAImageIO.h -index d510cae..4c2aa97 100644 +index 87a2d07..c59a7f0 100644 --- a/include/libkea/KEAImageIO.h +++ b/include/libkea/KEAImageIO.h @@ -35,7 +35,7 @@ diff --git a/ports/kealib/portfile.cmake b/ports/kealib/portfile.cmake index 2716310e137d5b..c6cebcae9036ba 100644 --- a/ports/kealib/portfile.cmake +++ b/ports/kealib/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ubarsc/kealib - REF 4984102cf5867105a28ae754689566217309d120 #1.4.14 - SHA512 06628996757bc9cffc5af0f03468ec32246980b6f72f7f1c88a489a8a2aed70924115df0726fcbb9851e44030c6a44ee0f3137660de43af421dec1eab81cc147 + REF "kealib-${VERSION}" + SHA512 82399f1332ff2aeb6342732e9e5c897c813109fd18e77cfc8d866f06adf4faa7f080f1f3c0a3b777fb3a679912dacf4851b7ad09a338d6087dd1d26eb2d1689f HEAD_REF master PATCHES hdf5_include.patch ) @@ -21,6 +21,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kealib/vcpkg.json b/ports/kealib/vcpkg.json index 7733a9cb4c3a43..49dd980eb2fad6 100644 --- a/ports/kealib/vcpkg.json +++ b/ports/kealib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kealib", - "version": "1.4.14", - "port-version": 1, + "version": "1.5.2", "description": "KEALib provides an implementation of the GDAL data model using HDF5.", "homepage": "https://github.com/ubarsc/kealib", "dependencies": [ @@ -14,6 +13,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/keccak-tiny/CMakeLists.txt b/ports/keccak-tiny/CMakeLists.txt new file mode 100644 index 00000000000000..b6f9377637ca00 --- /dev/null +++ b/ports/keccak-tiny/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 3.19) +project(keccak-tiny VERSION 2014.09.08 LANGUAGES C) + +set(Header_Files "${PROJECT_NAME}.h") +set(Source_Files "${PROJECT_NAME}-unrolled.c") + +add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}") + +include(GNUInstallDirs) +target_include_directories( + "${PROJECT_NAME}" + PUBLIC + "$" + "$" +) +target_compile_features("${PROJECT_NAME}" PRIVATE c_std_90) +set_target_properties("${PROJECT_NAME}" PROPERTIES C_VISIBILITY_PRESET hidden + PUBLIC_HEADER "${Header_Files}") + +install( + TARGETS "${PROJECT_NAME}" + EXPORT "unofficial-${PROJECT_NAME}Config" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +include(CMakePackageConfigHelpers) +set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake") +write_basic_package_version_file( + "${VERSION_FILE_PATH}" + VERSION "${PROJECT_VERSION}" + COMPATIBILITY SameMajorVersion +) +install(FILES "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}") + +install(FILES ${Header_Files} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +install( + EXPORT "unofficial-${PROJECT_NAME}Config" + FILE "unofficial-${PROJECT_NAME}Config.cmake" + NAMESPACE "unofficial::${PROJECT_NAME}::" + DESTINATION "share/unofficial-${PROJECT_NAME}") + +export(PACKAGE "${PROJECT_NAME}") diff --git a/ports/keccak-tiny/portfile.cmake b/ports/keccak-tiny/portfile.cmake new file mode 100644 index 00000000000000..395b4b269a1edd --- /dev/null +++ b/ports/keccak-tiny/portfile.cmake @@ -0,0 +1,28 @@ +if(WIN32) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coruus/${PORT} + REF 64b6647514212b76ae7bca0dea9b7b197d1d8186 + SHA512 5cf14061efc1b3c934dfb28a08e2a478036109c449aed41d4deb975a9f0748db06f83c1de9e5d991009d04f0220a397f5f66232a4db04bbc0dea0c624522752c + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "CC0-1.0") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/keccak-tiny/usage b/ports/keccak-tiny/usage new file mode 100644 index 00000000000000..f6c1fe0d59fd1d --- /dev/null +++ b/ports/keccak-tiny/usage @@ -0,0 +1,3 @@ +keccak-tiny provides CMake targets: + find_package(unofficial-keccak-tiny CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::keccak-tiny::keccak-tiny) diff --git a/ports/keccak-tiny/vcpkg.json b/ports/keccak-tiny/vcpkg.json new file mode 100644 index 00000000000000..8223f5034a6832 --- /dev/null +++ b/ports/keccak-tiny/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "keccak-tiny", + "version-date": "2014-09-08", + "description": "A tiny implementation of SHA-3, SHAKE, Keccak, and sha3sum", + "homepage": "https://github.com/coruus/keccak-tiny", + "license": "CC0-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/keystone/portfile.cmake b/ports/keystone/portfile.cmake index a05cf1317f2851..3b652722dc6333 100644 --- a/ports/keystone/portfile.cmake +++ b/ports/keystone/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_find_acquire_program(PYTHON2) +vcpkg_find_acquire_program(PYTHON3) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" KEYSTONE_BUILD_STATIC_RUNTIME) @@ -14,7 +14,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DKEYSTONE_BUILD_STATIC_RUNTIME=${KEYSTONE_BUILD_STATIC_RUNTIME} - -DPYTHON_EXECUTABLE=${PYTHON2} + -DPYTHON_EXECUTABLE=${PYTHON3} # Add support for only a subset of architectures #-DLLVM_TARGETS_TO_BUILD="AArch64;X86" diff --git a/ports/keystone/vcpkg.json b/ports/keystone/vcpkg.json index f8fcdb38244fab..1c0f82da50b4d4 100644 --- a/ports/keystone/vcpkg.json +++ b/ports/keystone/vcpkg.json @@ -1,7 +1,7 @@ { "name": "keystone", "version-semver": "0.9.2", - "port-version": 2, + "port-version": 3, "description": "A Lightweight multi-platform, multi-architecture assembler framework.", "homepage": "https://github.com/keystone-engine/keystone", "supports": "!uwp", diff --git a/ports/ktx/0001-Use-vcpkg-zstd.patch b/ports/ktx/0001-Use-vcpkg-zstd.patch index a44c02b70993f8..f74fe7e245b192 100644 --- a/ports/ktx/0001-Use-vcpkg-zstd.patch +++ b/ports/ktx/0001-Use-vcpkg-zstd.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index bc679fd1..c726fa71 100644 +index 0653da5..1265f3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -185,7 +185,6 @@ set(KTX_MAIN_SRC +@@ -265,7 +265,6 @@ set(KTX_MAIN_SRC lib/basisu/transcoder/basisu_transcoder.cpp lib/basisu/transcoder/basisu_transcoder.h lib/basisu/transcoder/basisu.h @@ -10,7 +10,7 @@ index bc679fd1..c726fa71 100644 lib/checkheader.c lib/dfdutils/createdfd.c lib/dfdutils/colourspaces.c -@@ -304,7 +303,6 @@ macro(commom_lib_settings lib write) +@@ -448,7 +447,6 @@ macro(common_libktx_settings target enable_write library_type) $ $ @@ -18,19 +18,20 @@ index bc679fd1..c726fa71 100644 $ $ -@@ -390,6 +388,10 @@ macro(commom_lib_settings lib write) - target_compile_definitions(${lib} PUBLIC KTX_FEATURE_KTX2) +@@ -538,6 +536,11 @@ macro(common_libktx_settings target enable_write library_type) + target_compile_definitions(${target} PUBLIC KTX_FEATURE_KTX2) endif() + # Use vcpkg zstd + find_package(zstd CONFIG REQUIRED) -+ target_link_libraries(${lib} PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") ++ target_link_libraries(${target} PRIVATE ${ZSTD_LIBRARIES}) + if(WIN32) - # By wrapping in generator expression we force multi configuration - # generators (like Visual Studio) to take the exact path and not + if(MINGW) + # Check if the Threads package is provided; if using Mingw it MIGHT be diff --git a/cmake/KtxConfig.cmake b/cmake/KtxConfig.cmake -index 6386ba2f..537bf4f2 100644 +index 6386ba2..537bf4f 100644 --- a/cmake/KtxConfig.cmake +++ b/cmake/KtxConfig.cmake @@ -1,7 +1,8 @@ @@ -45,7 +46,7 @@ index 6386ba2f..537bf4f2 100644 include("${CMAKE_CURRENT_LIST_DIR}/KtxTargets.cmake") diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt -index 492233ae..8786d16c 100644 +index 492233a..2663169 100644 --- a/lib/basisu/CMakeLists.txt +++ b/lib/basisu/CMakeLists.txt @@ -146,7 +146,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} @@ -53,7 +54,7 @@ index 492233ae..8786d16c 100644 if (ZSTD) - set(BASISU_SRC_LIST ${BASISU_SRC_LIST} zstd/zstd.c) -+ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") endif() if (APPLE) @@ -69,7 +70,7 @@ index 492233ae..8786d16c 100644 # For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us. if (OPENCL_FOUND) diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt -index 588d91b4..0b380129 100644 +index 588d91b..edd7457 100644 --- a/lib/basisu/webgl/encoder/CMakeLists.txt +++ b/lib/basisu/webgl/encoder/CMakeLists.txt @@ -34,9 +34,7 @@ if (EMSCRIPTEN) @@ -79,7 +80,7 @@ index 588d91b4..0b380129 100644 - set(SRC_LIST ${SRC_LIST} - ../../zstd/zstd.c - ) -+ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) @@ -95,7 +96,7 @@ index 588d91b4..0b380129 100644 OUTPUT_NAME "basis_encoder" SUFFIX ".js" diff --git a/lib/basisu/webgl/transcoder/CMakeLists.txt b/lib/basisu/webgl/transcoder/CMakeLists.txt -index 372653de..f75e3a35 100644 +index 372653d..3c9ed0c 100644 --- a/lib/basisu/webgl/transcoder/CMakeLists.txt +++ b/lib/basisu/webgl/transcoder/CMakeLists.txt @@ -28,9 +28,7 @@ if (EMSCRIPTEN) @@ -105,7 +106,7 @@ index 372653de..f75e3a35 100644 - set(SRC_LIST ${SRC_LIST} - ../../zstd/zstddeclib.c - ) -+ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) diff --git a/ports/ktx/0004-quirks.patch b/ports/ktx/0004-quirks.patch index 14783cb665dfc6..f0692f5c72879a 100644 --- a/ports/ktx/0004-quirks.patch +++ b/ports/ktx/0004-quirks.patch @@ -1,17 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 068c6bb..84fa624 100644 +index 9775c89..a4dfc2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -215,7 +215,7 @@ if(MSVC) - # With /W4 VS2015 (V19.0) issues many warnings that VS2017 & 2019 don't - # so only increase warning level for recent versions. - add_compile_options($<$:/W4>) +@@ -235,7 +235,7 @@ include(cmake/mkvk.cmake) + # Global compile & link options including optimization flags + if(MSVC) + add_compile_options( /W4;/WX ) - add_compile_options( $,/Gz,/O2> ) + add_compile_options( $,,/O2> ) elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - add_compile_options(-Wall -Wextra) -@@ -801,6 +801,7 @@ if(EMSCRIPTEN) + add_compile_options(-Wall -Wextra -Werror) +@@ -851,6 +851,7 @@ if(EMSCRIPTEN) endif() add_library( objUtil STATIC diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake index c6c0e25ea1cbdb..854fb4cfd2a935 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/KTX-Software REF "v${VERSION}" - SHA512 bb8f728009ba7e15eecd2d9eb7985883a6a85f4ea8fccfa7f25a5567240980d1eb8bcde67d90e56e5c93de910d1bc93704bc5cbd390a8cb660051a698d7fd573 + SHA512 9ef0100a402321b00faa822eb2a50fd0d1e17fa703edacdbacf9231484d911cc254aed1fa517988537dc5b7059921a793edaeb92e8b2965d25672cd9a2589a0f HEAD_REF master PATCHES 0001-Use-vcpkg-zstd.patch @@ -31,7 +31,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools KTX_FEATURE_TOOLS - vulkan KTX_FEATURE_VULKAN + vulkan KTX_FEATURE_VK_UPLOAD ) vcpkg_cmake_configure( @@ -49,11 +49,11 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_copy_pdbs() if(tools IN_LIST FEATURES) vcpkg_copy_tools( TOOL_NAMES + ktx toktx ktxsc ktxinfo @@ -61,12 +61,18 @@ if(tools IN_LIST FEATURES) ktx2check AUTO_CLEAN ) +else() + vcpkg_copy_pdbs() endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ktx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index b2005357fe6141..36bfc6b05cc575 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ktx", - "version-semver": "4.1.0", + "version-semver": "4.3.0-alpha3", "description": [ "The Khronos KTX library and tools.", "Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them." diff --git a/ports/lexbor/portfile.cmake b/ports/lexbor/portfile.cmake index 14127bc6c794dd..7f6bc8c21db0a1 100644 --- a/ports/lexbor/portfile.cmake +++ b/ports/lexbor/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lexbor/lexbor REF v${VERSION} - SHA512 26bbca3b41a417cbc59ba8cf736e1611966fc2202de85aabf621b840565d835e7e5ffc1b0294defc16ec883f9fb94e802bd19ed704be35fa79b41566acc05cbc + SHA512 add1832f2e1927538206329703cd717fb30cb6ae2f52e1a0042961062cbcafd2e3ce4437ee2081ad7b2d51c6b63b910be06987e47c4a7007321db52b2812e515 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/lexbor/vcpkg.json b/ports/lexbor/vcpkg.json index f8d522edea611a..680ebf77ddbb11 100644 --- a/ports/lexbor/vcpkg.json +++ b/ports/lexbor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lexbor", - "version": "2.2.0", + "version": "2.3.0", "description": "Lexbor is development of an open source HTML Renderer library.", "homepage": "https://github.com/lexbor/lexbor", "supports": "!uwp", diff --git a/ports/libassuan/cross-tools.patch b/ports/libassuan/cross-tools.patch index b999ef1fa0f9c8..c805f62361faeb 100644 --- a/ports/libassuan/cross-tools.patch +++ b/ports/libassuan/cross-tools.patch @@ -20,8 +20,8 @@ index 6b9a46d..5156865 100644 $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c --assuan.h: assuan.h.in mkheader $(parts_of_assuan_h) -- ./mkheader $(host_os) $(srcdir)/assuan.h.in \ -+assuan.h: assuan.h.in $(HOST_TOOLS_PREFIX)/mkheader $(parts_of_assuan_h) -+ $(HOST_TOOLS_PREFIX)/mkheader $(host_os) $(srcdir)/assuan.h.in \ +-assuan.h: assuan.h.in mkheader$(EXEEXT_FOR_BUILD) $(parts_of_assuan_h) +- ./mkheader$(EXEEXT_FOR_BUILD) $(host_os) $(srcdir)/assuan.h.in \ ++assuan.h: assuan.h.in $(HOST_TOOLS_PREFIX)/mkheader$(EXEEXT_FOR_BUILD) $(parts_of_assuan_h) ++ $(HOST_TOOLS_PREFIX)/mkheader$(EXEEXT_FOR_BUILD) $(host_os) $(srcdir)/assuan.h.in \ $(PACKAGE_VERSION) $(VERSION_NUMBER) >$@ diff --git a/ports/libassuan/portfile.cmake b/ports/libassuan/portfile.cmake index 833b73f457543d..c840ee2e4fd085 100644 --- a/ports/libassuan/portfile.cmake +++ b/ports/libassuan/portfile.cmake @@ -1,12 +1,10 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_download_distfile(tarball URLS "https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2" "https://mirrors.dotsrc.org/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2" "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2" FILENAME "libassuan-${VERSION}.tar.bz2" - SHA512 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403 + SHA512 dcca942d222a2c226a7e34ba7988ee0c3c55bd6032166eb472caf2053db89aeeea7a40e93d8c2887c7ee73c5f838e8b0725e8cfb595accc1606646559362f7ee ) vcpkg_extract_source_archive( SOURCE_PATH @@ -24,25 +22,29 @@ vcpkg_configure_make( AUTOCONFIG OPTIONS --disable-doc - --disable-silent-rules - OPTIONS_RELEASE - "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpg-error-config" - OPTIONS_DEBUG - "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" + "GPG_ERROR_CONFIG=no" + OPTIONS_RELEASE + "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config" + OPTIONS_DEBUG + "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config" ) vcpkg_install_make() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +set(install_prefix "${CURRENT_INSTALLED_DIR}") +if(VCPKG_HOST_IS_WINDOWS) + string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" install_prefix "${install_prefix}") +endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libassuan-config" "${install_prefix}" "`dirname $0`/../../..") if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libassuan-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libassuan-config" "${install_prefix}" "`dirname $0`/../../../..") endif() if(NOT VCPKG_CROSSCOMPILING) file(INSTALL - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_SUFFIX}" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" USE_SOURCE_PERMISSIONS ) diff --git a/ports/libassuan/vcpkg.json b/ports/libassuan/vcpkg.json index aaaf23e6ca097d..75249750f4dd5d 100644 --- a/ports/libassuan/vcpkg.json +++ b/ports/libassuan/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libassuan", - "version": "2.5.5", + "version": "2.5.6", "description": "A library implementing the so-called Assuan protocol", "homepage": "https://gnupg.org/software/libassuan/index.html", "license": "LGPL-2.1-or-later", diff --git a/ports/libavif/find-dependency.patch b/ports/libavif/find-dependency.patch index 0da39464822392..42498eaf9f5e37 100644 --- a/ports/libavif/find-dependency.patch +++ b/ports/libavif/find-dependency.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 29d7d60..7e28ba4 100644 +index 46c6059..c0c047a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -555,7 +555,7 @@ endif() +@@ -660,7 +660,7 @@ endif() if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) install( TARGETS avif @@ -11,7 +11,7 @@ index 29d7d60..7e28ba4 100644 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -@@ -563,7 +563,7 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) +@@ -668,7 +668,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) @@ -20,7 +20,7 @@ index 29d7d60..7e28ba4 100644 include(CMakePackageConfigHelpers) write_basic_package_version_file( -@@ -572,6 +572,28 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) +@@ -677,6 +677,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} ) @@ -48,4 +48,4 @@ index 29d7d60..7e28ba4 100644 + ) endif() - configure_file(libavif.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libavif.pc @ONLY) + # Handle both relative and absolute paths (e.g. NixOS) for a relocatable package diff --git a/ports/libavif/fix-compiler-warnings.patch b/ports/libavif/fix-compiler-warnings.patch deleted file mode 100644 index c3d5fd1eecac25..00000000000000 --- a/ports/libavif/fix-compiler-warnings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/read.c b/src/read.c -index e45db4e..0ddb05a 100644 ---- a/src/read.c -+++ b/src/read.c -@@ -945,7 +945,7 @@ static avifResult avifDecoderItemMaxExtent(const avifDecoderItem * item, const a - return AVIF_RESULT_BMFF_PARSE_FAILED; - } - startOffset += remainingOffset; -- extentSize -= remainingOffset; -+ extentSize -= (size_t)remainingOffset; - remainingOffset = 0; - } - } -@@ -3147,7 +3147,7 @@ static avifResult avifDecoderPrepareSample(avifDecoder * decoder, avifDecodeSamp - if ((decoder->io->sizeHint > 0) && (sample->offset > decoder->io->sizeHint)) { - return AVIF_RESULT_BMFF_PARSE_FAILED; - } -- avifResult readResult = decoder->io->read(decoder->io, 0, sample->offset, bytesToRead, &sampleContents); -+ avifResult readResult = decoder->io->read(decoder->io, 0, (size_t)sample->offset, bytesToRead, &sampleContents); - if (readResult != AVIF_RESULT_OK) { - return readResult; - } diff --git a/ports/libavif/portfile.cmake b/ports/libavif/portfile.cmake index b03550cd832b99..8c38ecce5f110a 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 4a9e2711fccddf35c477db6e2fa2f76c0648aafaa98b4e3f34df62c0fbd02ddcd57762f1f8149822da4f1bc3757ee75ec1d9ced5e56a54dbe9d0b43265aacd4c + SHA512 f7c35e40f9214314afeae69d5da6ab345e6dbd025e737a920ea4270452cdf7ff7010d7af5cc18d27e93b217114eb6b613cd349703d0e1bb7814dbeb84a9fd70f HEAD_REF master PATCHES disable-source-utf8.patch - fix-compiler-warnings.patch find-dependency.patch # from https://github.com/AOMediaCodec/libavif/pull/1339 ) diff --git a/ports/libavif/vcpkg.json b/ports/libavif/vcpkg.json index 4b1a5a7825b8b9..a48eb6e711f924 100644 --- a/ports/libavif/vcpkg.json +++ b/ports/libavif/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libavif", - "version-semver": "0.11.1", - "port-version": 2, + "version-semver": "1.0.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/libcap/portfile.cmake b/ports/libcap/portfile.cmake index 1dccf8170e9470..c463ae1692a82d 100644 --- a/ports/libcap/portfile.cmake +++ b/ports/libcap/portfile.cmake @@ -1,8 +1,11 @@ -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL git://git.kernel.org/pub/scm/libs/libcap/libcap.git - FETCH_REF "libcap-${VERSION}" - REF 3c7dda330bd9a154bb5b878d31fd591e4951fe17 +vcpkg_download_distfile(ARCHIVE + URLS https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-3c7dda330bd9a154bb5b878d31fd591e4951fe17.tar.gz + FILENAME libpcap-${VERSION}.tar.gz + SHA512 0732c9f07be38c2bb06409f1f31d7ed5ad31b38ae380650b334074856f89b885deabb9603e21a989e81b530050c068bbbf60157adbf3ca3893e4bca7d61f63d2 +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}") diff --git a/ports/libcap/vcpkg.json b/ports/libcap/vcpkg.json index 6d82f41d41d6e7..06189da7d53329 100644 --- a/ports/libcap/vcpkg.json +++ b/ports/libcap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcap", "version": "2.69", - "port-version": 1, + "port-version": 2, "description": "A library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities.", "homepage": "https://git.kernel.org/pub/scm/libs/libcap/libcap.git", "license": "BSD-3-Clause OR GPL-2.0-only", diff --git a/ports/libconfig/CMakeLists.txt b/ports/libconfig/CMakeLists.txt deleted file mode 100644 index ab6711ad9c8a74..00000000000000 --- a/ports/libconfig/CMakeLists.txt +++ /dev/null @@ -1,53 +0,0 @@ -cmake_minimum_required(VERSION 3.5.1) -project(libconfig C CXX) - -if(MSVC) - add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DYY_NO_UNISTD_H -DYY_USE_CONST) -endif() - -set(C_SOURCES - lib/grammar.c - lib/libconfig.c - lib/scanctx.c - lib/scanner.c - lib/strbuf.c - lib/strvec.c - lib/util.c - lib/wincompat.c -) - -set(CPP_SOURCES - lib/libconfigcpp.cc -) - -set(CMAKE_C_STANDARD 99) - -include_directories(lib ${STDINT_H}) - -add_library(libconfig ${C_SOURCES}) -add_library(libconfig++ ${CPP_SOURCES}) - -if(BUILD_SHARED_LIBS) - target_compile_definitions(libconfig PRIVATE -DLIBCONFIG_EXPORTS) - target_compile_definitions(libconfig++ PRIVATE -DLIBCONFIGXX_EXPORTS) -else() - target_compile_definitions(libconfig PUBLIC -DLIBCONFIG_STATIC) - target_compile_definitions(libconfig++ PUBLIC -DLIBCONFIGXX_STATIC) -endif() - -if (WIN32) - # Linux doesn't have shlwapi - target_link_libraries(libconfig shlwapi) -endif() -target_link_libraries(libconfig++ PRIVATE libconfig) - -install( - TARGETS libconfig libconfig++ - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES lib/libconfig.h++ lib/libconfig.h DESTINATION include) -endif() diff --git a/ports/libconfig/libconfig++-cmake-export.diff b/ports/libconfig/libconfig++-cmake-export.diff new file mode 100644 index 00000000000000..d7ef5911abca57 --- /dev/null +++ b/ports/libconfig/libconfig++-cmake-export.diff @@ -0,0 +1,22 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 3a64deb..233c89f 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -112,7 +112,7 @@ install(TARGETS ${libname} + ) + + install(TARGETS ${libname}++ +- EXPORT libconfig++Targets ++ EXPORT libconfigTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +@@ -121,7 +121,7 @@ install(TARGETS ${libname}++ + + + include(CMakePackageConfigHelpers) +-foreach(target_name libconfig libconfig++) ++foreach(target_name libconfig) + write_basic_package_version_file("${target_name}ConfigVersion.cmake" + VERSION ${PACKAGE_VERSION} + COMPATIBILITY SameMajorVersion diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index a5471ba9034ebd..d4022d721edd8a 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -1,52 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hyperrealm/libconfig - REF v1.7.3 + REF "v${VERSION}" SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4 HEAD_REF master + PATCHES + libconfig++-cmake-export.diff ) -if (NOT VCPKG_USE_HEAD_VERSION) - message("If you would like to use cmake with the port, use `--head` option with vcpkg install.") - file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -endif() - -if (NOT VCPKG_USE_HEAD_VERSION) - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON - ) -else() - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTS=OFF - ) -endif() - +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) vcpkg_cmake_install() - vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libconfig) -if (VCPKG_USE_HEAD_VERSION) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libconfig) -endif() - -foreach(FILE "${CURRENT_PACKAGES_DIR}/include/libconfig.h++" "${CURRENT_PACKAGES_DIR}/include/libconfig.h") - file(READ ${FILE} _contents) - string(REPLACE "defined(LIBCONFIGXX_EXPORTS)" "0" _contents "${_contents}") - string(REPLACE "defined(LIBCONFIG_EXPORTS)" "0" _contents "${_contents}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - string(REPLACE "defined(LIBCONFIGXX_STATIC)" "0" _contents "${_contents}") - string(REPLACE "defined(LIBCONFIG_STATIC)" "0" _contents "${_contents}") - else() - string(REPLACE "defined(LIBCONFIGXX_STATIC)" "1" _contents "${_contents}") - string(REPLACE "defined(LIBCONFIG_STATIC)" "1" _contents "${_contents}") - endif() - file(WRITE ${FILE} "${_contents}") -endforeach() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libconfig.h" "defined(LIBCONFIG_STATIC)" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libconfig.h++" "defined(LIBCONFIGXX_STATIC)" "1") +endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libconfig/vcpkg.json b/ports/libconfig/vcpkg.json index 46e5a2b8161bdc..794e91f4642103 100644 --- a/ports/libconfig/vcpkg.json +++ b/ports/libconfig/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libconfig", "version": "1.7.3", - "port-version": 3, + "port-version": 4, "description": "C/C++ library for processing configuration files", "homepage": "https://github.com/hyperrealm/libconfig", "dependencies": [ diff --git a/ports/libenvpp/portfile.cmake b/ports/libenvpp/portfile.cmake index 31eae10e91c7a4..5000d6cfb8b37e 100644 --- a/ports/libenvpp/portfile.cmake +++ b/ports/libenvpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ph3at/libenvpp REF v${VERSION} - SHA512 d8d2e6405311be1cba47cdf1c8b29018c84716a0d34a18bf3b6fa8c05f5eddf447ddee407a407d765e92296c5d7e7b5f2fe4561fb66f5165826825158ef82fc8 + SHA512 0b4ed6496efc54165e8e161510146146cfefb90c303a913bab6a6749ae4292823c19f34734d417a2bd4d44d8d05a68c60acd852c03487f40ba6126eeb3db16bd HEAD_REF main PATCHES fix-dependencies.patch diff --git a/ports/libenvpp/vcpkg.json b/ports/libenvpp/vcpkg.json index 1037daeaeb7882..1225008c5b4f7b 100644 --- a/ports/libenvpp/vcpkg.json +++ b/ports/libenvpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libenvpp", - "version": "1.0.0", + "version": "1.3.0", "description": "A modern C++ library for type-safe environment variable parsing ", "homepage": "https://github.com/ph3at/libenvpp", "license": "Apache-2.0", diff --git a/ports/libeventheader-decode/portfile.cmake b/ports/libeventheader-decode/portfile.cmake index 7827c203d79f61..cfd4f684488c6d 100644 --- a/ports/libeventheader-decode/portfile.cmake +++ b/ports/libeventheader-decode/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libeventheader-decode/vcpkg.json b/ports/libeventheader-decode/vcpkg.json index 19e79c2746bf14..a4215bc43322f5 100644 --- a/ports/libeventheader-decode/vcpkg.json +++ b/ports/libeventheader-decode/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libeventheader-decode", - "version": "1.1.0", + "version": "1.2.1", "description": "C++ classes for decoding EventHeader-encoded Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", @@ -8,11 +8,11 @@ "dependencies": [ { "name": "libeventheader-tracepoint", - "version>=": "1.1.0" + "version>=": "1.2.1" }, { "name": "libtracepoint-decode", - "version>=": "1.1.0" + "version>=": "1.2.1" }, { "name": "vcpkg-cmake", diff --git a/ports/libeventheader-tracepoint/portfile.cmake b/ports/libeventheader-tracepoint/portfile.cmake index 19d8ae4ee89c3f..7eaceed698d72f 100644 --- a/ports/libeventheader-tracepoint/portfile.cmake +++ b/ports/libeventheader-tracepoint/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libeventheader-tracepoint/vcpkg.json b/ports/libeventheader-tracepoint/vcpkg.json index f66fbdb9667718..d1256054025269 100644 --- a/ports/libeventheader-tracepoint/vcpkg.json +++ b/ports/libeventheader-tracepoint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libeventheader-tracepoint", - "version": "1.1.0", + "version": "1.2.1", "description": "C/C++ interface for generating EventHeader-encoded Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", @@ -8,7 +8,7 @@ "dependencies": [ { "name": "libtracepoint", - "version>=": "1.1.0" + "version>=": "1.2.1" }, { "name": "vcpkg-cmake", diff --git a/ports/libffi/fix_undefind_func.patch b/ports/libffi/fix_undefind_func.patch new file mode 100644 index 00000000000000..de20045408ef97 --- /dev/null +++ b/ports/libffi/fix_undefind_func.patch @@ -0,0 +1,28 @@ +diff --git a/include/ffi_common.h b/include/ffi_common.h +index 2bd31b0..c53a794 100644 +--- a/include/ffi_common.h ++++ b/include/ffi_common.h +@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; + static trampoline. */ + int ffi_tramp_is_present (void *closure) FFI_HIDDEN; + ++/* Return a file descriptor of a temporary zero-sized file in a ++ writable and executable filesystem. */ ++int open_temp_exec_file(void) FFI_HIDDEN; ++ + /* Extended cif, used in callback from assembly routine */ + typedef struct + { +diff --git a/src/tramp.c b/src/tramp.c +index b9d273a..90efb07 100644 +--- a/src/tramp.c ++++ b/src/tramp.c +@@ -39,6 +39,8 @@ + #ifdef __linux__ + #define _GNU_SOURCE 1 + #endif ++#include ++#include + #include + #include + #include diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index 40d936b35b84b9..f37cf125a3a232 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" PATCHES dll-bindir.diff + fix_undefind_func.patch ) vcpkg_list(SET options) diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index ba0a6bdca2e03b..5c8fcc9abdb51b 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libffi", "version": "3.4.4", - "port-version": 5, + "port-version": 6, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi", "license": "MIT", diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index a235bc592f6722..770dd0faa69861 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenKinect/libfreenect2 - REF v0.2.0 - SHA512 3525e3f21462cecd3b198f64545786ffddc2cafdfd8146e5a46f0300b83f29f1ad0739618a07ab195c276149d7e2e909f7662e2d379a2880593cac75942b0666 + REF "v${VERSION}" + SHA512 0fcee5471deb013d2b57581ef8d8838f652dfed2f457c4240d5b754674e949c59337a167ac74ad04b25ace69af470a7e014e0474a688d930a3323946feadee67 HEAD_REF master PATCHES fix-dependency-libusb.patch @@ -37,6 +37,6 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/GPL2" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/GPL2") vcpkg_fixup_pkgconfig() diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json index b8aa71df2b9de2..59e75a596f55c3 100644 --- a/ports/libfreenect2/vcpkg.json +++ b/ports/libfreenect2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libfreenect2", - "version": "0.2.0", - "port-version": 10, + "version": "0.2.1", "description": "Open source drivers for the Kinect for Windows v2 device", "homepage": "https://github.com/OpenKinect/libfreenect2", "license": "GPL-2.0-only", diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake index 72d595b146cc0b..37e7271d5fbf2b 100644 --- a/ports/libgcrypt/portfile.cmake +++ b/ports/libgcrypt/portfile.cmake @@ -1,18 +1,17 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_download_distfile(tarball URLS "https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2" "https://mirrors.dotsrc.org/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2" "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2" FILENAME "libgcrypt-${VERSION}.tar.bz2" - SHA512 e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13 + SHA512 3a850baddfe8ffe8b3e96dc54af3fbb9e1dab204db1f06b9b90b8fbbfb7fb7276260cd1e61ba4dde5a662a2385385007478834e62e95f785d2e3d32652adb29e ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${tarball}" PATCHES cross-tools.patch + upstream-fa21ddc1.patch ) if(VCPKG_CROSSCOMPILING) @@ -28,12 +27,12 @@ vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" OPTIONS --disable-doc - --disable-silent-rules "AS=${VCPKG_DETECTED_CMAKE_ASM_COMPILER}" + "GPG_ERROR_CONFIG=no" OPTIONS_RELEASE - "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpg-error-config" + "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config" OPTIONS_DEBUG - "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" + "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config" ) vcpkg_install_make(OPTIONS "CCAS=${VCPKG_DETECTED_CMAKE_ASM_COMPILER}") @@ -42,16 +41,20 @@ vcpkg_copy_pdbs() if(NOT VCPKG_CROSSCOMPILING) file(INSTALL - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cipher/gost-s-box${VCPKG_TARGET_SUFFIX}" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cipher/gost-s-box${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" USE_SOURCE_PERMISSIONS ) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +set(install_prefix "${CURRENT_INSTALLED_DIR}") +if(VCPKG_HOST_IS_WINDOWS) + string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" install_prefix "${install_prefix}") +endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/libgcrypt-config" "${install_prefix}" "`dirname $0`/../../..") if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libgcrypt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/libgcrypt-config" "${install_prefix}" "`dirname $0`/../../../..") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libgcrypt/upstream-fa21ddc1.patch b/ports/libgcrypt/upstream-fa21ddc1.patch new file mode 100644 index 00000000000000..b70408defa2845 --- /dev/null +++ b/ports/libgcrypt/upstream-fa21ddc1.patch @@ -0,0 +1,20 @@ +diff --git a/random/rndgetentropy.c b/random/rndgetentropy.c +index 513da0b95..a6f3c4ab1 100644 +--- a/random/rndgetentropy.c ++++ b/random/rndgetentropy.c +@@ -81,6 +81,7 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t, + do + { + _gcry_pre_syscall (); ++#ifdef GRND_RANDOM + if (fips_mode ()) + { + /* DRBG chaining defined in SP 800-90A (rev 1) specify +@@ -98,6 +99,7 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t, + ret = getrandom (buffer, nbytes, GRND_RANDOM); + } + else ++#endif + { + nbytes = length < sizeof (buffer) ? length : sizeof (buffer); + ret = getentropy (buffer, nbytes); diff --git a/ports/libgcrypt/vcpkg.json b/ports/libgcrypt/vcpkg.json index bcd7ae2b1370ef..522c600be4a35d 100644 --- a/ports/libgcrypt/vcpkg.json +++ b/ports/libgcrypt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgcrypt", - "version": "1.10.1", - "port-version": 1, + "version": "1.10.2", "description": "A general purpose cryptographic library", "homepage": "https://gnupg.org/software/libgcrypt/index.html", "license": null, diff --git a/ports/libgig/0001-msvc-fix-ssize_t.patch b/ports/libgig/0001-msvc-fix-ssize_t.patch new file mode 100644 index 00000000000000..d2edce0e7be6be --- /dev/null +++ b/ports/libgig/0001-msvc-fix-ssize_t.patch @@ -0,0 +1,16 @@ +diff --git a/src/Serialization.h b/src/Serialization.h +index cccfc54..91a8fa4 100644 +--- a/src/Serialization.h ++++ b/src/Serialization.h +@@ -40,6 +40,11 @@ + #include + #include + ++#ifdef _MSC_VER ++#include ++using ssize_t = SSIZE_T; ++#endif ++ + #ifndef __has_extension + # define __has_extension(x) 0 + #endif diff --git a/ports/libgig/0002-cmake-fixes.patch b/ports/libgig/0002-cmake-fixes.patch new file mode 100644 index 00000000000000..19982f251c6e80 --- /dev/null +++ b/ports/libgig/0002-cmake-fixes.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae66913..893e3ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,9 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.1) + project(libgig) + +-if(NOT MSVC) +- message(FATAL_ERROR "Please use configure and make, this cmake file is currently only to generate msvc solution files") +-endif() ++#To force the compiler to use C++ 11 ++set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD_REQUIRED TRUE) + + + #configuration options diff --git a/ports/libgig/0003-fix-usage.patch b/ports/libgig/0003-fix-usage.patch new file mode 100644 index 00000000000000..0b2c040bced3de --- /dev/null +++ b/ports/libgig/0003-fix-usage.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 893e3ea..2eef641 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,12 +128,11 @@ install(TARGETS libgig EXPORT libgig-config + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + PUBLIC_HEADER DESTINATION include/libgig) +-install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig) + +-install(TARGETS libakai EXPORT libakai-config ++install(TARGETS libakai EXPORT libgig-config + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + PUBLIC_HEADER DESTINATION include/libgig) +-install(EXPORT libakai-config NAMESPACE libgig:: DESTINATION share/libgig) ++install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig) + diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake new file mode 100644 index 00000000000000..57f2748f878009 --- /dev/null +++ b/ports/libgig/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://download.linuxsampler.org/packages/libgig-4.3.0.tar.bz2" + FILENAME "libgig-4.3.0.tar.bz2" + SHA512 683c09b1d17acf69020c631452b7dfb25ac54c3701db5e97471d4e7973e9a06267667bf19bfe4eb00d2964223e8446f248d93b4cf29c062dec2588758b4dfba2 +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + 0001-msvc-fix-ssize_t.patch + 0002-cmake-fixes.patch + 0003-fix-usage.patch +) + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic LIBGIG_BUILD_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + extra-tools LIBGIG_BUILD_TOOLS + tests LIBGIG_ENABLE_TESTING +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBGIG_BUILD_SHARED=${LIBGIG_BUILD_SHARED} +) + +vcpkg_cmake_install() +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES dlsdump gigdump gigmerge korg2gig korgdump rifftree sf2dump + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin") +endif() +vcpkg_cmake_config_fixup() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json new file mode 100644 index 00000000000000..917fb405e9817f --- /dev/null +++ b/ports/libgig/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "libgig", + "version": "4.3.0", + "description": "C++ library for loading Gigasampler files and DLS Level 1/2 files", + "homepage": "https://www.linuxsampler.org/libgig/", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tests": { + "description": "Build test cases", + "dependencies": [ + "cppunit" + ] + }, + "tools": { + "description": "Build extra tools", + "dependencies": [ + "libsndfile" + ] + } + } +} diff --git a/ports/libgnutls/portfile.cmake b/ports/libgnutls/portfile.cmake index 94302863e72764..58daad08804631 100644 --- a/ports/libgnutls/portfile.cmake +++ b/ports/libgnutls/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - string(REGEX REPLACE "^([0-9]*[.][0-9]*)[.].*" "\\1" GNUTLS_BRANCH "${VERSION}") vcpkg_download_distfile(tarball URLS @@ -28,8 +26,18 @@ if ("openssl" IN_LIST FEATURES) vcpkg_list(APPEND options "--enable-openssl-compatibility") endif() -if(VCPKG_TARGET_IS_OSX) - vcpkg_list(APPEND options "LDFLAGS=\$LDFLAGS -framework CoreFoundation") +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND options "LIBS=\$LIBS -liconv -lcharset") # for libunistring +endif() + +if(VCPKG_CROSSCOMPILING) + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") + set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + cmake_path(GET ccas PARENT_PATH ccas_dir) + vcpkg_add_to_path("${ccas_dir}") + cmake_path(GET ccas FILENAME ccas_command) + vcpkg_list(APPEND options "CCAS=${ccas_command}") endif() set(ENV{GTKDOCIZE} true) # true, the program @@ -42,7 +50,6 @@ vcpkg_configure_make( --disable-guile --disable-libdane --disable-maintainer-mode - --disable-silent-rules --disable-rpath --disable-tests --with-brotli=no @@ -57,6 +64,7 @@ vcpkg_configure_make( ) vcpkg_install_make() vcpkg_fixup_pkgconfig() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libgnutls/vcpkg.json b/ports/libgnutls/vcpkg.json index 227c79a8f41663..17f86699f3498b 100644 --- a/ports/libgnutls/vcpkg.json +++ b/ports/libgnutls/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgnutls", "version": "3.8.1", + "port-version": 1, "description": "A secure communications library implementing the SSL, TLS and DTLS protocols.", "homepage": "https://www.gnutls.org/", "license": null, @@ -11,20 +12,25 @@ "libtasn1", "libunistring", "nettle", + { + "name": "vcpkg-cmake-get-vars", + "host": true, + "platform": "!native" + }, "zlib" ], "features": { "nls": { "description": "Enable native language support.", "dependencies": [ - "gettext", { "name": "gettext", "host": true, "features": [ "tools" ] - } + }, + "gettext-libintl" ] }, "openssl": { diff --git a/ports/libgpg-error/gpgrt-config.patch b/ports/libgpg-error/gpgrt-config.patch new file mode 100644 index 00000000000000..926b88af905ea0 --- /dev/null +++ b/ports/libgpg-error/gpgrt-config.patch @@ -0,0 +1,51 @@ +diff --git a/src/gpgrt-config.in b/src/gpgrt-config.in +index bada0f2..8c03a05 100644 +--- a/src/gpgrt-config.in ++++ b/src/gpgrt-config.in +@@ -78,7 +78,7 @@ substitute_vars () { + esac + done + +- echo "$__result" ++ echo "$__result" | sed -e 's,",,g' + } + + # +@@ -132,7 +132,6 @@ EOF2 + *:|*:\ ) ;; + *) + echo "Error reading $_filename: $_line" 1>&2 +- exit 1 + ;; + esac + fi +@@ -166,6 +165,7 @@ read_config_file () { + fi + exit 1 + fi ++ VAR_pcfiledir="${RESULT%/*}" \ + read_config_from_stdin $RESULT < $RESULT + } + +@@ -540,6 +540,11 @@ while test $# -gt 0; do + ;; + esac + done ++vcpkg_prefix=$(echo "$0" | sed -e 's,^\([a-zA-Z]\):/,/\1/,') ++case "$vcpkg_prefix" in ++*/tools/libgpg-error/debug/bin/gpgrt-config) libdir="${vcpkg_prefix%/*/*/*/*/*}/debug/lib" ;; ++*/tools/libgpg-error/bin/gpgrt-config) libdir="${vcpkg_prefix%/*/*/*/*}/lib" ;; ++esac + + if env | grep '^PKG_CONFIG_LIBDIR=$' >/dev/null 2>&1; then + # The variable set as empty, we use PKG_CONFIG_PATH in this case, +@@ -598,7 +603,8 @@ output="" + + mt="no" + +-VAR_list=VAR_pc_sysrootdir ++VAR_list="VAR_pcfiledir VAR_pc_sysrootdir" ++VAR_pcfiledir="" + if [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then + VAR_pc_sysrootdir="/" + else diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index 36f2c2e4377bf7..9c85d1191d25ef 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -1,18 +1,17 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_download_distfile(tarball URLS "https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2" "https://mirrors.dotsrc.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2" "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${VERSION}.tar.bz2" FILENAME "libgpg-error-${VERSION}.tar.bz2" - SHA512 b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d + SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${tarball}" PATCHES cross-tools.patch + gpgrt-config.patch pkgconfig-libintl.patch ) @@ -35,8 +34,6 @@ vcpkg_configure_make( ${options} --disable-tests --disable-doc - --disable-silent-rules - --enable-install-gpg-error-config # still used downstream ) vcpkg_install_make() @@ -45,19 +42,14 @@ vcpkg_copy_pdbs() if(NOT VCPKG_CROSSCOMPILING) file(INSTALL - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkerrcodes${VCPKG_TARGET_SUFFIX}" - "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_SUFFIX}" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkerrcodes${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/mkheader${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" USE_SOURCE_PERMISSIONS ) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") -if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(NOT "nls" IN_LIST FEATURES) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale") diff --git a/ports/libgpg-error/vcpkg.json b/ports/libgpg-error/vcpkg.json index 62a3c7eeec5c24..eb5a83e664f6fc 100644 --- a/ports/libgpg-error/vcpkg.json +++ b/ports/libgpg-error/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libgpg-error", - "version": "1.46", + "version": "1.47", "description": "A common dependency of all GnuPG components", "homepage": "https://gnupg.org/software/libgpg-error/index.html", "license": "LGPL-2.1-or-later", @@ -8,22 +8,21 @@ "dependencies": [ { "name": "libgpg-error", - "host": true, - "default-features": false + "host": true } ], "features": { "nls": { "description": "Enable native language support", "dependencies": [ - "gettext", { "name": "gettext", "host": true, "features": [ "tools" ] - } + }, + "gettext-libintl" ] } } diff --git a/ports/libgpiod/portfile.cmake b/ports/libgpiod/portfile.cmake index 291c24bd2bf327..1e55e1f3da506e 100644 --- a/ports/libgpiod/portfile.cmake +++ b/ports/libgpiod/portfile.cmake @@ -1,8 +1,11 @@ -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL git://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git - FETCH_REF "v${VERSION}" - REF ae275c375477f207912113e5cf190fada78f3f90 # v2.0.1 +vcpkg_download_distfile(ARCHIVE + URLS https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-9068bb08dc3bf183eee6de2577ad266fe6b8f434.tar.gz + FILENAME libgpiod-${VERSION}.tar.gz + SHA512 3c569471007d12d94cb74377187dfe8b979de08f3747dca6348a4212ffb6d5f699af1d1135c25c70bcd17d533b09499fd0f1b3c5deac7d0a2d1bbf31092033c3 +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/libgpiod/vcpkg.json b/ports/libgpiod/vcpkg.json index 12175cd7f45778..e58002eeca660d 100644 --- a/ports/libgpiod/vcpkg.json +++ b/ports/libgpiod/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgpiod", - "version": "2.0.1", + "version": "2.0.2", + "port-version": 1, "description": "C library and tools for interacting with the linux GPIO character device", "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git", "license": "LGPL-2.1-or-later", diff --git a/ports/libgwenhywfar/portfile.cmake b/ports/libgwenhywfar/portfile.cmake index a108b76fe99e4d..a0ffa609e2ab14 100644 --- a/ports/libgwenhywfar/portfile.cmake +++ b/ports/libgwenhywfar/portfile.cmake @@ -1,8 +1,3 @@ -set(VERSION_MAJOR 5) -set(VERSION_MINOR 6) -set(VERSION_PATCH 0) -set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) - vcpkg_download_distfile(ARCHIVE URLS "https://www.aquamaniac.de/rdm/attachments/download/364/gwenhywfar-${VERSION}.tar.gz" FILENAME "gwenhywfar-${VERSION}.tar.gz" @@ -11,54 +6,61 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} - SOURCE_BASE ${VERSION} + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${VERSION}" ) +vcpkg_list(SET options) if ("libxml2" IN_LIST FEATURES) - set(WITH_LIBXML2_CODE "--with-libxml2-code=yes") + vcpkg_list(APPEND options "--with-libxml2-code=yes") endif() + if ("cpp" IN_LIST FEATURES) - list(APPEND FEATURES_GUI "cpp") + list(APPEND FEATURES_GUI "cpp") endif() if ("qt5" IN_LIST FEATURES) - list(APPEND FEATURES_GUI "qt5") + list(APPEND FEATURES_GUI "qt5") endif() - list(JOIN FEATURES_GUI " " GUIS) +vcpkg_list(APPEND options "--with-guis=${GUIS}") if(VCPKG_TARGET_IS_OSX) - set(LDFLAGS "-framework CoreFoundation -framework Security") -else() - set(LDFLAGS "") + vcpkg_list(APPEND options "LDFLAGS=\$LDFLAGS -framework CoreFoundation -framework Security") endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - --disable-silent-rules --disable-binreloc - --with-guis=${GUIS} - --with-libgpg-error-prefix=${CURRENT_INSTALLED_DIR}/tools/libgpg-error - --with-libgcrypt-prefix=${CURRENT_INSTALLED_DIR}/tools/libgcrypt - --with-qt5-qmake=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/qmake - --with-qt5-moc=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/moc - --with-qt5-uic=${CURRENT_INSTALLED_DIR}/tools/qt5/bin/uic - ${WITH_LIBXML2_CODE} - "LDFLAGS=${LDFLAGS}" + ${options} + OPTIONS_RELEASE + "--with-qt5-qmake=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/qmake" + "--with-qt5-moc=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/moc" + "--with-qt5-uic=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/uic" + "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config" + "gpg_error_config_args=gpg-error" + "LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/bin/libgcrypt-config" + OPTIONS_DEBUG + "--with-qt5-qmake=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/qmake" + "--with-qt5-moc=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/moc" + "--with-qt5-uic=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/uic" + "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config" + "gpg_error_config_args=gpg-error" + "LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config" ) vcpkg_install_make() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() +string(REGEX MATCH "^([0-9]*[.][0-9]*)" MAJOR_MINOR "${VERSION}") foreach(GUI IN LISTS FEATURES_GUI) - vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-cpp CONFIG_PATH lib/cmake/gwengui-${GUI}-${VERSION_MAJOR}.${VERSION_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-${GUI} CONFIG_PATH lib/cmake/gwengui-${GUI}-${MAJOR_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() -vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${VERSION_MAJOR}.${VERSION_MINOR}) +vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${MAJOR_MINOR}) if ("tools" IN_LIST FEATURES) - vcpkg_copy_tools(SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN) + vcpkg_copy_tools(SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN) endif() # the `dir` variable is not used in the script @@ -68,4 +70,4 @@ if(NOT VCPKG_BUILD_TYPE) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/libgwenhywfar/vcpkg.json b/ports/libgwenhywfar/vcpkg.json index 6245b6cd285ca3..4e0a1ca8802384 100644 --- a/ports/libgwenhywfar/vcpkg.json +++ b/ports/libgwenhywfar/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgwenhywfar", "version-semver": "5.6.0", - "port-version": 3, + "port-version": 4, "description": "A helper library for networking and security applications and libraries", "homepage": "https://www.aquamaniac.de/rdm/", "supports": "!windows", @@ -29,13 +29,19 @@ "libxml2": { "description": "Enables libXML2-depending functionality", "dependencies": [ - "libxml2" + { + "name": "libxml2", + "default-features": false + } ] }, "qt5": { "description": "Qt bindings", "dependencies": [ - "qt5-base" + { + "name": "qt5-base", + "default-features": false + } ] }, "tools": { diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index 764dc6342da68c..db1752498d330f 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libharu/libharu REF v${VERSION} - SHA512 4b01dd0d23bdcaec6f69fe5f059902e7f49eafdf19d53d4cce8b4d52a54b2057b764de29390f4da9e75aeb32cb6af8606b23478b04edf9f7dcb1e4b769c5fff2 + SHA512 422210b09f89643cb25808559aeea109db5cce8a71c779d51f87222cdd50434f4f0f92322ebe429fca8f85ad73592bcabb14c3e36cd0bea19b6ec4c729220522 HEAD_REF master PATCHES fix-include-path.patch diff --git a/ports/libharu/vcpkg.json b/ports/libharu/vcpkg.json index d71ae0bdf25870..9e18fc42c4e118 100644 --- a/ports/libharu/vcpkg.json +++ b/ports/libharu/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libharu", - "version": "2.4.3", + "version": "2.4.4", "description": "libharu - free PDF library", "homepage": "https://github.com/libharu/libharu", "license": "Zlib", diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 20241789a63efe..dc081bf1c98bab 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif REF "v${VERSION}" - SHA512 ef32fced3a66d888caf2202b55bc4c81094045abfd2806216bbf0c359a30663c500ed5e33a9cef316bcfd933498e87753e9af6b3c179e84c370efd62900493c0 + SHA512 a4dbb0b1bcd6957841ce218f931a2d836e58d0b60323753020c684e97e4920f7802316f8979d1276904cd2e5809dc8e0dcf85ff9474d5f70e59380c290716fe7 HEAD_REF master PATCHES gdk-pixbuf.patch diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 82796b95458342..f0287217dcb3ae 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libheif", - "version": "1.16.2", + "version": "1.17.1", "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/ports/libical/portfile.cmake b/ports/libical/portfile.cmake index cddeeff791b663..bfb357c20bb3f6 100644 --- a/ports/libical/portfile.cmake +++ b/ports/libical/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libical/libical - REF 5990fd0ac00ee3f068909ac86aa642c940720150 #v3.0.16 - SHA512 46e9330373e0c5ff4ffb658c2bd0a18cf082b539edf467323926c9b256122613b75190305f3365e52f26371bf51142c16dd40b8c18d2d13020e703b1d5d45042 + REF "v${VERSION}" + SHA512 11fbb4aba7503a3264b0efa30ad56aa923d31ec193bdb0b87b92bc88db9019fa670c8c9ee7998caa3a870e706446a58ead475f31bd703f0d2cb7aabf0f6a3aa7 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/libical/vcpkg.json b/ports/libical/vcpkg.json index 843b27cd184070..52dacb74deb429 100644 --- a/ports/libical/vcpkg.json +++ b/ports/libical/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libical", - "version": "3.0.16", - "port-version": 1, + "version": "3.0.17", "description": "Reference implementation of the iCalendar data type and serialization format", "homepage": "https://github.com/libical/libical", "license": "MPL-2.0", diff --git a/ports/libics/fix-integral-include.patch b/ports/libics/fix-integral-include.patch new file mode 100644 index 00000000000000..4546dadc713960 --- /dev/null +++ b/ports/libics/fix-integral-include.patch @@ -0,0 +1,12 @@ +diff --git a/support/cpp_interface/libics.hpp b/support/cpp_interface/libics.hpp +index 73f76e6..4ea2b1e 100644 +--- a/support/cpp_interface/libics.hpp ++++ b/support/cpp_interface/libics.hpp +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #if defined(__WIN32__) && !defined(WIN32) + # define WIN32 diff --git a/ports/libics/portfile.cmake b/ports/libics/portfile.cmake index 2d66f422586319..1a8350bc14f508 100644 --- a/ports/libics/portfile.cmake +++ b/ports/libics/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO svi-opensource/libics - REF ae55128e0532d78aaea4adce21a3fa553d208b83 # 1.6.5 - SHA512 37a1e9034d7e32954840e18f3e3c19f6ed2f8c651ce0da53f678e2f04653be0fc4d9ab3dca8b6f0bfcaec2a9cc560ccfbc7d9034977faa14036281d6a3ca662a + REF "${VERSION}" + SHA512 290d6d7bd3f5611d0b46aa6406ef10449ee768bc14d0b34f0bb365ca46f98b7fd4065c94fd9594e357427a4d0644f2724a1f773c7f3b43adc3db2389b94ee88e HEAD_REF master + PATCHES fix-integral-include.patch ) vcpkg_cmake_configure( diff --git a/ports/libics/vcpkg.json b/ports/libics/vcpkg.json index 09e0691557b654..444c9aa0ae2b7d 100644 --- a/ports/libics/vcpkg.json +++ b/ports/libics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libics", - "version": "1.6.5", + "version": "1.6.6", "description": "Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject.", "homepage": "https://github.com/svi-opensource/libics", "dependencies": [ diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 000dd544b4c9ba..0fa9a5ddb614fe 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -29,9 +29,9 @@ vcpkg_list(SET options) if("nls" IN_LIST FEATURES) vcpkg_list(APPEND options "--enable-nls") else() - set(ENV{AUTOPOINT} true) # true, the program vcpkg_list(APPEND options "--disable-nls") endif() +set(ENV{AUTOPOINT} true) # true, the program if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_list(APPEND options "CPPFLAGS=\$CPPFLAGS -DIDN2_STATIC") diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json index e56062289296cb..f0c5add11ff9b6 100644 --- a/ports/libidn2/vcpkg.json +++ b/ports/libidn2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libidn2", "version": "2.3.4", - "port-version": 2, + "port-version": 3, "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", "homepage": "https://www.gnu.org/software/libidn/", "license": null, diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 325c790c766dc3..e6dad47e3a8ce2 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo REF "${VERSION}" - SHA512 0efb7ce16333f4f3556b889bdd83b0f91697ce1645cbfb13db0c8a93ef47dd9cb0805c7160edaf946d4d54faf30a33bae90800c189e8b4bd44fcf3ce98179115 + SHA512 6f9f384bb3bf5476935b313576c03f11d3e22bf727aa135eb840a2c9b994890e6712e23f25996b91ee901e8242b41100fb8c3cb4905ffb72776edf14b2c05a12 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index f084727b5cb661..77578ea905b013 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libjpeg-turbo", - "version": "3.0.0", - "port-version": 2, + "version": "3.0.1", "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index 2adc028c43fe37..c1e3c7726a7fca 100644 --- a/ports/libjuice/portfile.cmake +++ b/ports/libjuice/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice - REF eff89f7ae3450d66fcebe4d3d1d2aacca527eb8c #v1.0.6 - SHA512 f28e8116e9437f7e2c114c0b6e296ec2c4bda264428ca94c3aa7356bfc3c76ac77f4664678579c933f70e6cb380c68ad42c03a83d5140bf41e20fc4272f1ae54 + REF "v${VERSION}" + SHA512 187901d6d8e1210210667b0bca274ce9507d46cc5f3fe81e812fb7c16dc2739359a5d331ce03a9a3958252c4ea942a75ca29a624f486abb23c19dd10c71127bc HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index ccd998ba13b684..4758d98615c76d 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "1.0.6", + "version": "1.3.1", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", "license": "LGPL-2.1-only", diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake index d8579e60596e95..6db26e44298fd8 100644 --- a/ports/liblemon/portfile.cmake +++ b/ports/liblemon/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_extract_source_archive( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_CXX_STANDARD=14 -DLEMON_ENABLE_GLPK=OFF -DLEMON_ENABLE_ILOG=OFF -DLEMON_ENABLE_COIN=OFF diff --git a/ports/liblemon/vcpkg.json b/ports/liblemon/vcpkg.json index dc767810fb3d95..7232279f5aca8c 100644 --- a/ports/liblemon/vcpkg.json +++ b/ports/liblemon/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblemon", "version-date": "2019-06-13", - "port-version": 7, + "port-version": 8, "description": "Library for Efficient Modeling and Optimization in Networks", "homepage": "https://lemon.cs.elte.hu/trac/lemon", "dependencies": [ diff --git a/ports/liblsquic/portfile.cmake b/ports/liblsquic/portfile.cmake index b0d18b4a505a0c..922610fa1f7769 100644 --- a/ports/liblsquic/portfile.cmake +++ b/ports/liblsquic/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO litespeedtech/lsquic - REF v3.1.1 - SHA512 b4675be355703fea12f4b7d24812b93e739b2dbef04e3d8108b6fbe45dd16c129c9e04e58cdcfdf2a4448ee2edea68565dbd2445a76515bbdc8d9980f4210bee + REF v${VERSION} + SHA512 40d742779bfa2dc6fdaf0ee8e9349498d373dcffcc6dd27867c18d87309a288ea6811d693043b5d98364d816b818b49445214497475844201241193c0f37b349 HEAD_REF master PATCHES disable-asan.patch @@ -17,9 +17,9 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH # Submodules vcpkg_from_github(OUT_SOURCE_PATH LSQPACK_SOURCE_PATH REPO litespeedtech/ls-qpack - REF v2.3.0 + REF v2.5.3 HEAD_REF master - SHA512 7f5a9dd15bcd32c1bfafbecc5cea4da30f50a852c02d2bd140a2baaafd80ccb822c1701b0d20699af6367e9c712f4fe019741507c44156e9897d25162de0b8b4 + SHA512 f90502c763abc84532f33d1b8f952aea7869e4e0c5f6bd344532ddd51c4a180958de4086d88b9ec96673a059c806eec9e70007651d4d4e1a73395919dee47ce0 ) if(NOT EXISTS "${SOURCE_PATH}/src/ls-hpack/CMakeLists.txt") file(REMOVE_RECURSE "${SOURCE_PATH}/src/liblsquic/ls-qpack") @@ -28,9 +28,9 @@ endif() vcpkg_from_github(OUT_SOURCE_PATH LSHPACK_SOURCE_PATH REPO litespeedtech/ls-hpack - REF v2.3.0 + REF v2.3.2 HEAD_REF master - SHA512 45866b18042125cbbd008eed2935a938a42e1682030aa52ff4a324ddbad7bf9bd483161352cc8988bae668e132ee8b4b043ddc09d9e0316a66aaefd927ae2d76 + SHA512 45d6c8296e8eee511e6a083f89460d5333fc9a49bc078dac55fdec6c46db199de9f150379f02e054571f954a5e3c79af3864dbc53dc57d10a8d2ed26a92d4278 ) if(NOT EXISTS "${SOURCE_PATH}/src/lshpack/CMakeLists.txt") file(REMOVE_RECURSE "${SOURCE_PATH}/src/lshpack") diff --git a/ports/liblsquic/vcpkg.json b/ports/liblsquic/vcpkg.json index cb12234746972d..7c9e6f1834a3d1 100644 --- a/ports/liblsquic/vcpkg.json +++ b/ports/liblsquic/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liblsquic", - "version": "3.1.1", - "port-version": 2, + "version": "3.3.2", "description": "An implementation of the QUIC and HTTP/3 protocols.", "homepage": "https://github.com/litespeedtech/lsquic", "license": "MIT AND BSD-3-Clause", diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index fc0ecec4462627..0fdc38dfff9a5d 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tukaani-project/xz REF "v${VERSION}" - SHA512 67292be900a713035d2a3dab4c3b6697cf0db37a78faaa5e0d3f5a96909ef9645c15a6030af94fb7f4224c3ad8eacd1a653ba67dfdeb6372165c1c36e0cf16b7 + SHA512 c28461123562564e030f3f733f078bc4c840e87598d9f4b718d4bca639120d8133f969c45d7bdc62f33f081d789ec0f14a1791fb7da18515682bfe3c0c7362e0 HEAD_REF master PATCHES fix_config_include.patch diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json index c73bfcfa495324..e9168357cc7c16 100644 --- a/ports/liblzma/vcpkg.json +++ b/ports/liblzma/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liblzma", - "version": "5.4.3", - "port-version": 1, + "version": "5.4.4", "description": "Compression library with an API similar to that of zlib.", "homepage": "https://tukaani.org/xz/", "license": null, diff --git a/ports/libmagic/0016-Fix-file_famagic-function.patch b/ports/libmagic/0016-Fix-file_famagic-function.patch new file mode 100644 index 00000000000000..b3acf638c53805 --- /dev/null +++ b/ports/libmagic/0016-Fix-file_famagic-function.patch @@ -0,0 +1,40 @@ +diff --git a/src/fsmagic.c b/src/fsmagic.c +index 7244841..2c553c1 100644 +--- a/src/fsmagic.c ++++ b/src/fsmagic.c +@@ -66,7 +66,7 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.81 2019/07/16 13:30:32 christos Exp $") + # define minor(dev) ((dev) & 0xff) + #endif + #undef HAVE_MAJOR +-#if S_IFLNK != 0 ++#if S_IFLNK != 0 && ! defined(_WIN32) + private int + bad_link(struct magic_set *ms, int err, char *buf) + { +@@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + int ret, did = 0; + int mime = ms->flags & MAGIC_MIME; + int silent = ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION); +-#if S_IFLNK != 0 ++#if S_IFLNK != 0 && ! defined(_WIN32) + char buf[BUFSIZ+4]; + ssize_t nch; + struct stat tstatbuf; +@@ -122,7 +122,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + * Fstat is cheaper but fails for files you don't have read perms on. + * On 4.2BSD and similar systems, use lstat() to identify symlinks. + */ +-#if S_IFLNK != 0 ++#if S_IFLNK != 0 && ! defined(_WIN32) + if ((ms->flags & MAGIC_SYMLINK) == 0) + ret = lstat(fn, sb); + else +@@ -290,7 +290,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + return -1; + break; + #endif +-#if S_IFLNK != 0 ++#if S_IFLNK != 0 && ! defined(_WIN32) + case S_IFLNK: + if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) { + if (ms->flags & MAGIC_ERROR) { diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake index ed155792b7e108..902be26aafe152 100644 --- a/ports/libmagic/portfile.cmake +++ b/ports/libmagic/portfile.cmake @@ -15,6 +15,7 @@ if(VCPKG_TARGET_IS_WINDOWS) "0013-Check-for-backslash-in-argv-0-on-Windows.patch" "0014-Define-POSIX-macros-if-missing.patch" "0015-MSYS2-Remove-ioctl-call.patch" + "0016-Fix-file_famagic-function.patch" ) endif() diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index e37a180e755862..a8984202158d33 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmagic", "version": "5.40", - "port-version": 2, + "port-version": 3, "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", "dependencies": [ diff --git a/ports/libmaxminddb/fix-linux-build.patch b/ports/libmaxminddb/fix-linux-build.patch index bdf9b77805d2b4..db35979e633618 100644 --- a/ports/libmaxminddb/fix-linux-build.patch +++ b/ports/libmaxminddb/fix-linux-build.patch @@ -1,5 +1,5 @@ diff --git a/include/maxminddb.h b/include/maxminddb.h -index 13b276f..6c70e49 100644 +index 4002ec6..65482c5 100644 --- a/include/maxminddb.h +++ b/include/maxminddb.h @@ -24,11 +24,12 @@ extern "C" { @@ -7,13 +7,13 @@ index 13b276f..6c70e49 100644 #include +/* libmaxminddb package version from configure */ -+#define PACKAGE_VERSION "1.4.3" ++#define PACKAGE_VERSION "1.7.1" + #ifdef _WIN32 #include #include -/* libmaxminddb package version from configure */ --#define PACKAGE_VERSION "1.4.3" +-#define PACKAGE_VERSION "1.7.1" typedef ADDRESS_FAMILY sa_family_t; diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake index 7c437a09178c21..70a393c3999b83 100644 --- a/ports/libmaxminddb/portfile.cmake +++ b/ports/libmaxminddb/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO maxmind/libmaxminddb - REF 07797e9dfb6771190f9fa41a33babe19425ef552 #1.4.3 - SHA512 94f7fbd46a7846c804edad9759ceedf2f7c4b2085430322f74bea5c89f6c3fa0824f154f551119a8c69becec5120650efef89c6d7f5a2ef3df476086070c8c7e + REF "${VERSION}" + SHA512 0a5caa267712310ef5de4c33e008d02dff76f8a9672e370719cd1d3e0f8de1146b9120991f5c2e34ed81a4ee011510dcc4b30051f6e23a6fd0634f50d35252ec HEAD_REF master PATCHES fix-linux-build.patch ) diff --git a/ports/libmaxminddb/vcpkg.json b/ports/libmaxminddb/vcpkg.json index 721f1161b0aed9..9fdd6d252a9018 100644 --- a/ports/libmaxminddb/vcpkg.json +++ b/ports/libmaxminddb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmaxminddb", - "version": "1.4.3", - "port-version": 3, + "version": "1.7.1", "description": "C library for the MaxMind DB file format", "homepage": "https://github.com/maxmind/libmaxminddb", "dependencies": [ diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake index f2fd10408f9083..5493c35e33b636 100644 --- a/ports/libmediainfo/portfile.cmake +++ b/ports/libmediainfo/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/MediaInfoLib REF "v${MEDIAINFO_VERSION}" - SHA512 6bc58f98ac1fc9637db0e8dd3a2e15b62036a2d33763e148cde425fceea798324f7c5f53cd51fc698d5b5b05fe1fc0fbfc4f391d2ec135eba6763eedfa5bd101 + SHA512 1407f5690415ccb7997cc9bcbe7d90980a52b1d06e543a446a0da8e4cb3f09ba8fcfbf6be80b043d7f76eeb2ba219242da1c34f3225e0f0bfe044b2394c0c3ae HEAD_REF master PATCHES msvc-arm.diff diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json index 243535c901d221..072cdd1dbd96ef 100644 --- a/ports/libmediainfo/vcpkg.json +++ b/ports/libmediainfo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmediainfo", - "version": "23.4", + "version": "23.10", "description": "Get most relevant technical and tag data from video and audio files", "homepage": "https://github.com/MediaArea/MediaInfoLib", "dependencies": [ diff --git a/ports/libmorton/portfile.cmake b/ports/libmorton/portfile.cmake index 80c774e0e292fe..46e3dd457f2215 100644 --- a/ports/libmorton/portfile.cmake +++ b/ports/libmorton/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Forceflow/libmorton REF "v${VERSION}" - SHA512 ff1b0ebca3d38e886b4320bab38360dd537c3f63bf02aedfe5b00a81e026e52aff1a929361f8e2c4de9a18272a9e2a24c0085d7beb1be0adf6434777aad02ae5 + SHA512 020d9ba97204b8c028a8700d7212821dd75b6dbe1b4a77776777d06ef29bcad75cdc4e830f211daf6250779cc81ed4842a0632f89a7b7017eb071869a3c938fa HEAD_REF master ) diff --git a/ports/libmorton/vcpkg.json b/ports/libmorton/vcpkg.json index 8fff9e427f24f6..084c22d588738a 100644 --- a/ports/libmorton/vcpkg.json +++ b/ports/libmorton/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmorton", - "version": "0.2.11", + "version": "0.2.12", "description": "Header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates", "dependencies": [ { diff --git a/ports/libmspack/portfile.cmake b/ports/libmspack/portfile.cmake index ad80eadc35b9e9..07d318fd800c92 100644 --- a/ports/libmspack/portfile.cmake +++ b/ports/libmspack/portfile.cmake @@ -1,11 +1,11 @@ set(LIB_NAME libmspack) -set(LIB_VERSION 0.10.1alpha) +set(LIB_VERSION 0.11alpha) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz) vcpkg_download_distfile(ARCHIVE URLS "https://www.cabextract.org.uk/libmspack/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245 + SHA512 40c487e5b4e2f63a6cada26d29db51f605e8c29525a1cb088566d02cf2b1cc9dba263f80e2101d7f8e9d69cf7684a15bcaf791fb4891ad013a56afc7256dfa62 ) vcpkg_extract_source_archive( diff --git a/ports/libmspack/vcpkg.json b/ports/libmspack/vcpkg.json index 6b57cfd6f8c4ca..468378b5b425f0 100644 --- a/ports/libmspack/vcpkg.json +++ b/ports/libmspack/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmspack", - "version": "0.10.1", - "port-version": 6, + "version": "0.11", "description": "libmspack is a portable library for some loosely related Microsoft compression formats.", "homepage": "https://www.cabextract.org.uk/libmspack", "dependencies": [ diff --git a/ports/libnop/portfile.cmake b/ports/libnop/portfile.cmake index 5c10f5e60ffdce..e261042956883c 100644 --- a/ports/libnop/portfile.cmake +++ b/ports/libnop/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/libnop - REF 910b55815be16109f04f4180e9adee14fb4ce281 - SHA512 74c5324eaa1b6b2ac8dfef94c835b5c5b044625f8e5efe3522470b1ecc4798ff43d344a013cee2f6901e83267c6167072947b754e63f1552ae7044cffe234c36 + REF 35e800d81f28c632956c5a592e3cbe8085ecd430 + SHA512 27f62710afb41165db5ef54bb2d09f89ed9c0c0cb401bffe2c52590bb28c67ed6ba68922510cdedd6dc7cc75fc267a02a2f9cbcca4bfa85042792a121e27097e ) file(INSTALL ${SOURCE_PATH}/include/nop DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/libnop/vcpkg.json b/ports/libnop/vcpkg.json index be09bef23df997..f342378f123663 100644 --- a/ports/libnop/vcpkg.json +++ b/ports/libnop/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libnop", - "version-date": "2021-03-01", + "version-date": "2021-11-03", "description": "libnop is a header-only library for serializing and deserializing C++ data types without external code generators or runtime support libraries", "homepage": "https://github.com/google/libnop" } diff --git a/ports/libopenmpt/CMakeLists.txt b/ports/libopenmpt/CMakeLists.txt index cce387beb2f1f9..e33601cc0bbfb9 100644 --- a/ports/libopenmpt/CMakeLists.txt +++ b/ports/libopenmpt/CMakeLists.txt @@ -11,7 +11,7 @@ endif() find_package(ZLIB REQUIRED) find_package(mpg123 CONFIG REQUIRED) -find_package(Vorbis REQUIRED) +find_package(Vorbis CONFIG REQUIRED) file(GLOB HEADERS libopenmpt/*.h libopenmpt/*.hpp src/openmpt/all/*.hpp) list(FILTER HEADERS EXCLUDE REGEX "_impl\\.hpp$|_internal\\.h$") @@ -82,16 +82,16 @@ set(exec_prefix [[${prefix}]]) set(includedir [[${prefix}/include]]) set(libdir [[${prefix}/lib]]) configure_file(libopenmpt/libopenmpt.pc.in libopenmpt.pc) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt.pc DESTINATION lib/pkgconfig) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libopenmpt.pc" DESTINATION lib/pkgconfig) install(TARGETS libopenmpt EXPORT libopenmpt-targets) install(EXPORT libopenmpt-targets DESTINATION share/libopenmpt NAMESPACE libopenmpt::) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake [[ +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake" [[ include(CMakeFindDependencyMacro) find_dependency(ZLIB) find_dependency(mpg123 CONFIG) -find_dependency(Vorbis) -include(${CMAKE_CURRENT_LIST_DIR}/libopenmpt-targets.cmake) +find_dependency(Vorbis CONFIG) +include("${CMAKE_CURRENT_LIST_DIR}/libopenmpt-targets.cmake") ]]) install(FILES ${HEADERS} DESTINATION include/libopenmpt) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake DESTINATION share/libopenmpt) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake" DESTINATION share/libopenmpt) diff --git a/ports/libopenmpt/portfile.cmake b/ports/libopenmpt/portfile.cmake index c568c7a848744a..a0fb876fdfbb29 100644 --- a/ports/libopenmpt/portfile.cmake +++ b/ports/libopenmpt/portfile.cmake @@ -1,20 +1,17 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO OpenMPT/openmpt - REF 6860d1dec9bd31ed450a44148e789c4054925ed0 # libopenmpt-0.6.7 - SHA512 04c9d6e2d604dc412574f20ec2ef055dc721530ea1b6ea276f93071be4e6f451a78cc66c30470e361c95995f27759c69534f70419856f1ba6cfe69478b9207db - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenMPT/openmpt + REF "libopenmpt-${VERSION}" + SHA512 ff89a4bf9b1831a5ca1241bddbeff30a16bb32132165e73fb51f6ad43450c23ed236a1ad26e99f1e4af4a65cb58c8ca6140e09b7ac7cd57771526dec160d851b + HEAD_REF master ) -file(READ ${CMAKE_CURRENT_LIST_DIR}/vcpkg.json vcpkg_json) -string(JSON version GET "${vcpkg_json}" "version") - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DVERSION=${version} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup() @@ -27,5 +24,5 @@ else() vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libopenmpt/libopenmpt_config.h "defined(LIBOPENMPT_USE_DLL)" "1") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libopenmpt/vcpkg.json b/ports/libopenmpt/vcpkg.json index e60b7afbfe57fa..63ad48fa84c8cc 100644 --- a/ports/libopenmpt/vcpkg.json +++ b/ports/libopenmpt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libopenmpt", - "version": "0.6.7", - "description": "a cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.", + "version": "0.6.12", + "description": "A cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.", "homepage": "https://openmpt.org/", "license": "BSD-3-Clause", "dependencies": [ diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake index 977e0c2f8e42e2..c781c771854b39 100644 --- a/ports/libosip2/portfile.cmake +++ b/ports/libosip2/portfile.cmake @@ -34,7 +34,7 @@ if(VCPKG_TARGET_IS_WINDOWS) PROJECT_SUBPATH "platform/vsnet/osip2.vcxproj" ) - file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" PATTERN Makefile.* EXCLUDE) vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json index cf25d2463804b7..e6bfe4f5d1b9c2 100644 --- a/ports/libosip2/vcpkg.json +++ b/ports/libosip2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libosip2", "version": "5.2.0", - "port-version": 4, + "port-version": 5, "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", "homepage": "https://www.gnu.org/software/osip/", "supports": "!(windows & arm) & !uwp", diff --git a/ports/libpcap/add-disable-packet-option.patch b/ports/libpcap/add-disable-packet-option.patch index 9d89a550596e13..8cec80674ec8f5 100644 --- a/ports/libpcap/add-disable-packet-option.patch +++ b/ports/libpcap/add-disable-packet-option.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f675d1..e9d6d96 100644 +index 650be01..7565e58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -244,6 +244,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire +@@ -521,6 +521,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire option(DISABLE_SNF "Disable Myricom SNF support" OFF) option(DISABLE_TC "Disable Riverbed TurboCap support" OFF) @@ -10,22 +10,20 @@ index 2f675d1..e9d6d96 100644 # # Debugging options. -@@ -302,7 +303,7 @@ if(WIN32) +@@ -579,7 +580,7 @@ if(WIN32) if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common) include_directories(${CMAKE_HOME_DIRECTORY}/../../Common) endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common) - + if(NOT DISABLE_PACKET) find_package(Packet) - if(PACKET_FOUND) + if(Packet_FOUND) set(HAVE_PACKET32 TRUE) -@@ -317,7 +318,8 @@ if(WIN32) +@@ -594,6 +595,7 @@ if(WIN32) check_function_exists(PacketGetTimestampModes HAVE_PACKET_GET_TIMESTAMP_MODES) cmake_pop_check_state() - endif(PACKET_FOUND) -- + endif(Packet_FOUND) + endif() -+ + message(STATUS "checking for Npcap's version.h") check_symbol_exists(WINPCAP_PRODUCT_NAME "${CMAKE_SOURCE_DIR}/../../version.h" HAVE_VERSION_H) - if(HAVE_VERSION_H) diff --git a/ports/libpcap/install-pc-on-msvc.patch b/ports/libpcap/install-pc-on-msvc.patch index 0f07f6d435ecdf..2cc9513ac7d241 100644 --- a/ports/libpcap/install-pc-on-msvc.patch +++ b/ports/libpcap/install-pc-on-msvc.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b83fbbd..2f675d1 100644 +index 58c5159..650be01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2678,9 +2678,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include) +@@ -3238,9 +3238,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-bpf.h DESTINATION include) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include) @@ -18,20 +18,20 @@ index b83fbbd..2f675d1 100644 set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") set(includedir "\${prefix}/include") -@@ -2715,10 +2718,14 @@ if(NOT MSVC) - foreach(LIB ${PCAP_LINK_LIBRARIES}) - set(LIBS "${LIBS} -l${LIB}") - endforeach(LIB) +@@ -3308,10 +3311,14 @@ if(NOT MSVC) + set(RPATH "") + endif() + endif() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig) -+ +# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and +# pcap-config and process man pages and arrange that they be installed. +if(NOT MSVC) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) ++ # # Man pages. diff --git a/ports/libpcap/portfile.cmake b/ports/libpcap/portfile.cmake index 4d1823bcb5f091..d412bab8cdf086 100644 --- a/ports/libpcap/portfile.cmake +++ b/ports/libpcap/portfile.cmake @@ -14,8 +14,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO the-tcpdump-group/libpcap - REF c7642e2cc0c5bd65754685b160d25dc23c76c6bd #1.10.1 - SHA512 ed46095863aaee79ca2833d26438f6c837cc3e64acb73efd5a388a11ff7d0d1245d23e5404070a9f2c2c77840c93c09328746761e4481e9a530593a5cbf2ad6f + REF "libpcap-${VERSION}" + SHA512 7352ff4d5bded916c0802e4a846fcb6b26e3ea8025dbbf58543abd9d9f6e8f7f5d60e03bcadb222d20434b7e052f663a560d7487af4b81fba74cf5aea040d733 HEAD_REF master PATCHES install-pc-on-msvc.patch @@ -33,6 +33,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RT) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DDISABLE_NETMAP=ON -DDISABLE_BLUETOOTH=ON @@ -48,7 +49,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # On Windows 64-bit, libpcap 1.10.1 installs the libraries in a x64 subdirectory of the usual directories if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") diff --git a/ports/libpcap/vcpkg.json b/ports/libpcap/vcpkg.json index eaff7e2ced396e..bf007b5144294a 100644 --- a/ports/libpcap/vcpkg.json +++ b/ports/libpcap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpcap", - "version-semver": "1.10.1", - "port-version": 3, + "version-semver": "1.10.4", + "port-version": 1, "description": "A portable C/C++ library for network traffic capture", "homepage": "https://www.tcpdump.org/", "license": "BSD-3-Clause", diff --git a/ports/libphonenumber/portfile.cmake b/ports/libphonenumber/portfile.cmake index 774ee5e0274199..daccddbc190690 100644 --- a/ports/libphonenumber/portfile.cmake +++ b/ports/libphonenumber/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/libphonenumber REF "v${VERSION}" - SHA512 b1ec99aa952558d2ba26d95d7c1bdfd8169f992b3190cc4236e1ce17e69db50ef2839b2840a9553541e09c7509b77c463a1036f84251844ec71bd5888ef78555 + SHA512 d7a576e64fd3f3ce9d4f79750d8c785c56efd97d90f37d0062fb2634124ed6b181c74e772b4d9e72daf8897cc9cae4d4e525dd8b5113739c8c7ac7279315cd66 HEAD_REF master PATCHES fix-re2-identifiers.patch diff --git a/ports/libphonenumber/vcpkg.json b/ports/libphonenumber/vcpkg.json index a8227cfc565bc4..aec3bf3ca41eb3 100644 --- a/ports/libphonenumber/vcpkg.json +++ b/ports/libphonenumber/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libphonenumber", - "version": "8.13.17", + "version": "8.13.23", "description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.", "license": "Apache-2.0", "dependencies": [ diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 406372d31578e8..77abf18c278568 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://ftp.postgresql.org/pub/source/v${VERSION}/postgresql-${VERSION}.tar.bz2" FILENAME "postgresql-${VERSION}.tar.bz2" - SHA512 cac97edeb40df1e8f2162f401b465751132929d7249495ef001e950645a2db46343bd732e7bd6504a7f795e25aea66724f2f4ab0065e3d9331b36db4b3a3bec6 + SHA512 c66b72d2d9bc503b9ad19c67384517ae921c494b2916f32157c2528dcbb38aefeb4a8cd5003fd40ba8a19612ea64511d534ff5d99e7a1b266024232f983bcf39 ) vcpkg_extract_source_archive( diff --git a/ports/libpq/unix/fix-configure.patch b/ports/libpq/unix/fix-configure.patch index c0a7f78906ca89..e5e1b91658042f 100644 --- a/ports/libpq/unix/fix-configure.patch +++ b/ports/libpq/unix/fix-configure.patch @@ -1,10 +1,10 @@ diff --git a/configure.ac b/configure.ac -index 9a73f50..a35395e 100644 +index 7f97248..48ff1a1 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [15.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [16.0], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. +cross_compiling=yes # Avoid conftest loading shared objects @@ -12,7 +12,7 @@ index 9a73f50..a35395e 100644 Untested combinations of 'autoconf' and PostgreSQL versions are not recommended. You can remove the check from 'configure.ac' but it is then your responsibility whether the result works or not.])]) -@@ -1274,7 +1275,8 @@ if test "$enable_thread_safety" = yes; then +@@ -1311,7 +1312,8 @@ if test "$enable_thread_safety" = yes; then fi if test "$with_readline" = yes; then @@ -22,7 +22,7 @@ index 9a73f50..a35395e 100644 if test x"$pgac_cv_check_readline" = x"no"; then AC_MSG_ERROR([readline library not found If you have readline already installed, see config.log for details on the -@@ -1284,7 +1286,7 @@ Use --without-readline to disable readline support.]) +@@ -1321,7 +1323,7 @@ Use --without-readline to disable readline support.]) fi if test "$with_zlib" = yes; then @@ -31,7 +31,7 @@ index 9a73f50..a35395e 100644 [AC_MSG_ERROR([zlib library not found If you have zlib already installed, see config.log for details on the failure. It is possible the compiler isn't looking in the proper directory. -@@ -1333,6 +1335,9 @@ if test "$with_ssl" = openssl ; then +@@ -1370,6 +1372,9 @@ if test "$with_ssl" = openssl ; then # Minimum required OpenSSL version is 1.0.1 AC_DEFINE(OPENSSL_API_COMPAT, [0x10001000L], [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.]) @@ -41,15 +41,15 @@ index 9a73f50..a35395e 100644 if test "$PORTNAME" != "win32"; then AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) -@@ -1340,6 +1345,7 @@ if test "$with_ssl" = openssl ; then +@@ -1377,6 +1382,7 @@ if test "$with_ssl" = openssl ; then AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) fi + fi - # Function introduced in OpenSSL 1.0.2. - AC_CHECK_FUNCS([X509_get_signature_nid]) - # Functions introduced in OpenSSL 1.1.0. We used to check for -@@ -1363,19 +1369,23 @@ if test "$with_pam" = yes ; then + # Functions introduced in OpenSSL 1.0.2. LibreSSL does not have + # SSL_CTX_set_cert_cb(). + AC_CHECK_FUNCS([X509_get_signature_nid SSL_CTX_set_cert_cb]) +@@ -1403,19 +1409,23 @@ if test "$with_pam" = yes ; then fi if test "$with_libxml" = yes ; then diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 2574d459e77639..13e9e6d4b23b70 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libpq", - "version": "15.3", - "port-version": 2, + "version": "16.0", "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", diff --git a/ports/libpq/windows/msbuild.patch b/ports/libpq/windows/msbuild.patch index ce243a326e6e1d..27ff546441f0cd 100644 --- a/ports/libpq/windows/msbuild.patch +++ b/ports/libpq/windows/msbuild.patch @@ -1,5 +1,5 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index 8de79c6..3bc677d 100644 +index 05548d7..097db91 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -53,6 +53,11 @@ sub Install @@ -83,7 +83,7 @@ index 8de79c6..3bc677d 100644 || croak "Could not copy $pf.pdb\n"; print "."; } -@@ -482,7 +506,7 @@ sub CopySubdirFiles +@@ -453,7 +477,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f.control", @@ -92,7 +92,7 @@ index 8de79c6..3bc677d 100644 || croak("Could not copy file $f.control in contrib $module"); print '.'; } -@@ -500,7 +524,7 @@ sub CopySubdirFiles +@@ -471,7 +495,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f", @@ -101,7 +101,7 @@ index 8de79c6..3bc677d 100644 || croak("Could not copy file $f in contrib $module"); print '.'; } -@@ -515,7 +539,7 @@ sub CopySubdirFiles +@@ -486,7 +510,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f", @@ -110,7 +110,7 @@ index 8de79c6..3bc677d 100644 || croak("Could not copy file $f in $subdir $module"); print '.'; } -@@ -578,7 +602,7 @@ sub CopySubdirFiles +@@ -549,7 +573,7 @@ sub CopySubdirFiles if ($module eq 'spi'); foreach my $f (split /\s+/, $flist) { @@ -119,7 +119,7 @@ index 8de79c6..3bc677d 100644 || croak("Could not copy file $f in contrib $module"); print '.'; } -@@ -708,7 +732,7 @@ sub GenerateNLSFiles +@@ -675,7 +699,7 @@ sub GenerateNLSFiles my $majorver = shift; print "Installing NLS files..."; @@ -128,7 +128,7 @@ index 8de79c6..3bc677d 100644 my @flist; File::Find::find( { -@@ -730,12 +754,12 @@ sub GenerateNLSFiles +@@ -697,12 +721,12 @@ sub GenerateNLSFiles next unless /([^\/]+)\.po/; $lang = $1; @@ -146,35 +146,36 @@ index 8de79c6..3bc677d 100644 system(@args) && croak("Could not run msgfmt on $dir\\$_"); print "."; diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index f24d9e5..356cc31 100644 +index 62fec1f..ecb1b86 100644 --- a/src/tools/msvc/MSBuildProject.pm +++ b/src/tools/msvc/MSBuildProject.pm -@@ -81,13 +81,14 @@ EOF +@@ -80,14 +80,14 @@ EOF + print $f < EOF - -+ my $maybe_dll = $self->{solution}->{options}->{VCPKG_CRT_LINKAGE} eq 'dynamic' ? "DLL" : ''; +- ++ my $maybe_dll = $self->{solution}->{options}->{VCPKG_CRT_LINKAGE} eq 'dynamic' ? "DLL" : ''; $self->WriteItemDefinitionGroup( $f, 'Debug', { - defs => "_DEBUG;DEBUG=1", - opt => 'Disabled', + defs => "_DEBUG;DEBUG=1", + opt => 'Disabled', strpool => 'false', - runtime => 'MultiThreadedDebugDLL' + runtime => 'MultiThreadedDebug' . $maybe_dll }); $self->WriteItemDefinitionGroup( $f, -@@ -96,7 +97,7 @@ EOF - defs => "", - opt => 'Full', +@@ -96,7 +96,7 @@ EOF + defs => "", + opt => 'Full', strpool => 'true', - runtime => 'MultiThreadedDLL' + runtime => 'MultiThreaded' . $maybe_dll }); return; } -@@ -266,6 +267,8 @@ sub WriteConfigurationPropertyGroup +@@ -266,6 +266,8 @@ sub WriteConfigurationPropertyGroup ($self->{type} eq "exe") ? 'Application' : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); @@ -183,7 +184,7 @@ index f24d9e5..356cc31 100644 print $f < -@@ -311,7 +314,9 @@ sub WriteItemDefinitionGroup +@@ -311,7 +313,9 @@ sub WriteItemDefinitionGroup my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';'); my $targetmachine = @@ -191,42 +192,33 @@ index f24d9e5..356cc31 100644 + 'Machine' . uc($self->{platform}); + $targetmachine =~ s/WIN32/X86/; + my $randomizebase = ($self->{platform} =~ /^ARM/) ? 'true' : 'false'; + my $arch = $self->{platform} eq 'Win32' ? 'x86' : 'x86_64'; my $includes = join ';', @{ $self->{includes} }, ""; - -@@ -347,7 +352,7 @@ sub WriteItemDefinitionGroup - .\\$cfgname\\$self->{name}\\$self->{name}.pdb - false - .\\$cfgname\\$self->{name}\\$self->{name}.map -- false -+ $randomizebase - - - Console diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index ef0a33c..dd68424 100644 +index 9e05eb9..8ac0a5d 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm -@@ -114,8 +114,10 @@ sub mkvcbuild +@@ -125,8 +125,10 @@ sub mkvcbuild if ($vsVersion >= '9.00') { -+ if ($solution->{platform} !~ /^ARM/) { ++ if ($solution->{platform} !~ /^ARM/) { push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); push(@pgportfiles, 'pg_crc32c_sse42.c'); -+ } ++ } push(@pgportfiles, 'pg_crc32c_sb8.c'); } else -@@ -196,6 +198,7 @@ sub mkvcbuild +@@ -208,6 +210,7 @@ sub mkvcbuild 'syncrep_gram.y'); $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', 'jsonpath_gram.y'); -+ ($config->{VCPKG_LIBRARY_LINKAGE} eq 'dynamic') && ++ ($config->{VCPKG_LIBRARY_LINKAGE} eq 'dynamic') && $postgres->AddDefine('BUILDING_DLL'); $postgres->AddLibrary('secur32.lib'); $postgres->AddLibrary('ws2_32.lib'); -@@ -240,12 +243,13 @@ sub mkvcbuild +@@ -252,12 +255,13 @@ sub mkvcbuild $pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include'); $pltcl->AddReference($postgres); @@ -242,17 +234,17 @@ index ef0a33c..dd68424 100644 $found = 1; last; } -@@ -500,8 +504,7 @@ sub mkvcbuild +@@ -512,8 +516,7 @@ sub mkvcbuild . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; my $prefixcmd = qq("$solution->{options}->{python}\\python" -c "$pythonprog"); - my $pyout = `$prefixcmd`; - die "Could not query for python version!\n" if $?; -+ my $pyout = "$solution->{options}->{python}\n$solution->{options}->{python_version}"; ++ my $pyout = "$solution->{options}->{python}\n$solution->{options}->{python_version}"; my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); # Sometimes (always?) if python is not present, the execution -@@ -517,8 +520,8 @@ sub mkvcbuild +@@ -529,8 +532,8 @@ sub mkvcbuild my $plpython = $solution->AddProject('plpython' . $pymajorver, 'dll', 'PLs', 'src/pl/plpython'); @@ -264,7 +256,7 @@ index ef0a33c..dd68424 100644 # Add transform modules dependent on plpython diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm -index 570bab5..2d51abe 100644 +index 0507ad0..48caab9 100644 --- a/src/tools/msvc/Project.pm +++ b/src/tools/msvc/Project.pm @@ -167,6 +167,11 @@ sub AddReference @@ -280,7 +272,7 @@ index 570bab5..2d51abe 100644 return; } diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index d30e8fc..231275b 100644 +index b6d31c3..27d89fc 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -63,6 +63,11 @@ sub DeterminePlatform @@ -308,22 +300,22 @@ index d30e8fc..231275b 100644 @@ -148,7 +156,7 @@ sub GetOpenSSLVersion sub GenerateFiles { - my $self = shift; -- my $bits = $self->{platform} eq 'Win32' ? 32 : 64; + my $self = shift; +- my $bits = $self->{platform} eq 'Win32' ? 32 : 64; + my $bits = $self->{platform} =~ /64/ ? 64 : 32; my $ac_init_found = 0; my $package_name; my $package_version; -@@ -502,7 +510,7 @@ sub GenerateFiles - USE_PAM => undef, - USE_SLICING_BY_8_CRC32C => undef, - USE_SSE42_CRC32C => undef, +@@ -440,7 +448,7 @@ sub GenerateFiles + USE_PAM => undef, + USE_SLICING_BY_8_CRC32C => undef, + USE_SSE42_CRC32C => undef, - USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => 1, + USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => $self->{platform} =~ /^ARM/ ? undef : 1, - USE_SYSTEMD => undef, - USE_SYSV_SEMAPHORES => undef, - USE_SYSV_SHARED_MEMORY => undef, -@@ -760,14 +768,14 @@ sub GenerateFiles + USE_SYSTEMD => undef, + USE_SYSV_SEMAPHORES => undef, + USE_SYSV_SHARED_MEMORY => undef, +@@ -725,14 +733,14 @@ sub GenerateFiles || confess "Could not open pg_config_paths.h"; print $o <{options}->{zlib}) { $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); @@ -357,7 +349,7 @@ index d30e8fc..231275b 100644 my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion(); # Starting at version 1.1.0 the OpenSSL installers have -@@ -1027,7 +1039,7 @@ sub AddProject +@@ -1032,7 +1044,7 @@ sub AddProject if ($self->{options}->{nls}) { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); @@ -366,7 +358,7 @@ index d30e8fc..231275b 100644 } if ($self->{options}->{gss}) { -@@ -1060,6 +1072,10 @@ sub AddProject +@@ -1065,6 +1077,10 @@ sub AddProject if ($self->{options}->{icu}) { $proj->AddIncludeDir($self->{options}->{icu} . '\include'); @@ -377,7 +369,7 @@ index d30e8fc..231275b 100644 if ($self->{platform} eq 'Win32') { $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); -@@ -1077,22 +1093,22 @@ sub AddProject +@@ -1082,22 +1098,22 @@ sub AddProject { $proj->AddIncludeDir($self->{options}->{xml} . '\include'); $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); @@ -405,24 +397,15 @@ index d30e8fc..231275b 100644 if ($self->{options}->{uuid}) { diff --git a/src/tools/msvc/gendef.pl b/src/tools/msvc/gendef.pl -index b8c514a..1fb7619 100644 +index cf83d7d..2d9a4ec 100644 --- a/src/tools/msvc/gendef.pl +++ b/src/tools/msvc/gendef.pl @@ -122,7 +122,7 @@ sub writedef # Strip the leading underscore for win32, but not x64 $f =~ s/^_// -- unless ($platform eq "x64"); -+ if ($platform eq "Win32"); +- unless ($arch eq "x86_64"); ++ if ($arch eq "Win32"); # Emit just the name if it's a function symbol, or emit the name # decorated with the DATA option for variables. -@@ -150,7 +150,7 @@ sub usage - usage() - unless scalar(@ARGV) == 2 - && ( ($ARGV[0] =~ /\\([^\\]+$)/) -- && ($ARGV[1] eq 'Win32' || $ARGV[1] eq 'x64')); -+ && ($ARGV[1] ne '')); - my $defname = uc $1; - my $deffile = "$ARGV[0]/$defname.def"; - my $platform = $ARGV[1]; diff --git a/ports/libpq/windows/win_bison_flex.patch b/ports/libpq/windows/win_bison_flex.patch index 645d53af2194cf..fc8230193cf85d 100644 --- a/ports/libpq/windows/win_bison_flex.patch +++ b/ports/libpq/windows/win_bison_flex.patch @@ -1,6 +1,26 @@ +diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl +index 25df669..373bedd 100644 +--- a/src/tools/msvc/pgbison.pl ++++ b/src/tools/msvc/pgbison.pl +@@ -13,7 +13,7 @@ use File::Basename; + + do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; + +-my ($bisonver) = `bison -V`; # grab first line ++my ($bisonver) = `win_bison -V`; # grab first line + $bisonver = (split(/\s+/, $bisonver))[3]; # grab version number + + unless ($bisonver ge '2.3') +@@ -51,5 +51,5 @@ my $headerflag = ($make =~ /^$basetarg:\s+BISONFLAGS\b.*-d/m ? '-d' : ''); + + my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : ""; + +-system("bison $nodep $headerflag $input -o $output"); ++system("win_bison $nodep $headerflag $input -o $output"); + exit $? >> 8; diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl -index aceed5ffd..f6ed215e8 100644 ---- a/src/tools/msvc/pgflex.pl +index c308a08..0807ce7 100644 +--- a/src/tools/msvc/pgflex.pl +++ b/src/tools/msvc/pgflex.pl @@ -16,7 +16,7 @@ $ENV{CYGWIN} = 'nodosfilewarning'; @@ -20,24 +40,3 @@ index aceed5ffd..f6ed215e8 100644 if ($? == 0) { -diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl -index 895e398c0..f5b524a5d 100644 ---- a/src/tools/msvc/pgbison.pl -+++ b/src/tools/msvc/pgbison.pl -@@ -13,7 +13,7 @@ use File::Basename; - - do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; - --my ($bisonver) = `bison -V`; # grab first line -+my ($bisonver) = `win_bison -V`; # grab first line - $bisonver = (split(/\s+/, $bisonver))[3]; # grab version number - - unless ($bisonver eq '1.875' || $bisonver ge '2.2') -@@ -51,5 +51,5 @@ close($mf); - - my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : ""; - --system("bison $nodep $headerflag $input -o $output"); -+system("win_bison $nodep $headerflag $input -o $output"); - exit $? >> 8; - diff --git a/ports/libpqxx/fix_build_with_vs2017.patch b/ports/libpqxx/fix_build_with_vs2017.patch index 9892415b0add1c..48b648b4fc8476 100644 --- a/ports/libpqxx/fix_build_with_vs2017.patch +++ b/ports/libpqxx/fix_build_with_vs2017.patch @@ -27,48 +27,48 @@ index abc1a39..cba0242 100644 #if defined(PQXX_HAVE_LIKELY) # define PQXX_LIKELY [[likely]] diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx -index ff4a93d..5b300d6 100644 +index 1e8a272..299248c 100644 --- a/include/pqxx/stream_from.hxx +++ b/include/pqxx/stream_from.hxx -@@ -153,7 +153,7 @@ public: +@@ -160,7 +160,7 @@ public: /** @deprecated Use factories @ref table or @ref raw_table instead. */ template -- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( -+ PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from( +- [[deprecated("Use transaction_base::stream instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from( transaction_base &, from_table_t, std::string_view table, Iter columns_begin, Iter columns_end); -@@ -161,13 +161,13 @@ public: +@@ -168,13 +168,13 @@ public: /** @deprecated Use factory function @ref query instead. */ template -- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( -+ PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from( +- [[deprecated("Use transaction_base::stream() instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream() instead.") stream_from( transaction_base &tx, from_table_t, std::string_view table, Columns const &columns); #include "pqxx/internal/ignore-deprecated-pre.hxx" /// @deprecated Use factories @ref table or @ref raw_table instead. -- [[deprecated("Use the from_table_t overload instead.")]] stream_from( -+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( +- [[deprecated("Use transaction_base::stream instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from( transaction_base &tx, std::string_view table) : stream_from{tx, from_table, table} {} -@@ -175,14 +175,14 @@ public: +@@ -182,14 +182,14 @@ public: /// @deprecated Use factories @ref table or @ref raw_table instead. template -- [[deprecated("Use the from_table_t overload instead.")]] stream_from( -+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( +- [[deprecated("Use transaction_base::stream instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from( transaction_base &tx, std::string_view table, Columns const &columns) : stream_from{tx, from_table, table, columns} {} /// @deprecated Use factories @ref table or @ref raw_table instead. template -- [[deprecated("Use the from_table_t overload instead.")]] stream_from( -+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( +- [[deprecated("Use transaction_base::stream instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from( transaction_base &, std::string_view table, Iter columns_begin, Iter columns_end); diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index cdbde3f5810e65..da75692fbffe5e 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jtv/libpqxx - REF 17e5a6c8ac3abc05329891aaa378bd6004b9c8ee # 7.7.4 - SHA512 51dc5525e801696b7716e4a4a7d8d794baa5bf7372da62a30e4b602bfb09ff53a4355bfc5e39945636cff018095d2917c9a79181bb3f824091b7780863b0073c + REF "${VERSION}" + SHA512 ce37fdfce2671d97e422ae3339fb5650065111b0635a7293200c56a8755a7dc7de80806816863c606c46b6049e4cb490d24dfb97446ea0014b55907554862fed HEAD_REF master PATCHES fix_build_with_vs2017.patch @@ -23,6 +23,6 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpqxx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_fixup_pkgconfig() diff --git a/ports/libpqxx/vcpkg.json b/ports/libpqxx/vcpkg.json index 43e3536c0942c4..29e8aced825fe7 100644 --- a/ports/libpqxx/vcpkg.json +++ b/ports/libpqxx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libpqxx", - "version": "7.7.4", + "version": "7.8.1", "description": "The official C++ client API for PostgreSQL", "homepage": "https://www.postgresql.org/", "license": "BSD-3-Clause", diff --git a/ports/libqtrest/portfile.cmake b/ports/libqtrest/portfile.cmake new file mode 100644 index 00000000000000..f518909e0d44a2 --- /dev/null +++ b/ports/libqtrest/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO qtrest/qtrest + REF ${VERSION} + SHA512 2bdbbdde7c4f7a27943c93a2a26abe89e087e6b7c32d0e481422a8ad3e78c66c6921ef00c1cbf17f3b61db8a678685371c819218d10576ac9ec1548262415c04 + HEAD_REF master +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_TYPE SHARED) +else() + set(BUILD_TYPE STATIC) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + qml WITH_QML_SUPPORT +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TYPE=${BUILD_TYPE} + -DBUILD_EXAMPLE=0 + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/libqtrest/vcpkg.json b/ports/libqtrest/vcpkg.json new file mode 100644 index 00000000000000..4ba8ac6a47cad0 --- /dev/null +++ b/ports/libqtrest/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libqtrest", + "version": "0.4.0", + "description": "Small and simple REST API (Json/Xml) client for any Qt/QML C++ application", + "homepage": "https://github.com/qtrest/qtrest", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "qml": { + "description": "Enable QML support to compile with required dependencies", + "dependencies": [ + { + "name": "qt5-declarative", + "default-features": false + } + ] + } + } +} diff --git a/ports/libraqm/portfile.cmake b/ports/libraqm/portfile.cmake index f19f010bfc70f2..84d967ff4adc0c 100644 --- a/ports/libraqm/portfile.cmake +++ b/ports/libraqm/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(RAQM_VERSION_MAJOR 0) -set(RAQM_VERSION_MINOR 9) -set(RAQM_VERSION_MICRO 0) +set(RAQM_VERSION_MINOR 10) +set(RAQM_VERSION_MICRO 1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HOST-Oman/libraqm REF v${RAQM_VERSION_MAJOR}.${RAQM_VERSION_MINOR}.${RAQM_VERSION_MICRO} - SHA512 a45c442a087c806143e5a96878e1d84a31afb7b682d71931fcb014c8d56b974d5a0d6186b163067d44a15952b3c549763f84354ed799f20473795f15d719f060 + SHA512 d35fd37764c153235ad89721be7a2a11212c1d3241383d81499ca5fe83e90d625e29e42a00edd626bff78bd0f72209f36826c84f59cd1504258079ed532329b6 HEAD_REF master ) diff --git a/ports/libraqm/vcpkg.json b/ports/libraqm/vcpkg.json index b969212a213cff..3401c2bea0b80f 100644 --- a/ports/libraqm/vcpkg.json +++ b/ports/libraqm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libraqm", - "version": "0.9.0", - "port-version": 1, + "version": "0.10.1", "description": "A library for complex text layout", "homepage": "https://github.com/HOST-Oman/libraqm", "dependencies": [ diff --git a/ports/libremidi/fix-install.patch b/ports/libremidi/fix-install.patch new file mode 100644 index 00000000000000..6a6f38137761ed --- /dev/null +++ b/ports/libremidi/fix-install.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/libremidi.install.cmake b/cmake/libremidi.install.cmake +index 08e17f5..985e9a5 100644 +--- a/cmake/libremidi.install.cmake ++++ b/cmake/libremidi.install.cmake +@@ -1,7 +1,7 @@ + if(NOT LIBREMIDI_HEADER_ONLY) + install(TARGETS libremidi + EXPORT libremidi-targets +- ARCHIVE DESTINATION lib/static ++ ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ) diff --git a/ports/libremidi/portfile.cmake b/ports/libremidi/portfile.cmake index edff0a344b7f36..16c90785245391 100644 --- a/ports/libremidi/portfile.cmake +++ b/ports/libremidi/portfile.cmake @@ -2,17 +2,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jcelerier/libremidi REF "v${VERSION}" - - SHA512 7b73d5e1a565e9f85ac28fba041c66a151537a9205b4f3605fa70e18d5e651fa0562329853c7e08bf8e620f9d83d08d167b746d30c39bffcd325fbd6338d0538 + SHA512 de7092c70af6fc0a23c8e6018fbd9f380632ac9dec8794171726fda9a6e7ba45479a8e8317919ba7a8a0267524bab8d5430782a54bc50a914658cf277e18145b HEAD_REF master + PATCHES + fix-install.patch ) +vcpkg_list(SET options) +if(VCPKG_TARGET_IS_LINUX) + vcpkg_list(APPEND options -DLIBREMIDI_NO_ALSA=OFF) +else() + vcpkg_list(APPEND options -DLIBREMIDI_NO_ALSA=ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${options} + -DLIBREMIDI_NO_BOOST=ON + -DLIBREMIDI_NO_JACK=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libremidi PACKAGE_NAME libremidi) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") - diff --git a/ports/libremidi/vcpkg.json b/ports/libremidi/vcpkg.json index a5496a058112f3..103952cd13a855 100644 --- a/ports/libremidi/vcpkg.json +++ b/ports/libremidi/vcpkg.json @@ -1,10 +1,15 @@ { "name": "libremidi", - "version": "4.1.0", + "version": "4.2.3", + "port-version": 2, "description": "A modern C++ MIDI real-time & file I/O library", "homepage": "https://github.com/jcelerier/libremidi", "license": "BSD-2-Clause", "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/libsbml/dependencies.diff b/ports/libsbml/dependencies.diff new file mode 100644 index 00000000000000..1f54a0400bfce5 --- /dev/null +++ b/ports/libsbml/dependencies.diff @@ -0,0 +1,131 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8af3a4..3926b68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -421,8 +421,9 @@ set(LIBSBML_XML_LIBRARY_LIBS) + if(WITH_EXPAT) + + if(NOT TARGET EXPAT::EXPAT) +- find_package(EXPAT REQUIRED) + endif() ++ find_package(EXPAT NAMES expat REQUIRED) ++ set(EXPAT_LIBRARY expat::expat) + + add_definitions( -DUSE_EXPAT ) + list(APPEND SWIG_EXTRA_ARGS -DUSE_EXPAT) +@@ -443,7 +444,8 @@ endif(WITH_EXPAT) + set(USE_LIBXML OFF) + if(WITH_LIBXML) + +- find_package(LIBXML REQUIRED) ++ find_package(LIBXML NAMES LibXml2 REQUIRED) ++ set(LIBXML_LIBRARY LibXml2::LibXml2) + + add_definitions( -DUSE_LIBXML ) + list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML) +@@ -495,7 +497,7 @@ endif() + option(WITH_BZIP2 "Enable the use of bzip2 compression." ${BZIP_INITIAL_VALUE}) + set(USE_BZ2 OFF) + if(WITH_BZIP2) +- find_package(BZ2 REQUIRED) ++ find_package(BZip2 REQUIRED) + set(USE_BZ2 ON) + add_definitions( -DUSE_BZ2 ) + list(APPEND SWIG_EXTRA_ARGS -DUSE_BZ2) +@@ -521,6 +525,9 @@ Separate multiple directories using semicolons." ) + # Locate zlib + # + ++if(WITH_ZLIB) ++ find_package(ZLIB REQUIRED) ++endif() + set(ZLIB_INITIAL_VALUE) + if (NOT LIBZ_LIBRARY) + find_library(LIBZ_LIBRARY +@@ -614,7 +621,6 @@ valid. It should contain the file zlib.h, but it does not.") + endif(WITH_ZLIB) + + # install find scripts only for used dependencies +-install(FILES ${LIBSBML_FIND_MODULES} DESTINATION share/cmake/Modules) + + ############################################################################### + # +@@ -671,7 +677,12 @@ if(WITH_CHECK) + + enable_testing() + +- find_package(CHECK REQUIRED) ++ find_package(CHECK NAMES check REQUIRED) ++ if(BUILD_SHARED_LIBS) ++ add_library(CHECK::CHECK ALIAS Check::checkShared) ++ else() ++ add_library(CHECK::CHECK ALIAS Check::check) ++ endif() + + if (UNIX) + # setup valgrind +@@ -1005,17 +1016,18 @@ install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX}) + # + + set (PRIVATE_LIBS "-lstdc++ -lm") ++set (PRIVATE_REQUIRES "") + if (WITH_ZLIB) +-set (PRIVATE_LIBS "${LIBZ_LIBRARY} ${PRIVATE_LIBS}") ++ string(APPEND PRIVATE_REQUIRES " zlib") + endif() + if (WITH_BZIP2) +-set (PRIVATE_LIBS "${LIBBZ_LIBRARY} ${PRIVATE_LIBS}") ++ string(APPEND PRIVATE_REQUIRES " bzip2") + endif() + if (WITH_LIBXML) +-set (PRIVATE_LIBS "${LIBXML_LIBRARY} ${PRIVATE_LIBS}") ++ string(APPEND PRIVATE_REQUIRES " libxml-2.0") + endif() + if (WITH_EXPAT) +-set (PRIVATE_LIBS "${LIBEXPAT_LIBRARY} ${PRIVATE_LIBS}") ++ string(APPEND PRIVATE_REQUIRES " expat") + endif() + if (WITH_XERCES) + set (PRIVATE_LIBS "${XERCES_LIBRARY} ${PRIVATE_LIBS}") +@@ -1037,9 +1049,7 @@ if (WITH_XERCES) + file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Conflicts: xerces-c = 2.6.0\n") + endif() + +-if (WITH_LIBXML) +-file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: libxml-2.0 >= 2.6.22\n") +-endif() ++file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: ${PRIVATE_REQUIRES}\n") + + if (UNIX OR MINGW) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 79301a6..0957d29 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -311,7 +311,7 @@ if(WITH_BZIP2) + sbml/compress/bzfstream.h + sbml/compress/bzfstream.cpp + ) +- set(LIBSBML_LIBS ${LIBSBML_LIBS} BZ2::BZ2) ++ set(LIBSBML_LIBS ${LIBSBML_LIBS} BZip2::BZip2) + + endif() + +@@ -405,7 +405,7 @@ if(WITH_EXPAT) + sbml/xml/ExpatHandler.h + sbml/xml/ExpatParser.h + ) +- set(LIBSBML_LIBS ${LIBSBML_LIBS} EXPAT::EXPAT) ++ set(LIBSBML_LIBS ${LIBSBML_LIBS} expat::expat) + + endif(WITH_EXPAT) + +@@ -423,7 +423,7 @@ if(WITH_LIBXML) + sbml/xml/LibXMLParser.h + sbml/xml/LibXMLTranscode.h + ) +- set(LIBSBML_LIBS ${LIBSBML_LIBS} LIBXML::LIBXML) ++ set(LIBSBML_LIBS ${LIBSBML_LIBS} LibXml2::LibXml2) + + endif(WITH_LIBXML) + diff --git a/ports/libsbml/dirent.diff b/ports/libsbml/dirent.diff new file mode 100644 index 00000000000000..538bca3fdd482c --- /dev/null +++ b/ports/libsbml/dirent.diff @@ -0,0 +1,28 @@ +diff --git a/src/sbml/validator/test/tps/dirent.c b/src/sbml/validator/test/tps/dirent.c +index beafc5e..48a60ca 100644 +--- a/src/sbml/validator/test/tps/dirent.c ++++ b/src/sbml/validator/test/tps/dirent.c +@@ -1,3 +1,4 @@ ++#if 0 + /* ///////////////////////////////////////////////////////////////////////////// + * File: dirent.c + * +@@ -239,3 +240,4 @@ struct dirent *readdir(DIR *dir) + } + + /* ////////////////////////////////////////////////////////////////////////// */ ++#endif +diff --git a/src/sbml/validator/test/tps/dirent.h b/src/sbml/validator/test/tps/dirent.h +index 4703aa2..8e4c29c 100644 +--- a/src/sbml/validator/test/tps/dirent.h ++++ b/src/sbml/validator/test/tps/dirent.h +@@ -46,6 +46,9 @@ + + #ifndef SYNSOFT_UNIXEM_INCL_H_DIRENT + #define SYNSOFT_UNIXEM_INCL_H_DIRENT ++#include ++#endif ++#if 0 + + #ifndef _SYNSOFT_DOCUMENTATION_SKIP_SECTION + # define SYNSOFT_UNIXEM_VER_H_DIRENT_MAJOR 2 diff --git a/ports/libsbml/fix-deps-libxml.patch b/ports/libsbml/fix-deps-libxml.patch deleted file mode 100644 index 1b30586d26eb1c..00000000000000 --- a/ports/libsbml/fix-deps-libxml.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42b3bd6..34e9a4c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -442,17 +442,15 @@ endif(WITH_EXPAT) - set(USE_LIBXML OFF) - if(WITH_LIBXML) - -- find_package(LIBXML REQUIRED) -+ find_package(LibXml2 REQUIRED) - - add_definitions( -DUSE_LIBXML ) - list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML) - set(USE_LIBXML ON) - -- set(LIBSBML_XML_LIBRARY "libxml2") -- set(LIBSBML_XML_LIBRARY_INCLUDE ${LIBXML_INCLUDE_DIR}) -- set(LIBSBML_XML_LIBRARY_LIBS ${LIBXML_LIBRARY}) -+ set(LIBSBML_XML_LIBRARY "LibXml2::LibXml2") -+ set(LIBSBML_XML_LIBRARY_LIBS ${LIBSBML_XML_LIBRARY}) - -- list(APPEND LIBSBML_FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/FindLIBXML.cmake") - - endif(WITH_LIBXML) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 79301a6..985f6cb 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -423,7 +423,7 @@ if(WITH_LIBXML) - sbml/xml/LibXMLParser.h - sbml/xml/LibXMLTranscode.h - ) -- set(LIBSBML_LIBS ${LIBSBML_LIBS} LIBXML::LIBXML) -+ set(LIBSBML_LIBS ${LIBSBML_LIBS} LibXml2::LibXml2) - - endif(WITH_LIBXML) - diff --git a/ports/libsbml/libsbml-config.cmake b/ports/libsbml/libsbml-config.cmake index 76a1cf6372ce8a..c0cd40a1d34fea 100644 --- a/ports/libsbml/libsbml-config.cmake +++ b/ports/libsbml/libsbml-config.cmake @@ -1,6 +1,6 @@ include(CMakeFindDependencyMacro) -find_dependency(libsbml-static CONFIG) +find_dependency(@name@ CONFIG) if(NOT TARGET libsbml) add_library(libsbml INTERFACE IMPORTED) - target_link_libraries(libsbml INTERFACE libsbml-static) + target_link_libraries(libsbml INTERFACE $) endif() diff --git a/ports/libsbml/no-docs.diff b/ports/libsbml/no-docs.diff new file mode 100644 index 00000000000000..acac8f31ff2258 --- /dev/null +++ b/ports/libsbml/no-docs.diff @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ad678a..f856774 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1012,7 +1012,6 @@ set(DOCUMENTATION_FILES + VERSION.txt + ) + +-install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX}) + + ############################################################################### + # diff --git a/ports/libsbml/portfile.cmake b/ports/libsbml/portfile.cmake index 5400ae90f61f2d..cab0f5008da5fb 100644 --- a/ports/libsbml/portfile.cmake +++ b/ports/libsbml/portfile.cmake @@ -2,16 +2,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sbmlteam/libsbml REF "v${VERSION}" - SHA512 c40f164ebd05a36f140ce2684dedb4bbccc51a2732383d3935fca1258738a9b9ba5bc1be2061f3b113b213e5cbb7fe22e9dca43ff78d91964c79cad093e55466 + SHA512 2770c1d3295e22ed8fb8dfa2480efa160fc61fbeeca3a9e214e210acb3fd6531a5cfb22eeb72c5334158bf8ba21c27015d0910487a7ef060f594a708f197676c HEAD_REF development PATCHES - fix-deps-libxml.patch + dependencies.diff + dirent.diff + no-docs.diff + test-shared.diff ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LIBRARY) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DYNAMIC_LIBRARY) +if("expat" IN_LIST FEATURES AND "libxml2" IN_LIST FEATURES) + message("Feature expat conflicts with feature libxml2. Selecting libxml2.") + list(REMOVE_ITEM FEATURES "expat") +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES comp ENABLE_COMP @@ -22,76 +30,46 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS qual ENABLE_QUAL render ENABLE_RENDER bzip2 WITH_BZIP2 + expat WITH_EXPAT + libxml2 WITH_LIBXML zlib WITH_ZLIB test WITH_CHECK namespace WITH_CPP_NAMESPACE ) -# Handle conflict features -set(WITH_EXPAT OFF) -if ("expat" IN_LIST FEATURES) - set(WITH_EXPAT ON) -endif() - -set(WITH_LIBXML OFF) -if ("libxml2" IN_LIST FEATURES) - set(WITH_LIBXML ON) -endif() - -if (WITH_EXPAT AND WITH_LIBXML) - message("Feature expat conflict with feature libxml2, currently using libxml2...") - set(WITH_EXPAT OFF) -endif() - -if ("test" IN_LIST FEATURES AND WIN32) - message(FATAL_ERROR "Feature test only support UNIX.") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} - -DWITH_EXPAT=${WITH_EXPAT} - -DWITH_LIBXML=${WITH_LIBXML} + OPTIONS + ${FEATURE_OPTIONS} -DENABLE_L3V2EXTENDEDMATH:BOOL=ON -DWITH_STATIC_RUNTIME=${STATIC_RUNTIME} -DLIBSBML_SKIP_SHARED_LIBRARY=${STATIC_LIBRARY} -DLIBSBML_SKIP_STATIC_LIBRARY=${DYNAMIC_LIBRARY} + MAYBE_UNUSED_VARIABLES + WITH_STATIC_RUNTIME ) vcpkg_cmake_install() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) -else() - vcpkg_cmake_config_fixup(PACKAGE_NAME libsbml-static CONFIG_PATH lib/cmake) - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libsbml-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -endif() - vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/debug/*.txt") -if (TXT_FILES) - file(REMOVE ${TXT_FILES}) -endif() -file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/*.txt") -if (TXT_FILES) - file(REMOVE ${TXT_FILES}) -endif() - -if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -endif() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/README.md") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.md") +foreach(name IN ITEMS libsbml libsbml-static sbml sbml-static) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${name}-config.cmake") + vcpkg_cmake_config_fixup(PACKAGE_NAME "${name}" CONFIG_PATH lib/cmake) + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake") + configure_file("${CURRENT_PORT_DIR}/libsbml-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY) + endif() + break() + endif() +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sbml/common/extern.h" "defined LIBSBML_STATIC" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sbml/xml/XMLExtern.h" "defined(LIBLAX_STATIC)" "1") endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") -vcpkg_fixup_pkgconfig() diff --git a/ports/libsbml/test-shared.diff b/ports/libsbml/test-shared.diff new file mode 100644 index 00000000000000..71bc6808652096 --- /dev/null +++ b/ports/libsbml/test-shared.diff @@ -0,0 +1,14 @@ +diff --git a/src/sbml/test/CMakeLists.txt b/src/sbml/test/CMakeLists.txt +index 7a408d7..462d58a 100644 +--- a/src/sbml/test/CMakeLists.txt ++++ b/src/sbml/test/CMakeLists.txt +@@ -49,6 +49,9 @@ if (EXTRA_INCLUDE_DIRS) + include_directories(${EXTRA_INCLUDE_DIRS}) + endif(EXTRA_INCLUDE_DIRS) + ++if(NOT TARGET ${LIBSBML_LIBRARY}-static) ++ add_library(${LIBSBML_LIBRARY}-static ALIAS ${LIBSBML_LIBRARY}) ++endif() + + add_executable(test_sbml_sbml ${TEST_FILES}) + target_link_libraries(test_sbml_sbml ${LIBSBML_LIBRARY}-static CHECK::CHECK) diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json index dcb514e6d74100..3b3c6f7a8d4cfc 100644 --- a/ports/libsbml/vcpkg.json +++ b/ports/libsbml/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsbml", - "version": "5.20.0", - "port-version": 1, + "version": "5.20.2", "description": "A library for reading / writing SBML files", "homepage": "https://github.com/sbmlteam/libsbml", "license": "LGPL-2.1", @@ -69,6 +68,7 @@ "dependencies": [ { "name": "libsbml", + "default-features": false, "features": [ "layout" ] @@ -77,8 +77,10 @@ }, "test": { "description": "Unit testing of libSBMLs implementation", + "supports": "!windows | mingw | (windows & static)", "dependencies": [ - "check" + "check", + "dirent" ] }, "zlib": { diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index 958de2f59f15ef..dbce16c2048f88 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -3,23 +3,26 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sahlberg/libsmb2 - REF d8c85a3119a0bd769590e448216130b368cd1099 - SHA512 d15a040ed6314ad6f7984cfa7b52d9ede9934b2a7ec9827e833f574c25c9f694b5372b3e0950e258a6244b7aaf32b9e59987a75a88681d8031d9837ba94629d5 + REF 99125c96750e192e2c50176548bf461e4a28f135 + SHA512 30cdc9bbcdcd384868e5865706b41f683b977ece4056040a29bb3b81ffdf83788ba8a39426132810b8cbbb778ae7db8e5e1be0b7c0a82d8beed75040de708240 HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + # TODO: Add a feature to enable gssapi/krb5 support + -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI=ON ) vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME smb2 CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -#the debug/share folder is generated empty by the provided cmake system file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/smb2") + +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/libsmb2/usage b/ports/libsmb2/usage new file mode 100644 index 00000000000000..f58d837fb74e2b --- /dev/null +++ b/ports/libsmb2/usage @@ -0,0 +1,5 @@ +libsmb2 can be used from CMake via: + + find_package(SMB2 REQUIRED) + target_include_directories(main PRIVATE ${SMB2_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${SMB2_LIBRARIES}) diff --git a/ports/libsmb2/vcpkg-cmake-wrapper.cmake b/ports/libsmb2/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..c408581651fa95 --- /dev/null +++ b/ports/libsmb2/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(SMB2_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${SMB2_PREV_MODULE_PATH}) diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json index 303a41ab810871..387bd6b0dae6c2 100644 --- a/ports/libsmb2/vcpkg.json +++ b/ports/libsmb2/vcpkg.json @@ -1,12 +1,10 @@ { "name": "libsmb2", - "version-date": "2021-04-29", - "port-version": 2, + "version-date": "2023-08-11", "description": "SMB2/3 Userspace Client", "homepage": "https://github.com/sahlberg/libsmb2", - "supports": "!osx", + "license": "LGPL-2.1-or-later", "dependencies": [ - "openssl", { "name": "vcpkg-cmake", "host": true diff --git a/ports/libsndfile/001-avoid-installing-find-modules.patch b/ports/libsndfile/001-avoid-installing-find-modules.patch new file mode 100644 index 00000000000000..3ae1b21b01bbe6 --- /dev/null +++ b/ports/libsndfile/001-avoid-installing-find-modules.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b501f08..022864f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -855,11 +847,6 @@ if (ENABLE_PACKAGE_CONFIG) + ${CMAKE_CURRENT_BINARY_DIR}/SndFileConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} + ) +- +- if (NOT BUILD_SHARED_LIBS AND FIND_MODULES_INSTALL_LIST) +- file(COPY ${FIND_MODULES_INSTALL_LIST} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +- install(FILES ${FIND_MODULES_INSTALL_LIST} DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) +- endif () + else () + + install (TARGETS sndfile ${sdnfile_PROGRAMS} diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake index 730ca68190c95d..710932b4d2016f 100644 --- a/ports/libsndfile/portfile.cmake +++ b/ports/libsndfile/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsndfile/libsndfile - REF 1.2.0 - SHA512 58d2567a4eb67f9af7a472ae02f62ce64bb6f54687bf670c84335a4d1c194d3e8d6933089ae9e2603137a035155447df4b0f59c054731d74d9814c1b757c833a + REF 1.2.2 + SHA512 fb8b4d367240a8ac9d55be6f053cb19419890691c56a8552d1600d666257992b6e8e41a413a444c9f2d6c5d71406013222c92a3bfa67228944a26475444240a1 HEAD_REF master + PATCHES + 001-avoid-installing-find-modules.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/libsndfile/vcpkg.json b/ports/libsndfile/vcpkg.json index 241781b700daa5..3633fc1ce0e407 100644 --- a/ports/libsndfile/vcpkg.json +++ b/ports/libsndfile/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsndfile", - "version-semver": "1.2.0", - "port-version": 2, + "version-semver": "1.2.2", "description": "A library for reading and writing audio files", "homepage": "https://github.com/erikd/libsndfile", "license": "LGPL-2.1-or-later", diff --git a/ports/libsvm/portfile.cmake b/ports/libsvm/portfile.cmake index 674014c0f62441..f56d169389a234 100644 --- a/ports/libsvm/portfile.cmake +++ b/ports/libsvm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cjlin1/libsvm - REF v325 - SHA512 D5323B128DFCDC7F64B2161E70FA7999C0A93D47C90B366BE066AA01EA92B5817F04812DEF2E05469DEE1F26C6A83DA5E50EEAE3F50B4062D9B24AC0944C6203 + REF v332 + SHA512 1b649e6baa7b23a082d510921d0be7b75c04331844c3057587db36b0f5a5a0a6a44ae3f187c2ffa19d70bc1bf25ea8c724ac2cd5c1842d684747469b5c99b9f6 HEAD_REF master ) diff --git a/ports/libsvm/vcpkg.json b/ports/libsvm/vcpkg.json index a1ac6c75e94dee..a26218dcb266c3 100644 --- a/ports/libsvm/vcpkg.json +++ b/ports/libsvm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsvm", - "version": "3.25", - "port-version": 1, + "version": "3.32", "description": "A library for Support Vector Machines.", "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/", "dependencies": [ diff --git a/ports/libtins/fix_include.patch b/ports/libtins/fix_include.patch new file mode 100644 index 00000000000000..c069cc0cc6ce46 --- /dev/null +++ b/ports/libtins/fix_include.patch @@ -0,0 +1,22 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 94bc8bf..14a15e9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -211,6 +211,7 @@ ADD_LIBRARY( + ) + + TARGET_LINK_LIBRARIES(tins ${PCAP_LIBRARY} ${OPENSSL_LIBRARIES} ${LIBTINS_OS_LIBS}) ++target_include_directories(tins PUBLIC $) + + SET_TARGET_PROPERTIES(tins PROPERTIES OUTPUT_NAME tins) + SET_TARGET_PROPERTIES(tins PROPERTIES VERSION ${LIBTINS_VERSION} SOVERSION ${LIBTINS_VERSION} ) +diff --git a/libtins.pc.in b/libtins.pc.in +index e9a5c29..c7e3f6c 100644 +--- a/libtins.pc.in ++++ b/libtins.pc.in +@@ -7,4 +7,4 @@ Name: libtins + Description: C++ packet crafting, sniffing and interpretation library. + Version: @pkgconfig_version@ + Libs: -L${libdir} -ltins +-Cflags: -I${includedir}/tins ++Cflags: -I${includedir} diff --git a/ports/libtins/portfile.cmake b/ports/libtins/portfile.cmake index 62cbde451d43b3..5d46ddbe5c4463 100644 --- a/ports/libtins/portfile.cmake +++ b/ports/libtins/portfile.cmake @@ -1,12 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mfontanini/libtins - REF v4.3 - SHA512 29d606004fe9a440c9a53eede42fd5c6dbd049677d2cca2c5cfd26311ee2ca4c64ca3e665fbc81efd5bfab5577a5181ed0754c617e139317d9ae0cabba05aff7 + REF "v${VERSION}" + SHA512 d8887949cb545dbaf4247c8405feb5cc1032f370bb418dd5344043dc97555b1b826a8d33cfc7dd0a7a9a9af6f3a46bd6fcbed89f98d5eb23fdd10294f823fcd6 HEAD_REF master PATCHES fix-source-writes.patch find-pcap_static.patch + fix_include.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTINS_BUILD_SHARED) diff --git a/ports/libtins/vcpkg.json b/ports/libtins/vcpkg.json index c9a7daa96afa8a..8dcb5c09e2e6e6 100644 --- a/ports/libtins/vcpkg.json +++ b/ports/libtins/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libtins", - "version": "4.3", - "port-version": 6, + "version": "4.5", "description": "High-level, multiplatform C++ network packet sniffing and crafting library", "license": "BSD-2-Clause", "supports": "!uwp", diff --git a/ports/libtracepoint-control/portfile.cmake b/ports/libtracepoint-control/portfile.cmake index 465cebc8e40d86..98bf67cb3865b8 100644 --- a/ports/libtracepoint-control/portfile.cmake +++ b/ports/libtracepoint-control/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint-control/vcpkg.json b/ports/libtracepoint-control/vcpkg.json index fa6561a818302a..015c36ab4ecd94 100644 --- a/ports/libtracepoint-control/vcpkg.json +++ b/ports/libtracepoint-control/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtracepoint-control", - "version": "1.1.0", + "version": "1.2.1", "description": "C++ classes for collecting Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", @@ -8,7 +8,7 @@ "dependencies": [ { "name": "libtracepoint-decode", - "version>=": "1.1.0" + "version>=": "1.2.1" }, { "name": "vcpkg-cmake", diff --git a/ports/libtracepoint-decode/portfile.cmake b/ports/libtracepoint-decode/portfile.cmake index 5233d415de4f4e..f5b9baa1fe0fab 100644 --- a/ports/libtracepoint-decode/portfile.cmake +++ b/ports/libtracepoint-decode/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint-decode/vcpkg.json b/ports/libtracepoint-decode/vcpkg.json index 47ed70e0fed5e7..6502d573378855 100644 --- a/ports/libtracepoint-decode/vcpkg.json +++ b/ports/libtracepoint-decode/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtracepoint-decode", - "version": "1.1.0", + "version": "1.2.1", "description": "C++ classes for decoding Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", diff --git a/ports/libtracepoint/portfile.cmake b/ports/libtracepoint/portfile.cmake index bf7f04e9432019..2dd1328d131ad1 100644 --- a/ports/libtracepoint/portfile.cmake +++ b/ports/libtracepoint/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint/vcpkg.json b/ports/libtracepoint/vcpkg.json index 8221e3e2dc7604..433dd8e408b8a9 100644 --- a/ports/libtracepoint/vcpkg.json +++ b/ports/libtracepoint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtracepoint", - "version": "1.1.0", + "version": "1.2.1", "description": "C/C++ interface for generating Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", diff --git a/ports/linalg/portfile.cmake b/ports/linalg/portfile.cmake index 23ae4c83c95ab1..27aa89180ce20a 100644 --- a/ports/linalg/portfile.cmake +++ b/ports/linalg/portfile.cmake @@ -1,11 +1,13 @@ #header-only library + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sgorsten/linalg - REF v2.1 - SHA512 48d8248ea1bca3d4fe35d038690f496cd0c8c9469d76eca684668ce6fef5df0eb9556f9b49e4da90e2c2e8ef475791877aa815c3f9437c097fbfc303134d02d7 + REF "v${VERSION}" + SHA512 736f6ff83fcc4a772ef5ab8e574b0e56aca9fcf2318d92f56f94684ffbd7283540b6496381d52834545b4902147bc67a3afa21ab877bc44bba84471c2eff6862 HEAD_REF master ) -configure_file(${SOURCE_PATH}/UNLICENSE ${CURRENT_PACKAGES_DIR}/share/linalg/copyright COPYONLY) -configure_file(${SOURCE_PATH}/linalg.h ${CURRENT_PACKAGES_DIR}/include/linalg.h COPYONLY) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/linalg.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/UNLICENSE") diff --git a/ports/linalg/vcpkg.json b/ports/linalg/vcpkg.json index 2d8170835bf41d..2b0d2d594c0ed3 100644 --- a/ports/linalg/vcpkg.json +++ b/ports/linalg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "linalg", - "version": "2.1", - "port-version": 2, - "description": "linalg.h is a single header public domain linear algebra library for C++11" + "version": "2.2", + "description": "linalg.h is a single header public domain linear algebra library for C++11", + "homepage": "https://github.com/sgorsten/linalg", + "license": "Unlicense" } diff --git a/ports/llvm/0001-Fix-install-paths.patch b/ports/llvm/0001-Fix-install-paths.patch deleted file mode 100644 index 9f303e642e3889..00000000000000 --- a/ports/llvm/0001-Fix-install-paths.patch +++ /dev/null @@ -1,208 +0,0 @@ - clang/cmake/modules/CMakeLists.txt | 4 ++-- - clang/utils/hmaptool/CMakeLists.txt | 2 +- - compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 2 +- - flang/cmake/modules/CMakeLists.txt | 4 ++-- - lld/cmake/modules/CMakeLists.txt | 4 ++-- - llvm/CMakeLists.txt | 2 +- - llvm/cmake/modules/AddLLVM.cmake | 2 +- - llvm/cmake/modules/CMakeLists.txt | 2 +- - mlir/cmake/modules/CMakeLists.txt | 8 ++++---- - mlir/test/CMakeLists.txt | 2 +- - openmp/tools/Modules/CMakeLists.txt | 2 +- - polly/cmake/CMakeLists.txt | 8 ++++---- - 12 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt -index 6a7fa2fa27eb..a17f807ab155 100644 ---- a/clang/cmake/modules/CMakeLists.txt -+++ b/clang/cmake/modules/CMakeLists.txt -@@ -6,13 +6,13 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(CLANG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/clang" CACHE STRING -+set(CLANG_INSTALL_PACKAGE_DIR "share/clang" CACHE STRING - "Path for CMake subdirectory for Clang (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/clang')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt -index 511268069bd1..72915ec66504 100644 ---- a/clang/utils/hmaptool/CMakeLists.txt -+++ b/clang/utils/hmaptool/CMakeLists.txt -@@ -1,4 +1,4 @@ --install(PROGRAMS hmaptool DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT hmaptool) -+install(PROGRAMS hmaptool DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT hmaptool) - add_custom_target(hmaptool ALL DEPENDS "hmaptool") - set_target_properties(hmaptool PROPERTIES FOLDER "Utils") - -diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -index e322af89a042..0df6a7a775cd 100644 ---- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -+++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -@@ -377,7 +377,7 @@ macro(load_llvm_config) - file(TO_CMAKE_PATH ${LLVM_CMAKE_DIR_FROM_LLVM_CONFIG} LLVM_CMAKE_DIR) - else() - file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE) -- set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+ set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/share/llvm") - endif() - - set(LLVM_CMAKE_INCLUDE_FILE "${LLVM_CMAKE_DIR}/LLVMConfig.cmake") -diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt -index 105cc09bf850..460db6c1d9e7 100644 ---- a/flang/cmake/modules/CMakeLists.txt -+++ b/flang/cmake/modules/CMakeLists.txt -@@ -5,13 +5,13 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(FLANG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/flang" CACHE STRING -+set(FLANG_INSTALL_PACKAGE_DIR "share/flang" CACHE STRING - "Path for CMake subdirectory for Flang (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/flang')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/flang") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt -index 57195bce45c9..e24c080725d7 100644 ---- a/lld/cmake/modules/CMakeLists.txt -+++ b/lld/cmake/modules/CMakeLists.txt -@@ -5,13 +5,13 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(LLD_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/lld" CACHE STRING -+set(LLD_INSTALL_PACKAGE_DIR "share/lld" CACHE STRING - "Path for CMake subdirectory for LLD (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/lld')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/lld") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt -index 4be91312271d..d6002808a205 100644 ---- a/llvm/CMakeLists.txt -+++ b/llvm/CMakeLists.txt -@@ -325,7 +325,7 @@ set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name - # LLVM_INSTALL_PACKAGE_DIR needs to be declared prior to adding the tools - # subdirectory in order to have the value available for llvm-config. - include(GNUInstallPackageDir) --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - - set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index 057431208322..89cbba8a5676 100644 ---- a/llvm/cmake/modules/AddLLVM.cmake -+++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -1093,7 +1093,7 @@ function(process_llvm_pass_plugins) - message(FATAL_ERROR "LLVM_INSTALL_PACKAGE_DIR must be defined and writable. GEN_CONFIG should only be passe when building LLVM proper.") - endif() - # LLVM_INSTALL_PACKAGE_DIR might be absolute, so don't reuse below. -- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") - file(WRITE - "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" - "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") -diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt -index 470881516915..36d2e9aa2120 100644 ---- a/llvm/cmake/modules/CMakeLists.txt -+++ b/llvm/cmake/modules/CMakeLists.txt -@@ -3,7 +3,7 @@ include(LLVMDistributionSupport) - include(FindPrefixFromConfig) - - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") - - # First for users who use an installed LLVM, create the LLVMExports.cmake file. - set(LLVM_EXPORTS_FILE ${llvm_cmake_builddir}/LLVMExports.cmake) -diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt -index 5fd9454cad93..af1d73a852c7 100644 ---- a/mlir/cmake/modules/CMakeLists.txt -+++ b/mlir/cmake/modules/CMakeLists.txt -@@ -6,16 +6,16 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(MLIR_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/mlir" CACHE STRING -+set(MLIR_INSTALL_PACKAGE_DIR "share/mlir" CACHE STRING - "Path for CMake subdirectory for Polly (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/polly')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") -+set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/share/mlir") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") - - get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS) - export(TARGETS ${MLIR_EXPORTS} FILE ${mlir_cmake_builddir}/MLIRTargets.cmake) -diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt -index 74f805865d2d..998ddb3b48e8 100644 ---- a/mlir/test/CMakeLists.txt -+++ b/mlir/test/CMakeLists.txt -@@ -8,7 +8,7 @@ endif() - # Passed to lit.site.cfg.py.so that the out of tree Standalone dialect test - # can find MLIR's CMake configuration - set(MLIR_CMAKE_DIR -- "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") -+ "${CMAKE_BINARY_DIR}/share/mlir") - - # Passed to lit.site.cfg.py.in to set up the path where to find the libraries - # for linalg integration tests. -diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt -index 22d818eea72d..75aacc4468d4 100644 ---- a/openmp/tools/Modules/CMakeLists.txt -+++ b/openmp/tools/Modules/CMakeLists.txt -@@ -12,4 +12,4 @@ - - - install(FILES "FindOpenMPTarget.cmake" -- DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp") -+ DESTINATION "share/openmp") -diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt -index 4c528d562e23..800080fb3f79 100644 ---- a/polly/cmake/CMakeLists.txt -+++ b/polly/cmake/CMakeLists.txt -@@ -4,15 +4,15 @@ include(GNUInstallPackageDir) - include(ExtendPath) - include(FindPrefixFromConfig) - --set(POLLY_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/polly" CACHE STRING -+set(POLLY_INSTALL_PACKAGE_DIR "share/polly" CACHE STRING - "Path for CMake subdirectory for Polly (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/polly')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(polly_cmake_builddir "${POLLY_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/polly") -+set(polly_cmake_builddir "${POLLY_BINARY_DIR}/share/polly") - --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") - - if (CMAKE_CONFIGURATION_TYPES) - set(POLLY_EXPORTS_FILE_NAME "PollyExports-$>.cmake") diff --git a/ports/llvm/0001-fix-install-package-dir.patch b/ports/llvm/0001-fix-install-package-dir.patch new file mode 100644 index 00000000000000..6bbe1af08f89bb --- /dev/null +++ b/ports/llvm/0001-fix-install-package-dir.patch @@ -0,0 +1,13 @@ + openmp/tools/Modules/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt +index 22d818eea72d..75aacc4468d4 100644 +--- a/openmp/tools/Modules/CMakeLists.txt ++++ b/openmp/tools/Modules/CMakeLists.txt +@@ -12,4 +12,4 @@ + + + install(FILES "FindOpenMPTarget.cmake" +- DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp") ++ DESTINATION "share/openmp") diff --git a/ports/llvm/0002-Fix-DR-1734.patch b/ports/llvm/0002-Fix-DR-1734.patch deleted file mode 100644 index 3a2f4a28e3e956..00000000000000 --- a/ports/llvm/0002-Fix-DR-1734.patch +++ /dev/null @@ -1,17 +0,0 @@ - llvm/include/llvm/Support/type_traits.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h -index 7b7d5d991f3f..469b681deea3 100644 ---- a/llvm/include/llvm/Support/type_traits.h -+++ b/llvm/include/llvm/Support/type_traits.h -@@ -176,7 +176,8 @@ class is_trivially_copyable { - (has_deleted_copy_assign || has_trivial_copy_assign) && - (has_deleted_copy_constructor || has_trivial_copy_constructor); - --#ifdef HAVE_STD_IS_TRIVIALLY_COPYABLE -+// due to DR 1734, a type can be std::is_trivially_copyable but not llvm::is_trivially_copyable -+#if 0 - static_assert(value == std::is_trivially_copyable::value, - "inconsistent behavior between llvm:: and std:: implementation of is_trivially_copyable"); - #endif diff --git a/ports/llvm/0005-Fix-tools-install-path.patch b/ports/llvm/0002-fix-tools-install-dir.patch similarity index 71% rename from ports/llvm/0005-Fix-tools-install-path.patch rename to ports/llvm/0002-fix-tools-install-dir.patch index a6d44d3ce33f19..4d0e5710a7e82b 100644 --- a/ports/llvm/0005-Fix-tools-install-path.patch +++ b/ports/llvm/0002-fix-tools-install-dir.patch @@ -1,10 +1,9 @@ + bolt/cmake/modules/AddBOLT.cmake | 2 +- clang-tools-extra/clang-tidy/tool/CMakeLists.txt | 2 +- clang-tools-extra/modularize/CMakeLists.txt | 2 +- clang/cmake/modules/AddClang.cmake | 2 +- clang/tools/c-index-test/CMakeLists.txt | 2 +- clang/tools/clang-format/CMakeLists.txt | 2 +- - clang/tools/clang-linker-wrapper/CMakeLists.txt | 2 +- - clang/tools/clang-nvlink-wrapper/CMakeLists.txt | 2 +- clang/tools/scan-build-py/CMakeLists.txt | 4 ++-- clang/tools/scan-build/CMakeLists.txt | 2 +- clang/tools/scan-view/CMakeLists.txt | 2 +- @@ -12,11 +11,25 @@ flang/tools/f18/CMakeLists.txt | 2 +- flang/tools/flang-driver/CMakeLists.txt | 2 +- lld/cmake/modules/AddLLD.cmake | 2 +- + lld/tools/lld/CMakeLists.txt | 2 +- lldb/cmake/modules/AddLLDB.cmake | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) +diff --git a/bolt/cmake/modules/AddBOLT.cmake b/bolt/cmake/modules/AddBOLT.cmake +index 1f69b9046320..b0de5186dde4 100644 +--- a/bolt/cmake/modules/AddBOLT.cmake ++++ b/bolt/cmake/modules/AddBOLT.cmake +@@ -17,7 +17,7 @@ macro(add_bolt_tool name) + get_target_export_arg(${name} BOLT export_to_bolttargets) + install(TARGETS ${name} + ${export_to_bolttargets} +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${BOLT_TOOLS_INSTALL_DIR}" + COMPONENT bolt) + + if(NOT LLVM_ENABLE_IDE) diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt -index 3ce552872015..e09b917ae5f8 100644 +index 3ce552872015..ce5a899ebe6d 100644 --- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt @@ -64,6 +64,6 @@ install(PROGRAMS clang-tidy-diff.py @@ -24,35 +37,35 @@ index 3ce552872015..e09b917ae5f8 100644 COMPONENT clang-tidy) install(PROGRAMS run-clang-tidy.py - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT clang-tidy RENAME run-clang-tidy) diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt -index fb17e353c39f..4b409e47446a 100644 +index 28635ca1089d..4516c8fb7ad0 100644 --- a/clang-tools-extra/modularize/CMakeLists.txt +++ b/clang-tools-extra/modularize/CMakeLists.txt -@@ -23,5 +23,5 @@ clang_target_link_libraries(modularize +@@ -24,5 +24,5 @@ clang_target_link_libraries(modularize ) install(TARGETS modularize - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT clang-extras) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake -index 21ac332e4f5f..1aaf785bdc99 100644 +index 75b0080f6715..46e32ddbe0cd 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake -@@ -166,7 +166,7 @@ macro(add_clang_tool name) +@@ -169,7 +169,7 @@ macro(add_clang_tool name) get_target_export_arg(${name} Clang export_to_clangtargets) install(TARGETS ${name} ${export_to_clangtargets} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt -index 0ae1b4e55244..e8a34e136194 100644 +index 0ae1b4e55244..7774cd27afcd 100644 --- a/clang/tools/c-index-test/CMakeLists.txt +++ b/clang/tools/c-index-test/CMakeLists.txt @@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) @@ -60,43 +73,23 @@ index 0ae1b4e55244..e8a34e136194 100644 "@executable_path/../../lib") else() - set(INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ set(INSTALL_DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") ++ set(INSTALL_DESTINATION "${CLANG_TOOLS_INSTALL_DIR}") endif() install(TARGETS c-index-test diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt -index bbdef93b576b..8744e414da0a 100644 +index 30c93f8667c8..5c6f87f62e8e 100644 --- a/clang/tools/clang-format/CMakeLists.txt +++ b/clang/tools/clang-format/CMakeLists.txt -@@ -36,5 +36,5 @@ install(PROGRAMS clang-format.py +@@ -36,5 +36,5 @@ install(FILES clang-format.py DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" COMPONENT clang-format) install(PROGRAMS git-clang-format - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT clang-format) -diff --git a/clang/tools/clang-linker-wrapper/CMakeLists.txt b/clang/tools/clang-linker-wrapper/CMakeLists.txt -index 88c19cad7b53..b50c9ff90586 100644 ---- a/clang/tools/clang-linker-wrapper/CMakeLists.txt -+++ b/clang/tools/clang-linker-wrapper/CMakeLists.txt -@@ -44,4 +44,4 @@ target_link_libraries(clang-linker-wrapper - ${CLANG_LINKER_WRAPPER_LIB_DEPS} - ) - --install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -+install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") -diff --git a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt -index 2c979e509795..f22b801fe19a 100644 ---- a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt -+++ b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt -@@ -22,4 +22,4 @@ target_link_libraries(clang-nvlink-wrapper - ${CLANG_NVLINK_WRAPPER_LIB_DEPS} - ) - --install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -+install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt -index 061dc7ef4dd9..91499600693b 100644 +index 3aca22c0b0a8..a8283219c99f 100644 --- a/clang/tools/scan-build-py/CMakeLists.txt +++ b/clang/tools/scan-build-py/CMakeLists.txt @@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles}) @@ -104,7 +97,7 @@ index 061dc7ef4dd9..91499600693b 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/scan-build) install (PROGRAMS "bin/scan-build" - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" RENAME scan-build-py COMPONENT scan-build-py) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/scan-build-py) @@ -113,12 +106,12 @@ index 061dc7ef4dd9..91499600693b 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT scan-build-py) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) endif() diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt -index ef687b0e90a1..a52af70443c3 100644 +index ef687b0e90a1..47f31efc9174 100644 --- a/clang/tools/scan-build/CMakeLists.txt +++ b/clang/tools/scan-build/CMakeLists.txt @@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) @@ -126,12 +119,12 @@ index ef687b0e90a1..a52af70443c3 100644 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT scan-build) endforeach() diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt -index 07aec76ee66f..ca6a3380ad0c 100644 +index 07aec76ee66f..55a945bb278d 100644 --- a/clang/tools/scan-view/CMakeLists.txt +++ b/clang/tools/scan-view/CMakeLists.txt @@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) @@ -139,48 +132,48 @@ index 07aec76ee66f..ca6a3380ad0c 100644 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT scan-view) endforeach() diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake -index d516ca31b51f..4a0d4ce80168 100644 +index 41ce8738e7bf..d9659c4cf53a 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake -@@ -110,7 +110,7 @@ macro(add_flang_tool name) +@@ -115,7 +115,7 @@ macro(add_flang_tool name) get_target_export_arg(${name} Flang export_to_flangtargets) install(TARGETS ${name} ${export_to_flangtargets} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ RUNTIME DESTINATION "${FLANG_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt -index dd0898730e2e..d01c2f8076e3 100644 +index d7538feef121..ec8b7737ee22 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt -@@ -56,7 +56,7 @@ if (NOT WIN32) +@@ -75,7 +75,7 @@ if (NOT WIN32) @ONLY ) add_custom_target(flang-to-external-fc ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc) - install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") ++ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${FLANG_TOOLS_INSTALL_DIR}") endif() # TODO Move this to a more suitable location diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt -index 94c8ce6d58f1..466d41c58b1d 100644 +index 3ce8b407450d..6b2e2b0dc33a 100644 --- a/flang/tools/flang-driver/CMakeLists.txt +++ b/flang/tools/flang-driver/CMakeLists.txt -@@ -42,4 +42,4 @@ if(FLANG_PLUGIN_SUPPORT) +@@ -43,4 +43,4 @@ if(FLANG_PLUGIN_SUPPORT) export_executable_symbols_for_plugins(flang-new) endif() -install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}") -+install(TARGETS flang-new DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") ++install(TARGETS flang-new DESTINATION "${FLANG_TOOLS_INSTALL_DIR}") diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake -index d3924f7243d4..f328b62ad8c8 100644 +index d3924f7243d4..318b41b73705 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake @@ -47,7 +47,7 @@ macro(add_lld_tool name) @@ -188,15 +181,28 @@ index d3924f7243d4..f328b62ad8c8 100644 install(TARGETS ${name} ${export_to_lldtargets} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ RUNTIME DESTINATION "${LLD_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT CMAKE_CONFIGURATION_TYPES) +diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt +index 12628395680b..ee58ed439a3a 100644 +--- a/lld/tools/lld/CMakeLists.txt ++++ b/lld/tools/lld/CMakeLists.txt +@@ -29,7 +29,7 @@ lld_target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ RUNTIME DESTINATION "${LLD_TOOLS_INSTALL_DIR}") + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake -index 3291a7c808e1..9fe9b9a7940d 100644 +index d47a30f5e109..f0bbc0e50627 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake -@@ -189,7 +189,7 @@ function(add_lldb_executable name) +@@ -216,7 +216,7 @@ function(add_lldb_executable name) endif() if(ARG_GENERATE_INSTALL) @@ -205,16 +211,3 @@ index 3291a7c808e1..9fe9b9a7940d 100644 if(ARG_INSTALL_PREFIX) set(install_dest ${ARG_INSTALL_PREFIX}) endif() -diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt -index df48cc0d6..1363144fd 100644 ---- a/lld/tools/lld/CMakeLists.txt -+++ b/lld/tools/lld/CMakeLists.txt -@@ -20,7 +20,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE diff --git a/ports/llvm/0003-Fix-tools-path.patch b/ports/llvm/0003-fix-llvm-config.patch similarity index 87% rename from ports/llvm/0003-Fix-tools-path.patch rename to ports/llvm/0003-fix-llvm-config.patch index 66fec67d86631b..e1231d578d4cb9 100644 --- a/ports/llvm/0003-Fix-tools-path.patch +++ b/ports/llvm/0003-fix-llvm-config.patch @@ -2,10 +2,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp -index 2c6c55f89d38..f2b581559991 100644 +index e86eb2b44b10..04e00944f891 100644 --- a/llvm/tools/llvm-config/llvm-config.cpp +++ b/llvm/tools/llvm-config/llvm-config.cpp -@@ -307,7 +307,7 @@ int main(int argc, char **argv) { +@@ -304,7 +304,7 @@ int main(int argc, char **argv) { // bin dir). sys::fs::make_absolute(CurrentPath); CurrentExecPrefix = diff --git a/ports/llvm/0004-Fix-compiler-rt-install-path.patch b/ports/llvm/0004-Fix-compiler-rt-install-path.patch deleted file mode 100644 index b08c12154585e1..00000000000000 --- a/ports/llvm/0004-Fix-compiler-rt-install-path.patch +++ /dev/null @@ -1,44 +0,0 @@ - clang/lib/Headers/CMakeLists.txt | 2 +- - clang/runtime/CMakeLists.txt | 2 +- - compiler-rt/cmake/base-config-ix.cmake | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt -index 6e2060991b92..94ced7feda9b 100644 ---- a/clang/lib/Headers/CMakeLists.txt -+++ b/clang/lib/Headers/CMakeLists.txt -@@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files}) - add_header_target("windows-resource-headers" ${windows_only_files}) - add_header_target("utility-resource-headers" ${utility_files}) - --set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+set(header_install_dir tools/llvm/lib/clang/${CLANG_VERSION}/include) - - ############################################################# - # Install rules for the catch-all clang-resource-headers target -diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt -index 9f4633bc85b1..6d7b70ee0dea 100644 ---- a/clang/runtime/CMakeLists.txt -+++ b/clang/runtime/CMakeLists.txt -@@ -84,7 +84,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) - -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} - -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION} - -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} -- -DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION} -+ -DCOMPILER_RT_INSTALL_PATH:PATH=tools/llvm/lib/clang/${CLANG_VERSION} - -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} -diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake -index 8a6219568b3f..f9c9f6478280 100644 ---- a/compiler-rt/cmake/base-config-ix.cmake -+++ b/compiler-rt/cmake/base-config-ix.cmake -@@ -45,7 +45,7 @@ if (LLVM_TREE_AVAILABLE) - # Setup the paths where compiler-rt runtimes and headers should be stored. - set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) - set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) -- set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}) -+ set(COMPILER_RT_INSTALL_PATH tools/llvm/lib/clang/${CLANG_VERSION}) - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." - ${LLVM_INCLUDE_TESTS}) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" diff --git a/ports/llvm/0009-disable-libomp-aliases.patch b/ports/llvm/0004-disable-libomp-aliases.patch similarity index 59% rename from ports/llvm/0009-disable-libomp-aliases.patch rename to ports/llvm/0004-disable-libomp-aliases.patch index 3598464189c809..6736f2a31d53df 100644 --- a/ports/llvm/0009-disable-libomp-aliases.patch +++ b/ports/llvm/0004-disable-libomp-aliases.patch @@ -1,37 +1,32 @@ + openmp/runtime/src/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt -index e795032..5e8cba5 100644 +index bb5822264514..340cef14df89 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt -@@ -201,6 +201,7 @@ endif() +@@ -215,7 +215,7 @@ endif() set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) # Add symbolic links to libomp +-if(NOT WIN32) +if(0) - if(NOT WIN32) add_custom_command(TARGET omp POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBOMP_LIB_FILE} -@@ -210,6 +211,8 @@ if(NOT WIN32) - WORKING_DIRECTORY ${LIBOMP_LIBRARY_DIR} - ) - endif() -+endif() -+ - set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) - - # Create *.inc before compiling any sources -@@ -354,6 +357,7 @@ endif() - if(WIN32) - install(TARGETS omp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + libgomp${LIBOMP_LIBRARY_SUFFIX} +@@ -367,6 +367,7 @@ if(WIN32) + install(TARGETS omp ${export_to_llvmexports} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") -+ if(0) # Create aliases (regular copies) of the library for backwards compatibility ++ if(0) set(LIBOMP_ALIASES "libiomp5md") foreach(alias IN LISTS LIBOMP_ALIASES) -@@ -362,6 +366,7 @@ if(WIN32) + install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_LIB_FILE}\" +@@ -375,6 +376,7 @@ if(WIN32) install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_IMP_LIB_FILE}\" \"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"${outdir}\")") endforeach() + endif() else() - install(TARGETS omp ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}") + install(TARGETS omp ${export_to_llvmexports} ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}") diff --git a/ports/llvm/0010-remove-numpy.patch b/ports/llvm/0005-remove-numpy.patch similarity index 70% rename from ports/llvm/0010-remove-numpy.patch rename to ports/llvm/0005-remove-numpy.patch index aefd2eb53491e3..966af9c31e3b15 100644 --- a/ports/llvm/0010-remove-numpy.patch +++ b/ports/llvm/0005-remove-numpy.patch @@ -1,17 +1,11 @@ -From 80300a7f4533fdfc75ec60b0d1dc1c5d5a6b9e3c Mon Sep 17 00:00:00 2001 -From: Ankur Verma -Date: Fri, 14 Jul 2023 09:45:22 -0700 -Subject: [PATCH] remove_numpy - ---- mlir/cmake/modules/MLIRDetectPythonEnv.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mlir/cmake/modules/MLIRDetectPythonEnv.cmake b/mlir/cmake/modules/MLIRDetectPythonEnv.cmake -index 9c8966591514..35c94f0d1acc 100644 +index 0a486c1bbb54..c07c55b1e17a 100644 --- a/mlir/cmake/modules/MLIRDetectPythonEnv.cmake +++ b/mlir/cmake/modules/MLIRDetectPythonEnv.cmake -@@ -26,7 +26,7 @@ macro(mlir_configure_python_dev_packages) +@@ -19,7 +19,7 @@ macro(mlir_configure_python_dev_packages) set(_python_development_component Development.Module) find_package(Python3 ${LLVM_MINIMUM_PYTHON_VERSION} @@ -20,6 +14,3 @@ index 9c8966591514..35c94f0d1acc 100644 unset(_python_development_component) message(STATUS "Found python include dirs: ${Python3_INCLUDE_DIRS}") message(STATUS "Found python libraries: ${Python3_LIBRARIES}") --- -2.41.0.windows.2 - diff --git a/ports/llvm/0012-create-destination-mlir-directory.patch b/ports/llvm/0006-create-destination-mlir-directory.patch similarity index 55% rename from ports/llvm/0012-create-destination-mlir-directory.patch rename to ports/llvm/0006-create-destination-mlir-directory.patch index a8d6db47be50ff..4950a48c3b5ec9 100644 --- a/ports/llvm/0012-create-destination-mlir-directory.patch +++ b/ports/llvm/0006-create-destination-mlir-directory.patch @@ -1,13 +1,16 @@ + mlir/python/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + diff --git a/mlir/python/CMakeLists.txt b/mlir/python/CMakeLists.txt -index 7eb6e05e4..b9e1a096a 100644 +index 50fbca38a08f..957a6722c21c 100644 --- a/mlir/python/CMakeLists.txt +++ b/mlir/python/CMakeLists.txt -@@ -483,6 +483,8 @@ add_mlir_python_common_capi_library(MLIRPythonCAPI +@@ -527,6 +527,8 @@ add_mlir_python_common_capi_library(MLIRPythonCAPI ${_ADDL_TEST_SOURCES} ) +file(MAKE_DIRECTORY "${MLIR_BINARY_DIR}/python_packages/mlir_core/mlir/_mlir_libs") + ################################################################################ - # The fully assembled package of modules. - # This must come last. + # Custom targets. + ################################################################################ diff --git a/ports/llvm/0007-Fix-install-bolt.patch b/ports/llvm/0007-Fix-install-bolt.patch deleted file mode 100644 index 361f58e7e8e6d5..00000000000000 --- a/ports/llvm/0007-Fix-install-bolt.patch +++ /dev/null @@ -1,21 +0,0 @@ - bolt/tools/driver/CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt -index e56be15dbcff..85b078e2e761 100644 ---- a/bolt/tools/driver/CMakeLists.txt -+++ b/bolt/tools/driver/CMakeLists.txt -@@ -35,13 +35,6 @@ set(BOLT_DEPENDS - ) - - add_custom_target(bolt DEPENDS ${BOLT_DEPENDS}) --install(PROGRAMS -- ${CMAKE_BINARY_DIR}/bin/llvm-bolt -- ${CMAKE_BINARY_DIR}/bin/perf2bolt -- ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff -- DESTINATION ${CMAKE_INSTALL_BINDIR} -- COMPONENT bolt -- ) - add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt) - set_target_properties(bolt PROPERTIES FOLDER "BOLT") - set_target_properties(install-bolt PROPERTIES FOLDER "BOLT") diff --git a/ports/llvm/0007-fix-compiler-rt-warnings.patch b/ports/llvm/0007-fix-compiler-rt-warnings.patch new file mode 100644 index 00000000000000..67ce0079b475b7 --- /dev/null +++ b/ports/llvm/0007-fix-compiler-rt-warnings.patch @@ -0,0 +1,45 @@ + compiler-rt/lib/asan/CMakeLists.txt | 2 +- + compiler-rt/lib/interception/CMakeLists.txt | 2 +- + compiler-rt/lib/ubsan/CMakeLists.txt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt +index 1bfc6f0c5e37..f35c385c379a 100644 +--- a/compiler-rt/lib/asan/CMakeLists.txt ++++ b/compiler-rt/lib/asan/CMakeLists.txt +@@ -92,7 +92,7 @@ append_rtti_flag(OFF ASAN_CFLAGS) + + # Silence warnings in system headers with MSVC. + if(NOT CLANG_CL) +- append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external /external:W0 /external:anglebrackets" ASAN_CFLAGS) ++ append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external;/external:W0;/external:anglebrackets" ASAN_CFLAGS) + endif() + + # Too many existing bugs, needs cleanup. +diff --git a/compiler-rt/lib/interception/CMakeLists.txt b/compiler-rt/lib/interception/CMakeLists.txt +index 3242cf50e35f..abe9229340be 100644 +--- a/compiler-rt/lib/interception/CMakeLists.txt ++++ b/compiler-rt/lib/interception/CMakeLists.txt +@@ -21,7 +21,7 @@ append_rtti_flag(OFF INTERCEPTION_CFLAGS) + + # Silence warnings in system headers with MSVC. + if(NOT CLANG_CL) +- append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external /external:W0 /external:anglebrackets" INTERCEPTION_CFLAGS) ++ append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external;/external:W0;/external:anglebrackets" INTERCEPTION_CFLAGS) + endif() + + add_compiler_rt_object_libraries(RTInterception +diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt +index 520a024fbede..75b0b12b9da2 100644 +--- a/compiler-rt/lib/ubsan/CMakeLists.txt ++++ b/compiler-rt/lib/ubsan/CMakeLists.txt +@@ -57,7 +57,7 @@ append_list_if(SANITIZER_CAN_USE_CXXABI -DUBSAN_CAN_USE_CXXABI UBSAN_CXXFLAGS) + + # Silence warnings in system headers with MSVC. + if(NOT CLANG_CL) +- append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external /external:W0 /external:anglebrackets" UBSAN_CXXFLAGS) ++ append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external;/external:W0;/external:anglebrackets" UBSAN_CXXFLAGS) + endif() + + set(UBSAN_LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS}) + \ No newline at end of file diff --git a/ports/llvm/0008-llvm_assert.patch b/ports/llvm/0008-llvm_assert.patch deleted file mode 100644 index 2e1f653e50c70c..00000000000000 --- a/ports/llvm/0008-llvm_assert.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/mlir/include/mlir/IR/PatternMatch.h b/mlir/include/mlir/IR/PatternMatch.h -index 12bf196bb58e5..200eae8c3b71c 100644 ---- a/mlir/include/mlir/IR/PatternMatch.h -+++ b/mlir/include/mlir/IR/PatternMatch.h -@@ -1102,10 +1097,9 @@ void assertArgs(PatternRewriter &rewriter, ArrayRef values, - auto errorFn = [&](const Twine &msg) -> LogicalResult { - llvm::report_fatal_error(msg); - }; -- (void)std::initializer_list{ -- (assert(succeeded(ProcessPDLValue>::verifyAsArg(errorFn, values[I], I))), -- 0)...}; -+ assert((succeeded(ProcessPDLValue>:: -+ verifyAsArg(errorFn, values[I], I)) && -+ ...)); - #endif - } - diff --git a/ports/llvm/0011-missing-include.patch b/ports/llvm/0011-missing-include.patch deleted file mode 100644 index c09ed958f690bc..00000000000000 --- a/ports/llvm/0011-missing-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/llvm/lib/Debuginfod/Debuginfod.cpp b/llvm/lib/Debuginfod/Debuginfod.cpp -index ef4e11ca3..29fdd6ffb 100644 ---- a/llvm/lib/Debuginfod/Debuginfod.cpp -+++ b/llvm/lib/Debuginfod/Debuginfod.cpp -@@ -40,6 +40,7 @@ - #include "llvm/Support/xxhash.h" - - #include -+#include - - namespace llvm { - static std::string uniqueKey(llvm::StringRef S) { return utostr(xxHash64(S)); } diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 4d7e26a182b162..51ed7d9b23579e 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -4,20 +4,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project REF "llvmorg-${VERSION}" - SHA512 99beff9ee6f8c26f16ea53f03ba6209a119099cbe361701b0d5f4df9d5cc5f2f0da7c994c899a4cec876da8428564dc7a8e798226a9ba8b5c18a3ef8b181d39e + SHA512 362ddb94fdd22d05bd11c950f1711eafbd47424f6da0b1b061da012ef1b39dd8f7efeb91b53c036ea0708aa3845893fe39d1fb529ac3b928df738b88717d1aee HEAD_REF main PATCHES - 0001-Fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. - 0002-Fix-DR-1734.patch - 0003-Fix-tools-path.patch - 0004-Fix-compiler-rt-install-path.patch - 0005-Fix-tools-install-path.patch - 0007-Fix-install-bolt.patch - 0008-llvm_assert.patch - 0009-disable-libomp-aliases.patch - 0010-remove-numpy.patch - 0011-missing-include.patch - 0012-create-destination-mlir-directory.patch + 0001-fix-install-package-dir.patch + 0002-fix-tools-install-dir.patch + 0003-fix-llvm-config.patch + 0004-disable-libomp-aliases.patch + 0005-remove-numpy.patch + 0006-create-destination-mlir-directory.patch + 0007-fix-compiler-rt-warnings.patch # fixed in upstream ) vcpkg_check_features( @@ -28,10 +24,10 @@ vcpkg_check_features( utils LLVM_BUILD_UTILS utils LLVM_INCLUDE_UTILS utils LLVM_INSTALL_UTILS + enable-assertions LLVM_ENABLE_ASSERTIONS enable-rtti LLVM_ENABLE_RTTI enable-ffi LLVM_ENABLE_FFI enable-terminfo LLVM_ENABLE_TERMINFO - enable-threads LLVM_ENABLE_THREADS enable-ios COMPILER_RT_ENABLE_IOS enable-eh LLVM_ENABLE_EH enable-bindings LLVM_ENABLE_BINDINGS @@ -44,7 +40,7 @@ include("${cmake_vars_file}") # LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON disables this error. # See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html # and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly" on llvm-dev Jan 21-23 2020. -if(VCPKG_DETECTED_MSVC_VERSION LESS "1925" AND VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") +if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND VCPKG_DETECTED_MSVC_VERSION LESS "1925") list(APPEND FEATURE_OPTIONS -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON ) @@ -70,19 +66,6 @@ foreach(external_library IN LISTS llvm_external_libraries) endif() endforeach() -# By default assertions are enabled for Debug configuration only. -if("enable-assertions" IN_LIST FEATURES) - # Force enable assertions for all configurations. - list(APPEND FEATURE_OPTIONS - -DLLVM_ENABLE_ASSERTIONS=ON - ) -elseif("disable-assertions" IN_LIST FEATURES) - # Force disable assertions for all configurations. - list(APPEND FEATURE_OPTIONS - -DLLVM_ENABLE_ASSERTIONS=OFF - ) -endif() - # LLVM_ABI_BREAKING_CHECKS can be WITH_ASSERTS (default), FORCE_ON or FORCE_OFF. # By default in LLVM, abi-breaking checks are enabled if assertions are enabled. # however, this breaks linking with the debug versions, since the option is @@ -103,21 +86,24 @@ endif() set(LLVM_ENABLE_PROJECTS) if("bolt" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "bolt") + list(APPEND FEATURE_OPTIONS + -DBOLT_TOOLS_INSTALL_DIR:PATH=tools/llvm + ) endif() if("clang" IN_LIST FEATURES OR "clang-tools-extra" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "clang") - if("disable-clang-static-analyzer" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS - # Disable ARCMT - -DCLANG_ENABLE_ARCMT=OFF - # Disable static analyzer - -DCLANG_ENABLE_STATIC_ANALYZER=OFF - ) - endif() - # 1) LLVM/Clang tools are relocated from ./bin/ to ./tools/llvm/ (LLVM_TOOLS_INSTALL_DIR=tools/llvm) - # 2) Clang resource files are relocated from ./lib/clang/ to ./tools/llvm/lib/clang/ (see patch 0007-fix-compiler-rt-install-path.patch) - # So, the relative path should be changed from ../lib/clang/ to ./lib/clang/ - list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=lib/clang/${VERSION}) + list(APPEND FEATURE_OPTIONS + -DCLANG_INSTALL_PACKAGE_DIR:PATH=share/clang + -DCLANG_TOOLS_INSTALL_DIR:PATH=tools/llvm + # Disable ARCMT + -DCLANG_ENABLE_ARCMT=OFF + # Disable static analyzer + -DCLANG_ENABLE_STATIC_ANALYZER=OFF + ) + # 1) LLVM/Clang tools are relocated from ./bin/ to ./tools/llvm/ (CLANG_TOOLS_INSTALL_DIR=tools/llvm) + # 2) Clang resource files should be relocated from lib/clang/ to ../tools/llvm/lib/clang/ + string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${VERSION}) + list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=../tools/llvm/lib/clang/${CLANG_VERSION_MAJOR}) endif() if("clang-tools-extra" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "clang-tools-extra") @@ -130,6 +116,10 @@ if("flang" IN_LIST FEATURES) message(FATAL_ERROR "Building Flang with MSVC is not supported on x86. Disable it until issues are fixed.") endif() list(APPEND LLVM_ENABLE_PROJECTS "flang") + list(APPEND FEATURE_OPTIONS + -DFLANG_INSTALL_PACKAGE_DIR:PATH=share/flang + -DFLANG_TOOLS_INSTALL_DIR:PATH=tools/llvm + ) list(APPEND FEATURE_OPTIONS # Flang requires C++17 -DCMAKE_CXX_STANDARD=17 @@ -140,6 +130,10 @@ if("libclc" IN_LIST FEATURES) endif() if("lld" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "lld") + list(APPEND FEATURE_OPTIONS + -DLLD_INSTALL_PACKAGE_DIR:PATH=share/lld + -DLLD_TOOLS_INSTALL_DIR:PATH=tools/llvm + ) endif() if("lldb" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "lldb") @@ -149,6 +143,11 @@ if("lldb" IN_LIST FEATURES) endif() if("mlir" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "mlir") + list(APPEND FEATURE_OPTIONS + -DMLIR_INSTALL_PACKAGE_DIR:PATH=share/mlir + -DMLIR_TOOLS_INSTALL_DIR:PATH=tools/llvm + -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF # Disables installation of object files in lib/objects-{CMAKE_BUILD_TYPE}. + ) if("enable-mlir-python-bindings" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -DMLIR_ENABLE_BINDINGS_PYTHON=ON @@ -158,6 +157,11 @@ if("mlir" IN_LIST FEATURES) endif() if("openmp" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "openmp") + list(APPEND FEATURE_OPTIONS + -DLIBOMP_INSTALL_ALIASES=OFF + -DOPENMP_ENABLE_LIBOMPTARGET=OFF # Currently libomptarget cannot be compiled on Windows or MacOS X. + -DOPENMP_ENABLE_OMPT_TOOLS=OFF # Currently tools are not tested well on Windows or MacOS X. + ) # Perl is required for the OpenMP run-time vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) @@ -167,30 +171,36 @@ if("openmp" IN_LIST FEATURES) endif() if("polly" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "polly") -endif() -if("pstl" IN_LIST FEATURES) - if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - message(FATAL_ERROR "Building pstl with MSVC is not supported. Disable it until issues are fixed.") - endif() - list(APPEND LLVM_ENABLE_PROJECTS "pstl") + list(APPEND FEATURE_OPTIONS + -DPOLLY_INSTALL_PACKAGE_DIR:PATH=share/polly + ) endif() set(LLVM_ENABLE_RUNTIMES) +if("libc" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_RUNTIMES "libc") +endif() if("libcxx" IN_LIST FEATURES) - if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - message(FATAL_ERROR "Building libcxx with MSVC is not supported, as cl doesn't support the #include_next extension.") + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND VCPKG_DETECTED_MSVC_VERSION LESS "1914") + # libcxx supports being built with clang-cl, but not with MSVC’s cl.exe, as cl doesn’t support the #include_next extension. + # Furthermore, VS 2017 or newer (19.14) is required. + # More info: https://releases.llvm.org/17.0.1/projects/libcxx/docs/BuildingLibcxx.html#support-for-windows + message(FATAL_ERROR "libcxx requiries MSVC 19.14 or newer.") endif() list(APPEND LLVM_ENABLE_RUNTIMES "libcxx") endif() if("libcxxabi" IN_LIST FEATURES) - if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - message(FATAL_ERROR "Building libcxxabi with MSVC is not supported. Disable it until issues are fixed.") - endif() list(APPEND LLVM_ENABLE_RUNTIMES "libcxxabi") endif() if("libunwind" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_RUNTIMES "libunwind") endif() +if("pstl" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message(FATAL_ERROR "Building pstl with MSVC is not supported.") + endif() + list(APPEND LLVM_ENABLE_RUNTIMES "pstl") +endif() # this is for normal targets set(known_llvm_targets @@ -201,6 +211,7 @@ set(known_llvm_targets BPF Hexagon Lanai + LoongArch Mips MSP430 NVPTX @@ -214,7 +225,7 @@ set(known_llvm_targets XCore ) -set(LLVM_TARGETS_TO_BUILD "") +set(LLVM_TARGETS_TO_BUILD) foreach(llvm_target IN LISTS known_llvm_targets) string(TOLOWER "target-${llvm_target}" feature_name) if(feature_name IN_LIST FEATURES) @@ -224,10 +235,15 @@ endforeach() # this is for experimental targets set(known_llvm_experimental_targets - SPRIV + ARC + CSKY + DirectX + M68k + SPIRV + Xtensa ) -set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "") +set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD) foreach(llvm_target IN LISTS known_llvm_experimental_targets) string(TOLOWER "target-${llvm_target}" feature_name) if(feature_name IN_LIST FEATURES) @@ -239,41 +255,44 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") -set(LLVM_LINK_JOBS 1) - file(REMOVE "${SOURCE_PATH}/llvm/cmake/modules/Findzstd.cmake") +if("${LLVM_ENABLE_RUNTIMES}" STREQUAL "") + list(APPEND FEATURE_OPTIONS + -DLLVM_INCLUDE_RUNTIMES=OFF + -DLLVM_BUILD_RUNTIMES=OFF + -DLLVM_BUILD_RUNTIME=OFF + ) +endif() + +# At least one target must be specified, otherwise default to "all". +if("${LLVM_TARGETS_TO_BUILD}" STREQUAL "") + set(LLVM_TARGETS_TO_BUILD "all") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/llvm" OPTIONS - ${FEATURE_OPTIONS} -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_BUILD_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_BUILD_BENCHMARKS=OFF - -DLIBOMP_INSTALL_ALIASES=OFF # Force TableGen to be built with optimization. This will significantly improve build time. -DLLVM_OPTIMIZED_TABLEGEN=ON + -DPACKAGE_VERSION=${VERSION} + # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link. + -DLLVM_PARALLEL_LINK_JOBS=1 + -DLLVM_INSTALL_PACKAGE_DIR:PATH=share/llvm + -DLLVM_TOOLS_INSTALL_DIR:PATH=tools/llvm "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}" "-DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES}" "-DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}" - - -DPACKAGE_VERSION=${VERSION} - # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link. - "-DLLVM_PARALLEL_LINK_JOBS=${LLVM_LINK_JOBS}" - -DLLVM_TOOLS_INSTALL_DIR:PATH=tools/llvm - -DCLANG_TOOLS_INSTALL_DIR:PATH=tools/llvm - -DLLD_TOOLS_INSTALL_DIR:PATH=tools/llvm - -DMLIR_TOOLS_INSTALL_DIR:PATH=tools/llvm - -DBOLT_TOOLS_INSTALL_DIR:PATH=tools/llvm # all others are strings - -DOPENMP_TOOLS_INSTALL_DIR:PATH=tools/llvm + ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES COMPILER_RT_ENABLE_IOS - OPENMP_TOOLS_INSTALL_DIR - MLIR_TOOLS_INSTALL_DIR ) vcpkg_cmake_install(ADD_BIN_TO_PATH) @@ -317,26 +336,29 @@ endif() if("pstl" IN_LIST FEATURES) list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/lib/cmake") - list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") + endif() endif() if("flang" IN_LIST FEATURES) - list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Config") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Config") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CMakeFiles") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CodeGen/CMakeFiles") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Dialect/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/HLFIR/CMakeFiles") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Transforms/CMakeFiles") endif() if(empty_dirs) foreach(empty_dir IN LISTS empty_dirs) if(NOT EXISTS "${empty_dir}") - message(SEND_ERROR "Directory '${empty_dir}' is not exist. Please remove it from the checking.") + message(WARNING "Directory '${empty_dir}' does not exist. Please remove it from the list of empty directories.") else() file(GLOB_RECURSE files_in_dir "${empty_dir}/*") if(files_in_dir) - message(SEND_ERROR "Directory '${empty_dir}' is not empty. Please remove it from the checking.") + message(WARNING "Directory '${empty_dir}' is not empty. Please remove it from the list of empty directories.") else() file(REMOVE_RECURSE "${empty_dir}") endif() @@ -358,9 +380,15 @@ if("mlir" IN_LIST FEATURES) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "\${MLIR_INCLUDE_DIRS}") endif() -# LLVM still generates a few DLLs in the static build: -# * LLVM-C.dll -# * libclang.dll -# * LTO.dll -# * Remarks.dll -set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) +if(VCPKG_TARGET_IS_WINDOWS) + # LLVM still generates a few DLLs in the static build: + # * LLVM-C.dll + # * libclang.dll + # * LTO.dll + # * Remarks.dll + set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) +else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() \ No newline at end of file diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 4665ef82cf9aeb..03203dbb57af1d 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,14 +1,13 @@ { "name": "llvm", - "version": "15.0.7", - "port-version": 6, + "version": "17.0.2", "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", "supports": "!uwp & !(arm & windows)", "dependencies": [ { - "name": "atlmfc", + "name": "atl", "platform": "windows & !mingw" }, { @@ -26,8 +25,11 @@ ], "default-features": [ "clang", - "default-options", "default-targets", + "enable-bindings", + "enable-terminfo", + "enable-zlib", + "enable-zstd", "lld", "tools" ], @@ -80,34 +82,9 @@ } ] }, - "default-options": { - "description": "Build with default options.", - "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "disable-assertions", - "disable-clang-static-analyzer", - "enable-bindings", - "enable-terminfo", - "enable-threads", - "enable-zlib", - "enable-zstd" - ] - } - ] - }, "default-targets": { "description": "Build with platform-specific default targets.", "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "target-spirv" - ] - }, { "name": "llvm", "default-features": false, @@ -131,23 +108,9 @@ "target-arm" ], "platform": "arm & !arm64" - }, - { - "name": "llvm", - "default-features": false, - "features": [ - "target-all" - ], - "platform": "!x86 & !x64 & !arm & !arm64" } ] }, - "disable-assertions": { - "description": "Build LLVM without assertions." - }, - "disable-clang-static-analyzer": { - "description": "Build without static analyzer." - }, "enable-abi-breaking-checks": { "description": "Build LLVM with LLVM_ABI_BREAKING_CHECKS=FORCE_ON." }, @@ -214,9 +177,6 @@ "enable-terminfo": { "description": "Use terminfo database if available." }, - "enable-threads": { - "description": "Use threads if available." - }, "enable-zlib": { "description": "Build with ZLib.", "dependencies": [ @@ -243,6 +203,20 @@ } ] }, + "libc": { + "description": "Include libc library.", + "supports": "linux", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "clang", + "tools" + ] + } + ] + }, "libclc": { "description": "Include OpenCL library." }, @@ -253,7 +227,9 @@ "name": "llvm", "default-features": false, "features": [ - "libcxxabi" + "clang", + "libcxxabi", + "tools" ] } ] @@ -265,6 +241,8 @@ "name": "llvm", "default-features": false, "features": [ + "clang", + "libcxx", "tools" ] } @@ -347,7 +325,16 @@ ] }, "pstl": { - "description": "Include pstl (Parallel STL) library." + "description": "Include pstl (Parallel STL) library.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] }, "target-aarch64": { "description": "Build with AArch64 backend." @@ -361,11 +348,16 @@ "features": [ "target-aarch64", "target-amdgpu", + "target-arc", "target-arm", "target-avr", "target-bpf", + "target-csky", + "target-directx", "target-hexagon", "target-lanai", + "target-loongarch", + "target-m68k", "target-mips", "target-msp430", "target-nvptx", @@ -377,7 +369,8 @@ "target-ve", "target-webassembly", "target-x86", - "target-xcore" + "target-xcore", + "target-xtensa" ] } ] @@ -385,6 +378,9 @@ "target-amdgpu": { "description": "Build with AMDGPU backend." }, + "target-arc": { + "description": "Build with ARC backend (experimental)." + }, "target-arm": { "description": "Build with ARM backend." }, @@ -394,12 +390,24 @@ "target-bpf": { "description": "Build with BPF backend." }, + "target-csky": { + "description": "Build with CSKY backend (experimental)." + }, + "target-directx": { + "description": "Build with DirectX backend (experimental)." + }, "target-hexagon": { "description": "Build with Hexagon backend." }, "target-lanai": { "description": "Build with Lanai backend." }, + "target-loongarch": { + "description": "Build with LoongArch backend." + }, + "target-m68k": { + "description": "Build with M68k backend (experimental)." + }, "target-mips": { "description": "Build with Mips backend." }, @@ -419,7 +427,7 @@ "description": "Build with Sparc backend." }, "target-spirv": { - "description": "Build with Spriv backend." + "description": "Build with SPIRV backend (experimental)." }, "target-systemz": { "description": "Build with SystemZ backend." @@ -436,17 +444,11 @@ "target-xcore": { "description": "Build with XCore backend." }, + "target-xtensa": { + "description": "Build with Xtensa backend (experimental)." + }, "tools": { - "description": "Build LLVM tools.", - "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "enable-threads" - ] - } - ] + "description": "Build LLVM tools." }, "utils": { "description": "Build LLVM utils." diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index 3b26122e235d25..ddc9756078bd66 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO log4cplus/log4cplus - REF REL_2_0_7 - SHA512 FE5FCEB346AC19A6D953661A20E8AA02AB48E872F427D958EA99C62F534DDF1FA4511FFD67A662605B1F225E3A6C06B0EE2C1B0EB62DE3AA0316F47F778DF06D + REF REL_2_1_0 + SHA512 fd26ae73e898af6896046e5e567bfc664bc8e81568c8cdbe5ff6316054b875af7fa946f7b1f011a96b0d3b53dc3f7f9411cbc2ffa07b674777cb0def2743ede8 HEAD_REF master ) @@ -40,7 +40,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() - +vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/log4cplus) vcpkg_copy_pdbs() diff --git a/ports/log4cplus/vcpkg.json b/ports/log4cplus/vcpkg.json index a70adf2990f4bf..0b0bf070f5743b 100644 --- a/ports/log4cplus/vcpkg.json +++ b/ports/log4cplus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "log4cplus", - "version": "2.0.7", - "port-version": 1, + "version": "2.1.0", "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", "homepage": "https://github.com/log4cplus/log4cplus", "dependencies": [ diff --git a/ports/ltla-cppirlba/portfile.cmake b/ports/ltla-cppirlba/portfile.cmake index 7a71588401d1ba..5822c2bb447f3b 100644 --- a/ports/ltla-cppirlba/portfile.cmake +++ b/ports/ltla-cppirlba/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LTLA/CppIrlba - REF d23a4c12b95563907cf8ca7584b7bb6625ff886b - SHA512 1fdc9552ab00c7c541b4cd34326075f257a30ebcf73dd633dd088b20a20cb0dd704be0c3295ab96d5a573cb1a783c19f34a3e5d860c719e413c098fd9df4cb3a + REF 228e207778597c8c3a0284fd2bfe4347dbb4646e + SHA512 4bfb4a508a62e3d5e3345bc59756353e6cd68e8d9a5cb9e7dd38ae71abd924a77e6c319bf8cd31b4f939be4531bf4527fd283515b40e8d5b88beaa0fd3411aff HEAD_REF master ) diff --git a/ports/ltla-cppirlba/vcpkg.json b/ports/ltla-cppirlba/vcpkg.json index eaafa717bbef97..638995702a1128 100644 --- a/ports/ltla-cppirlba/vcpkg.json +++ b/ports/ltla-cppirlba/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ltla-cppirlba", - "version-date": "2023-04-07", + "version-date": "2023-09-20", "description": "A C++ port of the IRLBA algorithm, based on the C code in the R package.", "homepage": "https://github.com/LTLA/CppIrlba", "license": "MIT", diff --git a/ports/makeid/portfile.cmake b/ports/makeid/portfile.cmake index b4328b40ccc3d8..67c75090195c5f 100644 --- a/ports/makeid/portfile.cmake +++ b/ports/makeid/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_download_distfile(ARCHIVE URLS "https://www.humus.name/3D/MakeID.h" FILENAME "MakeID.h-${VERSION}" - SHA512 9b7cb5c1b71904f37f65fcac3d18194154029fbe04d89099d879ce8eb03e796662c78653322317ed72988d3695414aaa6e6c24cfff999bea5009ec47119c57a7 + SHA512 fd4222d2cc0b0e16b0cfbac048cb64ac59d53ede10ab7f88f710e4b866cb67ffb0ec139821c181f1804a813cc9ab20cf33282c8b73e9ef0fdba414be474c2b64 ) -file(COPY "${ARCHIVE}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${ARCHIVE}" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME "MakeID.h") set(license_text "Public Domain diff --git a/ports/makeid/vcpkg.json b/ports/makeid/vcpkg.json index fbd793888b2cef..188046ce1c92b0 100644 --- a/ports/makeid/vcpkg.json +++ b/ports/makeid/vcpkg.json @@ -1,6 +1,6 @@ { "name": "makeid", - "version": "1.0.2", + "version": "1.0.3", "description": "MakeID is a cross platform C++ library for IDs allocation/deallocation", "homepage": "http://www.humus.name/index.php?page=3D", "license": null diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake index 924b302cabb4b1..9d9bd70db7de5c 100644 --- a/ports/matio/portfile.cmake +++ b/ports/matio/portfile.cmake @@ -27,10 +27,22 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +set(prefix "${CURRENT_INSTALLED_DIR}") +set(exec_prefix [[${prefix}]]) +set(libdir [[${prefix}/lib]]) +set(includedir [[${prefix}/include]]) +configure_file("${SOURCE_PATH}/matio.pc.in" "${SOURCE_PATH}/matio.pc" @ONLY) +file(INSTALL "${SOURCE_PATH}/matio.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +if(NOT VCPKG_BUILD_TYPE) + set(includedir [[${prefix}/../include]]) + file(INSTALL "${SOURCE_PATH}/matio.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() vcpkg_copy_tools(TOOL_NAMES matdump AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/matio/usage b/ports/matio/usage new file mode 100644 index 00000000000000..4a697912dfe247 --- /dev/null +++ b/ports/matio/usage @@ -0,0 +1,5 @@ +matio can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig REQUIRED) + pkg_check_modules(matio REQUIRED IMPORTED_TARGET matio) + target_link_libraries(main PRIVATE PkgConfig::matio) diff --git a/ports/matio/vcpkg.json b/ports/matio/vcpkg.json index b5ff9bbc078740..5e6aa4d8ce3abb 100644 --- a/ports/matio/vcpkg.json +++ b/ports/matio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "matio", "version": "1.5.23", - "port-version": 2, + "port-version": 3, "description": "MATLAB MAT File I/O Library", "homepage": "https://github.com/tbeu/matio", "license": "BSD-2-Clause", diff --git a/ports/mdns/portfile.cmake b/ports/mdns/portfile.cmake index 272ef3b93feabf..d6628d7bab941e 100644 --- a/ports/mdns/portfile.cmake +++ b/ports/mdns/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mjansson/mdns - REF 1.4.2 - SHA512 fa3fcf130721ee6f7012225c1e7952bd41703c2488b1d0ffe2b8c73ed06744d1cd9f03b6ab19aa0b8074fbfaafe46f8e102d6a648756725a60dc076e896cfbf6 + REF "${VERSION}" + SHA512 0bbfeefdd3f324a8e5aa85227bfa45c2b5cd88c12a9f77df2a1c48cb2661ba8b283dd53541e39d20ed2705646dc8d8724a0287c58f9efa91d2b1b796a0ca9a7a HEAD_REF master ) @@ -17,4 +17,4 @@ vcpkg_cmake_configure( vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/mdns/vcpkg.json b/ports/mdns/vcpkg.json index c0dade8e7ba38e..728a2a1f313413 100644 --- a/ports/mdns/vcpkg.json +++ b/ports/mdns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mdns", - "version": "1.4.2", + "version": "1.4.3", "description": "Public domain mDNS/DNS-SD library in C", "homepage": "https://github.com/mjansson/mdns", "license": "Unlicense", diff --git a/ports/mesa/clover-llvm-move-to-modern-pass-manager.patch b/ports/mesa/clover-llvm-move-to-modern-pass-manager.patch new file mode 100644 index 00000000000000..902336776cbd19 --- /dev/null +++ b/ports/mesa/clover-llvm-move-to-modern-pass-manager.patch @@ -0,0 +1,127 @@ +From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Fri, 25 Aug 2023 12:43:44 +1000 +Subject: [PATCH] clover/llvm: move to modern pass manager. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This seems like it should work, but I haven't tested it yet. + +Tested-by: Dieter Nützel +Part-of: +--- + .../frontends/clover/llvm/invocation.cpp | 64 +++++++++++++++---- + 1 file changed, 51 insertions(+), 13 deletions(-) + +diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp +index 7a50fea332395..43d26fe1abbce 100644 +--- a/src/gallium/frontends/clover/llvm/invocation.cpp ++++ b/src/gallium/frontends/clover/llvm/invocation.cpp +@@ -27,13 +27,17 @@ + #include + #include + #include ++#include + #include +-#include ++#include + #include + #ifdef HAVE_CLOVER_SPIRV + #include + #endif + ++#include ++#include ++#include + #include + #include + #include +@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source, + + namespace { + void +- optimize(Module &mod, unsigned optimization_level, ++ optimize(Module &mod, ++ const std::string& ir_target, ++ unsigned optimization_level, + bool internalize_symbols) { +- ::llvm::legacy::PassManager pm; +- + // By default, the function internalizer pass will look for a function + // called "main" and then mark all other functions as internal. Marking + // functions as internal enables the optimizer to perform optimizations +@@ -458,19 +462,53 @@ namespace { + if (internalize_symbols) { + std::vector names = + map(std::mem_fn(&Function::getName), get_kernels(mod)); +- pm.add(::llvm::createInternalizePass( ++ internalizeModule(mod, + [=](const ::llvm::GlobalValue &gv) { + return std::find(names.begin(), names.end(), + gv.getName()) != names.end(); +- })); ++ }); + } + +- ::llvm::PassManagerBuilder pmb; +- pmb.OptLevel = optimization_level; +- pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl( +- ::llvm::Triple(mod.getTargetTriple())); +- pmb.populateModulePassManager(pm); +- pm.run(mod); ++ ++ const char *opt_str = NULL; ++ LLVMCodeGenOptLevel level; ++ switch (optimization_level) { ++ case 0: ++ default: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelNone; ++ break; ++ case 1: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelLess; ++ break; ++ case 2: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelDefault; ++ break; ++ case 3: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelAggressive; ++ break; ++ } ++ ++ const target &target = ir_target; ++ LLVMTargetRef targ; ++ char *err_message; ++ ++ if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message)) ++ return; ++ LLVMTargetMachineRef tm = ++ LLVMCreateTargetMachine(targ, target.triple.c_str(), ++ target.cpu.c_str(), "", level, ++ LLVMRelocDefault, LLVMCodeModelDefault); ++ ++ if (!tm) ++ return; ++ LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions(); ++ LLVMRunPasses(wrap(&mod), opt_str, tm, opts); ++ ++ LLVMDisposeTargetMachine(tm); + } + + std::unique_ptr +@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector &binaries, + auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log); + auto mod = link(*ctx, *c, binaries, r_log); + +- optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library); ++ optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library); + + static std::atomic_uint seq(0); + const std::string id = "." + mod->getModuleIdentifier() + "-" + +-- +GitLab + diff --git a/ports/mesa/gallium-fix-build-with-llvm-17.patch b/ports/mesa/gallium-fix-build-with-llvm-17.patch new file mode 100644 index 00000000000000..cea5a17f30798d --- /dev/null +++ b/ports/mesa/gallium-fix-build-with-llvm-17.patch @@ -0,0 +1,42 @@ +From cda32e18a08fa2f2289a7409f37f44d5643e6aea Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 23 Jun 2023 01:20:38 -0700 +Subject: [PATCH] gallium: Fix build with llvm 17 + +These headers are not available for C files in llvm 17+ +and they seem to be not needed to compile after all with llvm 17 +so add conditions to exclude them for llvm >= 17 + +Signed-off-by: Khem Raj +--- + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c +index cd2108f3a088d..b1a4d0388a6a0 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c ++++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c +@@ -46,15 +46,19 @@ + #if GALLIVM_USE_NEW_PASS == 1 + #include + #elif GALLIVM_HAVE_CORO == 1 ++#if LLVM_VERSION_MAJOR < 17 + #include +-#if LLVM_VERSION_MAJOR >= 7 ++#endif ++#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17 + #include + #endif + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) + #include + #endif ++#if LLVM_VERSION_MAJOR < 17 + #include + #endif ++#endif + + unsigned gallivm_perf = 0; + +-- +GitLab + diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index feec2312c1ce91..d2f25670dd6fcd 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -7,19 +7,22 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa - REF b590fd1951a1949e5fe2bbfd61f0814c402af263 # mesa-23.0.1 - SHA512 7a66a587ef01fb58b51f3ebea584b40f70114844484df528d38ad1caa071fac7d6e23f1ed80309847f7e28468071571294bb8812a9882c0b86c89cf5a4144fe9 + REF mesa-${VERSION} + SHA512 96f7602c98d532a269116bd5d3f9cbe87ca4425b309467cc19f83277a0faaa9804edea72dcaeb6f7774cac17790d5d76b58c357ef639cb6064e7480d93b861bf FILE_DISAMBIGUATOR 1 HEAD_REF master + PATCHES + gallium-fix-build-with-llvm-17.patch + clover-llvm-move-to-modern-pass-manager.patch ) -x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako ) +x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako) vcpkg_find_acquire_program(FLEX) -get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") vcpkg_find_acquire_program(BISON) -get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY) vcpkg_add_to_path(PREPEND "${BISON_DIR}") if(WIN32) # WIN32 HOST probably has win_flex and win_bison! diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index e2a39246fcdfb4..dbf67a89b777fb 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mesa", - "version": "23.0.1", - "port-version": 2, + "version": "23.2.1", "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "license": "MIT AND BSL-1.0 AND SGI-B-2.0", diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 4229529c0747c2..958d6ee79c20c3 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/minizip-ng REF "${VERSION}" - SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05 + SHA512 857450c3a51a75269afdffdcbaaa6d05894913dd98a91e307129b5e61766f6e3d20bca5841afa41bbe6ca88ad0666c462079a5e1fe73718c2dffd05219c8f258 HEAD_REF master PATCHES fix_find_zstd.patch @@ -17,7 +17,6 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES pkcrypt MZ_PKCRYPT - signing MZ_SIGNING wzaes MZ_WZAES openssl MZ_OPENSSL bzip2 MZ_BZIP2 @@ -39,7 +38,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/minizip-ng) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index 9ec1b4fe7d8c82..4f0ca912dbbe4a 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "minizip-ng", - "version": "4.0.0", - "port-version": 4, + "version": "4.0.1", "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "license": "Zlib", @@ -20,7 +19,6 @@ "bzip2", "lzma", "pkcrypt", - "signing", "wzaes", "zlib", "zstd" @@ -47,19 +45,6 @@ "pkcrypt": { "description": "Enables PKWARE traditional encryption" }, - "signing": { - "description": "Enables zip signing support", - "dependencies": [ - { - "name": "minizip-ng", - "default-features": false, - "features": [ - "openssl" - ], - "platform": "!windows & !osx" - } - ] - }, "wzaes": { "description": "Enables WinZIP AES encryption", "dependencies": [ diff --git a/ports/mongoose/portfile.cmake b/ports/mongoose/portfile.cmake index 86cb5477de84bd..fefa7abe2f1a6d 100644 --- a/ports/mongoose/portfile.cmake +++ b/ports/mongoose/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cesanta/mongoose REF "${VERSION}" - SHA512 883807e4df1702e7def972d54a33ca6104d556bd5cfeb58890afa2d9f8825630507afbb3a7d7bb625d84d32162cc351cc1d3d29a5a40e281272fdd7176ca930a + SHA512 b243ab3e801c99f4c7c063be001e9a0cb30b301c719e2e44e47bdb815618cf1607bb57eba316332927b98de69460ff94ff521a2cf8c02fa03a201304193d4058 HEAD_REF master ) diff --git a/ports/mongoose/vcpkg.json b/ports/mongoose/vcpkg.json index c5ec19c73ef5ba..679ebe42769d38 100644 --- a/ports/mongoose/vcpkg.json +++ b/ports/mongoose/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongoose", - "version": "7.11", + "version": "7.12", "description": "Embedded web server / embedded networking library", "homepage": "https://cesanta.com/", "license": null, diff --git a/ports/mosquitto/0002-win64-support.patch b/ports/mosquitto/0002-win64-support.patch deleted file mode 100644 index c140a7873c52f5..00000000000000 --- a/ports/mosquitto/0002-win64-support.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2775a3da..ddd81b04 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -67,12 +67,7 @@ option(WITH_THREADING "Include client library threading support?" ON) - if (WITH_THREADING) - add_definitions("-DWITH_THREADING") - if (WIN32) -- if (CMAKE_CL_64) -- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib) -- else (CMAKE_CL_64) -- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib) -- endif (CMAKE_CL_64) -- set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include) -+ find_package(pthread REQUIRED) - elseif (ANDROID) - set (PTHREAD_LIBRARIES "") - set (PTHREAD_INCLUDE_DIR "") diff --git a/ports/mosquitto/0005-websocket-shared-lib-name.patch b/ports/mosquitto/0005-websocket-shared-lib-name.patch index 4ce8a826787233..33074e9c1bb175 100644 --- a/ports/mosquitto/0005-websocket-shared-lib-name.patch +++ b/ports/mosquitto/0005-websocket-shared-lib-name.patch @@ -1,20 +1,20 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9380a046..f2929e19 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -194,13 +194,13 @@ endif (WIN32) - - if (WITH_WEBSOCKETS) - if (STATIC_WEBSOCKETS) -- set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static) -+ set (MOSQ_LIBS ${MOSQ_LIBS} websockets) - if (WIN32) - set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi) - link_directories(${mosquitto_SOURCE_DIR}) - endif (WIN32) - else (STATIC_WEBSOCKETS) -- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) -+ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) - endif (STATIC_WEBSOCKETS) - endif (WITH_WEBSOCKETS) - +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 62ce99e..61f941e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -194,13 +194,13 @@ endif (WIN32) + + if (WITH_WEBSOCKETS) + if (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets) + if (WIN32) + set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi) + link_directories(${mosquitto_SOURCE_DIR}) + endif (WIN32) + else (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) + endif (STATIC_WEBSOCKETS) + endif (WITH_WEBSOCKETS) + diff --git a/ports/mosquitto/0006-pthreads-for-windows.patch b/ports/mosquitto/0006-pthreads-for-windows.patch new file mode 100644 index 00000000000000..14d59946f16dcb --- /dev/null +++ b/ports/mosquitto/0006-pthreads-for-windows.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c55e05..adece3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,8 +68,8 @@ option(WITH_THREADING "Include client library threading support?" ON) + if (WITH_THREADING) + add_definitions("-DWITH_THREADING") + if (WIN32) +- find_package(Threads REQUIRED) +- set (PTHREAD_LIBRARIES Threads::Threads) ++ find_package(pthread CONFIG REQUIRED) ++ set (PTHREAD_LIBRARIES PThreads4W::PThreads4W) + set (PTHREAD_INCLUDE_DIR "") + elseif (ANDROID) + set (PTHREAD_LIBRARIES "") diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index ab11f068f07d7d..f1487108e5c374 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -2,13 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/mosquitto HEAD_REF master - REF v2.0.14 - SHA512 4b7066acd7d8ecb05fef6089997632381c34ce6631b7106afedf95b7f72d7280e45c9b2f8cce49349bf599520770ebbebb68ff71930bc44b615d177b4056a945 + REF "v${VERSION}" + SHA512 667216f3e60f9916d5de200d3a205fb5a5c798564c96e44939af6c8e3af85fffa36a63eba47db009b432d14f43883dbca5b92547a458215dd269e91f6bcfb7fa PATCHES - 0002-win64-support.patch 0003-add-find_package-libwebsockets.patch 0004-support-static-build.patch 0005-websocket-shared-lib-name.patch + 0006-pthreads-for-windows.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE) diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json index db31380700747d..d298cf9f3973e1 100644 --- a/ports/mosquitto/vcpkg.json +++ b/ports/mosquitto/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mosquitto", - "version": "2.0.14", + "version": "2.0.18", "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", "homepage": "https://mosquitto.org/", "license": "EPL-2.0", + "supports": "!android", "dependencies": [ "c-ares", "libwebsockets", diff --git a/ports/mpark-patterns/portfile.cmake b/ports/mpark-patterns/portfile.cmake new file mode 100644 index 00000000000000..639fdceb58a3bb --- /dev/null +++ b/ports/mpark-patterns/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mpark/patterns + REF b3270e0dd7b6312f7a4fe8647e2333dbb86e355e + SHA512 ca8062b92cf0d5874aba7067615ff8cb089c22cb921d6131762a8dcb2f50d4f47d80c59b62b1c9b7e70dae2dfb68a44c2a4feeb78ab5e5473e0fbdd089538314 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE release) #header-only library + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME mpark_patterns CONFIG_PATH "lib/cmake/mpark_patterns") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mpark-patterns/usage b/ports/mpark-patterns/usage new file mode 100644 index 00000000000000..8e4f5d53613386 --- /dev/null +++ b/ports/mpark-patterns/usage @@ -0,0 +1,5 @@ +The package mpark-patterns provides CMake targets: + + find_package(mpark_patterns CONFIG REQUIRED) + target_link_libraries(main PRIVATE mpark_patterns) + diff --git a/ports/mpark-patterns/vcpkg.json b/ports/mpark-patterns/vcpkg.json new file mode 100644 index 00000000000000..a9619173b62797 --- /dev/null +++ b/ports/mpark-patterns/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "mpark-patterns", + "version-date": "2019-10-03", + "description": "MPark.Patterns is an experimental pattern matching library for C++17.", + "homepage": "https://github.com/mpark/patterns", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/mpg123/fix-checktypesize.patch b/ports/mpg123/fix-checktypesize.patch new file mode 100644 index 00000000000000..68af0ca9e88606 --- /dev/null +++ b/ports/mpg123/fix-checktypesize.patch @@ -0,0 +1,14 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index 79e1f9b..e057567 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -5,6 +5,7 @@ include(CheckFunctionExists) + include(CheckIncludeFile) + include(CheckIncludeFiles) + include(CheckSymbolExists) ++include(CheckTypeSize) + include(CMakeDependentOption) + include(TestBigEndian) + + + diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 7761054c444e56..01856176c5c5fd 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -5,20 +5,26 @@ vcpkg_from_sourceforge( FILENAME "mpg123-${VERSION}.tar.bz2" SHA512 5dd550e06f5d0d432cac1b7e546215e56378b44588c1a98031498473211e08bc4228de45be41f7ba764f7f6c0eb752a6501235bcc3712c9a8d8852ae3c607d98 PATCHES + fix-checktypesize.patch fix-modulejack.patch fix-m1-build.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") yasm_tool_helper(APPEND_TO_PATH) endif() +vcpkg_list(SET options) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND options "-DLIBMPG123_LIBS=-lshlwapi") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/ports/cmake" OPTIONS -DUSE_MODULES=OFF -DBUILD_PROGRAMS=OFF + ${options} MAYBE_UNUSED_VARIABLES BUILD_PROGRAMS ) diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index 0452cbb7f9b51d..57a6faca7fd20f 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpg123", "version": "1.31.3", - "port-version": 1, + "port-version": 3, "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "license": "LGPL-2.1-or-later", @@ -16,8 +16,12 @@ "host": true }, { - "name": "yasm-tool-helper", - "platform": "windows" + "name": "yasm", + "host": true, + "features": [ + "tools" + ], + "platform": "windows & !mingw" } ] } diff --git a/ports/murmur3/CMakeLists.txt b/ports/murmur3/CMakeLists.txt new file mode 100644 index 00000000000000..73796950f7ec74 --- /dev/null +++ b/ports/murmur3/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.19) +project(murmur3 LANGUAGES C) +set(PROJECT_VERSION "${VERSION}") + +set(Header_Files "${PROJECT_NAME}.h") +set(Source_Files "${PROJECT_NAME}.c") + +add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}") + +include(GNUInstallDirs) +target_include_directories( + "${PROJECT_NAME}" + PUBLIC + "$" + "$" +) +target_compile_features("${PROJECT_NAME}" PRIVATE c_std_90) +set_target_properties("${PROJECT_NAME}" PROPERTIES C_VISIBILITY_PRESET hidden + PUBLIC_HEADER "${Header_Files}") + +install( + TARGETS "${PROJECT_NAME}" + EXPORT "unofficial-${PROJECT_NAME}Config" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +include(CMakePackageConfigHelpers) +set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake") +write_basic_package_version_file( + "${VERSION_FILE_PATH}" + VERSION "${PROJECT_VERSION}" + COMPATIBILITY SameMajorVersion +) +install(FILES "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}") + +install(FILES ${Header_Files} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +install( + EXPORT "unofficial-${PROJECT_NAME}Config" + FILE "unofficial-${PROJECT_NAME}Config.cmake" + NAMESPACE "unofficial::${PROJECT_NAME}::" + DESTINATION "share/unofficial-${PROJECT_NAME}") + +export(PACKAGE "${PROJECT_NAME}") diff --git a/ports/murmur3/portfile.cmake b/ports/murmur3/portfile.cmake new file mode 100644 index 00000000000000..c2cf1642d74333 --- /dev/null +++ b/ports/murmur3/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PeterScott/murmur3 + REF dae94be0c0f54a399d23ea6cbe54bca5a4e93ce4 + SHA512 1bc01eefc04f06704800a7448231db9f82fc809079bd3f43ef24d7dd3d8deaec2143f252a8e556dafe366401f898b676922b0c93ac181aaf38ae69ad638adbba + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "CC0-1.0") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/murmur3/usage b/ports/murmur3/usage new file mode 100644 index 00000000000000..cbb2d18aac30f8 --- /dev/null +++ b/ports/murmur3/usage @@ -0,0 +1,3 @@ +murmur3 provides CMake targets: + find_package(unofficial-murmur3 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::murmur3::murmur3) diff --git a/ports/murmur3/vcpkg.json b/ports/murmur3/vcpkg.json new file mode 100644 index 00000000000000..4bc78a0f5638f7 --- /dev/null +++ b/ports/murmur3/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "murmur3", + "version-date": "2015-05-02", + "description": "Murmur3 hash in C", + "homepage": "https://github.com/PeterScott/murmur3", + "license": "CC0-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/netcdf-c/fix-dependency-libzip.patch b/ports/netcdf-c/fix-dependency-libzip.patch index 6305b9902f277c..9172a449881bda 100644 --- a/ports/netcdf-c/fix-dependency-libzip.patch +++ b/ports/netcdf-c/fix-dependency-libzip.patch @@ -1,93 +1,44 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b93a141..c3763a7 100644 +index 1113c7b..69f465e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -957,7 +957,14 @@ OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON) +@@ -960,7 +960,12 @@ OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON) SET(REMOTETESTSERVERS "remotetest.unidata.ucar.edu" CACHE STRING "test servers to use for remote test") # See if we have libzip -FIND_PACKAGE(Zip) +if(ENABLE_NCZARR_ZIP) -+ find_package(libzip CONFIG REQUIRED) -+ set(Zip_LIBRARIES zip) -+ set(Zip_FOUND TRUE) ++ find_package(Zip NAMES libzip REQUIRED) ++ set(Zip_LIBRARIES libzip::zip) +else() + set(Zip_LIBRARIES "") -+ set(Zip_FOUND FALSE) +endif() # Define a test flag for have curl library IF(Zip_FOUND) -diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in -index b3be259..72b4b25 100644 ---- a/netCDFConfig.cmake.in -+++ b/netCDFConfig.cmake.in -@@ -15,6 +15,9 @@ set(netCDF_LIBRARIES netCDF::netcdf) - include(CMakeFindDependencyMacro) - find_dependency(HDF5 CONFIG) - find_dependency(CURL CONFIG) -+if(@ENABLE_NCZARR_ZIP@) -+ find_dependency(libzip CONFIG) -+endif() - include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") - - # Compiling Options -diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index 1363d35..31dbbda 100644 ---- a/liblib/CMakeLists.txt -+++ b/liblib/CMakeLists.txt -@@ -134,6 +134,10 @@ ENDIF() - - TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) - -+if(ENABLE_NCZARR_ZIP) -+ target_link_libraries(netcdf libzip::zip) -+endif() -+ - SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TLL_LIBS}) - IF(MSVC) - SET_TARGET_PROPERTIES(netcdf PROPERTIES diff --git a/libnczarr/CMakeLists.txt b/libnczarr/CMakeLists.txt -index 86e093b..d7edaf6 100644 +index 86e093b..c0efe1b 100644 --- a/libnczarr/CMakeLists.txt +++ b/libnczarr/CMakeLists.txt -@@ -58,6 +58,10 @@ ENDIF() +@@ -57,6 +57,7 @@ ENDIF() + # the netCDF library. add_library(nczarr OBJECT ${libnczarr_SOURCES}) ++target_link_libraries(nczarr PRIVATE ${Zip_LIBRARIES}) -+IF(ENABLE_NCZARR_ZIP) -+ target_link_libraries(nczarr PRIVATE libzip::zip) -+ENDIF() -+ IF(MPI_C_INCLUDE_PATH) target_include_directories(nczarr PUBLIC ${MPI_C_INCLUDE_PATH}) - ENDIF(MPI_C_INCLUDE_PATH) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6357965..3de76cd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2123,6 +2123,10 @@ replace_pkgconfig_module("-lzip" "libzip") - replace_pkgconfig_module("-lCURL[^ ]*" "libcurl") - replace_pkgconfig_module("-lZLIB[^ ]*" "zlib") - -+IF(ENABLE_NCZARR_ZIP) -+ string(APPEND NC_REQUIRES_PRIVATE " libzip") -+ENDIF() -+ - configure_file( - ${netCDF_SOURCE_DIR}/netcdf.pc.in - ${netCDF_BINARY_DIR}/netcdf.pc @ONLY) -diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index 31dbbda..eb497cc 100644 ---- a/liblib/CMakeLists.txt -+++ b/liblib/CMakeLists.txt -@@ -120,9 +120,6 @@ IF(ENABLE_PNETCDF AND PNETCDF) - SET(TLL_LIBS ${TLL_LIBS} ${PNETCDF}) - ENDIF() - --IF(ENABLE_NCZARR_ZIP) -- SET(TLL_LIBS ${TLL_LIBS} ${Zip_LIBRARIES}) --ENDIF() +diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in +index 715e33e..0167326 100644 +--- a/netCDFConfig.cmake.in ++++ b/netCDFConfig.cmake.in +@@ -19,6 +19,9 @@ endif() + if("@FOUND_CURL@") + find_dependency(CURL CONFIG) + endif() ++if("@ENABLE_NCZARR_ZIP@") ++ find_dependency(libzip CONFIG) ++endif() + include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") - IF(ENABLE_S3_SDK) - TARGET_LINK_DIRECTORIES(netcdf PUBLIC ${AWSSDK_LIB_DIR}) + # Compiling Options diff --git a/ports/netcdf-c/fix-pkgconfig.patch b/ports/netcdf-c/fix-pkgconfig.patch index 6fff98ac2ba61b..bcaa53093de239 100644 --- a/ports/netcdf-c/fix-pkgconfig.patch +++ b/ports/netcdf-c/fix-pkgconfig.patch @@ -17,7 +17,7 @@ index 390ac0a..4bcd909 100644 +replace_pkgconfig_module("-lhdf5_hl" "hdf5_hl") +replace_pkgconfig_module("-lhdf5" "hdf5") +replace_pkgconfig_module("-lmpi" "ompi-c") -+replace_pkgconfig_module("-lzip" "libzip") ++replace_pkgconfig_module("-lzip::zip" "libzip") +replace_pkgconfig_module("-lCURL[^ ]*" "libcurl") +replace_pkgconfig_module("-lZLIB[^ ]*" "zlib") + diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 441d422cc61035..8bbad4e4d9e241 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -10,10 +10,10 @@ vcpkg_from_github( use_targets.patch fix-dependency-libmath.patch fix-linkage-error.patch - fix-pkgconfig.patch fix-manpage-msys.patch fix-dependency-libzip.patch fix-dependency-mpi.patch + fix-pkgconfig.patch ) #Remove outdated find modules @@ -41,6 +41,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS if(NOT ENABLE_DAP AND NOT ENABLE_NCZARR) list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON") +else() + list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_CURL=ON") endif() if(ENABLE_HDF5) diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch index 541be65b593967..427499ec9b89ec 100644 --- a/ports/netcdf-c/use_targets.patch +++ b/ports/netcdf-c/use_targets.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 507eb4c..c36908b 100644 +index 507eb4c..1516d0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -433,7 +433,6 @@ IF(NC_EXTRA_DEPS) @@ -35,11 +35,10 @@ index 507eb4c..c36908b 100644 ENDIF(MSVC) ## -@@ -726,6 +716,19 @@ IF(USE_HDF5) - SET(HDF5_C_LIBRARY hdf5) +@@ -727,6 +717,19 @@ IF(USE_HDF5) ENDIF() ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) -+ + + if(TARGET hdf5::hdf5-shared) + set(HDF5_C_LIBRARY hdf5::hdf5-shared) + set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared) @@ -52,9 +51,10 @@ index 507eb4c..c36908b 100644 + ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB) + endif() + list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY}) - ++ FIND_PACKAGE(Threads) + # There is a missing case in the above code so default it @@ -745,6 +748,8 @@ IF(USE_HDF5) IF(USE_SZIP) # If user has specified the `SZIP_LIBRARY`, use it; otherwise try to find... @@ -64,17 +64,24 @@ index 507eb4c..c36908b 100644 FIND_LIBRARY(SZIP PATH NAMES szip sz) SET(SZIP_LIBRARY ${SZIP}) IF(NOT SZIP) -@@ -847,8 +852,7 @@ IF(USE_HDF5) - ENDIF(USE_HDF5) +@@ -848,11 +853,14 @@ ENDIF(USE_HDF5) # See if we have libcurl --FIND_PACKAGE(CURL) + FIND_PACKAGE(CURL) -ADD_DEFINITIONS(-DCURL_STATICLIB=1) -+FIND_PACKAGE(CURL CONFIG) INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) # Define a test flag for have curl library -@@ -2089,10 +2093,9 @@ IF(NC_LIBS) +-IF(CURL_LIBRARIES OR CURL_LIBRARY) ++IF(CURL_FOUND) ++ SET(CURL_LIBRARY CURL::libcurl) ++ if(CURL_VERSION VERSION_GREATER_EQUAL "7.66") ++ set(HAVE_LIBCURL_766 TRUE CACHE INTERNAL "vcpkg") ++ endif() + SET(FOUND_CURL TRUE) + ELSE() + SET(FOUND_CURL FALSE) +@@ -2089,10 +2097,9 @@ IF(NC_LIBS) STRING(REPLACE "-lhdf5::hdf5_hl-static" "-lhdf5_hl" NC_LIBS ${NC_LIBS}) ENDIF() @@ -88,7 +95,7 @@ index 507eb4c..c36908b 100644 SET(LIBS ${NC_LIBS}) SET(NC_LIBS "-lnetcdf") diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index 5e1692f..9e126ec 100644 +index 5e1692f..882f1dd 100644 --- a/liblib/CMakeLists.txt +++ b/liblib/CMakeLists.txt @@ -77,6 +77,12 @@ IF(HAVE_LIBDL) @@ -104,15 +111,6 @@ index 5e1692f..9e126ec 100644 IF(NOT MSVC) # Some version of cmake define HDF5_hdf5_LIBRARY instead of # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES -@@ -97,7 +103,7 @@ IF(USE_HDF5) - ENDIF() - - IF(FOUND_CURL) -- SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY}) -+ SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl) - ENDIF() - - IF(USE_HDF4) @@ -118,7 +124,6 @@ IF(ENABLE_S3_SDK) ENDIF() @@ -122,16 +120,20 @@ index 5e1692f..9e126ec 100644 TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in -index 9d68eec..b3be259 100644 +index 9d68eec..715e33e 100644 --- a/netCDFConfig.cmake.in +++ b/netCDFConfig.cmake.in -@@ -12,6 +12,9 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") +@@ -12,6 +12,13 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") set(netCDF_LIBRARIES netCDF::netcdf) # include target information +include(CMakeFindDependencyMacro) -+find_dependency(HDF5 CONFIG) -+find_dependency(CURL CONFIG) ++if("@USE_HDF5@") ++ find_dependency(HDF5 CONFIG) ++endif() ++if("@FOUND_CURL@") ++ find_dependency(CURL CONFIG) ++endif() include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") # Compiling Options diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index 000b850c44a8e6..e358688880535a 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "netcdf-c", "version": "4.8.1", - "port-version": 3, + "port-version": 4, "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-c", "dependencies": [ @@ -16,9 +16,12 @@ ], "default-features": [ "dap", + { + "name": "hdf5", + "platform": "!uwp & !(arm64 & windows)" + }, "nczarr", - "netcdf-4", - "platform-default-features" + "netcdf-4" ], "features": { "dap": { @@ -56,6 +59,10 @@ "nczarr": { "description": "Build with NCZarr cloud storage access support", "dependencies": [ + { + "name": "curl", + "default-features": false + }, { "name": "netcdf-c", "default-features": false, @@ -84,20 +91,6 @@ "netcdf-4": { "description": "Build with netCDF-4 support" }, - "platform-default-features": { - "$comment": "Break vcpkg CI cascade.", - "description": "Enable platform-dependent default features", - "dependencies": [ - { - "name": "netcdf-c", - "default-features": false, - "features": [ - "hdf5" - ], - "platform": "!uwp & !(arm64 & windows)" - } - ] - }, "tools": { "description": "Build utilities" } diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index 732292c46ac698..6a8ada7f171932 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 ba143045220f4d1fbbefa6c3944b0a2cd3535b9d4b07ea05fe08cbbaaa2f7eb1f0ff7a65e8e13a5711a3f88855de36ecada54470e583099be14b77ec360a3084 + SHA512 fe71183df125a5ca83c28525bef66a41d63da7af02fb47e3837b97b13bf7707a64a7e1f634aee18c2dd4b824671a3f04dbb6475c7db2cd86a773c40c47632860 HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index 60f7cb47c6860e..99750cf11f200c 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.56.0", + "version": "1.57.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "license": "MIT", diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index 4709cdf51f6796..e78ad3f5b6c771 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 e6288157f897007a14587c3a31e26401c338a22b8e1547da731549a0c23e8b18e04048cb661e6b7072835b6bf7f3218f4a7a07c8e43ff94954c274221d8f92f9 + SHA512 a2f02342bdff8a39d9c95e061eaac068d92af3c93aaddc0119dfef4b4c4b545f2e434ef5e00d6901e5ecffb1f5e9fa6589b838543dbfcb3917255fba04589910 HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index 5a302fcce301e1..a71c5c8b9a6494 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp3", - "version": "0.15.0", + "version": "1.0.0", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index e93dce4b28ed8a..09d022103e6154 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 REF "v${VERSION}" - SHA512 2979f7609c42a3dc7d5bf76c8d007ee35bfe6a25d5bfe44fe32f3b0d71c9d44b10f0b400c311d150e6cfbc770621416ef7151d4b0a15bf0842da3a597eb171bf + SHA512 c76ede7546d0d7056281002149441e5722147c31c934266dbb50c821ba6c1c493c798e636c84b2d76e925a9cdf7f5b34dd7e9fa1f0ba674453ece26130acc9cf HEAD_REF master PATCHES export-unofficical-target.patch diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index 896697d2455f4b..7c6281457e9c2c 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ngtcp2", - "version": "0.19.1", + "version": "1.0.1", "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", diff --git a/ports/nifticlib/portfile.cmake b/ports/nifticlib/portfile.cmake index b4d166d41a5341..56e3795525e659 100644 --- a/ports/nifticlib/portfile.cmake +++ b/ports/nifticlib/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO NIFTI-Imaging/nifti_clib - REF 65f801b9c2f1f15f4de4a19d45e6595c25765632 - SHA512 be03cdc6cf17fd9ff74c5ecc1f6b2132121bb4b7973a731da334af2a8428d1f0dbbf7b94b2511d1ff7e515b8cc4cf3316d62b189566fb6ffc88c6146eebd48ff + REPO NIFTI-Imaging/nifti_clib + REF 5a8016be2161058f116b39ca476734bd81bb83c5 + SHA512 782cb4e494d73b054f8e3ab5f059b952fa461ceb3a0e12989ef1485675d1009d107c496abe6a495fbc30214d92859faad2c58a3edb10899114b440476b613315 HEAD_REF master - PATCHES zlib_include.patch + PATCHES + zlib_include.patch ) if(VCPKG_TARGET_IS_WINDOWS) @@ -50,4 +51,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/nifticlib/vcpkg.json b/ports/nifticlib/vcpkg.json index c4201194c76d08..2e90bf03c7e6f5 100644 --- a/ports/nifticlib/vcpkg.json +++ b/ports/nifticlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nifticlib", - "version-date": "2020-04-30", - "port-version": 4, + "version-date": "2022-07-04", "description": "Nifticlib is a C I/O library for reading and writing files in the nifti-1 data format.", "homepage": "https://github.com/NIFTI-Imaging/nifti_clib", "license": null, diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake index dd92a494567f15..4440892871a166 100644 --- a/ports/nmap/portfile.cmake +++ b/ports/nmap/portfile.cmake @@ -18,9 +18,15 @@ if(VCPKG_TARGET_IS_WINDOWS) ) list(APPEND DEL_PROJS "libpcap" "libpcre" "libssh2" "libz") foreach (DEL_PROJ ${DEL_PROJS}) - file(REMOVE_RECURSE ${SOURCE_PATH}/${DEL_PROJ}) + 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" @@ -28,7 +34,6 @@ if(VCPKG_TARGET_IS_WINDOWS) /Clean WORKING_DIRECTORY ${SOURCE_PATH}/mswin32 ) - # Uprade message(STATUS "Upgrade solution...") vcpkg_execute_required_process( @@ -38,10 +43,12 @@ if(VCPKG_TARGET_IS_WINDOWS) 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") diff --git a/ports/nmap/vcpkg.json b/ports/nmap/vcpkg.json index 21a49388fcc568..59ae90b286bb98 100644 --- a/ports/nmap/vcpkg.json +++ b/ports/nmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nmap", "version": "7.70", - "port-version": 10, + "port-version": 11, "description": "A library for scanning network ports.", "dependencies": [ { diff --git a/ports/oboe/fix_install.patch b/ports/oboe/fix_install.patch new file mode 100644 index 00000000000000..6916a32068c839 --- /dev/null +++ b/ports/oboe/fix_install.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3e3af59..aeac85d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,8 +94,8 @@ target_link_libraries(oboe PRIVATE log OpenSLES) + + # When installing oboe put the libraries in the lib/ folder e.g. lib/arm64-v8a + install(TARGETS oboe +- LIBRARY DESTINATION lib/${ANDROID_ABI} +- ARCHIVE DESTINATION lib/${ANDROID_ABI}) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + # Also install the headers + install(DIRECTORY include/oboe DESTINATION include) + diff --git a/ports/oboe/portfile.cmake b/ports/oboe/portfile.cmake new file mode 100644 index 00000000000000..e6aecf1e40ea9b --- /dev/null +++ b/ports/oboe/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/oboe + REF ${VERSION} + SHA512 7eeaf85f9889e03dd1e7f5de0e9f2cee815fc555fddfdb8c4d3450d67f6ae11b0ca43b63c73e869bfc4629d2f8e5bdb23a5833c665ca5226c339f74b9b34a8ad + HEAD_REF master + PATCHES + fix_install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/oboe/vcpkg.json b/ports/oboe/vcpkg.json new file mode 100644 index 00000000000000..e06d124b617cd2 --- /dev/null +++ b/ports/oboe/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "oboe", + "version": "1.8.0", + "description": "Oboe is a C++ library which makes it easy to build high-performance audio apps on Android", + "homepage": "https://developer.android.com/games/sdk/oboe", + "license": "Apache-2.0", + "supports": "android", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ogre-next/fix-dependencies.patch b/ports/ogre-next/fix-dependencies.patch new file mode 100644 index 00000000000000..18de8b3ae8aa1e --- /dev/null +++ b/ports/ogre-next/fix-dependencies.patch @@ -0,0 +1,68 @@ +diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +--- a/CMake/Dependencies.cmake ++++ b/CMake/Dependencies.cmake +@@ -73,23 +73,26 @@ + # Core dependencies + ####################################################################### + + # Find zlib +-find_package(ZLIB) ++find_package(ZLIB REQUIRED) + macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net" FALSE "" "") + + if (ZLIB_FOUND) + # Find zziplib +- find_package(ZZip) ++ find_package(ZZip NAMES unofficial-zziplib CONFIG REQUIRED) ++ set(ZZip_LIBRARIES unofficial::zziplib::libzzip) + macro_log_feature(ZZip_FOUND "zziplib" "Extract data from zip archives" "http://zziplib.sourceforge.net" FALSE "" "") + endif () + + # Find FreeImage +-find_package(FreeImage) ++find_package(FreeImage NAMES freeimage REQUIRED) ++set(FreeImage_LIBRARIES freeimage::FreeImage) + macro_log_feature(FreeImage_FOUND "freeimage" "Support for commonly used graphics image formats" "http://freeimage.sourceforge.net" FALSE "" "") + + # Find FreeType +-find_package(Freetype) ++find_package(FREETYPE NAMES freetype REQUIRED) ++set(FREETYPE_LIBRARIES freetype) + macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "") + + find_package(Vulkan) + macro_log_feature(Vulkan_FOUND "vulkan-sdk" "Vulkan SDK" "https://vulkan.lunarg.com/" FALSE "" "") +diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt +--- a/CMake/CMakeLists.txt ++++ b/CMake/CMakeLists.txt +@@ -43,14 +43,10 @@ + endif () + + set(STATIC_INST_FILES + Packages/FindDirectX.cmake +- Packages/FindFreeImage.cmake +- Packages/FindFreetype.cmake + Packages/FindOpenGLES.cmake + Packages/FindOpenGLES2.cmake +- Packages/FindZLIB.cmake +- Packages/FindZZip.cmake + Packages/FindSoftimage.cmake + ) + if (WIN32) + set(INST_FILES ${INST_FILES} +diff --git a/CMake/Packages/FindZLIB.cmake b/CMake/Packages/FindZLIB_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindZLIB.cmake +rename to CMake/Packages/FindZLIB_NOTUSE.cmake +diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindZZip.cmake +rename to CMake/Packages/FindZZip_NOTUSE.cmake +diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindFreeImage.cmake +rename to CMake/Packages/FindFreeImage_NOTUSE.cmake +diff --git a/CMake/Packages/FindFreetype.cmake b/CMake/Packages/FindFreetype_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindFreetype.cmake +rename to CMake/Packages/FindFreetype_NOTUSE.cmake diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 16b3a0e97637b4..d2963fffba0129 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( fix_find_package_sdl2.patch avoid-name-clashes.patch fix-error-c2039.patch + fix-dependencies.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") diff --git a/ports/ogre-next/toolchain_fixes.patch b/ports/ogre-next/toolchain_fixes.patch index ff5eb485068143..334fab27553a6e 100644 --- a/ports/ogre-next/toolchain_fixes.patch +++ b/ports/ogre-next/toolchain_fixes.patch @@ -19,19 +19,6 @@ index f3a62f2..b53df6f 100644 endif() set(INST_FILES -diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake -index 7c89ec5..d8314f0 100644 ---- a/CMake/Packages/FindFreeImage.cmake -+++ b/CMake/Packages/FindFreeImage.cmake -@@ -43,7 +43,7 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P - find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) - find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) - --make_library_set(FreeImage_LIBRARY) -+make_library_set(FreeImage) - - findpkg_finish(FreeImage) - diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake index dd4b179..6f158fc 100644 --- a/CMake/Packages/FindGLSLOptimizer.cmake @@ -149,25 +136,6 @@ index 4200aa0..35e4ea3 100644 -make_library_set(TBB_MALLOC_PROXY_LIBRARY) +make_library_set(TBB_MALLOC_PROXY) findpkg_finish(TBB_MALLOC_PROXY) -diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake -index c112071..214d9e5 100644 ---- a/CMake/Packages/FindZZip.cmake -+++ b/CMake/Packages/FindZZip.cmake -@@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib) - - findpkg_framework(ZZip) - --find_path(ZZip_INCLUDE_DIR NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) -+find_path(ZZip_INCLUDE_DIRS NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) - - find_library(ZZip_LIBRARY_REL NAMES ${ZZip_LIBRARY_NAMES} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) - find_library(ZZip_LIBRARY_DBG NAMES ${ZZip_LIBRARY_NAMES_DBG} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) - --make_library_set(ZZip_LIBRARY) -+make_library_set(ZZip) - - findpkg_finish(ZZip) - diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake index 53111e0..8dffbbc 100644 --- a/CMake/Utils/FindPkgMacros.cmake diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index d9fdfe9e3fa877..8f3b24d4e6aafd 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre-next", "version": "2.3.1", - "port-version": 2, + "port-version": 3, "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "license": "MIT", @@ -11,6 +11,7 @@ "freeimage", "freetype", "openvr", + "pkgconf", "poco", "rapidjson", "sdl2", diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 81c7d8cb0a916f..dd39a0f8d80041 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -10,8 +10,6 @@ if(VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_EMSCRIPTEN) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -set(PATCHLIB fix-dependencies.patch cfg-rel-paths.patch swig-python-polyfill.patch pkgconfig.patch same-install-rules-all-platforms.patch) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre @@ -19,7 +17,11 @@ vcpkg_from_github( SHA512 adadf0ce8510515c7519b87b502090c4a8d6694af0850ebd4a030d2dda497978eeb811746c74aa0cd1dc41adc0bf5f04fe38d02eb4ff03a56999c6635efe1e0e HEAD_REF master PATCHES - ${PATCHLIB} + fix-dependencies.patch + cfg-rel-paths.patch + swig-python-polyfill.patch + pkgconfig.patch + same-install-rules-all-platforms.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") @@ -28,26 +30,29 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OGRE_STATIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" OGRE_CONFIG_STATIC_LINK_CRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - assimp OGRE_BUILD_PLUGIN_ASSIMP - assimp CMAKE_REQUIRE_FIND_PACKAGE_assimp - bullet OGRE_BUILD_COMPONENT_BULLET - bullet CMAKE_REQUIRE_FIND_PACKAGE_Bullet - d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 - freeimage OGRE_BUILD_PLUGIN_FREEIMAGE - freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage - java OGRE_BUILD_COMPONENT_JAVA - openexr OGRE_BUILD_PLUGIN_EXRCODEC - openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR - python OGRE_BUILD_COMPONENT_PYTHON - python CMAKE_REQUIRE_FIND_PACKAGE_Python3 - csharp OGRE_BUILD_COMPONENT_CSHARP - overlay OGRE_BUILD_COMPONENT_OVERLAY - overlay CMAKE_REQUIRE_FIND_PACKAGE_FREETYPE - zip OGRE_CONFIG_ENABLE_ZIP - strict OGRE_RESOURCEMANAGER_STRICT - tools OGRE_BUILD_TOOLS - tools OGRE_INSTALL_TOOLS + FEATURES + assimp OGRE_BUILD_PLUGIN_ASSIMP + assimp CMAKE_REQUIRE_FIND_PACKAGE_assimp + bullet OGRE_BUILD_COMPONENT_BULLET + bullet CMAKE_REQUIRE_FIND_PACKAGE_Bullet + d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + freeimage OGRE_BUILD_PLUGIN_FREEIMAGE + freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage + java OGRE_BUILD_COMPONENT_JAVA + openexr OGRE_BUILD_PLUGIN_EXRCODEC + openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR + python OGRE_BUILD_COMPONENT_PYTHON + python CMAKE_REQUIRE_FIND_PACKAGE_Python3 + csharp OGRE_BUILD_COMPONENT_CSHARP + overlay OGRE_BUILD_COMPONENT_OVERLAY + zip OGRE_CONFIG_ENABLE_ZIP + strict OGRE_RESOURCEMANAGER_STRICT + tools OGRE_BUILD_TOOLS + tools OGRE_INSTALL_TOOLS + INVERTED_FEATURES + assimp CMAKE_DISABLE_FIND_PACKAGE_assimp + bullet CMAKE_DISABLE_FIND_PACKAGE_Bullet + python CMAKE_DISABLE_FIND_PACKAGE_Python3 ) if("java" IN_LIST FEATURES OR "python" IN_LIST FEATURES OR "csharp" IN_LIST FEATURES) @@ -92,6 +97,8 @@ vcpkg_cmake_configure( -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF + -DCMAKE_REQUIRE_FIND_PACKAGE_FREETYPE=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_pugixml=ON -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON -DCMAKE_DISABLE_FIND_PACKAGE_QT=ON diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index a76bdb54eb5580..fa466b82de3fe2 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,12 +1,16 @@ { "name": "ogre", "version": "14.0.1", - "port-version": 1, + "port-version": 2, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", "supports": "!uwp", "dependencies": [ + { + "name": "freetype", + "default-features": false + }, "pugixml", { "name": "sdl2", @@ -72,10 +76,6 @@ "overlay": { "description": "Build overlay component", "dependencies": [ - { - "name": "freetype", - "default-features": false - }, { "name": "imgui", "features": [ diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index 46ec144ee80307..b2736584efad53 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open62541/open62541 REF "v${VERSION}" - SHA512 bb45d288a097b461d2a7106153c7f4b4c38c73cf767fe15c6c9c2213a6e3fcaf9b436fb70c1e7c6dcbc8ef45f232a5bd2f140285fab486358cb5a3a17da96d6e + SHA512 48ae61fd096c3a45f57ecc70bec9bb4223d046eed017532937c99883e4e92f79d7425b4db02c1a7e451764b787313efd76b2ae3cd3011d575154199d5350a790 HEAD_REF master ) @@ -47,4 +47,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/open62541/tools") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index 10c7a39416a627..11911dac780765 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,7 +1,6 @@ { "name": "open62541", - "version": "1.3.5", - "port-version": 1, + "version": "1.3.8", "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", "license": "MPL-2.0", diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index c583243183bbe7..d56f4ed2bb25e9 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO OpenImageIO/oiio + REPO AcademySoftwareFoundation/OpenImageIO REF "v${VERSION}" - SHA512 59c38667ae792f5c5cc6f7f9655159e9b0e048d99f1232766407c01ab635a319ad4ba28cd3c6a115924ea0e4ec994d4c1bdb2f6301fbb9ae11b2820768bd1ff1 + SHA512 6b87c805907a2f7c98f40e987fb6ebf769f8519f5d8a8b7393bed62a41cee1118bb32d2bc4d23fd464973e237077d08771ff85f72073caa57799d71bd098038f HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index b63a14c3bcc118..a2b67d66495bdd 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.4.14.0", - "port-version": 1, + "port-version": 2, "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/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake index 08a20a20fad4a9..bb30fd9ed2c705 100644 --- a/ports/openmpi/portfile.cmake +++ b/ports/openmpi/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(OpenMPI_FULL_VERSION "4.1.3") +set(OpenMPI_FULL_VERSION "4.1.6") set(OpenMPI_SHORT_VERSION "4.1") vcpkg_download_distfile(ARCHIVE URLS "https://download.open-mpi.org/release/open-mpi/v${OpenMPI_SHORT_VERSION}/openmpi-${OpenMPI_FULL_VERSION}.tar.gz" FILENAME "openmpi-${OpenMPI_FULL_VERSION}.tar.gz" - SHA512 f7b177121863ef79df6106639d18a89c028442b1314340638273b12025c4dc2cf9b5316cb7e6ecca8b65a51ee40a306a6b0970d7cce727fbb269a14f89af3161 + SHA512 6fb38cafa75021f12a9674a05056d25cc9bb5e6dd88f26fee73a89736fb741bbfb37efee31e07edb372f21583144ccc2c03cd7861e9055e87699a22740173e0b ) vcpkg_extract_source_archive( diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index 94e54a572a4ae4..a14612dea010c5 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openmpi", - "version": "4.1.3", - "port-version": 2, + "version": "4.1.6", "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", "homepage": "https://www.open-mpi.org/", "supports": "!(windows | uwp)" diff --git a/ports/openvdb/fix_nanovdb.patch b/ports/openvdb/fix_nanovdb.patch new file mode 100644 index 00000000000000..4d36752bb78213 --- /dev/null +++ b/ports/openvdb/fix_nanovdb.patch @@ -0,0 +1,22 @@ +diff --git a/nanovdb/nanovdb/CMakeLists.txt b/nanovdb/nanovdb/CMakeLists.txt +index d20b4928..257d005a 100644 +--- a/nanovdb/nanovdb/CMakeLists.txt ++++ b/nanovdb/nanovdb/CMakeLists.txt +@@ -128,7 +128,7 @@ if(NANOVDB_USE_TBB AND NOT TARGET TBB::tbb) + endif() + + if(NANOVDB_USE_BLOSC AND NOT TARGET Blosc::blosc) +- find_package(Blosc REQUIRED) ++ find_package(Blosc REQUIRED NAMES blosc) + endif() + + if(NANOVDB_USE_ZLIB AND NOT TARGET ZLIB::ZLIB) +@@ -224,7 +224,7 @@ if(NANOVDB_USE_TBB) + endif() + + if(NANOVDB_USE_BLOSC) +- target_link_libraries(nanovdb INTERFACE Blosc::blosc) ++ target_link_libraries(nanovdb INTERFACE $,blosc_shared,blosc_static>) + target_compile_definitions(nanovdb INTERFACE -DNANOVDB_USE_BLOSC) + endif() + diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index 91cbc769ba28a7..eb03662f38296c 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( SHA512 92301bf675d700fedb0a2b3c4653158eeda6105e70623e5e4bda15d73391427cf0295a0426204888e2fe062847025542717bff34ceb923e51cffa1721e9d4105 PATCHES 0003-fix-cmake.patch + fix_nanovdb.patch ) file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake") @@ -20,8 +21,19 @@ vcpkg_check_features( FEATURES "tools" OPENVDB_BUILD_TOOLS "ax" OPENVDB_BUILD_AX + "nanovdb" OPENVDB_BUILD_NANOVDB ) +if (OPENVDB_BUILD_NANOVDB) + set(NANOVDB_OPTIONS + -DNANOVDB_BUILD_TOOLS=OFF + -DNANOVDB_USE_INTRINSICS=ON + -DNANOVDB_USE_CUDA=ON + -DNANOVDB_CUDA_KEEP_PTX=ON + -DNANOVDB_USE_OPENVDB=ON +) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -37,10 +49,12 @@ vcpkg_cmake_configure( -DOPENVDB_BUILD_VDB_RENDER=${OPENVDB_BUILD_TOOLS} -DOPENVDB_BUILD_VDB_LOD=${OPENVDB_BUILD_TOOLS} -DUSE_PKGCONFIG=OFF - -DOPENVDB_BUILD_AX=${OPENVDB_BUILD_AX} + ${FEATURE_OPTIONS} -DUSE_EXPLICIT_INSTANTIATION=OFF + ${NANOVDB_OPTIONS} MAYBE_UNUSED_VARIABLES OPENVDB_3_ABI_COMPATIBLE + OPENVDB_BUILD_TOOLS ) vcpkg_cmake_install() diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json index a566325859e3ae..6ff4b1ae290d3b 100644 --- a/ports/openvdb/vcpkg.json +++ b/ports/openvdb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openvdb", "version": "10.0.0", - "port-version": 5, + "port-version": 6, "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", "license": "MPL-2.0", @@ -39,6 +39,12 @@ } ] }, + "nanovdb": { + "description": "A lightweight GPU friendly version of VDB initially targeting rendering applications", + "dependencies": [ + "cuda" + ] + }, "tools": { "description": "OpenVDB utilities: view, print and render", "dependencies": [ diff --git a/ports/openvino/008-dynamic-protubuf.patch b/ports/openvino/008-dynamic-protubuf.patch new file mode 100644 index 00000000000000..60f5835a1eb700 --- /dev/null +++ b/ports/openvino/008-dynamic-protubuf.patch @@ -0,0 +1,156 @@ +diff --git a/src/frontends/common/src/manager.cpp b/src/frontends/common/src/manager.cpp +index fa917dadb1..6194fca758 100644 +--- a/src/frontends/common/src/manager.cpp ++++ b/src/frontends/common/src/manager.cpp +@@ -20,11 +20,6 @@ class FrontEndManager::Impl { + std::mutex m_loading_mutex; + std::vector m_plugins; + +- /// \brief map of shared object per frontend +- static std::unordered_map> m_shared_objects_map; +- /// \brief Mutex to guard access the shared object map +- static std::mutex m_shared_objects_map_mutex; +- + public: + Impl() { + search_all_plugins(); +@@ -36,10 +31,6 @@ public: + auto fe_obj = std::make_shared(); + fe_obj->m_shared_object = std::make_shared(plugin.get_so_pointer()); + fe_obj->m_actual = plugin.get_creator().m_creator(); +- +- std::lock_guard guard(m_shared_objects_map_mutex); +- m_shared_objects_map.emplace(plugin.get_creator().m_name, fe_obj->m_shared_object); +- + return fe_obj; + } + +@@ -128,8 +119,8 @@ public: + } + + static void shutdown() { +- std::lock_guard guard(m_shared_objects_map_mutex); +- m_shared_objects_map.clear(); ++ std::lock_guard guard(get_shared_objects_mutex()); ++ get_shared_objects_map().clear(); + } + + private: +@@ -154,6 +145,7 @@ private: + {".xml", {"ir", "ir"}}, + {".onnx", {"onnx", "onnx"}}, + {".pb", {"tf", "tensorflow"}}, ++ {".pbtxt", {"tf", "tensorflow"}}, + {".tflite", {"tflite", "tensorflow_lite"}}, + {".pdmodel", {"paddle", "paddle"}}, + // {".ts", {"pytorch", "pytorch"}}, +@@ -224,9 +216,6 @@ private: + } + }; + +-std::unordered_map> FrontEndManager::Impl::m_shared_objects_map{}; +-std::mutex FrontEndManager::Impl::m_shared_objects_map_mutex{}; +- + FrontEndManager::FrontEndManager() : m_impl(new Impl()) {} + + FrontEndManager::FrontEndManager(FrontEndManager&&) noexcept = default; +diff --git a/src/frontends/common/src/plugin_loader.cpp b/src/frontends/common/src/plugin_loader.cpp +index a044152d8d..a98eff766b 100644 +--- a/src/frontends/common/src/plugin_loader.cpp ++++ b/src/frontends/common/src/plugin_loader.cpp +@@ -16,17 +16,32 @@ + + #include + +-#include + #include + #include + + #include "openvino/util/file_util.hpp" ++#include "openvino/util/log.hpp" + #include "openvino/util/shared_object.hpp" + #include "plugin_loader.hpp" + + using namespace ov; + using namespace ov::frontend; + ++// Note, static methods below are required to create an order of initialization of static variables ++// e.g. if users (not encouraged) created ov::Model globally, we need to ensure proper order of initialization ++ ++/// \return map of shared object per frontend ++std::unordered_map>& ov::frontend::get_shared_objects_map() { ++ static std::unordered_map> shared_objects_map; ++ return shared_objects_map; ++} ++ ++/// \return Mutex to guard access the shared object map ++std::mutex& ov::frontend::get_shared_objects_mutex() { ++ static std::mutex shared_objects_map_mutex; ++ return shared_objects_map_mutex; ++} ++ + #ifdef OPENVINO_STATIC_LIBRARY + + # include "ov_frontends.hpp" +@@ -131,6 +146,10 @@ bool PluginInfo::load() { + m_load_failed = true; + return false; + } ++ ++ std::lock_guard guard(get_shared_objects_mutex()); ++ get_shared_objects_map().emplace(get_creator().m_name, get_so_pointer()); ++ + return true; + } + +diff --git a/src/frontends/common/src/plugin_loader.hpp b/src/frontends/common/src/plugin_loader.hpp +index 93e6a5cc2e..dccf8ddf7a 100644 +--- a/src/frontends/common/src/plugin_loader.hpp ++++ b/src/frontends/common/src/plugin_loader.hpp +@@ -4,7 +4,12 @@ + + #pragma once + +-#include ++#include ++#include ++#include ++#include ++ ++#include "openvino/frontend/manager.hpp" + + #ifdef _WIN32 + static const char PathSeparator[] = ";"; +@@ -15,6 +20,9 @@ static const char PathSeparator[] = ":"; + namespace ov { + namespace frontend { + ++std::unordered_map>& get_shared_objects_map(); ++std::mutex& get_shared_objects_mutex(); ++ + /// \brief Internal data structure holding by each frontend. Includes library handle and extensions. + class FrontEndSharedData { + friend inline void add_extension_to_shared_data(std::shared_ptr& obj, +diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake +index 12b72d52a2..111eea7c28 100644 +--- a/thirdparty/dependencies.cmake ++++ b/thirdparty/dependencies.cmake +@@ -415,14 +415,14 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND + if(CMAKE_VERBOSE_MAKEFILE) + set(Protobuf_DEBUG ON) + endif() +- if(OV_VCPKG_BUILD) +- set(protobuf_config CONFIG) +- endif() + # try to find newer version first (major is changed) + # see https://protobuf.dev/support/version-support/ and + # https://github.com/protocolbuffers/protobuf/commit/d61f75ff6db36b4f9c0765f131f8edc2f86310fa +- find_package(Protobuf 4.22.0 QUIET ${protobuf_config}) ++ find_package(Protobuf 4.22.0 QUIET CONFIG) + if(NOT Protobuf_FOUND) ++ if(OV_VCPKG_BUILD) ++ set(protobuf_config CONFIG) ++ endif() + # otherwise, fallback to existing default + find_package(Protobuf 3.20.3 REQUIRED ${protobuf_config}) + endif() diff --git a/ports/openvino/009-tensorflow-proto-odr.patch b/ports/openvino/009-tensorflow-proto-odr.patch new file mode 100644 index 00000000000000..5bd4ef8ec0c6b8 --- /dev/null +++ b/ports/openvino/009-tensorflow-proto-odr.patch @@ -0,0 +1,746 @@ +diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake +index df3586474b..ed603ca765 100644 +--- a/cmake/developer_package/frontends/frontends.cmake ++++ b/cmake/developer_package/frontends/frontends.cmake +@@ -125,19 +125,26 @@ macro(ov_add_frontend) + source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS}) + + # Generate protobuf file on build time for each '.proto' file in src/proto +- file(GLOB proto_files ${frontend_root_dir}/src/proto/*.proto) ++ set(protofiles_root_dir "${frontend_root_dir}/src/proto") ++ file(GLOB_RECURSE proto_files ${protofiles_root_dir}/*.proto) + +- foreach(INFILE IN LISTS proto_files) +- get_filename_component(FILE_DIR ${INFILE} DIRECTORY) +- get_filename_component(FILE_WE ${INFILE} NAME_WE) +- set(OUTPUT_PB_SRC ${CMAKE_CURRENT_BINARY_DIR}/${FILE_WE}.pb.cc) +- set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${FILE_WE}.pb.h) +- set(GENERATED_PROTO ${INFILE}) ++ foreach(proto_file IN LISTS proto_files) ++ # filter out standard google proto files ++ if(proto_file MATCHES ".*google.*") ++ continue() ++ endif() ++ ++ file(RELATIVE_PATH proto_file_relative "${CMAKE_SOURCE_DIR}" "${proto_file}") ++ get_filename_component(FILE_WE ${proto_file} NAME_WE) ++ file(RELATIVE_PATH relative_path ${protofiles_root_dir} ${proto_file}) ++ get_filename_component(relative_path ${relative_path} DIRECTORY) ++ set(OUTPUT_PB_SRC ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.cc) ++ set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) + add_custom_command( + OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" +- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${FILE_DIR} ${FILE_WE}.proto +- DEPENDS ${PROTOC_DEPENDENCY} ${GENERATED_PROTO} +- COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${GENERATED_PROTO}" ++ COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} ++ DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} ++ COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" + VERBATIM + COMMAND_EXPAND_LISTS) + list(APPEND PROTO_SRCS "${OUTPUT_PB_SRC}") +diff --git a/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp b/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp +index b51b8c91b3..f8a85bf4f5 100644 +--- a/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp ++++ b/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp +@@ -7,7 +7,7 @@ + #include "checkpoint_utils.hpp" + #include "openvino/frontend/exception.hpp" + #include "openvino/util/file_util.hpp" +-#include "saved_tensor_slice.pb.h" ++#include "ov_tensorflow/saved_tensor_slice.pb.h" + #include "tf_utils.hpp" + + #ifdef ENABLE_SNAPPY_COMPRESSION +diff --git a/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp b/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp +index bfae3b139a..1171fd6a68 100644 +--- a/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp ++++ b/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp +@@ -12,9 +12,9 @@ + #include "checkpoint_utils.hpp" + #include "openvino/core/any.hpp" + #include "openvino/frontend/exception.hpp" +-#include "saved_tensor_slice.pb.h" +-#include "tensor_shape.pb.h" +-#include "types.pb.h" ++#include "ov_tensorflow/saved_tensor_slice.pb.h" ++#include "ov_tensorflow/tensor_shape.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/decoder_argdef.cpp b/src/frontends/tensorflow/src/decoder_argdef.cpp +index 3430bcbe5e..ce7fc44a91 100644 +--- a/src/frontends/tensorflow/src/decoder_argdef.cpp ++++ b/src/frontends/tensorflow/src/decoder_argdef.cpp +@@ -5,11 +5,11 @@ + #include "decoder_argdef.hpp" + + #include "decoder_proto.hpp" +-#include "op_def.pb.h" ++#include "ov_tensorflow/op_def.pb.h" + #include "openvino/frontend/tensorflow/node_context.hpp" + #include "openvino/frontend/tensorflow/special_types.hpp" + #include "tf_utils.hpp" +-#include "types.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/decoder_proto.cpp b/src/frontends/tensorflow/src/decoder_proto.cpp +index 2488973c10..cf6049cdbc 100644 +--- a/src/frontends/tensorflow/src/decoder_proto.cpp ++++ b/src/frontends/tensorflow/src/decoder_proto.cpp +@@ -4,12 +4,12 @@ + + #include "decoder_proto.hpp" + +-#include "attr_value.pb.h" +-#include "node_def.pb.h" ++#include "ov_tensorflow/attr_value.pb.h" ++#include "ov_tensorflow/node_def.pb.h" + #include "openvino/frontend/tensorflow/node_context.hpp" + #include "openvino/frontend/tensorflow/special_types.hpp" + #include "tf_utils.hpp" +-#include "types.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/decoder_proto.hpp b/src/frontends/tensorflow/src/decoder_proto.hpp +index 338bfdecce..9d22e273e1 100644 +--- a/src/frontends/tensorflow/src/decoder_proto.hpp ++++ b/src/frontends/tensorflow/src/decoder_proto.hpp +@@ -9,7 +9,7 @@ + + #include "openvino/core/type/element_type.hpp" + #include "openvino/frontend/tensorflow/decoder.hpp" +-#include "types.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace tensorflow { + class GraphDef; +diff --git a/src/frontends/tensorflow/src/graph_iterator_meta.cpp b/src/frontends/tensorflow/src/graph_iterator_meta.cpp +index 8bc41fbaef..06f2d31f38 100644 +--- a/src/frontends/tensorflow/src/graph_iterator_meta.cpp ++++ b/src/frontends/tensorflow/src/graph_iterator_meta.cpp +@@ -10,8 +10,8 @@ + #include + + #include "openvino/core/type/element_type.hpp" +-#include "tensor_bundle.pb.h" +-#include "trackable_object_graph.pb.h" ++#include "ov_tensorflow/tensor_bundle.pb.h" ++#include "ov_tensorflow/trackable_object_graph.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/graph_iterator_proto.hpp b/src/frontends/tensorflow/src/graph_iterator_proto.hpp +index 8b073b0837..85d9a3767a 100644 +--- a/src/frontends/tensorflow/src/graph_iterator_proto.hpp ++++ b/src/frontends/tensorflow/src/graph_iterator_proto.hpp +@@ -10,7 +10,7 @@ + #include "checkpoint_v1_reader.hpp" + #include "decoder_argdef.hpp" + #include "decoder_proto.hpp" +-#include "graph.pb.h" ++#include "ov_tensorflow/graph.pb.h" + #include "openvino/frontend/exception.hpp" + #include "openvino/frontend/graph_iterator.hpp" + #include "openvino/frontend/tensorflow/decoder.hpp" +diff --git a/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp b/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp +index ece0148d19..803e7d694b 100644 +--- a/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp ++++ b/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp +@@ -10,8 +10,8 @@ + #include + + #include "openvino/core/type/element_type.hpp" +-#include "tensor_bundle.pb.h" +-#include "trackable_object_graph.pb.h" ++#include "ov_tensorflow/tensor_bundle.pb.h" ++#include "ov_tensorflow/trackable_object_graph.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp b/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp +index 511f2a0a5b..4cb385e66f 100644 +--- a/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp ++++ b/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp +@@ -8,7 +8,7 @@ + + #include "graph_iterator_proto.hpp" + #include "openvino/util/file_util.hpp" +-#include "saved_model.pb.h" ++#include "ov_tensorflow/saved_model.pb.h" + #include "variables_index.hpp" + + namespace ov { +diff --git a/src/frontends/tensorflow/src/op/var_handle.cpp b/src/frontends/tensorflow/src/op/var_handle.cpp +index 50a5b73c44..0c86041440 100644 +--- a/src/frontends/tensorflow/src/op/var_handle.cpp ++++ b/src/frontends/tensorflow/src/op/var_handle.cpp +@@ -10,7 +10,7 @@ + #include "ngraph/runtime/shared_buffer.hpp" + #include "openvino/opsets/opset8.hpp" + #include "openvino/util/mmap_object.hpp" +-#include "tensor_bundle.pb.h" ++#include "ov_tensorflow/tensor_bundle.pb.h" + + using namespace std; + using namespace ov::opset8; +diff --git a/src/frontends/tensorflow/src/proto/any.proto b/src/frontends/tensorflow/src/proto/google/protobuf/any.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/any.proto +rename to src/frontends/tensorflow/src/proto/google/protobuf/any.proto +diff --git a/src/frontends/tensorflow/src/proto/wrappers.proto b/src/frontends/tensorflow/src/proto/google/protobuf/wrappers.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/wrappers.proto +rename to src/frontends/tensorflow/src/proto/google/protobuf/wrappers.proto +diff --git a/src/frontends/tensorflow/src/proto/allocation_description.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/allocation_description.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/allocation_description.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/allocation_description.proto +diff --git a/src/frontends/tensorflow/src/proto/api_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/api_def.proto +similarity index 99% +rename from src/frontends/tensorflow/src/proto/api_def.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/api_def.proto +index 810aabc5a2..cbb581973d 100644 +--- a/src/frontends/tensorflow/src/proto/api_def.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/api_def.proto +@@ -21,7 +21,7 @@ option java_outer_classname = "ApiDefProtos"; + option java_multiple_files = true; + option java_package = "org.tensorflow.framework"; + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework/api_def_go_proto"; +-import "attr_value.proto"; ++import "ov_tensorflow/attr_value.proto"; + + // Used to specify and override the default API & behavior in the + // generated code for client languages, from what you would get from +diff --git a/src/frontends/tensorflow/src/proto/attr_value.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/attr_value.proto +similarity index 96% +rename from src/frontends/tensorflow/src/proto/attr_value.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/attr_value.proto +index 3028176c02..b903c30cf9 100644 +--- a/src/frontends/tensorflow/src/proto/attr_value.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/attr_value.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/tensor.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "AttrValueProtos"; +diff --git a/src/frontends/tensorflow/src/proto/cost_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/cost_graph.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/cost_graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/cost_graph.proto +index dad93a029b..8e4d9788f4 100644 +--- a/src/frontends/tensorflow/src/proto/cost_graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/cost_graph.proto +@@ -14,8 +14,8 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "CostGraphProtos"; +diff --git a/src/frontends/tensorflow/src/proto/dataset_options.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/dataset_options.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/dataset_options.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/dataset_options.proto +diff --git a/src/frontends/tensorflow/src/proto/device_attributes.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/device_attributes.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/device_attributes.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/device_attributes.proto +diff --git a/src/frontends/tensorflow/src/proto/function.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/function.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/function.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/function.proto +index 65a2acb3b9..9e84731c98 100644 +--- a/src/frontends/tensorflow/src/proto/function.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/function.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "attr_value.proto"; +-import "node_def.proto"; +-import "op_def.proto"; ++import "ov_tensorflow/attr_value.proto"; ++import "ov_tensorflow/node_def.proto"; ++import "ov_tensorflow/op_def.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "FunctionProtos"; +diff --git a/src/frontends/tensorflow/src/proto/graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph.proto +similarity index 95% +rename from src/frontends/tensorflow/src/proto/graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/graph.proto +index c52e84022f..e047abeafe 100644 +--- a/src/frontends/tensorflow/src/proto/graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "function.proto"; +-import "node_def.proto"; +-import "versions.proto"; ++import "ov_tensorflow/function.proto"; ++import "ov_tensorflow/node_def.proto"; ++import "ov_tensorflow/versions.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "GraphProtos"; +diff --git a/src/frontends/tensorflow/src/proto/graph_transfer_info.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph_transfer_info.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/graph_transfer_info.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/graph_transfer_info.proto +index e42c135369..9e7d598e34 100644 +--- a/src/frontends/tensorflow/src/proto/graph_transfer_info.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph_transfer_info.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "types.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "GraphTransferInfoProto"; +diff --git a/src/frontends/tensorflow/src/proto/kernel_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/kernel_def.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/kernel_def.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/kernel_def.proto +index 5e6b839d31..88142d3de9 100644 +--- a/src/frontends/tensorflow/src/proto/kernel_def.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/kernel_def.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "attr_value.proto"; ++import "ov_tensorflow/attr_value.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "KernelDefProtos"; +diff --git a/src/frontends/tensorflow/src/proto/log_memory.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/log_memory.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/log_memory.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/log_memory.proto +index 96dac4c9ca..62489f0e0b 100644 +--- a/src/frontends/tensorflow/src/proto/log_memory.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/log_memory.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor_description.proto"; ++import "ov_tensorflow/tensor_description.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "LogMemoryProtos"; +diff --git a/src/frontends/tensorflow/src/proto/meta_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/meta_graph.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/meta_graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/meta_graph.proto +index b6918fa853..255fb6efeb 100644 +--- a/src/frontends/tensorflow/src/proto/meta_graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/meta_graph.proto +@@ -14,14 +14,14 @@ syntax = "proto3"; + + package tensorflow; + +-import "any.proto"; +-import "graph.proto"; +-import "op_def.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; +-import "saved_object_graph.proto"; +-import "saver.proto"; +-import "struct.proto"; ++import "google/protobuf/any.proto"; ++import "ov_tensorflow/graph.proto"; ++import "ov_tensorflow/op_def.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/saved_object_graph.proto"; ++import "ov_tensorflow/saver.proto"; ++import "ov_tensorflow/struct.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "MetaGraphProtos"; +diff --git a/src/frontends/tensorflow/src/proto/model.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/model.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/model.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/model.proto +diff --git a/src/frontends/tensorflow/src/proto/node_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/node_def.proto +similarity index 99% +rename from src/frontends/tensorflow/src/proto/node_def.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/node_def.proto +index 573d0f901d..b8f3a017a3 100644 +--- a/src/frontends/tensorflow/src/proto/node_def.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/node_def.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "attr_value.proto"; ++import "ov_tensorflow/attr_value.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "NodeProto"; +diff --git a/src/frontends/tensorflow/src/proto/op_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/op_def.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/op_def.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/op_def.proto +index 4d5c66c39e..31493fed26 100644 +--- a/src/frontends/tensorflow/src/proto/op_def.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/op_def.proto +@@ -18,9 +18,10 @@ option java_outer_classname = "OpDefProtos"; + option java_multiple_files = true; + option java_package = "org.tensorflow.framework"; + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework/op_def_go_proto"; +-import "attr_value.proto"; +-import "types.proto"; +-import "resource_handle.proto"; ++ ++import "ov_tensorflow/attr_value.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/resource_handle.proto"; + + // Defines an operation. A NodeDef in a GraphDef specifies an Op by + // using the "op" field which should match the name of a OpDef. +diff --git a/src/frontends/tensorflow/src/proto/reader_base.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/reader_base.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/reader_base.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/reader_base.proto +diff --git a/src/frontends/tensorflow/src/proto/remote_fused_graph_execute_info.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/remote_fused_graph_execute_info.proto +similarity index 94% +rename from src/frontends/tensorflow/src/proto/remote_fused_graph_execute_info.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/remote_fused_graph_execute_info.proto +index abfcfdbec0..3b17878e12 100644 +--- a/src/frontends/tensorflow/src/proto/remote_fused_graph_execute_info.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/remote_fused_graph_execute_info.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "graph.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/graph.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "RemoteFusedGraphExecuteInfoProto"; +diff --git a/src/frontends/tensorflow/src/proto/resource_handle.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/resource_handle.proto +similarity index 96% +rename from src/frontends/tensorflow/src/proto/resource_handle.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/resource_handle.proto +index 4d872b6d9d..19b4dcc3b8 100644 +--- a/src/frontends/tensorflow/src/proto/resource_handle.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/resource_handle.proto +@@ -14,8 +14,8 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "ResourceHandle"; +diff --git a/src/frontends/tensorflow/src/proto/saved_model.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_model.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/saved_model.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saved_model.proto +index 0034fdfd46..f866065522 100644 +--- a/src/frontends/tensorflow/src/proto/saved_model.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_model.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "meta_graph.proto"; ++import "ov_tensorflow/meta_graph.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "SavedModelProtos"; +diff --git a/src/frontends/tensorflow/src/proto/saved_object_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_object_graph.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/saved_object_graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saved_object_graph.proto +index 671441075c..d0b2170044 100644 +--- a/src/frontends/tensorflow/src/proto/saved_object_graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_object_graph.proto +@@ -14,13 +14,13 @@ syntax = "proto3"; + + package tensorflow; + +-import "any.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; +-import "variable.proto"; +-import "versions.proto"; +-import "struct.proto"; +-import "trackable_object_graph.proto"; ++import "google/protobuf/any.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/variable.proto"; ++import "ov_tensorflow/versions.proto"; ++import "ov_tensorflow/struct.proto"; ++import "ov_tensorflow/trackable_object_graph.proto"; + + option cc_enable_arenas = true; + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto"; +diff --git a/src/frontends/tensorflow/src/proto/saved_tensor_slice.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_tensor_slice.proto +similarity index 94% +rename from src/frontends/tensorflow/src/proto/saved_tensor_slice.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saved_tensor_slice.proto +index 4645b2bdca..9e628752bb 100644 +--- a/src/frontends/tensorflow/src/proto/saved_tensor_slice.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_tensor_slice.proto +@@ -35,11 +35,11 @@ option java_outer_classname = "SavedTensorSliceProtos"; + option java_multiple_files = true; + option java_package = "org.tensorflow.util"; + +-import "tensor_shape.proto"; +-import "tensor_slice.proto"; +-import "tensor.proto"; +-import "types.proto"; +-import "versions.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/tensor_slice.proto"; ++import "ov_tensorflow/tensor.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/versions.proto"; + + // Metadata describing the set of slices of the same tensor saved in a + // checkpoint file. +diff --git a/src/frontends/tensorflow/src/proto/saver.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saver.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/saver.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saver.proto +diff --git a/src/frontends/tensorflow/src/proto/step_stats.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/step_stats.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/step_stats.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/step_stats.proto +index 04e0864a5a..027a1d79ee 100644 +--- a/src/frontends/tensorflow/src/proto/step_stats.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/step_stats.proto +@@ -14,8 +14,8 @@ syntax = "proto3"; + + package tensorflow; + +-import "allocation_description.proto"; +-import "tensor_description.proto"; ++import "ov_tensorflow/allocation_description.proto"; ++import "ov_tensorflow/tensor_description.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "StepStatsProtos"; +diff --git a/src/frontends/tensorflow/src/proto/struct.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/struct.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/struct.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/struct.proto +index d03201b685..4126bd98c4 100644 +--- a/src/frontends/tensorflow/src/proto/struct.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/struct.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/tensor.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto"; + +diff --git a/src/frontends/tensorflow/src/proto/summary.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/summary.proto +similarity index 99% +rename from src/frontends/tensorflow/src/proto/summary.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/summary.proto +index 9e4b95f4bc..ce32617694 100644 +--- a/src/frontends/tensorflow/src/proto/summary.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/summary.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor.proto"; ++import "ov_tensorflow/tensor.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "SummaryProtos"; +diff --git a/src/frontends/tensorflow/src/proto/tensor.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor.proto +similarity index 96% +rename from src/frontends/tensorflow/src/proto/tensor.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor.proto +index c2e1fd7eb6..42f063536e 100644 +--- a/src/frontends/tensorflow/src/proto/tensor.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "resource_handle.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/resource_handle.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "TensorProtos"; +diff --git a/src/frontends/tensorflow/src/proto/tensor_bundle.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_bundle.proto +similarity index 94% +rename from src/frontends/tensorflow/src/proto/tensor_bundle.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_bundle.proto +index 43fea749b4..21af38195c 100644 +--- a/src/frontends/tensorflow/src/proto/tensor_bundle.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_bundle.proto +@@ -14,10 +14,10 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor_shape.proto"; +-import "tensor_slice.proto"; +-import "types.proto"; +-import "versions.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/tensor_slice.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/versions.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "TensorBundleProtos"; +diff --git a/src/frontends/tensorflow/src/proto/tensor_description.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_description.proto +similarity index 90% +rename from src/frontends/tensorflow/src/proto/tensor_description.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_description.proto +index 3ab9c310a6..c03e1311c1 100644 +--- a/src/frontends/tensorflow/src/proto/tensor_description.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_description.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "allocation_description.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/allocation_description.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "TensorDescriptionProtos"; +diff --git a/src/frontends/tensorflow/src/proto/tensor_shape.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_shape.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/tensor_shape.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_shape.proto +diff --git a/src/frontends/tensorflow/src/proto/tensor_slice.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_slice.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/tensor_slice.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_slice.proto +diff --git a/src/frontends/tensorflow/src/proto/trackable_object_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/trackable_object_graph.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/trackable_object_graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/trackable_object_graph.proto +index f4a8e4da34..f0a9617432 100644 +--- a/src/frontends/tensorflow/src/proto/trackable_object_graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/trackable_object_graph.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "wrappers.proto"; ++import "google/protobuf/wrappers.proto"; + + option cc_enable_arenas = true; + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto"; +diff --git a/src/frontends/tensorflow/src/proto/types.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/types.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/types.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/types.proto +diff --git a/src/frontends/tensorflow/src/proto/variable.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/variable.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/variable.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/variable.proto +diff --git a/src/frontends/tensorflow/src/proto/versions.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/versions.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/versions.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/versions.proto +diff --git a/src/frontends/tensorflow/src/tf_utils.hpp b/src/frontends/tensorflow/src/tf_utils.hpp +index a7a80a522b..5c4a97a5da 100644 +--- a/src/frontends/tensorflow/src/tf_utils.hpp ++++ b/src/frontends/tensorflow/src/tf_utils.hpp +@@ -4,8 +4,8 @@ + + #pragma once + +-#include "attr_value.pb.h" +-#include "node_def.pb.h" ++#include "ov_tensorflow/attr_value.pb.h" ++#include "ov_tensorflow/node_def.pb.h" + #include "openvino/core/node.hpp" + #include "openvino/core/partial_shape.hpp" + #include "openvino/core/runtime_attribute.hpp" +@@ -13,9 +13,9 @@ + #include "openvino/core/type/element_type.hpp" + #include "openvino/frontend/node_context.hpp" + #include "openvino/runtime/tensor.hpp" +-#include "tensor.pb.h" +-#include "tensor_shape.pb.h" +-#include "types.pb.h" ++#include "ov_tensorflow/tensor.pb.h" ++#include "ov_tensorflow/tensor_shape.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/variables_index.cpp b/src/frontends/tensorflow/src/variables_index.cpp +index c24ffd8112..2dcf3faf9e 100644 +--- a/src/frontends/tensorflow/src/variables_index.cpp ++++ b/src/frontends/tensorflow/src/variables_index.cpp +@@ -11,8 +11,8 @@ + #include "graph_iterator_saved_model.hpp" + #include "openvino/core/type/element_type.hpp" + #include "openvino/util/mmap_object.hpp" +-#include "tensor_bundle.pb.h" +-#include "trackable_object_graph.pb.h" ++#include "ov_tensorflow/tensor_bundle.pb.h" ++#include "ov_tensorflow/trackable_object_graph.pb.h" + + #ifdef ENABLE_SNAPPY_COMPRESSION + # include "snappy.h" +diff --git a/src/frontends/tensorflow/src/variables_index.hpp b/src/frontends/tensorflow/src/variables_index.hpp +index df852a6279..aa805b264b 100644 +--- a/src/frontends/tensorflow/src/variables_index.hpp ++++ b/src/frontends/tensorflow/src/variables_index.hpp +@@ -9,7 +9,7 @@ + #include "graph_iterator_proto.hpp" + #include "openvino/util/file_util.hpp" + #include "openvino/util/mmap_object.hpp" +-#include "saved_model.pb.h" ++#include "ov_tensorflow/saved_model.pb.h" + + namespace ov { + namespace frontend { diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index d1ad458ecea01d..3556c5d285c4d4 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -4,11 +4,22 @@ vcpkg_from_github( REF "${VERSION}" SHA512 29ee621c1428808607ce499e527b5943b8a2172769cb7315ef25253db818f54f2da4bbf5539198c012e25e78c8c830205b46f6e6a83032e732e82a7d00d46312 PATCHES + # vcpkg specific patch, because OV creates a file in source tree, which is prohibited 001-disable-tools.patch + # from https://github.com/openvinotoolkit/openvino/pull/18359 003-fix-find-onnx.patch + # from https://github.com/openvinotoolkit/openvino/pull/19629 004-compilation-with-cpp17.patch + # from https://github.com/openvinotoolkit/openvino/pull/19599 005-tflite-search.patch - 007-macos-14.patch # from https://github.com/openvinotoolkit/openvino/pull/19946 + # # from https://github.com/openvinotoolkit/openvino/pull/19946 + 007-macos-14.patch + # from https://github.com/openvinotoolkit/openvino/pull/19758 + # and https://github.com/openvinotoolkit/openvino/pull/20612 + 008-dynamic-protubuf.patch + # from https://github.com/openvinotoolkit/openvino/pull/20588 + # and https://github.com/openvinotoolkit/openvino/pull/20636 + 009-tensorflow-proto-odr.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 226c63665fb24b..60d03bc889eccf 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", "version": "2023.1.0", - "port-version": 3, + "port-version": 4, "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ @@ -15,6 +15,7 @@ "homepage": "https://github.com/openvinotoolkit/openvino", "documentation": "https://docs.openvino.ai/latest/index.html", "license": "Apache-2.0", + "supports": "!uwp", "dependencies": [ { "name": "pkgconf", diff --git a/ports/pipewire/portfile.cmake b/ports/pipewire/portfile.cmake index b11368ec87e7f7..5da0152fe12f73 100644 --- a/ports/pipewire/portfile.cmake +++ b/ports/pipewire/portfile.cmake @@ -1,10 +1,9 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/ OUT_SOURCE_PATH SOURCE_PATH REPO pipewire/pipewire REF ${VERSION} - SHA512 94d23a3660f76624abc18a1716519b4d18258a0a4c3047438df231f813df760f21f65b80c174f34b4de111da28b49ae3a46de961637e89828d67ecf614b17ba2 + SHA512 140d02242b1c76e4ced9bccaf306e7881103aa7081778b0e734a3eab12f3dae8c2824cca83d5e01c05817808c41da8280a4bf5a025448cff4ff9376219ae8050 HEAD_REF master # branch name ) @@ -12,7 +11,7 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dalsa=disabled - -Daudioconvert=disabled + -Daudioconvert=enabled -Daudiomixer=disabled -Daudiotestsrc=disabled -Davahi=disabled @@ -76,7 +75,7 @@ vcpkg_install_meson() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/pipewire/vcpkg.json b/ports/pipewire/vcpkg.json index 4bacb36e393432..42502c4a2ad9ce 100644 --- a/ports/pipewire/vcpkg.json +++ b/ports/pipewire/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pipewire", - "version": "0.3.62", + "version": "0.3.83", "description": "Low-latency audio/video router and processor. This port only builds the client library, not the server.", "homepage": "https://pipewire.org", "license": "MIT", diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index e38c3c93746508..e8836319c1fe37 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO plplot/plplot - REF "${VERSION} Source" + REF "${VERSION}%20Source" FILENAME "plplot-${VERSION}.tar.gz" SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8 PATCHES diff --git a/ports/plplot/vcpkg.json b/ports/plplot/vcpkg.json index 490c0ba7a000ff..054a7d80cffd63 100644 --- a/ports/plplot/vcpkg.json +++ b/ports/plplot/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plplot", "version-semver": "5.15.0", - "port-version": 1, + "port-version": 2, "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.", "homepage": "http://plplot.org/", "license": null, diff --git a/ports/pravila00-enum-string/portfile.cmake b/ports/pravila00-enum-string/portfile.cmake new file mode 100644 index 00000000000000..5a099731d5d608 --- /dev/null +++ b/ports/pravila00-enum-string/portfile.cmake @@ -0,0 +1,13 @@ +# Header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Pravila00/enum-string + REF 3eec46f5520c287ee46692ea1d41833cbe0d80f2 + SHA512 5b29c27b8ceb358bae5a2b4fb5d198b7b4cd8a7c9926bd7685c27650da5cda9f6dc85b6a9694fe151d03b22e3230d5f3faf9143e865dffc0795b2952fca5fc0f + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/EnumString.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/pravila00-enum-string/vcpkg.json b/ports/pravila00-enum-string/vcpkg.json new file mode 100644 index 00000000000000..a1afb14d86f804 --- /dev/null +++ b/ports/pravila00-enum-string/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pravila00-enum-string", + "version-date": "2023-10-16", + "description": "A utility to provide stringizing support for C++ enums.", + "homepage": "https://github.com/Pravila00/enum-string", + "license": "Unlicense" +} diff --git a/ports/pravila00-make-vector/portfile.cmake b/ports/pravila00-make-vector/portfile.cmake new file mode 100644 index 00000000000000..285464d9b63476 --- /dev/null +++ b/ports/pravila00-make-vector/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Pravila00/make-vector + REF 1518ac00adec9b13a645aee45ed1a36eb6ec1e98 + SHA512 2be4af258ceeb71e990ecc5c1c2c269456f6621b7b6b8183ba4e29f5479c4c7a618bd0c737a8d66aa00052a710930ec2f2ee5bc925f7a627427ac90918b6d4fa + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/include/make_vector.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/make-vector") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/pravila00-make-vector/vcpkg.json b/ports/pravila00-make-vector/vcpkg.json new file mode 100644 index 00000000000000..04cd52a3271c05 --- /dev/null +++ b/ports/pravila00-make-vector/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pravila00-make-vector", + "version-date": "2023-04-10", + "description": "C++ helper for making vectors.", + "homepage": "https://github.com/Pravila00/make-vector", + "license": "BSL-1.0" +} diff --git a/ports/proxsuite/portfile.cmake b/ports/proxsuite/portfile.cmake new file mode 100644 index 00000000000000..fdc74aab66e41d --- /dev/null +++ b/ports/proxsuite/portfile.cmake @@ -0,0 +1,37 @@ +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Simple-Robotics/proxsuite + REF "v${VERSION}" + SHA512 ce9d20f689cabf7668f8bd801017613a83ed816c8cab0190ae7116b2dc4880d0b5fa31bf11053f653f326b68984e3e63cdb3b43d9fd50a345554777d3d801a1b + HEAD_REF main +) + +vcpkg_from_github( + OUT_SOURCE_PATH MODULES_SOURCE_PATH + REPO jrl-umi3218/jrl-cmakemodules + REF e1a71520cd2f0e6f2a611e1a70df4d8edf4d5a65 + SHA512 a9dec01a4b4b30b42bf7f6e07c7102d58242c431f59875dac6bfc296473266f927e2ac3b823dcfa9364dad5cdbf46532d94eb65c41aa7d1ddfd7ec5212466ffa + HEAD_REF master +) +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake-module") +file(RENAME "${MODULES_SOURCE_PATH}" "${SOURCE_PATH}/cmake-module") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_WITH_VECTORIZATION_SUPPORT=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/proxsuite/vcpkg.json b/ports/proxsuite/vcpkg.json new file mode 100644 index 00000000000000..3c98ab88159edd --- /dev/null +++ b/ports/proxsuite/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "proxsuite", + "version": "0.5.0", + "description": "The Advanced Proximal Optimization Toolbox", + "homepage": "https://github.com/Simple-Robotics/proxsuite", + "license": "BSD-2-Clause", + "dependencies": [ + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 498c86f51ae295..5f32c2cf3599d1 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml - REF a0e064336317c9347a91224112af9933598714e9 #v1.13.0 - SHA512 9fe2285215520b6ac5f832d457bdfedcf183787a7058bb970a20ea7ca111e1afd864f5b90a4810c79470afefc55c0199febf04d1600634c1ffdbbe000ef6e1df + REF "v${VERSION}" + SHA512 730d203829eb24d6e1c873f9b921ae97cf7a157fd45504151bc2e61adea5c536eaf33ff38c5ad61629b54a6686135ff1834a61102b4660fbb9ead4ecf20dfd34 HEAD_REF master ) @@ -14,9 +14,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/pugixml) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/pugixml/vcpkg.json b/ports/pugixml/vcpkg.json index 3eafc0a7898837..4f81e3a62f5813 100644 --- a/ports/pugixml/vcpkg.json +++ b/ports/pugixml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pugixml", - "version": "1.13.0", + "version": "1.14", "description": "Light-weight, simple and fast XML parser for C++ with XPath support", "homepage": "https://github.com/zeux/pugixml", "license": "MIT", diff --git a/ports/qca/0002-fix-build-error.patch b/ports/qca/0002-fix-build-error.patch index 69993e79a11eae..5515d21f738aed 100644 --- a/ports/qca/0002-fix-build-error.patch +++ b/ports/qca/0002-fix-build-error.patch @@ -23,35 +23,4 @@ index 80af6e84..ba86310d 100644 endmacro(install_pdb) macro(normalize_path PATH) -diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp -index b2c5d3d3..4250ec26 100644 ---- a/plugins/qca-ossl/qca-ossl.cpp -+++ b/plugins/qca-ossl/qca-ossl.cpp -@@ -6846,6 +6846,7 @@ public: - else if (type == QLatin1String("aes256-ccm")) - return new opensslCipherContext(EVP_aes_256_ccm(), 0, this, type); - #endif -+#ifndef OPENSSL_NO_BF - else if (type == QLatin1String("blowfish-ecb")) - return new opensslCipherContext(EVP_bf_ecb(), 0, this, type); - else if (type == QLatin1String("blowfish-cfb")) -@@ -6856,6 +6857,8 @@ public: - return new opensslCipherContext(EVP_bf_cbc(), 0, this, type); - else if (type == QLatin1String("blowfish-cbc-pkcs7")) - return new opensslCipherContext(EVP_bf_cbc(), 1, this, type); -+#endif -+#ifndef OPENSSL_NO_DES - else if (type == QLatin1String("tripledes-ecb")) - return new opensslCipherContext(EVP_des_ede3(), 0, this, type); - else if (type == QLatin1String("tripledes-cbc")) -@@ -6872,6 +6875,7 @@ public: - return new opensslCipherContext(EVP_des_cfb(), 0, this, type); - else if (type == QLatin1String("des-ofb")) - return new opensslCipherContext(EVP_des_ofb(), 0, this, type); -+#endif - #ifndef OPENSSL_NO_CAST - else if (type == QLatin1String("cast5-ecb")) - return new opensslCipherContext(EVP_cast5_ecb(), 0, this, type); --- -2.31.1 diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 599801eaeaeed7..6f1246f622cb45 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -11,8 +11,8 @@ vcpkg_add_to_path("${PERL_EXE_PATH}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/qca - REF v2.3.5 - SHA512 c83ac69597f22d915479fd4fd1557b89c56ba384321c324f93cf2f1bd32a819cb6d7b008c44e7606fa39c8184043d97c36ee1210d23a6e8ce24c41c8a83e4fb9 + REF "v${VERSION}" + SHA512 de06173aaea32aac19a24510b5dbb4bb79681217eb1e4256de36db9f7158ad485fa450ffba5e13c12a0425866923b54f9b4d6164d0eaf659fdf40e458f5ee017 PATCHES 0001-fix-path-for-vcpkg.patch 0002-fix-build-error.patch @@ -92,4 +92,4 @@ file(REMOVE_RECURSE vcpkg_fixup_pkgconfig() # Handle copyright -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/qca/vcpkg.json b/ports/qca/vcpkg.json index dde4c6dcd4a54d..cc1315838fa9b3 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qca", - "version": "2.3.5", - "port-version": 2, + "version": "2.3.7", "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://userbase.kde.org/QCA", "dependencies": [ diff --git a/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch b/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch new file mode 100644 index 00000000000000..9f84b4319a93e1 --- /dev/null +++ b/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch @@ -0,0 +1,19 @@ +diff --git a/qcoro/websockets/qcorowebsocket.cpp b/qcoro/websockets/qcorowebsocket.cpp +index be9c1f7..c686d14 100644 +--- a/qcoro/websockets/qcorowebsocket.cpp ++++ b/qcoro/websockets/qcorowebsocket.cpp +@@ -32,7 +32,13 @@ public: + emitReady(true); + } + })) +- , mError(connect(socket, qOverload(&QWebSocket::error), this, [this](auto error) { ++ , mError(connect(socket, qOverload( ++#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) ++ &QWebSocket::errorOccurred ++#else ++ &QWebSocket::error ++#endif ++ ), this, [this](auto error) { + qWarning() << "QWebSocket failed to connect to a websocket server: " << error; + emitReady(false); + })) diff --git a/ports/qcoro/portfile.cmake b/ports/qcoro/portfile.cmake new file mode 100644 index 00000000000000..141554d50e3046 --- /dev/null +++ b/ports/qcoro/portfile.cmake @@ -0,0 +1,59 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO danvratil/qcoro + REF "v${VERSION}" + SHA512 f708e1a82861c39434d6934172246c3280864e933b333b56c0471f1a629f9da65554d1508af4291ac2257ad8df2040655394ae5525d728710de5bd83cef8fbee + HEAD_REF main + PATCHES 0001-qt6-deprecated-qwebsocket-error.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS EXTRA_OPTIONS + FEATURES + dbus QCORO_WITH_QTDBUS + network QCORO_WITH_QTNETWORK + websockets QCORO_WITH_QTWEBSOCKETS + quick QCORO_WITH_QTQUICK + qml QCORO_WITH_QML + test QCORO_WITH_QTTEST +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_QT_VERSION=6 + -DBUILD_TESTING=OFF + -DQCORO_BUILD_EXAMPLES=OFF + ${EXTRA_OPTIONS} +) + +vcpkg_cmake_install() + +if (QCORO_WITH_QTDBUS) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6DBus DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6DBus) +endif() +if (QCORO_WITH_QTNETWORK) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Network DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Network) +endif() +if (QCORO_WITH_QTWEBSOCKETS) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6WebSockets DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6WebSockets) +endif() +if (QCORO_WITH_QTQUICK) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Quick DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Quick) +endif() +if (QCORO_WITH_QML) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Qml DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Qml) +endif() +if (QCORO_WITH_QTTEST) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Test DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Test) +endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Coro DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Coro) +vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6 DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6) +vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Core CONFIG_PATH lib/cmake/QCoro6Core) + +# Remove debug includes and CMake macros +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/qcoro/usage b/ports/qcoro/usage new file mode 100644 index 00000000000000..ddd875a8759744 --- /dev/null +++ b/ports/qcoro/usage @@ -0,0 +1,36 @@ +qcoro-qt6 provides CMake targets: + + # Generic coroutine types and tools + find_package(QCoro6Coro CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Coro) + + # Coroutine support for QtCore types + find_package(QCoro6Core CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Core) + + # Coroutine supports for QtDBus types + find_package(QCoro6DBus CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::DBus) + + # Coroutine support for QtNetwork types + find_package(QCoro6Network CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Network) + + # Coroutine support for QtQml types + find_package(QCoro6Qml CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Qml) + + # Coroutine support for QML + find_package(QCoro6Quick CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Quick) + + # Coroutine support for developing tests with QtTest + find_package(QCoro6Test CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Test) + + # Coroutine support for QtWebSockets types + find_package(QCoro6WebSockets CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::WebSockets) + +You can also use `QCoro` target namespace for transparent +support of both Qt5 and Qt6. diff --git a/ports/qcoro/vcpkg.json b/ports/qcoro/vcpkg.json new file mode 100644 index 00000000000000..3000d2faa70269 --- /dev/null +++ b/ports/qcoro/vcpkg.json @@ -0,0 +1,56 @@ +{ + "name": "qcoro", + "version": "0.9.0", + "description": "Coroutine support for Qt", + "homepage": "https://www.github.com/danvratil/qcoro", + "documentation": "https://qcoro.dvratil.cz", + "license": "MIT", + "dependencies": [ + "qtbase", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "dbus", + "network", + "qml", + "quick", + "test", + "websockets" + ], + "features": { + "dbus": { + "description": "Coroutine support for QtDBus module" + }, + "network": { + "description": "Coroutine support for QtNetwork module" + }, + "qml": { + "description": "Coroutine support for QtQml module", + "dependencies": [ + "qtdeclarative" + ] + }, + "quick": { + "description": "Coroutine support for QtQuick module", + "dependencies": [ + "qtdeclarative" + ] + }, + "test": { + "description": "Support code for easier testing of coroutines with QtTest." + }, + "websockets": { + "description": "Coroutine support for QtWebSockets module", + "dependencies": [ + "qtwebsockets" + ] + } + } +} diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index e43904ccdcff2f..398b30b5e59f73 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-3d", - "version": "5.15.10", - "port-version": 1, + "version": "5.15.11", "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", "license": null, "dependencies": [ diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json index cdce229a192fcc..da99d74106e4fd 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-activeqt", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 ActiveQt Module - ActiveX components", "license": null, "supports": "windows", diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json index 339df96c58fa75..5c5ff65cf0a3b2 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-androidextras", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 androidextras Module;", "license": null, "supports": "android", diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index e61050013c4b69..a4aeef035f79c9 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,53 +1,53 @@ # Every update requires an update of these hashes and the version within the control file of each of the 32 ports. # So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 10) +set(QT_PATCH_VER 11) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-3d 6c3d94b02188493567921552e104f407fd92bf2b95acd6c933a9dd214ba7ebc0c1983ffcaefeae63d60131d02651df1da834522628711d36514dc697e7bb885f) -set(QT_HASH_qt5-activeqt 67ebe2eb0b45c128d9e57305f378900d21348d75960800e7848134452c1c01688219b36e712bceff76e942ce05e5100881194409627a7902a6d613938656550b) -set(QT_HASH_qt5-androidextras 9001f6cee644efcbfe5df1a7f97e8426364cc1a86cc7b5ae897aed05436920992325c8ff708a4de796ae02ab38af5c6cc20388f5d682bcd7fd43aa8d5775c5ae) -set(QT_HASH_qt5-base 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef) -set(QT_HASH_qt5-charts 15c76bc6b987b2d89473972df9cd4826913bb0dd2dffdb06fc6dfdbdd1a5676508584d5f0982b06ab513e46cee12871f3eb0ed00f94fccf23ef807079be96961) -set(QT_HASH_qt5-connectivity 3bc1c701f1e80794a410f0784c8955be42cb800c315d686da1a1e8429dbb72799bba2da59592f9edcd686c326df26fee4bf4e74b49feb96119e6aa29e982059f) -set(QT_HASH_qt5-datavis3d 414f4c86a55a9f2db745691f01f0d7ad6bbdddf56a04a280fd11f5b1bcd590ff34a8b35e178eaef15e1b1a1813cb148ac5bddfbb8fcb05de6ed5492666cccaf9) -set(QT_HASH_qt5-declarative 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8) -set(QT_HASH_qt5-doc 5c2751c1736c1c6818a7806ed14a81856115dfd8f46508dcea9b8023df638d34e96171c383cbdd3b7c307f97297e97da13503032225d8135e1a52b2fef5722e8) -set(QT_HASH_qt5-gamepad 20f06a11b8e7057e11b2f061ba088f1721cf94a20bed21e52eb0d7c6e20cd8f74ae2d0fe47748466c4a3dd63f9843afc94f74fb3076849e80ad8e71017fb3605) -set(QT_HASH_qt5-graphicaleffects a7e1326c10bd3bbce0f5b3e664dc42e5573de7add44ac852417aba9170a4e21c173679a65ea4ed403782fa954652b896266611887664488a99d42a8b3c8f7504) -set(QT_HASH_qt5-imageformats 7373884e5f01da0aae6f7d4575ca953de3be6cd41d3d19aa29bb2a2e5998486407525f23122e8b13c26143e64aa95d4756c5381643e93f930472c9890e6561de) -set(QT_HASH_qt5-location e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4) -set(QT_HASH_qt5-macextras 6eea905dab769183bacba4eac04f8de9c006dfda2034bd2025361445781a5379b2cc038ca6af95206f52fe6a2a11d73b36f96b0b716e93445973b9fb20337167) -set(QT_HASH_qt5-mqtt 5ca3b7ab7865f09eb0d5d300854b9fc7cd1534090a17462fcdbecee25f831e8d3a0de2adb151ae6f810f9df0ef30146f22a902275636554f6b77660e9bf00440) -set(QT_HASH_qt5-multimedia a322dba0daced00cf0a7fcd21b7f55c281dec107b7976792406ecc7658c94ea1a40c81c7cbdc0987f1be32cafd2458993c92db87fcbfdc7ba1243d2e0047896e) -set(QT_HASH_qt5-networkauth bfdda139223d183767e50fb95309dee7cd85c42fa09a00246a38987bf1570d84a137fb3fc71119416cc45126f21f6964f430b031e5acd4447caf30d0aac3bc2a) -set(QT_HASH_qt5-purchasing 9758325cf7bbdc8428a1ec9254749c27d6397a72d4fe164dc8ce0da08d09aa9c0ec0edb67879d6aa54500a47096154b252292b200d0bc516de425bfaad4f9ca8) -set(QT_HASH_qt5-quickcontrols fe7faf770adad9820ae897b5822b5dcba095dfc267411dd92d0b46daf7f84f87b3d9f2f9f90a90c030b09dcdc30549647f3f42039ac09e9207b5c1462116ed10) -set(QT_HASH_qt5-quickcontrols2 87e1590223c36b1191f4d976cab946c7d688228032a4a32e699a87ee844d64ed60f93c3c0c148374f4ac6ca619bbf583492cb9b57823b15dd0b9811ca270f390) -set(QT_HASH_qt5-remoteobjects 980884aaa65cd3462d9359f4def9e15a1d395569a14ee6c7c70f71a3d0445031baaa5a91541df01d6b7d6ca48bade2ae2c4ceebb306a97eefdc500c2f7d3eee6) -set(QT_HASH_qt5-script 3748cc8c90c2f96a21e6b0c8ffacca11d023e37091f6f5a05608f7f787f81619a7aac5c8074360486e28033a28601c1d347e499bc387a36f50c4cec2be30e782) -set(QT_HASH_qt5-scxml 93e2df05da176802a0439ba752f52d1c84d291a2addf9492aaab2099f06efb32d896edd0660711bb2e0b67f7a9ea2c4d31b4ec3366f6230140d3de0056478923) -set(QT_HASH_qt5-sensors 9950b0f8b90727a051299c5b7e7852819c165bcdb1cbe2f8bd7386768175c387ab838918e7d6f1dcf2a7d6d32bb1559dfda225c57e8b9b5b4ffeac5f3db432ac) -set(QT_HASH_qt5-serialbus 914a6ec2d51f89f84bc3425185cc35d497595c8f5378ff475ce784bc744fe1a9054feeaeed8d4205abc5f4de256d9511e8e1be3076066eed424848724325f513) -set(QT_HASH_qt5-serialport 59face48cce750fb02c112dbef9c997a5b61d84cf8085a0f8c59c3bb5c93d7110de9c9830f26f3ed61fffb2c23eb8a42d5683211abaa6e5147cf87643469a45e) -set(QT_HASH_qt5-speech b938c8baba11aa9a40a2ec5492df32c511164686aa2649d78023beccc8b23f1e0a77193672f7bc7d7f72aeb7b59fe30972683f5a4e22e1e39da9744ecd40201d) -set(QT_HASH_qt5-svg 6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7) -set(QT_HASH_qt5-tools 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1) -set(QT_HASH_qt5-translations 94f22857cf9f14f13f774ee5632bfd0fc367ca5fb745cbfb3997fee8651961d9547f0a629afc54c35b2e4493244da9b94214777e20340c2b203c538bc1c84a22) -set(QT_HASH_qt5-virtualkeyboard 6d539af5e5a336f2bf4ac1e6006268e50b426f6bb174019f742847da86f8cd5c8eb2c5f353255b5d1bba9c9c7a7b035bcb12e0063be5b31e45741ea9bd478582) -set(QT_HASH_qt5-wayland 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899) -set(QT_HASH_qt5-webchannel ed8349820c623dd7abcd34244a2f05426667d6997a8952567c3cbe785bb2ea92f03dd931bb53f77b34faff16d04dd7d39e4165c75d7a9ebb4ae225d7582355bc) -set(QT_HASH_qt5-webengine e35d0cab5f66a148420206616b3517e62b8320572beac53650096c0db58db8b4942d52a3abf4f0d6db1450de27befeb92f8b632c1277b0939464c1407a904b1b) -set(QT_HASH_qt5-webglplugin f47dc98f94ee422bdfce70663e24af3155047cb3ee1a914cb4d5f0d269de43bdb5f68376e04d0a9701c2f95ffe19c29f5c38db6441ec2144ccb41beb45924f1e) -set(QT_HASH_qt5-websockets b9a2593169f0ff8e3e77c178de689dacfed564b2100ae67194f3636bf6d2300be3531a01b7158b06657f4a2d2a32453a98b96c6ab13fb9d8094e7ceeb5fdcbe3) -set(QT_HASH_qt5-webview 258e2146a74083b2a7e48f8875f601df8f6135cdd4bb7c35c3d8b61bec0e5937942e74c36e971565ced9c070e3f1303a3950b7f2a87b148e8abb516bd0ce7a25) -set(QT_HASH_qt5-winextras dec47ca62e83a0794dc2f096a6fdccc45a1e43912af7f8a67ffd4aaed047d1887c85e411daba8a5a71d38e4ed3fbef1e2142a314aee1416a3a91a75c61f58706) -set(QT_HASH_qt5-x11extras 460345ad1fc7812a5bc71c097eb31c37a94acaaf94a79cfbfe3317142b4c515832ce2bf46b9bfcc9c9f669587a76492fb172dd55bfc27ca1570780772438f8b7) -set(QT_HASH_qt5-xmlpatterns 308203fafdd572998563a30b3289002f848c05b6de5a18545dc06489f97aa197c32f37019880b068c152e678ff5254ebe33333b581572811111c45a5ccb4a243) +set(QT_HASH_qt5-3d 34362aafbff5352786e87d98362e8961d4e2d9ad4ddd0c76ec7771375eb3f9c6f23b681c2697752ee9dad228f04e377e0a934859f70e6020dd9613b6ee760f1c) +set(QT_HASH_qt5-activeqt 33e441e56e0d59215c2884f75fbea104c2089e2b7571025f045cd03a8f5db1cf318f7f0bd7107ff2e414ddd0de13e16fbd49ad6c75ae1cef4cc4049429d3fba0) +set(QT_HASH_qt5-androidextras 6524e13c255f8350c0ac4abe8ea6a424daed60b3dc05c2aa66ecdcceace47fe4733a386dd4faf883c1014791e11f7f34633c6189907fbf8da31e81b027ef4003) +set(QT_HASH_qt5-base 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f) +set(QT_HASH_qt5-charts fe6f32b9d42a6fb6c26d4f860489be18643b1f5b32d5be348f7529fa029cfaea79af0c8493d8d26b0a9d91ebdbdc8ac0d80a3912ee40b36bed863cc5356370bf) +set(QT_HASH_qt5-connectivity f1bddff89b45352c9f98c7f94be9c5226588219036474d3be1e35b6f0c9327dcb1e8ca4e52e342863ff2e3052014eb7abbed1f9d4381174e326e3c70eebc1306) +set(QT_HASH_qt5-datavis3d 43ca0e5aa9af59d80a05166bb6cf29ab0d1a7421474d7dc974cb960dd3100d417456a2614208ccfca900e2203fd9becea12af6c15dd93107c196ebe17ad47559) +set(QT_HASH_qt5-declarative 08f76c5a1253d6014e48ef8d8c53f65d3087efea0f614f36aa03f37882c6947109b17398ac491157c4fbd0c954762e819c2f074fa5a71e6990f16a54ec7224ae) +set(QT_HASH_qt5-doc 8c7777446ca83fc7a4f2ef33b0f7e032268f67284855fd97900e07e1f7e0b7173bfb980cba206d010c489630719a5f8f08c42b222784a426b0800c4c34f097da) +set(QT_HASH_qt5-gamepad 4aa21aa51d854edd365e21e6f8f195c70998223c2a70603518b00a0efbeddf5ed9c60c33e665c1bb2dbed73e3d9b113b7fbf47287789ea54ba2a1d5c65b72c33) +set(QT_HASH_qt5-graphicaleffects 9e46eb1d985fdde3571f0327229a973b9ba4e3da360c3a890aa9c658a4cd82c20485a46ffbdbfd10c7fe4d6e3c45476682ee561ce3345f1eddebbf97eee162b0) +set(QT_HASH_qt5-imageformats a41f2adec9470433914a634e3dc79a70e2eda5713be5884029f8ef5eae3c5b2cea4c6de795907ddc69268635aef194325b047cddf84c8be4cf59668d172a89fa) +set(QT_HASH_qt5-location d439d03ff9044fc70165d1ceb5def9ec3290beec56b3e893409a24cd355651a4317e0eadff0266d38203ff84429a5fb8659a200f094669716579b6791a1a0f6d) +set(QT_HASH_qt5-macextras 5a9427c5dc21ecaac45097c731fcb3cb5c8397f0391e3da52f8aee30a6ba919b4697e6a20008b358c0086e98cb47fec678a2ed421a44c5107425432b5bc59e9a) +set(QT_HASH_qt5-mqtt 7bc1c4f3fa0097c057ffa72fd7ac68a3f7df35b1c0b93a54d53568c4743041887f3e2739c0281fcfad49909c926e9353c0a6523fd2bac62f539e4390044151fe) +set(QT_HASH_qt5-multimedia 1d72f79fe83cc955037ec6c5348058369697889a9a40b9fbaee9f3ad0cb74fe5f97062e026254e3512f0861e67cca8a36eaa19c1b3ffbea32d6b3cde2163b484) +set(QT_HASH_qt5-networkauth a7e4fcb5d5d5f80640444ae42896920c3e713df887244fbb42ce8de920270204fde1be12664ae24c075cdeea5d98da8f13aa4114524516cd9e3e5f2c68bd016f) +set(QT_HASH_qt5-purchasing 89b2d03528c4902ce2011817246f691902314383e0401638dc06c3bef4664a3d5a37edfe6f290fd7117168fa7862217b67b9a2340353b883b6e2b3741af658a8) +set(QT_HASH_qt5-quickcontrols 0779f9eb1b7b78a9f7662f5c2f7754882c0b85efbfff6e922d044757d1bc47f4c8ba0adb14b1a1347c32abd8086b6031d77c50cf534206f1988c4ce616e4953c) +set(QT_HASH_qt5-quickcontrols2 2621ae1d0c8ebb38ec2c9a0ff28b9bdb3a7aebfd2b6477d145a9772002abdae832aa7daeb8843a8372b32ebe476262650ba23cc977257fd5932499cde796eb32) +set(QT_HASH_qt5-remoteobjects ae5910c4b4da95cb927389137c2def0e75030024f5139a7634d009f9ebcc81c3f7171e6d0b3a5f3e0201a93eb8fad4d346b70fcc0aefbb1c6c69afc13c6d4848) +set(QT_HASH_qt5-script 116dc95c804fcd78082100d67c51c68c045a17754c8591cb885925c3b3541439317ae79ba7eefc1102ce12d2f544dc502fd67c4d8724f4d7f1347099cda3f744) +set(QT_HASH_qt5-scxml 7b6b9a13e8a142cbb3d10b879877dcffdcf99a815db8149f7ff869c1b967a39620b8fd0bbb5e07832b9aeb91b6152ea5b8413b25020d73531e560041525a7842) +set(QT_HASH_qt5-sensors 94c3ae48a8423fd6af5c984ae99a51cba49d396a6d7032ba29008aa9bea461199986d52449f838278285a98aa3c0a95bb62868368bdc5879ca696273608a74d6) +set(QT_HASH_qt5-serialbus 2f51b449242a05a50cdf761f639dc9fa178eca5531cc520fdd22a1a18e3bac7244acc5a4b596f1ca11dbf7bff38181b451f6cb8de6fcee63165316a5b09956d8) +set(QT_HASH_qt5-serialport ff863b20283f36f865dbcf363faff5555234438ac29f475f98f2a351bbcac320fb1764ecc42f0cdcc729b6b6a64792ca86f35cfa2567d9ade5ef72ff2e493e2f) +set(QT_HASH_qt5-speech 658eb9d24ea2f2bf39c6f4cd6dc75677067c8058cae694b53e665e28a273d2f730ab0dd4744ca8f8db224e52bb014fd145af1abd1667e3cd37f74c51bf96ebf4) +set(QT_HASH_qt5-svg ac04197aa69342aa403f476e41a8ea7b1895187812577afe32536130d5605fb1dc7f99c0aef368ccbacb673f8b41efe44a200643b905e4674379aa951a48cf59) +set(QT_HASH_qt5-tools 7aa66964dfc4bd144ee828a5c278b3127c5b269c6fb0e5363e7d2377ba19165e04719636659cb30fee471de26740d3d8692068459e1764d9f84a7737f24c4884) +set(QT_HASH_qt5-translations bb1d5c353932566b3daccc8b4d9ad957d3c4ea130e67eb933c0a7e49b99d2f9cac2860201a12e37ea51e46ae772a75a4be80d71e3a8afa59f5e14d3e02dd1ce2) +set(QT_HASH_qt5-virtualkeyboard 771088a6f847c901f59c14e32225410a4b174d2e9eb026928acba41e7dc2f658ad09d054846a06efb262fe198c1ddfbaf1014a61257856014c6ca2498747cc0e) +set(QT_HASH_qt5-wayland b47a3358bc37f52dde0839940431e8049abfaa827722e6d57362b07547c35fe9fb422d28fd28c69a13f5773c24efc3eeea1e584372737a0151ed94bf4c5b9980) +set(QT_HASH_qt5-webchannel 499e67d83d08476ee4b9da6c331a459b595ace3c6a7cbc7e1d8660b551cc0a87ef50e5d9d69a7783614c67db46df7802fdb4a2e79edb76012f6d26ceb3417eeb) +set(QT_HASH_qt5-webengine cebda17b9023348c85e9397fce5ad0f8ee16cfe821b8e79cea7ce92f7bb00e7fe59594107ac9f9411df1bb2e675eb6ecbfe3366df67a05b45fe12ead97cdc76c) +set(QT_HASH_qt5-webglplugin cbbab9ac54b38dfaa3f492ded0796ea942c24534d001980f71f5d1f35786c7c455de8a187608caa9ec4d9d1a0ed7dba19dc03de00414ac69efec48ff8c69f2ed) +set(QT_HASH_qt5-websockets 644182da57f0b3b77a434abcfe67731178cb0e62bc8743c85bda24e137f2fe686728b10a73f5030d8f357cc616c2e681de15598bedf4d01d4cb705482235bbcd) +set(QT_HASH_qt5-webview 7a741b3bb79b9aeaca05130ad8346a2dc704a203654754c73953d37a88d4c923375c3db44ddc22ea0b9856abedb7daf99e89d4f387014dfe8fbb31aaea6a7e38) +set(QT_HASH_qt5-winextras a387da6da092267545c78caff54dd95958be1840913f8ebe66320d35d8328ced2bb2b0cc85f0e2f7138f937fd828141e573d45c805e2da47c7b050bf961f2fb5) +set(QT_HASH_qt5-x11extras e1135ed8d1800d59f039e82ce33f3c84ac87df29ad61a60b2a0d25d78e4e38e2e1800406513d45abd3af79a2821698ca5d71161d6ad1f3b05deb3fad7599f654) +set(QT_HASH_qt5-xmlpatterns 73326aaa7fef65e00e3a585952d06841bba0905c1cb9a753b6c636e01fd7bf8cc66dadbe962ed962523f234c7461463ed893b045a7e3c2f0fbfb5e9aecf7a802) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qt5-base/patches/patch-qtbase-memory_resource.diff b/ports/qt5-base/patches/patch-qtbase-memory_resource.diff new file mode 100644 index 00000000000000..18b5b4d5136dbd --- /dev/null +++ b/ports/qt5-base/patches/patch-qtbase-memory_resource.diff @@ -0,0 +1,43 @@ +--- a/src/corelib/global/qcompilerdetection.h ++++ b/src/corelib/global/qcompilerdetection.h +@@ -1050,16 +1050,22 @@ + # endif // !_HAS_CONSTEXPR + # endif // !__GLIBCXX__ && !_LIBCPP_VERSION + # endif // Q_OS_QNX +-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \ +- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) ++# if defined(Q_CC_CLANG) && defined(Q_OS_DARWIN) ++# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) + // Apple has not updated libstdc++ since 2007, which means it does not have + // or std::move. Let's disable these features +-# undef Q_COMPILER_INITIALIZER_LISTS +-# undef Q_COMPILER_RVALUE_REFS +-# undef Q_COMPILER_REF_QUALIFIERS ++# undef Q_COMPILER_INITIALIZER_LISTS ++# undef Q_COMPILER_RVALUE_REFS ++# undef Q_COMPILER_REF_QUALIFIERS + // Also disable , since it's clearly not there +-# undef Q_COMPILER_ATOMICS +-# endif ++# undef Q_COMPILER_ATOMICS ++# endif ++# if defined(__cpp_lib_memory_resource) \ ++ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \ ++ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000)) ++# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17 ++# endif ++# endif // defined(Q_CC_CLANG) && defined(Q_OS_DARWIN) + # if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500 + // ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode + // (probably because libc++'s on OS X failed to compile), but they're missing some +--- a/src/corelib/tools/qduplicatetracker_p.h ++++ b/src/corelib/tools/qduplicatetracker_p.h +@@ -52,7 +52,7 @@ + + #include + +-#if QT_HAS_INCLUDE() && __cplusplus > 201402L ++#ifdef __cpp_lib_memory_resource + # include + # include + #else diff --git a/ports/qt5-base/patches/xcode-15.patch b/ports/qt5-base/patches/xcode-15.patch new file mode 100644 index 00000000000000..9430967b593506 --- /dev/null +++ b/ports/qt5-base/patches/xcode-15.patch @@ -0,0 +1,28 @@ +diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf +index 0040b6c..bfad10d 100644 +--- a/mkspecs/features/toolchain.prf ++++ b/mkspecs/features/toolchain.prf +@@ -288,9 +288,12 @@ + } + } + } +- isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \ ++ isEmpty(QMAKE_DEFAULT_INCDIRS): \ + !integrity: \ +- error("failed to parse default search paths from compiler output") ++ error("failed to parse default include paths from compiler output") ++ isEmpty(QMAKE_DEFAULT_LIBDIRS): \ ++ !integrity:!darwin: \ ++ error("failed to parse default library paths from compiler output") + QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS) + } else: ghs { + cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp +@@ -411,7 +414,7 @@ + QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP) + } + +- unix:if(!cross_compile|host_build) { ++ unix:!darwin:if(!cross_compile|host_build) { + isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include + isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib + } diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index e6c737bdfde61e..9969b7f7bcad3e 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -66,6 +66,8 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/mysql_plugin_include.patch #Fix include path of mysql plugin patches/mysql-configure.patch #Fix mysql project patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 + patches/xcode-15.patch #From https://codereview.qt-project.org/c/qt/qtbase/+/503172 + patches/patch-qtbase-memory_resource.diff # From https://bugreports.qt.io/browse/QTBUG-114316 #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 9a9c8342e0ca9d..c01e316ea2e57f 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", - "version": "5.15.10", - "port-version": 6, + "version": "5.15.11", + "port-version": 1, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json index ff1f5737a0e422..4776a533e44a1f 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-charts", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", "license": null, "dependencies": [ diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json index 30e607a3e06af1..eab2b2e3720d90 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-connectivity", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json index ab129f728804bc..e9dae7a52427b2 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-datavis3d", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", "license": null, "dependencies": [ diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index 25e4d19b2e1732..2ffb5acee7950e 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-declarative", - "version": "5.15.10", - "port-version": 1, + "version": "5.15.11", "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", "license": null, "dependencies": [ diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json index 0d7aafe81c893c..403099132eae3b 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-doc", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 doc Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index 9d757785e72ad3..a5cbb927303e91 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-gamepad", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json index ef0df010942726..01b6f6d9e6f4d0 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-graphicaleffects", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 GraphicalEffects Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index d9ec973cac4c94..38c70b1b609635 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-imageformats", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 9048df7d7b5dc9..ee68e67e202042 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-location", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", "license": null, "dependencies": [ diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json index 16146b0b71e5ed..b2d03191a8beb5 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-macextras", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", "license": null, "supports": "osx", diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json index 9d3619a24015ad..16f7f52c6b9ba2 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-mqtt", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 MQTT module.", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake index 214726759f3cf1..d2f61ad9861eec 100644 --- a/ports/qt5-multimedia/portfile.cmake +++ b/ports/qt5-multimedia/portfile.cmake @@ -1,2 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation(PATCHES xcode15.patch) diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index c349d61d73033a..68638dca3b400e 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-multimedia", - "version": "5.15.10", + "version": "5.15.11", + "port-version": 1, "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/xcode15.patch b/ports/qt5-multimedia/xcode15.patch new file mode 100644 index 00000000000000..699c57c0df01ce --- /dev/null +++ b/ports/qt5-multimedia/xcode15.patch @@ -0,0 +1,12 @@ +diff -ur a/src/plugins/avfoundation/camera/avfcamerautility.mm b/src/plugins/avfoundation/camera/avfcamerautility.mm +--- a/src/plugins/avfoundation/camera/avfcamerautility.mm 2023-04-01 11:51:14.736887185 -0400 ++++ b/src/plugins/avfoundation/camera/avfcamerautility.mm 2023-04-01 11:54:19.979498301 -0400 +@@ -101,7 +101,7 @@ + } + }; + +-struct FormatHasNoFPSRange : std::unary_function ++struct FormatHasNoFPSRange + { + bool operator() (AVCaptureDeviceFormat *format) + { diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json index dd059c25f891f9..24814527eb7934 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-networkauth", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Network Authorization Module", "license": null, "dependencies": [ diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index fa3a509ed635b6..ce0126d6f184f0 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-purchasing", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json index a45d8e0987d3d2..26741f8f5dcac0 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 QuickControls Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index 7ee321220f8ab6..9d7f132a918982 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols2", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 QuickControls2 Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index fb38de4d9780cd..675197200ee357 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-remoteobjects", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", "license": null, "dependencies": [ diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json index ecafd394eb9507..0d1609a26c1f30 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-script", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Script Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index feb59ba6a8fdee..522e87d415c6d1 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-scxml", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", "license": null, "dependencies": [ diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json index 9fea767a039036..1c714da77f8f46 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-sensors", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", "license": null, "dependencies": [ diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json index 36174611d70eb0..c55bf6c7aa71d2 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialbus", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Serialbus Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index a09f5ecf0a2c28..7644e67fc22ce2 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialport", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", "license": null, "dependencies": [ diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json index cc493f9849ae66..15a50ac979cccb 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-speech", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Speech Module", "license": null, "dependencies": [ diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 989f2e177f4ad3..63f9b59fa54e93 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-svg", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", "license": null, "dependencies": [ diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index edf24f1ccb7445..31a9e69653a73e 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-tools", - "version": "5.15.10", - "port-version": 1, + "version": "5.15.11", "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", "license": null, "dependencies": [ diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json index 2fc8ed1482c6a8..83f1f385d31b6c 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-translations", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 translations module", "license": null, "dependencies": [ diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index a8941978315fe2..3a6eb89f7d70d2 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-virtualkeyboard", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", "license": null, "dependencies": [ diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index 3c5035539d92dc..224d47f9c10fe1 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-wayland", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 wayland Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index 5cc07a85dc471b..d16e484d35006e 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webchannel", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", "license": null, "dependencies": [ diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 8161a985c8ed44..296aa471eb58b3 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-webengine", - "version": "5.15.10", - "port-version": 1, + "version": "5.15.11", "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 6476a176f2dbe2..99ab24ed5e0059 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webglplugin", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Webglplugin Module", "license": null, "dependencies": [ diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index 9e71b76e48ce4d..45209f405fe4fa 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-websockets", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", "license": null, "dependencies": [ diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json index 7a993eb0a80c33..2d6ad37008d217 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webview", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", "license": null, "dependencies": [ diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json index 724ae378c92b6b..b1b519b0dc8724 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-winextras", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", "license": null, "supports": "windows", diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json index af3b84383b5411..76ca6eb92b5ec7 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-x11extras", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 x11extras Module;", "license": null, "supports": "!windows", diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index 12d0f5e98f2437..c44f47a8c4db81 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-xmlpatterns", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", "license": null, "dependencies": [ diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json index e30614eaef3b4f..4fced41162bc4f 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/CVE-2023-43114-6.5.patch b/ports/qtbase/CVE-2023-43114-6.5.patch new file mode 100644 index 00000000000000..12b1c5005ccfb4 --- /dev/null +++ b/ports/qtbase/CVE-2023-43114-6.5.patch @@ -0,0 +1,119 @@ +diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp +index 44cc7fe63e..e44d85a3cb 100644 +--- a/src/gui/text/windows/qwindowsfontdatabase.cpp ++++ b/src/gui/text/windows/qwindowsfontdatabase.cpp +@@ -873,36 +873,70 @@ QT_WARNING_POP + return fontEngine; + } + +-static QList getTrueTypeFontOffsets(const uchar *fontData) ++static QList getTrueTypeFontOffsets(const uchar *fontData, const uchar *fileEndSentinel) + { + QList offsets; +- const quint32 headerTag = *reinterpret_cast(fontData); ++ if (fileEndSentinel - fontData < 12) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ return offsets; ++ } ++ ++ const quint32 headerTag = qFromUnaligned(fontData); + if (headerTag != MAKE_TAG('t', 't', 'c', 'f')) { + if (headerTag != MAKE_TAG(0, 1, 0, 0) + && headerTag != MAKE_TAG('O', 'T', 'T', 'O') + && headerTag != MAKE_TAG('t', 'r', 'u', 'e') +- && headerTag != MAKE_TAG('t', 'y', 'p', '1')) ++ && headerTag != MAKE_TAG('t', 'y', 'p', '1')) { + return offsets; ++ } + offsets << 0; + return offsets; + } ++ ++ const quint32 maximumNumFonts = 0xffff; + const quint32 numFonts = qFromBigEndian(fontData + 8); +- for (uint i = 0; i < numFonts; ++i) { +- offsets << qFromBigEndian(fontData + 12 + i * 4); ++ if (numFonts > maximumNumFonts) { ++ qCWarning(lcQpaFonts) << "Font collection of" << numFonts << "fonts is too large. Aborting."; ++ return offsets; ++ } ++ ++ if (quintptr(fileEndSentinel - fontData) > 12 + (numFonts - 1) * 4) { ++ for (quint32 i = 0; i < numFonts; ++i) ++ offsets << qFromBigEndian(fontData + 12 + i * 4); ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } ++ + return offsets; + } + +-static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag, const uchar **table, quint32 *length) ++static void getFontTable(const uchar *fileBegin, const uchar *fileEndSentinel, const uchar *data, quint32 tag, const uchar **table, quint32 *length) + { +- const quint16 numTables = qFromBigEndian(data + 4); +- for (uint i = 0; i < numTables; ++i) { +- const quint32 offset = 12 + 16 * i; +- if (*reinterpret_cast(data + offset) == tag) { +- *table = fileBegin + qFromBigEndian(data + offset + 8); +- *length = qFromBigEndian(data + offset + 12); +- return; ++ if (fileEndSentinel - data >= 6) { ++ const quint16 numTables = qFromBigEndian(data + 4); ++ if (fileEndSentinel - data >= 28 + 16 * (numTables - 1)) { ++ for (quint32 i = 0; i < numTables; ++i) { ++ const quint32 offset = 12 + 16 * i; ++ if (qFromUnaligned(data + offset) == tag) { ++ const quint32 tableOffset = qFromBigEndian(data + offset + 8); ++ if (quintptr(fileEndSentinel - fileBegin) <= tableOffset) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ break; ++ } ++ *table = fileBegin + tableOffset; ++ *length = qFromBigEndian(data + offset + 12); ++ if (quintptr(fileEndSentinel - *table) < *length) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ break; ++ } ++ return; ++ } ++ } ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } + *table = 0; + *length = 0; +@@ -915,8 +949,9 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + QList *values) + { + const uchar *data = reinterpret_cast(fontData.constData()); ++ const uchar *dataEndSentinel = data + fontData.size(); + +- QList offsets = getTrueTypeFontOffsets(data); ++ QList offsets = getTrueTypeFontOffsets(data, dataEndSentinel); + if (offsets.isEmpty()) + return; + +@@ -924,7 +959,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + const uchar *font = data + offsets.at(i); + const uchar *table; + quint32 length; +- getFontTable(data, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); ++ getFontTable(data, dataEndSentinel, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); + if (!table) + continue; + QFontNames names = qt_getCanonicalFontNames(table, length); +@@ -934,7 +969,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + families->append(std::move(names)); + + if (values || signatures) +- getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); ++ getFontTable(data, dataEndSentinel, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); + + if (values) { + QFontValues fontValues; +-- +2.27.0.windows.1 diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index ccd4731ce3789a..9a96976ce01f88 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -19,6 +19,7 @@ set(${PORT}_PATCHES GLIB2-static.patch # alternative is to force pkg-config clang-cl_source_location.patch clang-cl_QGADGET_fix.diff + CVE-2023-43114-6.5.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 164f900871341c..64ec5f1d892011 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.5.3", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index ad00681202f4e1..25a8810cba51da 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 37147f7180b09ab2cfc49400255ffab470e5f3b07cf8eade0f9fe2b20a6bbc3c5c75deeb3b6beca698f62abb2114075fb4e70e43ef936028b9e30f6338dac785 + SHA512 a7854d6ff5810708c7289ba2aab7cb72040ec0ddc116fc8d39e983277ce4edc2bcf59ac63c4d71135cec7d85f43c6a4ca17353a9c060153564d002f98c54d1c9 HEAD_REF master ) diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index ff3c41b235bc98..6a46e0eb4102ea 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quantlib", - "version": "1.31.1", + "version": "1.32", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", "license": "BSD-3-Clause", diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index a2dc96d73db1ed..7c7c4e16ddca9e 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tencent/rapidjson - REF 949c771b03de448bdedea80c44a4a5f65284bfeb # accessed on 2023-04-27 - SHA512 dc0a16230188ccd3ef8f1abffb3213948dd34b17df68330a28bb82a4e3f636e13add3ff33f03774322697140456c704223102e6517d5122fa099260704b7c363 + REF a95e013b97ca6523f32da23f5095fcc9dd6067e5 # accessed on 2023-07-17 + SHA512 19bf9a579df70cbeaf60c7ccf25c92c327bffe95b0df14f27f2132134d5bb214e98a45e021eb287c4790e301f84bb095e0bdb3c97f65a37fbeb254970d97c005 FILE_DISAMBIGUATOR 2 HEAD_REF master ) diff --git a/ports/rapidjson/vcpkg.json b/ports/rapidjson/vcpkg.json index a343edc2bc2d87..ec17e082f51a79 100644 --- a/ports/rapidjson/vcpkg.json +++ b/ports/rapidjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rapidjson", - "version-date": "2023-04-27", + "version-date": "2023-07-17", "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API ", "homepage": "http://rapidjson.org/", "license": "MIT", diff --git a/ports/reactiveplusplus/portfile.cmake b/ports/reactiveplusplus/portfile.cmake index 35ea573118d7d2..41da550f306594 100644 --- a/ports/reactiveplusplus/portfile.cmake +++ b/ports/reactiveplusplus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO victimsnino/ReactivePlusPlus - REF v0.2.2 - SHA512 86c374c7523c028528ce985f053901a1f0f37a18c2d16085a60fd5d0819ae052cc3d6bfe6065627044b51e65b24de93399be9ba6f0ca8ec92622358112f1c821 + REF "v${VERSION}" + SHA512 24bc81cf6b26ed994f0740140dedcca2fa794f28e1c59cb6ddb876286a65678dcc849ea7e3ce8d71eb12e1d210eaa2f3e913e0f4e6fc7414e3afaa82c3e0b06a HEAD_REF master ) diff --git a/ports/reactiveplusplus/vcpkg.json b/ports/reactiveplusplus/vcpkg.json index db2a44a9929f56..2fb816e44e435c 100644 --- a/ports/reactiveplusplus/vcpkg.json +++ b/ports/reactiveplusplus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "reactiveplusplus", - "version": "0.2.2", + "version": "0.2.3", "description": "ReactivePlusPlus is reactive programming library for C++ language", "homepage": "https://github.com/victimsnino/ReactivePlusPlus", "license": "BSL-1.0", diff --git a/ports/readline-win32/portfile.cmake b/ports/readline-win32/portfile.cmake index 494c512fc8d28a..45fd95691ab39c 100644 --- a/ports/readline-win32/portfile.cmake +++ b/ports/readline-win32/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaozhuai/readline-win32 - REF 8f141e9a77f81fae5b67f915621988aef116e9ae - SHA512 2eb88a2fa3780df1bb8fa5dfc0be197113d3789cd7b494c0c30509099a6c4818cf14d8301d312747107b2b4f8e52e5a2ed93d3fe5fbbd6b796f780e2f1e0f729 + REF 2b94fbb51f5da90b7bbd9b236da80be6f798e014 + SHA512 1285625ca6c608b98d13a783dd34461782bd88026bc09e6c9e70fd343e28561d1d7e5392b8068e52e93308029544276bdbc8ca12703c8976836561777a03dc17 HEAD_REF master ) diff --git a/ports/readline-win32/vcpkg.json b/ports/readline-win32/vcpkg.json index bd171c66570fe6..e09abde7ede31d 100644 --- a/ports/readline-win32/vcpkg.json +++ b/ports/readline-win32/vcpkg.json @@ -1,7 +1,7 @@ { "name": "readline-win32", "version": "5.0", - "port-version": 7, + "port-version": 8, "description": "Implementation of readline for Windows Desktop", "homepage": "https://github.com/xiaozhuai/readline-win32", "license": "GPL-2.0", diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index deed97f32d16f8..f5899614c90396 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF v2.54.1 - SHA512 9b7146a5f6a4152d95286f679e0f5314ab0b040f67a030e42dfe01ad995af486d3d158d1ac7ef0bbe783a90e067d32e4bb4ba1a524fe75a89be6c7fe9c3a30ed + REF "v${VERSION}" + SHA512 20561294da571e0e1f5f8c9ac1039828512f3361a4241e5ad320bbb684626c1e78cd18e6a6344ec80fcd86dc699742c51069bc2b6895aec1dcbd9f394d2c9998 HEAD_REF master PATCHES fix_openni2.patch @@ -70,5 +70,5 @@ if(BUILD_OPENNI2_BINDINGS) endif() endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_fixup_pkgconfig() diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index 61ebac1dd16197..0390b62b5d1f8e 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "realsense2", - "version": "2.54.1", - "port-version": 1, + "version": "2.54.2", "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "license": "Apache-2.0", diff --git a/ports/sdbus-cpp/pic.patch b/ports/sdbus-cpp/pic.patch new file mode 100644 index 00000000000000..3b2c06c45c6cd4 --- /dev/null +++ b/ports/sdbus-cpp/pic.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7332b23..822a594 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -130,7 +130,7 @@ target_compile_definitions(sdbus-c++-objlib PRIVATE + target_include_directories(sdbus-c++-objlib PUBLIC $ + $) +-if(DEFINED BUILD_SHARED_LIBS) ++if(BUILD_SHARED_LIBS) +- set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS}) ++ set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON) + endif() + if(BUILD_LIBSYSTEMD) + add_dependencies(sdbus-c++-objlib LibsystemdBuildProject) diff --git a/ports/sdbus-cpp/portfile.cmake b/ports/sdbus-cpp/portfile.cmake new file mode 100644 index 00000000000000..f9b952ad66460d --- /dev/null +++ b/ports/sdbus-cpp/portfile.cmake @@ -0,0 +1,38 @@ +message(WARNING "You will need to install sytemd dependencies to build sdbus-cpp:\nsudo apt install libsystemd-dev\n") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Kistler-Group/sdbus-cpp + REF "v${VERSION}" + SHA512 8f4cb9ae88b1ec0db0bcc27e131fcb9ad8a8bc88e39721b3b73f63e057bae4cd36619894e25114ccddb1a8e6c21db2f80adcabb3263ff5d8b34b72af7563afe2 + PATCHES + pic.patch # can be dropped once https://github.com/Kistler-Group/sdbus-cpp/pull/361 is merged+released +) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tool BUILD_CODE_GEN +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DBUILD_LIBSYSTEMD=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sdbus-c++) +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/bin" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING-LGPL-Exception") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +if ("tool" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES sdbus-c++-xml2cpp AUTO_CLEAN) +endif() diff --git a/ports/sdbus-cpp/usage b/ports/sdbus-cpp/usage new file mode 100644 index 00000000000000..bea252a66784da --- /dev/null +++ b/ports/sdbus-cpp/usage @@ -0,0 +1,3 @@ +sdbus-cpp provides CMake targets: + find_package(sdbus-c++ REQUIRED) + target_link_libraries(main PRIVATE SDBusCpp::sdbus-c++) diff --git a/ports/sdbus-cpp/vcpkg.json b/ports/sdbus-cpp/vcpkg.json new file mode 100644 index 00000000000000..3895a5f0e7a27a --- /dev/null +++ b/ports/sdbus-cpp/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "sdbus-cpp", + "version": "1.3.0", + "description": "High-level C++ D-Bus library for Linux designed to provide easy-to-use yet powerful API in modern C++", + "homepage": "https://github.com/Kistler-Group/sdbus-cpp", + "license": "LGPL-2.1", + "supports": "linux", + "dependencies": [ + "dbus", + "libsystemd", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tool": { + "description": "build C++ codegen tool", + "dependencies": [ + "expat" + ] + } + } +} diff --git a/ports/sdl2-mixer-ext/vcpkg.json b/ports/sdl2-mixer-ext/vcpkg.json index dd18c5a5d74eb3..bb60a677880c9f 100644 --- a/ports/sdl2-mixer-ext/vcpkg.json +++ b/ports/sdl2-mixer-ext/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2-mixer-ext", "version-date": "2023-05-04", + "port-version": 1, "description": "An audio mixer library based on the SDL library, a fork of SDL_mixer", "homepage": "https://wohlsoft.github.io/SDL-Mixer-X", "license": "Zlib OR LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later", @@ -100,7 +101,7 @@ }, "nativemidi": { "description": "Use Native MIDI Player to play MIDI audio format.", - "supports": "windows | osx" + "supports": "(windows & !uwp) | osx" }, "opusfile": { "description": "Use opusfile to play Opus audio format.", diff --git a/ports/sdl2-net/fix-uwp.patch b/ports/sdl2-net/fix-uwp.patch new file mode 100644 index 00000000000000..79f4c07a290858 --- /dev/null +++ b/ports/sdl2-net/fix-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/SDLnetUDP.c b/SDLnetUDP.c +index ee4e46b..dc9b4b0 100644 +--- a/SDLnetUDP.c ++++ b/SDLnetUDP.c +@@ -22,7 +22,7 @@ + #include "SDLnetsys.h" + #include "SDL_net.h" + +-#if defined(__WIN32__) || defined(__OS2__) ++#if defined(_WIN32) || defined(__OS2__) + #define srandom srand + #define random rand + #endif diff --git a/ports/sdl2-net/portfile.cmake b/ports/sdl2-net/portfile.cmake index f5c4473adb655f..eac85455e0b9e2 100644 --- a/ports/sdl2-net/portfile.cmake +++ b/ports/sdl2-net/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 669e75b84632e2c6cc5c65974ec9e28052cb7a4e # release-2.2.0 SHA512 180c757d704c72dc7fcc392c13942214c87b90de22e32045ec9eb6cde5da2b762516e14120d8bee52f7f4a59ad8e30d4f71e313918432ae07ef71df8e9380e4b HEAD_REF main + PATCHES + fix-uwp.patch ) vcpkg_cmake_configure( diff --git a/ports/sdl2-net/vcpkg.json b/ports/sdl2-net/vcpkg.json index 1b10deb52a1972..941ca075e48e58 100644 --- a/ports/sdl2-net/vcpkg.json +++ b/ports/sdl2-net/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-net", "version": "2.2.0", - "port-version": 1, + "port-version": 2, "description": "Networking library for SDL", "homepage": "https://github.com/libsdl-org/SDL_net", "license": "Zlib", diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 2fa57963787410..e9c6837b054d37 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL REF "release-${VERSION}" - SHA512 6383280f12f7fc75b958a4354da2a5b3dfe4364eb7f65354546c5f9e95492c0f5da721a39dc9b90cdd91fdcea0153b153cdf31c0cd635e74786d23828d4184b0 + SHA512 3199e535033c8728bd12b97931d5c5d7a7dcc9b0f502109ff722982601b6fbb00995d71cbaab7d3b780c738deece235ef76ab1963ce946084c482c2d31a4abe8 HEAD_REF main PATCHES deps.patch @@ -15,11 +15,15 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + alsa SDL_ALSA + alsa CMAKE_REQUIRE_FIND_PACKAGE_ALSA + ibus SDL_IBUS + samplerate SDL_LIBSAMPLERATE vulkan SDL_VULKAN - x11 SDL_X11 wayland SDL_WAYLAND - samplerate SDL_LIBSAMPLERATE - ibus SDL_IBUS + x11 SDL_X11 + INVERTED_FEATURES + alsa CMAKE_DISABLE_FIND_PACKAGE_ALSA ) if ("x11" IN_LIST FEATURES) @@ -51,6 +55,7 @@ vcpkg_cmake_configure( -DSDL_LIBSAMPLERATE_SHARED=OFF MAYBE_UNUSED_VARIABLES SDL_FORCE_STATIC_VCRT + PKG_CONFIG_USE_CMAKE_PREFIX_PATH ) vcpkg_cmake_install() diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 16d148a40a419c..4f67f6ea0bced0 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sdl2", - "version": "2.28.3", + "version": "2.28.4", "port-version": 1, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", @@ -23,6 +23,15 @@ "base" ], "features": { + "alsa": { + "description": "Support for alsa audio", + "dependencies": [ + { + "name": "alsa", + "platform": "linux" + } + ] + }, "base": { "description": "Base functionality for SDL", "dependencies": [ diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 3a5c9882e15354..51814f64a09cb0 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 fe28ecb66325f6dc81ba0e2f76c99b3f70c2a3e85e33a90eb16262b258e9e83a466c7b6bd2356bc44774d895b18d281c0238670aa2112bf48f0dc7de0eb94788 + SHA512 0fa548b70e3fbb87614521d797a577ffa185991f0942cf20dd965f8c068414512a63f5d715672ecf243aa31d18fdcda6ce355ad8614ede7b988d0a103cda7244 ) vcpkg_extract_source_archive( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 2c412d8e4770a5..9e8d60ea8ece5e 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.6.5", + "version": "0.6.6", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/ports/shiva-sfml/portfile.cmake b/ports/shiva-sfml/portfile.cmake deleted file mode 100644 index efc79a81131c3c..00000000000000 --- a/ports/shiva-sfml/portfile.cmake +++ /dev/null @@ -1,144 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Milerius/shiva - REF 1.0 - SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1 - HEAD_REF master - ) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DSHIVA_BUILD_TESTS=OFF - -DSHIVA_USE_SFML_AS_RENDERER=ON - -DSHIVA_INSTALL_PLUGINS=ON - -DSHIVA_BUILD_EXAMPLES=OFF -) - -vcpkg_cmake_install() - - -if (VCPKG_CMAKE_SYSTEM_NAME) - file(GLOB PLUGINS_RELEASE "${SOURCE_PATH}/bin/Release/systems/*") - file(GLOB PLUGINS_DEBUG "${SOURCE_PATH}/bin/Debug/systems/*") -else() - file(GLOB PLUGINS_RELEASE "${SOURCE_PATH}/bin/Release/systems/*.dll") - file(GLOB PLUGINS_DEBUG "${SOURCE_PATH}/bin/Debug/systems/*.dll") -endif() - -message(STATUS "PLUGINS_RELEASE -> ${PLUGINS_RELEASE}") -message(STATUS "PLUGINS_DEBUG -> ${PLUGINS_DEBUG}") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shiva-sfml) - - -if (VCPKG_CMAKE_SYSTEM_NAME) - set(SUFFIX_BINARY lib) -else() - set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) - set(SUFFIX_BINARY bin) -endif() - -##! Pre removing -if (VCPKG_CMAKE_SYSTEM_NAME) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -endif() - -##! Include -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/shiva-sfml") - -##! Release -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release") - -##! Debug -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug") - -##! Copy Plugins -file(COPY ${PLUGINS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release") -file(COPY ${PLUGINS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug") - -if (NOT VCPKG_CMAKE_SYSTEM_NAME) - find_file(LUADLL lua.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(FMTDLL fmt.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(FLACDLL FLAC.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(FREETYPEDLL freetype.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(LIBBZ2DLL libbz2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(LIBPNG16DLL libpng16.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(OGGDLL ogg.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(OPENAL32DLL OpenAL32.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(SFMLAUDIO2DLL sfml-audio-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(SFMLGRAPHICS2DLL sfml-graphics-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(SFMLSYSTEM2DLL sfml-system-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(SFMLWINDOW2DLL sfml-window-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(VORBISDLL vorbis.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(VORBISENCDLL vorbisenc.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(VORBISFILEDLL vorbisfile.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(ZLIB1DLL zlib1.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - set(DEPENDANCIES_RELEASE_DLL - ${LUADLL} - ${FMTDLL} - ${FLACDLL} - ${FREETYPEDLL} - ${LIBBZ2DLL} - ${LIBPNG16DLL} - ${OGGDLL} - ${OPENAL32DLL} - ${SFMLAUDIO2DLL} - ${SFMLGRAPHICS2DLL} - ${SFMLSYSTEM2DLL} - ${SFMLWINDOW2DLL} - ${VORBISDLL} - ${VORBISENCDLL} - ${VORBISFILEDLL} - ${ZLIB1DLL}) - - find_file(LUADLL_D lua.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(FMTDLL_D fmtd.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(FLACDLL_D FLAC.dll PATHS $"{CURRENT_INSTALLED_DIR}/debug/bin") - find_file(FREETYPEDLL_D freetyped.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(LIBBZ2DLL_D libbz2d.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(LIBPNG16DLL_D libpng16d.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(OGGDLL_D ogg.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(OPENAL32DLL_D OpenAL32.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(SFMLAUDIO2DLL_D sfml-audio-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(SFMLGRAPHICS2DLL_D sfml-graphics-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(SFMLSYSTEM2DLL_D sfml-system-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(SFMLWINDOW2DLL_D sfml-window-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(VORBISDLL_D vorbis.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(VORBISENCDLL_D vorbisenc.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(VORBISFILEDLL_D vorbisfile.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(ZLIB1DLL_D zlibd1.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - set(DEPENDANCIES_DEBUG_DLL - ${LUADLL_D} - ${FMTDLL_D} - ${FLACDLL_D} - ${FREETYPEDLL_D} - ${LIBBZ2DLL_D} - ${LIBPNG16DLL_D} - ${OGGDLL_D} - ${OPENAL32DLL} - ${SFMLAUDIO2DLL_D} - ${SFMLGRAPHICS2DLL_D} - ${SFMLSYSTEM2DLL_D} - ${SFMLWINDOW2DLL_D} - ${VORBISDLL_D} - ${VORBISENCDLL_D} - ${VORBISFILEDLL_D} - ${ZLIB1DLL_D} - ) - - file(COPY ${DEPENDANCIES_RELEASE_DLL} DESTINATION "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release") - file(COPY ${DEPENDANCIES_DEBUG_DLL} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug") -endif() - -file(WRITE "${CURRENT_PACKAGES_DIR}/include/shiva-sfml/empty.h" "") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/shiva-sfml/copyright" "") diff --git a/ports/shiva-sfml/vcpkg.json b/ports/shiva-sfml/vcpkg.json deleted file mode 100644 index 7d7ddd54dad7e6..00000000000000 --- a/ports/shiva-sfml/vcpkg.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "shiva-sfml", - "version": "1.0", - "port-version": 4, - "description": "shiva-sfml plugins of shiva C++ engine", - "dependencies": [ - { - "name": "sfml", - "platform": "windows" - }, - "shiva", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake index 6b2c926e1bde36..fd3af730992c6a 100644 --- a/ports/so5extra/portfile.cmake +++ b/ports/so5extra/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/so5extra REF "v.${VERSION}" - SHA512 7dc632158e244ed82ec4220c022c8172cbb29fbf2176ed0899a17d655bcf047080dbaf8b35e6db666e071141bb59db140d2363eeb0e63b163988a507053c3075 + SHA512 ec9de55671ecd0d49fce3e677e11776306ec9ea993b06d67eaa3e5505ea171085c35aedea3cf29e03958b2c73f438c5ccd95539c75b63fd89c50d6367ccda1fe ) vcpkg_cmake_configure( diff --git a/ports/so5extra/vcpkg.json b/ports/so5extra/vcpkg.json index 731de0942d23bc..5b0b7683bd3244 100644 --- a/ports/so5extra/vcpkg.json +++ b/ports/so5extra/vcpkg.json @@ -1,6 +1,6 @@ { "name": "so5extra", - "version": "1.6.0", + "version": "1.6.1", "description": "A set of additional tools for SObjectizer framework.", "homepage": "https://github.com/Stiffstream/so5extra", "license": "BSD-3-Clause", diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index efce03e97bcc1a..6b3226a07ed6e7 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer REF "v.${VERSION}" - SHA512 b1131c25477f397e58d79ea5489b8ed42a7ca8f2ff7592f8ff2972bb7c905f1b23ec9596573b60d7c5beaa169d0dd8882210b4c39daa8213ea06134bde44ebde + SHA512 9484ef5fd07deb6c82dba868f089fbdfbae34b33380cd25cdb40ba57468b429e8746e76a4fd1808f33f3609f143150d17966642816b27a78e7a1153520b28f0e ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 57bed40d54b9dd..887c93759897bf 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.8.0.1", + "version": "5.8.1", "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.", "homepage": "https://github.com/Stiffstream/sobjectizer", "license": "BSD-3-Clause", diff --git a/ports/soci/dependencies.diff b/ports/soci/dependencies.diff new file mode 100644 index 00000000000000..187022d0ec981f --- /dev/null +++ b/ports/soci/dependencies.diff @@ -0,0 +1,100 @@ +diff --git a/cmake/dependencies/Boost.cmake b/cmake/dependencies/Boost.cmake +index 366d32b..7ff041b 100644 +--- a/cmake/dependencies/Boost.cmake ++++ b/cmake/dependencies/Boost.cmake +@@ -10,4 +10,6 @@ endif() + set(Boost_RELEASE_VERSION + "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") + ++set(BOOST_FOUND "${Boost_FOUND}") ++set(BOOST_LIBRARIES "${Boost_LIBRARIES}") + boost_external_report(Boost RELEASE_VERSION INCLUDE_DIR LIBRARIES) +diff --git a/cmake/dependencies/MySQL.cmake b/cmake/dependencies/MySQL.cmake +index 5599b08..0a4ce0f 100644 +--- a/cmake/dependencies/MySQL.cmake ++++ b/cmake/dependencies/MySQL.cmake +@@ -1,5 +1,9 @@ + set(MySQL_FIND_QUIETLY TRUE) + +-find_package(MySQL) ++find_package(MYSQL NAMES unofficial-libmysql REQUIRED) ++set(MYSQL_LIBRARIES "$") ++if(TARGET mysqlclient AND NOT TARGET libmysql) ++ set(MYSQL_LIBRARIES "$") ++endif() + + boost_external_report(MySQL INCLUDE_DIR LIBRARIES) +diff --git a/cmake/dependencies/PostgreSQL.cmake b/cmake/dependencies/PostgreSQL.cmake +index c6f2154..ef6bfcd 100644 +--- a/cmake/dependencies/PostgreSQL.cmake ++++ b/cmake/dependencies/PostgreSQL.cmake +@@ -1,5 +1,8 @@ + set(PostgreSQL_FIND_QUIETLY TRUE) + +-find_package(PostgreSQL) ++find_package(PostgreSQL REQUIRED) ++set(POSTGRESQL_FOUND TRUE) ++set(POSTGRESQL_INCLUDE_DIRS "${PostgreSQL_INCLUDE_DIRS}") ++set(POSTGRESQL_LIBRARIES "${PostgreSQL_LIBRARIES}") + + boost_external_report(PostgreSQL INCLUDE_DIRS LIBRARIES VERSION) +diff --git a/cmake/dependencies/SQLite3.cmake b/cmake/dependencies/SQLite3.cmake +index 0daa9a5..17775da 100644 +--- a/cmake/dependencies/SQLite3.cmake ++++ b/cmake/dependencies/SQLite3.cmake +@@ -1,5 +1,6 @@ + set(SQLITE3_FIND_QUIETLY TRUE) + +-find_package(SQLite3) ++find_package(SQLITE3 NAMES unofficial-sqlite3 CONFIG REQUIRED) ++set(SQLITE3_LIBRARIES unofficial::sqlite3::sqlite3) + + boost_external_report(SQLite3 INCLUDE_DIR LIBRARIES) +diff --git a/cmake/resources/SOCIConfig.cmake.in b/cmake/resources/SOCIConfig.cmake.in +index 8096a3c..354c18b 100644 +--- a/cmake/resources/SOCIConfig.cmake.in ++++ b/cmake/resources/SOCIConfig.cmake.in +@@ -1,3 +1,11 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++if("@WITH_MYSQL@") ++ find_dependency(unofficial-libmysql) ++endif() ++if("@WITH_SQLITE3@") ++ find_dependency(unofficial-sqlite3) ++endif() ++ + include(${CMAKE_CURRENT_LIST_DIR}/SOCITargets.cmake) +diff --git a/include/soci/mysql/soci-mysql.h b/include/soci/mysql/soci-mysql.h +index 376bb7e..fbe48fa 100644 +--- a/include/soci/mysql/soci-mysql.h ++++ b/include/soci/mysql/soci-mysql.h +@@ -21,8 +21,8 @@ + #ifdef _WIN32 + #include // SOCKET + #endif // _WIN32 +-#include // MySQL Client +-#include // MySQL Error codes ++#include // MySQL Client ++#include // MySQL Error codes + #include + + +diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt +index 871e151..3cffc80 100644 +--- a/src/backends/CMakeLists.txt ++++ b/src/backends/CMakeLists.txt +@@ -14,9 +14,9 @@ colormsg(_HIBLUE_ "Configuring SOCI backend libraries:") + foreach(dep ${SOCI_BACKENDS_DB_DEPENDENCIES}) + string(TOUPPER ${dep} depUP) + if (WITH_${depUP}) +- find_package(${dep}) +- endif() +- if(${dep}_FOUND OR ${depUP}_FOUND) ++ if(NOT (${dep}_FOUND OR ${depUP}_FOUND)) ++ message(FATAL_ERROR "${depUP} not found, check SociDependencies.cmake") ++ endif() + set(${depUP}_FOUND ON) + else() + set(${depUP}_FOUND OFF) diff --git a/ports/soci/fix-dependency-libmysql.patch b/ports/soci/fix-dependency-libmysql.patch deleted file mode 100644 index 809ec76d5be325..00000000000000 --- a/ports/soci/fix-dependency-libmysql.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake -index 1233568..9a7cb61 100644 ---- a/cmake/modules/FindMySQL.cmake -+++ b/cmake/modules/FindMySQL.cmake -@@ -13,6 +13,9 @@ - # - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+find_package(libmysql REQUIRED) -+set(MySQL_FOUND 1) -+return() - - include(CheckCXXSourceCompiles) - diff --git a/ports/soci/fix-mysql-feature-error.patch b/ports/soci/fix-mysql-feature-error.patch deleted file mode 100644 index 05e9c4bfe04a23..00000000000000 --- a/ports/soci/fix-mysql-feature-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/backends/mysql/session.cpp b/src/backends/mysql/session.cpp -index 383248c..86a5bfd 100644 ---- a/src/backends/mysql/session.cpp -+++ b/src/backends/mysql/session.cpp -@@ -5,6 +5,7 @@ - // (See accompanying file LICENSE_1_0.txt or copy at - // http://www.boost.org/LICENSE_1_0.txt) - // -+typedef bool my_bool; - - #define SOCI_MYSQL_SOURCE - #include "soci/mysql/soci-mysql.h" diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake index 71dc324a17ae9b..b6757821d93b0b 100644 --- a/ports/soci/portfile.cmake +++ b/ports/soci/portfile.cmake @@ -5,57 +5,70 @@ vcpkg_from_github( SHA512 d501f55e7e7408e46b4823fd8a97d6ef587f5db0f5b98434be8dfc5693c91b8c3b84a24454279c83142ab1cd1fa139c6e54d6d9a67397b2ead61650fcc88bcdb HEAD_REF master PATCHES - fix-dependency-libmysql.patch - export-include-dirs.patch - fix-mysql-feature-error.patch # https://bugs.mysql.com/bug.php?id=85131 + dependencies.diff + usage-requirements.diff +) +file(REMOVE + "${SOURCE_PATH}/cmake/modules/FindPostgreSQL.cmake" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOCI_STATIC) -# Handle features -set(_COMPONENT_FLAGS "") -foreach(_feature IN LISTS ALL_FEATURES) - # Uppercase the feature name and replace "-" with "_" - string(TOUPPER "${_feature}" _FEATURE) - string(REPLACE "-" "_" _FEATURE "${_FEATURE}") - - # Turn "-DWITH_*=" ON or OFF depending on whether the feature - # is in the list. - if(_feature IN_LIST FEATURES) - list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON") - else() - list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF") - endif() - - if(_feature MATCHES "mysql") - set(MYSQL_OPT "-DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql") - endif() -endforeach() +vcpkg_check_features(OUT_FEATURE_OPTIONS options + FEATURES + boost WITH_BOOST + boost CMAKE_REQUIRE_FIND_PACKAGE_Boost + empty SOCI_EMPTY + mysql WITH_MYSQL + odbc WITH_ODBC + odbc CMAKE_REQUIRE_FIND_PACKAGE_ODBC + postgresql WITH_POSTGRESQL + sqlite3 WITH_SQLITE3 + INVERTED_FEATURES + core WITH_DB2 + core WITH_FIREBIRD + core WITH_ORACLE + core WITH_VALGRIND +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DSOCI_TESTS=OFF -DSOCI_CXX11=ON - -DSOCI_STATIC=${SOCI_STATIC} -DSOCI_SHARED=${SOCI_DYNAMIC} - ${_COMPONENT_FLAGS} - ${MYSQL_OPT} + -DSOCI_STATIC=${SOCI_STATIC} + -DSOCI_TESTS=OFF + ${options} + MAYBE_UNUSED_VARIABLES + CMAKE_REQUIRE_FIND_PACKAGE_Boost + CMAKE_REQUIRE_FIND_PACKAGE_ODBC ) vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SOCI) -if ("mysql" IN_LIST FEATURES) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCIConfig.cmake" - "# Create imported target SOCI::soci_mysql" - "\ninclude(CMakeFindDependencyMacro)\nfind_dependency(libmysql)\n# Create imported target SOCI::soci_mysql" - ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/soci/soci-platform.h" "ifdef SOCI_DLL" "if 1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright +file(READ "${CURRENT_PORT_DIR}/usage" usage) +set(backends ${FEATURES}) +list(REMOVE_ITEM backends core boost) +if(backends STREQUAL "") + string(APPEND usage " +This soci build doesn't include any backend and may not be useful. +") +endif() +foreach(backend IN LISTS backends) + string(APPEND usage " + # Using the ${backend} backend directly + target_link_libraries(main PRIVATE $,SOCI::soci_${backend},SOCI::soci_${backend}_static>) +") +endforeach() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage}") + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") diff --git a/ports/soci/usage b/ports/soci/usage new file mode 100644 index 00000000000000..fc3044265bbc43 --- /dev/null +++ b/ports/soci/usage @@ -0,0 +1,5 @@ +soci provides CMake targets: + + find_package(SOCI CONFIG REQUIRED) + # Using core (loading backends at runtime) + target_link_libraries(main PRIVATE $,SOCI::soci_core,SOCI::soci_core_static>) diff --git a/ports/soci/export-include-dirs.patch b/ports/soci/usage-requirements.diff similarity index 82% rename from ports/soci/export-include-dirs.patch rename to ports/soci/usage-requirements.diff index e141363fc2e894..9ecd405c96fd61 100644 --- a/ports/soci/export-include-dirs.patch +++ b/ports/soci/usage-requirements.diff @@ -1,15 +1,14 @@ diff --git a/cmake/SociBackend.cmake b/cmake/SociBackend.cmake -index 5d4ef0d..bb0edf2 100644 +index 5d4ef0d..279cb75 100644 --- a/cmake/SociBackend.cmake +++ b/cmake/SociBackend.cmake -@@ -159,8 +159,14 @@ macro(soci_backend NAME) +@@ -159,8 +159,13 @@ macro(soci_backend NAME) ${THIS_BACKEND_HEADERS}) target_link_libraries(${THIS_BACKEND_TARGET} + PUBLIC ${SOCI_CORE_TARGET} ${THIS_BACKEND_DEPENDS_LIBRARIES}) -+ + target_include_directories(${THIS_BACKEND_TARGET} + PUBLIC + ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS} @@ -17,20 +16,18 @@ index 5d4ef0d..bb0edf2 100644 if(WIN32) set_target_properties(${THIS_BACKEND_TARGET} -@@ -197,9 +203,15 @@ macro(soci_backend NAME) +@@ -197,8 +202,14 @@ macro(soci_backend NAME) # Still need to link the libraries for tests to work target_link_libraries (${THIS_BACKEND_TARGET_STATIC} + PUBLIC ++ ${SOCI_CORE_TARGET}_static ${THIS_BACKEND_DEPENDS_LIBRARIES} ) -- -+ + target_include_directories(${THIS_BACKEND_TARGET_STATIC} + PUBLIC + ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS} + ) -+ + set_target_properties(${THIS_BACKEND_TARGET_STATIC} PROPERTIES - OUTPUT_NAME ${THIS_BACKEND_OUTPUT_NAME} diff --git a/ports/soci/vcpkg.json b/ports/soci/vcpkg.json index db687ca0842709..004473ef31d261 100644 --- a/ports/soci/vcpkg.json +++ b/ports/soci/vcpkg.json @@ -1,9 +1,9 @@ { "name": "soci", "version": "4.0.3", - "port-version": 1, - "description": "SOCI database access library", - "homepage": "https://github.com/SOCI/soci", + "port-version": 3, + "description": "SOCI - The C++ Database Access Library", + "homepage": "https://soci.sourceforge.net/", "license": "BSL-1.0", "dependencies": [ { @@ -26,6 +26,9 @@ "boost-tuple" ] }, + "empty": { + "description": "Build the backend skeleton for new backends development" + }, "mysql": { "description": "Build mysql backend", "dependencies": [ @@ -34,18 +37,30 @@ }, "odbc": { "description": "Build odbc backend", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "unixodbc", + "platform": "!windows" + } + ] }, "postgresql": { "description": "Build postgresql backend", "dependencies": [ - "libpq" + { + "name": "libpq", + "default-features": false + } ] }, "sqlite3": { "description": "Build sqlite3 backend", "dependencies": [ - "sqlite3" + { + "name": "sqlite3", + "default-features": false + } ] } } diff --git a/ports/soem/portfile.cmake b/ports/soem/portfile.cmake index b0daea2490f155..fa83adcf1b0186 100644 --- a/ports/soem/portfile.cmake +++ b/ports/soem/portfile.cmake @@ -20,6 +20,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/soem/cmake") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" diff --git a/ports/soem/vcpkg.json b/ports/soem/vcpkg.json index 781494cea2f426..6915b4c80c15bf 100644 --- a/ports/soem/vcpkg.json +++ b/ports/soem/vcpkg.json @@ -1,6 +1,7 @@ { "name": "soem", "version-date": "2023-06-09", + "port-version": 1, "description": "Simple Open Source EtherCAT Master", "homepage": "https://github.com/OpenEtherCATsociety/SOEM", "supports": "!uwp", @@ -9,6 +10,10 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, { "name": "winpcap", "platform": "windows" diff --git a/ports/sokol/portfile.cmake b/ports/sokol/portfile.cmake index 9785eecca73c27..be80a3a82289f8 100644 --- a/ports/sokol/portfile.cmake +++ b/ports/sokol/portfile.cmake @@ -3,16 +3,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO floooh/sokol - REF 425e906d2af8c976c30f7e925a303fea9f0bf879 - SHA512 4606735b9466637f3b676402cc2d7ef96e4152836c901d7a84039c52951aec27922726de21a537e0fef2d2218f48e3a9a3c32c3bc67076c10d199f067f50dad9 + REF d98c8b92c25070f13d0491f5fade1d9d2ca885ad + SHA512 bb49dc3da366e70c7b6b16ebd490f9b2c88c496b278f1b9651321b3aab0977db92707d3955c2cb2654d8032647429ac90aa585de36644380112d988eac877cd0 HEAD_REF master ) -file(GLOB SOKOL_INCLUDE_FILES ${SOURCE_PATH}/*.h) -file(COPY ${SOKOL_INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(GLOB SOKOL_INCLUDE_FILES "${SOURCE_PATH}/*.h") +file(COPY ${SOKOL_INCLUDE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(GLOB SOKOL_UTIL_INCLUDE_FILES ${SOURCE_PATH}/util/*.h) -file(COPY ${SOKOL_UTIL_INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/util) +file(GLOB SOKOL_UTIL_INCLUDE_FILES "${SOURCE_PATH}/util/*.h") +file(COPY ${SOKOL_UTIL_INCLUDE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/util") -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/sokol/vcpkg.json b/ports/sokol/vcpkg.json index 1094d1204a54be..2394bb69704a59 100644 --- a/ports/sokol/vcpkg.json +++ b/ports/sokol/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sokol", - "version-date": "2019-09-09", - "port-version": 2, + "version-date": "2023-10-07", "description": "Minimal cross-platform standalone C headers", - "homepage": "https://github.com/floooh/sokol" + "homepage": "https://github.com/floooh/sokol", + "license": "Zlib" } diff --git a/ports/soundtouch/portfile.cmake b/ports/soundtouch/portfile.cmake index 0e2ad0626abe82..501094ddd2f3b9 100644 --- a/ports/soundtouch/portfile.cmake +++ b/ports/soundtouch/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH GITHUB_HOST https://codeberg.org REPO soundtouch/soundtouch - REF 2.3.1 - SHA512 c9d110b06cafb79968c94c4d206360b9ea9673d63eaf1470b097a39acf18b5b9cd53759f2656ff8963c6eee6a36fecdf1ea9aa7dc014fbf8bbee0dcfb8e4e438 + REF ${VERSION} + SHA512 93f757b2c1abe16be589e0d191e6c0416c5980843bd416cd5cb820b65a705d98081c0fc7ca0d9880af54b5343318262c77ba39a096bb240ceec084e93ceef964 HEAD_REF master ) @@ -31,5 +31,6 @@ if(SOUNDSTRETCH) vcpkg_copy_tools(TOOL_NAMES soundstretch AUTO_CLEAN) endif() -file(INSTALL "${SOURCE_PATH}/COPYING.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.TXT") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/soundtouch/vcpkg.json b/ports/soundtouch/vcpkg.json index 645d9b39162f9b..8decad7f834b57 100644 --- a/ports/soundtouch/vcpkg.json +++ b/ports/soundtouch/vcpkg.json @@ -1,7 +1,6 @@ { "name": "soundtouch", - "version": "2.3.1", - "port-version": 2, + "version": "2.3.2", "description": "SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.", "homepage": "https://www.surina.net/soundtouch", "supports": "!uwp", diff --git a/ports/sqlite3/add-config-include.patch b/ports/sqlite3/add-config-include.patch index cb0e957bbe980e..df4b8172131e1f 100644 --- a/ports/sqlite3/add-config-include.patch +++ b/ports/sqlite3/add-config-include.patch @@ -1,17 +1,17 @@ diff --git a/sqlite3.c b/sqlite3.c -index 310583f..61f7d9e 100644 +index 1884b08..0d191be 100644 --- a/sqlite3.c +++ b/sqlite3.c @@ -20,6 +20,7 @@ ** The content in this amalgamation comes from Fossil check-in - ** f80b798b3f4b81a7bb4233c58294edd0f11. + ** d3a40c05c49e1a49264912b1a05bc2143ac. */ +#include "sqlite3-vcpkg-config.h" #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 #ifndef SQLITE_PRIVATE diff --git a/sqlite3.h b/sqlite3.h -index ec451a5..9c01424 100644 +index b9d0692..698c410 100644 --- a/sqlite3.h +++ b/sqlite3.h @@ -32,6 +32,7 @@ diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index ca93d91e2a96dc..5d4a6f987ac200 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -4,7 +4,7 @@ string(REGEX REPLACE "^([0-9]+),0*([0-9][0-9]),0*([0-9][0-9]),0*([0-9][0-9])," " vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2023/sqlite-amalgamation-${SQLITE_VERSION}.zip" FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" - SHA512 241b22899c9090d94677328335588ba964a5bc3bfb278b8dcc97d6062cdfab6460b5b03dc166124f6119f5f8ece62ef9d06298de06eb5b36ed3ea49fd6ddc394 + SHA512 f17810f3b68b7f77a174503a863385a17bac0e9c819b9813cb75597cbd229ae8ad0b545410fc320669f377e79ab8412bbff8863f197d0f804c3a05b573df57e9 ) vcpkg_extract_source_archive( diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index b78b582414f95b..31540cdf3381dc 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlite3", - "version": "3.43.0", + "version": "3.43.1", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", diff --git a/ports/symengine/portfile.cmake b/ports/symengine/portfile.cmake index 3056150551dc82..152d5884ea3988 100644 --- a/ports/symengine/portfile.cmake +++ b/ports/symengine/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO symengine/symengine REF "v${VERSION}" - SHA512 e73f62a87d20b676cac66ce82ac93308b688ed2ac18ebdb6884bae1ae66868e1033e33908e797f86a1906f91b975e8607a02e8932db8550a677f6b41373b7934 + SHA512 076aac35428589c5b3524a46bd939a3a3a7da44b1c866b5f71487678b27b6e48b4da034029f1630881d7713a9252e905411a04b8016c9ec56a608b6de23365ac HEAD_REF master ) @@ -58,4 +58,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/symengine/SymEngineConfig.cm [[${SYMENGINE_CMAKE_DIR}/../../include]] ) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json index 4f3b4d9ba63d27..5fcc271221f3b9 100644 --- a/ports/symengine/vcpkg.json +++ b/ports/symengine/vcpkg.json @@ -1,7 +1,6 @@ { "name": "symengine", - "version": "0.10.1", - "port-version": 1, + "version": "0.11.1", "description": "SymEngine is a fast symbolic manipulation library", "homepage": "https://github.com/symengine/symengine", "license": "BSD-3-Clause", diff --git a/ports/talib/portfile.cmake b/ports/talib/portfile.cmake new file mode 100644 index 00000000000000..f8218aa2bcf9ac --- /dev/null +++ b/ports/talib/portfile.cmake @@ -0,0 +1,82 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO "ta-lib/ta-lib" + REF "${VERSION}" + FILENAME "ta-lib-${VERSION}-msvc.zip" + SHA512 5f211327b6a1d4f00d0a2b9e276adadd118d7aa29fc87c6771d550fda124a863b4a20e3803f325f7c903c82ea12bfb23121a5f0566eeaa434e0f107a6eedb737 +) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(LFLAG "d") +else() + set(LFLAG "m") +endif() + +# Debug build +if (NOT VCPKG_BUILD_TYPE) + vcpkg_execute_build_process( + COMMAND nmake -f Makefile + WORKING_DIRECTORY "${SOURCE_PATH}/c/make/c${LFLAG}d/win32/msvc" + LOGNAME build-${TARGET_TRIPLET}-dbg + ) + + file( + INSTALL "${SOURCE_PATH}/c/lib/ta_abstract_c${LFLAG}d.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME ta_abstract.lib + ) + file( + INSTALL "${SOURCE_PATH}/c/lib/ta_libc_c${LFLAG}d.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME ta_libc.lib + ) + file( + INSTALL "${SOURCE_PATH}/c/lib/ta_func_c${LFLAG}d.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME ta_func.lib + ) + file( + INSTALL "${SOURCE_PATH}/c/lib/ta_common_c${LFLAG}d.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME ta_common.lib + ) +endif() + +# Release build +vcpkg_execute_build_process( + COMMAND nmake -f Makefile + WORKING_DIRECTORY "${SOURCE_PATH}/c/make/c${LFLAG}r/win32/msvc" + LOGNAME build-${TARGET_TRIPLET}-rel +) + +file( + INSTALL "${SOURCE_PATH}/c/lib/ta_abstract_c${LFLAG}r.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME ta_abstract.lib +) +file( + INSTALL "${SOURCE_PATH}/c/lib/ta_libc_c${LFLAG}r.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME ta_libc.lib +) +file( + INSTALL "${SOURCE_PATH}/c/lib/ta_func_c${LFLAG}r.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME ta_func.lib +) +file( + INSTALL "${SOURCE_PATH}/c/lib/ta_common_c${LFLAG}r.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME ta_common.lib +) + +# Include files +file( + INSTALL "${SOURCE_PATH}/c/include" + DESTINATION ${CURRENT_PACKAGES_DIR} + PATTERN Makefile.* EXCLUDE +) + +# License file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT") diff --git a/ports/talib/vcpkg.json b/ports/talib/vcpkg.json new file mode 100644 index 00000000000000..0dc503d9a3810a --- /dev/null +++ b/ports/talib/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "talib", + "version-semver": "0.4.0", + "port-version": 1, + "description": "TA-Lib - Technical Analysis Library", + "homepage": "https://ta-lib.github.io/", + "license": "BSD-2-Clause", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index f90944c83ae44a..a2a9cdb7bc1219 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -2,11 +2,11 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tbb", "version": "2021.10.0", - "port-version": 2, + "port-version": 3, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", - "supports": "(windows & !uwp) | linux | osx | ios | android", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", @@ -20,13 +20,13 @@ "default-features": [ { "name": "hwloc", - "platform": "!static & !osx" + "platform": "!static & !osx & !uwp" } ], "features": { "hwloc": { "description": "Builds TBB with TBBBind support for Hybrid CPUs or NUMA architectures.", - "supports": "!static & !osx", + "supports": "!static & !osx & !uwp", "dependencies": [ "hwloc" ] diff --git a/ports/thomasmonkman-filewatch/portfile.cmake b/ports/thomasmonkman-filewatch/portfile.cmake new file mode 100644 index 00000000000000..e64a4c24c0000f --- /dev/null +++ b/ports/thomasmonkman-filewatch/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ThomasMonkman/filewatch + REF a59891baf375b73ff28144973a6fafd3fe40aa21 + SHA512 9a110b42a499ed7047bb8a79029134943582b388db810974ad6b5f91d1ec720e45a9a3543c4a56ee97d51439f5a34222bada0fb43281dcbc2e65bdee38f836d5 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/FileWatch.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/thomasmonkman-filewatch") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/thomasmonkman-filewatch/vcpkg.json b/ports/thomasmonkman-filewatch/vcpkg.json new file mode 100644 index 00000000000000..8ce8e5bc7a95ea --- /dev/null +++ b/ports/thomasmonkman-filewatch/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "thomasmonkman-filewatch", + "version-date": "2023-01-16", + "description": "File watcher in C++.", + "homepage": "https://github.com/ThomasMonkman/filewatch", + "license": "MIT" +} diff --git a/ports/thorvg/install-tools.patch b/ports/thorvg/install-tools.patch deleted file mode 100644 index 8efcbea700705d..00000000000000 --- a/ports/thorvg/install-tools.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/bin/svg2png/meson.build b/src/bin/svg2png/meson.build -index c9fe63b6..92bfdda4 100644 ---- a/src/bin/svg2png/meson.build -+++ b/src/bin/svg2png/meson.build -@@ -5,4 +5,4 @@ executable('svg2png', - include_directories : headers, - cpp_args : compiler_flags, - install : true, -- link_with : thorvg_lib) -+ link_with : thorvg_lib , install_dir : get_option('bindir')) -\ No newline at end of file -diff --git a/src/bin/svg2tvg/meson.build b/src/bin/svg2tvg/meson.build -index 158376b5..8d960aec 100644 ---- a/src/bin/svg2tvg/meson.build -+++ b/src/bin/svg2tvg/meson.build -@@ -5,4 +5,4 @@ executable('svg2tvg', - include_directories : headers, - cpp_args : compiler_flags, - install : true, -- link_with : thorvg_lib) -+ link_with : thorvg_lib , install_dir : get_option('bindir')) diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index d97c2cf4c1a396..e1657571c6a098 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thorvg/thorvg - REF v0.10.1 - SHA512 8a105f4d854829995799016bb2837ec3c80da1cca0bc1833069a04928d6104677568d1e80fac02a4aa86d1b79b837586366fa28e2d21d43211f31bbb0e79399c + REF v0.11.1 + SHA512 388c3d8bd5099c1e35911dc75ffa6aafc6ea9f1219845ea29dbef91db8c75b2e22b091df4340acc2b44d948cb18fcf8f3a511045ce6ff959a078b350c9a13756 HEAD_REF master PATCHES - install-tools.patch windows-build-option.patch ) @@ -46,4 +45,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index e36e58ca5115b0..8bfed0d78db5c4 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "thorvg", - "version": "0.10.1", - "port-version": 1, + "version": "0.11.1", "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations", "homepage": "https://www.thorvg.org", "license": "MIT", diff --git a/ports/thorvg/windows-build-option.patch b/ports/thorvg/windows-build-option.patch index 84173ce34a378d..db0bc171e9af07 100644 --- a/ports/thorvg/windows-build-option.patch +++ b/ports/thorvg/windows-build-option.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index dff33edb..f8339a3a 100644 +index 363b8c3b..a3cc862d 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ @@ -7,6 +7,6 @@ index dff33edb..f8339a3a 100644 'cpp', - default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14', 'strip=true'], + default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14'], - version : '0.10.1', + version : '0.11.1', license : 'MIT') diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 01af6b41b21f17..6307aae0e162b8 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO libtiff/libtiff REF "v${VERSION}" - SHA512 859331284cd28df56c44644a355ecdd8eece19f0d5cd3e693e37c0fe37115091e46943ffbad784e84af1b39a6fd81cd196af2d4fefe86369258f89050dafaa84 + SHA512 ef2f1d424219d9e245069b7d23e78f5e817cf6ee516d46694915ab6c8909522166f84997513d20a702f4e52c3f18467813935b328fafa34bea5156dee00f66fa HEAD_REF master PATCHES FindCMath.patch @@ -69,22 +69,9 @@ 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/vcpkg.json b/ports/tiff/vcpkg.json index 5efdd811634629..18a1950d5bdbab 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiff", - "version": "4.5.1", - "port-version": 2, + "version": "4.6.0", + "port-version": 1, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": "libtiff", diff --git a/ports/tinygltf/portfile.cmake b/ports/tinygltf/portfile.cmake index 373167a255e8a5..86b654f53c49ab 100644 --- a/ports/tinygltf/portfile.cmake +++ b/ports/tinygltf/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO syoyo/tinygltf - REF "v.${VERSION}" - SHA512 e5309e4018db1c2fde8d5fcf0fef2a0a2fc37fc69524ee3cdc89cbf1a163da42e71c5e2154befe0eaac5d33e345698ff05b1aea6952f2cd18d908787c758d2f9 + REF "v${VERSION}" + SHA512 b745fea9e7291494d3bda225b90885ee7923d8a98f515908f3c3390dc3eb76207b9f7d3464254ef68031d0a8428935064dcf40e9c0f1858bd465c4b5dd660382 HEAD_REF master ) diff --git a/ports/tinygltf/vcpkg.json b/ports/tinygltf/vcpkg.json index 6f0124dffd50c7..1084ba4e261936 100644 --- a/ports/tinygltf/vcpkg.json +++ b/ports/tinygltf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tinygltf", - "version": "2.8.4", + "version": "2.8.17", "description": "A header only C++11 glTF 2.0 library.", "homepage": "https://github.com/syoyo/tinygltf", "dependencies": [ diff --git a/ports/tracy/001-fix-vcxproj-vcpkg.patch b/ports/tracy/001-fix-vcxproj-vcpkg.patch index f712a4974dde15..8baed20b3717ff 100644 --- a/ports/tracy/001-fix-vcxproj-vcpkg.patch +++ b/ports/tracy/001-fix-vcxproj-vcpkg.patch @@ -15,7 +15,7 @@ index 7be39025..ddb49fbc 100644 Fast -- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) +- brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Windows - $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -35,7 +35,7 @@ index 7be39025..ddb49fbc 100644 true true -- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) +- brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Windows - $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib diff --git a/ports/tracy/002-fix-capstone-5.patch b/ports/tracy/002-fix-capstone-5.patch deleted file mode 100644 index 2c9f4c7533b851..00000000000000 --- a/ports/tracy/002-fix-capstone-5.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp -index cc56298..7b9370a 100644 ---- a/server/TracySourceView.cpp -+++ b/server/TracySourceView.cpp -@@ -2,7 +2,7 @@ - #include - #include - --#include -+#include - - #include "imgui.h" - #include "TracyCharUtil.hpp" -diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp -index fcb1718..2433e59 100644 ---- a/server/TracyWorker.cpp -+++ b/server/TracyWorker.cpp -@@ -19,7 +19,7 @@ - #include - #include - --#include -+#include - - #define ZDICT_STATIC_LINKING_ONLY - #include "../zstd/zdict.h" diff --git a/ports/tracy/004-fix-missing-threads-dep.patch b/ports/tracy/004-fix-missing-threads-dep.patch deleted file mode 100644 index 76d5eb64c8bf98..00000000000000 --- a/ports/tracy/004-fix-missing-threads-dep.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d69f71eb..31429d23 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -143,5 +143,11 @@ install(FILES ${common_includes} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common) - install(EXPORT TracyConfig - NAMESPACE Tracy:: -- FILE TracyConfig.cmake -+ FILE TracyTargets.cmake -+ DESTINATION share/Tracy) -+include(CMakePackageConfigHelpers) -+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in -+ "${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake" -+ INSTALL_DESTINATION share/Tracy) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake - DESTINATION share/Tracy) -diff --git a/Config.cmake.in b/Config.cmake.in -new file mode 100644 -index 00000000..fc913ab3 ---- /dev/null -+++ b/Config.cmake.in -@@ -0,0 +1,6 @@ -+@PACKAGE_INIT@ -+ -+include(CMakeFindDependencyMacro) -+find_dependency(Threads REQUIRED) -+ -+include("${CMAKE_CURRENT_LIST_DIR}/TracyTargets.cmake") -\ No newline at end of file diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 827c028b2b1c3e..1bf66f41bb6284 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -7,14 +7,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF v0.9.1 - SHA512 988f492501e5a449ecc89b98d4e8cb6164b65dfe2b5daf17ccc3035f1a477162b77ce7a2cc4c62d7b8a8d530d80f2b439c779319a6bd15b6d37b4a36406d8f4c + REF v0.10 + SHA512 3fc406a42380f6ebe671d560482733f3cdbca16dd7721ac2fce8f1cdefb96ba87701714c2ee8161d65d9e185bc5f9a0fe587a3843eb75f851b10eb895358cb64 HEAD_REF master PATCHES 001-fix-vcxproj-vcpkg.patch - 002-fix-capstone-5.patch 003-fix-imgui-path.patch - 004-fix-missing-threads-dep.patch # https://github.com/wolfpld/tracy/pull/562 005-fix-imgui-path-legacy.patch ) diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 7431305451baba..fd22aa637accb1 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tracy", - "version-semver": "0.9.1", - "port-version": 3, + "version-semver": "0.10.0", "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 9047e9a172a585..7bef5e87dff583 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets REF "v${VERSION}" - SHA512 38022fc555a89654828d872ef2b4ef3a6b01e8eccfe511cb8df37dff772c6c09b379933da73606970ac8581333b3be26ad7b0a8cdec8d19fe05b326fbf4f6c84 + SHA512 f6324663db534a0c70fbe94f77900ac0dedfd837abe091c7bf41c92865309dea01dc91703ac435a2e4d4f71342beb595fabba9477743c932cd1dfee8b2a7c3e2 HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index 221e3f031b99c1..2758a3b13d3bf1 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.45.0", + "version-semver": "20.47.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "license": "Apache-2.0", diff --git a/ports/vc/Fix-internal-func-export.patch b/ports/vc/Fix-internal-func-export.patch deleted file mode 100644 index a06321649dd594..00000000000000 --- a/ports/vc/Fix-internal-func-export.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/support_x86.cpp b/src/support_x86.cpp -index 0ab9669..d5c17ba 100644 ---- a/src/support_x86.cpp -+++ b/src/support_x86.cpp -@@ -58,8 +58,9 @@ static inline bool xgetbvCheck(unsigned int bits) - #endif - } - --Vc_TARGET_NO_SIMD --bool isImplementationSupported(Implementation impl) -+ -+Vc_TARGET_NO_SIMD -+bool Vc_VDECL isImplementationSupported(Vc::Implementation impl) - { - CpuId::init(); - diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake index d185dd587fecbd..91ced9f34e326c 100644 --- a/ports/vc/portfile.cmake +++ b/ports/vc/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VcDevel/Vc - REF 1.4.3 - SHA512 7c0c4ccf8c7c4585334482135f2daf1a5bc088114b880093893583bdcea1fbfcec02485da6059304c510c8b1bb1b768ef04fd7ac8ccb21b9ebbad5d0d5babaef + REF 1.4.4 + SHA512 b8aa0a45637dd1e0cc23f074d023b677aab570dd4a78cff94e4c2d832afb841c1b421077ae9c848a40aa4beb50ed2e31fdf075738496856ff8fe3ea1d0acba07 HEAD_REF 1.4 PATCHES correct_cmake_config_path.patch - Fix-internal-func-export.patch #remove it in next version ) vcpkg_cmake_configure( diff --git a/ports/vc/vcpkg.json b/ports/vc/vcpkg.json index 09bb050102a37f..965a2141462ba4 100644 --- a/ports/vc/vcpkg.json +++ b/ports/vc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vc", - "version": "1.4.3", + "version": "1.4.4", "description": "SIMD Vector Classes for C++ .", "homepage": "https://github.com/VcDevel/Vc", "license": "BSD-3-Clause", diff --git a/ports/webview2/portfile.cmake b/ports/webview2/portfile.cmake index 6a47ad7581f1e7..ed4c7a96db2663 100644 --- a/ports/webview2/portfile.cmake +++ b/ports/webview2/portfile.cmake @@ -2,12 +2,10 @@ if(VCPKG_TARGET_IS_UWP) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) endif() -set(VERSION 1.0.1210.39) - vcpkg_download_distfile(ARCHIVE URLS "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${VERSION}" FILENAME "microsoft.web.webview2.${VERSION}.zip" - SHA512 c87812247a466f4aaeac8be8b32be49166b4ddb5bbf65581d5df81d69eda340e9911144a8dd8401baa6e51f95337001cd18ff90cd36ca0af86cc65227e8e2ccf + SHA512 59d2293d2becb03ed99ab0a70a753adf49d998294d318d331047c2ec7c7dcb163ed84a09ab35765873c2364c3367a8033e2b1a5ad52c5b8e99f8d7a69b8e915e ) vcpkg_extract_source_archive( diff --git a/ports/webview2/vcpkg.json b/ports/webview2/vcpkg.json index 34a407b0e0b92e..22131b61553e9e 100644 --- a/ports/webview2/vcpkg.json +++ b/ports/webview2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "webview2", - "version": "1.0.1210.39", - "port-version": 1, + "version": "1.0.2088.41", "description": "The WebView2 control allows you to embed web technologies (HTML, CSS, and JavaScript) using Microsoft Edge", "homepage": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", "documentation": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index 5663f3cac51179..2a929e4b2cad4d 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -7,6 +7,9 @@ vcpkg_from_github( HEAD_REF master ) +# WIL is header-only, so we don't need to build it in both modes +set(VCPKG_BUILD_TYPE release) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/wil/vcpkg.json b/ports/wil/vcpkg.json index 7a2ef8c7557cef..ebd816c1b63586 100644 --- a/ports/wil/vcpkg.json +++ b/ports/wil/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wil", "version-date": "2023-08-24", + "port-version": 1, "description": "The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.", "homepage": "https://github.com/microsoft/wil", "license": "MIT", diff --git a/ports/winpcap/bison-flex.patch b/ports/winpcap/bison-flex.patch new file mode 100644 index 00000000000000..201de00789598c --- /dev/null +++ b/ports/winpcap/bison-flex.patch @@ -0,0 +1,22 @@ +diff --git a/wpcap/PRJ/build_scanner_parser.bat b/wpcap/PRJ/build_scanner_parser.bat +index 31786d596..54cba739d 100644 +--- a/wpcap/PRJ/build_scanner_parser.bat ++++ b/wpcap/PRJ/build_scanner_parser.bat +@@ -4,7 +4,7 @@ echo Building the libpcap parser and scanner... + del /Q /F ..\libpcap\grammar.c > nul 2> nul + del /Q /F ..\libpcap\tokdefs.h > nul 2> nul + +-bison -y -p pcap_ -d ../libpcap/GRAMMAR.Y > nul ++win_bison -y -p pcap_ -d ../libpcap/GRAMMAR.Y > nul + if not %ERRORLEVEL% == 0 ( + echo failure in generating the grammar. + goto end +@@ -14,7 +14,7 @@ move y.tab.c ..\libpcap\grammar.c + move y.tab.h ..\libpcap\tokdefs.h + + del /Q /F ..\libpcap\scanner.c >/nul 2>/nul +-flex -Ppcap_ -t ../libpcap/scanner.l > ../libpcap/scanner.c ++win_flex -Ppcap_ -t ../libpcap/scanner.l > ../libpcap/scanner.c + + if not %ERRORLEVEL% == 0 ( + echo failure in generating the scanner. diff --git a/ports/winpcap/create_bin.bat b/ports/winpcap/create_bin.bat deleted file mode 100644 index aa9e7f10630485..00000000000000 --- a/ports/winpcap/create_bin.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -IF "%2"=="" (set WPDPACKDESTDIR=.\WpdPack\) ELSE (set WPDPACKDESTDIR=%2) - -IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) - -echo Creating \Lib folder -mkdir %WPDPACKDESTDIR% >nul 2>nul -mkdir %WPDPACKDESTDIR%\Bin >nul 2>nul -mkdir %WPDPACKDESTDIR%\Bin\x64 >nul 2>nul - -xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.dll" %WPDPACKDESTDIR%\Bin\ >nul -xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.dll" %WPDPACKDESTDIR%\Bin\x64 >nul -xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.dll %WPDPACKDESTDIR%\Bin\ >nul -xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.dll %WPDPACKDESTDIR%\Bin\x64 >nul - -echo Folder \Bin created successfully - -set WPDPACKDESTDIR= -set WINPCAPSOURCEDIR= \ No newline at end of file diff --git a/ports/winpcap/create_lib.patch b/ports/winpcap/create_lib.patch deleted file mode 100644 index 8e144fa3d2488e..00000000000000 --- a/ports/winpcap/create_lib.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/create_lib.bat b/create_lib.bat -index dbe511c..d431b88 100644 ---- a/create_lib.bat -+++ b/create_lib.bat -@@ -9,12 +9,10 @@ mkdir %WPDPACKDESTDIR% >nul 2>nul - mkdir %WPDPACKDESTDIR%\Lib >nul 2>nul - mkdir %WPDPACKDESTDIR%\Lib\x64 >nul 2>nul - --xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\PRJ\Release\x86\wpcap.lib %WPDPACKDESTDIR%\Lib\ >nul --xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\PRJ\Release\x64\wpcap.lib %WPDPACKDESTDIR%\Lib\x64 >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul - xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib %WPDPACKDESTDIR%\Lib\ >nul - xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64 >nul --xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\libpacket.a %WPDPACKDESTDIR%\Lib\ >nul --xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\LIB\libwpcap.a %WPDPACKDESTDIR%\Lib\ >nul - - echo Folder \Lib created successfully - diff --git a/ports/winpcap/fix-create-lib-batch.patch b/ports/winpcap/fix-create-lib-batch.patch deleted file mode 100644 index 0a1d9017d007c0..00000000000000 --- a/ports/winpcap/fix-create-lib-batch.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/create_lib.bat b/create_lib.bat -index c70a179..4690d9e 100644 ---- a/create_lib.bat -+++ b/create_lib.bat -@@ -7,10 +7,16 @@ IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) - echo Creating \Lib folder - mkdir %WPDPACKDESTDIR% >nul 2>nul - mkdir %WPDPACKDESTDIR%\Lib >nul 2>nul -+mkdir %WPDPACKDESTDIR%\Lib\debug\ >nul 2>nul - mkdir %WPDPACKDESTDIR%\Lib\x64 >nul 2>nul -+mkdir %WPDPACKDESTDIR%\Lib\x64\debug >nul 2>nul - --xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul --xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\debug\ >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64\debug\ >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul -+xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x86\packet.lib %WPDPACKDESTDIR%\Lib\debug\ >nul -+xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64\debug\ >nul - xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib %WPDPACKDESTDIR%\Lib\ >nul - xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64 >nul - diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index 0f5e9264a84cbc..f693025873dbc5 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -10,9 +10,6 @@ vcpkg_download_distfile(ARCHIVE SHA512 89a5109ed17f8069f7a43497f6fec817c58620dbc5fa506e52069b9113c5bc13f69c307affe611281cb727cfa0f8529d07044d41427e350b24468ccc89a87f33 ) -# MSBuild performs in-source builds, so to ensure reliability we must clear them each time -file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src") - if(VCPKG_CRT_LINKAGE STREQUAL "static") set(CRT_LINKAGE "MT") elseif(VCPKG_CRT_LINKAGE STREQUAL "dynamic") @@ -21,8 +18,10 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LIBRARY_LINKAGE "4") + set(lib_type StaticLibrary) elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LIBRARY_LINKAGE "2") + set(lib_type DynamicLibrary) endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/packetNtx.patch.in" "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" @ONLY) @@ -35,11 +34,13 @@ vcpkg_extract_source_archive( PATCHES "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch" - "${CMAKE_CURRENT_LIST_DIR}/create_lib.patch" - "${CMAKE_CURRENT_LIST_DIR}/fix-create-lib-batch.patch" + "bison-flex.patch" ) -file(COPY "${CURRENT_PORT_DIR}/create_bin.bat" DESTINATION "${SOURCE_PATH}") +file(REMOVE_RECURSE "${SOURCE_PATH}/wpcap/libpcap/rpcapd/win32-pthreads") # avoid copying pthreadVC.lib; TODO: maybe should also use libpcap headers instead of this vendored stuff + +vcpkg_replace_string("${SOURCE_PATH}/wpcap/PRJ/wpcap.vcproj" "DebugInformationFormat=\"4\"" "") +vcpkg_replace_string("${SOURCE_PATH}/wpcap/PRJ/wpcap.vcproj" "DebugInformationFormat=\"3\"" "") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(PLATFORM Win32) @@ -47,6 +48,14 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(PLATFORM x64) endif() +vcpkg_find_acquire_program(BISON) +cmake_path(GET BISON PARENT_PATH BISON_DIR) +vcpkg_add_to_path("${BISON_DIR}") + +vcpkg_find_acquire_program(FLEX) +cmake_path(GET FLEX PARENT_PATH FLEX_DIR) +vcpkg_add_to_path("${FLEX_DIR}") + vcpkg_execute_required_process( COMMAND "devenv.exe" "Packet.sln" @@ -55,10 +64,6 @@ vcpkg_execute_required_process( LOGNAME upgrade-Packet-${TARGET_TRIPLET} ) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - configure_file("${CURRENT_PORT_DIR}/Packet.vcxproj.in" "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.vcxproj" COPYONLY) -endif() - vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "packetNtx/Dll/Project/Packet.sln" @@ -67,15 +72,16 @@ vcpkg_msbuild_install( PLATFORM ${PLATFORM} ) -vcpkg_find_acquire_program(BISON) -vcpkg_find_acquire_program(FLEX) +message(STATUS "Building Scanner/Parser") vcpkg_execute_required_process( COMMAND "${SOURCE_PATH}/wpcap/PRJ/build_scanner_parser.bat" - WORKING_DIRECTORY "${SOURCE_PATH}" + WORKING_DIRECTORY "${SOURCE_PATH}/wpcap/PRJ" LOGNAME build_scanner_parser-${TARGET_TRIPLET} ) +message(STATUS "Building wpcap") + vcpkg_execute_required_process( COMMAND "devenv.exe" "wpcap.sln" @@ -84,9 +90,8 @@ vcpkg_execute_required_process( LOGNAME upgrade-wpcap-${TARGET_TRIPLET} ) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" COPYONLY) -endif() +configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" @ONLY) + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" @@ -124,50 +129,6 @@ file(INSTALL "${SOURCE_PATH}/WpdPack/Include/pcap/vlan.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/pcap") -vcpkg_execute_required_process( - COMMAND "${SOURCE_PATH}/create_lib.bat" - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME create_lib-${TARGET_TRIPLET} -) - -set(PCAP_LIBRARY_PATH "${SOURCE_PATH}/WpdPack/Lib") -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(PCAP_LIBRARY_PATH "${PCAP_LIBRARY_PATH}/x64") -endif() - -file(INSTALL - "${PCAP_LIBRARY_PATH}/Packet.lib" - "${PCAP_LIBRARY_PATH}/wpcap.lib" - DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - -file(INSTALL - "${PCAP_LIBRARY_PATH}/debug/Packet.lib" - "${PCAP_LIBRARY_PATH}/debug/wpcap.lib" - DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_execute_required_process( - COMMAND "${SOURCE_PATH}/create_bin.bat" - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME create_bin-${TARGET_TRIPLET} - ) - - set(PCAP_BINARY_PATH "${SOURCE_PATH}/WpdPack/Bin") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(PCAP_BINARY_PATH "${PCAP_BINARY_PATH}/x64") - endif() - - file(INSTALL - "${PCAP_BINARY_PATH}/Packet.dll" - "${PCAP_BINARY_PATH}/wpcap.dll" - DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - - file(INSTALL - "${PCAP_BINARY_PATH}/Packet.dll" - "${PCAP_BINARY_PATH}/wpcap.dll" - DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.") diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json index 47dc1cdccf2218..7566e334dede60 100644 --- a/ports/winpcap/vcpkg.json +++ b/ports/winpcap/vcpkg.json @@ -1,10 +1,10 @@ { "name": "winpcap", "version": "4.1.3", - "port-version": 11, + "port-version": 12, "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", "homepage": "https://www.winpcap.org", - "supports": "windows", + "supports": "windows & !uwp & !arm & !static", "dependencies": [ { "name": "vcpkg-msbuild", diff --git a/ports/winpcap/wpcap.vcxproj.in b/ports/winpcap/wpcap.vcxproj.in index 5740dec40787be..4fbaf3b8f50a07 100644 --- a/ports/winpcap/wpcap.vcxproj.in +++ b/ports/winpcap/wpcap.vcxproj.in @@ -41,46 +41,46 @@ - StaticLibrary + @lib_type@ v141 MultiByte true - StaticLibrary + @lib_type@ v141 MultiByte - StaticLibrary + @lib_type@ v141 MultiByte true - StaticLibrary + @lib_type@ v141 MultiByte - StaticLibrary + @lib_type@ v141 MultiByte true - StaticLibrary + @lib_type@ v141 MultiByte - StaticLibrary + @lib_type@ v141 MultiByte true - StaticLibrary + @lib_type@ v141 MultiByte @@ -165,11 +165,11 @@ MultiThreadedDebug Level3 - EditAndContinue + None ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Debug\x86;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories) false wpcap.def true @@ -190,11 +190,10 @@ MultiThreadedDebug Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Debug\x64;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories) false wpcap.def true @@ -209,11 +208,10 @@ MultiThreaded Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Release\x86;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories) wpcap.def true Windows @@ -232,11 +230,10 @@ MultiThreaded Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Release\x64;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories) wpcap.def true Windows @@ -255,11 +252,11 @@ MultiThreadedDebug Level3 - EditAndContinue + None ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Debug\x86;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories) false wpcap.def true @@ -283,11 +280,10 @@ MultiThreadedDebug Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Debug\x64;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories) false wpcap.def true @@ -302,11 +298,10 @@ MultiThreaded Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Release\x86;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories) wpcap.def true Windows @@ -328,11 +323,10 @@ MultiThreaded Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Release\x64;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories) wpcap.def true Windows diff --git a/ports/wxwidgets/fix-nanosvg.patch b/ports/wxwidgets/fix-nanosvg.patch deleted file mode 100644 index fd48cf3f7987f2..00000000000000 --- a/ports/wxwidgets/fix-nanosvg.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git "a/build/cmake/config.cmake" "b/build/cmake/config.cmake" -index b68d167dac..5de1fd19ad 100644 ---- "a/build/cmake/config.cmake" -+++ "b/build/cmake/config.cmake" -@@ -40,6 +40,14 @@ macro(wx_get_dependencies var lib) - else() - get_target_property(dep_name ${dep} OUTPUT_NAME) - endif() -+ if(NOT dep_name) -+ set(prop_suffix) -+ if (CMAKE_BUILD_TYPE) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" prop_suffix) -+ set(prop_suffix "_${prop_suffix}") -+ endif() -+ get_target_property(dep_name ${dep} LOCATION${prop_suffix}) -+ endif() - else() - # For the value like $<$:LIB_PATH> - # Or $<$>:LIB_PATH> diff --git a/ports/wxwidgets/fix_include.patch b/ports/wxwidgets/fix_include.patch deleted file mode 100644 index e146a2e178e1f1..00000000000000 --- a/ports/wxwidgets/fix_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h -index 8c57520e1..54ffb27d2 100644 ---- a/src/stc/scintilla/include/Scintilla.h -+++ b/src/stc/scintilla/include/Scintilla.h -@@ -27,7 +27,7 @@ int Scintilla_LinkLexers(void); - #endif - - // Include header that defines basic numeric types. --#if defined(_MSC_VER) -+#if defined(_MSC_VER) && !defined(__clang__) - // Older releases of MSVC did not have stdint.h. - #include - #elif defined( __VMS ) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index a23934b425a7d6..10e6e93ac0d815 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets REF "v${VERSION}" - SHA512 8ff645fe7ee97bf6358b3619efd737ef8f9eb0235ca481e921a64d451c45eb9671ee4e2807fea285153bc0bb434266234f6f4ab15f396bb8290f262fa879e9b3 + SHA512 d9cfad429c5c160944cd9c23c3a32ca72740e2d25d7392a06c22374bcbdd099affee5f541d59ac4a9983fb3d82f90bda7eaf92a93a1e8b5ace2c5bf29962ed53 HEAD_REF master PATCHES install-layout.patch @@ -12,8 +12,6 @@ vcpkg_from_github( fix-pcre2.patch gtk3-link-libraries.patch sdl2.patch - fix_include.patch - fix-nanosvg.patch ) vcpkg_check_features( @@ -191,4 +189,4 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/licence.txt") diff --git a/ports/wxwidgets/relocatable-wx-config.patch b/ports/wxwidgets/relocatable-wx-config.patch index 8a5e7c4d5bc69e..608c9c5469de73 100644 --- a/ports/wxwidgets/relocatable-wx-config.patch +++ b/ports/wxwidgets/relocatable-wx-config.patch @@ -1,17 +1,8 @@ diff --git a/wx-config.in b/wx-config.in -index 441f88c..b326867 100755 +index 4df8571..a90db3d 100644 --- a/wx-config.in +++ b/wx-config.in -@@ -91,7 +91,7 @@ EOF - - - # Contentious tools determined by configure. --EGREP="@EGREP@" -+EGREP="grep -E" # no absolute path from host - - - # For the people who know what they want, or think they do: -@@ -402,8 +402,23 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } +@@ -398,8 +398,23 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } # Determine the base directories we require. @@ -37,7 +28,7 @@ index 441f88c..b326867 100755 wxconfdir="@libdir@/wx/config" installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` -@@ -940,6 +949,9 @@ prefix=${this_prefix-$prefix} +@@ -936,6 +951,9 @@ prefix=${this_prefix-$prefix} exec_prefix=${this_exec_prefix-$exec_prefix} includedir="@includedir@" diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 4cdeb6b33988b0..14f297ebd4952b 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wxwidgets", - "version": "3.2.2.1", - "port-version": 3, + "version": "3.2.3", "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", diff --git a/ports/x86-simd-sort/portfile.cmake b/ports/x86-simd-sort/portfile.cmake index 5d5b2f8720c4d0..287f17ee6909ae 100644 --- a/ports/x86-simd-sort/portfile.cmake +++ b/ports/x86-simd-sort/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/x86-simd-sort - REF 7d7591cf5927e83e4a1e7c4b6f2c4dc91a97889f - SHA512 6b71f25e0ec1adcd81a6ce3ecf60316a841c48d9b438ae2afde9b2a17a90d13047cb1d7bce7dcecf15718f4fb299adad7875b022b57f90965f5e7a25e16e6721 + REF "v${VERSION}" + SHA512 9713413b5d368cdcc066db6161a63ffe35e1d8986f417c88cb1eb91426c8b9aec4481c4dac003b8721c279575d79e7b1182c7ea78dcbdb96e41b04863a715284 HEAD_REF master ) diff --git a/ports/x86-simd-sort/vcpkg.json b/ports/x86-simd-sort/vcpkg.json index 7802f4f1d913a2..55b946107c17be 100644 --- a/ports/x86-simd-sort/vcpkg.json +++ b/ports/x86-simd-sort/vcpkg.json @@ -1,6 +1,6 @@ { "name": "x86-simd-sort", - "version-date": "2023-03-04", + "version": "3.0", "description": "C++ header file library for high-performance SIMD-based sorting algorithms for primitive datatypes", "homepage": "https://github.com/intel/x86-simd-sort", "license": "BSD-3-Clause" diff --git a/ports/xbyak/portfile.cmake b/ports/xbyak/portfile.cmake index 1fb5618dfbd1b9..916e9fa400a984 100644 --- a/ports/xbyak/portfile.cmake +++ b/ports/xbyak/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak - REF v6.69 - SHA512 c202e5c3688c4dc8cd26d4371c511ffc0fd0885c4d31a6a5fa955c39ae6fcc98f5f0ac2b88c087e10b71b24a91c0e7f082683cd6be67c29a19170723d966a585 + REF "v${VERSION}" + SHA512 1af11bea9e75b9b2842197e52d21283fc5ea7ea3ae1034a3e4584e6ca7b364a60589675a0b171d4ff205029730948b91d353f13d11d52c07f1befedc106971b2 HEAD_REF master ) diff --git a/ports/xbyak/vcpkg.json b/ports/xbyak/vcpkg.json index 2e919bb187b03e..5065390016e0d8 100644 --- a/ports/xbyak/vcpkg.json +++ b/ports/xbyak/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xbyak", - "version": "6.69", + "version": "6.73", "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", "license": "BSD-3-Clause", diff --git a/scripts/Get-Changelog.ps1 b/scripts/Get-Changelog.ps1 deleted file mode 100644 index 1a804f9795a1f3..00000000000000 --- a/scripts/Get-Changelog.ps1 +++ /dev/null @@ -1,498 +0,0 @@ -#Requires -Version 5.0 -# We are not using Powershell >= 6.0, as the only supported debugger (vscode powershell extension) breaks on complex code. See: https://github.com/PowerShell/PowerShellEditorServices/issues/1295 -# This code can be run on PowerShell Core on any platform, but it is recommend to debug this code in Windows PowerShell ISE unless debugging happens to "just work" on your machine. -# Expect the fix to be out at around the end of 2020/beginning of 2021, at which point consider upgrading this script to PowerShell 7 the next time maintenance is necessary. -# -- Griffin Downs 2020-12-15 (@grdowns) - -using namespace System.Management.Automation -using namespace System.Collections.Generic - -<# -.SYNOPSIS - Changelog generator for vcpkg. -.DESCRIPTION - The changelog generator uses GitHub's Pull Request and Files API to get - pull requests and their associated file changes over the provided date range. - Then, the data is processed into buckets which are presented to the user - as a markdown file. -.EXAMPLE - Get-Changelog -.EXAMPLE - Get-Changelog -StartDate 11/1/20 -EndDate 12/1/20 -.EXAMPLE - $cred = Get-Credential - Get-Changelog -Credentials $cred -.OUTPUTS - A "CHANGELOG.md" file in the working directory. If the file already exists, - suffix is added to the filename and a new file is created to prevent overwriting. -#> -[CmdletBinding(PositionalBinding=$True)] -Param ( - # The begin date range (inclusive) - [Parameter(Mandatory=$True, Position=0)] - [ValidateScript({$_ -le (Get-Date)})] - [DateTime]$StartDate, - - # The end date range (exclusive) - [Parameter(Mandatory, Position=1)] - [ValidateScript({$_ -le (Get-Date)})] - [DateTime]$EndDate, - - [Parameter(Mandatory=$True)] - [String]$OutFile, - - # GitHub credentials (username and PAT) - [Parameter()] - [Credential()] - [PSCredential]$Credentials -) - -Set-StrictMode -Version 2 - -if (-not $Credentials) { - $Credentials = Get-Credential -Message 'Enter GitHub Credentials (username and PAT)' - if (-not $Credentials) { - throw [System.ArgumentException]::new( - 'Cannot process command because of the missing mandatory parameter: Credentials.' - ) - } -} - -function Get-AuthHeader() { - [CmdletBinding()] - Param( - [Parameter(Mandatory=$True)] - [Credential()] - [PSCredential]$Credentials - ) - @{ Authorization = 'Basic ' + [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes( - "$($Credentials.UserName):$($Credentials.GetNetworkCredential().Password)")) } -} - -$response = Invoke-WebRequest -uri 'https://api.github.com' -Headers (Get-AuthHeader $Credentials) -if ('X-OAuth-Scopes' -notin $response.Headers.Keys) { - throw [System.ArgumentException]::new( - "Cannot validate argument on parameter 'Credentials'. Incorrect GitHub credentials" - ) -} - - -function Get-MergedPullRequests { - [CmdletBinding()] - [OutputType([Object[]])] - Param( - [Parameter(Mandatory=$True, Position=0)] - [ValidateScript({$_ -le (Get-Date)})] - [DateTime]$StartDate, - - # The end date range (exclusive) - [Parameter(Mandatory, Position=1)] - [ValidateScript({$_ -le (Get-Date)})] - [DateTime]$EndDate, - - [Parameter(Mandatory=$True)] - [Credential()] - [PSCredential]$Credentials - ) - Begin { - $RequestSplat = @{ - Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls' - Body = @{ - state = 'closed' - sort = 'updated' - base = 'master' - per_page = 100 - direction = 'desc' - page = 1 - } - } - $Epoch = Get-Date -AsUTC - $DeltaEpochStart = ($Epoch - $StartDate).Ticks - - $ProgressSplat = @{ - Activity = "Searching for merged Pull Requests in date range: $($StartDate.ToString('yyyy-MM-dd')) - $($EndDate.ToString('yyyy-MM-dd'))" - PercentComplete = 0 - } - - Write-Progress @ProgressSplat - - $writeProgress = { - $ProgressSplat.PercentComplete = 100 * ($Epoch - $_.updated_at).Ticks / $DeltaEpochStart - Write-Progress @ProgressSplat -Status "Current item date: $($_.updated_at.ToString('yyyy-MM-dd'))" - } - } - Process { - while ($True) { - $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @RequestSplat | ConvertFrom-Json - - foreach ($_ in $response) { - foreach ($x in 'created_at', 'merged_at', 'updated_at', 'closed_at') { - if ($_.$x) { $_.$x = [DateTime]::Parse($_.$x, - [System.Globalization.CultureInfo]::InvariantCulture, - [System.Globalization.DateTimeStyles]::AdjustToUniversal -bor [System.Globalization.DateTimeStyles]::AssumeUniversal) } - } - - if (-not $_.merged_at) { continue } - if ($_.updated_at -lt $StartDate) { return } - - &$WriteProgress - - if ($_.merged_at -ge $EndDate -or $_.merged_at -lt $StartDate) { continue } - - $_ - } - - $RequestSplat.Body.page++ - } - } -} - - -class PRFileMap { - [Object]$Pull - [Object[]]$Files -} - - -function Get-PullRequestFileMap { - [CmdletBinding()] - [OutputType([PRFileMap[]])] - Param ( - [Parameter(Mandatory=$True,ValueFromPipeline=$True)] - [Object]$Pull, - [Parameter(Mandatory=$True)] - [Credential()] - [PSCredential]$Credentials - ) - Begin { - $Pulls = [List[Object]]::new() - - $ProgressSplat = @{ - Activity = 'Getting Pull Request files' - PercentComplete = 0 - } - - $Count = 0 - $WriteProgress = { - $ProgressSplat.Status = 'Getting files for: #{0} ({1}/{2})' -f $_.number, $Count, $Pulls.Length - $ProgressSplat.PercentComplete = 100 * $Count / $Pulls.Length - Write-Progress @ProgressSplat - } - } - Process { - $Pulls += $Pull - } - End { - Write-Progress @ProgressSplat - $ProgressSplat += @{ Status = '' } - - $Pulls | ForEach-Object { - $Count++ - - [PRFileMap]@{ - Pull = $_ - Files = $( - $requestSplat = @{ - Uri = 'https://api.github.com/repos/Microsoft/vcpkg/pulls/{0}/files' -f $_.number - Body = @{ page = 0; per_page = 100 } - } - do { - $requestSplat.Body.page++ - - $response = Invoke-WebRequest -Headers (Get-AuthHeader $Credentials) @requestSplat | ConvertFrom-Json - - $response - } until ($response.Length -lt $requestSplat.Body.per_page) - ) - } - - &$WriteProgress - } - } -} - - -class DocumentationUpdate { - [String]$Path - [Boolean]$New - [List[Object]]$Pulls -} - - -function Select-Documentation { - [CmdletBinding()] - [OutputType([DocumentationUpdate])] - Param ( - [Parameter(Mandatory=$True,ValueFromPipeline=$True)] - [PRFileMap]$PRFileMap - ) - Begin { - $UpdatedDocumentation = @{} - } - Process { - $PRFileMap.Files | ForEach-Object { - if ($_.filename -notlike 'docs/*') { return } - - $new = $_.status -eq 'added' - if ($entry = $UpdatedDocumentation[$_.filename]) { - $entry.Pulls += $PRFileMap.Pull - $entry.New = $entry.New -or $new - } else { - $UpdatedDocumentation[$_.filename] = @{ - Pulls = [List[Object]]::new(@($PRFileMap.Pull)) - New = $new - } - } - } - } - End { - $UpdatedDocumentation.GetEnumerator() | ForEach-Object { - [DocumentationUpdate]@{ - Path = $_.Key - Pulls = $_.Value.Pulls - New = $_.Value.New - } - } - } -} - - -function Select-InfrastructurePullRequests { - [CmdletBinding()] - [OutputType([Object])] - Param ( - [Parameter(Mandatory=$True,ValueFromPipeline=$True)] - [PRFileMap]$PRFileMap - ) - Process { - switch -Wildcard ($PRFileMap.Files | Foreach-Object {$_.filename}) { - "docs/*" { continue } - "ports/*" { continue } - "versions/*" { continue } - "scripts/ci.baseline.txt" { continue } - Default { return $PRFileMap.Pull } - } - } -} - - -class Version { - [String]$Begin - [String]$End - [String]$BeginPort - [String]$EndPort -} - - -function Select-Version { - [CmdletBinding()] - [OutputType([Version])] - Param ( - [Parameter(Mandatory=$True,ValueFromPipeline=$True)] - [Object]$VersionFile - ) - Begin { - $V = [Version]@{} - } - Process { - $regex = switch ($VersionFile.filename | Split-Path -Leaf) { - 'CONTROL' { - '(?^[\+|\-]|)(?Version|[\+|\-]Port-Version):\s(?\S+)' - } - 'vcpkg.json' { - '(?^[\+|\-]|)\s*(\"(?version|version-date|version-string|version-semver)\":\s\"(?.+)\"|\"(?port-version)\":\s(?.+))' - } - Default { return } - } - - $VersionFile.Patch -split '\n' | ForEach-Object { - if ($_ -notmatch $regex) { return } - - $m = $Matches - switch -Wildcard ($m.operation + $m.field) { - 'Version*' { $V.Begin = $V.End = $m.version } - '-Version*' { $V.Begin = ($V.Begin, $m.version | Measure-Object -Minimum).Minimum } - '+Version*' { $V.End = ($V.End, $m.version | Measure-Object -Minimum).Minimum } - 'Port-Version' { $V.BeginPort = $V.EndPort = $m.version } - '-Port-Version' { $V.BeginPort = ($V.BeginPort, $m.version | Measure-Object -Minimum).Minimum } - '+Port-Version' { $V.EndPort = ($V.EndPort, $m.version | Measure-Object -Maximum).Maximum } - } - } - } - End { - if (-not $V.Begin) { $V.Begin = $V.End } - elseif (-not $V.End) { $V.End = $V.Begin } - - if (-not $V.BeginPort) { $V.BeginPort = '0' } - if (-not $V.EndPort) { $V.EndPort = '0' } - - $V - } -} - - -class PortUpdate { - [String]$Port - [Object[]]$Pulls - [Version]$Version - [Boolean]$New -} - - -function Select-UpdatedPorts { - [CmdletBinding()] - [OutputType([PortUpdate])] - Param ( - [Parameter(Mandatory=$True,ValueFromPipeline=$True)] - [PRFileMap]$PRFileMap - ) - Begin { - $ModifiedPorts = @{} - } - Process { - $PRFileMap.Files | Where-Object { - $_.filename -like 'ports/*/CONTROL' -or - $_.filename -like 'ports/*/vcpkg.json' - } | ForEach-Object { - $port = $_.filename.split('/')[1] - if ($entry = $ModifiedPorts[$port]) { - $entry.VersionFiles += $_ - if (-not $entry.Pulls.Contains($PRFileMap.Pull)) { $entry.Pulls += $PRFileMap.Pull } - } else { - $ModifiedPorts[$port] = @{ - VersionFiles = [List[Object]]::new(@($_)) - Pulls = [List[Object]]::new(@($PRFileMap.Pull)) - } - } - } - } - End { - $ModifiedPorts.GetEnumerator() | ForEach-Object { - $versionFiles = $_.Value.VersionFiles - if (-not ($versionChange = $versionFiles | Select-Version)) { return } - - function Find-File($x) { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" }) } - function Find-NewFile($x) - { [bool]($versionFiles | Where-Object { $_.filename -like "*$x" -and $_.status -eq 'added' }) } - - [PortUpdate]@{ - Port = $_.Key - Pulls = $_.Value.Pulls - Version = $versionChange - New = (Find-NewFile 'CONTROL') -or (-not (Find-File 'CONTROL') -and (Find-NewFile 'vcpkg.json')) - } - } - } -} - -$MergedPRs = Get-MergedPullRequests -StartDate $StartDate -EndDate $EndDate -Credentials $Credentials -$MergedPRsSorted = $MergedPRs | Sort-Object -Property 'number' -$PRFileMaps = $MergedPRsSorted | Get-PullRequestFileMap -Credentials $Credentials - -$sortSplat = @{ Property = - @{ Expression = 'New'; Descending = $True }, @{ Expression = 'Path'; Descending = $False } } -$UpdatedDocumentation = $PRFileMaps | Select-Documentation | Sort-Object @sortSplat -$UpdatedInfrastructure = $PRFileMaps | Select-InfrastructurePullRequests -$UpdatedPorts = $PRFileMaps | Select-UpdatedPorts -$NewPorts = $UpdatedPorts | Where-Object { $_.New } -$ChangedPorts = $UpdatedPorts | Where-Object { -not $_.New } - -Write-Progress -Activity 'Selecting updates from pull request files' -Completed - -Write-Progress -Activity 'Writing changelog file' -PercentComplete -1 - -$output = @" -vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToString('yyyy.MM.dd'))) ---- -#### Total port count: -#### Total port count per triplet (tested) (tentative): LINK TO BUILD -|triplet|ports available| -|---|---| -|x86-windows|NUM| -|**x64-windows**|NUM| -|x64-windows-static|NUM| -|x64-windows-static-md|NUM| -|x64-uwp|NUM| -|arm64-windows|NUM| -|arm64-uwp|NUM| -|**x64-osx**|NUM| -|**x64-linux**|NUM| - -"@ - -if ($UpdatedDocumentation) { - $output += @" -#### The following documentation has been updated: - -$(-join ($UpdatedDocumentation | Sort-Object -Property 'Path' | ForEach-Object { - $PathWithoutDocs = ([string]$_.Path).Remove(0, 5) # 'docs/' - "- [{0}](https://github.com/microsoft/vcpkg/blob/master/docs/{0}){1}`n" -f $PathWithoutDocs, ($(if ($_.New) { ' ***[NEW]***' } else { '' })) - - $_.Pulls | ForEach-Object { - " - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number - } -})) - -"@ -} - -if ($NewPorts) { - $output += @" -
-The following $($NewPorts.Length) ports have been added: - -|port|version| -|---|---| -$(-join ($NewPorts | Sort-Object -Property 'Port' | ForEach-Object { - "|[{0}]({1})" -f $_.Port, $_.Pulls[0].html_url - - if ($_.Pulls.Length -gt 1 ) { - '' - $_.Pulls[1..($_.Pulls.Length - 1)] | ForEach-Object { - " #{0}" -f $_.number - } - '' - } - - "|{0}`n" -f $_.Version.End -})) -
- -"@ -} - -if ($ChangedPorts) { - $output += @" -
-The following $($ChangedPorts.Length) ports have been updated: - -$(-join ($ChangedPorts | Sort-Object -Property 'Port' | ForEach-Object { - "- {0} ``{1}#{2}``" -f $_.Port, $_.Version.Begin, $_.Version.BeginPort - ' -> ' - "``{0}#{1}```n" -f $_.Version.End, $_.Version.EndPort - - $_.Pulls | ForEach-Object { - " - {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number - } -})) -
- -"@ -} - -if ($UpdatedInfrastructure) { - $output += @" -
-The following additional changes have been made to vcpkg's infrastructure: - -$(-join ($UpdatedInfrastructure | ForEach-Object { - "- {0} (by @{1}, in #{2})`n" -f $_.title, $_.user.login, $_.number -})) -
- -"@ -} - -Set-Content -Value $Output -Path $OutFile - -Write-Progress -Activity 'Writing changelog file' -Completed diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index d14d2aec155242..dd6094c4b90016 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -4,9 +4,9 @@ variables: android-pool: 'PrAnd-1ES-Pool' linux-pool: 'PrLin-1ES-Pool' - windows-pool: 'PrWin-2023-09-13' + windows-pool: 'PrWin-2023-10-11' osx-pool: 'PrOsx-2023-09-11' - linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-09-13' + linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-10-11' parameters: - name: vcpkgToolSha diff --git a/scripts/azure-pipelines/linux/changing-linux-packages.md b/scripts/azure-pipelines/linux/changing-linux-packages.md new file mode 100644 index 00000000000000..f8b5f8265b016f --- /dev/null +++ b/scripts/azure-pipelines/linux/changing-linux-packages.md @@ -0,0 +1,3 @@ +- [ ] Update `provision-image.sh` to add the new apt package. +- [ ] Update `managed-image.json` to add the new apt package to the very long line of packages. +- [ ] Update the managed image named CPP_GITHUB\PrLin-1ES\PrLin-1ESImage by copying the contents of `managed-image.json` to the Settings\Image text box. diff --git a/scripts/azure-pipelines/linux/managed-image.json b/scripts/azure-pipelines/linux/managed-image.json index b26239528ed3de..090ae8a90ff7cc 100644 --- a/scripts/azure-pipelines/linux/managed-image.json +++ b/scripts/azure-pipelines/linux/managed-image.json @@ -3,7 +3,7 @@ { "name": "linux-install-packages", "parameters": { - "packages": "git curl zip unzip tar at libxt-dev gperf libxaw7-dev cifs-utils build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full pkg-config meson nasm cmake ninja-build libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-cursor-dev libkrb5-dev libxcb-res0-dev libxcb-keysyms1-dev libxcb-xkb-dev libxcb-record0-dev python3-setuptools python3-mako python3-pip python3-venv nodejs libwayland-dev python-is-python3 guile-2.2-dev libxdamage-dev libdbus-1-dev libxtst-dev haskell-stack golang-go" + "packages": "git curl zip unzip tar at libxt-dev gperf libxaw7-dev cifs-utils build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full pkg-config meson nasm cmake ninja-build libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-cursor-dev libkrb5-dev libxcb-res0-dev libxcb-keysyms1-dev libxcb-xkb-dev libxcb-record0-dev python3-setuptools python3-mako python3-pip python3-venv nodejs libwayland-dev python-is-python3 guile-2.2-dev libxdamage-dev libdbus-1-dev libxtst-dev haskell-stack golang-go wayland-protocols" } }, { diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 9a280d2b328bac..28ad54864333cd 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -91,6 +91,9 @@ APT_PACKAGES="$APT_PACKAGES haskell-stack" ## required by boringssl APT_PACKAGES="$APT_PACKAGES golang-go" +## required by libdecor +APT_PACKAGES="$APT_PACKAGES wayland-protocols" + ## CUDA APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-1 cuda-libraries-dev-12-1 cuda-driver-dev-12-1 \ cuda-cudart-dev-12-1 libcublas-12-1 libcurand-dev-12-1 cuda-nvml-dev-12-1 libcudnn8-dev libnccl2 \ diff --git a/scripts/azure-pipelines/patch-tuesday-checklist.md b/scripts/azure-pipelines/patch-tuesday-checklist.md index 1ceb337444469f..cb5857467aabc3 100644 --- a/scripts/azure-pipelines/patch-tuesday-checklist.md +++ b/scripts/azure-pipelines/patch-tuesday-checklist.md @@ -1,22 +1,36 @@ ## First time machine setup: * [ ] Install Azure PowerShell: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps +* [ ] Run `Connect-AzAccount -Subscription CPP_GITHUB` * [ ] Install Docker ## Each Patch Tuesday: * [ ] Check for depends:vm-update PRs and make relevant changes if possible. -* [ ] Check for Service 360 alerts about vulnerable software we are installing in the VMs and - update that. (Most often PowerShell needs to be updated to the current 7.2.x release) +* [ ] Check for Service 360 alerts (possibly at https://aka.ms/s360 ?) against the service named + "C++ VCPKG Validation" about vulnerable software we are installing in the VMs and update that. + (Most often PowerShell needs to be updated) +* [ ] Check for any other software for the Windows images we wish to update and make the edits to do + so in `scripts/azure-pipelines/windows` * [ ] Run android/create-docker-image.ps1 * [ ] Update azure-pipelines.yml to point to the new linux docker image from Azure Container Registry * [ ] Run windows/create-image.ps1 * [ ] Run windows/create-vmss.ps1 * [ ] Create new pools for these in Azure DevOps: https://dev.azure.com/vcpkg/public/_settings/agentqueues * Windows: 22 agents + * Make sure to check 'Grant access permission to all pipelines' * [ ] Update azure-pipelines.yml to point to the new pools. * [ ] Submit PR with those changes. * [ ] Submit a full CI rebuild with those changes: https://dev.azure.com/vcpkg/public/_build?definitionId=29 refs/pull/NUMBER/head +* [ ] Look at that and compare with recent build and resolve anything that's not an existing baseline issue. +* [ ] Merge the PR. +* [ ] Update the managed image for compiler testing and delete unused images. + * CPP_GITHUB\vcpkg-image-minting\PrWinEA + * Standard HDD LRS + * East Asia, 1 Replica + * West US 2, 1 Replica + * West US 3, 1 Replica +* [ ] After the last build finishes on the previous pool, delete it in the Azure Devops *Organization* UI and its Resource Group. ( https://dev.azure.com/vcpkg/_settings/agentpools ?) * [ ] Run `generate-sas-tokens.ps1` and update the relevant libraries on dev.azure.com/vcpkg and devdiv.visualstudio.com. -* [ ] Mint a new macOS base box. +* [ ] Mint a new macOS base box. (See instructions in `scripts/azure-pipelines/osx/README.md`) * [ ] Deploy the new base box to all hosts. diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 1d22346945a8cc..9a5a02afc506fa 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.6/PowerShell-7.3.6-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.8/PowerShell-7.3.8-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index a669d0635d931c..ca33285129e6e3 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -26,6 +26,8 @@ $defaultPortVersion = 0 $portVersions = @{ 'boost' = 1; 'boost-fiber' = 1; + 'boost-iostreams' = 1; + 'boost-modular-build-helper' = 1; } function Get-PortVersion { diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 6747a2a444da1c..8ae279069d91b6 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -268,6 +268,39 @@ else() set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED CMAKE_OSX_ARCHITECTURES) + list(LENGTH CMAKE_OSX_ARCHITECTURES Z_VCPKG_OSX_ARCH_COUNT) + if(Z_VCPKG_OSX_ARCH_COUNT EQUAL "0") + message(WARNING "Unable to determine target architecture. " + "Consider providing a value for the CMAKE_OSX_ARCHITECTURES cache variable. " + "Continuing without vcpkg.") + set(VCPKG_TOOLCHAIN ON) + cmake_policy(POP) + return() + endif() + + if(Z_VCPKG_OSX_ARCH_COUNT GREATER "1") + message(WARNING "Detected more than one target architecture. Using the first one.") + endif() + list(GET CMAKE_OSX_ARCHITECTURES "0" Z_VCPKG_OSX_TARGET_ARCH) + if(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64s") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64s) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7s") + set(Z_VCPKG_TARGET_TRIPLET_ARCH armv7s) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "x86_64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "i386") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) + else() + message(WARNING "Unable to determine target architecture, continuing without vcpkg.") + set(VCPKG_TOOLCHAIN ON) + cmake_policy(POP) + return() + endif() else() find_program(Z_VCPKG_CL cl) if(Z_VCPKG_CL MATCHES "amd64/cl.exe$" OR Z_VCPKG_CL MATCHES "x64/cl.exe$") @@ -278,39 +311,6 @@ else() set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) elseif(Z_VCPKG_CL MATCHES "bin/cl.exe$" OR Z_VCPKG_CL MATCHES "x86/cl.exe$") set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED CMAKE_SYSTEM_NAME AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") - list(LENGTH CMAKE_OSX_ARCHITECTURES Z_VCPKG_OSX_ARCH_COUNT) - if(Z_VCPKG_OSX_ARCH_COUNT EQUAL "0") - message(WARNING "Unable to determine target architecture. " - "Consider providing a value for the CMAKE_OSX_ARCHITECTURES cache variable. " - "Continuing without vcpkg.") - set(VCPKG_TOOLCHAIN ON) - cmake_policy(POP) - return() - endif() - - if(Z_VCPKG_OSX_ARCH_COUNT GREATER "1") - message(WARNING "Detected more than one target architecture. Using the first one.") - endif() - list(GET CMAKE_OSX_ARCHITECTURES "0" Z_VCPKG_OSX_TARGET_ARCH) - if(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64") - set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64s") - set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64s) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7s") - set(Z_VCPKG_TARGET_TRIPLET_ARCH armv7s) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7") - set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "x86_64") - set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "i386") - set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) - else() - message(WARNING "Unable to determine target architecture, continuing without vcpkg.") - set(VCPKG_TOOLCHAIN ON) - cmake_policy(POP) - return() - endif() elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ec3f2591e0e5ee..f479f3d607736a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -59,7 +59,6 @@ arrayfire:x64-osx=fail allegro5:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail -assimp:arm-neon-android=fail avro-c:arm-neon-android=fail avro-c:arm64-android=fail avro-c:x64-android=fail @@ -115,7 +114,6 @@ caf:arm64-android=fail caf:x64-android=fail caf:x64-uwp=fail caffe2:x86-windows=fail -caffe2:arm64-windows=fail cairo:x64-android=fail # file conflict with dbg-macro c-dbg-macro:x86-windows=skip @@ -201,9 +199,6 @@ lapack-reference:x64-uwp=skip clblas:arm-neon-android=fail clblas:arm64-android=fail clblas:x64-android=fail -clblast:arm-neon-android=fail -clblast:arm64-android=fail -clblast:x64-android=fail clockutils:arm-neon-android=fail clockutils:arm64-android=fail clockutils:x64-android=fail @@ -251,18 +246,12 @@ cppslippi:x64-android=fail cppslippi:x64-linux=fail cppslippi:x64-osx=fail cppcoro:x64-linux=fail -cpptoml:arm-neon-android=fail -cpptoml:arm64-android=fail -cpptoml:x64-android=fail cpputest:arm-neon-android=fail crashpad:x64-linux=fail cserialport:arm-neon-android=fail cserialport:arm64-android=fail cserialport:x64-android=fail ctbench:x64-osx=fail -cubeb:arm-neon-android=fail -cubeb:arm64-android=fail -cubeb:x64-android=fail czmq:arm-neon-android=fail czmq:arm64-android=fail czmq:x64-android=fail @@ -295,6 +284,7 @@ directxsdk:x64-windows=skip directxsdk:x64-windows-static-md=skip discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail +discordcoreapi:x64-osx=fail discount:x64-android=fail dlib:arm64-uwp=fail dlib:x64-uwp=fail @@ -319,10 +309,8 @@ evpp:arm64-android=fail evpp:x64-android=fail faiss:arm64-windows=fail fastrtps:arm-neon-android=fail -fastrtps:arm64-uwp=fail fastrtps:arm64-android=fail fastrtps:x64-android=fail -fastrtps:x64-uwp=fail fastrtps:x64-windows-static-md=fail fastrtps:x64-windows-static=fail fdk-aac:arm-neon-android=fail @@ -356,9 +344,6 @@ fmi4cpp:arm64-uwp=fail fmi4cpp:x64-uwp=fail folly:arm64-android=fail folly:x64-android=fail -foonathan-memory:arm64-windows=fail -foonathan-memory:arm64-uwp=fail -foonathan-memory:x64-uwp=fail freeglut:arm-neon-android=fail freeglut:arm64-android=fail freeglut:x64-android=fail @@ -449,11 +434,7 @@ gstreamer:x64-android=fail # upstream issue https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1629. gstreamer:x64-windows-static = skip gstreamer:x64-windows-static-md = skip -gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail -gts:arm-neon-android=fail -gts:arm64-android=fail -gts:x64-android=fail gul14:arm-neon-android=fail gul14:arm64-android=fail gul14:x64-android=fail @@ -476,7 +457,11 @@ hwloc:arm-neon-android=fail hwloc:arm64-android=fail hwloc:x64-android=fail hyperscan:x64-android=fail +iceoryx:x64-android=fail +iceoryx:arm64-android=fail +iceoryx:arm-neon-android=fail ignition-common1:x64-linux=fail +ignition-common1:x64-osx=fail ignition-msgs1:arm-neon-android=fail ignition-msgs1:arm64-android=fail ignition-msgs1:arm64-windows=fail @@ -521,8 +506,6 @@ jinja2cpplight:arm64-android=fail jinja2cpplight:x64-android=fail json-schema-validator:arm-neon-android=fail json-schema-validator:arm64-android=fail -keystone:x64-linux=fail # python2 -keystone:x64-osx=fail kfr:x64-android=fail kfr:x64-uwp=fail lastools:arm-neon-android=fail @@ -654,9 +637,6 @@ libtar:arm64-android=fail libtcod:arm-neon-android=fail libtcod:arm64-android=fail libtcod:x64-android=fail -libtins:arm-neon-android=fail -libtins:arm64-android=fail -libtins:x64-android=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm64-uwp=fail libtorch:x64-osx=fail @@ -748,7 +728,6 @@ microsoft-signalr:x64-windows=skip microsoft-signalr:x64-windows-static=skip microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip -# https://github.com/mlpack/mlpack/pull/2945 monkeys-audio:arm-neon-android=fail monkeys-audio:arm64-android=fail monkeys-audio:x64-android=fail @@ -869,6 +848,7 @@ ompl:x64-osx=fail ompl:arm64-osx=fail ompl:x64-linux=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected +omplapp:arm-neon-android=fail omplapp:arm64-android=fail omplapp:x64-android=fail onednn:x64-android=fail @@ -923,10 +903,6 @@ openscap:x64-windows-static=fail opensubdiv:x64-android=fail # osx needs bison 3.4 installed openturns:x64-osx=fail -# https://github.com/AcademySoftwareFoundation/openvdb/issues/1362 -# openvdb\openvdb\libopenvdb.lib : fatal error LNK1248: image size (109A36020) exceeds maximum allowable size (FFFFFFFF) -openvdb:x64-windows-static=fail -openvdb:x64-windows-static-md=fail openvpn3:x64-osx=fail openvpn3:arm64-osx=fail openvr:x64-windows-static=fail @@ -959,7 +935,6 @@ plib:arm64-android=fail plib:x64-android=fail plplot:arm64-windows=fail pmdk:x64-android=fail -pmdk:x64-linux=fail pmdk:x64-osx=fail pmdk:x64-windows-static=fail popsift:x64-windows-static-md=fail @@ -1077,7 +1052,6 @@ rest-rpc:arm64-windows=skip rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip rest-rpc:arm64-osx=skip -rhash:arm64-windows=fail rpclib:arm64-windows=fail rpclib:arm64-uwp=fail rpclib:x64-uwp=fail @@ -1118,8 +1092,6 @@ sdformat9:x64-windows-static-md=fail sdl1:arm-neon-android=fail sdl1:arm64-android=fail sdl1:x64-android=fail -sdl2-net:arm64-uwp=fail -sdl2-net:x64-uwp=fail sentencepiece:arm-neon-android=fail sentencepiece:arm64-android=fail sentencepiece:x64-android=fail @@ -1128,11 +1100,6 @@ septag-sx:x64-android=fail sfml:arm-neon-android=fail sfml:arm64-android=fail sfml:x64-android=fail -shiva-sfml:x64-linux=fail -shiva-sfml:x64-osx=fail -shiva-sfml:arm64-osx=fail -shiva-sfml:x86-windows=fail -shiva-sfml:x64-windows=fail shogun:arm64-windows = skip shogun:arm64-uwp = skip shogun:x64-osx = skip @@ -1313,13 +1280,9 @@ wasmedge:arm64-android=fail wasmedge:x64-android=fail wavpack:arm-neon-android=fail wavpack:x64-android=fail -winpcap:arm64-windows = skip -winpcap:arm64-uwp = skip -winpcap:x64-uwp = skip -winpcap:x64-windows = skip -winpcap:x64-windows-static = skip -winpcap:x64-windows-static-md=skip -winpcap:x86-windows = skip +# Collides with libpcap -> similar headers +winpcap:x64-windows = skip +winpcap:x86-windows = skip wordnet:arm-neon-android=fail wordnet:arm64-android=fail wordnet:x64-android=fail @@ -1435,6 +1398,11 @@ vcpkg-ci-paraview:x64-windows-static-md=pass vcpkg-ci-paraview:x64-windows-static=pass vcpkg-ci-paraview:x64-windows=pass vcpkg-ci-paraview:x86-windows=pass +vcpkg-ci-soci:x64-linux=pass +vcpkg-ci-soci:x64-osx=pass +vcpkg-ci-soci:x64-windows=pass +vcpkg-ci-soci:x64-windows-static=pass +vcpkg-ci-soci:x64-windows-static-md=pass vcpkg-ci-wxwidgets:arm64-windows=pass vcpkg-ci-wxwidgets:x64-linux=pass vcpkg-ci-wxwidgets:x64-osx=pass diff --git a/scripts/cmake/vcpkg_from_gitlab.cmake b/scripts/cmake/vcpkg_from_gitlab.cmake index b739e5bef3d486..93e8e60bdf7e84 100644 --- a/scripts/cmake/vcpkg_from_gitlab.cmake +++ b/scripts/cmake/vcpkg_from_gitlab.cmake @@ -18,7 +18,7 @@ endfunction() function(vcpkg_from_gitlab) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" - "OUT_SOURCE_PATH;GITLAB_URL;REPO;REF;SHA512;HEAD_REF;FILE_DISAMBIGUATOR" + "OUT_SOURCE_PATH;GITLAB_URL;REPO;REF;SHA512;HEAD_REF;FILE_DISAMBIGUATOR;AUTHORIZATION_TOKEN" "PATCHES") if(DEFINED arg_UNPARSED_ARGUMENTS) @@ -45,7 +45,7 @@ function(vcpkg_from_gitlab) set(headers_param "") if(DEFINED arg_AUTHORIZATION_TOKEN) - set(headers_param "HEADERS" "Authorization: token ${arg_AUTHORIZATION_TOKEN}") + set(headers_param "HEADERS" "PRIVATE-TOKEN: ${arg_AUTHORIZATION_TOKEN}") endif() if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) diff --git a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake new file mode 100644 index 00000000000000..bc785962c8d5de --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake @@ -0,0 +1,4 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}/project") +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt new file mode 100644 index 00000000000000..8bbcf70da08289 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt @@ -0,0 +1,45 @@ +cmake_minimum_required(VERSION 3.12) + +project(embedresource-test VERSION 0.0.1) + +set(CMAKE_CXX_STANDARD 17) + +find_package(EmbedResource REQUIRED) + +file(SIZE "${CMAKE_CURRENT_LIST_DIR}/main.cpp" MAIN_CPP_FILE_SIZE) +file(SIZE "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" CMAKELISTS_TXT_FILE_SIZE) + +add_resource_library(sample_test_resources OBJECT RESOURCE_COLLECTION_NAME testdata1 RESOURCES main.cpp GENERATOR_COMMAND echo "CMakeLists.txt" GENERATOR_DEPEND CMakeLists.txt) +add_resource_library(testdata3 OBJECT RESOURCES main.cpp) + +macro(setup_target target) + target_add_resource(${target} RESOURCE_COLLECTION_NAME testdata2 RESOURCES main.cpp) + get_target_property(type ${target} TYPE) + if ("${type}" STREQUAL "STATIC_LIBRARY") + target_link_libraries(${target} PRIVATE $ $) + else() + target_link_libraries(${target} PRIVATE sample_test_resources testdata3) + endif() + + target_compile_definitions(${target} PRIVATE MAIN_CPP_FILE_SIZE=${MAIN_CPP_FILE_SIZE}) + target_compile_definitions(${target} PRIVATE CMAKELISTS_TXT_FILE_SIZE=${CMAKELISTS_TXT_FILE_SIZE}) +endmacro() + +add_executable(sample_test_exe main.cpp) +setup_target(sample_test_exe) + +add_library(sample_test_shlib SHARED main.cpp) +target_compile_features(sample_test_shlib PRIVATE cxx_std_20) +setup_target(sample_test_shlib) + +add_library(sample_test_lib STATIC main.cpp) +setup_target(sample_test_lib) + +install(TARGETS sample_test_shlib EXPORT sample_test_shlib) +install(EXPORT sample_test_shlib FILE sampleTargets.cmake DESTINATION cmake) + +install(TARGETS sample_test_lib EXPORT sample_test_lib) +install(EXPORT sample_test_lib FILE sampleTargets.cmake DESTINATION cmake) + +enable_testing() +add_test(NAME sample_test_exe COMMAND sample_test_exe) diff --git a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp new file mode 100644 index 00000000000000..39d7a8304f2613 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp @@ -0,0 +1,58 @@ +#include +#include +#include +#include +#include + +DECLARE_RESOURCE_COLLECTION(testdata1); +DECLARE_RESOURCE_COLLECTION(testdata2); +DECLARE_RESOURCE_COLLECTION(testdata3); +DECLARE_RESOURCE(testdata3, main_cpp); + +void verify_resource(ResourceLoader const& r) +{ + if (r.name() == L"main.cpp") + { +#ifdef __cpp_lib_span + if (r.template data().size() != MAIN_CPP_FILE_SIZE) { throw std::runtime_error("r.data.len() != MAIN_CPP_FILE_SIZE"); } +#endif +#ifdef __cpp_lib_string_view + if (r.string().size() != MAIN_CPP_FILE_SIZE) { throw std::runtime_error("r.string().size() != MAIN_CPP_FILE_SIZE"); } +#endif + } + else if (r.name() == L"CMakeLists.txt") + { +#ifdef __cpp_lib_span + if (r.template data().size() != CMAKELISTS_TXT_FILE_SIZE) + { + throw std::runtime_error("r.data.len() != CMAKELISTS_TXT_FILE_SIZE"); + } +#endif +#ifdef __cpp_lib_string_view + if (r.string().size() != CMAKELISTS_TXT_FILE_SIZE) { throw std::runtime_error("r.string().size() != CMAKELISTS_TXT_FILE_SIZE"); } +#endif + } + else { throw std::runtime_error("Unknown resource name"); } +} + +int main(int argc, char* argv[]) +try +{ + std::string_view res = LOAD_RESOURCE(testdata3, main_cpp).data; + if (res.size() != MAIN_CPP_FILE_SIZE) { throw std::runtime_error("r.data.len() != MAIN_CPP_FILE_SIZE"); } + + auto resourceCollection1 = LOAD_RESOURCE_COLLECTION(testdata1); + for (auto const r : resourceCollection1) { verify_resource(r); } + + auto resourceCollection2 = LOAD_RESOURCE_COLLECTION(testdata2); + for (auto const r : resourceCollection2) { verify_resource(r); } + + auto resourceCollection3 = LOAD_RESOURCE_COLLECTION(testdata3); + for (auto const r : resourceCollection2) { verify_resource(r); } + + return 0; +} catch (const std::exception& ex) +{ + std::cerr << "Failed: " << ex.what() << std::endl; + return -1; +} \ No newline at end of file diff --git a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json new file mode 100644 index 00000000000000..1c13e817687ad5 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-ci-ankurvdev-embedresource", + "version-string": "ci", + "description": "Validates ankurvdev-embedresource", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "ankurvdev-embedresource" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json index d3f597073b7cf4..b43b1048c99717 100644 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -23,6 +23,7 @@ "mp3lame", "nonfree", "openjpeg", + "openmpt", "openssl", "opus", "postproc", @@ -97,25 +98,25 @@ "name": "ffmpeg", "default-features": false, "features": [ - "x265" + "aom" ], - "platform": "!uwp & !(arm & windows)" + "platform": "!(windows & arm & !uwp)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "aom" + "dav1d" ], - "platform": "!(windows & arm & !uwp)" + "platform": "!(uwp | arm | x86 | osx)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "dav1d" + "x265" ], - "platform": "!(uwp | arm | x86 | osx)" + "platform": "!uwp & !(arm & windows)" }, { "name": "ffmpeg", diff --git a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json index 7c76a68221a919..afa1a3eb731b18 100644 --- a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json @@ -10,15 +10,13 @@ "default-features": false, "features": [ "clang", + "compiler-rt", "default-targets", - "disable-assertions", - "disable-clang-static-analyzer", "enable-abi-breaking-checks", "enable-bindings", "enable-eh", "enable-rtti", "enable-terminfo", - "enable-threads", "enable-zlib", "lld", "lldb", @@ -38,11 +36,11 @@ "platform": "!static" }, { - "$comment": "Platform restriction due to CI artifact upload quirks; flang", + "$comment": "Platform restriction due to CI artifact upload quirks; libc", "name": "llvm", "default-features": false, "features": [ - "flang" + "libc" ], "platform": "linux" } diff --git a/scripts/test_ports/vcpkg-ci-soci/portfile.cmake b/scripts/test_ports/vcpkg-ci-soci/portfile.cmake new file mode 100644 index 00000000000000..bc785962c8d5de --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-soci/portfile.cmake @@ -0,0 +1,4 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}/project") +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt new file mode 100644 index 00000000000000..31535c1b8f0eed --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 3.7) +project(soci-test CXX) + +if(APPLE) + set(CMAKE_CXX_STANDARD 11) +endif() + +add_executable(main main.cpp) + +find_package(SOCI CONFIG REQUIRED) +target_link_libraries(main PRIVATE $,SOCI::soci_mysql,SOCI::soci_mysql_static>) +target_link_libraries(main PRIVATE $,SOCI::soci_postgresql,SOCI::soci_postgresql_static>) +target_link_libraries(main PRIVATE $,SOCI::soci_sqlite3,SOCI::soci_sqlite3_static>) diff --git a/scripts/test_ports/vcpkg-ci-soci/project/main.cpp b/scripts/test_ports/vcpkg-ci-soci/project/main.cpp new file mode 100644 index 00000000000000..86377acc547a1d --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-soci/project/main.cpp @@ -0,0 +1,11 @@ +#include +#include +#include +#include + +int main() +{ + soci::session mysql_db(soci::mysql, "test:mysql"); + soci::session pgsql_db(soci::postgresql, "test:postgresql"); + soci::session sqlite3_db(soci::sqlite3, "test.db"); +} diff --git a/scripts/test_ports/vcpkg-ci-soci/vcpkg.json b/scripts/test_ports/vcpkg-ci-soci/vcpkg.json new file mode 100644 index 00000000000000..8ff0c2916013b0 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-soci/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "vcpkg-ci-soci", + "version-string": "ci", + "description": "Validates soci", + "supports": "x64 & (linux | osx | windows) & !uwp", + "dependencies": [ + { + "name": "soci", + "features": [ + "mysql", + "postgresql", + "sqlite3" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index c8387661b18f23..45e7e180970c2f 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2023-09-15 -VCPKG_MACOS_SHA=3c822003ec4e5eb3ea15d8ccf1a156f1d58e742b9d375a79693af9ad5b454796d4a42e05091bafefdf8359b56aee27ff8b07ff9bcb99f549a5bc81cb7ed47cc7 -VCPKG_MUSLC_SHA=125c77acbc6a2271eb882767e44da3fb0acd0719a35f2460e65eafcccae47967a5c370206d7af06b1d5a10d4ea53d04e620ca8df4bface8cd972b27eb89cf04e -VCPKG_GLIBC_SHA=08d27596961819573a66163ca5373e8f20137856d78d58154cc9ad0ba4864a1d22698d25c08c5ebcb3601f2952a476b0f1d12bed25c42cdbe6dab520870fabf3 -VCPKG_TOOL_SOURCE_SHA=a97ed33b6f3a5bbb9ae9e58ccd370f4941a5889098356aacb200effebc26f34b1ea205d21a749550db9e4c4c64b28a66f52bbfa0ba0bb4d5fc5b9be1fe4d76ff +VCPKG_TOOL_RELEASE_TAG=2023-10-18 +VCPKG_MACOS_SHA=a088881182d89cc8df5d4956eeafb5b1af08d0b5b99e84296796da13572cedaeb7e08c5256585b5417a39bb4b31a0c08323b63754fd75e45de0e5a61f21d6517 +VCPKG_MUSLC_SHA=0e278d8d5fe34f1c1513b18ff9061fe47a46e5d34d0834b1e966e0a7c0e7646af99679e39d6ea0e2b731eb5d0e0cc79e5b893cfeaeced083212d45a44f14a6e7 +VCPKG_GLIBC_SHA=89359cd737d9a19598cde8d27f4cd1e2c52d768ec8d2f8a9d2cd23f1054717cb9881e9e0587fa8726fa754cffd0b93d851b4d48f1e27cec9d9c25d92d1f35cff +VCPKG_TOOL_SOURCE_SHA=ef2f4973c417da1f127dcda4c9ee423fadc518b807d9347920559cf648720c71547bc7cb719209007cd3fda87e3655a85215deb523c4ece71b9147dfd2e52ae4 diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 2f7bfb8ce63a75..bd288557ab3e00 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -159,32 +159,25 @@ aria2-1.35.0-osx-darwin.tar.bz2 - 1.10.2 + 1.11.1 ninja.exe - https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip - 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3 - ninja-win-1.10.2.zip + https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip + a700e794c32eb67b9f87040db7f1ba3a8e891636696fc54d416b01661c2421ff46fa517c97fd904adacdf8e621df3e68ea380105b909ae8b6651a78ae7eb3199 + ninja-win-1.11.1.zip - 1.10.2 + 1.11.1 ninja - https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip - 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3 - ninja-linux-1.10.2.zip + https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip + 6403dac9196baffcff614fa73ea530752997c8db6bbfbaa0446b4b09d7327e2aa6e8615d1283c961d3bf0df497e85ba86604149f1505ee75f89d600245a45dde + ninja-linux-1.11.1.zip - 1.10.2 + 1.11.1 ninja - https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-mac.zip - bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b - ninja-mac-1.10.2.zip - - - 1.8.2 - ninja - https://github.com/ivysnow/ninja/releases/download/v1.8.2/ninja-freebsd.zip - 56a55ae9a6b5dfad4f28f9fe9b8114f1475c999d2f07fff7efa7375f987e74b498e9b63c41fc6c577756f15f3a1459c6d5d367902de3bedebdf9a9fd49089a86 - ninja-freebsd-1.8.2.zip + https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip + dad33b0918c60bbf5107951a936175b1610b4894a408f4ba4b47a2f5b328fc982a52a2aed6a0cb75028ee4765af5083bea66611c37516826eb0c851366bb4427 + ninja-mac-1.11.1.zip 7.2.11 diff --git a/triplets/community/mips64-linux.cmake b/triplets/community/mips64-linux.cmake new file mode 100644 index 00000000000000..25ba947eecb7b9 --- /dev/null +++ b/triplets/community/mips64-linux.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE mips64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) + diff --git a/versions/a-/ade.json b/versions/a-/ade.json index 51cad80808290c..a7f75babfb6a02 100644 --- a/versions/a-/ade.json +++ b/versions/a-/ade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "005ca3815ef985e0e10d716652be95e7775cf8de", + "version-string": "0.1.2d", + "port-version": 0 + }, { "git-tree": "c42175dddb51914574ff7fdcb8f653ed342f8ff2", "version-string": "0.1.2c", diff --git a/versions/a-/ankurvdev-embedresource.json b/versions/a-/ankurvdev-embedresource.json new file mode 100644 index 00000000000000..e80c7ad8dd2367 --- /dev/null +++ b/versions/a-/ankurvdev-embedresource.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b200fce22ffffeb4174ca68fcca609a9c4857c38", + "version": "0.0.10", + "port-version": 0 + } + ] +} diff --git a/versions/a-/asiosdk.json b/versions/a-/asiosdk.json index 6c75ac72908be5..eb278990417682 100644 --- a/versions/a-/asiosdk.json +++ b/versions/a-/asiosdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "798527dff966ba5c7ef8aab89eb941791d682090", + "version": "2.3.3", + "port-version": 7 + }, { "git-tree": "a58f240a86a38690339c96b11db0a62fd2388e4f", "version": "2.3.3", diff --git a/versions/a-/assimp.json b/versions/a-/assimp.json index f6bd7699ab3355..550bb0594cf119 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a825878e38726e638f29d4defeadb9108ac20697", + "version": "5.3.1", + "port-version": 2 + }, + { + "git-tree": "572034c626843af86fe62b64905fd4e79f19535f", + "version": "5.3.1", + "port-version": 1 + }, { "git-tree": "f9934603cb6f42343b122951f22b5af3c1967cde", "version": "5.3.1", diff --git a/versions/a-/atl.json b/versions/a-/atl.json new file mode 100644 index 00000000000000..458b1eed606a00 --- /dev/null +++ b/versions/a-/atl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0cf33fe03c09b26209c1162fee2bb2c5538f8b0f", + "version": "0", + "port-version": 0 + } + ] +} diff --git a/versions/a-/atlmfc.json b/versions/a-/atlmfc.json index 4de2206ee7c86a..f9be7ff97a1c17 100644 --- a/versions/a-/atlmfc.json +++ b/versions/a-/atlmfc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a6d710d7d3ffd42089aa001571c625805f59918", + "version": "0", + "port-version": 3 + }, { "git-tree": "60bac7802a9cdb32192315262495b647af36b723", "version": "0", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 6cec92faa398e4..c4e50267a8e9db 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bb95756096209a013e786b104a11b0aa6357119d", + "version": "1.11.169", + "port-version": 2 + }, + { + "git-tree": "5c0ad10a852e7facc0cea54e3990f16e0cb1ea8b", + "version": "1.11.169", + "port-version": 1 + }, { "git-tree": "714b1b2815e2a3f57c79c8703a9cdc9892240acd", "version": "1.11.169", diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json index 7d8610a784bc2f..08f1e3af2e2cf1 100644 --- a/versions/a-/azure-core-amqp-cpp.json +++ b/versions/a-/azure-core-amqp-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50c7a85fdc78ded123beb5dd15e2b4557ace24b2", + "version-semver": "1.0.0-beta.4", + "port-version": 0 + }, { "git-tree": "f2454e03858a910421f6fd248968fd1cb7999ba7", "version-semver": "1.0.0-beta.3", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index a55a42a6f8d4af..c0169902a36fbc 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "0f2e80c3e438f6738b7f0910f3122f21d52eb653", + "version-semver": "1.10.3", + "port-version": 1 + }, + { + "git-tree": "a6323331b6946093d5e0c3dd11e33d3e83203dc3", + "version-semver": "1.10.3", + "port-version": 0 + }, { "git-tree": "5f406f6bf6084c74a6a234f35bc6e232fae15cae", "version-semver": "1.10.2", diff --git a/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json new file mode 100644 index 00000000000000..0d16a7f4acd4c7 --- /dev/null +++ b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9289b19329d8fc1b12ef5a71d1cf2d743a32cc2a", + "version-semver": "1.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index dd1e776927b38e..f05325a35e0b68 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d50578e6b52b84c8be16a01ee83b4777c3c4bc9d", + "version-semver": "1.0.0-beta.3", + "port-version": 0 + }, { "git-tree": "2e4e38f8b37bd9c3c6af8bd95887d9108ba1ca67", "version-semver": "1.0.0-beta.2", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index 2d45ef1b5d30c4..95c7390813a85a 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db0ceb9ad55c2c774fac30663522efc247a1ce04", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "ece07432ef22395a14fe6cbdf5026d4b0f49872a", "version": "3.3.0", diff --git a/versions/b-/basisu.json b/versions/b-/basisu.json index ec05207fd2411e..01876593f34b70 100644 --- a/versions/b-/basisu.json +++ b/versions/b-/basisu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d355537e7392dad769a0c435f2a2cedf310b322c", + "version": "1.16.4", + "port-version": 0 + }, { "git-tree": "31adec97dda19e99a5745f46a5d2031981206bb1", "version": "1.11", diff --git a/versions/b-/better-enums.json b/versions/b-/better-enums.json new file mode 100644 index 00000000000000..f7905caa2712ae --- /dev/null +++ b/versions/b-/better-enums.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "64e0dbffe12134b2198b81043cc0dcfd0a340f33", + "version": "0.11.3", + "port-version": 0 + } + ] +} diff --git a/versions/b-/bext-mp.json b/versions/b-/bext-mp.json new file mode 100644 index 00000000000000..7bfb4d9a2caa63 --- /dev/null +++ b/versions/b-/bext-mp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "506fb6ec5f2a49a2b7e0bb637e6e8ef0f4e966ac", + "version-date": "2023-03-02", + "port-version": 0 + } + ] +} diff --git a/versions/b-/bext-wintls.json b/versions/b-/bext-wintls.json index b57b166726ec7d..f5fffd6cbf0de0 100644 --- a/versions/b-/bext-wintls.json +++ b/versions/b-/bext-wintls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc8c1307f16b47fb5fd638e719f0157323be3919", + "version": "0.9.7", + "port-version": 0 + }, { "git-tree": "1bed92afff8085f2d8f888b35ce0049e5986aa8a", "version": "0.9.5", diff --git a/versions/b-/bfgroup-lyra.json b/versions/b-/bfgroup-lyra.json index ef5ca5bf38fa83..c3a9a564ce6a65 100644 --- a/versions/b-/bfgroup-lyra.json +++ b/versions/b-/bfgroup-lyra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b58cd66176db34198f2a59a06f87afe194db2a45", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "bbd3e635da6198f0f2458ec62ff937287c5c5b45", "version": "1.6", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index 6539dc598295c7..f0a409a7a64ee7 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be97780ebb3e46185f1838115f642ec2d110f76d", + "version": "1.83.0", + "port-version": 1 + }, { "git-tree": "da8972f0e4c59981021913e4ef16a39a9ff8d491", "version": "1.83.0", diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json index 29f4edb13c3045..fe013489a906e5 100644 --- a/versions/b-/boringssl.json +++ b/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b809260036c7ee69cbf1a8a06e015354121d741", + "version-date": "2023-10-13", + "port-version": 0 + }, { "git-tree": "5f833bab8ecfc28f45a9034291e79f8cd126ad01", "version-date": "2023-09-25", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index ab55eb09922052..7ee8c91e54d24a 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d66e60d97a7a4e77df4e559fed1926a45dac3f52", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "575322265c701c0ff15d79c65a47ad38e7958235", "version": "2.19.3", diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index 098056c1855946..e4147f50ca4f78 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a244c96e6e67d802de17045cb395c0f11e0b3aa4", + "version-date": "2022-07-12", + "port-version": 6 + }, { "git-tree": "a451811c203f1ec086288b40dd4571d97bb7033e", "version-date": "2022-07-12", diff --git a/versions/b-/brotli.json b/versions/b-/brotli.json index 0a3da5eb0ae9e8..16e39e99d6c2a0 100644 --- a/versions/b-/brotli.json +++ b/versions/b-/brotli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e5b5ae1ad26c80535c893cc0307121f0398549e", + "version": "1.1.0", + "port-version": 1 + }, { "git-tree": "4156ea7744047f9ace2769b857d97d11154de28f", "version": "1.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index b7d4d91c655cc4..c0edb4185396dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -41,7 +41,7 @@ "port-version": 0 }, "ade": { - "baseline": "0.1.2c", + "baseline": "0.1.2d", "port-version": 0 }, "adios2": { @@ -132,6 +132,10 @@ "baseline": "chromium_5414", "port-version": 7 }, + "ankurvdev-embedresource": { + "baseline": "0.0.10", + "port-version": 0 + }, "annoy": { "baseline": "1.17.2", "port-version": 0 @@ -254,7 +258,7 @@ }, "asiosdk": { "baseline": "2.3.3", - "port-version": 6 + "port-version": 7 }, "asmjit": { "baseline": "2023-03-25", @@ -266,7 +270,7 @@ }, "assimp": { "baseline": "5.3.1", - "port-version": 0 + "port-version": 2 }, "async-mqtt": { "baseline": "2.0.0", @@ -296,9 +300,13 @@ "baseline": "2.36.1", "port-version": 2 }, + "atl": { + "baseline": "0", + "port-version": 0 + }, "atlmfc": { "baseline": "0", - "port-version": 2 + "port-version": 3 }, "atomic-queue": { "baseline": "2021-05-03", @@ -398,7 +406,7 @@ }, "aws-sdk-cpp": { "baseline": "1.11.169", - "port-version": 0 + "port-version": 2 }, "azmq": { "baseline": "2023-03-23", @@ -409,12 +417,12 @@ "port-version": 0 }, "azure-core-amqp-cpp": { - "baseline": "1.0.0-beta.3", - "port-version": 1 + "baseline": "1.0.0-beta.4", + "port-version": 0 }, "azure-core-cpp": { - "baseline": "1.10.2", - "port-version": 5 + "baseline": "1.10.3", + "port-version": 1 }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", @@ -436,9 +444,13 @@ "baseline": "2022-01-21", "port-version": 1 }, + "azure-messaging-eventhubs-checkpointstore-blob-cpp": { + "baseline": "1.0.0-beta.1", + "port-version": 0 + }, "azure-messaging-eventhubs-cpp": { - "baseline": "1.0.0-beta.2", - "port-version": 1 + "baseline": "1.0.0-beta.3", + "port-version": 0 }, "azure-security-attestation-cpp": { "baseline": "1.1.0", @@ -505,12 +517,12 @@ "port-version": 1 }, "baresip-libre": { - "baseline": "3.3.0", + "baseline": "3.4.0", "port-version": 0 }, "basisu": { - "baseline": "1.11", - "port-version": 7 + "baseline": "1.16.4", + "port-version": 0 }, "bcg729": { "baseline": "1.1.1", @@ -548,10 +560,18 @@ "baseline": "4.8.30", "port-version": 9 }, + "better-enums": { + "baseline": "0.11.3", + "port-version": 0 + }, "bext-di": { "baseline": "1.2.0", "port-version": 1 }, + "bext-mp": { + "baseline": "2023-03-02", + "port-version": 0 + }, "bext-sml": { "baseline": "1.1.5", "port-version": 0 @@ -565,11 +585,11 @@ "port-version": 2 }, "bext-wintls": { - "baseline": "0.9.5", + "baseline": "0.9.7", "port-version": 0 }, "bfgroup-lyra": { - "baseline": "1.6", + "baseline": "1.6.1", "port-version": 0 }, "bgfx": { @@ -910,7 +930,7 @@ }, "boost-iostreams": { "baseline": "1.83.0", - "port-version": 0 + "port-version": 1 }, "boost-iterator": { "baseline": "1.83.0", @@ -1273,12 +1293,12 @@ "port-version": 0 }, "boringssl": { - "baseline": "2023-09-25", + "baseline": "2023-10-13", "port-version": 0 }, "botan": { - "baseline": "2.19.3", - "port-version": 2 + "baseline": "3.1.1", + "port-version": 0 }, "box2d": { "baseline": "2.4.1", @@ -1290,7 +1310,7 @@ }, "breakpad": { "baseline": "2022-07-12", - "port-version": 5 + "port-version": 6 }, "brigand": { "baseline": "1.3.0", @@ -1298,7 +1318,7 @@ }, "brotli": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "brpc": { "baseline": "1.6.0", @@ -1381,7 +1401,7 @@ "port-version": 0 }, "caf": { - "baseline": "0.19.1", + "baseline": "0.19.3", "port-version": 0 }, "caffe2": { @@ -1404,6 +1424,10 @@ "baseline": "1.6.2", "port-version": 0 }, + "canvas-ity": { + "baseline": "1.0", + "port-version": 0 + }, "capnproto": { "baseline": "1.0.1", "port-version": 0 @@ -1506,7 +1530,7 @@ }, "chakracore": { "baseline": "2022-11-09", - "port-version": 4 + "port-version": 5 }, "charls": { "baseline": "2.4.2", @@ -1518,7 +1542,7 @@ }, "check": { "baseline": "0.15.2", - "port-version": 4 + "port-version": 5 }, "chipmunk": { "baseline": "7.0.3", @@ -1558,7 +1582,7 @@ }, "civetweb": { "baseline": "1.16", - "port-version": 0 + "port-version": 1 }, "cjson": { "baseline": "1.7.16", @@ -1597,7 +1621,7 @@ "port-version": 0 }, "clickhouse-cpp": { - "baseline": "2.2.1", + "baseline": "2.4.0", "port-version": 0 }, "clipboardxx": { @@ -1697,8 +1721,8 @@ "port-version": 10 }, "colmap": { - "baseline": "2023-03-12", - "port-version": 1 + "baseline": "2023-10-01", + "port-version": 0 }, "color-console": { "baseline": "2022-03-20", @@ -1762,10 +1786,10 @@ }, "corrade": { "baseline": "2020.06", - "port-version": 6 + "port-version": 7 }, "cpp-async": { - "baseline": "1.0.1", + "baseline": "1.1.0", "port-version": 0 }, "cpp-base64": { @@ -1773,7 +1797,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.14.0", + "baseline": "0.14.1", "port-version": 0 }, "cpp-ipc": { @@ -1796,6 +1820,10 @@ "baseline": "4.3.1", "port-version": 5 }, + "cpp-sort": { + "baseline": "1.15.0", + "port-version": 0 + }, "cpp-taskflow": { "baseline": "2.6.0", "port-version": 2 @@ -1820,6 +1848,10 @@ "baseline": "2022-10-25", "port-version": 0 }, + "cppdap": { + "baseline": "1.58.0-a", + "port-version": 0 + }, "cppfs": { "baseline": "1.3.0", "port-version": 3 @@ -1838,7 +1870,7 @@ }, "cppmicroservices": { "baseline": "3.7.6", - "port-version": 0 + "port-version": 1 }, "cpprestsdk": { "baseline": "2.10.18", @@ -1850,7 +1882,7 @@ }, "cpptoml": { "baseline": "0.1.1", - "port-version": 3 + "port-version": 4 }, "cppunit": { "baseline": "1.15.1", @@ -1873,8 +1905,8 @@ "port-version": 0 }, "cpr": { - "baseline": "1.10.2+3", - "port-version": 0 + "baseline": "1.10.5", + "port-version": 1 }, "cpu-features": { "baseline": "0.9.0", @@ -1921,7 +1953,7 @@ "port-version": 0 }, "cryptopp": { - "baseline": "8.8.0", + "baseline": "8.9.0", "port-version": 0 }, "cserialport": { @@ -1957,12 +1989,12 @@ "port-version": 0 }, "cub": { - "baseline": "1.16.0", + "baseline": "2.1.0", "port-version": 0 }, "cubeb": { "baseline": "2023-09-26", - "port-version": 0 + "port-version": 1 }, "cuda": { "baseline": "10.1", @@ -1977,7 +2009,7 @@ "port-version": 8 }, "curl": { - "baseline": "8.3.0", + "baseline": "8.4.0", "port-version": 0 }, "curlpp": { @@ -2045,8 +2077,8 @@ "port-version": 5 }, "dav1d": { - "baseline": "1.2.1", - "port-version": 0 + "baseline": "1.3.0", + "port-version": 1 }, "daw-header-libraries": { "baseline": "2.96.1", @@ -2082,7 +2114,7 @@ }, "dbus": { "baseline": "1.15.8", - "port-version": 0 + "port-version": 1 }, "dcmtk": { "baseline": "3.6.7", @@ -2145,8 +2177,8 @@ "port-version": 1 }, "dirent": { - "baseline": "1.23.2", - "port-version": 3 + "baseline": "1.24", + "port-version": 0 }, "discord-game-sdk": { "baseline": "3.2.1", @@ -2157,7 +2189,7 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "2.0", + "baseline": "2.0.1", "port-version": 0 }, "discount": { @@ -2218,7 +2250,7 @@ }, "drogon": { "baseline": "1.8.7", - "port-version": 0 + "port-version": 1 }, "dstorage": { "baseline": "1.2.0", @@ -2368,6 +2400,10 @@ "baseline": "1.3.17", "port-version": 2 }, + "enkits": { + "baseline": "1.11", + "port-version": 0 + }, "ensmallen": { "baseline": "2.19.1", "port-version": 0 @@ -2429,7 +2465,7 @@ "port-version": 2 }, "ezc3d": { - "baseline": "1.4.7", + "baseline": "1.5.0", "port-version": 0 }, "ezfoundation": { @@ -2457,8 +2493,8 @@ "port-version": 0 }, "fann": { - "baseline": "2.2.0", - "port-version": 3 + "baseline": "2023-01-26", + "port-version": 0 }, "farmhash": { "baseline": "1.1", @@ -2502,7 +2538,7 @@ }, "fastrtps": { "baseline": "2.7.0", - "port-version": 3 + "port-version": 4 }, "fawdlstty-libfv": { "baseline": "0.0.8", @@ -2530,7 +2566,7 @@ }, "ffmpeg": { "baseline": "6.0", - "port-version": 0 + "port-version": 2 }, "ffnvcodec": { "baseline": "11.1.5.2", @@ -2597,7 +2633,7 @@ "port-version": 0 }, "flecs": { - "baseline": "3.2.7", + "baseline": "3.2.8", "port-version": 0 }, "flint": { @@ -2650,7 +2686,7 @@ }, "fontconfig": { "baseline": "2.14.2", - "port-version": 0 + "port-version": 1 }, "foonathan-lexy": { "baseline": "2022.12.1", @@ -2798,7 +2834,7 @@ }, "gdal": { "baseline": "3.7.2", - "port-version": 0 + "port-version": 1 }, "gdcm": { "baseline": "3.0.22", @@ -2877,8 +2913,8 @@ "port-version": 3 }, "ginkgo": { - "baseline": "1.4.0", - "port-version": 2 + "baseline": "1.6.0", + "port-version": 0 }, "gklib": { "baseline": "2022-07-27", @@ -2897,7 +2933,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.5.1", + "baseline": "1.5.4", "port-version": 0 }, "glbinding": { @@ -2917,7 +2953,7 @@ "port-version": 2 }, "glib": { - "baseline": "2.76.5", + "baseline": "2.78.0", "port-version": 0 }, "glibmm": { @@ -2925,8 +2961,8 @@ "port-version": 1 }, "glm": { - "baseline": "2023-06-08", - "port-version": 0 + "baseline": "0.9.9.8", + "port-version": 2 }, "globjects": { "baseline": "1.1.0", @@ -2946,7 +2982,7 @@ }, "glslang": { "baseline": "13.0.0", - "port-version": 0 + "port-version": 1 }, "glui": { "baseline": "2019-11-30", @@ -2973,8 +3009,8 @@ "port-version": 5 }, "google-cloud-cpp": { - "baseline": "2.15.1", - "port-version": 0 + "baseline": "2.17.0", + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", @@ -2997,7 +3033,7 @@ "port-version": 1 }, "gpgme": { - "baseline": "1.18.0", + "baseline": "1.22.0", "port-version": 0 }, "gpgmm": { @@ -3030,7 +3066,7 @@ }, "graphviz": { "baseline": "9.0.0", - "port-version": 1 + "port-version": 2 }, "greatest": { "baseline": "1.5.0", @@ -3062,7 +3098,7 @@ }, "gstreamer": { "baseline": "1.22.5", - "port-version": 1 + "port-version": 4 }, "gtest": { "baseline": "1.14.0", @@ -3086,7 +3122,7 @@ }, "gts": { "baseline": "0.7.6", - "port-version": 7 + "port-version": 8 }, "gtsam": { "baseline": "4.2a9", @@ -3113,8 +3149,8 @@ "port-version": 6 }, "gz-cmake3": { - "baseline": "3.0.1", - "port-version": 0 + "baseline": "3.4.1", + "port-version": 1 }, "gz-common5": { "baseline": "5.4.1", @@ -3125,8 +3161,8 @@ "port-version": 0 }, "gz-math7": { - "baseline": "7.0.2", - "port-version": 1 + "baseline": "7.3.0", + "port-version": 0 }, "gz-msgs9": { "baseline": "9.5.0", @@ -3162,7 +3198,7 @@ }, "halide": { "baseline": "16.0.0", - "port-version": 0 + "port-version": 1 }, "happly": { "baseline": "2021-03-19", @@ -3174,7 +3210,7 @@ }, "harfbuzz": { "baseline": "8.2.1", - "port-version": 0 + "port-version": 3 }, "hash-library": { "baseline": "8", @@ -3193,8 +3229,8 @@ "port-version": 0 }, "hdf5": { - "baseline": "1.14.0", - "port-version": 1 + "baseline": "1.14.2", + "port-version": 0 }, "healpix": { "baseline": "1.12.10", @@ -3222,11 +3258,11 @@ }, "highfive": { "baseline": "2.7.1", - "port-version": 0 + "port-version": 1 }, "highs": { "baseline": "1.6.0", - "port-version": 0 + "port-version": 1 }, "highway": { "baseline": "1.0.7", @@ -3278,7 +3314,7 @@ }, "hypre": { "baseline": "2.29.0", - "port-version": 0 + "port-version": 1 }, "iceoryx": { "baseline": "2.0.3", @@ -3297,8 +3333,8 @@ "port-version": 0 }, "idyntree": { - "baseline": "9.0.0", - "port-version": 1 + "baseline": "10.0.0", + "port-version": 0 }, "if97": { "baseline": "2.1.3", @@ -3413,7 +3449,7 @@ "port-version": 0 }, "imgui-node-editor": { - "baseline": "0.9.2", + "baseline": "0.9.3", "port-version": 0 }, "imgui-sfml": { @@ -3425,8 +3461,8 @@ "port-version": 1 }, "immer": { - "baseline": "0.8.0", - "port-version": 1 + "baseline": "0.8.1", + "port-version": 0 }, "implot": { "baseline": "0.16", @@ -3493,12 +3529,12 @@ "port-version": 0 }, "ismrmrd": { - "baseline": "1.13.2", - "port-version": 1 + "baseline": "1.13.7", + "port-version": 0 }, "itk": { - "baseline": "5.2.1", - "port-version": 5 + "baseline": "5.3rc02", + "port-version": 0 }, "itpp": { "baseline": "4.3.1", @@ -3586,10 +3622,10 @@ }, "jsoncpp": { "baseline": "1.9.5", - "port-version": 0 + "port-version": 1 }, "jsonifier": { - "baseline": "0.9.8", + "baseline": "0.9.9", "port-version": 0 }, "jsonnet": { @@ -3633,8 +3669,12 @@ "port-version": 0 }, "kealib": { - "baseline": "1.4.14", - "port-version": 1 + "baseline": "1.5.2", + "port-version": 0 + }, + "keccak-tiny": { + "baseline": "2014-09-08", + "port-version": 0 }, "kenlm": { "baseline": "20230531", @@ -3642,7 +3682,7 @@ }, "keystone": { "baseline": "0.9.2", - "port-version": 2 + "port-version": 3 }, "kf5archive": { "baseline": "5.98.0", @@ -3825,7 +3865,7 @@ "port-version": 0 }, "ktx": { - "baseline": "4.1.0", + "baseline": "4.3.0-alpha3", "port-version": 0 }, "kubazip": { @@ -3917,7 +3957,7 @@ "port-version": 3 }, "lexbor": { - "baseline": "2.2.0", + "baseline": "2.3.0", "port-version": 0 }, "libaaplus": { @@ -3953,7 +3993,7 @@ "port-version": 0 }, "libassuan": { - "baseline": "2.5.5", + "baseline": "2.5.6", "port-version": 0 }, "libatomic-ops": { @@ -3961,8 +4001,8 @@ "port-version": 0 }, "libavif": { - "baseline": "0.11.1", - "port-version": 2 + "baseline": "1.0.1", + "port-version": 0 }, "libb2": { "baseline": "0.98.1", @@ -3990,7 +4030,7 @@ }, "libcap": { "baseline": "2.69", - "port-version": 1 + "port-version": 2 }, "libcbor": { "baseline": "0.10.2", @@ -4006,7 +4046,7 @@ }, "libconfig": { "baseline": "1.7.3", - "port-version": 3 + "port-version": 4 }, "libconfuse": { "baseline": "2019-07-14", @@ -4101,7 +4141,7 @@ "port-version": 2 }, "libenvpp": { - "baseline": "1.0.0", + "baseline": "1.3.0", "port-version": 0 }, "libepoxy": { @@ -4117,11 +4157,11 @@ "port-version": 0 }, "libeventheader-decode": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libeventheader-tracepoint": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libevhtp": { @@ -4138,7 +4178,7 @@ }, "libffi": { "baseline": "3.4.4", - "port-version": 5 + "port-version": 6 }, "libfido2": { "baseline": "1.13.0", @@ -4157,8 +4197,8 @@ "port-version": 1 }, "libfreenect2": { - "baseline": "0.2.0", - "port-version": 10 + "baseline": "0.2.1", + "port-version": 0 }, "libfs": { "baseline": "1.0.8", @@ -4173,8 +4213,8 @@ "port-version": 4 }, "libgcrypt": { - "baseline": "1.10.1", - "port-version": 1 + "baseline": "1.10.2", + "port-version": 0 }, "libgd": { "baseline": "2.3.3", @@ -4184,6 +4224,10 @@ "baseline": "1.7.1", "port-version": 3 }, + "libgig": { + "baseline": "4.3.0", + "port-version": 0 + }, "libgit2": { "baseline": "1.6.4", "port-version": 1 @@ -4194,19 +4238,19 @@ }, "libgnutls": { "baseline": "3.8.1", - "port-version": 0 + "port-version": 1 }, "libgo": { "baseline": "3.1", "port-version": 5 }, "libgpg-error": { - "baseline": "1.46", + "baseline": "1.47", "port-version": 0 }, "libgpiod": { - "baseline": "2.0.1", - "port-version": 0 + "baseline": "2.0.2", + "port-version": 1 }, "libgpod": { "baseline": "2019-08-29", @@ -4222,14 +4266,14 @@ }, "libgwenhywfar": { "baseline": "5.6.0", - "port-version": 3 + "port-version": 4 }, "libgxps": { "baseline": "0.3.2", "port-version": 2 }, "libharu": { - "baseline": "2.4.3", + "baseline": "2.4.4", "port-version": 0 }, "libhdfs3": { @@ -4237,7 +4281,7 @@ "port-version": 5 }, "libheif": { - "baseline": "1.16.2", + "baseline": "1.17.1", "port-version": 0 }, "libhsplasma": { @@ -4253,8 +4297,8 @@ "port-version": 0 }, "libical": { - "baseline": "3.0.16", - "port-version": 1 + "baseline": "3.0.17", + "port-version": 0 }, "libice": { "baseline": "1.0.10", @@ -4265,7 +4309,7 @@ "port-version": 1 }, "libics": { - "baseline": "1.6.5", + "baseline": "1.6.6", "port-version": 0 }, "libideviceactivation": { @@ -4274,7 +4318,7 @@ }, "libidn2": { "baseline": "2.3.4", - "port-version": 2 + "port-version": 3 }, "libigl": { "baseline": "2.4.0", @@ -4297,11 +4341,11 @@ "port-version": 1 }, "libjpeg-turbo": { - "baseline": "3.0.0", - "port-version": 2 + "baseline": "3.0.1", + "port-version": 0 }, "libjuice": { - "baseline": "1.0.6", + "baseline": "1.3.1", "port-version": 0 }, "libjxl": { @@ -4330,7 +4374,7 @@ }, "liblemon": { "baseline": "2019-06-13", - "port-version": 7 + "port-version": 8 }, "liblinear": { "baseline": "243", @@ -4349,12 +4393,12 @@ "port-version": 0 }, "liblsquic": { - "baseline": "3.1.1", - "port-version": 2 + "baseline": "3.3.2", + "port-version": 0 }, "liblzma": { - "baseline": "5.4.3", - "port-version": 1 + "baseline": "5.4.4", + "port-version": 0 }, "libmad": { "baseline": "0.15.1", @@ -4362,18 +4406,18 @@ }, "libmagic": { "baseline": "5.40", - "port-version": 2 + "port-version": 3 }, "libmariadb": { "baseline": "3.3.1", "port-version": 3 }, "libmaxminddb": { - "baseline": "1.4.3", - "port-version": 3 + "baseline": "1.7.1", + "port-version": 0 }, "libmediainfo": { - "baseline": "23.4", + "baseline": "23.10", "port-version": 0 }, "libmesh": { @@ -4405,7 +4449,7 @@ "port-version": 10 }, "libmorton": { - "baseline": "0.2.11", + "baseline": "0.2.12", "port-version": 0 }, "libmount": { @@ -4417,8 +4461,8 @@ "port-version": 3 }, "libmspack": { - "baseline": "0.10.1", - "port-version": 6 + "baseline": "0.11", + "port-version": 0 }, "libmt32emu": { "baseline": "2.7.0", @@ -4445,7 +4489,7 @@ "port-version": 3 }, "libnop": { - "baseline": "2021-03-01", + "baseline": "2021-11-03", "port-version": 0 }, "libodb": { @@ -4477,7 +4521,7 @@ "port-version": 1 }, "libopenmpt": { - "baseline": "0.6.7", + "baseline": "0.6.12", "port-version": 0 }, "libopensp": { @@ -4494,7 +4538,7 @@ }, "libosip2": { "baseline": "5.2.0", - "port-version": 4 + "port-version": 5 }, "libosmium": { "baseline": "2.20.0", @@ -4513,15 +4557,15 @@ "port-version": 4 }, "libpcap": { - "baseline": "1.10.1", - "port-version": 3 + "baseline": "1.10.4", + "port-version": 1 }, "libpff": { "baseline": "2021-11-14", "port-version": 2 }, "libphonenumber": { - "baseline": "8.13.17", + "baseline": "8.13.23", "port-version": 0 }, "libplist": { @@ -4541,11 +4585,11 @@ "port-version": 16 }, "libpq": { - "baseline": "15.3", - "port-version": 2 + "baseline": "16.0", + "port-version": 0 }, "libpqxx": { - "baseline": "7.7.4", + "baseline": "7.8.1", "port-version": 0 }, "libprotobuf-mutator": { @@ -4568,13 +4612,17 @@ "baseline": "4.1.1", "port-version": 2 }, + "libqtrest": { + "baseline": "0.4.0", + "port-version": 0 + }, "librabbitmq": { "baseline": "0.11.0", "port-version": 2 }, "libraqm": { - "baseline": "0.9.0", - "port-version": 1 + "baseline": "0.10.1", + "port-version": 0 }, "libraw": { "baseline": "0.21.1", @@ -4589,8 +4637,8 @@ "port-version": 1 }, "libremidi": { - "baseline": "4.1.0", - "port-version": 0 + "baseline": "4.2.3", + "port-version": 2 }, "libressl": { "baseline": "3.6.2", @@ -4621,8 +4669,8 @@ "port-version": 1 }, "libsbml": { - "baseline": "5.20.0", - "port-version": 1 + "baseline": "5.20.2", + "port-version": 0 }, "libsbsms": { "baseline": "2.3.0", @@ -4657,12 +4705,12 @@ "port-version": 0 }, "libsmb2": { - "baseline": "2021-04-29", - "port-version": 2 + "baseline": "2023-08-11", + "port-version": 0 }, "libsndfile": { - "baseline": "1.2.0", - "port-version": 2 + "baseline": "1.2.2", + "port-version": 0 }, "libsnoretoast": { "baseline": "0.8.0", @@ -4721,8 +4769,8 @@ "port-version": 3 }, "libsvm": { - "baseline": "3.25", - "port-version": 1 + "baseline": "3.32", + "port-version": 0 }, "libsystemd": { "baseline": "254", @@ -4749,8 +4797,8 @@ "port-version": 6 }, "libtins": { - "baseline": "4.3", - "port-version": 6 + "baseline": "4.5", + "port-version": 0 }, "libtomcrypt": { "baseline": "1.18.2", @@ -4769,15 +4817,15 @@ "port-version": 0 }, "libtracepoint": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libtracepoint-control": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libtracepoint-decode": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libu2f-server": { @@ -5049,8 +5097,8 @@ "port-version": 2 }, "linalg": { - "baseline": "2.1", - "port-version": 2 + "baseline": "2.2", + "port-version": 0 }, "linenoise-ng": { "baseline": "4754bee2d8eb3", @@ -5085,8 +5133,8 @@ "port-version": 0 }, "llvm": { - "baseline": "15.0.7", - "port-version": 6 + "baseline": "17.0.2", + "port-version": 0 }, "lmdb": { "baseline": "0.9.31", @@ -5105,8 +5153,8 @@ "port-version": 0 }, "log4cplus": { - "baseline": "2.0.7", - "port-version": 1 + "baseline": "2.1.0", + "port-version": 0 }, "log4cpp-log4cpp": { "baseline": "1.1.4", @@ -5129,7 +5177,7 @@ "port-version": 0 }, "ltla-cppirlba": { - "baseline": "2023-04-07", + "baseline": "2023-09-20", "port-version": 0 }, "ltla-cppkmeans": { @@ -5245,7 +5293,7 @@ "port-version": 2 }, "makeid": { - "baseline": "1.0.2", + "baseline": "1.0.3", "port-version": 0 }, "manif": { @@ -5310,7 +5358,7 @@ }, "matio": { "baseline": "1.5.23", - "port-version": 2 + "port-version": 3 }, "matplotlib-cpp": { "baseline": "2020-08-27", @@ -5341,7 +5389,7 @@ "port-version": 3 }, "mdns": { - "baseline": "1.4.2", + "baseline": "1.4.3", "port-version": 0 }, "mdnsresponder": { @@ -5361,8 +5409,8 @@ "port-version": 3 }, "mesa": { - "baseline": "23.0.1", - "port-version": 2 + "baseline": "23.2.1", + "port-version": 0 }, "meschach": { "baseline": "1.2b", @@ -5461,8 +5509,8 @@ "port-version": 1 }, "minizip-ng": { - "baseline": "4.0.0", - "port-version": 4 + "baseline": "4.0.1", + "port-version": 0 }, "mio": { "baseline": "2023-03-03", @@ -5505,7 +5553,7 @@ "port-version": 0 }, "mongoose": { - "baseline": "7.11", + "baseline": "7.12", "port-version": 0 }, "monkeys-audio": { @@ -5529,7 +5577,7 @@ "port-version": 3 }, "mosquitto": { - "baseline": "2.0.14", + "baseline": "2.0.18", "port-version": 0 }, "mozjpeg": { @@ -5544,6 +5592,10 @@ "baseline": "3.100", "port-version": 11 }, + "mpark-patterns": { + "baseline": "2019-10-03", + "port-version": 0 + }, "mpark-variant": { "baseline": "1.4.0", "port-version": 3 @@ -5558,7 +5610,7 @@ }, "mpg123": { "baseline": "1.31.3", - "port-version": 1 + "port-version": 3 }, "mpi": { "baseline": "1", @@ -5644,6 +5696,10 @@ "baseline": "2.3.4", "port-version": 0 }, + "murmur3": { + "baseline": "2015-05-02", + "port-version": 0 + }, "murmurhash": { "baseline": "2016-01-09", "port-version": 7 @@ -5754,7 +5810,7 @@ }, "netcdf-c": { "baseline": "4.8.1", - "port-version": 3 + "port-version": 4 }, "netcdf-cxx4": { "baseline": "4.3.1", @@ -5773,7 +5829,7 @@ "port-version": 4 }, "nghttp2": { - "baseline": "1.56.0", + "baseline": "1.57.0", "port-version": 0 }, "nghttp2-asio": { @@ -5781,7 +5837,7 @@ "port-version": 1 }, "nghttp3": { - "baseline": "0.15.0", + "baseline": "1.0.0", "port-version": 0 }, "ngspice": { @@ -5789,7 +5845,7 @@ "port-version": 0 }, "ngtcp2": { - "baseline": "0.19.1", + "baseline": "1.0.1", "port-version": 0 }, "nifly": { @@ -5797,8 +5853,8 @@ "port-version": 1 }, "nifticlib": { - "baseline": "2020-04-30", - "port-version": 4 + "baseline": "2022-07-04", + "port-version": 0 }, "nlohmann-fifo-map": { "baseline": "2018.05.07", @@ -5814,7 +5870,7 @@ }, "nmap": { "baseline": "7.70", - "port-version": 10 + "port-version": 11 }, "nmslib": { "baseline": "2.1.1", @@ -5956,6 +6012,10 @@ "baseline": "1.3.0", "port-version": 2 }, + "oboe": { + "baseline": "1.8.0", + "port-version": 0 + }, "observer-ptr-lite": { "baseline": "0.4.0", "port-version": 3 @@ -5982,11 +6042,11 @@ }, "ogre": { "baseline": "14.0.1", - "port-version": 1 + "port-version": 2 }, "ogre-next": { "baseline": "2.3.1", - "port-version": 2 + "port-version": 3 }, "ois": { "baseline": "1.5.1", @@ -6033,8 +6093,8 @@ "port-version": 0 }, "open62541": { - "baseline": "1.3.5", - "port-version": 1 + "baseline": "1.3.8", + "port-version": 0 }, "openal-soft": { "baseline": "1.23.1", @@ -6118,7 +6178,7 @@ }, "openimageio": { "baseline": "2.4.14.0", - "port-version": 1 + "port-version": 2 }, "openjpeg": { "baseline": "2.5.0", @@ -6137,8 +6197,8 @@ "port-version": 1 }, "openmpi": { - "baseline": "4.1.3", - "port-version": 2 + "baseline": "4.1.6", + "port-version": 0 }, "openmvg": { "baseline": "2.0", @@ -6198,11 +6258,11 @@ }, "openvdb": { "baseline": "10.0.0", - "port-version": 5 + "port-version": 6 }, "openvino": { "baseline": "2023.1.0", - "port-version": 3 + "port-version": 4 }, "openvpn3": { "baseline": "3.7.0", @@ -6425,7 +6485,7 @@ "port-version": 2 }, "pipewire": { - "baseline": "0.3.62", + "baseline": "0.3.83", "port-version": 0 }, "pistache": { @@ -6486,7 +6546,7 @@ }, "plplot": { "baseline": "5.15.0", - "port-version": 1 + "port-version": 2 }, "plustache": { "baseline": "0.4.0", @@ -6580,6 +6640,14 @@ "baseline": "1.3", "port-version": 7 }, + "pravila00-enum-string": { + "baseline": "2023-10-16", + "port-version": 0 + }, + "pravila00-make-vector": { + "baseline": "2023-04-10", + "port-version": 0 + }, "presentmon": { "baseline": "1.7.0", "port-version": 2 @@ -6616,6 +6684,10 @@ "baseline": "1.7.1", "port-version": 0 }, + "proxsuite": { + "baseline": "0.5.0", + "port-version": 0 + }, "proxy": { "baseline": "1.1.1", "port-version": 0 @@ -6657,7 +6729,7 @@ "port-version": 0 }, "pugixml": { - "baseline": "1.13.0", + "baseline": "1.14", "port-version": 0 }, "pulzed-mini": { @@ -6681,8 +6753,12 @@ "port-version": 0 }, "qca": { - "baseline": "2.3.5", - "port-version": 2 + "baseline": "2.3.7", + "port-version": 0 + }, + "qcoro": { + "baseline": "0.9.0", + "port-version": 0 }, "qcustomplot": { "baseline": "2.1.1", @@ -6729,67 +6805,67 @@ "port-version": 0 }, "qt5": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.10", - "port-version": 1 + "baseline": "5.15.11", + "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-base": { - "baseline": "5.15.10", - "port-version": 6 + "baseline": "5.15.11", + "port-version": 1 }, "qt5-canvas3d": { "baseline": "0", "port-version": 2 }, "qt5-charts": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.10", - "port-version": 1 + "baseline": "5.15.11", + "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-location": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-modularscripts": { @@ -6797,107 +6873,107 @@ "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.10", - "port-version": 0 + "baseline": "5.15.11", + "port-version": 1 }, "qt5-networkauth": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-script": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.10", - "port-version": 1 + "baseline": "5.15.11", + "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.10", - "port-version": 1 + "baseline": "5.15.11", + "port-version": 0 }, "qt5-webglplugin": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5compat": { @@ -6914,7 +6990,7 @@ }, "qtbase": { "baseline": "6.5.3", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.5.3", @@ -7089,7 +7165,7 @@ "port-version": 0 }, "quantlib": { - "baseline": "1.31.1", + "baseline": "1.32", "port-version": 0 }, "quaternions": { @@ -7165,7 +7241,7 @@ "port-version": 0 }, "rapidjson": { - "baseline": "2023-04-27", + "baseline": "2023-07-17", "port-version": 0 }, "rapidxml": { @@ -7201,7 +7277,7 @@ "port-version": 0 }, "reactiveplusplus": { - "baseline": "0.2.2", + "baseline": "0.2.3", "port-version": 0 }, "readerwriterqueue": { @@ -7222,15 +7298,15 @@ }, "readline-win32": { "baseline": "5.0", - "port-version": 7 + "port-version": 8 }, "readosm": { "baseline": "1.1.0a", "port-version": 4 }, "realsense2": { - "baseline": "2.54.1", - "port-version": 1 + "baseline": "2.54.2", + "port-version": 0 }, "recast": { "baseline": "deprecated", @@ -7500,6 +7576,10 @@ "baseline": "2018-08-26-16e6f435", "port-version": 3 }, + "sdbus-cpp": { + "baseline": "1.3.0", + "port-version": 0 + }, "sdformat10": { "baseline": "10.0.0", "port-version": 3 @@ -7529,7 +7609,7 @@ "port-version": 6 }, "sdl2": { - "baseline": "2.28.3", + "baseline": "2.28.4", "port-version": 1 }, "sdl2-gfx": { @@ -7546,11 +7626,11 @@ }, "sdl2-mixer-ext": { "baseline": "2023-05-04", - "port-version": 0 + "port-version": 1 }, "sdl2-net": { "baseline": "2.2.0", - "port-version": 1 + "port-version": 2 }, "sdl2-ttf": { "baseline": "2.20.2", @@ -7585,7 +7665,7 @@ "port-version": 2 }, "sentry-native": { - "baseline": "0.6.5", + "baseline": "0.6.6", "port-version": 0 }, "septag-dmon": { @@ -7656,10 +7736,6 @@ "baseline": "1.0", "port-version": 7 }, - "shiva-sfml": { - "baseline": "1.0", - "port-version": 4 - }, "shogun": { "baseline": "6.1.4", "port-version": 9 @@ -7777,16 +7853,16 @@ "port-version": 2 }, "so5extra": { - "baseline": "1.6.0", + "baseline": "1.6.1", "port-version": 0 }, "sobjectizer": { - "baseline": "5.8.0.1", + "baseline": "5.8.1", "port-version": 0 }, "soci": { "baseline": "4.0.3", - "port-version": 1 + "port-version": 3 }, "socket-io-client": { "baseline": "2023-02-14", @@ -7798,7 +7874,7 @@ }, "soem": { "baseline": "2023-06-09", - "port-version": 0 + "port-version": 1 }, "soil": { "baseline": "2021-04-22", @@ -7809,8 +7885,8 @@ "port-version": 1 }, "sokol": { - "baseline": "2019-09-09", - "port-version": 2 + "baseline": "2023-10-07", + "port-version": 0 }, "sol2": { "baseline": "3.3.0", @@ -7833,8 +7909,8 @@ "port-version": 2 }, "soundtouch": { - "baseline": "2.3.1", - "port-version": 2 + "baseline": "2.3.2", + "port-version": 0 }, "soxr": { "baseline": "0.1.3", @@ -7941,7 +8017,7 @@ "port-version": 0 }, "sqlite3": { - "baseline": "3.43.0", + "baseline": "3.43.1", "port-version": 0 }, "sqlitecpp": { @@ -8073,8 +8149,8 @@ "port-version": 0 }, "symengine": { - "baseline": "0.10.1", - "port-version": 1 + "baseline": "0.11.1", + "port-version": 0 }, "systemc": { "baseline": "2.3.3", @@ -8096,6 +8172,10 @@ "baseline": "1.13.1", "port-version": 1 }, + "talib": { + "baseline": "0.4.0", + "port-version": 1 + }, "taocpp-json": { "baseline": "2020-09-14", "port-version": 3 @@ -8114,7 +8194,7 @@ }, "tbb": { "baseline": "2021.10.0", - "port-version": 2 + "port-version": 3 }, "tcb-span": { "baseline": "2022-06-15", @@ -8184,13 +8264,17 @@ "baseline": "2023.1", "port-version": 0 }, + "thomasmonkman-filewatch": { + "baseline": "2023-01-16", + "port-version": 0 + }, "thor": { "baseline": "2022-04-16", "port-version": 0 }, "thorvg": { - "baseline": "0.10.1", - "port-version": 1 + "baseline": "0.11.1", + "port-version": 0 }, "threadpool": { "baseline": "0.2.5", @@ -8205,8 +8289,8 @@ "port-version": 0 }, "tiff": { - "baseline": "4.5.1", - "port-version": 2 + "baseline": "4.6.0", + "port-version": 1 }, "tinkerforge": { "baseline": "2.1.25", @@ -8265,7 +8349,7 @@ "port-version": 0 }, "tinygltf": { - "baseline": "2.8.4", + "baseline": "2.8.17", "port-version": 0 }, "tinynpy": { @@ -8353,8 +8437,8 @@ "port-version": 4 }, "tracy": { - "baseline": "0.9.1", - "port-version": 3 + "baseline": "0.10.0", + "port-version": 0 }, "transwarp": { "baseline": "2.2.2", @@ -8557,7 +8641,7 @@ "port-version": 0 }, "uwebsockets": { - "baseline": "20.45.0", + "baseline": "20.47.0", "port-version": 0 }, "v-hacd": { @@ -8585,7 +8669,7 @@ "port-version": 0 }, "vc": { - "baseline": "1.4.3", + "baseline": "1.4.4", "port-version": 0 }, "vcglib": { @@ -8797,8 +8881,8 @@ "port-version": 2 }, "webview2": { - "baseline": "1.0.1210.39", - "port-version": 1 + "baseline": "1.0.2088.41", + "port-version": 0 }, "wepoll": { "baseline": "1.5.8", @@ -8814,7 +8898,7 @@ }, "wil": { "baseline": "2023-08-24", - "port-version": 0 + "port-version": 1 }, "wildmidi": { "baseline": "0.4.5", @@ -8830,7 +8914,7 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 11 + "port-version": 12 }, "winpty": { "baseline": "0.4.3", @@ -8905,8 +8989,8 @@ "port-version": 0 }, "wxwidgets": { - "baseline": "3.2.2.1", - "port-version": 3 + "baseline": "3.2.3", + "port-version": 0 }, "wyhash": { "baseline": "2023-01-25", @@ -8925,7 +9009,7 @@ "port-version": 10 }, "x86-simd-sort": { - "baseline": "2023-03-04", + "baseline": "3.0", "port-version": 0 }, "xapian": { @@ -8941,7 +9025,7 @@ "port-version": 0 }, "xbyak": { - "baseline": "6.69", + "baseline": "6.73", "port-version": 0 }, "xcb": { diff --git a/versions/c-/caf.json b/versions/c-/caf.json index 44b4a548632e8c..d1f9512900e899 100644 --- a/versions/c-/caf.json +++ b/versions/c-/caf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b744b08352077e2bf620c383d9924f4a008cbca", + "version": "0.19.3", + "port-version": 0 + }, { "git-tree": "0561defb72007b054cede4fed6ef5950f8c2e2bc", "version": "0.19.1", diff --git a/versions/c-/canvas-ity.json b/versions/c-/canvas-ity.json new file mode 100644 index 00000000000000..560454c5cec02c --- /dev/null +++ b/versions/c-/canvas-ity.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ba934f25e09c4ade51de82b8b8213ec2068aa826", + "version": "1.0", + "port-version": 0 + } + ] +} diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index aa917d32b8a4ad..10b4b0fd2ae46b 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98c62c0fbb2d410646eec57ce65ec0b91ad19fcf", + "version-date": "2022-11-09", + "port-version": 5 + }, { "git-tree": "cc06634190b18bc8003202b9490c6af7919821a3", "version-date": "2022-11-09", diff --git a/versions/c-/check.json b/versions/c-/check.json index d66579d7462a60..2be960805e8084 100644 --- a/versions/c-/check.json +++ b/versions/c-/check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c993fcbc415d3c12c9161215529c1d36ba7e5f96", + "version": "0.15.2", + "port-version": 5 + }, { "git-tree": "d3b96c10d08746796f0e7540f9cb896b263cd4a9", "version": "0.15.2", diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json index 323c526f176300..3faace72dd04d0 100644 --- a/versions/c-/civetweb.json +++ b/versions/c-/civetweb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23fa18e460290d6b0629ca6487f69b56845cfbda", + "version": "1.16", + "port-version": 1 + }, { "git-tree": "46ba5309a5759827c0d729344e8f17cc5f3132b9", "version": "1.16", diff --git a/versions/c-/clickhouse-cpp.json b/versions/c-/clickhouse-cpp.json index 2e1b3e08c80cfb..3ad180e4d0010c 100644 --- a/versions/c-/clickhouse-cpp.json +++ b/versions/c-/clickhouse-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d665e3d36b571b68596140563d1934e8b416aa23", + "version": "2.4.0", + "port-version": 0 + }, { "git-tree": "10588d8080311cbc920f1805d3dd51e5b9c27ebe", "version": "2.2.1", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index ea652317e7e899..46334e0dfd0b59 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3482baa430e8733afa927fae4d3951e300a5c67", + "version-date": "2023-10-01", + "port-version": 0 + }, { "git-tree": "be5a8b2aa2354b0d3aec03253dcd13358ba950da", "version-date": "2023-03-12", diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json index 8f81e374c7b140..95a5e4e46efc0f 100644 --- a/versions/c-/corrade.json +++ b/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8630a6d00fec6c7462af2e03bd0e1946f6812069", + "version-string": "2020.06", + "port-version": 7 + }, { "git-tree": "1a278fdbd46715f454e366df7d06410ae2fc9747", "version-string": "2020.06", diff --git a/versions/c-/cpp-async.json b/versions/c-/cpp-async.json index 1d57e3a116c245..0bafe8c0228604 100644 --- a/versions/c-/cpp-async.json +++ b/versions/c-/cpp-async.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f29e519d60913ea86ca5cee69d9129a1e04b337", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "c9b2e9c3ddd004c4201a27963d4b1bedb2dc2b2c", "version": "1.0.1", diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index db3998454a23cf..848ec94ca60921 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "209025ac7de89c4a8292aeffd8a59259dfc433c5", + "version": "0.14.1", + "port-version": 0 + }, { "git-tree": "5ed5d9de6eeab399563ab93d52f73b7d4691d1cc", "version": "0.14.0", diff --git a/versions/c-/cpp-sort.json b/versions/c-/cpp-sort.json new file mode 100644 index 00000000000000..cc906838854876 --- /dev/null +++ b/versions/c-/cpp-sort.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b474d4009aeb5dd69f5024899bff6fbbb92a78f6", + "version": "1.15.0", + "port-version": 0 + } + ] +} diff --git a/versions/c-/cppdap.json b/versions/c-/cppdap.json new file mode 100644 index 00000000000000..73e4394edbb431 --- /dev/null +++ b/versions/c-/cppdap.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ab1e5e1b50226ecd6d45d53b357dac35051a8a47", + "version-semver": "1.58.0-a", + "port-version": 0 + } + ] +} diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index 647f576e655467..34f83579fdfc92 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b438280ccc1012bda6457141a3dea8071711ffb9", + "version": "3.7.6", + "port-version": 1 + }, { "git-tree": "3399e4ad64f4b4c0d32f4b5df723384a1bd98dbe", "version": "3.7.6", diff --git a/versions/c-/cpptoml.json b/versions/c-/cpptoml.json index 74aeafc6d5282e..e42d19dcb4f499 100644 --- a/versions/c-/cpptoml.json +++ b/versions/c-/cpptoml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6993c08a35db3961ad0543456f236e3e5a2492c9", + "version": "0.1.1", + "port-version": 4 + }, { "git-tree": "fde8b7854f0796406eada5609cb2cc54728d73db", "version": "0.1.1", diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 18e5ea04276a1c..79a0fd5c985f70 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "83379af62bd0d170537dd4ee3abba017d4a54659", + "version-semver": "1.10.5", + "port-version": 1 + }, + { + "git-tree": "b734e9b119682ee4c98e2b4a127a8e29fc750844", + "version-semver": "1.10.5", + "port-version": 0 + }, { "git-tree": "96f05ba23a7dc5ba102ba451210b2c367669c1ad", "version-semver": "1.10.2+3", diff --git a/versions/c-/cryptopp.json b/versions/c-/cryptopp.json index 522b30f36c3b04..162b5a68ea06d7 100644 --- a/versions/c-/cryptopp.json +++ b/versions/c-/cryptopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48788514ae1e84dea9055e603527c91f92c124fb", + "version": "8.9.0", + "port-version": 0 + }, { "git-tree": "ecb46c9c0fbce15e4238443a6d93275a052b3c9e", "version": "8.8.0", diff --git a/versions/c-/cub.json b/versions/c-/cub.json index 4dc47df0860c4d..6538ac26f51d0e 100644 --- a/versions/c-/cub.json +++ b/versions/c-/cub.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7b6e0430fa6c7701a81090f35c8344c7889d790", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "d6fe5c753cf67eeb18b536ea933864d15a88331d", "version": "1.16.0", diff --git a/versions/c-/cubeb.json b/versions/c-/cubeb.json index c6f400a1ee52f5..575a01b830e710 100644 --- a/versions/c-/cubeb.json +++ b/versions/c-/cubeb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eac0d45fa24887b010ffdd09284d936950d6b0e", + "version-date": "2023-09-26", + "port-version": 1 + }, { "git-tree": "734318573d1aab99ec902221d209cd01940b37e7", "version-date": "2023-09-26", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index e8b032195747e1..6d4b362adff634 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6125c796d6e2913a89a2996d7082375ce16b02dd", + "version": "8.4.0", + "port-version": 0 + }, { "git-tree": "11ef099083754220ca800477b81e5ea6e51730ff", "version": "8.3.0", diff --git a/versions/d-/dav1d.json b/versions/d-/dav1d.json index 99f0e7e9caf26d..6d077fdfe0463c 100644 --- a/versions/d-/dav1d.json +++ b/versions/d-/dav1d.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "68bf154a3ecc55fd1ad71ff6773ed3f0c418fbba", + "version": "1.3.0", + "port-version": 1 + }, + { + "git-tree": "99fc7f3cc963cb7a3e567d13f313e5f0dbf46c72", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "e819aee6d5e62ecd2981c858897773239e66b496", "version": "1.2.1", diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json index 0494991edc706c..0e39a12637cf87 100644 --- a/versions/d-/dbus.json +++ b/versions/d-/dbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9104cc6d890ace8c14067e7cbf29c39f7a93b937", + "version": "1.15.8", + "port-version": 1 + }, { "git-tree": "a49c03bc95822c2f376e3f3758ac3087a428ddec", "version": "1.15.8", diff --git a/versions/d-/dirent.json b/versions/d-/dirent.json index 07e9e7d86851e1..c1af536dd5a7ec 100644 --- a/versions/d-/dirent.json +++ b/versions/d-/dirent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcace8750d2b6080c63877eed432f8b862501012", + "version": "1.24", + "port-version": 0 + }, { "git-tree": "6df6238f6f97735c39e2e9b19d90f3895c4a636b", "version": "1.23.2", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index aaa0d2bc20b63c..fb065baf9e7da2 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b4e38bd8dd9683ee4923d31a64426a01e8b3466", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "374bc763a70ab0e9556a40bdea62ea9a9cf7d8bd", "version": "2.0", diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 65b8a2fa4f1aa3..69d1c4f29de96d 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dc8fd6d40ad624513353e295fbd39a0dd237c91", + "version": "1.8.7", + "port-version": 1 + }, { "git-tree": "01b8dcf586886018269bc888cc651751d074d4c6", "version": "1.8.7", diff --git a/versions/e-/enkits.json b/versions/e-/enkits.json new file mode 100644 index 00000000000000..6d2b78eef1e844 --- /dev/null +++ b/versions/e-/enkits.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8fe0e538a1d8685844297f35b7e00f4984d4bb09", + "version": "1.11", + "port-version": 0 + } + ] +} diff --git a/versions/e-/ezc3d.json b/versions/e-/ezc3d.json index 116bab01aad63b..834b2a939f52f5 100644 --- a/versions/e-/ezc3d.json +++ b/versions/e-/ezc3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f41d466838bd526b6e8717bf3c962b29a7bb47c5", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "21ec5f8371f785c406c466171aadff744e2b34e2", "version": "1.4.7", diff --git a/versions/f-/fann.json b/versions/f-/fann.json index e005396d3d4a4a..c99cc402c8fb8b 100644 --- a/versions/f-/fann.json +++ b/versions/f-/fann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94b730a699257765fce03efa37433036770904c4", + "version-date": "2023-01-26", + "port-version": 0 + }, { "git-tree": "05d4d344a7295f604f3cf541a9d92b9a680fd830", "version": "2.2.0", diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index eb9a83aba1d1f2..3ddde31d11ae29 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "17e66e986b0296a09cf61691351f381bea310538", + "git-tree": "2b2c27c3a92da80b837e5f14641cd6ea2b5fc6f6", + "version": "2.7.0", + "port-version": 4 + }, + { + "git-tree": "75ba9fed16853532cfc26487e85e4309289b8dd2", "version": "2.7.0", "port-version": 3 }, diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index f2a4680e598c0b..c38dd4d6e2f3c1 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9f33fe16e3a4e278bc2eb92b24483d00b90e9f3a", + "version": "6.0", + "port-version": 2 + }, + { + "git-tree": "70c25989395c92bd79faf0b136fb4636e96d541c", + "version": "6.0", + "port-version": 1 + }, { "git-tree": "515f4b8df7a66e74ef6bcde4eae3841d3a96038f", "version": "6.0", diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index ed9855b2a4d481..8b97502ce90664 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "524cb7cfd119c5f71730df87f81208d2dc1c28a2", + "version": "3.2.8", + "port-version": 0 + }, { "git-tree": "ac488e485debfb252900bb5e9b6129f19628032b", "version": "3.2.7", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 00a989f7054357..48fef57f6d4084 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de73339d579963e68fed652ed2e206b307a0c03f", + "version": "2.14.2", + "port-version": 1 + }, { "git-tree": "26490bc4c9aa1377da98980ba6e1089525fdaa55", "version": "2.14.2", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index bcf45a4a550432..d91f56fd259c3e 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3931fc54de192cbee6b4683bc2261b2f3093130f", + "version-semver": "3.7.2", + "port-version": 1 + }, { "git-tree": "d01864aaa21a85e1e8f7bb6748d607e953c52e77", "version-semver": "3.7.2", diff --git a/versions/g-/ginkgo.json b/versions/g-/ginkgo.json index 941d040ee5ad79..a946d291131506 100644 --- a/versions/g-/ginkgo.json +++ b/versions/g-/ginkgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09962781615d028b2b96be5aef56b0590fd7b54f", + "version-semver": "1.6.0", + "port-version": 0 + }, { "git-tree": "779490458d51f75bc22ed324afceffe0c3b0ee12", "version-semver": "1.4.0", diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 94149adb97d024..68abcd04c10b0d 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c4b6e2335f681c7d5183776b595718244791df78", + "version": "1.5.4", + "port-version": 0 + }, { "git-tree": "bfeb3e970fc4dd67fcf667cc5e50d3833a07561b", "version": "1.5.1", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index ee968bfb39b576..b856f49bf3766f 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd9adf35a5c743b40cedce00c43542980f338229", + "version": "2.78.0", + "port-version": 0 + }, { "git-tree": "4ae4475a91c8ec7f156e5904da9f0c3f02224cdc", "version": "2.76.5", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 98d60404ae19b0..9ae47f89067093 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5c6c37e6477580e47bd5645a3760ff534c689f6", + "version": "13.0.0", + "port-version": 1 + }, { "git-tree": "07a60a91ac63383677c203954125ba981d08f53b", "version": "13.0.0", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index bd68d61b6f6b30..00e412cea04971 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "eb4b2fd7eea450ced2e6f33dcd9af1237f2de3c2", + "version": "2.17.0", + "port-version": 1 + }, + { + "git-tree": "cfe978bbc8c0f0e98f02aaaf2ab546f08107ce95", + "version": "2.17.0", + "port-version": 0 + }, + { + "git-tree": "76121e57d4d9f0ce925973295ee30a574d448e4f", + "version": "2.16.0", + "port-version": 0 + }, { "git-tree": "6b622eca80c311ef081e80432d56f13d9c8f0d72", "version": "2.15.1", diff --git a/versions/g-/gpgme.json b/versions/g-/gpgme.json index 9682d45c47480f..7974a38bd8e767 100644 --- a/versions/g-/gpgme.json +++ b/versions/g-/gpgme.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71d1688aa684def46e7303068d31cbac5a90c010", + "version": "1.22.0", + "port-version": 0 + }, { "git-tree": "ac2d5bcf5b538ac0c93f5af00fb210e1da266911", "version": "1.18.0", diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json index 2c5bf547f06abb..c896650db79fc6 100644 --- a/versions/g-/graphviz.json +++ b/versions/g-/graphviz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83813d9389be10cbd741a2e6dbd32924972e6b82", + "version-semver": "9.0.0", + "port-version": 2 + }, { "git-tree": "ba712eb597e2f6b4cd9113689ccb72cb95025d6f", "version-semver": "9.0.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 90e1edd8925ad9..fc39a164bab852 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "b18eecdb79cdeb95b0c5e003cf14ababd9bca7c9", + "version": "1.22.5", + "port-version": 4 + }, + { + "git-tree": "5bcd4e4f541fb90ffef24a354db74f5555f2ba6d", + "version": "1.22.5", + "port-version": 3 + }, + { + "git-tree": "921fefd3f9b9ce85c031881f5861074957d1a7f1", + "version": "1.22.5", + "port-version": 2 + }, { "git-tree": "7f37f12f5a39fa6eea841721c51bb591039c3251", "version": "1.22.5", diff --git a/versions/g-/gts.json b/versions/g-/gts.json index dbd92b12773896..ed71a2901b6320 100644 --- a/versions/g-/gts.json +++ b/versions/g-/gts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c12aefc981ca389e3235cf1940883f881dddb4d", + "version": "0.7.6", + "port-version": 8 + }, { "git-tree": "1bce412085edcd46e3f358cca2c3bb1cffb25cfa", "version": "0.7.6", diff --git a/versions/g-/gz-cmake3.json b/versions/g-/gz-cmake3.json index 865ab42b8c574e..dd5779d88c0465 100644 --- a/versions/g-/gz-cmake3.json +++ b/versions/g-/gz-cmake3.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "8d7ac07eb757d7a69f1df27ad7a1ef71c26957d4", + "version": "3.4.1", + "port-version": 1 + }, + { + "git-tree": "c0061f3363187e8da74f252ff3c21c42e382e8c9", + "version": "3.4.1", + "port-version": 0 + }, + { + "git-tree": "04e105aecf5f7805dde15ac905cacb77ffcd3225", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "a1a12dbb8647dbc12381aa63fe0c66c48e2b4b31", "version": "3.0.1", diff --git a/versions/g-/gz-math7.json b/versions/g-/gz-math7.json index 7574a7ada977ae..61f24bdb5a1259 100644 --- a/versions/g-/gz-math7.json +++ b/versions/g-/gz-math7.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "788bff7f23bcb592cfbe23a0077ce5e338633515", + "version": "7.3.0", + "port-version": 0 + }, { "git-tree": "687462541825396052367baec48a08e4657d63d4", "version": "7.0.2", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index d6810381c69bc0..5ba8cace1d2e24 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c12d736ad0a8329d09a23dc7ae3a094d4ce02df1", + "version": "16.0.0", + "port-version": 1 + }, { "git-tree": "be8971ecbab0879a1db7aedfec5095c0d1d942b3", "version": "16.0.0", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 2a9dc543686d43..1cf75441ac7ca1 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "5baafcf92a1de9e3b94fba26f36f4287dad722fb", + "version": "8.2.1", + "port-version": 3 + }, + { + "git-tree": "d6359755bd398188b67a216f7627e9f297f47889", + "version": "8.2.1", + "port-version": 2 + }, + { + "git-tree": "1f39a3081e7055cbf5e8cc27b5f91fef2a274415", + "version": "8.2.1", + "port-version": 1 + }, { "git-tree": "6894af0b171aea403718ebb131b454a60b0c961a", "version": "8.2.1", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index 263361f4e95a24..e2d073401549b0 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24055818f16022ee4fe1feca4008df0a20d2cdb1", + "version": "1.14.2", + "port-version": 0 + }, { "git-tree": "1266e52ebeeb58e015af053d4e87e5356efe130e", "version": "1.14.0", diff --git a/versions/h-/highfive.json b/versions/h-/highfive.json index 38d69a6cceaea3..1e02949e7d41e5 100644 --- a/versions/h-/highfive.json +++ b/versions/h-/highfive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2eb72663fb8f48a01e0caaef98c56d8cf60ffdf7", + "version": "2.7.1", + "port-version": 1 + }, { "git-tree": "de97a368e21a37ade6556f064c16409a0a3132dd", "version": "2.7.1", diff --git a/versions/h-/highs.json b/versions/h-/highs.json index 508cd5fc93b4c6..28519ab17eb645 100644 --- a/versions/h-/highs.json +++ b/versions/h-/highs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70dcabf84d768dffa37123812c300637dc9231a5", + "version": "1.6.0", + "port-version": 1 + }, { "git-tree": "bf3c23e1f9f53ae9d35cd62b49a064556bf9ec13", "version": "1.6.0", diff --git a/versions/h-/hypre.json b/versions/h-/hypre.json index 39edafad89499d..67e936f1c0e97e 100644 --- a/versions/h-/hypre.json +++ b/versions/h-/hypre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c86dd4b42c27ebdfbfa8c276e3e1b1d8f9ca7333", + "version": "2.29.0", + "port-version": 1 + }, { "git-tree": "bb61b149787c812f654a86f6863a6e4b8cb011cb", "version": "2.29.0", diff --git a/versions/i-/idyntree.json b/versions/i-/idyntree.json index 6ac41a1e9644fa..e21ba65525faf1 100644 --- a/versions/i-/idyntree.json +++ b/versions/i-/idyntree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1899c3e91178e266bedb71a79fcf173f009db6b", + "version": "10.0.0", + "port-version": 0 + }, { "git-tree": "50658eb0c1ccc3ada2d91638cddb51bec93dd2c5", "version": "9.0.0", diff --git a/versions/i-/imgui-node-editor.json b/versions/i-/imgui-node-editor.json index be4fe961d4acd7..d22e01fd960ff0 100644 --- a/versions/i-/imgui-node-editor.json +++ b/versions/i-/imgui-node-editor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b660409ffe6d690ff6a3fae999b249e4521b5583", + "version": "0.9.3", + "port-version": 0 + }, { "git-tree": "26e2cf3260ea1e08e61912431635f49d24b6ea87", "version": "0.9.2", diff --git a/versions/i-/immer.json b/versions/i-/immer.json index 4874b892536f33..4f5e56105d1885 100644 --- a/versions/i-/immer.json +++ b/versions/i-/immer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9495490d64d82334b0cf687ceb2ba810d14b7755", + "version": "0.8.1", + "port-version": 0 + }, { "git-tree": "e133c376f7ef7d4e7c8b78245b70231e8df5b601", "version": "0.8.0", diff --git a/versions/i-/ismrmrd.json b/versions/i-/ismrmrd.json index 1b739596c1ccc7..7a4ee983466928 100644 --- a/versions/i-/ismrmrd.json +++ b/versions/i-/ismrmrd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d06eae0d931f4c173562d89e9b4239f844910ab", + "version": "1.13.7", + "port-version": 0 + }, { "git-tree": "b378ab76b7b723dd6b9091f897c87b5a99fc11b7", "version": "1.13.2", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index b848437c2c790c..924de2af6fd062 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b74bb68b58026e759112afb8155d44650cee24b4", + "version-string": "5.3rc02", + "port-version": 0 + }, + { + "git-tree": "9da4bc8949edd65bc3e0afa8e694480e330f5f40", + "version": "5.3-rc02", + "port-version": 6 + }, { "git-tree": "33def29a955f79fae7497d8be276decf175a9881", "version": "5.2.1", diff --git a/versions/j-/jsoncpp.json b/versions/j-/jsoncpp.json index ca8db93235910b..eccacde2a2fe60 100644 --- a/versions/j-/jsoncpp.json +++ b/versions/j-/jsoncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0213314186f58bfac60d8dee9895c137291db35d", + "version": "1.9.5", + "port-version": 1 + }, { "git-tree": "ee92c743e235ebd2eda342c656704f20a329bda9", "version": "1.9.5", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 1ce6a7c736920e..62aa5f801e2186 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e89f30157ff02233bb4ec6661f40356e6a94260", + "version": "0.9.9", + "port-version": 0 + }, { "git-tree": "3e076a2668e15aa6ad44ff29f45356467f745766", "version": "0.9.8", diff --git a/versions/k-/kealib.json b/versions/k-/kealib.json index 56c6415575b595..40a96ca4481695 100644 --- a/versions/k-/kealib.json +++ b/versions/k-/kealib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e23b8bf23a4254e1028ca0c93f722a2691012852", + "version": "1.5.2", + "port-version": 0 + }, { "git-tree": "d6136ef42467c0204cd6a082a272c16ab955caa3", "version": "1.4.14", diff --git a/versions/k-/keccak-tiny.json b/versions/k-/keccak-tiny.json new file mode 100644 index 00000000000000..1a1c9c5afaecba --- /dev/null +++ b/versions/k-/keccak-tiny.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "068d9cedaf0a577eabe71f008037116929435931", + "version-date": "2014-09-08", + "port-version": 0 + } + ] +} diff --git a/versions/k-/keystone.json b/versions/k-/keystone.json index 68b76c7cae81b4..7ed0f91ddb92c8 100644 --- a/versions/k-/keystone.json +++ b/versions/k-/keystone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c08eb2c84899fd5de79744b811c859667c7cfc17", + "version-semver": "0.9.2", + "port-version": 3 + }, { "git-tree": "f0094b1730f5973d7c3661eec95eb009d1d272b9", "version-semver": "0.9.2", diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index fa5bc1fe9f29c3..7883f0191f9f10 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47559725520a0015829f65dfda7f3b28a7a7d78f", + "version-semver": "4.3.0-alpha3", + "port-version": 0 + }, { "git-tree": "74b3fa8f53d6a1d173c09c2f87f865125717d894", "version-semver": "4.1.0", diff --git a/versions/l-/lexbor.json b/versions/l-/lexbor.json index 10962ee2b67dbd..1d99be98202bec 100644 --- a/versions/l-/lexbor.json +++ b/versions/l-/lexbor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae940a82ff44ebbeea58d1022e28ae1d1f853213", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "f5c7890c5fb34ec0622b01dfdff10f11e8dccdbd", "version": "2.2.0", diff --git a/versions/l-/libassuan.json b/versions/l-/libassuan.json index fa8b9bd7737fd6..09e021a51864d5 100644 --- a/versions/l-/libassuan.json +++ b/versions/l-/libassuan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5eb84b4591e790d4fe81a7a5cd37ebd6e567d40e", + "version": "2.5.6", + "port-version": 0 + }, { "git-tree": "0072ae5afdd0e25564266077bd7600faf20d2770", "version": "2.5.5", diff --git a/versions/l-/libavif.json b/versions/l-/libavif.json index 8a8e94f6dae276..43623772938fd6 100644 --- a/versions/l-/libavif.json +++ b/versions/l-/libavif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "204b6c51e6d23a77e275b5ec370e15e1c9fccaf1", + "version-semver": "1.0.1", + "port-version": 0 + }, { "git-tree": "864c480bb39144c9905eb74976a59efd74224429", "version-semver": "0.11.1", diff --git a/versions/l-/libcap.json b/versions/l-/libcap.json index 1fe3d4d68e66b7..1be64790592701 100644 --- a/versions/l-/libcap.json +++ b/versions/l-/libcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d699cd38c2cf76ab59628fc3437c381ccabd2383", + "version": "2.69", + "port-version": 2 + }, { "git-tree": "3f8091b1a094e5a0ab51652478289c040e98e7ca", "version": "2.69", diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 7f98184b0bd1a3..38ee00e4698c22 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "378d40ce036cf220dfaedf27f625a28d6e72d3e9", + "version": "1.7.3", + "port-version": 4 + }, { "git-tree": "9056cd67b1885ed4721a931467fb7fd1eb5b4bf3", "version": "1.7.3", diff --git a/versions/l-/libenvpp.json b/versions/l-/libenvpp.json index b94e65ef036133..6d3a1d1d5344bf 100644 --- a/versions/l-/libenvpp.json +++ b/versions/l-/libenvpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5388e430f77d77307fe2d4358241e684886390bb", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "8eb66698367b380452b1f693237d383381e2373e", "version": "1.0.0", diff --git a/versions/l-/libeventheader-decode.json b/versions/l-/libeventheader-decode.json index ea3869e9d25c2c..739d960aa7a86d 100644 --- a/versions/l-/libeventheader-decode.json +++ b/versions/l-/libeventheader-decode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75e4da728961822b82de47fb036aeae025893fb6", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "0e830f1815ed8de8c73a7e90841533854b54261c", "version": "1.1.0", diff --git a/versions/l-/libeventheader-tracepoint.json b/versions/l-/libeventheader-tracepoint.json index c1ca544bb1777f..6b1255fd9830ff 100644 --- a/versions/l-/libeventheader-tracepoint.json +++ b/versions/l-/libeventheader-tracepoint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "076106bc342a9e9253ced5bfd4e13ac16b360d20", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "ba5030dde966e742b068efb77cab8f820f0ab7ea", "version": "1.1.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index e675172fcb9dbb..547478dfc6d905 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "982248d325407b09d26ad0d929f67fd0b873f984", + "version": "3.4.4", + "port-version": 6 + }, { "git-tree": "db85488447cfda7bcc5e08452d8581ac0295b4c9", "version": "3.4.4", diff --git a/versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json index ff702f94936a3d..19640318d55208 100644 --- a/versions/l-/libfreenect2.json +++ b/versions/l-/libfreenect2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfa5e96443079122b324178a6ed421423067039a", + "version": "0.2.1", + "port-version": 0 + }, { "git-tree": "68766f591851bf3b1bf97eff04a69dcd894d712a", "version": "0.2.0", diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json index b959ae209a7f38..3e9265716b62e7 100644 --- a/versions/l-/libgcrypt.json +++ b/versions/l-/libgcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb85f5dab3e4cacb5da45cf352ca23a25d7c4d18", + "version": "1.10.2", + "port-version": 0 + }, { "git-tree": "47460b53b2ea4430d6b020f00d4a4557ef690427", "version": "1.10.1", diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json new file mode 100644 index 00000000000000..b68106b2e4f233 --- /dev/null +++ b/versions/l-/libgig.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "328bc5b2b64bc33badee7d282589b14d49aadb55", + "version": "4.3.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libgnutls.json b/versions/l-/libgnutls.json index d8aa09978a5bc6..997bb9db7b76a8 100644 --- a/versions/l-/libgnutls.json +++ b/versions/l-/libgnutls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdcde91b6757c786647f9bfafef1e0f02591a859", + "version": "3.8.1", + "port-version": 1 + }, { "git-tree": "7818d88f0b76ec5775b8bc6269ebf22d9aea466d", "version": "3.8.1", diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index f7edf93a2e6793..e49bc861667fc0 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4375cd3cc867a96a2d8b5e99a425b9b3efb4f863", + "version": "1.47", + "port-version": 0 + }, { "git-tree": "29784b31b199a3d0c00583b6619f73b834e1b3ed", "version": "1.46", diff --git a/versions/l-/libgpiod.json b/versions/l-/libgpiod.json index afbc40cd205752..e9b53096623ec1 100644 --- a/versions/l-/libgpiod.json +++ b/versions/l-/libgpiod.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "c470b2f0c5a31ebee904f7486e50b2adf0f8e8c2", + "version": "2.0.2", + "port-version": 1 + }, + { + "git-tree": "e78935fc408abcc2e62d8d1ca1831b0fd5510b7d", + "version": "2.0.2", + "port-version": 0 + }, { "git-tree": "d5fde793827568c4be74cb76793650e37e3e5354", "version": "2.0.1", diff --git a/versions/l-/libgwenhywfar.json b/versions/l-/libgwenhywfar.json index aefee739a55d27..d4db3c38c6eec9 100644 --- a/versions/l-/libgwenhywfar.json +++ b/versions/l-/libgwenhywfar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6402ae94301ce25a7f846286954d8847e1360871", + "version-semver": "5.6.0", + "port-version": 4 + }, { "git-tree": "82aafb480367645c4ef047b08b420a8926b1b24e", "version-semver": "5.6.0", diff --git a/versions/l-/libharu.json b/versions/l-/libharu.json index d5a4d1a300457a..6529e3e2a02360 100644 --- a/versions/l-/libharu.json +++ b/versions/l-/libharu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0acfe5296a4986caf51cea318361967f5d57e3ee", + "version": "2.4.4", + "port-version": 0 + }, { "git-tree": "0418db9cf0a5dac68fd54f5a6dfc384bbece1406", "version": "2.4.3", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 7ebd1b7efb46cf..8b30de1245346a 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "32b640f029df01a4322b7d36d9405cf366c7811d", + "version": "1.17.1", + "port-version": 0 + }, + { + "git-tree": "bfddf765a3840434bd1306bc48193566642e9bef", + "version": "1.17.0", + "port-version": 0 + }, { "git-tree": "1874b1dd0f2756a3254c8eec416430b941af7b6e", "version": "1.16.2", diff --git a/versions/l-/libical.json b/versions/l-/libical.json index 63677c2b6a17b3..b2e6426e551ed3 100644 --- a/versions/l-/libical.json +++ b/versions/l-/libical.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef8cbea0185c5c9154f2ef0a38db78541f2e5769", + "version": "3.0.17", + "port-version": 0 + }, { "git-tree": "86f667b283c1e7d92dd68a3733d80d2e074db342", "version": "3.0.16", diff --git a/versions/l-/libics.json b/versions/l-/libics.json index dd0bcac49050ad..5c7597217922d6 100644 --- a/versions/l-/libics.json +++ b/versions/l-/libics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd79bb59a4716358360e475a7aaa3ec6a20c80e1", + "version": "1.6.6", + "port-version": 0 + }, { "git-tree": "aea77d2369ae831edee51b05bc8dcad585795990", "version": "1.6.5", diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index 552f76f234eccd..65f1e85078d4a9 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20e169744f242f67bc4b4dc310f5785d55dba58c", + "version": "2.3.4", + "port-version": 3 + }, { "git-tree": "4784d5f7f99d7ea1ebe6f1ef01943e402e7bfddf", "version": "2.3.4", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 91026f6f0cfb64..71290878f0a4f5 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "481b08127d4002ba7441f144df259e03271e7592", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "4510832adaa3f5f415a59d26f5520ca250a8ff77", "version": "3.0.0", diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index 43ac165f40ce9e..4a9dbea80d749a 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ace25316c085db75ac26220e854bd83baa86294", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "f93f38276ee4097f4b4e85f58b14aaa7e0cda3d4", "version": "1.0.6", diff --git a/versions/l-/liblemon.json b/versions/l-/liblemon.json index fcbabec40c96e5..33774711fcb8b2 100644 --- a/versions/l-/liblemon.json +++ b/versions/l-/liblemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bdd7ed9804fee3e743082bb048916a213777a79", + "version-date": "2019-06-13", + "port-version": 8 + }, { "git-tree": "e7357874ce9b71f43cb1c298dbb1228ac9241a69", "version-date": "2019-06-13", diff --git a/versions/l-/liblsquic.json b/versions/l-/liblsquic.json index 6c114d84eaf735..d94777b3eabf51 100644 --- a/versions/l-/liblsquic.json +++ b/versions/l-/liblsquic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0368e7d992fcf1272735695f405a56c9a7c35ff6", + "version": "3.3.2", + "port-version": 0 + }, { "git-tree": "9117a86afaed60857454ba0b5a5e684fc947ba56", "version": "3.1.1", diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index 0a475ce93723e3..ee12a2142a6597 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f285b7c4ffa2cc065c7c6fec4b61006f7fa2714e", + "version": "5.4.4", + "port-version": 0 + }, { "git-tree": "3f97f6a0904a3add9c3273f8ab1993902d75d5ef", "version": "5.4.3", diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json index d8d90fc1073548..d5b3517574d06b 100644 --- a/versions/l-/libmagic.json +++ b/versions/l-/libmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bb05dd744d7eb83ad0a8d887ef589aaea37f6b3", + "version": "5.40", + "port-version": 3 + }, { "git-tree": "d70a57e09ed4060b2ade1cb1f80bcbdbd8a7a1ec", "version": "5.40", diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index 9c03ecca5fddef..da9a71ac9b1cba 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a396718bfaa9c8e9e950cb3aaedb7bd562a157a7", + "version": "1.7.1", + "port-version": 0 + }, { "git-tree": "2bac54e78c424e4420145ae4a407e7b88229a387", "version": "1.4.3", diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json index 0fcde3542cacba..126956d9774c87 100644 --- a/versions/l-/libmediainfo.json +++ b/versions/l-/libmediainfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2bccca86faecebdacabafa1ff7b63e34168d342", + "version": "23.10", + "port-version": 0 + }, { "git-tree": "a5adf3a515c6144124fe9bb1825505de0f234b8c", "version": "23.4", diff --git a/versions/l-/libmorton.json b/versions/l-/libmorton.json index 1ff7edfe2036a9..baafdd4f92eeec 100644 --- a/versions/l-/libmorton.json +++ b/versions/l-/libmorton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f00ce462ab2d581aa3d0bb33c2ff37ff745377c", + "version": "0.2.12", + "port-version": 0 + }, { "git-tree": "01b61d968554cd38b6d3df05d11beda85750ff11", "version": "0.2.11", diff --git a/versions/l-/libmspack.json b/versions/l-/libmspack.json index 6f03352bd14bc0..f0d460cb1cd7fe 100644 --- a/versions/l-/libmspack.json +++ b/versions/l-/libmspack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "198f4c8a1eac2254110eaed939dc99744c78a58f", + "version": "0.11", + "port-version": 0 + }, { "git-tree": "b26826abcd6d912b526809624f838431cb470b3d", "version": "0.10.1", diff --git a/versions/l-/libnop.json b/versions/l-/libnop.json index 2b8d1a131a7517..1e049f0fa7ef4e 100644 --- a/versions/l-/libnop.json +++ b/versions/l-/libnop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3612fe75503c2bf24d2e6069f7cd8dfff289d90", + "version-date": "2021-11-03", + "port-version": 0 + }, { "git-tree": "97da98d4a3cd4e60972f53211892baa5b2f066df", "version-date": "2021-03-01", diff --git a/versions/l-/libopenmpt.json b/versions/l-/libopenmpt.json index fe08a0b1092411..8b7fd4d0b8d7c1 100644 --- a/versions/l-/libopenmpt.json +++ b/versions/l-/libopenmpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f46d9666ff500c3694970f2031cdf0583d3be2e4", + "version": "0.6.12", + "port-version": 0 + }, { "git-tree": "5d66142c7858d9ac23b31a1ab5d596e2370ef7c2", "version": "0.6.7", diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json index 74d6a3bc4f3155..0bebfe36308ba6 100644 --- a/versions/l-/libosip2.json +++ b/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2811fe1a0d4cb7faabaebfa4cf47e1296bcddd2", + "version": "5.2.0", + "port-version": 5 + }, { "git-tree": "9b3b93c2039a5369ddd07c5dfb482644ce18c961", "version": "5.2.0", diff --git a/versions/l-/libpcap.json b/versions/l-/libpcap.json index 48295baaf347a4..480eef1d4f6387 100644 --- a/versions/l-/libpcap.json +++ b/versions/l-/libpcap.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7bfda50e586151e14fb6704ed154e8747bc64ea9", + "version-semver": "1.10.4", + "port-version": 1 + }, + { + "git-tree": "3af367bec0a2e0049f723ffb3654d262e775ac45", + "version-semver": "1.10.4", + "port-version": 0 + }, { "git-tree": "6cf3667c0320e2ff5d92d45e91b07fb3bf2fe05e", "version-semver": "1.10.1", diff --git a/versions/l-/libphonenumber.json b/versions/l-/libphonenumber.json index 9b0438921e7437..a1199b9036fa0b 100644 --- a/versions/l-/libphonenumber.json +++ b/versions/l-/libphonenumber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9df18bd6b1bab30de04c91942cf6724b6ff26f0c", + "version": "8.13.23", + "port-version": 0 + }, { "git-tree": "8c0eab944c22034092f0200dcbdd5a422eddc7f9", "version": "8.13.17", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index b4c4666cfe574f..c19c69f99241b9 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbd6314cbfd04132985a7a6412184d368c3cd0b6", + "version": "16.0", + "port-version": 0 + }, { "git-tree": "859b43f8db33293c411c365d945ecd4ae2cc056b", "version": "15.3", diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json index 21896623d77aea..404df4b63dc656 100644 --- a/versions/l-/libpqxx.json +++ b/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8083e94ed4ded4546cbad5263a7efb4b9b154b73", + "version": "7.8.1", + "port-version": 0 + }, { "git-tree": "7ddefb009a457fb899a8661e46ba79544da6b2df", "version": "7.7.4", diff --git a/versions/l-/libqtrest.json b/versions/l-/libqtrest.json new file mode 100644 index 00000000000000..76765128975b10 --- /dev/null +++ b/versions/l-/libqtrest.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "efcb288a743d19fa7e795479221b17644864890e", + "version": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libraqm.json b/versions/l-/libraqm.json index e8e89f1b8f03e4..1cfd676f9e10ff 100644 --- a/versions/l-/libraqm.json +++ b/versions/l-/libraqm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65a919304f99dbe9ed1c5f2777785cd89ed97ad2", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "aae562aa1a91357654efbd688ca511ae34d1afed", "version": "0.9.0", diff --git a/versions/l-/libremidi.json b/versions/l-/libremidi.json index ba6cc62e387e3f..08f47d60b1a070 100644 --- a/versions/l-/libremidi.json +++ b/versions/l-/libremidi.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "4269a93684ffd5145f2b5a79421824b6efd87372", + "version": "4.2.3", + "port-version": 2 + }, + { + "git-tree": "4427d9259242a0dbc53753710b42b6531276f392", + "version": "4.2.3", + "port-version": 1 + }, + { + "git-tree": "0a6cac97560ba37eae699bdb65f6561a8415d362", + "version": "4.1.0", + "port-version": 1 + }, { "git-tree": "4c1473e864943f0e6189d315c1eb09a77ce3a3f0", "version": "4.1.0", diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json index 66ddcb5815861e..e00d74be3f6402 100644 --- a/versions/l-/libsbml.json +++ b/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5610c6abee862e6ef538a8c62fde2c6ff62325e0", + "version": "5.20.2", + "port-version": 0 + }, { "git-tree": "9d718a41ed85525971eb0cc46dbb31e91673c576", "version": "5.20.0", diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index 4bc2bbdde87744..b6fee31f2b3939 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e925ba41cc6441c6f2491462a26bea64d0cdeb16", + "version-date": "2023-08-11", + "port-version": 0 + }, { "git-tree": "a70cca2c9bcfe6b7848efbf21a9b2779b4e47055", "version-date": "2021-04-29", diff --git a/versions/l-/libsndfile.json b/versions/l-/libsndfile.json index ca603248d7ecb0..416229efccade2 100644 --- a/versions/l-/libsndfile.json +++ b/versions/l-/libsndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c973dc3a659457ad4bd00a68da7903b674720f69", + "version-semver": "1.2.2", + "port-version": 0 + }, { "git-tree": "f78736afe548520c2bd5675eec91a9c15112a0fb", "version-semver": "1.2.0", diff --git a/versions/l-/libsvm.json b/versions/l-/libsvm.json index e668294437c7d4..51339f2f856748 100644 --- a/versions/l-/libsvm.json +++ b/versions/l-/libsvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "322988838e09b1a1ce9766a803eab0e9867e0e1d", + "version": "3.32", + "port-version": 0 + }, { "git-tree": "6ee5de615b1449a216f61cb83ec2704e93a34495", "version": "3.25", diff --git a/versions/l-/libtins.json b/versions/l-/libtins.json index d81d747b036c65..f616561cdb74e2 100644 --- a/versions/l-/libtins.json +++ b/versions/l-/libtins.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2aca4b43d1b64057b5316e609514d41ee7013c4b", + "version": "4.5", + "port-version": 0 + }, + { + "git-tree": "30fbfd14d90e9aedac77f8272135a7e51444b01f", + "version": "4.3", + "port-version": 7 + }, { "git-tree": "4a1470befea5c6b5c7418f9b85f37d6f8733d7d5", "version": "4.3", diff --git a/versions/l-/libtracepoint-control.json b/versions/l-/libtracepoint-control.json index eeda65aea1bdab..0e32295690ae1b 100644 --- a/versions/l-/libtracepoint-control.json +++ b/versions/l-/libtracepoint-control.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "410f33d930822507551474d486031021c4fea1dd", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "46fe85ffc8eb1f431685a49dace1cf330d54d6c9", "version": "1.1.0", diff --git a/versions/l-/libtracepoint-decode.json b/versions/l-/libtracepoint-decode.json index 7b7e0e933d50e5..cf62f1e72bab52 100644 --- a/versions/l-/libtracepoint-decode.json +++ b/versions/l-/libtracepoint-decode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51ab3448c97daa75b873c3e4b70f2894908fc2f4", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "3559772cf7c926b54b92bdc0e72ecaa9e06534d6", "version": "1.1.0", diff --git a/versions/l-/libtracepoint.json b/versions/l-/libtracepoint.json index 128184e5a81f16..f6a59a85d7552d 100644 --- a/versions/l-/libtracepoint.json +++ b/versions/l-/libtracepoint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f85708521c851b4c64ad10c04ad0261343fef25", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "0106479d49132d017d8c89f4189bce8cb4251479", "version": "1.1.0", diff --git a/versions/l-/linalg.json b/versions/l-/linalg.json index a863c0854f8b63..600cdcb55ead75 100644 --- a/versions/l-/linalg.json +++ b/versions/l-/linalg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8287026554baea7ac2fbbf2ec7c54d3ebe181b7", + "version": "2.2", + "port-version": 0 + }, { "git-tree": "dec66a04dc695329609da7aad70ecfde3e36aa4b", "version": "2.1", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 1a224eb4e4e575..91ea1f569bc6c9 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bbd8fe3bd9dd7f507ec0b0713c5de3109d312b5", + "version": "17.0.2", + "port-version": 0 + }, { "git-tree": "484d2a5abb5ffc10d18e18603adb20bd01854012", "version": "15.0.7", diff --git a/versions/l-/log4cplus.json b/versions/l-/log4cplus.json index ac896243b215aa..8c6f6e4e161462 100644 --- a/versions/l-/log4cplus.json +++ b/versions/l-/log4cplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0a2d8577299ff33c61cbb08d3eb4d4616e4e392", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "7eb39878c5311e28d66f4a25e0c1583c1c99ff82", "version": "2.0.7", diff --git a/versions/l-/ltla-cppirlba.json b/versions/l-/ltla-cppirlba.json index df091854bf8f85..24d3483a70b002 100644 --- a/versions/l-/ltla-cppirlba.json +++ b/versions/l-/ltla-cppirlba.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6edf2cf4964bd6d76488af4320eea69e6604b226", + "version-date": "2023-09-20", + "port-version": 0 + }, { "git-tree": "a1a4fe3742a5fecbadcb34155df9230a279a3e1c", "version-date": "2023-04-07", diff --git a/versions/m-/makeid.json b/versions/m-/makeid.json index 4b7c72c99db533..72598a80f2046e 100644 --- a/versions/m-/makeid.json +++ b/versions/m-/makeid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1e67fd4892325f13527874899102c734da3333d", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "08114cbf3e65a21af7fa59508fc838fb4cac067c", "version": "1.0.2", diff --git a/versions/m-/matio.json b/versions/m-/matio.json index bfd65ec39e899b..f0f3fc82ed8103 100644 --- a/versions/m-/matio.json +++ b/versions/m-/matio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42d087530e333855d74225712aab7755d2eb6be2", + "version": "1.5.23", + "port-version": 3 + }, { "git-tree": "28df0a44f618c5fd412fafda91507f3bad6ac4b1", "version": "1.5.23", diff --git a/versions/m-/mdns.json b/versions/m-/mdns.json index 1f40a43a9acc95..a53d9320ffdc6b 100644 --- a/versions/m-/mdns.json +++ b/versions/m-/mdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67bfd722fb49f35c6a08ca9c1e4e1dea2a53d5df", + "version": "1.4.3", + "port-version": 0 + }, { "git-tree": "56cbde1a40c13e9584e62d15f69c2579f6bcd476", "version": "1.4.2", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index ac00c004c71ea4..2832dbd483a946 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f318339b0c26814bbd53fce78471f1a95fdfe0d", + "version": "23.2.1", + "port-version": 0 + }, { "git-tree": "cdf9e52bbaf36ffdf540342ea090d8535ad7a883", "version": "23.0.1", diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index 008e44fdd91132..4ab34e020a0cad 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d77f713bae64d416bf60adb3395a3b295feccc9b", + "version": "4.0.1", + "port-version": 0 + }, { "git-tree": "fb59eb8b735f74193a79326e33fb6f9abc66846a", "version": "4.0.0", diff --git a/versions/m-/mongoose.json b/versions/m-/mongoose.json index ec07e58e30e893..ceba3f6d180912 100644 --- a/versions/m-/mongoose.json +++ b/versions/m-/mongoose.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfea1ea4e50f4361b3381a638ac89d023d91c51a", + "version": "7.12", + "port-version": 0 + }, { "git-tree": "1da80484966f8ca2b0840d8bb37c523bd0ddbc87", "version": "7.11", diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json index b8884b9e345689..20220eac430be9 100644 --- a/versions/m-/mosquitto.json +++ b/versions/m-/mosquitto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fbbe753533949d40d9ff4307bab2bb61432a117", + "version": "2.0.18", + "port-version": 0 + }, { "git-tree": "c8f2f0732c56a4cc622139bba1b7cb110dea985d", "version": "2.0.14", diff --git a/versions/m-/mpark-patterns.json b/versions/m-/mpark-patterns.json new file mode 100644 index 00000000000000..0c522ba9ec0e25 --- /dev/null +++ b/versions/m-/mpark-patterns.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f8b22778a3c1393308468021303beb56ff392a03", + "version-date": "2019-10-03", + "port-version": 0 + } + ] +} diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 77fca26318bfee..27abc59b73d05e 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6e990602e7caa6965db94c4ef01e3f1b44fb4f67", + "version": "1.31.3", + "port-version": 3 + }, + { + "git-tree": "58fbb0bf0ec6307689125ef1ba71112b670a42a9", + "version": "1.31.3", + "port-version": 2 + }, { "git-tree": "73f380749ae40814a07c7a0952e94db2970a9b85", "version": "1.31.3", diff --git a/versions/m-/murmur3.json b/versions/m-/murmur3.json new file mode 100644 index 00000000000000..44d1791a47aea1 --- /dev/null +++ b/versions/m-/murmur3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5f4ab89578aaab8f3e4edf66398db2a693753abb", + "version-date": "2015-05-02", + "port-version": 0 + } + ] +} diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index 00bf36d0cf2d16..5fc756df9f5cd9 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12002458bc69dbcd92c6792a3edd1f5e3931ae95", + "version": "4.8.1", + "port-version": 4 + }, { "git-tree": "2d17052df3479de37b4c756f4e90661c9fa85e7d", "version": "4.8.1", diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 9729be2cb7f030..ccd8edc4cdf77b 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a369a1a84bf659607d06fcfdcf2b38996c0f935", + "version": "1.57.0", + "port-version": 0 + }, { "git-tree": "fbaeb01777a225a56a3f29ea40db69711f06256f", "version": "1.56.0", diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 0dc20e108f4c79..14d3de6dba0818 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9552b83f2dfc8fc3211ce4e18708570193d9625f", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "dc20ed3b2fc048cdcebb7f936b2614b42e66c286", "version": "0.15.0", diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index ca65f6a8394074..304d661a0eae66 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "b2b2e40609c45b92b199a998590bb1074f1226d4", + "version": "1.0.1", + "port-version": 0 + }, + { + "git-tree": "40104b5c6052054c49211e1a9098f833dba4a63d", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "05c0bba60ffa39b1368709bb4ef25102b4b74c7a", "version": "0.19.1", diff --git a/versions/n-/nifticlib.json b/versions/n-/nifticlib.json index eecb403b5c8943..5be5f702c49be3 100644 --- a/versions/n-/nifticlib.json +++ b/versions/n-/nifticlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04096233d605e377c31588273d928c15538713ac", + "version-date": "2022-07-04", + "port-version": 0 + }, { "git-tree": "d889870db5d6d2e5afc8e738c6f6451c7d237a4c", "version-date": "2020-04-30", diff --git a/versions/n-/nmap.json b/versions/n-/nmap.json index 42f8154ba4e5b9..cd1029d5ce5510 100644 --- a/versions/n-/nmap.json +++ b/versions/n-/nmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d96fe27573cd4c06549f6a711e54f0f26a1c4485", + "version": "7.70", + "port-version": 11 + }, { "git-tree": "fd1dcfaf73ff23b171247d76abdca50cd7f10f33", "version": "7.70", diff --git a/versions/o-/oboe.json b/versions/o-/oboe.json new file mode 100644 index 00000000000000..90d27946745bb2 --- /dev/null +++ b/versions/o-/oboe.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "844ba873a3df24fb50fcb6fc5deef22642dfccb1", + "version": "1.8.0", + "port-version": 0 + } + ] +} diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 9ac81a207509ff..5bc87f64235ff6 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c93cd3ebf7b2a50082e97f5f7a6f4ed1cf1f5c94", + "version": "2.3.1", + "port-version": 3 + }, { "git-tree": "0089cd2cc3d48d19a5b465f43454dfb0124f9723", "version": "2.3.1", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 9f8bbfc9b724a6..a8b9511de714ae 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a445b3c7be57d018422e139945ff622292cd5cff", + "version": "14.0.1", + "port-version": 2 + }, { "git-tree": "ba65238d3998c84df40961d63f7c254fbac7639d", "version": "14.0.1", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index 1234dded03d514..4d45b6aea4b4ad 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a50cf77d055c6249b2568880f61fb72b8f916d62", + "version": "1.3.8", + "port-version": 0 + }, { "git-tree": "3f1e010d847419f3f68439f1ad1d76df9b118f26", "version": "1.3.5", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 9b0dd874dfae66..49da4aa3b11724 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fed3a9ba9a7731e30376ded1d6bdaba3e41b1ec6", + "version": "2.4.14.0", + "port-version": 2 + }, { "git-tree": "c74249169c46dbedf60590f672fb709294ffc7c6", "version": "2.4.14.0", diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json index 3dacc89cbb5cbd..147953942d6827 100644 --- a/versions/o-/openmpi.json +++ b/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a35bc145d32795f1a71cbe596de040805c3af780", + "version": "4.1.6", + "port-version": 0 + }, { "git-tree": "0958d31a6843d3961c39fb6d459543d9be852bad", "version": "4.1.3", diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index 268858725a7020..78b8486c51105a 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8565eefd07d9a9d108cec2545039261b53d2e3b1", + "version": "10.0.0", + "port-version": 6 + }, { "git-tree": "6200720b464b3cc005edd767613f3978f614a32f", "version": "10.0.0", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index 07122fc74b6fe7..8f05d268811b47 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e33c2a6c920269c1564d88ac95d0933771763ca3", + "version": "2023.1.0", + "port-version": 4 + }, { "git-tree": "185f20b166701fdc9c255e0ca7e574a88c1a34d9", "version": "2023.1.0", diff --git a/versions/p-/pipewire.json b/versions/p-/pipewire.json index 305b1592fff5bb..dbf6eb78a00355 100644 --- a/versions/p-/pipewire.json +++ b/versions/p-/pipewire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "482bffaec768a8c253cd14b8dec373db14a49338", + "version": "0.3.83", + "port-version": 0 + }, { "git-tree": "a013a40facd5bdfc94419f5ce591b2c776922462", "version": "0.3.62", diff --git a/versions/p-/plplot.json b/versions/p-/plplot.json index 4f67b2bde98dcc..de2860c2d3f801 100644 --- a/versions/p-/plplot.json +++ b/versions/p-/plplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "650f7b8973b4a28f84fc0e8ab1711e468417f564", + "version-semver": "5.15.0", + "port-version": 2 + }, { "git-tree": "3fb1fa2f2f5f9c3ea3543f5ba3074138be2d2320", "version-semver": "5.15.0", diff --git a/versions/p-/pravila00-enum-string.json b/versions/p-/pravila00-enum-string.json new file mode 100644 index 00000000000000..0a3a67d0405731 --- /dev/null +++ b/versions/p-/pravila00-enum-string.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a5172f6fa4786d4b0d4f41d843e24c04799a2d85", + "version-date": "2023-10-16", + "port-version": 0 + } + ] +} diff --git a/versions/p-/pravila00-make-vector.json b/versions/p-/pravila00-make-vector.json new file mode 100644 index 00000000000000..3b694dd47e2800 --- /dev/null +++ b/versions/p-/pravila00-make-vector.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b4a9f4a88cb5645d9a5f6827293bc3732a57e043", + "version-date": "2023-04-10", + "port-version": 0 + } + ] +} diff --git a/versions/p-/proxsuite.json b/versions/p-/proxsuite.json new file mode 100644 index 00000000000000..193a49c45ecb8d --- /dev/null +++ b/versions/p-/proxsuite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d43b63f01c1240a12c85794fdde566064996b845", + "version": "0.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/p-/pugixml.json b/versions/p-/pugixml.json index d1ef05aa0bb41a..dccc7cd1c1bfb9 100644 --- a/versions/p-/pugixml.json +++ b/versions/p-/pugixml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e38344aea6e7529afde3895e0885ed5cb0c0542", + "version": "1.14", + "port-version": 0 + }, { "git-tree": "4547c4ff9371f06f34f087f2989f884ab3ef7b71", "version": "1.13.0", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index d032255dc1d0a8..24a56166d38006 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4a6f18e51fa29570a8e35e20668aa86e60f6ff7", + "version": "2.3.7", + "port-version": 0 + }, { "git-tree": "32321bfdc0e4563ed40687585b48038d551f6149", "version": "2.3.5", diff --git a/versions/q-/qcoro.json b/versions/q-/qcoro.json new file mode 100644 index 00000000000000..4a347717df90d6 --- /dev/null +++ b/versions/q-/qcoro.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0b82c30bd542212b17946094149433dda747515f", + "version": "0.9.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index ec5e76fdb9072c..856cd3966c6516 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd3a019873d77d8951d137f3f5a4bd3ae8fc147a", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "be8daf4a45d4f87e7867bd9110ba974c3db3aa00", "version": "5.15.10", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index 2a6eb937ea93bf..6fede3be3dacbe 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45de7184a24f527bbccf33013f1c6667d5e6f668", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "7862807b3cdd0a4647ba2f9db4eb3c1338536e9e", "version": "5.15.10", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index dc85eeafc339c2..7a173015f515dd 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "382ab13532eab56c75a3a4150a8bdb2cf9464200", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "11a9fee7235b0de6c54f4b1ee65e103bc94a6075", "version": "5.15.10", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index f28cb7c57f72fd..a509edccd1820e 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "c09b409166a1cb3e4881ee5b0081069227a7ae45", + "version": "5.15.11", + "port-version": 1 + }, + { + "git-tree": "d26db1adfbe17c91d6c2858d38290ce2277cd8a3", + "version": "5.15.11", + "port-version": 0 + }, + { + "git-tree": "0ee4e266c41088bae8b961529841eebc5696a749", + "version": "5.15.10", + "port-version": 7 + }, { "git-tree": "3910010e49edbdf2f8a7bf917ee51f5ab888769e", "version": "5.15.10", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index 470a52be7d7ccf..0e2d14123f0108 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "917d2b5a9ee716031be8a168076d174ec6712788", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "21cff64c27a49de9aeebf975fa890c7de64b2ede", "version": "5.15.10", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 16777143387321..48bd66c53dd9e4 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b623eee1a6ff0e483580654a60d9e6eb4787be92", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "8b9f8ae492cb7fb0ad32863279bfd1796779a043", "version": "5.15.10", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 1813793f887d50..3c8db1d4cacbd6 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80f8d82fe81bf098c225ca52b7ea49478512be67", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "734a01140c22505395e27032cdbadebbdb0d1cdc", "version": "5.15.10", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index c865fd09b97b3d..f969d3fa8533b4 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "880d2e0ae6f6042a0cb4baae85bc7bc7c950b746", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "c7cc59aec9e75dc548a741b01b94b13438904e99", "version": "5.15.10", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index b60ede1f0c308f..3c9a0a16c4dc0e 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e2640c2eff33d0d16d7a3168aeb75bccb8fbc37", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "260c42f72e3b608905415b0570f98a354264d9e0", "version": "5.15.10", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index b3870620a87e8b..122e59f0742f42 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a02c1cd4d355720fc3b2af9d0ddad446279a731", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "556adf6709fe319be9960166e72a30c03372d370", "version": "5.15.10", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 065e27e4a63c0d..1ac424030bacc8 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "209e1c20fbc69e0bd69bf50aad1a5b049f7cf5fd", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "53cf70df24a80e1b6c72b85f9d6ff8c4765b7af2", "version": "5.15.10", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 8bf01c71c0380a..913cb0cfa4015f 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea581d5a2583209a4b276fd9a20f8c04194e29c0", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "39d5acff58afd279f8249487ea29263910b24220", "version": "5.15.10", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 216dd8c7bec027..2440816d684969 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55991602e3deb4103599fc04c287a4959c847016", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "fc2aca1d6bd39aba9d6e45651d8f2908e3a555c8", "version": "5.15.10", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index ab158ecdbfb269..0982c9698795b1 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a50e9a0fc524758440c3715855627b8b8bd531f0", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "12b1fde22a5acf67e0ac9e5066ff280363131c14", "version": "5.15.10", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index 33c3cb2603445a..91adb1ac41e0d6 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0fc4bdfce63f3f7410762189b98448182f9b3ab", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "398e7c0eab3505667a21ba09a66acbaf434f2469", "version": "5.15.10", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index f9f4681f94e08d..9510c155ba8c77 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "e4c6f73398cdab1711339020a1dfe0630e0f89c4", + "version": "5.15.11", + "port-version": 1 + }, + { + "git-tree": "3c3d01a70310ae2d017d0e08428b1902c45b872f", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "a6c4649e892aeb5e8c154336702ee48f0dfcfcf9", "version": "5.15.10", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index 80c87368431a46..9462015627700b 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2245d4d7c2e1064fd19a893f34ee247bdb07322b", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "dae7f812fc32b8659a16029d431fe0fe0156681e", "version": "5.15.10", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index 762e02785d7769..301ad95bca54d4 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "714b9adc89ab6a09174e73be5497e982e4e830fa", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "9769b05f79a109d7fcd2ace8c3500638504f586b", "version": "5.15.10", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index 19a8ac2bff3cdb..5c0081dcb554c4 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e63a158c8c9551554c2986dab6d771efabd38c7", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "342b8c5a23f4f9690bedb464a32e171dbb5ef2e4", "version": "5.15.10", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index d686cac46f968f..26bc37f30d8c48 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1d335409f6c5c9af37eb6721b5d68d78a8dbdb1", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "e22bfd152605c0559014192e82b46e465e16dac6", "version": "5.15.10", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index bc69d8c1d5f48d..37efcaa9d1c41f 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83e7e782900b0f016a0f7b659e6cb235f7677cf7", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "6f93d74b2bcca02aee5e9e4e7e0126f5c445aeaa", "version": "5.15.10", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index 674877136587fb..be9f8fb2e74595 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4c21b90523ce92847d4b1f675a84ba4f34a9710", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "bf51477b296f65a9b1548f1f895fb123aba0c792", "version": "5.15.10", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index dc2078c350dfc9..392a3f1371b500 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6eb406a4e80cd474efe6f42e896438b7b90ee96c", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "26f667cea870335a6f46ca414baa020c8f6aba35", "version": "5.15.10", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 172bd3ec20b857..8696e62d28f103 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5883a76574d6f2b6077898a5fd3ca52d1788dd88", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "dbca7fa67ff94eee8d6e3de297d737170190ff6f", "version": "5.15.10", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index b14917d7083741..6aae9ca9212069 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1259ec9f3eea78cad8e057fbc7d765a47929154", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "66becab038e0bc1ebd91613c96f32203edfd2933", "version": "5.15.10", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index b0f268596e1202..4ed83e36d86e34 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "081a6b53bdb5d7dd70f8e8315deaa8e71a160714", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "051b6d588faeba97c3ee9e53e96c5a619ac38352", "version": "5.15.10", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 192022a7a7bc56..4b12030f96351c 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf9d4d8eab1658f34274dcdf5e83c2624e7727bb", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "3530341f63252d313281374bb000e761889a0de6", "version": "5.15.10", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 3d36f2e75e7e16..f86df19be40431 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c938a0870f30cebe24c31abefa8ac8a8dc60722a", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "632ca34b395881412e1694d350f605a2dd6d54f0", "version": "5.15.10", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index 3092ebf0bcd4f8..66ada1a2178a5c 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b41d2e4f17b9cbcb85f1fe67b9e1adfaa70a0cb", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "c3e934f75a0e506d6c3329e0fa0b2a56d6f71324", "version": "5.15.10", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index fbb33fad50acfd..ea43d1be6d6d9f 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d49653566c4a0eae04e6b56cb9b3904b7c826af", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "7a8ae0c894141bd285fa02a23a9d4eb6f40604aa", "version": "5.15.10", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index cecdc6dd54322a..69b7314fe1ac53 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "144f57127630eec25443579a16d72fd4eb2c0378", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "eca137a635e6a4aa62a40609dc1a09029ca02733", "version": "5.15.10", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 5a384bc6772b40..46518ab9cce87e 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fe250be41e03ec6404fb5b38d8db2d52e68ef78", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "f45281462dfeef2426bd9e6cc4d15d87fdd5f888", "version": "5.15.10", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 09bf79c553a18b..676f1bcab04c00 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "834b6ab045a2739e6fa6d85f3687423e66417d7a", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "688b1af87eb544cc7828bfa75df01c0dc2efe4d8", "version": "5.15.10", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index c7359dba460963..28a436dae28074 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4609e43287d1db55e04e0553d85039adebffacd", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "cf5ac17e7409f445cbfc1cffc1d8a138a24582a0", "version": "5.15.10", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index 520cabfb43f208..d1e22f69d04da2 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b2a0472f4b91117a702ed605c443c71d3393862", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "d056d88bfc82130467bf524e8c7285850b71c594", "version": "5.15.10", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index 5f2317b6c4326d..8db9fd64e267b7 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8589b41f61533965537f8a6701d2f8ea015f1f2", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "13d815c2479b4a47f6b617ff2e1de3379d0a44b7", "version": "5.15.10", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index fe439a429bf2ce..7a492fc5fdb56e 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf926864a58a4777c63c25c856ea5f4c544b1fd2", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "d70201641dafec375d2ac778fce87a73c5f451b3", "version": "5.15.10", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 5011282158d114..897abe00eb9519 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "913946992a50661e33d59f4452c3d322d5341400", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "9e40a0af7bdebc43925450f1e51e2c2f8b49a067", "version": "5.15.10", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index cb55edaa388ba7..e961435bd32c4f 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08d312b3a2e6e0016aa0b6d2bdac1d3d3d864d23", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "e2042c06d5c6007ed72d9df7f8dae8d1148eb1cc", "version": "5.15.10", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 49afb77b66f6d7..1934dfffd8d805 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d366bc9e9536eb8db2be796afdd35eb0ad05c8b", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "510fff85661604ebc087feee170a857bc08d31d9", "version": "5.15.10", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index ee969ff2156edc..3c90fbf95b2427 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83c7937d7b60d45f3f9e5006fa6cbcdead8b62e0", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "50fe0254b5caf977970fd69dfed756799a54120c", "version": "5.15.10", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index e51759879a7c53..342be9a090205b 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "348dbf9cdcda0559adb72c98c249e06f8a2e50e8", + "version": "6.5.3", + "port-version": 1 + }, { "git-tree": "8ff10ec91d1eda17f49dd867924e6e034a0abd5c", "version": "6.5.3", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 7fe1fdb0b0e881..3708d91dde6b81 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c1dde04a75974f93af79e0ee812e43f1260ab4b", + "version": "1.32", + "port-version": 0 + }, { "git-tree": "eb8bae6053207228b42d957b8a2e0d187f4173e7", "version": "1.31.1", diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index 7d632c02b06318..a335aac74cfdd0 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9da8fa409b1afef5674fe412237db0504cf6156e", + "version-date": "2023-07-17", + "port-version": 0 + }, { "git-tree": "ea1032a866631acc7d63b4804be4ece09baeb47f", "version-date": "2023-04-27", diff --git a/versions/r-/reactiveplusplus.json b/versions/r-/reactiveplusplus.json index 02c43d205af4f3..7ded1acf3a2523 100644 --- a/versions/r-/reactiveplusplus.json +++ b/versions/r-/reactiveplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c5e055740d26b07149cc34e3dc41ef0674844b2", + "version": "0.2.3", + "port-version": 0 + }, { "git-tree": "352a13ae0dacf015a5c79bbfcaceea5d0a5877cf", "version": "0.2.2", diff --git a/versions/r-/readline-win32.json b/versions/r-/readline-win32.json index b5ab0d0b2b17ff..8fbd3e32b681b0 100644 --- a/versions/r-/readline-win32.json +++ b/versions/r-/readline-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c7dd189ed4434c993da75506f0b6d4e94b7f952", + "version": "5.0", + "port-version": 8 + }, { "git-tree": "932081e9a1f922cd1f3e710fd9fd426f882360aa", "version": "5.0", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 19082cd83d5559..6ba3ef956305ef 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c860a042c288cc1618ea5e728e8eb715b233ff44", + "version": "2.54.2", + "port-version": 0 + }, { "git-tree": "29719e1172d7bb950bc88a29ba009e4c4c2d5f27", "version": "2.54.1", diff --git a/versions/s-/sdbus-cpp.json b/versions/s-/sdbus-cpp.json new file mode 100644 index 00000000000000..6fdcf9ad52cc73 --- /dev/null +++ b/versions/s-/sdbus-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cae6cd5686aeefb86b4b97cda6d258d80a9eb5b6", + "version": "1.3.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/sdl2-mixer-ext.json b/versions/s-/sdl2-mixer-ext.json index f12db451ffa7ff..9b2c960d29193e 100644 --- a/versions/s-/sdl2-mixer-ext.json +++ b/versions/s-/sdl2-mixer-ext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72599d1d3f046b10ba695a83a5de68a98bf86ec8", + "version-date": "2023-05-04", + "port-version": 1 + }, { "git-tree": "04312072ef4ea392cb39c240e579f06b4d62b955", "version-date": "2023-05-04", diff --git a/versions/s-/sdl2-net.json b/versions/s-/sdl2-net.json index 8a937d9af535f4..0452f1331ea656 100644 --- a/versions/s-/sdl2-net.json +++ b/versions/s-/sdl2-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "755d96f16afae7c5b7cae15eb97fe5da85951a72", + "version": "2.2.0", + "port-version": 2 + }, { "git-tree": "b34dc64f26f414003d909391145491128bdcf636", "version": "2.2.0", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index e254df72244c67..88e296f3c06f62 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "3d625914314454b36d303ce86753840f6193f2bd", + "version": "2.28.4", + "port-version": 1 + }, + { + "git-tree": "289db88c23499b30e20bf972b2e1e68c093e5dea", + "version": "2.28.4", + "port-version": 0 + }, { "git-tree": "6b6220c48794ae1238dd8a6b491059446a8d3ebb", "version": "2.28.3", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 35d48346653bf3..c8e101cdbc76f7 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eda2bc26483b80cda6cb44c7aa2506de7c254547", + "version": "0.6.6", + "port-version": 0 + }, { "git-tree": "57e5580a75a4aa261871733eeda97721e557fe58", "version": "0.6.5", diff --git a/versions/s-/so5extra.json b/versions/s-/so5extra.json index a31ba6c15eb8eb..fcd6582258c95b 100644 --- a/versions/s-/so5extra.json +++ b/versions/s-/so5extra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec341c7fb5c8d09b831db9d31ce7ce70b9eb5252", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "c9d60e292e5e8e325a94f96069299824e59b1a90", "version": "1.6.0", diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index bf599d329b14f9..e960bc9edbc08b 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "318301f060f4853b2ed29d087e7d7730fe55d156", + "version": "5.8.1", + "port-version": 0 + }, { "git-tree": "d0e513c72a3e180c47d0f1d9f68256aa5eb3ea2b", "version": "5.8.0.1", diff --git a/versions/s-/soci.json b/versions/s-/soci.json index 9df5c8393297a8..c8b037402bb6f3 100644 --- a/versions/s-/soci.json +++ b/versions/s-/soci.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "24c340284022dab38da690548caa65c4f003bb7c", + "version": "4.0.3", + "port-version": 3 + }, + { + "git-tree": "63f4471adc41e108aed34cd585a06e354f1b4762", + "version": "4.0.3", + "port-version": 2 + }, { "git-tree": "9a70ee9344f5a66ed9ad34a5f64608b81e66bfde", "version": "4.0.3", diff --git a/versions/s-/soem.json b/versions/s-/soem.json index 6b32317372a38c..fbab3c1f5c440d 100644 --- a/versions/s-/soem.json +++ b/versions/s-/soem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdbb2e9fafc4dfc1aca0c45a872b3b202e2a9254", + "version-date": "2023-06-09", + "port-version": 1 + }, { "git-tree": "a02a02f57a58361241f7bb0890de819f94e198b3", "version-date": "2023-06-09", diff --git a/versions/s-/sokol.json b/versions/s-/sokol.json index 93581b46a647d1..614b2ec14590b0 100644 --- a/versions/s-/sokol.json +++ b/versions/s-/sokol.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bc7a2147353f37a7902e5187718bbb74f6d1615", + "version-date": "2023-10-07", + "port-version": 0 + }, { "git-tree": "5ba547d31c66bb41bf11cb755706b99e1b615e2e", "version-date": "2019-09-09", diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json index 5c37a47d71b5ae..07f765b229b83f 100644 --- a/versions/s-/soundtouch.json +++ b/versions/s-/soundtouch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a50336df269c13ab5d50f840fdc02afbfda7244c", + "version": "2.3.2", + "port-version": 0 + }, { "git-tree": "f4f307065b40b131fd80ce953afcc121aba46f9f", "version": "2.3.1", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index ad00ae370deab6..ef71f41ebcc86d 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6497ccc9668ca1e0b17a080b01e8585b33660336", + "version": "3.43.1", + "port-version": 0 + }, { "git-tree": "4f7a1dcf86377b6045fbf05eb0ec1baff1d2ceb6", "version": "3.43.0", diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index 41b4b059ee86b4..36453c7c55d0a1 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2308025668dda013e8b55f395871ed7d73cd20d5", + "version": "0.11.1", + "port-version": 0 + }, { "git-tree": "af6b6ed24e9fd37de357cd126afe917b47febd25", "version": "0.10.1", diff --git a/versions/t-/talib.json b/versions/t-/talib.json new file mode 100644 index 00000000000000..5c49de26f762e2 --- /dev/null +++ b/versions/t-/talib.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "b21601e58da50f810bacb160a8960a131227aa28", + "version-semver": "0.4.0", + "port-version": 1 + }, + { + "git-tree": "639b6ba11c1768faf5ab92f42d4cdf0a1bba2270", + "version-semver": "0.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 920d8ad518626d..b3f2497a118304 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4cde1e2a3654b8540b76ac295675a37bdbca311", + "version": "2021.10.0", + "port-version": 3 + }, { "git-tree": "376c59cda9f516006ce87b0f5da05be5a67fed7d", "version": "2021.10.0", diff --git a/versions/t-/thomasmonkman-filewatch.json b/versions/t-/thomasmonkman-filewatch.json new file mode 100644 index 00000000000000..5e210f5a94c3a2 --- /dev/null +++ b/versions/t-/thomasmonkman-filewatch.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "09215796e0a4591e54d9aa37ab46dc5edc7bd491", + "version-date": "2023-01-16", + "port-version": 0 + } + ] +} diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index 6125b28fcbebe5..468a9568e336c8 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "46f0b52581895d5c9deeaa582387fcc32c25fa15", + "version": "0.11.1", + "port-version": 0 + }, + { + "git-tree": "f54024173375727d79da6658e23e99337a55a8a6", + "version": "0.11.0", + "port-version": 0 + }, { "git-tree": "11178391a67b24a7bbbe7950359aaad9e51cfce6", "version": "0.10.1", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 2548d1d90eb96e..954fad63654809 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1c0fc716f916833234f0fb5e7061d52e9063e7c6", + "version": "4.6.0", + "port-version": 1 + }, + { + "git-tree": "88ab604b58a0473cf643b6f3890c2d0c8174ff62", + "version": "4.6.0", + "port-version": 0 + }, { "git-tree": "68f4ecc87b5ddce6c328c0f600a4c8b81d967d4c", "version": "4.5.1", diff --git a/versions/t-/tinygltf.json b/versions/t-/tinygltf.json index 7e9d0ee46f1c94..2c795115547ea7 100644 --- a/versions/t-/tinygltf.json +++ b/versions/t-/tinygltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a828c964c3dac5b5b48545da10e8e357c3759042", + "version": "2.8.17", + "port-version": 0 + }, { "git-tree": "d642030fcb4784451290f7523460bdabfa96bd56", "version": "2.8.4", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index bbbbb0828a4816..787f817187dd1f 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "2ffcc745825c95eec75922bfdf4433ccedf3981d", + "version-semver": "0.10.0", + "port-version": 0 + }, + { + "git-tree": "ce810f0e5535da3969128dc5eee0ecf0fcb51162", + "version-semver": "0.9.1", + "port-version": 4 + }, { "git-tree": "2d84bb317ef020ff408ce8000ecb896d7fe4fe78", "version-semver": "0.9.1", diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index cc2edea3095d71..706d11581258da 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "accbc9586fca80fd1345c5f2f3cf8449c76dcb24", + "version-semver": "20.47.0", + "port-version": 0 + }, { "git-tree": "db7e8088e0a542c51cea89ed081e8bcae6baec8c", "version-semver": "20.45.0", diff --git a/versions/v-/vc.json b/versions/v-/vc.json index f1232fc14d8b6a..14fb131a9d48e3 100644 --- a/versions/v-/vc.json +++ b/versions/v-/vc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "219677dca49bb75959b61537111daca726e52a86", + "version": "1.4.4", + "port-version": 0 + }, { "git-tree": "933ac99201b15104edd8037e8bcc7959d36a6d67", "version": "1.4.3", diff --git a/versions/w-/webview2.json b/versions/w-/webview2.json index dc4844fb87435b..bab3df15557270 100644 --- a/versions/w-/webview2.json +++ b/versions/w-/webview2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cd32d80f7fd65a498507ca2de77f8ce5449dd30", + "version": "1.0.2088.41", + "port-version": 0 + }, { "git-tree": "8f620381c9d12e72ae72e693571bc98ab82510da", "version": "1.0.1210.39", diff --git a/versions/w-/wil.json b/versions/w-/wil.json index 3d16548b460128..682f476c840a00 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1305125361ca7587fdcdd0caac7609c15a94e48f", + "version-date": "2023-08-24", + "port-version": 1 + }, { "git-tree": "ddb021c58bdc3c24a0440d2e6f808797cd698bf8", "version-date": "2023-08-24", diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json index 30e73f43459039..194f9641a64828 100644 --- a/versions/w-/winpcap.json +++ b/versions/w-/winpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a9aab1255bdc3aa23acbc3cbb89c175d56fdf9b", + "version": "4.1.3", + "port-version": 12 + }, { "git-tree": "fa00dc5de34d5076f7d7bad06b649b6ce4412b68", "version": "4.1.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 0ffbf0353c6a38..cf88dc82830459 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dfaace5786af8de744ecf9e02622b7b3e39087a", + "version": "3.2.3", + "port-version": 0 + }, { "git-tree": "2cbbd8d7a9d521546e8bc9b8957560806c4902e1", "version": "3.2.2.1", diff --git a/versions/x-/x86-simd-sort.json b/versions/x-/x86-simd-sort.json index 6cd7250da81e3e..d973c76d640bf9 100644 --- a/versions/x-/x86-simd-sort.json +++ b/versions/x-/x86-simd-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54331ace9e00eeff0f8508317ef48d011a8821bc", + "version": "3.0", + "port-version": 0 + }, { "git-tree": "dbe8f88ac8cc85689eb7666fa8beb6d819c4573a", "version-date": "2023-03-04", diff --git a/versions/x-/xbyak.json b/versions/x-/xbyak.json index 7b6431e94dc757..b73385de3d65ac 100644 --- a/versions/x-/xbyak.json +++ b/versions/x-/xbyak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c72f02ee8e100020f33b6f409cbabeca9fe8b0aa", + "version": "6.73", + "port-version": 0 + }, { "git-tree": "9774b99e4f632c777b1f0d1cec57f4918acc591a", "version": "6.69",