From 04ec3b438377591e8b45c7fff2543c42421493a8 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 21 Mar 2022 18:14:10 +0100 Subject: [PATCH 001/217] Fix github actions (#23674) --- .github/workflows/trustedPR.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trustedPR.yml b/.github/workflows/trustedPR.yml index 53518c0f533d9f..4ae202ec34c8cd 100644 --- a/.github/workflows/trustedPR.yml +++ b/.github/workflows/trustedPR.yml @@ -20,7 +20,7 @@ jobs: uses: actions/github-script@v6 with: script: | - var artifacts = await github.actions.listWorkflowRunArtifacts({ + var artifacts = await github.rest.actions.listWorkflowRunArtifacts({ owner: context.repo.owner, repo: context.repo.repo, run_id: ${{github.event.workflow_run.id }}, @@ -28,7 +28,7 @@ jobs: var matchArtifact = artifacts.data.artifacts.filter((artifact) => { return artifact.name == "pr" })[0]; - var download = await github.actions.downloadArtifact({ + var download = await github.rest.actions.downloadArtifact({ owner: context.repo.owner, repo: context.repo.repo, artifact_id: matchArtifact.id, From e383f75a8f69b95f56ab36d4f2b31f0b9bda1d1b Mon Sep 17 00:00:00 2001 From: Sandy Date: Mon, 21 Mar 2022 13:16:56 -0400 Subject: [PATCH 002/217] Add help for Arch linux derivates to bootstrap (#23676) --- scripts/bootstrap.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 5d408801541b72..6877dc11c6a98a 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -76,6 +76,8 @@ vcpkgCheckRepoTool() echo " sudo yum install curl zip unzip tar" echo "On SUSE Linux and derivatives:" echo " sudo zypper install curl zip unzip tar" + echo "On Arch Linux and derivatives:" + echo " sudo pacman -S curl zip unzip tar cmake ninja" echo "On Alpine:" echo " apk add build-base cmake ninja zip unzip curl git" echo " (and export VCPKG_FORCE_SYSTEM_BINARIES=1)" From 6ba1666604022ba7fcc38ccdea0c2f21593e58f1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 21 Mar 2022 19:14:26 +0100 Subject: [PATCH 003/217] [vcpkg baseline][qtapplicationmanager] Configure hardcodes bin paths. (#23638) * disable parallel configure * run buildtypes manually * correct close statement * version stuff --- ports/qtapplicationmanager/portfile.cmake | 50 +++++++++++++++-------- ports/qtapplicationmanager/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qtapplicationmanager.json | 5 +++ 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 8e190a55eeb3b2..3df32f8d103030 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -22,24 +22,40 @@ endif() set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) -qt_cmake_configure(${_opt} - OPTIONS - -DINPUT_libarchive=system - -DINPUT_libyaml=system - -DFEATURE_am_system_libyaml=ON - -DFEATURE_am_system_libarchive=ON - OPTIONS_DEBUG - OPTIONS_RELEASE) - -### Need to fix one post-build.bat; Couldn't find the place where it gets generated! -if(VCPKG_TARGET_IS_WINDOWS) - set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE) - if(EXISTS "${scriptfile}") - vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin") - endif() +set(build_type_backup ${VCPKG_BUILD_TYPE}) +set(path_backup "$ENV{PATH}") +if(NOT VCPKG_BUILD_TYPE) + set(types release debug) +else() + set(types ${VCPKG_BUILD_TYPE}) endif() -vcpkg_cmake_install(ADD_BIN_TO_PATH) +foreach(VCPKG_BUILD_TYPE IN LISTS types) + if(VCPKG_BUILD_TYPE STREQUAL debug) + vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") + else() + vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") + endif() + qt_cmake_configure(${_opt} + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DINPUT_libarchive=system + -DINPUT_libyaml=system + -DFEATURE_am_system_libyaml=ON + -DFEATURE_am_system_libarchive=ON + OPTIONS_DEBUG + OPTIONS_RELEASE) + if(VCPKG_TARGET_IS_WINDOWS) + set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE) + if(EXISTS "${scriptfile}") + vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin") + endif() + endif() + vcpkg_cmake_install() + set(ENV{PATH} "${path_backup}") +endforeach() +set(VCPKG_BUILD_TYPE ${build_type_backup}) +### Need to fix one post-build.bat; Couldn't find the place where it gets generated! qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 901b72cde9214d..6ddf08cbc07248 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtapplicationmanager", "version": "6.2.3", + "port-version": 1, "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 100d4446abce01..fc99da02957e6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5810,7 +5810,7 @@ }, "qtapplicationmanager": { "baseline": "6.2.3", - "port-version": 0 + "port-version": 1 }, "qtbase": { "baseline": "6.2.3", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index e07cc61014dc2a..baaee179d3992f 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c971f01c7b3ee85236a451ad93fd00fe4cc17e6", + "version": "6.2.3", + "port-version": 1 + }, { "git-tree": "9597e662be8fbe3317e0fd88058071db708da977", "version": "6.2.3", From bca99c46b00674e9e1974ca0fee967c03b5f8c5e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 21 Mar 2022 20:31:03 +0100 Subject: [PATCH 004/217] [qhttpengine] no absolute paths (#22328) --- ports/qhttpengine/portfile.cmake | 5 +++++ ports/qhttpengine/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qhttpengine.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/qhttpengine/portfile.cmake b/ports/qhttpengine/portfile.cmake index 5a59f0ce84d268..3d744bc1737218 100644 --- a/ports/qhttpengine/portfile.cmake +++ b/ports/qhttpengine/portfile.cmake @@ -17,6 +17,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() 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/qhttpengine/vcpkg.json b/ports/qhttpengine/vcpkg.json index 9e554e1e50bc5e..f1762479d4f8ed 100644 --- a/ports/qhttpengine/vcpkg.json +++ b/ports/qhttpengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qhttpengine", "version": "1.0.2", + "port-version": 1, "description": "HTTP server for Qt applications", "supports": "!uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fc99da02957e6d..b7f30e46fef140 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5598,7 +5598,7 @@ }, "qhttpengine": { "baseline": "1.0.2", - "port-version": 0 + "port-version": 1 }, "qhull": { "baseline": "8.0.2", diff --git a/versions/q-/qhttpengine.json b/versions/q-/qhttpengine.json index 7ce14ff67e9662..16d3df94ee19ce 100644 --- a/versions/q-/qhttpengine.json +++ b/versions/q-/qhttpengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df41e64df52df962bbd8836762d3946358819690", + "version": "1.0.2", + "port-version": 1 + }, { "git-tree": "7981cbfcf13bef7cfede8cf40a9d69967cc63dfb", "version": "1.0.2", From ce5fa83c6e70e00c6eef7fca234a11199999212f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 22 Mar 2022 03:36:19 +0800 Subject: [PATCH 005/217] [shapelib] Fix shapelib usage (#22633) * [shapelib] Fix shapelib usage * update version --- ports/shapelib/fix-usage.patch | 34 ++++++++++++++++++++++++++++++++++ ports/shapelib/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/s-/shapelib.json | 5 +++++ 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 ports/shapelib/fix-usage.patch diff --git a/ports/shapelib/fix-usage.patch b/ports/shapelib/fix-usage.patch new file mode 100644 index 00000000000000..8b22423fa2e6d5 --- /dev/null +++ b/ports/shapelib/fix-usage.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b3b3b51..ea3f129 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,8 +73,8 @@ set( + + # Export build information to help other projects link installed + # shapelib software. Only one of these signatures is required +-# for the export_shp name. +-install(EXPORT export_shp DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) ++# for the shpConfig name. ++install(EXPORT shpConfig DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) + + # Initial boilerplate done, now build library and executables. + +@@ -127,12 +127,17 @@ if(USE_RPATH) + endif(USE_RPATH) + + install(TARGETS shp +- EXPORT export_shp ++ EXPORT shpConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + ++INSTALL(EXPORT shpConfig ++ DESTINATION share/shp ++) ++ ++ + # executables to be built and installed. + set(executables + shpcreate diff --git a/ports/shapelib/vcpkg.json b/ports/shapelib/vcpkg.json index ae310d8c4b8a03..db87581cf10256 100644 --- a/ports/shapelib/vcpkg.json +++ b/ports/shapelib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shapelib", - "version-string": "1.5.0", - "port-version": 2, + "version": "1.5.0", + "port-version": 3, "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles", "homepage": "https://download.osgeo.org/shapelib", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b7f30e46fef140..7a0bd8bf5b90a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6414,7 +6414,7 @@ }, "shapelib": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 3 }, "shiva": { "baseline": "1.0", diff --git a/versions/s-/shapelib.json b/versions/s-/shapelib.json index e874311a9f3c9d..e558b2abd1954d 100644 --- a/versions/s-/shapelib.json +++ b/versions/s-/shapelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "befbba83687abe4b10f1fb55ac5ccc344bd11084", + "version": "1.5.0", + "port-version": 3 + }, { "git-tree": "d70a93c1899b5607ca1894c66beacec5c1afec9c", "version-string": "1.5.0", From fd8ffd1ac028a16c6de49550311bf6f871739dbb Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 21 Mar 2022 20:56:32 +0100 Subject: [PATCH 006/217] [argtable3] Disable examples (#23655) * Disable examples * Fix version * version * license, https * version --- ports/argtable3/portfile.cmake | 20 ++++++++++---------- ports/argtable3/vcpkg.json | 16 ++++++++++++++-- versions/a-/argtable3.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/ports/argtable3/portfile.cmake b/ports/argtable3/portfile.cmake index 5cb94bc151a9f6..90615e522ca812 100644 --- a/ports/argtable3/portfile.cmake +++ b/ports/argtable3/portfile.cmake @@ -9,24 +9,24 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DARGTABLE3_ENABLE_CONAN=OFF -DARGTABLE3_ENABLE_TESTS=OFF + -DARGTABLE3_ENABLE_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/argtable3/vcpkg.json b/ports/argtable3/vcpkg.json index d28ccb74573c56..29d863dee2d1b3 100644 --- a/ports/argtable3/vcpkg.json +++ b/ports/argtable3/vcpkg.json @@ -1,6 +1,18 @@ { "name": "argtable3", - "version-string": "3.2.1", + "version": "3.2.1", + "port-version": 1, "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options", - "homepage": "www.argtable.org" + "homepage": "https://www.argtable.org/", + "license": "BSD-2-Clause-FreeBSD", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/a-/argtable3.json b/versions/a-/argtable3.json index 10b5524fc182ec..73a0032169c245 100644 --- a/versions/a-/argtable3.json +++ b/versions/a-/argtable3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "acbbb26e54e658b8af673a112fb338274275ad6b", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "0dc3ede1be6316bee6853f84c5f147340be70ee8", "version-string": "3.2.1", diff --git a/versions/baseline.json b/versions/baseline.json index 7a0bd8bf5b90a5..7913ef5868a627 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -150,7 +150,7 @@ }, "argtable3": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 1 }, "argumentum": { "baseline": "0.3.1", From 29cab2b72b7b88ca63cadf1e9a8feb77e26091eb Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 21 Mar 2022 20:57:12 +0100 Subject: [PATCH 007/217] [nanorange] update to master (#23656) * [nanorange] update to master * remove nanorange from CI baseline * version * Add homepage * version --- ports/nanorange/portfile.cmake | 19 ++++--------------- ports/nanorange/vcpkg.json | 7 ++++--- scripts/ci.baseline.txt | 9 --------- versions/baseline.json | 4 ++-- versions/n-/nanorange.json | 5 +++++ 5 files changed, 15 insertions(+), 29 deletions(-) diff --git a/ports/nanorange/portfile.cmake b/ports/nanorange/portfile.cmake index c516ecb80c1b0e..1b22c4868fbfbf 100644 --- a/ports/nanorange/portfile.cmake +++ b/ports/nanorange/portfile.cmake @@ -1,22 +1,11 @@ -# header-only vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tcbrindle/NanoRange + REF bf32251d65673fe170d602777c087786c529ead8 + SHA512 74dc8497fd20f56de39e54a104007840450466648f7b216f83265294e24582b486392ad6bf0cc85ca9877655640f08f833bc5d82ebee991b8a57d4fa44f0934f HEAD_REF master ) -# -#vcpkg_configure_cmake( -# SOURCE_PATH ${SOURCE_PATH} -# PREFER_NINJA -#) -#vcpkg_build_cmake() -# - -# Copy header files -file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") - -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/nanorange) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/nanorange/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/nanorange/copyright) +file(COPY "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}" FILES_MATCHING PATTERN "*.hpp") +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nanorange/vcpkg.json b/ports/nanorange/vcpkg.json index 7ed217cb00007a..3aed5b7a9ab180 100644 --- a/ports/nanorange/vcpkg.json +++ b/ports/nanorange/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nanorange", - "version-string": "0.0.0", - "port-version": 1, - "description": "NanoRange is a C++14 implementation of the C++20 Ranges proposals." + "version-date": "2020-07-06", + "description": "NanoRange is a C++14 implementation of the C++20 Ranges proposals.", + "homepage": "https://github.com/tcbrindle/NanoRange", + "license": "BSL-1.0" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e416b81bc244f7..081db27d460760 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -835,15 +835,6 @@ nana:x64-uwp=fail nanodbc:arm-uwp=fail nanodbc:x64-uwp=fail nanodbc:x64-linux=skip -nanorange:arm64-windows=fail -nanorange:arm-uwp=fail -nanorange:x64-linux=fail -nanorange:x64-osx=fail -nanorange:x64-uwp=fail -nanorange:x64-windows=fail -nanorange:x64-windows-static=fail -nanorange:x64-windows-static-md=fail -nanorange:x86-windows=fail nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail ngspice:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 7913ef5868a627..4bf49acbd392dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4729,8 +4729,8 @@ "port-version": 1 }, "nanorange": { - "baseline": "0.0.0", - "port-version": 1 + "baseline": "2020-07-06", + "port-version": 0 }, "nanort": { "baseline": "2019-08-20", diff --git a/versions/n-/nanorange.json b/versions/n-/nanorange.json index 308349280b8b95..8316508a11260c 100644 --- a/versions/n-/nanorange.json +++ b/versions/n-/nanorange.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66af15410d36dcfe707cfa3ed693e2ad4b8c0a6b", + "version-date": "2020-07-06", + "port-version": 0 + }, { "git-tree": "a9d8e3712ada3496381d4a9ec4d8b6eb638f65e8", "version-string": "0.0.0", From a7f4e7bf98c272bac8e754cd890492d2c5f96f64 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 21 Mar 2022 21:13:11 +0100 Subject: [PATCH 008/217] Remove trailing whitespaces from some issue templates (#23667) --- .github/ISSUE_TEMPLATE/other-type-of-bug-report.md | 2 +- .github/ISSUE_TEMPLATE/report-package-build-failure.md | 2 +- .github/pull_request_template.md | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md b/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md index 85c2967451ace5..8a12e861de7ffc 100644 --- a/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md +++ b/.github/ISSUE_TEMPLATE/other-type-of-bug-report.md @@ -24,7 +24,7 @@ Repro code when **Expected behavior** A clear and concise description of what you expected to happen. -**Failure logs** +**Failure logs** -(please attached failure logs) **Additional context** diff --git a/.github/ISSUE_TEMPLATE/report-package-build-failure.md b/.github/ISSUE_TEMPLATE/report-package-build-failure.md index 785483c368b440..765f870c1d833b 100644 --- a/.github/ISSUE_TEMPLATE/report-package-build-failure.md +++ b/.github/ISSUE_TEMPLATE/report-package-build-failure.md @@ -15,7 +15,7 @@ assignees: '' Steps to reproduce the behavior: `./vcpkg install xxxx` -**Failure logs** +**Failure logs** -Cut and paste the appropriate build messages from the console output. -Please attach any additional failure logs mentioned in the console output. diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 31be625f265ee3..9253eadcb27d02 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,15 +1,15 @@ **Describe the pull request** -- #### What does your PR fix? +- #### What does your PR fix? Fixes #... -- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)? +- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)? , -- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)? +- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)? `Your answer` -- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result? +- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result? **If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/** From 470620d23a85666d9af62b3f16d76a27d5c36f36 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 22 Mar 2022 04:18:01 +0800 Subject: [PATCH 009/217] [grpc] update to 1.44.0 (#23591) * [grpc] update to 1.44.0 * update version * update patch EOL * overwrite version * update patch * update version * fix uwp-build * overwrite version --- ports/grpc/00001-fix-uwp.patch | 31 ++++++-------------- ports/grpc/00003-undef-base64-macro.patch | 8 ++--- ports/grpc/00004-link-gdi32-on-windows.patch | 8 ++--- ports/grpc/00006-fix-uwp-error.patch | 13 ++++++++ ports/grpc/00010-add-feature-absl-sync.patch | 11 ++++--- ports/grpc/00012-fix-use-cxx17.patch | 13 ++++---- ports/grpc/00014-pkgconfig-upbdefs.patch | 6 ++-- ports/grpc/portfile.cmake | 5 ++-- ports/grpc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/grpc.json | 5 ++++ 11 files changed, 54 insertions(+), 50 deletions(-) create mode 100644 ports/grpc/00006-fix-uwp-error.patch diff --git a/ports/grpc/00001-fix-uwp.patch b/ports/grpc/00001-fix-uwp.patch index 80146babb0cb11..a7f353d7039e3f 100644 --- a/ports/grpc/00001-fix-uwp.patch +++ b/ports/grpc/00001-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1911144984..8f78306f77 100644 +index 7a97604..4967c4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -181,6 +181,9 @@ if(UNIX) +@@ -215,6 +215,9 @@ if(UNIX) endif() if(WIN32) set(_gRPC_PLATFORM_WINDOWS ON) @@ -12,17 +12,17 @@ index 1911144984..8f78306f77 100644 endif() # Use C99 standard -@@ -219,6 +222,9 @@ if(MSVC) +@@ -259,6 +262,9 @@ if(MSVC) set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267") # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619") + if(_gRPC_PLATFORM_UWP) + add_definitions(-DGRPC_ARES=0) + endif() + # Silences thousands of trucation warnings + set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503") endif() - if (MINGW) - add_definitions(-D_WIN32_WINNT=0x600) -@@ -286,6 +292,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) +@@ -336,6 +342,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) # ``.proto`` files # function(protobuf_generate_grpc_cpp) @@ -33,7 +33,7 @@ index 1911144984..8f78306f77 100644 if(NOT ARGN) message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") return() -@@ -358,6 +368,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) +@@ -408,6 +418,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin) endif () @@ -41,7 +41,7 @@ index 1911144984..8f78306f77 100644 add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) -@@ -376,6 +387,7 @@ add_custom_target(tools_cxx +@@ -424,6 +435,7 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) @@ -49,21 +49,8 @@ index 1911144984..8f78306f77 100644 protobuf_generate_grpc_cpp( src/proto/grpc/channelz/channelz.proto -diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc -index dbe84e3466..cda40b6435 100644 ---- a/src/core/lib/iomgr/resource_quota.cc -+++ b/src/core/lib/iomgr/resource_quota.cc -@@ -945,7 +945,7 @@ bool grpc_resource_user_alloc(grpc_resource_user* resource_user, size_t size, - void grpc_resource_user_free(grpc_resource_user* resource_user, size_t size) { - gpr_mu_lock(&resource_user->mu); - grpc_resource_quota* resource_quota = resource_user->resource_quota; -- gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -size); -+ gpr_atm prior = gpr_atm_no_barrier_fetch_add(&resource_quota->used, -static_cast(size)); - GPR_ASSERT(prior >= static_cast(size)); - bool was_zero_or_negative = resource_user->free_pool <= 0; - resource_user->free_pool += static_cast(size); diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -index 59432cff36..fed574d5bc 100644 +index 5d2bdc1..e9870c2 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc @@ -39,6 +39,7 @@ bool check_bios_data(const char*) { return false; } diff --git a/ports/grpc/00003-undef-base64-macro.patch b/ports/grpc/00003-undef-base64-macro.patch index 3f540a53444cc9..be182659d4107d 100644 --- a/ports/grpc/00003-undef-base64-macro.patch +++ b/ports/grpc/00003-undef-base64-macro.patch @@ -1,13 +1,13 @@ diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc -index 99a32980aa..f55db67113 100644 +index 5d74ec2..89494b5 100644 --- a/src/core/lib/transport/transport.cc +++ b/src/core/lib/transport/transport.cc -@@ -97,6 +97,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/, - refcount, &refcount->slice_refcount); +@@ -77,6 +77,8 @@ void grpc_stream_ref_init(grpc_stream_refcount* refcount, int /*initial_refs*/, + : nullptr); } +#undef move64 + - static void move64(uint64_t* from, uint64_t* to) { + static void move64bits(uint64_t* from, uint64_t* to) { *to += *from; *from = 0; diff --git a/ports/grpc/00004-link-gdi32-on-windows.patch b/ports/grpc/00004-link-gdi32-on-windows.patch index e30e94f3d9ec33..0d1abe7f819ba6 100644 --- a/ports/grpc/00004-link-gdi32-on-windows.patch +++ b/ports/grpc/00004-link-gdi32-on-windows.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e09f8fcc1e..ec1714687e 100644 +index 14514b7..497470c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -278,7 +278,7 @@ elseif(UNIX) - endif() +@@ -323,7 +323,7 @@ include(cmake/xxhash.cmake) + include(cmake/zlib.cmake) if(WIN32) -- set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32) +- set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) + set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) endif() diff --git a/ports/grpc/00006-fix-uwp-error.patch b/ports/grpc/00006-fix-uwp-error.patch new file mode 100644 index 00000000000000..871e170c4c4c28 --- /dev/null +++ b/ports/grpc/00006-fix-uwp-error.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +index 18abbda..9789983 100644 +--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc ++++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +@@ -1052,7 +1052,7 @@ class HPackParser::Parser { + + private: + void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) { +- const char* type; ++ const char* type = nullptr; + switch (log_info_.type) { + case LogInfo::kHeaders: + type = "HDR"; diff --git a/ports/grpc/00010-add-feature-absl-sync.patch b/ports/grpc/00010-add-feature-absl-sync.patch index 2c7df5c876afba..75d986d616ed88 100644 --- a/ports/grpc/00010-add-feature-absl-sync.patch +++ b/ports/grpc/00010-add-feature-absl-sync.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae06ea3..8b64438 100644 +index 497470c..9c07732 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2180,6 +2180,8 @@ target_link_libraries(grpc +@@ -2196,6 +2196,8 @@ target_link_libraries(grpc ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_map @@ -10,8 +10,8 @@ index ae06ea3..8b64438 100644 + absl::synchronization absl::inlined_vector absl::bind_front - absl::statusor -@@ -2733,6 +2735,8 @@ target_link_libraries(grpc_unsecure + absl::hash +@@ -2753,6 +2755,8 @@ target_link_libraries(grpc_unsecure ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_map @@ -21,7 +21,7 @@ index ae06ea3..8b64438 100644 absl::bind_front absl::statusor diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake -index c89ba26..68ae4fd 100644 +index c89ba26..81212b9 100644 --- a/cmake/abseil-cpp.cmake +++ b/cmake/abseil-cpp.cmake @@ -35,3 +35,6 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package") @@ -31,4 +31,3 @@ index c89ba26..68ae4fd 100644 + if (gRPC_ABSL_SYNC_ENABLE) + add_definitions(-DGPR_ABSEIL_SYNC=1) + endif() -\ No newline at end of file diff --git a/ports/grpc/00012-fix-use-cxx17.patch b/ports/grpc/00012-fix-use-cxx17.patch index ea425c9635a835..7ff404a8e9cbe2 100644 --- a/ports/grpc/00012-fix-use-cxx17.patch +++ b/ports/grpc/00012-fix-use-cxx17.patch @@ -1,17 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4573027..4615602 100644 +index 9c07732..54b4b23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -271,6 +271,12 @@ include(cmake/upb.cmake) +@@ -321,6 +321,11 @@ include(cmake/ssl.cmake) + include(cmake/upb.cmake) include(cmake/xxhash.cmake) include(cmake/zlib.cmake) - + +if (ABSL_USE_CXX17) + message(STATUS "Found absl uses CXX17, enable CXX17 feature.") + set(CMAKE_CXX_STANDARD 17) +endif() -+ - if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS) - set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread) - elseif(_gRPC_PLATFORM_ANDROID) + + if(WIN32) + set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch index 2aa257b3ec3183..01e064e3bf7ce7 100644 --- a/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f7d677c..d527ff4 100644 +index 54b4b23..83fab3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -17705,7 +17705,7 @@ generate_pkgconfig( +@@ -17276,7 +17276,7 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant" + "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant" - "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" + "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz" "" diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index a0015372524c74..11705ec434c6e5 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF fc662b7964384b701af5bd3ce6994d2180080eb4 # v1.41.0 - SHA512 ebb534b5d55f1a84c5ee2ea75f2ef871819d278966dec2610877c2f8ddd87bae80a63cbab0393fb37b81844f261327848821ac641b55963583288e6ec3b94e62 + REF 591d56e1300b6d11948e1b821efac785a295989c # v1.44.0 + SHA512 b24f82768eed95b017a499ffb539af1f59d6916ab2da5ffb1de344ea7b0b7df536d1bb29a9bcb273bd84bc1f11b62383dc6c7df62e50d57621228f5aeeca6d5d HEAD_REF master PATCHES 00001-fix-uwp.patch @@ -14,6 +14,7 @@ vcpkg_from_github( 00003-undef-base64-macro.patch 00004-link-gdi32-on-windows.patch 00005-fix-uwp-error.patch + 00006-fix-uwp-error.patch 00009-use-system-upb.patch 00010-add-feature-absl-sync.patch 00011-fix-csharp_plugin.patch diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index e8577e6dea1b12..63b1b33dd7a704 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version-semver": "1.41.0", + "version-semver": "1.44.0", "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4bf49acbd392dc..33bdb89d54ef75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2617,7 +2617,7 @@ "port-version": 0 }, "grpc": { - "baseline": "1.41.0", + "baseline": "1.44.0", "port-version": 0 }, "grppi": { diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 4d776dcd42b805..160d6a33a18736 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "489c160e47ae99de58a438f93714ecbb008df330", + "version-semver": "1.44.0", + "port-version": 0 + }, { "git-tree": "5e3795bf43afe5243e47e18ac66a28bc722207f5", "version-semver": "1.41.0", From 744f50c03b80c7ec45dac29dbde8752844605dd9 Mon Sep 17 00:00:00 2001 From: HrOokami <4591995+faserg1@users.noreply.github.com> Date: Mon, 21 Mar 2022 23:23:49 +0300 Subject: [PATCH 010/217] Patching websocketpp for cxx20 support (#23669) --- ports/websocketpp/cxx20.patch | 66 ++++++++++++++++++++++++++++++++ ports/websocketpp/portfile.cmake | 2 + ports/websocketpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/websocketpp.json | 5 +++ 5 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 ports/websocketpp/cxx20.patch diff --git a/ports/websocketpp/cxx20.patch b/ports/websocketpp/cxx20.patch new file mode 100644 index 00000000000000..34283e2b18dc37 --- /dev/null +++ b/ports/websocketpp/cxx20.patch @@ -0,0 +1,66 @@ +diff --git "a/websocketpp/endpoint.hpp" "b/websocketpp/endpoint.hpp" +index c124b1d..9ce8a62 100644 +--- "a/websocketpp/endpoint.hpp" ++++ "b/websocketpp/endpoint.hpp" +@@ -109,7 +109,7 @@ public: + + + /// Destructor +- ~endpoint() {} ++ ~endpoint() {} + + #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ + // no copy constructor because endpoints are not copyable +diff --git "a/websocketpp/logger/basic.hpp" "b/websocketpp/logger/basic.hpp" +index 8451413..4c9d836 100644 +--- "a/websocketpp/logger/basic.hpp" ++++ "b/websocketpp/logger/basic.hpp" +@@ -58,33 +58,33 @@ namespace log { + template + class basic { + public: +- basic(channel_type_hint::value h = ++ basic(channel_type_hint::value h = + channel_type_hint::access) + : m_static_channels(0xffffffff) + , m_dynamic_channels(0) + , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} + +- basic(std::ostream * out) ++ basic(std::ostream * out) + : m_static_channels(0xffffffff) + , m_dynamic_channels(0) + , m_out(out) {} + +- basic(level c, channel_type_hint::value h = ++ basic(level c, channel_type_hint::value h = + channel_type_hint::access) + : m_static_channels(c) + , m_dynamic_channels(0) + , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {} + +- basic(level c, std::ostream * out) ++ basic(level c, std::ostream * out) + : m_static_channels(c) + , m_dynamic_channels(0) + , m_out(out) {} + + /// Destructor +- ~basic() {} ++ ~basic() {} + + /// Copy constructor +- basic(basic const & other) ++ basic(basic const & other) + : m_static_channels(other.m_static_channels) + , m_dynamic_channels(other.m_dynamic_channels) + , m_out(other.m_out) +@@ -97,7 +97,7 @@ public: + + #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ + /// Move constructor +- basic(basic && other) ++ basic(basic && other) + : m_static_channels(other.m_static_channels) + , m_dynamic_channels(other.m_dynamic_channels) + , m_out(other.m_out) diff --git a/ports/websocketpp/portfile.cmake b/ports/websocketpp/portfile.cmake index 8feb3bd8e9d9e6..2592ca3313b418 100644 --- a/ports/websocketpp/portfile.cmake +++ b/ports/websocketpp/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 56123c87598f8b1dd471be83ca841ceae07f95ba # 0.8.2 SHA512 f185a66e5a7c783254352a6ef87e2e559f681032b7368765d08393ed12bcae76825abed7dcaea73de09df644320409dad46279701f5f469520542a2c9b6a6163 HEAD_REF master + PATCHES + cxx20.patch ) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/websocketpp/vcpkg.json b/ports/websocketpp/vcpkg.json index 460fa86cabddc7..daa7f5cf6be18a 100644 --- a/ports/websocketpp/vcpkg.json +++ b/ports/websocketpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "websocketpp", "version": "0.8.2", - "port-version": 1, + "port-version": 2, "description": "Library that implements RFC6455 The WebSocket Protocol", "homepage": "https://github.com/zaphoyd/websocketpp", "documentation": "http://docs.websocketpp.org/", diff --git a/versions/baseline.json b/versions/baseline.json index 33bdb89d54ef75..c45d33dcdf17d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7366,7 +7366,7 @@ }, "websocketpp": { "baseline": "0.8.2", - "port-version": 1 + "port-version": 2 }, "wepoll": { "baseline": "1.5.8", diff --git a/versions/w-/websocketpp.json b/versions/w-/websocketpp.json index da556f2aaa558e..d040079dc7d90f 100644 --- a/versions/w-/websocketpp.json +++ b/versions/w-/websocketpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70d3b037559f580fa52bc50bb2dc26e58f5107d9", + "version": "0.8.2", + "port-version": 2 + }, { "git-tree": "495a31980417d3ca202b50c1951012d699af21f6", "version": "0.8.2", From 70a7074c685516fed36da7befb3898821b1425ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 22 Mar 2022 04:25:52 +0800 Subject: [PATCH 011/217] [libsquish] Add feature sse2 for OSX (#23679) * [libsquish] Add feature sse2 for OSX * correct version field * version * apply suggestion * version --- ports/libsquish/portfile.cmake | 8 +++++++- ports/libsquish/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 2 +- versions/l-/libsquish.json | 5 +++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ports/libsquish/portfile.cmake b/ports/libsquish/portfile.cmake index 80c4ef54ba7663..e9cb26e3f5d021 100644 --- a/ports/libsquish/portfile.cmake +++ b/ports/libsquish/portfile.cmake @@ -9,9 +9,15 @@ vcpkg_from_sourceforge( export-target.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sse2 BUILD_SQUISH_WITH_SSE2 +) + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE + OPTIONS ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/libsquish/vcpkg.json b/ports/libsquish/vcpkg.json index 3d247cb935b6db..3af7e3b130ba02 100644 --- a/ports/libsquish/vcpkg.json +++ b/ports/libsquish/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libsquish", - "version-string": "1.15", - "port-version": 9, + "version": "1.15", + "port-version": 10, "description": "Open source DXT compression library.", "homepage": "https://sourceforge.net/projects/libsquish", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", @@ -13,5 +14,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "sse2": { + "description": "Build with SSE2", + "supports": "osx" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index c45d33dcdf17d8..83ae61c1f035fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3998,7 +3998,7 @@ }, "libsquish": { "baseline": "1.15", - "port-version": 9 + "port-version": 10 }, "libsrt": { "baseline": "1.4.4", diff --git a/versions/l-/libsquish.json b/versions/l-/libsquish.json index 4c70c7dece1950..da008f533dc8cd 100644 --- a/versions/l-/libsquish.json +++ b/versions/l-/libsquish.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a7ae325bacc78d07dc92de654a877584cff0cca", + "version": "1.15", + "port-version": 10 + }, { "git-tree": "97da7fd0b127d2b07821950e5aee7acadbcd9d17", "version-string": "1.15", From e9d2a27ff98ceb87fc5a69f8c76b03f85dcb8ec1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 21 Mar 2022 21:40:17 +0100 Subject: [PATCH 012/217] [poppler] Update to 22.03.0 (#23651) * Update poppler to 22.03.0 * Private include dirs depend on feature private-api * Update versions * Fix usage * Update versions --- ports/poppler/export-unofficial-poppler.patch | 18 ++++++++++-------- ports/poppler/portfile.cmake | 4 ++-- ports/poppler/usage | 2 +- ports/poppler/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/poppler.json | 5 +++++ 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/ports/poppler/export-unofficial-poppler.patch b/ports/poppler/export-unofficial-poppler.patch index ca02c12b1d4d26..c818e8ff2d72c5 100644 --- a/ports/poppler/export-unofficial-poppler.patch +++ b/ports/poppler/export-unofficial-poppler.patch @@ -2,22 +2,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a0dcb1..c1f2f02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -600,7 +600,14 @@ target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS}) - if(CMAKE_USE_PTHREADS_INIT) - target_link_libraries(poppler LINK_PRIVATE Threads::Threads) +@@ -585,9 +585,16 @@ if(MINGW AND BUILD_SHARED_LIBS) + set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") endif() + target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS}) -install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+target_include_directories(poppler PUBLIC -+ $ -+ $ -+ $ -+) ++target_include_directories(poppler PUBLIC $) +set_target_properties(poppler PROPERTIES EXPORT_NAME poppler-private) +install(TARGETS poppler EXPORT unofficial-poppler-targets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(EXPORT unofficial-poppler-targets NAMESPACE unofficial::poppler:: DESTINATION share/unofficial-poppler) if(ENABLE_UNSTABLE_API_ABI_HEADERS) ++ target_include_directories(poppler PUBLIC ++ $ ++ $ ++ ) install(FILES + poppler/Annot.h + poppler/AnnotStampImageHelper.h diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index c37936b..344933c 100644 --- a/cpp/CMakeLists.txt diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index c75bad85932076..3ae105866a8a82 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO poppler/poppler - REF poppler-22.02.0 - SHA512 693b813ef80656e7078f8830ec38e23520c6abd307befbb1721ba883233c92099704a7f02557807b28560f9c7ea1aa27192aea620b2ce4e9062a0b8790e93225 + REF poppler-22.03.0 + SHA512 0229e50bbf21154f398480730649fd15ca37c7edae5abd63ed41ab722852d09e4dc2b9df66b13b1cfe3e7a0da945916e1bd39c75c4879ded2759eb465f69424a HEAD_REF master PATCHES export-unofficial-poppler.patch diff --git a/ports/poppler/usage b/ports/poppler/usage index f5cbbd53704b0f..f901589b2e8a47 100644 --- a/ports/poppler/usage +++ b/ports/poppler/usage @@ -3,4 +3,4 @@ The package poppler can be imported via CMake FindPkgConfig module: include(FindPkgConfig) pkg_check_modules(POPPLER_CPP REQUIRED IMPORTED_TARGET poppler-cpp) - target_link_libraries(main PRIVATE PkgConfig::poppler-cpp) + target_link_libraries(main PRIVATE PkgConfig::POPPLER_CPP) diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index 4ef8d2ab7eeb4e..988bc780fe3c30 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,6 +1,6 @@ { "name": "poppler", - "version": "22.2.0", + "version": "22.3.0", "description": "A PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 83ae61c1f035fb..4f767d554f4071 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5465,7 +5465,7 @@ "port-version": 4 }, "poppler": { - "baseline": "22.2.0", + "baseline": "22.3.0", "port-version": 0 }, "popsift": { diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index 6dbef9b4de9fe4..e0a495273b6775 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9928fbfbe44a32d0a4ff7efed4de2a7797958322", + "version": "22.3.0", + "port-version": 0 + }, { "git-tree": "139058e4ec62f875c5538cbd1577c95938183364", "version": "22.2.0", From e00234bedd392435e0e3bdf9c9fb68ce6f407c0b Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Mon, 21 Mar 2022 20:42:20 +0000 Subject: [PATCH 013/217] 2022 03 19 glib update (#23652) * [glib] Update to 2.70.5 (microsoft#23647) See https://github.com/GNOME/glib/commits/glib-2-70 for an extensive list of changes * [glibmm] update to 2.70 (microsoft#23649) See https://github.com/GNOME/glibmm/commits/glibmm-2-70 for an extensive list of changes * [glibmm] support msvc2022 (microsoft#23650) The latest release of glibmm manually configures the v142 compiler toolchain to be used on msvc2022 environments, which results in binarycache and export metadata to indicate msvc's v143 compiler having built the package while it was in fact the v142 toolchain from the windows sdk. Upstream has "fixed" this issue, but the patch didn't make it into the latest release. Apply https://github.com/GNOME/glibmm/commit/b3a77c3 manually on our side to make sure we use the toolchain we instructed to be used. --- ports/glib/portfile.cmake | 4 +- ports/glib/vcpkg.json | 3 +- .../glibmm/build-support-vs2022-builds.patch | 41 +++++++++++++++++++ ports/glibmm/portfile.cmake | 10 +++-- ports/glibmm/vcpkg.json | 3 +- versions/baseline.json | 8 ++-- versions/g-/glib.json | 5 +++ versions/g-/glibmm.json | 5 +++ 8 files changed, 65 insertions(+), 14 deletions(-) create mode 100644 ports/glibmm/build-support-vs2022-builds.patch diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 61d7a0bc5fb146..8ef135df7353ad 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -5,11 +5,11 @@ if (VCPKG_TARGET_IS_WINDOWS) endif() set(GLIB_MAJOR_MINOR 2.70) -set(GLIB_PATCH 1) +set(GLIB_PATCH 5) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/gnome/sources/glib/${GLIB_MAJOR_MINOR}/glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" FILENAME "glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" - SHA512 639317c98ab72ad853608ab4d395484daff135c0222556c51ca93fd8533c5759db14478beda964e4feb02bb2737a46a4eda25063f98a9c6ba6ae4bc5d74bf5e1) + SHA512 3dfb45a9b6fe67fcf185f5cbb3985b6f1da17caf9c6f01e638d8fe4a6271ea1a30b0cf4ca8f43728bd29a8ac13b05a34e1cf262ade7795f0c0d0a2c0b90b1ff8) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 586c4cc2723b24..6ad02e28ce8356 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glib", - "version": "2.70.1", - "port-version": 2, + "version": "2.70.5", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "supports": "!uwp & !(windows & static)", diff --git a/ports/glibmm/build-support-vs2022-builds.patch b/ports/glibmm/build-support-vs2022-builds.patch new file mode 100644 index 00000000000000..b1efb9c20d90a4 --- /dev/null +++ b/ports/glibmm/build-support-vs2022-builds.patch @@ -0,0 +1,41 @@ +commit b3a77c3f0b7dd2e1405a781ac9a76f648779d7fa +Author: Chun-wei Fan +Date: Tue Nov 9 14:28:14 2021 +0800 + + Build: Support VS2022 builds + + Make these builds distinct from the Visual Studio 2019 builds. + +diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak +index 6933505d..16d57810 100644 +--- a/MSVC_NMake/detectenv-msvc.mak ++++ b/MSVC_NMake/detectenv-msvc.mak +@@ -98,9 +98,12 @@ PDBVER = 14 + !if $(VCVERSION) > 1909 && $(VCVERSION) < 1920 + VSVER_SUFFIX = 1 + VSVER = 15 +-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000 ++!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930 + VSVER_SUFFIX = 2 + VSVER = 16 ++!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000 ++VSVER_SUFFIX = 3 ++VSVER = 17 + !else + VSVER = $(PDBVER) + !endif +diff --git a/meson.build b/meson.build +index b7c7f77e..a2ee5ef3 100644 +--- a/meson.build ++++ b/meson.build +@@ -231,7 +231,9 @@ if is_msvc + add_project_arguments(disabled_warnings, language: 'cpp') + + if use_msvc14x_toolset_ver +- if cpp_compiler.version().version_compare('>=19.20') ++ if cpp_compiler.version().version_compare('>=19.30') ++ msvc14x_toolset_ver = '-vc143' ++ elif cpp_compiler.version().version_compare('>=19.20') + msvc14x_toolset_ver = '-vc142' + elif cpp_compiler.version().version_compare('>=19.10') + msvc14x_toolset_ver = '-vc141' diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index 35d44428034261..9d14499a5d2352 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -1,14 +1,16 @@ # Glib uses winapi functions not available in WindowsStore vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.68/glibmm-2.68.1.tar.xz" - FILENAME "glibmm-2.68.1.tar.xz" - SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c + URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.70/glibmm-2.70.0.tar.xz" + FILENAME "glibmm-2.70.0.tar.xz" + SHA512 059cab7f0b865303cef3cba6c4f3a29ae4e359aba428f5e79cea6fedd3f1e082199f673323cf804902cee14b91739598fbc6ff706ec36f19c4d793d032782518 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + build-support-vs2022-builds.patch ) vcpkg_configure_meson( @@ -20,7 +22,7 @@ vcpkg_configure_meson( vcpkg_install_meson() vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.68/proc" "${CURRENT_PACKAGES_DIR}/lib/glibmm-2.68/proc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.70/proc" "${CURRENT_PACKAGES_DIR}/lib/glibmm-2.70/proc") vcpkg_fixup_pkgconfig() diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index 08650595852a11..6fa34378a6d623 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glibmm", - "version": "2.68.1", - "port-version": 2, + "version": "2.70.0", "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 4f767d554f4071..85ba73d58d4361 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2509,12 +2509,12 @@ "port-version": 0 }, "glib": { - "baseline": "2.70.1", - "port-version": 2 + "baseline": "2.70.5", + "port-version": 0 }, "glibmm": { - "baseline": "2.68.1", - "port-version": 2 + "baseline": "2.70.0", + "port-version": 0 }, "glm": { "baseline": "0.9.9.8", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 6ec585aeeeb5a7..c4c805e65d474e 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9d76755634e72f74de67a04e2713ba0278e772a", + "version": "2.70.5", + "port-version": 0 + }, { "git-tree": "83e2d36acbf39c01a33df90c4e65fee0221008aa", "version": "2.70.1", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index bc474973e5eeec..f6ffc0678ededb 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d485de58180f1755b67cb2b829c7c73e4dfae13a", + "version": "2.70.0", + "port-version": 0 + }, { "git-tree": "dd76481f04a2d3747dcd2c5eef0333ce5c6d61e5", "version": "2.68.1", From 86b0ea6fe5f355ac30735088841ca00b00c515d6 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 21 Mar 2022 22:02:46 +0100 Subject: [PATCH 014/217] [gdal] Update to 3.4.2 (#23475) * Update to 3.4.2 * Disable ATL for uwp and for arm64 * Fix linking on uwp * Fix pc file fixup * Update versions * Declare dependency on atlmfc. Co-authored-by: Billy Robert O'Neal III --- ports/gdal/0009-atlbase.patch | 72 +++++++++++++++++++++++++++++ ports/gdal/0009-poppler-cxx17.patch | 17 ------- ports/gdal/0010-symprefix.patch | 13 ++++++ ports/gdal/portfile.cmake | 19 ++++++-- ports/gdal/vcpkg.json | 8 ++-- scripts/ci.baseline.txt | 3 -- versions/baseline.json | 4 +- versions/g-/gdal.json | 5 ++ 8 files changed, 111 insertions(+), 30 deletions(-) create mode 100644 ports/gdal/0009-atlbase.patch delete mode 100644 ports/gdal/0009-poppler-cxx17.patch create mode 100644 ports/gdal/0010-symprefix.patch diff --git a/ports/gdal/0009-atlbase.patch b/ports/gdal/0009-atlbase.patch new file mode 100644 index 00000000000000..b2c423e1c8a3ba --- /dev/null +++ b/ports/gdal/0009-atlbase.patch @@ -0,0 +1,72 @@ +diff --git a/gdal/nmake.opt b/gdal/nmake.opt +index 7e7871e..ac01bf2 100644 +--- a/gdal/nmake.opt ++++ b/gdal/nmake.opt +@@ -239,6 +239,11 @@ STDCALL=YES + VERSION = 304 + !ENDIF + ++# Set HAVE_ATLBASE_H=NO if atlbase.h header is not available ++!IFNDEF HAVE_ATLBASE_H ++HAVE_ATLBASE_H=YES ++!ENDIF ++ + # Comment the following out if you want PAM supported disabled + # by default. + !IFNDEF PAM_SETTING +diff --git a/gdal/port/cpl_aws.cpp b/gdal/port/cpl_aws.cpp +index eed23f9..e3a1578 100644 +--- a/gdal/port/cpl_aws.cpp ++++ b/gdal/port/cpl_aws.cpp +@@ -43,7 +43,7 @@ CPL_CVSID("$Id$") + // #define DEBUG_VERBOSE 1 + + #ifdef WIN32 +-#if defined(_MSC_VER) ++#if defined(HAVE_ATLBASE_H) + bool CPLFetchWindowsProductUUID(CPLString &osStr); // defined in cpl_aws_win32.cpp + #endif + const char* CPLGetWineVersion(); // defined in cpl_vsil_win32.cpp +@@ -688,7 +688,7 @@ static bool IsMachinePotentiallyEC2Instance() + } + else + { +-#if defined(_MSC_VER) ++#if defined(HAVE_ATLBASE_H) + CPLString osMachineUUID; + if( CPLFetchWindowsProductUUID(osMachineUUID) ) + { +diff --git a/gdal/port/cpl_aws_win32.cpp b/gdal/port/cpl_aws_win32.cpp +index 7742a35..98be522 100644 +--- a/gdal/port/cpl_aws_win32.cpp ++++ b/gdal/port/cpl_aws_win32.cpp +@@ -28,7 +28,7 @@ + + #include "cpl_port.h" + +-#if defined(WIN32) && defined(_MSC_VER) ++#if defined(HAVE_ATLBASE_H) + + #define _WIN32_DCOM + #include +@@ -140,4 +140,4 @@ bool CPLFetchWindowsProductUUID(CPLString &osStr) + return !osWindowsProductUUID.empty(); + } + +-#endif /* defined(WIN32) && defined(_MSC_VER) */ ++#endif /* defined(HAVE_ATLBASE_H) */ +diff --git a/gdal/port/makefile.vc b/gdal/port/makefile.vc +index a8b0e02..68da2dd 100644 +--- a/gdal/port/makefile.vc ++++ b/gdal/port/makefile.vc +@@ -141,6 +141,10 @@ EXTRAFLAGS = $(EXTRAFLAGS) $(LZ4_CFLAGS) -DHAVE_LZ4 + ODBC_OBJ = cpl_odbc.obj + !ENDIF + ++!IF "$(HAVE_ATLBASE_H)" == "YES" ++EXTRAFLAGS = $(EXTRAFLAGS) -DHAVE_ATLBASE_H ++!ENDIF ++ + default: prev_dllbuild cpl_config.h $(LIB) + + $(LIB): $(OBJ) diff --git a/ports/gdal/0009-poppler-cxx17.patch b/ports/gdal/0009-poppler-cxx17.patch deleted file mode 100644 index ec82353eab623f..00000000000000 --- a/ports/gdal/0009-poppler-cxx17.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/gdal/frmts/pdf/GNUmakefile b/gdal/frmts/pdf/GNUmakefile -index aa42769477fc..56c2cd775d05 100644 ---- a/gdal/frmts/pdf/GNUmakefile -+++ b/gdal/frmts/pdf/GNUmakefile -@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle - endif - - ifeq ($(HAVE_POPPLER),yes) -+# Poppler 2022.1 requires c++17 -+ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0) -+CXX := $(subst -std=c++11,,${CXX}) -+CXX := $(subst -std=c++14,,${CXX}) -+CXX := ${CXX} -std=c++17 -+endif - CPPFLAGS += -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION) - endif - diff --git a/ports/gdal/0010-symprefix.patch b/ports/gdal/0010-symprefix.patch new file mode 100644 index 00000000000000..e21fb8d7790cc3 --- /dev/null +++ b/ports/gdal/0010-symprefix.patch @@ -0,0 +1,13 @@ +diff --git a/gdal/makefile.vc b/gdal/makefile.vc +index 9de546c..56f617d 100644 +--- a/gdal/makefile.vc ++++ b/gdal/makefile.vc +@@ -27,7 +27,7 @@ OGR_INCLUDE = $(OGR_BASE_INCLUDE) \ + CPPFLAGS = $(CPPFLAGS) -DGNM_ENABLED + !ENDIF + +-!IF DEFINED(STDCALL) && !DEFINED(WIN64) ++!IF DEFINED(STDCALL) && !DEFINED(WIN64) && "$(SYM_PREFIX)" == "_" + + BASE_INCLUDE = /INCLUDE:_GDALSimpleImageWarp@36 \ + /INCLUDE:_GDALReprojectImage@48 \ diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 50e1bea245f5b0..5d75c14216a97d 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -5,7 +5,8 @@ set(GDAL_PATCHES 0005-Fix-configure.patch 0007-Control-tools.patch 0008-Fix-absl-string_view.patch - 0009-poppler-cxx17.patch + 0009-atlbase.patch + 0010-symprefix.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND GDAL_PATCHES 0006-Fix-mingw-dllexport.patch) @@ -14,8 +15,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF v3.4.1 - SHA512 b9b5389f15fdc6cff846003a07c934918c0e1d8e53d0f2ea3f88fff31d3f8a59a857e938fc337d0bde11dc1416297d46f52d729576281bec53d50b08868c51ba + REF v3.4.2 + SHA512 4dadfaefb4924e17395b2d8b695e185e91e9ad28b4b8666b64f11f40164411974f8ade747592060b515907ee73bf335610698c5e53e56a8937a89ddfffc3d66b HEAD_REF master PATCHES ${GDAL_PATCHES} ) @@ -49,6 +50,14 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) list(APPEND NMAKE_OPTIONS "WIN64=YES") endif() + if(VCPKG_TARGET_IS_UWP) + list(APPEND NMAKE_OPTIONS "SYM_PREFIX=" "EXTRA_LINKER_FLAGS=/APPCONTAINER WindowsApp.lib") + endif() + + if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND NMAKE_OPTIONS "HAVE_ATLBASE_H=NO") + endif() + if(VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") list(APPEND NMAKE_OPTIONS "SSEFLAGS=/DNO_SSSE" "AVXFLAGS=/DNO_AVX") endif() @@ -330,8 +339,8 @@ else() vcpkg_fixup_pkgconfig() set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdal.pc") if(EXISTS "${pc_file_debug}") - vcpkg_replace_string("${pc_file_debug}" "${prefix}/../../include" "${prefix}/../include") - vcpkg_replace_string("${pc_file_debug}" "${exec_prefix}/include" "${prefix}/../include") + vcpkg_replace_string("${pc_file_debug}" "\${prefix}/../../include" "\${prefix}/../include") + vcpkg_replace_string("${pc_file_debug}" "\${exec_prefix}/include" "\${prefix}/../include") endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 0d5299bc7489fb..766fe35a82a84a 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,12 +1,14 @@ { "name": "gdal", - "version-semver": "3.4.1", - "port-version": 4, + "version-semver": "3.4.2", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, - "supports": "!uwp", "dependencies": [ + { + "name": "atlmfc", + "platform": "windows & !uwp" + }, "curl", "expat", "geos", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 081db27d460760..1346305cb3ca24 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -315,9 +315,6 @@ fuzzylite:x64-linux=fail fuzzylite:x64-osx=fail fuzzylite:x64-uwp=fail -# Requires ATL for ARM64 to be installed in CI -gdal:arm64-windows=fail - # gsoap does not offer stable public source downloads gsoap:x64-windows = skip gsoap:x86-windows = skip diff --git a/versions/baseline.json b/versions/baseline.json index 85ba73d58d4361..7746e49d44750d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2401,8 +2401,8 @@ "port-version": 1 }, "gdal": { - "baseline": "3.4.1", - "port-version": 4 + "baseline": "3.4.2", + "port-version": 0 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index ec6f7ea3683064..6f1222acf6000b 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c26036e04d87f1f5c27bf4bffa589b2481f47d3", + "version-semver": "3.4.2", + "port-version": 0 + }, { "git-tree": "daeafe53684ed8335d3bf77deeffa3424b26120d", "version-semver": "3.4.1", From 867df2ac4476661e69f78d96f80ff523b591f9cd Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 22 Mar 2022 05:07:02 +0800 Subject: [PATCH 015/217] [OpenVDB] Update to V9.0.0 (#23623) * [OpenVDB] Update to V9.0.0 * update version * add license * update version --- ports/openvdb/0003-fix-cmake.patch | 74 ++++++++++++++++--------- ports/openvdb/fix-Target-notfound.patch | 19 +++++++ ports/openvdb/portfile.cmake | 5 +- ports/openvdb/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/o-/openvdb.json | 5 ++ 6 files changed, 77 insertions(+), 31 deletions(-) create mode 100644 ports/openvdb/fix-Target-notfound.patch diff --git a/ports/openvdb/0003-fix-cmake.patch b/ports/openvdb/0003-fix-cmake.patch index 4bd86e5cfd4ead..52839ae143225f 100644 --- a/ports/openvdb/0003-fix-cmake.patch +++ b/ports/openvdb/0003-fix-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a879f2..e0d9ab5 100644 +index 8dfbc5e..0ba8887 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -356,13 +356,9 @@ endif() +@@ -373,13 +373,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") if(OPENVDB_INSTALL_CMAKE_MODULES) set(OPENVDB_CMAKE_MODULES @@ -17,10 +17,10 @@ index 2a879f2..e0d9ab5 100644 cmake/OpenVDBHoudiniSetup.cmake cmake/OpenVDBMayaSetup.cmake diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index 86eaf84..15fe31a 100644 +index 0dac1de..5014c6a 100644 --- a/cmake/FindOpenVDB.cmake +++ b/cmake/FindOpenVDB.cmake -@@ -462,7 +462,7 @@ endif() +@@ -485,7 +485,7 @@ endif() # Add standard dependencies @@ -29,7 +29,7 @@ index 86eaf84..15fe31a 100644 if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) # @note Both of these must be set for Boost 1.70 (VFX2020) to link against -@@ -612,7 +612,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) +@@ -635,7 +635,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) endif() if(OpenVDB_USES_BLOSC) @@ -38,7 +38,7 @@ index 86eaf84..15fe31a 100644 endif() if(OpenVDB_USES_ZLIB) -@@ -626,7 +626,7 @@ endif() +@@ -649,7 +649,7 @@ endif() if(OpenVDB_USES_IMATH_HALF) find_package(Imath CONFIG) if (NOT TARGET Imath::Imath) @@ -47,7 +47,7 @@ index 86eaf84..15fe31a 100644 endif() if(WIN32) -@@ -675,7 +675,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) +@@ -698,7 +698,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) if(NOT OPENVDB_USE_STATIC_LIBS) if(OpenVDB_USES_BLOSC) @@ -57,7 +57,7 @@ index 86eaf84..15fe31a 100644 if(OpenVDB_USES_ZLIB) list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt -index 9b6ba83..08b6bb3 100644 +index 1d5b75f..f2da6f9 100644 --- a/openvdb/openvdb/CMakeLists.txt +++ b/openvdb/openvdb/CMakeLists.txt @@ -127,9 +127,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION) @@ -81,23 +81,35 @@ index 9b6ba83..08b6bb3 100644 if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION) message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} " -@@ -157,14 +157,7 @@ endif() +@@ -157,26 +157,7 @@ endif() if(USE_BLOSC) # Find Blosc libraries - find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED) -- if(Blosc_FOUND AND Blosc_VERSION VERSION_GREATER MINIMUM_BLOSC_VERSION) -- message(WARNING "The version of Blosc located is greater than ${MINIMUM_BLOSC_VERSION}. " -- "There have been reported issues with using later versions of Blosc with OpenVDB. " -- "OpenVDB has been tested fully against Blosc ${MINIMUM_BLOSC_VERSION}, it is " -- "recommended that you use this version where possible." -- ) +- if(Blosc_VERSION) +- if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BLOSC_VERSION) +- if(${Blosc_VERSION} VERSION_LESS FUTURE_MINIMUM_BLOSC_VERSION) +- message(DEPRECATION "Support for Blosc versions < ${FUTURE_MINIMUM_BLOSC_VERSION} " +- "is deprecated and will be removed.") +- endif() +- endif() +- # Print a warning if using of the blosc versions with regression issues +- # with Blosc 1.5.0 caches. +- if((Blosc_VERSION VERSION_GREATER_EQUAL 1.11.0 AND +- Blosc_VERSION VERSION_LESS 1.14.0) OR +- (Blosc_VERSION VERSION_GREATER_EQUAL 1.16.0 AND +- Blosc_VERSION VERSION_LESS 1.16.2)) +- message(WARNING "The following Blosc versions are incompatible with the " +- "recommended builds of OpenVDB: [1.11.0 -> 1.14.0) [1.16.0, 1.16.1]. " +- "Found Blosc version '${Blosc_VERSION}' which falls in this range. We " +- "strongly recommend using the new future minimum version '${FUTURE_MINIMUM_BLOSC_VERSION}'") +- endif() - endif() + find_package(blosc CONFIG REQUIRED) else() message(WARNING "Blosc support is disabled. It is strongly recommended to " "enable blosc for optimal builds of OpenVDB and to support compatible " -@@ -222,7 +215,7 @@ endif() +@@ -234,7 +215,7 @@ endif() # /usr/local if(USE_BLOSC) @@ -107,7 +119,7 @@ index 9b6ba83..08b6bb3 100644 if(USE_BLOSC OR USE_ZLIB) diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt -index 4d96425..d2037e8 100644 +index c1d5649..c173566 100644 --- a/openvdb/openvdb/cmd/CMakeLists.txt +++ b/openvdb/openvdb/cmd/CMakeLists.txt @@ -46,7 +46,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") @@ -119,14 +131,22 @@ index 4d96425..d2037e8 100644 list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc) endif() -@@ -83,8 +83,8 @@ endif() - if(OPENVDB_BUILD_VDB_RENDER) - find_package(Imath CONFIG) - if (NOT TARGET Imath::Imath) -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) -- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) -+ find_package(IlmBase CONFIG REQUIRED) -+ find_package(OpenEXR CONFIG REQUIRED) - else() - find_package(OpenEXR CONFIG) +@@ -90,17 +90,13 @@ if(OPENVDB_BUILD_VDB_RENDER) + find_package(Imath CONFIG) + if (NOT TARGET Imath::Imath) + if(USE_EXR) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) +- else() +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + endif() + endif() + endif() + + if(USE_EXR) + if (NOT TARGET Imath::Imath) +- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) +- else() + find_package(OpenEXR CONFIG REQUIRED) + endif() endif() diff --git a/ports/openvdb/fix-Target-notfound.patch b/ports/openvdb/fix-Target-notfound.patch new file mode 100644 index 00000000000000..421ee5da202ace --- /dev/null +++ b/ports/openvdb/fix-Target-notfound.patch @@ -0,0 +1,19 @@ +diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt +index c173566..53f8575 100644 +--- a/openvdb/openvdb/cmd/CMakeLists.txt ++++ b/openvdb/openvdb/cmd/CMakeLists.txt +@@ -137,9 +137,11 @@ if(OPENVDB_BUILD_VDB_RENDER) + + if(WIN32) + # @note OPENVDB_OPENEXR_STATICLIB is old functionality and should be removed +- get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE) +- if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY)) +- target_compile_definitions(vdb_render PUBLIC -DOPENVDB_OPENEXR_STATICLIB) ++ if(USE_IMATH_HALF) ++ get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE) ++ if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY)) ++ target_compile_definitions(vdb_render PUBLIC -DOPENVDB_OPENEXR_STATICLIB) ++ endif() + endif() + endif() + diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index b5a3e77790cb2a..6016632fa1b59b 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openvdb - REF 89873d2bd29870cc9f176ed12b3f3a930ca38d1a # v8.2.0 - SHA512 d72a0eec6b7ce8e25fbe3100d4a291c35d7c2448f23131aaa9f247210f26e965198ef2991d9cf789afc754cbcddaace7a27ab62a2609a19a896034859c518699 + REF 0ed0f19ea4fbb0d8bf64d3dca07abab3c7429803 # v9.0.0 + SHA512 f033f2d5801327ab8aeffb12d1a74ff880e477a1f00da3b03a3087262a3e72ef77c13e05fe8e3c94a26721804230c0272d9ca069af997c36c992f3e2f3d962f2 PATCHES 0003-fix-cmake.patch + fix-Target-notfound.patch ) file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake") diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json index 669107898efb72..7acb002f72a632 100644 --- a/ports/openvdb/vcpkg.json +++ b/ports/openvdb/vcpkg.json @@ -1,8 +1,9 @@ { "name": "openvdb", - "version": "8.2.0", + "version": "9.0.0", "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", + "license": "MPL-2.0", "dependencies": [ "blosc", "boost-any", diff --git a/versions/baseline.json b/versions/baseline.json index 7746e49d44750d..5debe164804a49 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5145,7 +5145,7 @@ "port-version": 2 }, "openvdb": { - "baseline": "8.2.0", + "baseline": "9.0.0", "port-version": 0 }, "openvpn3": { diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index 3549324dfc9177..75ee6fac0e3f01 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a026562abe75e40d4b60d97108ef057b2e28629a", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "8546c4c4d392f4b0bb9a604e8bb6a831d39b99e8", "version": "8.2.0", From 67f79d8799d91434a0216303771a38eb2b12e8a0 Mon Sep 17 00:00:00 2001 From: Sandy Date: Mon, 21 Mar 2022 17:07:49 -0400 Subject: [PATCH 016/217] [Bullet3] Remove platform restrictions (#23673) * bullet3: Add patch for windows-arm64 * bullet3: Add patch for uwp * Bullet: Remove platform restrictions Bullet claims to support all platforms. ARM works on android and UWP seems to be taken into consideration. Vcpkg's restrictions are historical and seem to date back to when the CI was unable to properly test all platforms. --- ports/bullet3/portfile.cmake | 5 ++++- ports/bullet3/uwp-deltav-fix.patch | 26 ++++++++++++++++++++++ ports/bullet3/vcpkg.json | 3 +-- ports/bullet3/windows-arm64-sse-fix.patch | 27 +++++++++++++++++++++++ versions/b-/bullet3.json | 5 +++++ versions/baseline.json | 2 +- 6 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 ports/bullet3/uwp-deltav-fix.patch create mode 100644 ports/bullet3/windows-arm64-sse-fix.patch diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index d7531f57edac5c..42be5fd5502b6d 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -6,7 +6,10 @@ vcpkg_from_github( REF 3.17 SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc HEAD_REF master - PATCHES cmake-fix.patch + PATCHES + cmake-fix.patch + windows-arm64-sse-fix.patch + uwp-deltav-fix.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/bullet3/uwp-deltav-fix.patch b/ports/bullet3/uwp-deltav-fix.patch new file mode 100644 index 00000000000000..4df866b9119a6c --- /dev/null +++ b/ports/bullet3/uwp-deltav-fix.patch @@ -0,0 +1,26 @@ +From 35264f81bb63c4d4e5cf195e3b9db7ea6b761396 Mon Sep 17 00:00:00 2001 +From: Sandy Carter +Date: Sun, 20 Mar 2022 15:46:58 -0400 +Subject: [PATCH] UWP: Fix potentially uninitialized local pointer variable + error + +--- + src/BulletSoftBody/btSoftBody.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/BulletSoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp +index 933f3edc5..e91c1b9a4 100644 +--- a/src/BulletSoftBody/btSoftBody.cpp ++++ b/src/BulletSoftBody/btSoftBody.cpp +@@ -3897,7 +3897,7 @@ void btSoftBody::PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti) + btVector3 va(0, 0, 0); + btRigidBody* rigidCol = 0; + btMultiBodyLinkCollider* multibodyLinkCol = 0; +- btScalar* deltaV; ++ btScalar* deltaV = NULL; + + if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY) + { +-- +2.35.1 + diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json index 6c6013512a97bc..ec7966767267f2 100644 --- a/ports/bullet3/vcpkg.json +++ b/ports/bullet3/vcpkg.json @@ -1,10 +1,9 @@ { "name": "bullet3", "version": "3.17", - "port-version": 4, + "port-version": 5, "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", "homepage": "https://github.com/bulletphysics/bullet3", - "supports": "osx | !(arm | uwp)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/bullet3/windows-arm64-sse-fix.patch b/ports/bullet3/windows-arm64-sse-fix.patch new file mode 100644 index 00000000000000..cecea6ff3b9849 --- /dev/null +++ b/ports/bullet3/windows-arm64-sse-fix.patch @@ -0,0 +1,27 @@ +From e4414c80232d66f8a250aa83f934594bcba3c605 Mon Sep 17 00:00:00 2001 +From: Sandy +Date: Sun, 20 Mar 2022 15:41:07 -0400 +Subject: [PATCH] Fix compile on windows 64 bit arm architecture + +When building 64 bit arm with visual studio, btScalar will try to include SSE headers meant for x86 and x64 architectures. +This gives the following error in many source files: +``` +C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.31.31103\include\emmintrin.h(20): fatal error C1189: #error: This header is specific to X86 and X64 targets +``` +--- + src/LinearMath/btScalar.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h +index 28c03b2868..e47baadd6b 100644 +--- a/src/LinearMath/btScalar.h ++++ b/src/LinearMath/btScalar.h +@@ -107,7 +107,7 @@ inline int btIsDoublePrecision() + #define btFsel(a,b,c) __fsel((a),(b),(c)) + #else + +-#if defined (_M_ARM) ++#if defined (_M_ARM) || defined (_M_ARM64) + //Do not turn SSE on for ARM (may want to turn on BT_USE_NEON however) + #elif (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION)) + diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json index 10ebf720efab4a..6ac41d9e06bcf0 100644 --- a/versions/b-/bullet3.json +++ b/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f526f9d9698251590883fcc52ac8bf0f7ef9c5a4", + "version": "3.17", + "port-version": 5 + }, { "git-tree": "d986cc96144fa3de5201d56a508f348db9b66e71", "version": "3.17", diff --git a/versions/baseline.json b/versions/baseline.json index 5debe164804a49..b263cec9c9ac10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1174,7 +1174,7 @@ }, "bullet3": { "baseline": "3.17", - "port-version": 4 + "port-version": 5 }, "bustache": { "baseline": "1.1.0", From bea991d2c6ef0e37a4b97067c482930ecccf4482 Mon Sep 17 00:00:00 2001 From: Fei Chong Date: Tue, 22 Mar 2022 05:24:20 +0800 Subject: [PATCH 017/217] [qt5] fix ambiguous option for vulkan feature (#23645) qt5-base[vulkan] feature will introduce --vulkan=yes or --vulkan=no option, which redundants/confilicts with inherent option -no-vulkan, which is ambiguous in configure stage. --- ports/qt5-base/portfile.cmake | 1 - ports/qt5-base/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 +++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 5fa298b2a5de56..80c5996e59ac43 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -127,7 +127,6 @@ list(APPEND CORE_OPTIONS -system-sqlite -system-harfbuzz -icu - -no-vulkan -no-angle # Qt does not need to build angle. VCPKG will build angle! -no-glib ) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index fc71f36968ad7f..c4b5d854b4881b 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version": "5.15.3", - "port-version": 1, + "port-version": 2, "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/versions/baseline.json b/versions/baseline.json index b263cec9c9ac10..f8c69033222ec7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5642,7 +5642,7 @@ }, "qt5-base": { "baseline": "5.15.3", - "port-version": 1 + "port-version": 2 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 81218465f2f26e..a14cf4e64aa0ec 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abaaa592badf33576f197d915ed1f4ddd91d0931", + "version": "5.15.3", + "port-version": 2 + }, { "git-tree": "0b581b90072df50364b8c863110b2034a6b9f28e", "version": "5.15.3", From b3c7e74cd2b8ba58738ab943599de7ab5cdc4229 Mon Sep 17 00:00:00 2001 From: Burak Arslan Date: Mon, 21 Mar 2022 17:49:12 -0700 Subject: [PATCH 018/217] [nss] Add new ports nspr and nss (#21281) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [nspr] Add new port 4.33 * [nss] Add new port 3.73.1 * [nss] Add new port 3.73.1 * Improve code * Add supports field * improve code * version * Update doc * [nss] Switch to gyp-nss fork to fix msvc 17 build * [nss] Improve code * [nss] Bump version to 3.74 * [nspr] Add new port 4.33 * [nss] Add new port 3.73.1 * improve code * Update doc * [nss] Switch to gyp-nss fork to fix msvc 17 build * [nss] Improve code * [nss] Bump to 3.74 * [nss] Bump to 3.75 * [nss] Fix mpi.h confusion When GYP generates rules for ninja, it puts nspr include dirs before nss's own include dirs. When the msmpi package is installed, this causes mpi.h from msmpi to be found, instead of multi-precision integer library that comes bundled with nss. This patch uses nspr headers from include/nspr subdirectory which sidesteps the mpi.h from the include root * [nss] add quotes around paths Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [nss] remove debug versions of tools * [nspr] Remove redundant environment variable assignments * Add dependencies vcpkg-tool-mozbuild and vcpkg-tool-gyp-nss * clean doc * version * Remove unnecessary vcpkg_crosscompiling block on vcpkg-tool-gyp-nss. Guard for VCPKG_BUILD_TYPE Improve error reporting for unsupported VCPKG_TARGET_ARCHITECTURE Declare support for x64 rather than !x86 (given that the URI in question only has x64 binaries) Fix version numbers to use 'version'. Co-authored-by: JackBoosY Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/nspr/portfile.cmake | 94 ++++++++ ports/nspr/vcpkg.json | 14 ++ ports/nss/01-nspr-no-lib-prefix.patch | 12 + ports/nss/02-gen-debug-info-for-release.patch | 15 ++ ports/nss/portfile.cmake | 208 ++++++++++++++++++ ports/nss/vcpkg.json | 20 ++ ports/vcpkg-tool-gyp-nss/portfile.cmake | 21 ++ ports/vcpkg-tool-gyp-nss/vcpkg.json | 6 + ports/vcpkg-tool-mozbuild/portfile.cmake | 28 +++ ports/vcpkg-tool-mozbuild/vcpkg.json | 7 + versions/baseline.json | 16 ++ versions/n-/nspr.json | 9 + versions/n-/nss.json | 9 + versions/v-/vcpkg-tool-gyp-nss.json | 9 + versions/v-/vcpkg-tool-mozbuild.json | 9 + 15 files changed, 477 insertions(+) create mode 100644 ports/nspr/portfile.cmake create mode 100644 ports/nspr/vcpkg.json create mode 100644 ports/nss/01-nspr-no-lib-prefix.patch create mode 100644 ports/nss/02-gen-debug-info-for-release.patch create mode 100644 ports/nss/portfile.cmake create mode 100644 ports/nss/vcpkg.json create mode 100644 ports/vcpkg-tool-gyp-nss/portfile.cmake create mode 100644 ports/vcpkg-tool-gyp-nss/vcpkg.json create mode 100644 ports/vcpkg-tool-mozbuild/portfile.cmake create mode 100644 ports/vcpkg-tool-mozbuild/vcpkg.json create mode 100644 versions/n-/nspr.json create mode 100644 versions/n-/nss.json create mode 100644 versions/v-/vcpkg-tool-gyp-nss.json create mode 100644 versions/v-/vcpkg-tool-mozbuild.json diff --git a/ports/nspr/portfile.cmake b/ports/nspr/portfile.cmake new file mode 100644 index 00000000000000..c3302609fee90d --- /dev/null +++ b/ports/nspr/portfile.cmake @@ -0,0 +1,94 @@ +set(NSPR_VERSION "4.33") + +vcpkg_download_distfile(ARCHIVE + URLS "https://releases.mozilla.org/pub/nspr/releases/v${NSPR_VERSION}/src/nspr-${NSPR_VERSION}.tar.gz" + FILENAME "nspr-${NSPR_VERSION}.tar.gz" + SHA512 8064f826c977f1302a341ca7a7aaf7977b5d10102062c030b1d42b856638e3408ab262447e8c7cfd5a98879b9b1043d17ceae66fbb1e5ed86d6bc3531f26667e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF "${NSPR_VERSION}" +) + +set(MOZBUILD_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/mozbuild") + +set(MOZBUILD_BINDIR "${MOZBUILD_ROOT}/bin") +vcpkg_add_to_path("${MOZBUILD_BINDIR}") + +set(MOZBUILD_MSYS_ROOT "${MOZBUILD_ROOT}/msys") +vcpkg_add_to_path(PREPEND "${MOZBUILD_MSYS_ROOT}") + +set(OPTIONS "") +if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "--disable-static-rtl") +else() + list(APPEND OPTIONS "--enable-static-rtl") +endif() + +list(APPEND OPTIONS "--enable-win32-target=win95") + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND OPTIONS "--enable-64bit") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND OPTIONS "--disable-64bit") +else() + message(FATAL_ERROR "Unsupported arch: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +set(OPTIONS_DEBUG + "--enable-debug-rtl" +) + +set(OPTIONS_RELEASE + "--disable-debug-rtl" +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + CONFIGURE_ENVIRONMENT_VARIABLES CC CXX LD + PROJECT_SUBPATH "nspr" + OPTIONS ${OPTIONS} + OPTIONS_DEBUG ${OPTIONS_DEBUG} + OPTIONS_RELEASE ${OPTIONS_RELEASE} + DISABLE_VERBOSE_FLAGS true +) +vcpkg_install_make() +vcpkg_copy_pdbs() + +# +# VCPKG FHS adjustments +# + +# Release +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB BIN_RELEASE "${CURRENT_PACKAGES_DIR}/lib/*.dll" "${CURRENT_PACKAGES_DIR}/lib/*.pdb") + list(LENGTH BIN_RELEASE BIN_RELEASE_SIZE) + if (BIN_RELEASE_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + + foreach(path ${BIN_RELEASE}) + get_filename_component(name "${path}" NAME) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/${name}" "${CURRENT_PACKAGES_DIR}/bin/${name}") + endforeach() + endif() +endif() + +# Debug +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(GLOB BIN_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll" "${CURRENT_PACKAGES_DIR}/debug/lib/*.pdb") + list(LENGTH BIN_DEBUG BIN_DEBUG_SIZE) + if (BIN_DEBUG_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + + foreach(path IN LISTS BIN_DEBUG) + get_filename_component(name "${path}" NAME) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/${name}" "${CURRENT_PACKAGES_DIR}/debug/bin/${name}") + endforeach() + endif() +endif() + +# Copy license +file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nspr" RENAME copyright) diff --git a/ports/nspr/vcpkg.json b/ports/nspr/vcpkg.json new file mode 100644 index 00000000000000..096df7d4ab7056 --- /dev/null +++ b/ports/nspr/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "nspr", + "version": "4.33", + "description": "Netscape portable runtime", + "homepage": "https://releases.mozilla.org/pub/nspr/", + "license": "MPL-2.0", + "supports": "windows & !(arm | uwp | static)", + "dependencies": [ + { + "name": "vcpkg-tool-mozbuild", + "host": true + } + ] +} diff --git a/ports/nss/01-nspr-no-lib-prefix.patch b/ports/nss/01-nspr-no-lib-prefix.patch new file mode 100644 index 00000000000000..0351c0db6ac91f --- /dev/null +++ b/ports/nss/01-nspr-no-lib-prefix.patch @@ -0,0 +1,12 @@ +diff -ur x64-windows-rel/nss/coreconf/config.gypi src/3.66-485ec2a7fc.clean/nss/coreconf/config.gypi +--- a/nss/coreconf/config.gypi 2021-05-28 02:50:43.000000000 -0700 ++++ b/nss/coreconf/config.gypi 2021-11-09 07:51:35.884650900 -0800 +@@ -44,7 +44,7 @@ + }], + ['OS=="win"', { + 'use_system_zlib%': 0, +- 'nspr_libs%': ['libnspr4.lib', 'libplc4.lib', 'libplds4.lib'], ++ 'nspr_libs%': ['nspr4.lib', 'plc4.lib', 'plds4.lib'], + 'zlib_libs%': [], + #TODO + 'moz_debug_flags%': '', diff --git a/ports/nss/02-gen-debug-info-for-release.patch b/ports/nss/02-gen-debug-info-for-release.patch new file mode 100644 index 00000000000000..435abea2d86478 --- /dev/null +++ b/ports/nss/02-gen-debug-info-for-release.patch @@ -0,0 +1,15 @@ +diff -ur +--- a/nss/coreconf/config.gypi 2021-11-09 22:46:52.555246500 -0800 ++++ b/nss/coreconf/config.gypi 2021-11-10 00:49:48.044560100 -0800 +@@ -638,9 +638,11 @@ + 'VCCLCompilerTool': { + 'Optimization': '<(release_optimization_level)', + 'RuntimeLibrary': '2', # /MD ++ 'DebugInformationFormat': '3', + }, + 'VCLinkerTool': { + 'LinkIncremental': '1', ++ 'GenerateDebugInformation' : 'true', + }, + }, + }, diff --git a/ports/nss/portfile.cmake b/ports/nss/portfile.cmake new file mode 100644 index 00000000000000..59d58768dce495 --- /dev/null +++ b/ports/nss/portfile.cmake @@ -0,0 +1,208 @@ +set(NSS_VERSION "3.75") +string(REPLACE "." "_" V_URL ${NSS_VERSION}) + +vcpkg_download_distfile(ARCHIVE + URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${NSS_VERSION}.tar.gz" + FILENAME "nss-${NSS_VERSION}.tar.gz" + SHA512 0ad42f663b48649d7d16dc8b8956d2971a9566c0f7f655dd0609b94877f400977e5ad693f2eb44e1e277e55d1669294f07b3ba7a32573d3d72837b3944adf86d +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF "${NSS_VERSION}" + PATCHES "01-nspr-no-lib-prefix.patch" +) + +# setup ninja +vcpkg_find_acquire_program(NINJA) +get_filename_component(NINJA_ROOT "${NINJA}" DIRECTORY) +list(APPEND CMAKE_PROGRAM_PATH "${NINJA_ROOT}") +vcpkg_add_to_path(APPEND "${NINJA_ROOT}") + +# setup mozbuild for windows +if (VCPKG_TARGET_IS_WINDOWS) + set(MOZBUILD_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/mozbuild") + + set(MOZBUILD_BINDIR "${MOZBUILD_ROOT}/bin") + vcpkg_add_to_path(PREPEND "${MOZBUILD_BINDIR}") + + set(MOZBUILD_MSYS_ROOT "${MOZBUILD_ROOT}/msys") + vcpkg_add_to_path(PREPEND "${MOZBUILD_MSYS_ROOT}/bin") + + find_program(MOZBUILD_MAKE_COMMAND make PATHS "${MOZBUILD_MSYS_ROOT}/bin" NO_DEFAULT_PATH REQUIRED) + message(STATUS "Found make: ${MOZBUILD_MAKE_COMMAND}") + + find_program(MOZBUILD_BASH bash PATHS "${MOZBUILD_MSYS_ROOT}/bin" NO_DEFAULT_PATH REQUIRED) + message(STATUS "Found bash: ${MOZBUILD_BASH}") + + set(MOZBUILD_PYTHON_ROOT "${MOZBUILD_ROOT}/python") + find_program(MOZBUILD_PYTHON python PATHS "${MOZBUILD_ROOT}/python" NO_DEFAULT_PATH REQUIRED) + message(STATUS "Found python: ${MOZBUILD_PYTHON}") + vcpkg_add_to_path(PREPEND "${MOZBUILD_PYTHON_ROOT}") + +else() + # TODO: setup non-windows build environment + +endif() + +set(GYP_NSS_ROOT "${CURRENT_HOST_INSTALLED_DIR}/tools/gyp-nss") +if (VCPKG_HOST_IS_WINDOWS) + find_file(GYP_NSS NAMES gyp.bat PATHS "${GYP_NSS_ROOT}" NO_DEFAULT_PATH REQUIRED) +else() + find_program(GYP_NSS NAMES gyp PATHS "${GYP_NSS_ROOT}" NO_DEFAULT_PATH REQUIRED) +endif() +vcpkg_add_to_path(PREPEND "${GYP_NSS_ROOT}") +message(STATUS "Found gyp: ${GYP_NSS}") + +# setup paths +execute_process( + COMMAND ${MOZBUILD_BASH} -c pwd + WORKING_DIRECTORY ${CURRENT_INSTALLED_DIR}/include + OUTPUT_VARIABLE VCPKG_INCLUDEDIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) +message(STATUS "Using headers from: ${VCPKG_INCLUDEDIR} arch: ${VCPKG_TARGET_ARCHITECTURE}") + +execute_process( + COMMAND ${MOZBUILD_BASH} -c pwd + WORKING_DIRECTORY ${CURRENT_INSTALLED_DIR}/lib + OUTPUT_VARIABLE VCPKG_LIBDIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) +message(STATUS "Using libraries from: ${VCPKG_LIBDIR} arch: ${VCPKG_TARGET_ARCHITECTURE}") + +# +# get to work +# + +# see help.txt in nss root +set(OPTIONS + "-v" "-g" + "--disable-tests" + "--with-nspr=${VCPKG_INCLUDEDIR}/nspr:${VCPKG_LIBDIR}" + "--system-sqlite" + "-Dsign_libs=0" +) + +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND OPTIONS "--target=x64") +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + list(APPEND OPTIONS "--target=ia32") +else() + message(FATAL_ERROR "Unsupported arch: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS + "--msvc" + ) +endif() + +set(VCPKG_BINARY_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + +# build debug +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + message(STATUS "Copying sources to debug build dir ...") + file(COPY "${SOURCE_PATH}/nss" DESTINATION "${VCPKG_BINARY_DIR}-dbg") + message(STATUS "Building debug ...") + vcpkg_execute_required_process( + COMMAND ${MOZBUILD_BASH} ./build.sh ${OPTIONS} + WORKING_DIRECTORY ${VCPKG_BINARY_DIR}-dbg/nss + LOGNAME build-${TARGET_TRIPLET}${short_buildtype} + ) +endif() + +# build release +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + message(STATUS "Copying sources to release build dir ...") + file(COPY "${SOURCE_PATH}/nss" DESTINATION "${VCPKG_BINARY_DIR}-rel") + message(STATUS "Building release ...") + vcpkg_execute_required_process( + COMMAND ${MOZBUILD_BASH} ./build.sh ${OPTIONS} "--opt" + WORKING_DIRECTORY ${VCPKG_BINARY_DIR}-rel/nss + LOGNAME build-${TARGET_TRIPLET}${short_buildtype} + ) +endif() + +# +# VCPKG FHS adjustments +# + +# Headers + +file( + COPY "${VCPKG_BINARY_DIR}-rel/dist/public/nss" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +file( + COPY "${VCPKG_BINARY_DIR}-rel/dist/private/nss/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/nss/private" +) + +# Release libraries + +file(GLOB LIB_RELEASE + "${VCPKG_BINARY_DIR}-rel/dist/Release/lib/*.dll" + "${VCPKG_BINARY_DIR}-rel/dist/Release/lib/*.pdb" +) +list(LENGTH LIB_RELEASE LIB_RELEASE_SIZE) + +if (LIB_RELEASE_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + + foreach(path ${LIB_RELEASE}) + get_filename_component(name "${path}" NAME) + file(RENAME "${path}" "${CURRENT_PACKAGES_DIR}/bin/${name}") + endforeach() + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${VCPKG_BINARY_DIR}-rel/dist/Release/lib" DESTINATION "${CURRENT_PACKAGES_DIR}") +endif() + +# Release tools + +vcpkg_copy_tools( + TOOL_NAMES + "certutil" + "cmsutil" + "crlutil" + "hw-support" + "modutil" + "nss" + "pk12util" + "pwdecrypt" + "shlibsign" + "signtool" + "signver" + "ssltap" + "symkeyutil" + "validation" + SEARCH_DIR "${VCPKG_BINARY_DIR}-rel/dist/Release/bin/" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" +) + +# Debug libraries +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB LIB_DEBUG + "${VCPKG_BINARY_DIR}-dbg/dist/Debug/lib/*.dll" + "${VCPKG_BINARY_DIR}-dbg/dist/Debug/lib/*.pdb" + ) + list(LENGTH LIB_DEBUG LIB_DEBUG_SIZE) + + if (LIB_DEBUG_SIZE GREATER 0) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + + foreach(path ${LIB_DEBUG}) + get_filename_component(name "${path}" NAME) + file(RENAME "${path}" "${CURRENT_PACKAGES_DIR}/debug/bin/${name}") + endforeach() + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY "${VCPKG_BINARY_DIR}-dbg/dist/Debug/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + endif() +endif() + +# Copy license +file(INSTALL "${SOURCE_PATH}/nss/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nss" RENAME copyright) diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json new file mode 100644 index 00000000000000..a32a8be2c50e73 --- /dev/null +++ b/ports/nss/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "nss", + "version": "3.75", + "description": "Network Security Services from Mozilla", + "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", + "license": "MPL-2.0", + "supports": "windows & !arm", + "dependencies": [ + "nspr", + "sqlite3", + { + "name": "vcpkg-tool-gyp-nss", + "host": true + }, + { + "name": "vcpkg-tool-mozbuild", + "host": true + } + ] +} diff --git a/ports/vcpkg-tool-gyp-nss/portfile.cmake b/ports/vcpkg-tool-gyp-nss/portfile.cmake new file mode 100644 index 00000000000000..16bd07b2ff8d77 --- /dev/null +++ b/ports/vcpkg-tool-gyp-nss/portfile.cmake @@ -0,0 +1,21 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(PROGNAME gyp-nss) +set(PROG_VERSION b3177c3f6c2c45a8ca098ae0f0ebb4536c624762) +set(ARCHIVE gyp-nss-${PROG_VERSION}) + +vcpkg_download_distfile(ARCHIVE_PATH + URLS "https://github.com/plq/gyp-nss/archive/${PROG_VERSION}.zip" + SHA512 7cd05e1bdcdb579e8226ecae2e925285e164349927f60350b87703afe9cbdc308f044bc9f6455318f99778b7b49304003aab47f6c587a13e6fbdaaa1533c558d + FILENAME "${ARCHIVE}.zip" +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + +vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${ARCHIVE_PATH}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" +) +file(GLOB_RECURSE folders "${CURRENT_PACKAGES_DIR}/tools/*" LIST_DIRECTORIES true) + +file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${ARCHIVE}" "${CURRENT_PACKAGES_DIR}/tools/gyp-nss") diff --git a/ports/vcpkg-tool-gyp-nss/vcpkg.json b/ports/vcpkg-tool-gyp-nss/vcpkg.json new file mode 100644 index 00000000000000..74299811b57ec6 --- /dev/null +++ b/ports/vcpkg-tool-gyp-nss/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vcpkg-tool-gyp-nss", + "version-date": "2022-03-04", + "description": "https://github.com/plq/gyp-nss", + "supports": "native" +} diff --git a/ports/vcpkg-tool-mozbuild/portfile.cmake b/ports/vcpkg-tool-mozbuild/portfile.cmake new file mode 100644 index 00000000000000..28a65b99d6e4c0 --- /dev/null +++ b/ports/vcpkg-tool-mozbuild/portfile.cmake @@ -0,0 +1,28 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(PROGNAME mozbuild) +set(EXE_NAME mozmake) +set(PROG_VERSION 3.3) +set(ARCHIVE MozillaBuildSetup-${PROG_VERSION}) +set(BASE_URL "https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-") +set(URL "${BASE_URL}${PROG_VERSION}.exe") +set(HASH ac33d15dd9c974ef8ad581f9b414520a9d5e3b9816ab2bbf3e305d0a33356cc22c356cd9761e64a19588d17b6c13f124e837cfb462a36b8da898899e7db22ded) + +if(VCPKG_CROSSCOMPILING) + message(FATAL_ERROR "This is a host only port!") +endif() + +vcpkg_download_distfile(ARCHIVE_PATH + URLS "${URL}" + SHA512 ${HASH} + FILENAME "${ARCHIVE}.7z.exe" +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/mozbuild") + +vcpkg_find_acquire_program(7Z) + +vcpkg_execute_in_download_mode( + COMMAND "${7Z}" x "${ARCHIVE_PATH}" -aoa + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/mozbuild" +) diff --git a/ports/vcpkg-tool-mozbuild/vcpkg.json b/ports/vcpkg-tool-mozbuild/vcpkg.json new file mode 100644 index 00000000000000..feb244e7ede27c --- /dev/null +++ b/ports/vcpkg-tool-mozbuild/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-tool-mozbuild", + "version": "3.3", + "description": "mozbuild is a Python package providing functionality used by Mozilla’s build system", + "homepage": "https://firefox-source-docs.mozilla.org/build/buildsystem/mozbuild/index.html", + "supports": "native & x64 & windows" +} diff --git a/versions/baseline.json b/versions/baseline.json index f8c69033222ec7..cfe36b781ffa3d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4848,6 +4848,14 @@ "baseline": "4.1.2", "port-version": 1 }, + "nspr": { + "baseline": "4.33", + "port-version": 0 + }, + "nss": { + "baseline": "3.75", + "port-version": 0 + }, "nsync": { "baseline": "1.24.0", "port-version": 0 @@ -7272,6 +7280,10 @@ "baseline": "2021-10-23", "port-version": 0 }, + "vcpkg-tool-gyp-nss": { + "baseline": "2022-03-04", + "port-version": 0 + }, "vcpkg-tool-lessmsi": { "baseline": "1.10.0", "port-version": 0 @@ -7280,6 +7292,10 @@ "baseline": "0.60.2", "port-version": 2 }, + "vcpkg-tool-mozbuild": { + "baseline": "3.3", + "port-version": 0 + }, "vcpkg-tool-nodejs": { "baseline": "14.17.4", "port-version": 0 diff --git a/versions/n-/nspr.json b/versions/n-/nspr.json new file mode 100644 index 00000000000000..a784fd0685425f --- /dev/null +++ b/versions/n-/nspr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ec6fe24b3b4db98f624391627f113a7bd93397eb", + "version": "4.33", + "port-version": 0 + } + ] +} diff --git a/versions/n-/nss.json b/versions/n-/nss.json new file mode 100644 index 00000000000000..9fd5c647a8d807 --- /dev/null +++ b/versions/n-/nss.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "96cd78f1c74951c2e623deff9549d776bf4968b5", + "version": "3.75", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vcpkg-tool-gyp-nss.json b/versions/v-/vcpkg-tool-gyp-nss.json new file mode 100644 index 00000000000000..2c153252cd37d0 --- /dev/null +++ b/versions/v-/vcpkg-tool-gyp-nss.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "724d29c42ace865fdba94d8c32bdbe987072eaaa", + "version-date": "2022-03-04", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vcpkg-tool-mozbuild.json b/versions/v-/vcpkg-tool-mozbuild.json new file mode 100644 index 00000000000000..16089f35d0922b --- /dev/null +++ b/versions/v-/vcpkg-tool-mozbuild.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9ec0167eafba536f0f5d8a83807f6b3b0dbb50be", + "version": "3.3", + "port-version": 0 + } + ] +} From 2588a2e9790f86f2a58750e9911f9888db5996a2 Mon Sep 17 00:00:00 2001 From: Fletcher Dunn Date: Mon, 21 Mar 2022 19:25:04 -0700 Subject: [PATCH 019/217] [gamenetworkingsockets] update version to 1.4.0 (#23043) * Update to gamenetworkingsockets 1.4.0 * Added version using x-add-version --- ports/gamenetworkingsockets/portfile.cmake | 9 +++++---- ports/gamenetworkingsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gamenetworkingsockets.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/gamenetworkingsockets/portfile.cmake b/ports/gamenetworkingsockets/portfile.cmake index c0b2e487d0b197..212d5ceea876fd 100644 --- a/ports/gamenetworkingsockets/portfile.cmake +++ b/ports/gamenetworkingsockets/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/GameNetworkingSockets - REF 9875f39ad3fae8c913daa310c7ff0a7a54b1e6c2 # v1.3.0 - SHA512 edf814ef10a11b67045d90d589a3bd6471fa46bc3f16cf1e83d1806df6bb48306dcda4096a2ff80fee78b24ce36d164cd46808680c9f5f8f546455fce7bf9aa0 + REF b99aa75ed9b1ec57d5c90ee009f8de8882eeca13 # v1.4.0 + SHA512 1776a6a66d2c6546a8a3d71123544ea9590ab6b123d4a92eebd38c0a195f09a55185b999250c518527e1d8983176732429901a2f781a883715e6695b597229f5 HEAD_REF master ) @@ -14,8 +14,9 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DGAMENETWORKINGSOCKETS_BUILD_TESTS=OFF - -DGAMENETWORKINGSOCKETS_BUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_TOOLS=OFF -DUSE_CRYPTO=${CRYPTO_BACKEND} -DUSE_CRYPTO25519=${CRYPTO_BACKEND} ) diff --git a/ports/gamenetworkingsockets/vcpkg.json b/ports/gamenetworkingsockets/vcpkg.json index 84aff5eaeadb5c..433753e0d0165c 100644 --- a/ports/gamenetworkingsockets/vcpkg.json +++ b/ports/gamenetworkingsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gamenetworkingsockets", - "version": "1.3.0", + "version": "1.4.0", "description": "GameNetworkingSockets is a basic transport layer for games.", "homepage": "https://github.com/ValveSoftware/GameNetworkingSockets", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index cfe36b781ffa3d..125ed7fe2997c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2377,7 +2377,7 @@ "port-version": 2 }, "gamenetworkingsockets": { - "baseline": "1.3.0", + "baseline": "1.4.0", "port-version": 0 }, "gamma": { diff --git a/versions/g-/gamenetworkingsockets.json b/versions/g-/gamenetworkingsockets.json index 3aeda7b8cb47c2..3f87f529edc4ba 100644 --- a/versions/g-/gamenetworkingsockets.json +++ b/versions/g-/gamenetworkingsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56c1a61c82400d285d3d37cf8e20a1f362a0d83f", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "02453dad9eb5272c445ba8e22c3d1aa3383a1a11", "version": "1.3.0", From cd6034faaeb6c50700878c7c2e092ebf35d4b074 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 22 Mar 2022 10:26:30 +0800 Subject: [PATCH 020/217] [chartdir] Update SHA512 to fix install error (#23701) * [chartdir] Update SHA512 to fix install error * update version --- ports/chartdir/portfile.cmake | 2 +- ports/chartdir/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/chartdir.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake index 6a9f786102bba2..7e79c17d69ddf2 100644 --- a/ports/chartdir/portfile.cmake +++ b/ports/chartdir/portfile.cmake @@ -9,7 +9,7 @@ elseif(VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(ARCHIVE_FILE URLS "https://www.advsofteng.net/chartdir_cpp_win.zip" FILENAME "chartdir_cpp_win-7.0.0.zip" - SHA512 38d9dae641c0341ccee4709138afd37ad4718c34def70a0dc569956bf9c3488d0d66072f604dca4663dc80bd09446a2ba27ef3806fc3b87dda6aaa5453a7316f + SHA512 e5b5d387cff693a7f5ee98c2d2df75f421129b006e4324ae30ace0cbaac58867f048868ddfacdb3224c7165c8f27219c4273f3c778be3330d39ef95260d4186b ) vcpkg_extract_source_archive_ex( diff --git a/ports/chartdir/vcpkg.json b/ports/chartdir/vcpkg.json index 0d5298fd671ecd..f99954188dd583 100644 --- a/ports/chartdir/vcpkg.json +++ b/ports/chartdir/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chartdir", "version": "7.0.0", - "port-version": 2, + "port-version": 3, "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.", "homepage": "https://www.advsofteng.com/" } diff --git a/versions/baseline.json b/versions/baseline.json index 125ed7fe2997c5..cd14828767c823 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1338,7 +1338,7 @@ }, "chartdir": { "baseline": "7.0.0", - "port-version": 2 + "port-version": 3 }, "check": { "baseline": "0.15.2", diff --git a/versions/c-/chartdir.json b/versions/c-/chartdir.json index 5121b6e16acdf4..e2b949dd9c81b7 100644 --- a/versions/c-/chartdir.json +++ b/versions/c-/chartdir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b4bad1eb46439cbd63295d8120f03966c52d162", + "version": "7.0.0", + "port-version": 3 + }, { "git-tree": "fe0cf0c045f1092f18faa48f70b6b23d66e6298e", "version": "7.0.0", From ed9ba1e0a9a443cd1e84e24bf311b7c9c5da78b8 Mon Sep 17 00:00:00 2001 From: andremueller-cosateq <77957172+andremueller-cosateq@users.noreply.github.com> Date: Tue, 22 Mar 2022 03:27:37 +0100 Subject: [PATCH 021/217] [itk] Add feature opencv supporting ITKBridgeOpenCV (#23502) * add itk[opencv] supporting the ITKBridgeOpenCV module see https://github.com/InsightSoftwareConsortium/ITK/tree/master/Modules/Video/BridgeOpenCV * Add version * update version * reduce dependencies to opencv * update version Co-authored-by: Andre Mueller Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/itk/portfile.cmake | 7 +++++++ ports/itk/vcpkg.json | 12 ++++++++++++ versions/i-/itk.json | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 5bd030f4e61e39..b36ce928a2b4e2 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "tbb" Module_ITKTBB "rtk" Module_RTK "tools" RTK_BUILD_APPLICATIONS + "opencv" Module_ITKVideoBridgeOpenCV # There are a lot of more (remote) modules and options in ITK # feel free to add those as a feature ) @@ -108,6 +109,12 @@ if("python" IN_LIST FEATURES) ) #ITK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages within vcpkg endif() +if("opencv" IN_LIST FEATURES) + message(STATUS "${PORT} includes the ITKVideoBridgeOpenCV") + list(APPEND ADDITIONAL_OPTIONS + -DModule_ITKVideoBridgeOpenCV:BOOL=ON + ) +endif() set(USE_64BITS_IDS OFF) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index c50fa5f0fb817e..a86e3e10fdf5ee 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -67,6 +67,18 @@ "opencl" ] }, + "opencv": { + "description": "Build ITKVideoBridgeOpenCV module.", + "dependencies": [ + { + "name": "opencv", + "default-features": false, + "features": [ + "default-features" + ] + } + ] + }, "python": { "description": "Python functionality for ITK", "dependencies": [ diff --git a/versions/i-/itk.json b/versions/i-/itk.json index e723245764939a..7b63c922b0c430 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "292c97cb7b593c84d77628fbe7f6e91ea0f43902", + "git-tree": "21beac1c375ce633f869566345d7418849633c3e", "version": "5.2.1", "port-version": 1 }, From cec1fbea37eb6de75a2ea801b2b1c661190d6cd3 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 22 Mar 2022 03:38:10 +0100 Subject: [PATCH 022/217] [libdatrie] Update and fixes (#23681) * Libdatrie fixes * Libdatrie fixes and update to v0.2.13 * Add usage * Create feature 'tool' * Update versions * Install pkg-config module * Update versions Co-authored-by: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> --- ports/libdatrie/CMakeLists.txt | 35 ++++++++++--------- ports/libdatrie/fix-trietool.patch | 31 ----------------- ports/libdatrie/portfile.cmake | 56 ++++++++++++------------------ ports/libdatrie/usage | 13 +++++++ ports/libdatrie/vcpkg.json | 22 +++++++++--- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 4 +-- versions/l-/libdatrie.json | 5 +++ 8 files changed, 78 insertions(+), 90 deletions(-) delete mode 100644 ports/libdatrie/fix-trietool.patch create mode 100644 ports/libdatrie/usage diff --git a/ports/libdatrie/CMakeLists.txt b/ports/libdatrie/CMakeLists.txt index bdc1c21eaa4b72..57e7cf58e2f7b7 100644 --- a/ports/libdatrie/CMakeLists.txt +++ b/ports/libdatrie/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.22) project(libdatrie LANGUAGES C) option(SKIP_HEADERS "Skip headers" OFF) @@ -49,30 +49,23 @@ check_function_exists(malloc HAVE_MALLOC) configure_file(config.h.cmake config.h) +include_directories( + "${CMAKE_CURRENT_SOURCE_DIR}" + "${CMAKE_CURRENT_BINARY_DIR}" +) + add_library(libdatrie ${LIB_SRCS}) -target_include_directories(libdatrie PRIVATE ".") -target_include_directories(libdatrie PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) -set_target_properties(libdatrie PROPERTIES PREFIX "") -set_target_properties(libdatrie PROPERTIES DEBUG_POSTFIX "d") +set_target_properties(libdatrie PROPERTIES OUTPUT_NAME "datrie") if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) endif() - if (NOT SKIP_TOOL) add_executable(trietool "tools/trietool.c" ) - target_include_directories(trietool PRIVATE ".") - target_include_directories(trietool PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - target_link_libraries(trietool libdatrie) - - find_path(ICONV_INCLUDE_DIR iconv.h) - find_library(ICONV_LIBRARY NAMES iconv libiconv) - find_library(CHARSET_LIBRARY NAMES charset libcharset) - target_include_directories(trietool PRIVATE ${ICONV_INCLUDE_DIR}) - target_link_libraries(trietool ${ICONV_LIBRARY} ${CHARSET_LIBRARY}) - + find_package(Iconv REQUIRED) + target_link_libraries(trietool PRIVATE libdatrie Iconv::Iconv) install( TARGETS trietool RUNTIME DESTINATION bin @@ -92,3 +85,13 @@ if (NOT SKIP_HEADERS) DESTINATION "include/datrie" ) endif() + +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +configure_file(datrie-0.2.pc.in datrie-0.2.pc) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/datrie-0.2.pc" + DESTINATION "lib/pkgconfig" +) \ No newline at end of file diff --git a/ports/libdatrie/fix-trietool.patch b/ports/libdatrie/fix-trietool.patch deleted file mode 100644 index bcecee26e41698..00000000000000 --- a/ports/libdatrie/fix-trietool.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 086a76ad7c17060d504371ea724cf5d651d43eb3 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Thu, 28 Dec 2017 16:07:51 +0300 -Subject: [PATCH] fix trietool for MSVC runtime - ---- - tools/trietool.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/trietool.c b/tools/trietool.c -index 4cfde2a..7c90905 100644 ---- a/tools/trietool.c -+++ b/tools/trietool.c -@@ -589,12 +589,12 @@ string_trim (char *s) - char *p; - - /* skip leading white spaces */ -- while (*s && isspace (*s)) -+ while (*s && isspace ((unsigned char)*s)) - ++s; - - /* trim trailing white spaces */ - p = s + strlen (s) - 1; -- while (isspace (*p)) -+ while (isspace ((unsigned char)*p)) - --p; - *++p = '\0'; - --- -2.14.1.windows.1 - diff --git a/ports/libdatrie/portfile.cmake b/ports/libdatrie/portfile.cmake index 452b66a174f692..76e88046011323 100644 --- a/ports/libdatrie/portfile.cmake +++ b/ports/libdatrie/portfile.cmake @@ -1,52 +1,40 @@ -set(LIBDATRIE_VERSION 0.2.10) +set(LIBDATRIE_VERSION 0.2.13) -vcpkg_download_distfile(ARCHIVE - URLS "https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${LIBDATRIE_VERSION}.tar.xz" - FILENAME "libdatrie-${LIBDATRIE_VERSION}.tar.xz" - SHA512 ee68ded9d6e06c562da462d42e7e56098a82478d7b8547506200c3018b72536c4037a4e518924f779dc77d3ab139d93216bdb29ab4116b9dc9efd1a5d1eb9e31 -) - -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH + REPO tlwg/libdatrie + REF v${LIBDATRIE_VERSION} + SHA512 38f5a3ee1f3ca0f0601a5fcfeec3892cb34857d4b4720b8e018ca1beb6520c4c10af3bd2f0e4d64367cb256e8e2bca4d0a59b1c81fb36782613d2c258b64df59 + HEAD_REF master PATCHES - "${CMAKE_CURRENT_LIST_DIR}/fix-exports.patch" - "${CMAKE_CURRENT_LIST_DIR}/fix-trietool.patch" + fix-exports.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h.cmake" DESTINATION "${SOURCE_PATH}") -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(SKIP_TOOL ON) -else() - set(SKIP_TOOL OFF) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + tool SKIP_TOOL +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DVERSION=${LIBDATRIE_VERSION} - OPTIONS_RELEASE - -DSKIP_TOOL=${SKIP_TOOL} - -DSKIP_HEADERS=OFF + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSKIP_TOOL=ON -DSKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/trietool.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/trietool.exe) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +if(NOT SKIP_TOOL) + vcpkg_copy_tools(TOOL_NAMES trietool AUTO_CLEAN) endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libdatrie RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_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/libdatrie/usage b/ports/libdatrie/usage new file mode 100644 index 00000000000000..2eed31d16f73fe --- /dev/null +++ b/ports/libdatrie/usage @@ -0,0 +1,13 @@ +The package libdatrie can be used via CMake: + + find_path(LIBDATRIE_INCLUDE_DIR datrie/trie.h) + find_library(LIBDATRIE_LIBRARY NAMES datrie) + target_include_directories(main PRIVATE "${LIBDATRIE_INCLUDE_DIR}") + target_link_libraries(main PRIVATE "${LIBDATRIE_LIBRARY}") + +The package libdatrie can be imported via CMake FindPkgConfig module: + + include(FindPkgConfig) + pkg_check_modules(LIBDATRIE REQUIRED IMPORTED_TARGET datrie-0.2) + + target_link_libraries(main PRIVATE PkgConfig::LIBDATRIE) diff --git a/ports/libdatrie/vcpkg.json b/ports/libdatrie/vcpkg.json index b9f1f545705060..bb78a27aefd2a9 100644 --- a/ports/libdatrie/vcpkg.json +++ b/ports/libdatrie/vcpkg.json @@ -1,10 +1,22 @@ { "name": "libdatrie", - "version-string": "0.2.10", - "port-version": 4, - "description": "implementation of double-array structure for representing trie", + "version": "0.2.13", + "description": "Implementation of double-array structure for representing trie", "homepage": "https://linux.thai.net/pub/ThaiLinux/software/libthai", + "license": "LGPL-2.1-or-later", "dependencies": [ - "libiconv" - ] + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tool": { + "description": "Build the trietool application", + "supports": "!uwp", + "dependencies": [ + "libiconv" + ] + } + } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1346305cb3ca24..893da2e18078d7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -495,8 +495,6 @@ libcopp:arm-uwp=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail libgpod:x64-osx=fail -libdatrie:x64-linux=fail -libdatrie:x64-osx=fail libepoxy:arm-uwp=fail libepoxy:x64-uwp=fail libepoxy:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index cd14828767c823..320bfc219ae90f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3453,8 +3453,8 @@ "port-version": 0 }, "libdatrie": { - "baseline": "0.2.10", - "port-version": 4 + "baseline": "0.2.13", + "port-version": 0 }, "libdc1394": { "baseline": "2.2.6", diff --git a/versions/l-/libdatrie.json b/versions/l-/libdatrie.json index e67f74a58cc2d1..643ac455a5f8bc 100644 --- a/versions/l-/libdatrie.json +++ b/versions/l-/libdatrie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8e0374439550fd870ff280c0a3321c202b42929", + "version": "0.2.13", + "port-version": 0 + }, { "git-tree": "55aab3566cc2c82313f67f484a411b28f53da90b", "version-string": "0.2.10", From e4a05031c5683d4e57caa61318f5ad68c6e15377 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 21 Mar 2022 19:39:28 -0700 Subject: [PATCH 023/217] [fbthrift] Fix incorrect path in FBThriftConfig.cmake (#23686) * [fbthrift] Fix incorrect path in FBThriftConfig.cmake * update version Co-authored-by: Lily Wang --- ports/fbthrift/portfile.cmake | 9 +++++++++ ports/fbthrift/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/f-/fbthrift.json | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index bd757eaaca6cd3..bda0676fd08147 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -49,5 +49,14 @@ file(REMOVE_RECURSE vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN) vcpkg_copy_pdbs() +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake" + "${PACKAGE_PREFIX_DIR}/lib/cmake/fbthrift" "${PACKAGE_PREFIX_DIR}/share/fbthrift") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake" + "${PACKAGE_PREFIX_DIR}/bin/thrift1.exe" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1.exe") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake" + "${PACKAGE_PREFIX_DIR}/bin/thrift1" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1") +endif() + # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index d7869115b6a758..c7c4b3aeaa6aed 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fbthrift", "version-string": "2022.01.31.00", - "port-version": 1, + "port-version": 2, "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", + "license": "Apache-2.0", "supports": "x64 & static", "dependencies": [ "boost-context", diff --git a/versions/baseline.json b/versions/baseline.json index 320bfc219ae90f..84bb506ddd9563 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2158,7 +2158,7 @@ }, "fbthrift": { "baseline": "2022.01.31.00", - "port-version": 1 + "port-version": 2 }, "fcl": { "baseline": "0.7.0", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 3d7727e53c1fa7..e54a4e83efa7d6 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "228608a7708d80532948eec3a0987f2e85e4a43c", + "version-string": "2022.01.31.00", + "port-version": 2 + }, { "git-tree": "bf1148604c897c7727621feb13713eac7e782497", "version-string": "2022.01.31.00", From 1fff5b32a91019149244d97dabff3d4153468819 Mon Sep 17 00:00:00 2001 From: David <48836389+david-antiteum@users.noreply.github.com> Date: Tue, 22 Mar 2022 03:42:02 +0100 Subject: [PATCH 024/217] [mailio] Version 0.21.0 (#23696) * Version 0.21.0 Solves #23695 * Version 0.21.0 Solves #23695 Correct port format x-add-version called * Correct sha --- ports/mailio/portfile.cmake | 6 +++--- ports/mailio/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/m-/mailio.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/mailio/portfile.cmake b/ports/mailio/portfile.cmake index 2c3dfb932a6d33..ce7e7fadbcadae 100644 --- a/ports/mailio/portfile.cmake +++ b/ports/mailio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO karastojko/mailio - REF 1872f29d88a52f06cd96b611673b2e46c6b9832b # version_0-20-0 - SHA512 1686e49ed2c7163c33f88c820633e772986ecfea5696b78a44b370f44051190b14a1ddcd055bce2a9104324c80e8045cf0441c085eb6f272261da7e80bc4fdb5 + REF cc887a7808d9c55e07c8a7503c7ae2e2d7485120 # version_0-21-0 + SHA512 7125bfe4274e1e126e335b2e4b5743ef54d5dc0b6fd83f0c10e7578b57924d3e398af6b3865fdee3de587e2e2d7c33d95dbe017b1966649e68cf52f2dd268ee5 HEAD_REF master ) @@ -12,7 +12,6 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DMAILIO_BUILD_SHARED_LIBRARY=${BUILD_SHARED} -DMAILIO_BUILD_DOCUMENTATION=OFF -DMAILIO_BUILD_EXAMPLES=OFF ) @@ -21,4 +20,5 @@ vcpkg_cmake_install() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mailio/vcpkg.json b/ports/mailio/vcpkg.json index be8c009cd17b11..3d8a9406b1fb20 100644 --- a/ports/mailio/vcpkg.json +++ b/ports/mailio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mailio", - "version": "0.20.0", - "port-version": 2, + "version": "0.21.0", "maintainers": "Tomislav Karastojković ", "description": "mailio is a cross platform C++ library for MIME format and SMTP, POP3 and IMAP protocols. It is based on the standard C++ 17 and Boost library.", "homepage": "https://github.com/karastojko/mailio", diff --git a/versions/baseline.json b/versions/baseline.json index 84bb506ddd9563..81331cfe024932 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4329,8 +4329,8 @@ "port-version": 8 }, "mailio": { - "baseline": "0.20.0", - "port-version": 2 + "baseline": "0.21.0", + "port-version": 0 }, "mapbox-geojson-cpp": { "baseline": "0.5.1", diff --git a/versions/m-/mailio.json b/versions/m-/mailio.json index 5e713851f4c13d..5611b81ae2c520 100644 --- a/versions/m-/mailio.json +++ b/versions/m-/mailio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd8eea3c3ba5b6d465f5c799861571294c795d50", + "version": "0.21.0", + "port-version": 0 + }, { "git-tree": "452f51edc1d79104f3cf968477176d155666cb46", "version": "0.20.0", From 6b6a35335c9064fac2ec6684c4f79808dce59b7d Mon Sep 17 00:00:00 2001 From: Sandy Date: Mon, 21 Mar 2022 22:44:39 -0400 Subject: [PATCH 025/217] sdl2: Fix Emscripten declaration-after-statement error (#23678) --- ...pten-declaration-after-statement-err.patch | 45 +++++++++++++++++++ ports/sdl2/portfile.cmake | 3 +- ports/sdl2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++ 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch diff --git a/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch b/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch new file mode 100644 index 00000000000000..39665a9b84cd3f --- /dev/null +++ b/ports/sdl2/0007-timer-Fix-Emscripten-declaration-after-statement-err.patch @@ -0,0 +1,45 @@ +From 99af3281ee11ff947a82c561c2a275627ccea90c Mon Sep 17 00:00:00 2001 +From: Charlie Birks +Date: Sat, 22 Jan 2022 12:27:43 +0000 +Subject: [PATCH] timer: Fix Emscripten declaration-after-statement error + +--- + src/timer/unix/SDL_systimer.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/timer/unix/SDL_systimer.c b/src/timer/unix/SDL_systimer.c +index 57fdab09c..2cf26764c 100644 +--- a/src/timer/unix/SDL_systimer.c ++++ b/src/timer/unix/SDL_systimer.c +@@ -187,13 +187,6 @@ SDL_GetPerformanceFrequency(void) + void + SDL_Delay(Uint32 ms) + { +-#ifdef __EMSCRIPTEN__ +- if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) { +- /* pseudo-synchronous pause, used directly or through e.g. SDL_WaitEvent */ +- emscripten_sleep(ms); +- return; +- } +-#endif + int was_error; + + #if HAVE_NANOSLEEP +@@ -203,6 +196,14 @@ SDL_Delay(Uint32 ms) + Uint64 then, now, elapsed; + #endif + ++#ifdef __EMSCRIPTEN__ ++ if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) { ++ /* pseudo-synchronous pause, used directly or through e.g. SDL_WaitEvent */ ++ emscripten_sleep(ms); ++ return; ++ } ++#endif ++ + /* Set the timeout interval */ + #if HAVE_NANOSLEEP + elapsed.tv_sec = ms / 1000; +-- +2.35.1 + diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index fe845aa97ac395..67c43d4bbb146b 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( 0004-Define-crt-macros.patch 0005-Fix-uwp-joystick.patch 0006-Update-SDL_sysurl.cpp.patch + 0007-timer-Fix-Emscripten-declaration-after-statement-err.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) @@ -98,4 +99,4 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ") endif() -vcpkg_fixup_pkgconfig() \ No newline at end of file +vcpkg_fixup_pkgconfig() diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index dc92992c6a3de4..af004284078537 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2", "version": "2.0.20", + "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", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 81331cfe024932..6b82616f0d92ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6334,7 +6334,7 @@ }, "sdl2": { "baseline": "2.0.20", - "port-version": 0 + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 93196b43ed7a3d..16b746b1f06cf3 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9900463f2847ed86e25bac1688c527ae3486a024", + "version": "2.0.20", + "port-version": 1 + }, { "git-tree": "d5865b5fb9c52f255629f4c015f37df9ca788a33", "version": "2.0.20", From bb9bf77a6b48ae1a4054e2ef75aac4ca15849524 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 22 Mar 2022 18:55:22 +0100 Subject: [PATCH 026/217] Fix github actions (#23720) --- .github/workflows/trustedPR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trustedPR.yml b/.github/workflows/trustedPR.yml index 4ae202ec34c8cd..c2d86049355e8a 100644 --- a/.github/workflows/trustedPR.yml +++ b/.github/workflows/trustedPR.yml @@ -55,4 +55,4 @@ jobs: if (body !== "") { req.body = body; } - await github.pulls.createReview(req); + await github.rest.pulls.createReview(req); From 67e734c04ca963f0fc43a2787d6559c01a27a55a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 22 Mar 2022 10:56:43 -0700 Subject: [PATCH 027/217] Remove passing-remove-from-fail-lists from 2022-03-19 (#23707) PASSING, REMOVE FROM FAIL LIST: intelrdfpmathlib:x64-linux PASSING, REMOVE FROM FAIL LIST: ocilib:x64-windows-static PASSING, REMOVE FROM FAIL LIST: skia:arm64-windows PASSING, REMOVE FROM FAIL LIST: yato:x64-windows-static-md REGRESSION: argtable3:arm-uwp No repro. Maybe fixed by https://github.com/microsoft/vcpkg/pull/23655 REGRESSION: infoware:x64-windows-static ``` -- Found Git: C:/agent/externals/git/cmd/git.exe (found version "2.30.2.windows.1") Cloning into 'pciids'... fatal: unable to access 'https://github.com/pciutils/pciids/': Could not resolve host: github.com CMake Error at CMakeLists.txt:111 (message): Cloning/pulling pciids repository from https://github.com/pciutils/pciids failed with 128. The pci.ids file, downloadable from https://github.com/pciutils/pciids or http://pci-ids.ucw.cz, is required for building infoware, and cloned automatically from that GitHub repository by default. To use a local copy, set INFOWARE_PCI_IDS_PATH to its location. ``` Looks like this port needs to be fixed to work with artifact caching. REGRESSION: libgpg-error:x64-uwp ``` "D:\buildtrees\libgpg-error\x64-uwp-rel\error-1.42-2324ddbc71.clean\SMP\libgpg-error.sln" (Rebuild target) (1) -> "D:\buildtrees\libgpg-error\x64-uwp-rel\error-1.42-2324ddbc71.clean\SMP\libgpg-error_winrt.vcxproj" (Rebuild target) (2) -> (_GetPackageFileExtensions target) -> C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VisualStudio\v17.0\AppxPackage\Microsoft.AppXPackage.Targets(892,25): error MSB4086: A numeric comparison was attempted on "$(TargetPlatformMinVersion)" that evaluates to "" instead of a number, in condition "'$(TargetPlatformMinVersion)' >= '10.0.17200.0'". [D:\buildtrees\libgpg-error\x64-uwp-rel\error-1.42-2324ddbc71.clean\SMP\libgpg-error_winrt.vcxproj] ``` This looks like a VS2022 regression. REGRESSION: chromium-base:x64-osx This port is still having the strange behavior where building it once fails but building it again succeeds O_O REGRESSION: libmikmod:x64-osx This is emitting a bunch of spew about standard library symbols. REGRESSION: qtapplicationmanager:x64-windows Should be fixed by https://github.com/microsoft/vcpkg/pull/23638 --- scripts/ci.baseline.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 893da2e18078d7..587b21418c3e46 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -433,7 +433,6 @@ intel-mkl:x64-windows-static=fail intel-mkl:x64-windows-static-md=fail intel-mkl:x86-windows=fail intelrdfpmathlib:arm-uwp=fail -intelrdfpmathlib:x64-linux=fail intelrdfpmathlib:x64-uwp=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail @@ -851,7 +850,6 @@ nvtt:x64-uwp=fail ocilib:arm-uwp=fail ocilib:arm64-windows=fail ocilib:x64-uwp=fail -ocilib:x64-windows-static=fail ocilib:x64-windows-static-md=fail octomap:arm-uwp=fail octomap:x64-uwp=fail @@ -1204,7 +1202,6 @@ shogun:x64-windows-static-md=skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail -skia:arm64-windows=fail skia:arm-uwp=fail skia:x64-linux=fail skia:x64-uwp=fail @@ -1432,7 +1429,6 @@ v8:x64-windows=fail v8:x64-windows-static=fail v8:x64-windows-static-md=fail -yato:x64-windows-static-md=fail zyre:x64-windows-static-md=fail usbmuxd:x64-windows-static-md=fail workflow:x64-uwp=fail From b219334d40a15bca12536fc44ba0795533f65b9f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 23 Mar 2022 06:09:23 +0800 Subject: [PATCH 028/217] [WinReg] update to v5.0.1 (#23706) * [WinReg] update to v5.0.1 * update version --- ports/winreg/portfile.cmake | 4 ++-- ports/winreg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/winreg.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/winreg/portfile.cmake b/ports/winreg/portfile.cmake index baa5775f25baeb..7f09a788f2f66d 100644 --- a/ports/winreg/portfile.cmake +++ b/ports/winreg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF bcdce7361be8409887adac6f6b5cb0a436a489aa #v5.0.0 - SHA512 8a112cc505ba9ec4431e80ee77b6a08389ea8ed92c2d75be191e2494818913ad01d6b4cc0ccf213dd2dd3455594434ba3876fa385e71bdbb758797672c844d8d + REF d2cae6b398d3e5a4ac3f2b5215de9084609d7cff #v5.0.1 + SHA512 52f9a4cb57a59590349a20120b113e9926eea40a4aff05d7ffeaca73236add74685c160e37d37303684bc47f70b96998b816d2f3b9ea18777ec678dad02b7b7b HEAD_REF master ) diff --git a/ports/winreg/vcpkg.json b/ports/winreg/vcpkg.json index d3588bdf49ecdc..70afef0d4b485c 100644 --- a/ports/winreg/vcpkg.json +++ b/ports/winreg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "winreg", - "version": "5.0.0", + "version": "5.0.1", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6b82616f0d92ca..024a9f1fb8d411 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7417,7 +7417,7 @@ "port-version": 0 }, "winreg": { - "baseline": "5.0.0", + "baseline": "5.0.1", "port-version": 0 }, "winsock2": { diff --git a/versions/w-/winreg.json b/versions/w-/winreg.json index 8f257f3dd1ee3b..2e6a0cc0efd245 100644 --- a/versions/w-/winreg.json +++ b/versions/w-/winreg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a355bab9791bca02dc9ad9bc2b61f6ba72486a23", + "version": "5.0.1", + "port-version": 0 + }, { "git-tree": "a788126cfabb1299a7f43933fec7ced6074a7939", "version": "5.0.0", From 6065e5175fb8511ca6a9da8abd491da45814586d Mon Sep 17 00:00:00 2001 From: PanForPancakes <87640847+PanForPancakes@users.noreply.github.com> Date: Wed, 23 Mar 2022 02:12:30 +0400 Subject: [PATCH 029/217] [imfl/color-console] Add new port (#23671) * color-console port * :trollface: * :rocket: * git hates me for that :trollface: emoji * Update ports/color-console/portfile.cmake Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update ports/color-console/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update ports/color-console/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version color-console Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/color-console/portfile.cmake | 16 ++++++++++++++++ ports/color-console/usage | 4 ++++ ports/color-console/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/c-/color-console.json | 14 ++++++++++++++ 5 files changed, 45 insertions(+) create mode 100644 ports/color-console/portfile.cmake create mode 100644 ports/color-console/usage create mode 100644 ports/color-console/vcpkg.json create mode 100644 versions/c-/color-console.json diff --git a/ports/color-console/portfile.cmake b/ports/color-console/portfile.cmake new file mode 100644 index 00000000000000..392a600a7e6ead --- /dev/null +++ b/ports/color-console/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO imfl/color-console + REF 745f57141e6322e20cdda59a74ab1e00d107ade1 + SHA512 d4d919eb211f2981daf6b9af93262fc8ac89bac0db755ba30b31d6aa1b981e5383fb23ef95d1ff004606d138fee630fd790c72e92440b684306c6780750bd9fd + HEAD_REF master +) + +# Install source file +file(INSTALL ${SOURCE_PATH}/include/color.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME colorconsole.hpp) + +# Install license +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Install usage +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) \ No newline at end of file diff --git a/ports/color-console/usage b/ports/color-console/usage new file mode 100644 index 00000000000000..ec734688d95e6a --- /dev/null +++ b/ports/color-console/usage @@ -0,0 +1,4 @@ +The package zstr is header only and can be used from CMake via: + + find_path(COLORCONSOLE_INCLUDE_DIRS "colorconsole.hpp") + target_include_directories(main PRIVATE ${COLORCONSOLE_INCLUDE_DIRS}) \ No newline at end of file diff --git a/ports/color-console/vcpkg.json b/ports/color-console/vcpkg.json new file mode 100644 index 00000000000000..2475ce2cc4263e --- /dev/null +++ b/ports/color-console/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "color-console", + "version-date": "2022-03-20", + "description": "A lightweight header-only C++ library to bring colors to your Windows console with a very-easy-to-use API.", + "homepage": "https://github.com/imfl/color-console", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 024a9f1fb8d411..42967465eaad96 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1480,6 +1480,10 @@ "baseline": "2022-03-14", "port-version": 0 }, + "color-console": { + "baseline": "2022-03-20", + "port-version": 0 + }, "comms": { "baseline": "3.4.0", "port-version": 1 diff --git a/versions/c-/color-console.json b/versions/c-/color-console.json new file mode 100644 index 00000000000000..7aab6764a0eca5 --- /dev/null +++ b/versions/c-/color-console.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "bdd7720df549670e50ef636219b7d093f7cc8bc6", + "version-date": "2022-03-20", + "port-version": 0 + }, + { + "git-tree": "9a371b999eb2e8c7d72d50267fbcad9c9b3967b1", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} From 6996aecc964d7954946264f872c4cdd014817a4d Mon Sep 17 00:00:00 2001 From: Burak Arslan Date: Wed, 23 Mar 2022 07:16:21 +0300 Subject: [PATCH 030/217] [nss] Version bump to 3.76 (#23719) * [nss] Verbump 3.76 * [nss] Update version --- ports/nss/portfile.cmake | 4 ++-- ports/nss/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nss.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nss/portfile.cmake b/ports/nss/portfile.cmake index 59d58768dce495..79593dae847cc7 100644 --- a/ports/nss/portfile.cmake +++ b/ports/nss/portfile.cmake @@ -1,10 +1,10 @@ -set(NSS_VERSION "3.75") +set(NSS_VERSION "3.76") string(REPLACE "." "_" V_URL ${NSS_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${NSS_VERSION}.tar.gz" FILENAME "nss-${NSS_VERSION}.tar.gz" - SHA512 0ad42f663b48649d7d16dc8b8956d2971a9566c0f7f655dd0609b94877f400977e5ad693f2eb44e1e277e55d1669294f07b3ba7a32573d3d72837b3944adf86d + SHA512 ffbdd8a27f60b796e1204912cde2fa62ac99747ce550258ccdd6fe96d60a46c6ac3f82758a7aba3c7ee58da4e7bf09f1bf817fb9f0fa4e62faaea08a6301b8bd ) vcpkg_extract_source_archive_ex( diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json index a32a8be2c50e73..8a528257bab9dd 100644 --- a/ports/nss/vcpkg.json +++ b/ports/nss/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nss", - "version": "3.75", + "version": "3.76", "description": "Network Security Services from Mozilla", "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 42967465eaad96..3da9fc2baefd34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4857,7 +4857,7 @@ "port-version": 0 }, "nss": { - "baseline": "3.75", + "baseline": "3.76", "port-version": 0 }, "nsync": { diff --git a/versions/n-/nss.json b/versions/n-/nss.json index 9fd5c647a8d807..0fd85cbb1a14bd 100644 --- a/versions/n-/nss.json +++ b/versions/n-/nss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffcb42dbcb29e96a2e367dbbe473f447d67f54ce", + "version": "3.76", + "port-version": 0 + }, { "git-tree": "96cd78f1c74951c2e623deff9549d776bf4968b5", "version": "3.75", From 9958c2cac3c91e48d2419a4ed425e4de9a009c01 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 23 Mar 2022 05:21:50 +0100 Subject: [PATCH 031/217] Fix usage of FindPkgConfig module (#23708) * Fix usage of FindPkgConfig module * Update versions --- ports/libdatrie/usage | 2 +- ports/libdatrie/vcpkg.json | 1 + ports/libfido2/fix_cmakelists.patch | 2 +- ports/libfido2/vcpkg.json | 1 + ports/liburing/usage | 2 +- ports/liburing/vcpkg.json | 2 +- ports/poppler/usage | 2 +- ports/poppler/vcpkg.json | 1 + versions/baseline.json | 8 ++++---- versions/l-/libdatrie.json | 5 +++++ versions/l-/libfido2.json | 5 +++++ versions/l-/liburing.json | 5 +++++ versions/p-/poppler.json | 5 +++++ 13 files changed, 32 insertions(+), 9 deletions(-) diff --git a/ports/libdatrie/usage b/ports/libdatrie/usage index 2eed31d16f73fe..e63cedeeda99ce 100644 --- a/ports/libdatrie/usage +++ b/ports/libdatrie/usage @@ -7,7 +7,7 @@ The package libdatrie can be used via CMake: The package libdatrie can be imported via CMake FindPkgConfig module: - include(FindPkgConfig) + find_package(PkgConfig) pkg_check_modules(LIBDATRIE REQUIRED IMPORTED_TARGET datrie-0.2) target_link_libraries(main PRIVATE PkgConfig::LIBDATRIE) diff --git a/ports/libdatrie/vcpkg.json b/ports/libdatrie/vcpkg.json index bb78a27aefd2a9..e143b035f9b765 100644 --- a/ports/libdatrie/vcpkg.json +++ b/ports/libdatrie/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdatrie", "version": "0.2.13", + "port-version": 1, "description": "Implementation of double-array structure for representing trie", "homepage": "https://linux.thai.net/pub/ThaiLinux/software/libthai", "license": "LGPL-2.1-or-later", diff --git a/ports/libfido2/fix_cmakelists.patch b/ports/libfido2/fix_cmakelists.patch index a5da148cb1432d..23bbf6a8fac558 100644 --- a/ports/libfido2/fix_cmakelists.patch +++ b/ports/libfido2/fix_cmakelists.patch @@ -18,7 +18,7 @@ index 11a51ac..33b9313 100644 - set(CBOR_LIBRARIES cbor) - set(ZLIB_LIBRARIES zlib) - set(CRYPTO_LIBRARIES crypto-47) -+ include(FindPkgConfig) ++ find_package(PkgConfig) + + find_package(LIBCBOR REQUIRED) + find_package(OpenSSL REQUIRED) diff --git a/ports/libfido2/vcpkg.json b/ports/libfido2/vcpkg.json index c45f3fceb1487b..a470ecdd59e204 100644 --- a/ports/libfido2/vcpkg.json +++ b/ports/libfido2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libfido2", "version": "1.10.0", + "port-version": 1, "description": "Provides library functionality to communicate with a FIDO device over USB, and to verify attestation and assertion signatures.", "homepage": "https://developers.yubico.com/libfido2/", "license": "BSD-2-Clause", diff --git a/ports/liburing/usage b/ports/liburing/usage index 36a7188959a198..bbfbaafbf24a51 100644 --- a/ports/liburing/usage +++ b/ports/liburing/usage @@ -1,6 +1,6 @@ The package liburing can be imported via CMake FindPkgConfig module: - include(FindPkgConfig) + find_package(PkgConfig) pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0) target_link_libraries(main PRIVATE PkgConfig::liburing) diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index 17ba8c16cbd710..37403d70c9d118 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liburing", "version": "2.0", - "port-version": 2, + "port-version": 3, "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", "supports": "linux" diff --git a/ports/poppler/usage b/ports/poppler/usage index f901589b2e8a47..1c3ed1b2d271cf 100644 --- a/ports/poppler/usage +++ b/ports/poppler/usage @@ -1,6 +1,6 @@ The package poppler can be imported via CMake FindPkgConfig module: - include(FindPkgConfig) + find_package(PkgConfig) pkg_check_modules(POPPLER_CPP REQUIRED IMPORTED_TARGET poppler-cpp) target_link_libraries(main PRIVATE PkgConfig::POPPLER_CPP) diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index 988bc780fe3c30..f1a3be54c088b3 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,6 +1,7 @@ { "name": "poppler", "version": "22.3.0", + "port-version": 1, "description": "A PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 3da9fc2baefd34..aa225f0fa04ac1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3458,7 +3458,7 @@ }, "libdatrie": { "baseline": "0.2.13", - "port-version": 0 + "port-version": 1 }, "libdc1394": { "baseline": "2.2.6", @@ -3522,7 +3522,7 @@ }, "libfido2": { "baseline": "1.10.0", - "port-version": 0 + "port-version": 1 }, "libflac": { "baseline": "1.3.3", @@ -4094,7 +4094,7 @@ }, "liburing": { "baseline": "2.0", - "port-version": 2 + "port-version": 3 }, "libusb": { "baseline": "1.0.24", @@ -5478,7 +5478,7 @@ }, "poppler": { "baseline": "22.3.0", - "port-version": 0 + "port-version": 1 }, "popsift": { "baseline": "0.9", diff --git a/versions/l-/libdatrie.json b/versions/l-/libdatrie.json index 643ac455a5f8bc..14fe14750843cd 100644 --- a/versions/l-/libdatrie.json +++ b/versions/l-/libdatrie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60d1568dadc94ddb1b894b33a8da7b20802a96e8", + "version": "0.2.13", + "port-version": 1 + }, { "git-tree": "f8e0374439550fd870ff280c0a3321c202b42929", "version": "0.2.13", diff --git a/versions/l-/libfido2.json b/versions/l-/libfido2.json index a58e394b56a55e..95a5d06be973ac 100644 --- a/versions/l-/libfido2.json +++ b/versions/l-/libfido2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad26e81c6c119e160709c7e0ce7872d888ed5a57", + "version": "1.10.0", + "port-version": 1 + }, { "git-tree": "0d3dc297cbc4c116910b6cb793bc3b5a06834e00", "version": "1.10.0", diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index b5e32b3429d5c1..2fc0750a765c67 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10bf5144950610a1f587342c5107bf4fdfb52658", + "version": "2.0", + "port-version": 3 + }, { "git-tree": "65bbf5b3f642b9e76a659d78a9077d207c827b76", "version": "2.0", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index e0a495273b6775..275069c77acbb0 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d14bc508abd0861bda1a16290ad65b061a82b7c", + "version": "22.3.0", + "port-version": 1 + }, { "git-tree": "9928fbfbe44a32d0a4ff7efed4de2a7797958322", "version": "22.3.0", From 358e3449d3b78a33819f04639ccd0907905655cd Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 23 Mar 2022 05:37:07 +0100 Subject: [PATCH 032/217] [libarchive] Fix lzo support in wrapper (#23664) * Fix lzo support in wrapper * Update usage * Update versions * CI --- ports/libarchive/usage | 5 ++++- ports/libarchive/vcpkg-cmake-wrapper.cmake.in | 11 +++++++++-- ports/libarchive/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libarchive.json | 5 +++++ 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ports/libarchive/usage b/ports/libarchive/usage index cf8c24304535e8..ff8a1fb0b6d509 100644 --- a/ports/libarchive/usage +++ b/ports/libarchive/usage @@ -1,5 +1,8 @@ -The package libarchive is compatible with built-in CMake targets: +The package libarchive is compatible with the CMake Find Module: find_package(LibArchive REQUIRED) target_include_directories(main PRIVATE ${LibArchive_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${LibArchive_LIBRARIES}) + + find_package(LibArchive REQUIRED) + target_link_libraries(main PRIVATE LibArchive::LibArchive) # CMake >= 3.17 diff --git a/ports/libarchive/vcpkg-cmake-wrapper.cmake.in b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in index 5f00aad95cbf62..f3b7cf5885db85 100644 --- a/ports/libarchive/vcpkg-cmake-wrapper.cmake.in +++ b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in @@ -33,8 +33,8 @@ if(LibArchive_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") endif() if(@ENABLE_LZO@) include(SelectLibraryConfigurations) - find_library(Z_VCPKG_LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) - find_library(Z_VCPKG_LZO_LIBRARY_RELEASE NAMES lzo2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + find_library(Z_VCPKG_LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) + find_library(Z_VCPKG_LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) select_library_configurations(Z_VCPKG_LZO) if(Z_VCPKG_LZO_LIBRARY) list(APPEND z_vcpkg_libarchive_libs ${Z_VCPKG_LZO_LIBRARY}) @@ -57,6 +57,13 @@ if(LibArchive_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") list(APPEND LibArchive_LIBRARIES ${z_vcpkg_libarchive_libs}) if(TARGET LibArchive::LibArchive) + if(Z_VCPKG_LZO_LIBRARY AND Z_VCPKG_LZO_LIBRARY_DEBUG) + list(REMOVE_ITEM z_vcpkg_libarchive_libs ${Z_VCPKG_LZO_LIBRARY}) + list(APPEND z_vcpkg_libarchive_libs + "\$<\$>:${Z_VCPKG_LZO_LIBRARY_RELEASE}>" + "\$<\$:${Z_VCPKG_LZO_LIBRARY_DEBUG}>" + ) + endif() set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_libarchive_libs}) endif() unset(z_vcpkg_libarchive_libs) diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index d3f0739cbbafd3..0a0eb02d5b5e7b 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libarchive", "version-semver": "3.5.2", - "port-version": 4, + "port-version": 5, "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index aa225f0fa04ac1..ea16f432c908df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3370,7 +3370,7 @@ }, "libarchive": { "baseline": "3.5.2", - "port-version": 4 + "port-version": 5 }, "libass": { "baseline": "0.15.2", diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index e104add83c1fee..1cb4b7bf07aee9 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeb6f06729d407abcf56fa92b2fcff01c031035b", + "version-semver": "3.5.2", + "port-version": 5 + }, { "git-tree": "96ba668589b8400bcc1164b98fc5dcecf3af923e", "version-semver": "3.5.2", From 423d9f01a7195a9fd13998500d57f532344eae38 Mon Sep 17 00:00:00 2001 From: Vito Gamberini Date: Wed, 23 Mar 2022 00:50:33 -0400 Subject: [PATCH 033/217] [ztd-text] Add port (#23662) * Add ztd-text port * [ztd-text] Add supports: !uwp * [ztd-text] Switch to version-date, update to latest --- ports/ztd-text/portfile.cmake | 37 +++++++++++++++++++++++++++++++++++ ports/ztd-text/usage | 4 ++++ ports/ztd-text/vcpkg.json | 14 +++++++++++++ versions/baseline.json | 4 ++++ versions/z-/ztd-text.json | 9 +++++++++ 5 files changed, 68 insertions(+) create mode 100644 ports/ztd-text/portfile.cmake create mode 100644 ports/ztd-text/usage create mode 100644 ports/ztd-text/vcpkg.json create mode 100644 versions/z-/ztd-text.json diff --git a/ports/ztd-text/portfile.cmake b/ports/ztd-text/portfile.cmake new file mode 100644 index 00000000000000..377a475b06f0fe --- /dev/null +++ b/ports/ztd-text/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH ZTD_CMAKE_PATH + REPO soasis/cmake + REF 4277edaf7bf237de07c4a9833f6546872ab9f151 + SHA512 f05143068a1f22bd46aa0d8c250afb04b29ffbc0f32d746093bfb61f274d0e212ff9786a5163608097ed989b5b212d73811179f311a37d2b2eedce89cc75ee94 + HEAD_REF main +) + +vcpkg_from_github( + OUT_SOURCE_PATH ZTD_IDK_PATH + REPO soasis/idk + REF 6173bb3d433a3dab65e8c356ef69441aa5a86275 + SHA512 083711e9fc9b03aac34c5a7e182691a9bc9ee2d7c2d9ed2f55093423e2655f7a3829bd3e3db82bc42a78721795ca2d21a7b64c71f05e3c03ea3198f6228eb6f2 + HEAD_REF main +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO soasis/text + REF d76205c12300234f815e099e5f8152f443515df5 + SHA512 836b6cb1a59cd1138bc4c00f9f511bced912d1d5dc36a4a7d757ef1cd7e31cf5046b5a32476ffa89ea9c0ca7834028774f9baa8c74bfc9287cc16ef3b4e987df + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DFETCHCONTENT_SOURCE_DIR_ZTD.CMAKE=${ZTD_CMAKE_PATH} + -DFETCHCONTENT_SOURCE_DIR_ZTD.IDK=${ZTD_IDK_PATH} +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ztd-text/usage b/ports/ztd-text/usage new file mode 100644 index 00000000000000..86c8ef9fc2230b --- /dev/null +++ b/ports/ztd-text/usage @@ -0,0 +1,4 @@ +The package ztd-text is header only and can be used from CMake via: + + find_path(ZTD_INCLUDE_DIRS ztd) + target_include_directories(main PRIVATE ${ZTD_INCLUDE_DIRS}) diff --git a/ports/ztd-text/vcpkg.json b/ports/ztd-text/vcpkg.json new file mode 100644 index 00000000000000..1de4a13965f670 --- /dev/null +++ b/ports/ztd-text/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ztd-text", + "version-date": "2022-03-21", + "description": "A spicy text library.", + "homepage": "https://github.com/soasis/text", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ea16f432c908df..8334322aac5f0d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7660,6 +7660,10 @@ "baseline": "1.0.4", "port-version": 2 }, + "ztd-text": { + "baseline": "2022-03-21", + "port-version": 0 + }, "zug": { "baseline": "2021-04-23", "port-version": 0 diff --git a/versions/z-/ztd-text.json b/versions/z-/ztd-text.json new file mode 100644 index 00000000000000..11d2b3dc2590c0 --- /dev/null +++ b/versions/z-/ztd-text.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "594b7d2a437b6576bfd4993e9763cac18621e903", + "version-date": "2022-03-21", + "port-version": 0 + } + ] +} From 2aa0d83ee7756eb4d221c6ef7784f34ba65c093d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:14:40 +0100 Subject: [PATCH 034/217] [gmp] Switch sources on windows away from SMP fork. (#23466) * [gmp] use native buildsystem on windows * fix stuff from merge * fix version * version stuff * trying patching some symbols for dynamic builds * fix nettle build * fix more dependent ports using gmpd * fix uwp builds by copying tools * missing host dep * fix mpfr * version-string nettle * port-version mpfr * version stuff * remove patch from portfile * version stuff Co-authored-by: Alexander Neumann --- ports/gmp/adddef.patch | 12 --- ports/gmp/msvc_symbol.patch | 28 +++++ ports/gmp/portfile.cmake | 166 ++++++++++++------------------ ports/gmp/runtime.patch | 180 --------------------------------- ports/gmp/vcpkg.json | 9 +- ports/gmp/vs.build.patch | 172 ------------------------------- ports/gmp/yasm.patch | 83 +++++++++++++++ ports/mpc/gmpd.patch | 15 --- ports/mpc/portfile.cmake | 1 - ports/mpc/vcpkg.json | 4 +- ports/mpfr/gmpd.patch | 15 --- ports/mpfr/portfile.cmake | 5 - ports/mpfr/vcpkg.json | 4 +- ports/nettle/gmp.patch | 8 +- ports/nettle/name.dir.patch | 8 +- ports/nettle/portfile.cmake | 3 +- ports/nettle/remove_gmpd.patch | 44 ++++++++ ports/nettle/vcpkg.json | 4 +- versions/baseline.json | 8 +- versions/g-/gmp.json | 5 + versions/m-/mpc.json | 5 + versions/m-/mpfr.json | 5 + versions/n-/nettle.json | 5 + 23 files changed, 263 insertions(+), 526 deletions(-) delete mode 100644 ports/gmp/adddef.patch create mode 100644 ports/gmp/msvc_symbol.patch delete mode 100644 ports/gmp/runtime.patch delete mode 100644 ports/gmp/vs.build.patch create mode 100644 ports/gmp/yasm.patch delete mode 100644 ports/mpc/gmpd.patch delete mode 100644 ports/mpfr/gmpd.patch create mode 100644 ports/nettle/remove_gmpd.patch diff --git a/ports/gmp/adddef.patch b/ports/gmp/adddef.patch deleted file mode 100644 index c2276ffc10b2d6..00000000000000 --- a/ports/gmp/adddef.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/SMP/libgmp.def b/SMP/libgmp.def -index 289f0e2d1..632274ab2 100644 ---- a/SMP/libgmp.def -+++ b/SMP/libgmp.def -@@ -16,6 +16,7 @@ __gmp_randclear - __gmp_urandomb_ui - __gmp_urandomm_ui - __gmp_asprintf -+__gmp_vasprintf - __gmp_fprintf - __gmp_printf - __gmp_snprintf diff --git a/ports/gmp/msvc_symbol.patch b/ports/gmp/msvc_symbol.patch new file mode 100644 index 00000000000000..c416595b30e655 --- /dev/null +++ b/ports/gmp/msvc_symbol.patch @@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index cafdb3c71..bd92bc4bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2703,8 +2703,8 @@ Use "--disable-static --enable-shared" to build just a DLL.]) + # + if test "$enable_shared" = yes; then + GMP_LDFLAGS="$GMP_LDFLAGS -no-undefined -Wl,--export-all-symbols" +- LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmp-3.dll.def" +- LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmpxx-3.dll.def" ++ #LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmp-3.dll.def" ++ #LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmpxx-3.dll.def" + LIBGMP_DLL=1 + fi + ;; +diff --git a/gmp-h.in b/gmp-h.in +index 3d449d427..18a03b753 100644 +--- a/gmp-h.in ++++ b/gmp-h.in +@@ -398,7 +398,7 @@ typedef __mpq_struct *mpq_ptr; + + /* Microsoft's C compiler accepts __inline */ + #ifdef _MSC_VER +-#define __GMP_EXTERN_INLINE __inline ++#define __GMP_EXTERN_INLINE static __inline + #endif + + /* Recent enough Sun C compilers want "inline" */ diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 6007ad9c60dd3b..b4acb3047bfb94 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -2,116 +2,78 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/gmp.h" OR "${CURRENT_INSTALLED_DIR}/ message(FATAL_ERROR "Can't build ${PORT} if mpir is installed. Please remove mpir, and try install ${PORT} again if you need it.") endif() -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ShiftMediaProject/gmp - REF 0018c44e8dfcc3b64b43e0aea4b3f419f0b65fd0 #v6.2.1-2 - SHA512 2405e2536ca9fe0b890f44f54c936ac0e4b5a9ebe6a19e1c48a9c21b7211d2a1b45865852e3c65a98a6735216a4e27bea75c0fd6e52efeed4baecd95da9895a5 - HEAD_REF master - PATCHES - vs.build.patch - runtime.patch - adddef.patch - ) +vcpkg_download_distfile( + ARCHIVE + URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz + FILENAME gmp-6.2.1.tar.xz + SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 +) - yasm_tool_helper(OUT_VAR YASM) - file(TO_NATIVE_PATH "${YASM}" YASM) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(PATCHES yasm.patch + msvc_symbol.patch) +endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(CONFIGURATION_RELEASE ReleaseDLL) - set(CONFIGURATION_DEBUG DebugDLL) - else() - set(CONFIGURATION_RELEASE Release) - set(CONFIGURATION_DEBUG Debug) - endif() +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF gmp-6.2.1 + PATCHES + ${PATCHES} + tools.patch +) - if(VCPKG_TARGET_IS_UWP) - string(APPEND CONFIGURATION_RELEASE WinRT) - string(APPEND CONFIGURATION_DEBUG WinRT) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(asmflag win64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(asmflag win32) endif() + set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw") + set(OPTIONS ac_cv_func_memset=yes + "gmp_cv_asm_w32=.word" + ) + +endif() - #Setup YASM integration - set(_porjectfile) - if(VCPKG_TARGET_IS_UWP) - set(_porjectfile "${SOURCE_PATH}/SMP/libgmp_winrt.vcxproj") - else() - set(_porjectfile "${SOURCE_PATH}/SMP/libgmp.vcxproj") - endif() - set(_file "${_porjectfile}") - file(READ "${_file}" _contents) - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REPLACE [[]] - "" - _contents "${_contents}") - file(WRITE "${_file}" "${_contents}") +if(VCPKG_CROSSCOMPILING) + # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. + set(ENV{CC_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + set(ENV{CPP_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") +endif() - vcpkg_install_msbuild( - USE_VCPKG_INTEGRATION - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH SMP/libgmp.sln - PLATFORM ${TRIPLET_SYSTEM_ARCH} - LICENSE_SUBPATH COPYING.LESSERv3 - TARGET Rebuild - RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE} - DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG} - SKIP_CLEAN - OPTIONS "/p:YasmPath=${YASM}" - ) - get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) - file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include") - set(PACKAGE_VERSION 6.2.1) - set(PACKAGE_NAME gmp) - set(prefix "${CURRENT_INSTALLED_DIR}") - set(exec_prefix "\${prefix}") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/include") - set(LIBS -lgmp) - configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmp.pc" @ONLY) - configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmpxx.pc" @ONLY) - set(prefix "${CURRENT_INSTALLED_DIR}/debug") - set(exec_prefix "\${prefix}") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/../include") - set(LIBS -lgmpd) - configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmp.pc" @ONLY) - configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmpxx.pc" @ONLY) - vcpkg_fixup_pkgconfig() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gmp.h" - "#if defined(DLL_EXPORT) && defined(NO_ASM)" - "#if 1") - endif() -else() - vcpkg_download_distfile( - ARCHIVE - URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz - FILENAME gmp-6.2.1.tar.xz - SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84 - ) +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${OPTIONS} + --enable-cxx +) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF gmp-6.2.1 - PATCHES - tools.patch - ) +set(tool_names bases fac fib jacobitab psqr trialdivtab) +list(TRANSFORM tool_names PREPEND "gen-") +list(TRANSFORM tool_names APPEND "${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - OPTIONS - --enable-cxx - ) +if(VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/") + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/" ) + if(NOT VCPKG_BUILD_TYPE) + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/" ) + endif() +endif() - vcpkg_install_make() - vcpkg_fixup_pkgconfig() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_make() - # # Handle copyright - file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +if(NOT VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + file(COPY ${tool_names} DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}" ) endif() + +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/gmp/runtime.patch b/ports/gmp/runtime.patch deleted file mode 100644 index f219e3dc740043..00000000000000 --- a/ports/gmp/runtime.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff --git a/SMP/smp.props b/SMP/smp.props -index fc70bd8..d515523 100644 ---- a/SMP/smp.props -+++ b/SMP/smp.props -@@ -86,7 +86,7 @@ - - - -- lib$(RootNamespace)d -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -94,7 +94,7 @@ - MSB8012 - - -- lib$(RootNamespace)d -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -118,7 +118,7 @@ - MSB8012 - - -- lib$(RootNamespace) -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -126,7 +126,7 @@ - MSB8012 - - -- lib$(RootNamespace) -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -159,6 +159,7 @@ - $(OutDir)\lib\x86\$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -177,6 +178,7 @@ - $(OutDir)\lib\x64\$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -196,6 +198,7 @@ - $(IntDir)$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x86\$(TargetName)$(TargetExt) -@@ -219,6 +222,7 @@ - $(IntDir)$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -248,6 +252,7 @@ - SingleFile - $(OutDir)\lib\x86\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -273,6 +278,7 @@ - SingleFile - $(OutDir)\lib\x64\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -297,6 +303,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -328,6 +335,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props -index cb5f090..19b2b8d 100644 ---- a/SMP/smp_winrt.props -+++ b/SMP/smp_winrt.props -@@ -97,7 +97,7 @@ - - - -- lib$(RootNamespace)d_winrt -+ l$(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -105,7 +105,7 @@ - MSB8012 - - -- lib$(RootNamespace)d_winrt -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -113,7 +113,7 @@ - MSB8012 - - -- $(RootNamespace)d_winrt -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -121,7 +121,7 @@ - MSB8012 - - -- $(RootNamespace)d_winrt -+ $(RootNamespace)d - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -129,7 +129,7 @@ - MSB8012 - - -- lib$(RootNamespace)_winrt -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -137,7 +137,7 @@ - MSB8012 - - -- lib$(RootNamespace)_winrt -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -145,7 +145,7 @@ - MSB8012 - - -- $(RootNamespace)_winrt -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated -@@ -153,7 +153,7 @@ - MSB8012 - - -- $(RootNamespace)_winrt -+ $(RootNamespace) - $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 972a4d67f6f998..8393feed120dcb 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,15 +1,14 @@ { "name": "gmp", - "version-string": "6.2.1", - "port-version": 8, + "version": "6.2.1", + "port-version": 9, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "!(windows & (arm | arm64))", "dependencies": [ { - "name": "vs-yasm", - "host": true, - "platform": "windows" + "name": "gmp", + "host": true }, { "name": "yasm", diff --git a/ports/gmp/vs.build.patch b/ports/gmp/vs.build.patch deleted file mode 100644 index 4c04d0c1659645..00000000000000 --- a/ports/gmp/vs.build.patch +++ /dev/null @@ -1,172 +0,0 @@ -diff --git a/SMP/smp.props b/SMP/smp.props -index e2ed214..fc70bd8 100644 ---- a/SMP/smp.props -+++ b/SMP/smp.props -@@ -87,7 +87,7 @@ - - - lib$(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -95,7 +95,7 @@ - - - lib$(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -103,7 +103,7 @@ - - - $(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -111,7 +111,7 @@ - - - $(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -119,7 +119,7 @@ - - - lib$(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -127,7 +127,7 @@ - - - lib$(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -135,7 +135,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -143,7 +143,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props -index 9b453a5..cb5f090 100644 ---- a/SMP/smp_winrt.props -+++ b/SMP/smp_winrt.props -@@ -98,7 +98,7 @@ - - - lib$(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -106,7 +106,7 @@ - - - lib$(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -114,7 +114,7 @@ - - - $(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -122,7 +122,7 @@ - - - $(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -130,7 +130,7 @@ - - - lib$(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -138,7 +138,7 @@ - - - lib$(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -146,7 +146,7 @@ - - - $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -154,7 +154,7 @@ - - - $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -diff --git a/gmp.pc.in b/gmp.pc.in -index bf1c799..d0c81be 100644 ---- a/gmp.pc.in -+++ b/gmp.pc.in -@@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library - URL: https://gmplib.org - Version: @PACKAGE_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lgmp -+Libs: -L${libdir} @LIBS@ -diff --git a/gmpxx.pc.in b/gmpxx.pc.in -index 181cc70..2b697ce 100644 ---- a/gmpxx.pc.in -+++ b/gmpxx.pc.in -@@ -9,4 +9,4 @@ URL: https://gmplib.org - Version: @PACKAGE_VERSION@ - Requires: gmp - Cflags: -I${includedir} --Libs: -L${libdir} -lgmpxx -+Libs: -L${libdir} @LIBS@ diff --git a/ports/gmp/yasm.patch b/ports/gmp/yasm.patch new file mode 100644 index 00000000000000..8ea6ac35659291 --- /dev/null +++ b/ports/gmp/yasm.patch @@ -0,0 +1,83 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 86175ce42..8228d20dc 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1649,7 +1649,7 @@ AC_DEFUN([GMP_TRY_ASSEMBLE], + [cat >conftest.s <&AC_FD_CC + ifelse([$2],,:,[$2]) +@@ -2382,7 +2382,7 @@ for tmp_underscore in "" "_"; do + ${tmp_gsym_prefix}main$gmp_cv_asm_label_suffix + addl $ ${tmp_underscore}_GLOBAL_OFFSET_TABLE_, %ebx + EOF +- gmp_compile="$CCAS $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CFLAGS $CPPFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC" ++ gmp_compile="$CCAS $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.s >&AC_FD_CC && $CC $CPPFLAGS $ASMFLAGS $lt_prog_compiler_pic conftest.$OBJEXT >&AC_FD_CC" + if AC_TRY_EVAL(gmp_compile); then + if test "$tmp_underscore" = "_"; then + gmp_cv_asm_x86_got_underscore=yes +@@ -2556,7 +2556,7 @@ movq-bug) + AC_MSG_WARN([+----------------------------------------------------------]) + AC_MSG_WARN([| WARNING WARNING WARNING]) + AC_MSG_WARN([| Host CPU has MMX code, but the assembler]) +- AC_MSG_WARN([| $CCAS $CFLAGS $CPPFLAGS]) ++ AC_MSG_WARN([| $CCAS $CPPFLAGS $ASMFLAGS]) + AC_MSG_WARN([| has the Solaris 2.6 and 2.7 bug where register to register]) + AC_MSG_WARN([| movq operands are reversed.]) + AC_MSG_WARN([| Non-MMX replacements will be used.]) +diff --git a/mpn/Makeasm.am b/mpn/Makeasm.am +index 5d7306c22..75692128d 100644 +--- a/mpn/Makeasm.am ++++ b/mpn/Makeasm.am +@@ -32,7 +32,7 @@ + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + # Flags used for preprocessing (in ansi2knr rules). + # +diff --git a/mpn/Makefile.in b/mpn/Makefile.in +index 2bc061012..59c805976 100644 +--- a/mpn/Makefile.in ++++ b/mpn/Makefile.in +@@ -403,7 +403,7 @@ EXTRA_DIST = asm-defs.m4 cpp-ccas m4-ccas $(TARG_DIST) + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + + # Flags used for preprocessing (in ansi2knr rules). +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 9742a4016..430603cef 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -666,7 +666,7 @@ SUBDIRS = . devel mpn mpz mpq mpf rand misc cxx + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + + # Flags used for preprocessing (in ansi2knr rules). +diff --git a/tune/Makefile.in b/tune/Makefile.in +index f82cd13e2..351bcd9b1 100644 +--- a/tune/Makefile.in ++++ b/tune/Makefile.in +@@ -549,7 +549,7 @@ TUNE_MPN_SRCS_BASIC = div_qr_2.c bdiv_q.c bdiv_qr.c \ + # COMPILE minus CC. + # + COMPILE_FLAGS = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ASMFLAGS) ++ $(CPPFLAGS) $(ASMFLAGS) + + + # Flags used for preprocessing (in ansi2knr rules). diff --git a/ports/mpc/gmpd.patch b/ports/mpc/gmpd.patch deleted file mode 100644 index b08625777c365f..00000000000000 --- a/ports/mpc/gmpd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ab3da6092..2533df1d8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -151,7 +151,9 @@ AC_CHECK_FUNCS([dup dup2],, - - AC_CHECK_LIB([gmp], [__gmpz_init], - [LIBS="-lgmp $LIBS"], -- [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared).])]) -+ [AC_CHECK_LIB([gmpd], [__gmpz_init], -+ [LIBS="-lgmpd $LIBS"], -+ [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared).])])]) - - AC_MSG_CHECKING(for MPFR) - LIBS="-lmpfr $LIBS" diff --git a/ports/mpc/portfile.cmake b/ports/mpc/portfile.cmake index 66aeb9f18fd987..7ecd9b325bca0d 100644 --- a/ports/mpc/portfile.cmake +++ b/ports/mpc/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES gmpd.patch ) vcpkg_configure_make( diff --git a/ports/mpc/vcpkg.json b/ports/mpc/vcpkg.json index 2c8e38d1da1f30..9f79c44a801646 100644 --- a/ports/mpc/vcpkg.json +++ b/ports/mpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpc", - "version-string": "1.2.0", - "port-version": 1, + "version": "1.2.0", + "port-version": 2, "description": "GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.", "homepage": "http://www.multiprecision.org/mpc/", "dependencies": [ diff --git a/ports/mpfr/gmpd.patch b/ports/mpfr/gmpd.patch deleted file mode 100644 index d34027d36496b1..00000000000000 --- a/ports/mpfr/gmpd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index ea92c1f97..9621a70e5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -693,8 +693,9 @@ See 'config.log' for details (search for GMP_NUMB_BITS).])], - - dnl Check if we can link with GMP - AC_CHECK_LIB(gmp, __gmpz_init, [LIBS="-lgmp $LIBS"], -+ [AC_CHECK_LIB(gmpd, __gmpz_init, [LIBS="-lgmpd $LIBS"], - [AC_MSG_ERROR([libgmp not found or uses a different ABI (including static vs shared). --Please read the INSTALL file -- see "In case of problem".])]) -+Please read the INSTALL file -- see "In case of problem".])])]) - - dnl Check for corresponding 'gmp.h' and libgmp - AC_MSG_CHECKING(if gmp.h version and libgmp version are the same) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 59354a99e5b050..83354d7d93a4a1 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -13,7 +13,6 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - gmpd.patch dll.patch src-only.patch ) @@ -27,10 +26,6 @@ vcpkg_configure_make( vcpkg_install_make() vcpkg_copy_pdbs() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mpfr.pc" AND VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mpfr.pc" " -lgmp" " -lgmpd") -endif() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/mpfr/vcpkg.json b/ports/mpfr/vcpkg.json index 2033a12bb1551d..195d7efbee3d6a 100644 --- a/ports/mpfr/vcpkg.json +++ b/ports/mpfr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpfr", - "version-string": "4.1.0", - "port-version": 3, + "version": "4.1.0", + "port-version": 4, "description": "The MPFR library is a C library for multiple-precision floating-point computations with correct rounding", "homepage": "https://www.mpfr.org", "license": "LGPL-3.0-or-later", diff --git a/ports/nettle/gmp.patch b/ports/nettle/gmp.patch index c54298a28c5288..b9eec5e1e64935 100644 --- a/ports/nettle/gmp.patch +++ b/ports/nettle/gmp.patch @@ -20,7 +20,7 @@ index 476f7a7..308bd0b 100644 libhogweed.def - nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies) -+ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled_winrt.lib;gmp.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -29,7 +29,7 @@ index 476f7a7..308bd0b 100644 libhogweed.def - nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies) -+ nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled_winrt.lib;gmp.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -136,7 +136,7 @@ index cb650ab..188f67a 100644 libnettle.def - gmpd_winrt.lib;%(AdditionalDependencies) -+ gmpd.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) mkdir "$(OutDir)"\include @@ -145,7 +145,7 @@ index cb650ab..188f67a 100644 libnettle.def - gmpd_winrt.lib;%(AdditionalDependencies) -+ gmpd.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) mkdir "$(OutDir)"\include diff --git a/ports/nettle/name.dir.patch b/ports/nettle/name.dir.patch index 834a0440978740..ff1ce206afd115 100644 --- a/ports/nettle/name.dir.patch +++ b/ports/nettle/name.dir.patch @@ -82,8 +82,8 @@ index 308bd0b..a436c69 100644 libhogweed.def -- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) +- nettled_winrt.lib;gmp.lib;%(AdditionalDependencies) ++ nettled.lib;gmp.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) @@ -91,8 +91,8 @@ index 308bd0b..a436c69 100644 libhogweed.def -- nettled_winrt.lib;gmpd.lib;%(AdditionalDependencies) -+ nettled.lib;gmpd.lib;%(AdditionalDependencies) +- nettled_winrt.lib;gmp.lib;%(AdditionalDependencies) ++ nettled.lib;gmp.lib;%(AdditionalDependencies) /IGNORE:4006,4221,4078 %(AdditionalOptions) diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index 731017de7be79d..5f0fba4f24163d 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -9,6 +9,7 @@ if(VCPKG_TARGET_IS_WINDOWS) gmp.patch name.dir.patch runtime.patch + remove_gmpd.patch ) include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) @@ -88,7 +89,7 @@ if(VCPKG_TARGET_IS_WINDOWS) set(exec_prefix "\${prefix}") set(libdir "\${prefix}/lib") set(includedir "\${prefix}/../include") - set(LIBS "-lnettled -lgmpd") + set(LIBS "-lnettled -lgmp") configure_file("${SOURCE_PATH}/nettle.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/nettle.pc" @ONLY) set(LIBS -lnettled) set(HOGWEED -lhogweedd) diff --git a/ports/nettle/remove_gmpd.patch b/ports/nettle/remove_gmpd.patch new file mode 100644 index 00000000000000..a248d81e2422c1 --- /dev/null +++ b/ports/nettle/remove_gmpd.patch @@ -0,0 +1,44 @@ +diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj +index 51fa24113..5d418b53e 100644 +--- a/SMP/libnettle.vcxproj ++++ b/SMP/libnettle.vcxproj +@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def +- gmpd.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) + + + mkdir "$(OutDir)"\include +@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libnettle.def +- gmpd.lib;%(AdditionalDependencies) ++ gmp.lib;%(AdditionalDependencies) + + + mkdir "$(OutDir)"\include +diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj +index 8f2f433bc..dae3458d8 100644 +--- a/SMP/libhogweed.vcxproj ++++ b/SMP/libhogweed.vcxproj +@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettled.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled.lib;gmp.lib;%(AdditionalDependencies) + /IGNORE:4006,4221,4078 %(AdditionalOptions) + + +@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt + + + libhogweed.def +- nettled.lib;gmpd.lib;%(AdditionalDependencies) ++ nettled.lib;gmp.lib;%(AdditionalDependencies) + /IGNORE:4006,4221,4078 %(AdditionalOptions) + + diff --git a/ports/nettle/vcpkg.json b/ports/nettle/vcpkg.json index 1a653be5ff7681..87833d1211cc79 100644 --- a/ports/nettle/vcpkg.json +++ b/ports/nettle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nettle", - "version-string": "3.6", - "port-version": 1, + "version": "3.6", + "port-version": 2, "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.", "homepage": "https://git.lysator.liu.se/nettle/nettle", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8334322aac5f0d..565f830af57ce6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2554,7 +2554,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 8 + "port-version": 9 }, "gmsh": { "baseline": "4.9.0", @@ -4598,11 +4598,11 @@ }, "mpc": { "baseline": "1.2.0", - "port-version": 1 + "port-version": 2 }, "mpfr": { "baseline": "4.1.0", - "port-version": 3 + "port-version": 4 }, "mpg123": { "baseline": "1.29.2", @@ -4786,7 +4786,7 @@ }, "nettle": { "baseline": "3.6", - "port-version": 1 + "port-version": 2 }, "networkdirect-sdk": { "baseline": "2.0.1", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 85c94f62f43b64..9505d80d19d521 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b9a71843073bf4a86bb64ddf219c9900ebb3dbd", + "version": "6.2.1", + "port-version": 9 + }, { "git-tree": "8d09c9addf60d381cabe4c565cb59b27f5b2bdc7", "version-string": "6.2.1", diff --git a/versions/m-/mpc.json b/versions/m-/mpc.json index 209ac786cb76a8..da45380dc8aaac 100644 --- a/versions/m-/mpc.json +++ b/versions/m-/mpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c38230459b115da37fe9fe0161c7462de85549d5", + "version": "1.2.0", + "port-version": 2 + }, { "git-tree": "8ef4f1423bd95ed6bbe514de46fc9f4c8884ae5e", "version-string": "1.2.0", diff --git a/versions/m-/mpfr.json b/versions/m-/mpfr.json index 65d2472d1ca639..e3316b5bb20f4f 100644 --- a/versions/m-/mpfr.json +++ b/versions/m-/mpfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af50e086428e7b7b1e1e5969a296a770a32ff88d", + "version": "4.1.0", + "port-version": 4 + }, { "git-tree": "9f38beb4c3179d0b08008af901d05c2a70afaa1b", "version-string": "4.1.0", diff --git a/versions/n-/nettle.json b/versions/n-/nettle.json index 00096cd8d2ec10..07261c08a58e40 100644 --- a/versions/n-/nettle.json +++ b/versions/n-/nettle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d7735edc12e985fbe6bae0489a8c01ff18413cd", + "version": "3.6", + "port-version": 2 + }, { "git-tree": "87e3211d256198eb00d854b24b2043efb0fe892d", "version-string": "3.6", From 147027390bd5bb13ce14e0bfc153873e424b71b2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 23 Mar 2022 20:19:54 +0100 Subject: [PATCH 035/217] [Qt6] update to 6.2.4 (#23691) * [Qt6] update to 6.2.4 * adjust patches * more fixes * more CMAKE_REQUIRE_FIND_PACKAGE * fix configure? * cannot require cmake not config stuff. * more REQUIRE removals * adjust required stuff * more modules. * less require stuff * disable env patch for now and silent the require maybe unused. warnings * different approach * fix case ? * fix linux builds * more stuff to not force in vcpkg * reenable env patch * only use env patch on windows. * reenable qtwebengine. Maybe the ICE was fixed? * Revert "reenable qtwebengine. Maybe the ICE was fixed?" This reverts commit 5dc3ca88c1db61a61bcb701d903b042457d85afd. * version stuff Co-authored-by: Alexander Neumann --- ports/qt/vcpkg.json | 2 +- ports/qt5compat/portfile.cmake | 2 + ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/portfile.cmake | 1 + ports/qtactiveqt/vcpkg.json | 2 +- ports/qtapplicationmanager/portfile.cmake | 50 ++++------- ports/qtapplicationmanager/vcpkg.json | 3 +- ports/qtbase/cmake/qt_install_submodule.cmake | 7 +- ports/qtbase/cmake/qt_port_details.cmake | 80 +++++++++--------- ports/qtbase/dont_force_cmakecache.patch | 62 ++++++++------ ports/qtbase/env.patch | 16 ++++ ports/qtbase/portfile.cmake | 27 +++++- ports/qtbase/vcpkg.json | 2 +- ports/qtcharts/portfile.cmake | 1 + ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtconnectivity/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdeviceutilities/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtimageformats/portfile.cmake | 4 + ports/qtimageformats/vcpkg.json | 2 +- ports/qtinterfaceframework/vcpkg.json | 3 +- ports/qtlocation/vcpkg.json | 2 +- ports/qtlottie/portfile.cmake | 1 + ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtmultimedia/portfile.cmake | 4 + ports/qtmultimedia/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/portfile.cmake | 1 + ports/qtopcua/vcpkg.json | 2 +- ports/qtpositioning/portfile.cmake | 1 + ports/qtpositioning/vcpkg.json | 2 +- ports/qtquick3d/portfile.cmake | 1 + ports/qtquick3d/vcpkg.json | 2 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtremoteobjects/portfile.cmake | 1 + ports/qtremoteobjects/vcpkg.json | 2 +- ports/qtscxml/portfile.cmake | 1 + ports/qtscxml/vcpkg.json | 2 +- ports/qtsensors/portfile.cmake | 1 + ports/qtsensors/vcpkg.json | 2 +- ports/qtserialbus/vcpkg.json | 2 +- ports/qtserialport/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/portfile.cmake | 4 + ports/qttools/vcpkg.json | 2 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/portfile.cmake | 1 + ports/qtwayland/vcpkg.json | 2 +- ports/qtwebchannel/portfile.cmake | 1 + ports/qtwebchannel/vcpkg.json | 2 +- ports/qtwebengine/portfile.cmake | 2 + ports/qtwebengine/vcpkg.json | 3 +- ports/qtwebsockets/portfile.cmake | 1 + ports/qtwebsockets/vcpkg.json | 2 +- ports/qtwebview/portfile.cmake | 3 + ports/qtwebview/vcpkg.json | 2 +- versions/baseline.json | 82 +++++++++---------- versions/q-/qt.json | 5 ++ versions/q-/qt5compat.json | 5 ++ versions/q-/qtactiveqt.json | 5 ++ versions/q-/qtapplicationmanager.json | 5 ++ versions/q-/qtbase.json | 5 ++ versions/q-/qtcharts.json | 5 ++ versions/q-/qtcoap.json | 5 ++ versions/q-/qtconnectivity.json | 5 ++ versions/q-/qtdatavis3d.json | 5 ++ versions/q-/qtdeclarative.json | 5 ++ versions/q-/qtdeviceutilities.json | 5 ++ versions/q-/qtdoc.json | 5 ++ versions/q-/qtimageformats.json | 5 ++ versions/q-/qtinterfaceframework.json | 5 ++ versions/q-/qtlocation.json | 5 ++ versions/q-/qtlottie.json | 5 ++ versions/q-/qtmqtt.json | 5 ++ versions/q-/qtmultimedia.json | 5 ++ versions/q-/qtnetworkauth.json | 5 ++ versions/q-/qtopcua.json | 5 ++ versions/q-/qtpositioning.json | 5 ++ versions/q-/qtquick3d.json | 5 ++ versions/q-/qtquicktimeline.json | 5 ++ versions/q-/qtremoteobjects.json | 5 ++ versions/q-/qtscxml.json | 5 ++ versions/q-/qtsensors.json | 5 ++ versions/q-/qtserialbus.json | 5 ++ versions/q-/qtserialport.json | 5 ++ versions/q-/qtshadertools.json | 5 ++ versions/q-/qtsvg.json | 5 ++ versions/q-/qttools.json | 5 ++ versions/q-/qttranslations.json | 5 ++ versions/q-/qtvirtualkeyboard.json | 5 ++ versions/q-/qtwayland.json | 5 ++ versions/q-/qtwebchannel.json | 5 ++ versions/q-/qtwebengine.json | 5 ++ versions/q-/qtwebsockets.json | 5 ++ versions/q-/qtwebview.json | 5 ++ 101 files changed, 442 insertions(+), 182 deletions(-) create mode 100644 ports/qtbase/env.patch diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 411d572e3e2edd..4e51339debbfbf 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/portfile.cmake b/ports/qt5compat/portfile.cmake index d597b464ec43e0..452cf48be9eedd 100644 --- a/ports/qt5compat/portfile.cmake +++ b/ports/qt5compat/portfile.cmake @@ -10,6 +10,8 @@ FEATURES "big-codecs" FEATURE_big_codecs "iconv" FEATURE_iconv "iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU + #"iconv" CMAKE_REQUIRE_FIND_PACKAGE_WrapIconv + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 272fb321fd8fe0..43291a052475c9 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.2.3", + "version": "6.2.4", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/portfile.cmake b/ports/qtactiveqt/portfile.cmake index 5092d7d85c88c6..32b1aa7b182bf5 100644 --- a/ports/qtactiveqt/portfile.cmake +++ b/ports/qtactiveqt/portfile.cmake @@ -19,6 +19,7 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index a535f025298639..bd9b6055c7af43 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.2.3", + "version": "6.2.4", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 3df32f8d103030..8e190a55eeb3b2 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -22,40 +22,24 @@ endif() set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) -set(build_type_backup ${VCPKG_BUILD_TYPE}) -set(path_backup "$ENV{PATH}") -if(NOT VCPKG_BUILD_TYPE) - set(types release debug) -else() - set(types ${VCPKG_BUILD_TYPE}) -endif() -foreach(VCPKG_BUILD_TYPE IN LISTS types) - if(VCPKG_BUILD_TYPE STREQUAL debug) - vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") - else() - vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") - endif() - qt_cmake_configure(${_opt} - DISABLE_PARALLEL_CONFIGURE - OPTIONS - -DINPUT_libarchive=system - -DINPUT_libyaml=system - -DFEATURE_am_system_libyaml=ON - -DFEATURE_am_system_libarchive=ON - OPTIONS_DEBUG - OPTIONS_RELEASE) - if(VCPKG_TARGET_IS_WINDOWS) - set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE) - if(EXISTS "${scriptfile}") - vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin") - endif() - endif() - vcpkg_cmake_install() - set(ENV{PATH} "${path_backup}") -endforeach() -set(VCPKG_BUILD_TYPE ${build_type_backup}) +qt_cmake_configure(${_opt} + OPTIONS + -DINPUT_libarchive=system + -DINPUT_libyaml=system + -DFEATURE_am_system_libyaml=ON + -DFEATURE_am_system_libarchive=ON + OPTIONS_DEBUG + OPTIONS_RELEASE) + ### Need to fix one post-build.bat; Couldn't find the place where it gets generated! +if(VCPKG_TARGET_IS_WINDOWS) + set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE) + if(EXISTS "${scriptfile}") + vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin") + endif() +endif() +vcpkg_cmake_install(ADD_BIN_TO_PATH) qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 6ddf08cbc07248..4727a132804c8e 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.2.3", - "port-version": 1, + "version": "6.2.4", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index 7026b300f1635c..f235d367e48b3c 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -86,9 +86,14 @@ function(qt_cmake_configure) endif() endif() - # Disable warning for CMAKE_DISABLE_FIND_PACKAGE_ + # Disable warning for CMAKE_(REQUIRE|DISABLE)_FIND_PACKAGE_ string(REGEX MATCHALL "CMAKE_DISABLE_FIND_PACKAGE_[^:=]+" disabled_find_package "${_qarg_OPTIONS}") list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_find_package}) + + string(REGEX MATCHALL "CMAKE_REQUIRE_FIND_PACKAGE_[^:=]+(:BOOL)?=OFF" require_find_package "${_qarg_OPTIONS}") + list(TRANSFORM require_find_package REPLACE "(:BOOL)?=OFF" "") + list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${require_find_package}) + # Disable unused warnings for disabled features. Qt might decide to not emit the feature variables if other features are deactivated. string(REGEX MATCHALL "(QT_)?FEATURE_[^:=]+(:BOOL)?=OFF" disabled_features "${_qarg_OPTIONS}") list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "") diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 697d3681160d27..a33f93b4a37334 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -1,4 +1,4 @@ -set(QT_VERSION 6.2.3) +set(QT_VERSION 6.2.4) if(PORT MATCHES "qtquickcontrols2") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) @@ -68,52 +68,52 @@ set(QT_PORTS qt foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF 0145fe008894c3b280649b02725e6ec5a5605006) -set(qtshadertools_REF a82d73829028a31640e317a2c8ce365ef74281a1) -set(qtdeclarative_REF 809f24b274ebfeb537c44f38445a4327d43da5e0) -set(qt5compat_REF ca0c27fb51622058e50150ab906260fb7ed11ae3) -set(qttools_REF fb3a3731946c70d573daaab232e13ed8f283fcef) # Additional refs ibelow -set(qtcoap_REF 7b4a337efc71426c84abab3b1d4bdad659ae1c63) -set(qtdoc_REF 1d8092320fedfa368e486eeeea43efec45460672) -set(qtimageformats_REF 1a8e25eb8a63968e09b944cebee5882c137b0c32) -set(qtmqtt_REF b1cfdd8b121c3d0554814c271096e3448da032bb) -set(qtnetworkauth_REF 8451dff3c65712b037ef0606c1f25d70152623f0) -set(qtopcua_REF 42a61efa01a255ab94eddd06321f1afd88653d26) -set(qtquicktimeline_REF 964efe364a37ef20da42d0a207022fe4b9414fe1) -set(qtquick3d_REF 8f4a5d3bedb548def24f2192d23a724dd05ed5a6) -set(qtsvg_REF 6c682d8f996ef5d6c8241f8550cab03cac49f440) -set(qttranslations_REF 4a1ae5b85d64411217438705da21462c5c7f9034) -set(qtwayland_REF 2bc79b7e60af737ceb3329cae076804ab84ea4d4) +set(qtbase_REF 597359f7d0736917123842dee63a7ae45522eb8e ) +set(qtshadertools_REF d954aeb073375ee1edda4d6b2956c3c79b26b386 ) +set(qtdeclarative_REF 614d85d460fa46e947eeb4281609ce5453a29e5c ) +set(qt5compat_REF c5dab10ba77dd2701dbd2d7b69998fbee90557f2 ) +set(qttools_REF a60e0e5dfb2af83ffb1adda28028b24e21fe9131 ) # Additional refs below +set(qtcoap_REF 29df645fc165087e74b603e7ad20033381006fb5 ) +set(qtdoc_REF 5c70158a15f23224a76b6919ab06eefee6ed187e ) +set(qtimageformats_REF 356fb7846b5bc002b2d34e23253fda1dffed7932 ) +set(qtmqtt_REF 9ad6c48474c2b94c62a518dc3dc7e65d30a6309e ) +set(qtnetworkauth_REF d5ffb7549dd1e6139b746021c4d40053d0f15950 ) +set(qtopcua_REF 4a0dd4334d98bea48acda1e203ab2c31f207bad3 ) +set(qtquicktimeline_REF 6a06bdbaa55d1c165e992732f2e3dc923846b921 ) +set(qtquick3d_REF d126dea81f48386ef24e8b30e1328c40e72c4861 ) +set(qtsvg_REF 77ea18adfb91c591f249f442e0ffc0079023e431 ) +set(qttranslations_REF 87f95df09b1fc388ea15ce208a349d6b1deac2a4 ) +set(qtwayland_REF 6bdaed8301336750dda95823ed0dfac4828ebab6 ) ### New in 6.1 -set(qtactiveqt_REF 8900aaf9bd44c265544b6346ab951ac8b4fa2cb3) -set(qtcharts_REF 690c97c1c0628985014c49ed69f5e9b05da3d775) -set(qtdatavis3d_REF 6e8983a92203194f5047002340ecf522e83187d1) -set(qtdeviceutilities_REF 643e82571dad2c96616d851508393a27b7ca788b) -set(qtlottie_REF 1509364fe51f432a5367d19a1a3f13566fa5e70f) -set(qtscxml_REF 98f98f87437369f6a3ed4f9f8668d0a29964372a) -set(qtvirtualkeyboard_REF 06ea4e113221c26ee5ed2edad6cffa63cde30978) +set(qtactiveqt_REF 5dd7acd1395627e6bd0d87beb148957059c1a3c6 ) +set(qtcharts_REF 7184ea521d04ec13587562c3275ae698fa9a722e ) +set(qtdatavis3d_REF 74c469d4926f59264c5cbc47fe301fe4713aa358 ) +set(qtdeviceutilities_REF f7333510b4dcfe32eb9065a63c434704750d4fb6 ) +set(qtlottie_REF fd61d8e92cfacbd3d10f31b176a7cde911525632 ) +set(qtscxml_REF 63455c888e012fdc682c32fd3d0de96127721bd4 ) +set(qtvirtualkeyboard_REF ffe9bba23ae45662d25ac3d90167d794e0d6c828 ) ### New in 6.2 -set(qtconnectivity_REF ddfa5de7af5d674ac1d0e9d18e37f70ae1ccd453) -set(qtmultimedia_REF 03c6a61266543c7634915de65cdb7752a25df6f4) -set(qtremoteobjects_REF 715bc1f6bc551aedbaddca3f44f3a5cee8710936) -set(qtserialport_REF b7f42ccd13cf0e736b65eebb7537e31584af6930) -set(qtsensors_REF e53e83d9beffc6a3ef465e91033f2b62fc8102fa) -set(qtserialbus_REF edefe743658051c6c406d3d7645031f2ac281fc0) -set(qtlocation_REF 0) # Currently empty port -set(qtwebchannel_REF adbb4c38c5af970f46000f61501ceee714364a46) -set(qtwebengine_REF 855304132f321f285986c7f1710a45bae72aec12) # Additional refs below -set(qtwebsockets_REF 84e8557281b242d3023b2cff86366343ac440fee) -set(qtwebview_REF 4c27976cd3817914a927f66153b123fd593a9fcf) -set(qtpositioning_REF 2702073aec1d87bb150bf27e8b28f0351710aaa6) +set(qtconnectivity_REF f0ac95d1685f4f0f2e72fb42800b17d7738ccefb ) +set(qtmultimedia_REF 3423c7172f948f27ff0512d1d2db4ea97fc0e9c0 ) +set(qtremoteobjects_REF 2d0f27e736211e2a6b9d08345f65c736a17a67eb ) +set(qtserialport_REF c7dc6737a2e98af81900f55f814cf79a6d579779 ) +set(qtsensors_REF 32dda47f507e74ef7ed33290545b762a0c20e532 ) +set(qtserialbus_REF 1ebbf87cbc90c22817785bffc563d4bb86525abc ) +set(qtlocation_REF 0 ) # Currently empty port +set(qtwebchannel_REF e1014dcf9a924d3b8fd3450a3360381a0a8fc6ab ) +set(qtwebengine_REF cc7181c12d1d1605ecab6c448df4a684278d01d8 ) # Additional refs below +set(qtwebsockets_REF fd509016da201ed63122c5ec79355930f2489ee8 ) +set(qtwebview_REF aade84c30fbbc85fe5a8c5e49172a02a7522623d ) +set(qtpositioning_REF 3a68165bc88f9ddd165567d30887147d2d71915b ) ### New in Qt 6.2.2 -set(qtapplicationmanager_REF bcdd87312d8f959a8b928d9e1bc5f614fea9e4b3) -set(qtinterfaceframework_REF e0ebb6fd68e5c585ad55da8c4ca768ade6b82617) +set(qtapplicationmanager_REF 2626ae6e9ce84aebd88a163153719c07d7f65b7d ) +set(qtinterfaceframework_REF 71512be8758c75b4b6b0130d6b623f564c6bf227 ) #Submodule stuff: set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38) set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01) set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc) -set(qtwebengine_chromium_REF 30c22c6ed9833c7e6e14a345752c6f13cfbaec51) +set(qtwebengine_chromium_REF b33b4266df8c333d3d273ae4665d6b322eee33c6) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") @@ -123,7 +123,7 @@ if(QT_UPDATE_VERSION) foreach(_current_qt_port IN LISTS QT_PORTS) set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json") file(READ "${_current_control}" _control_contents) - string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"version(-(string|semver))?\": [^\n]+\n" "\"version\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") file(WRITE "${_current_control}" "${_control_contents}") #need to run a vcpkg format-manifest --all after update once diff --git a/ports/qtbase/dont_force_cmakecache.patch b/ports/qtbase/dont_force_cmakecache.patch index f8e90f3a10e969..fc5423425dc6c2 100644 --- a/ports/qtbase/dont_force_cmakecache.patch +++ b/ports/qtbase/dont_force_cmakecache.patch @@ -2,22 +2,16 @@ diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 4f8106dfa..bec5c402e 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake -@@ -414,7 +414,7 @@ function(qt_generate_install_prefixes out_var) +@@ -472,7 +472,7 @@ function(qt_generate_install_prefixes out_var) foreach(var ${vars}) get_property(docstring CACHE "${var}" PROPERTY HELPSTRING) - string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n") -+ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\")\n") ++ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" )\n") endforeach() set(${out_var} "${content}" PARENT_SCOPE) -@@ -465,12 +465,12 @@ function(qt_generate_build_internals_extra_cmake_code) - # at the start of project configuration (with an empty value), - # so we need to force override it. - string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS -- "set(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE STRING \"Choose the type of build.\" FORCE)\n") -+ "set(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE STRING \"Choose the type of build.\")\n") - +@@ -528,7 +528,7 @@ qt_internal_force_set_cmake_build_type_conditionally( endif() if(CMAKE_CONFIGURATION_TYPES) string(APPEND multi_config_specific @@ -26,21 +20,39 @@ index 4f8106dfa..bec5c402e 100644 endif() if(CMAKE_TRY_COMPILE_CONFIGURATION) string(APPEND multi_config_specific -@@ -492,7 +492,7 @@ function(qt_generate_build_internals_extra_cmake_code) - if(multi_config_specific) - string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS " - if(QT_BUILD_STANDALONE_TESTS) -- set(CMAKE_BUILD_TYPE \"\${QT_MULTI_CONFIG_FIRST_CONFIG}\" CACHE STRING \"Choose the type of build.\" FORCE) -+ set(CMAKE_BUILD_TYPE \"\${QT_MULTI_CONFIG_FIRST_CONFIG}\" CACHE STRING \"Choose the type of build.\") +@@ -655,7 +655,7 @@ endif()\n") + # find_package(Qt6Core) is called in case if the feature was disabled. + string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS " + if(NOT QT_SKIP_BUILD_INTERNALS_PKG_CONFIG_FEATURE) +- set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\" FORCE) ++ set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\") endif()\n") - endif() -@@ -583,7 +583,7 @@ endif()\n") - if(\"$\{CMAKE_STAGING_PREFIX}\" STREQUAL \"\" - AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX) - set(CMAKE_STAGING_PREFIX \"${CMAKE_STAGING_PREFIX}\" CACHE PATH -- \"Staging path prefix, prepended onto install directories on the host machine.\" FORCE) -+ \"Staging path prefix, prepended onto install directories on the host machine.\" ) - endif() - ") - endif() + # The OpenSSL root dir needs to be saved so that repos other than qtbase (like qtopcua) can +diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in +index cadf3847c..6ec51fd63 100644 +--- a/cmake/QtBuildInternalsExtra.cmake.in ++++ b/cmake/QtBuildInternalsExtra.cmake.in +@@ -41,11 +41,11 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND + AND "${CMAKE_STAGING_PREFIX}" STREQUAL "" + AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX) + set(CMAKE_STAGING_PREFIX "${qtbi_new_prefix}" CACHE PATH +- "Staging path prefix, prepended onto install directories on the host machine." FORCE) ++ "Staging path prefix, prepended onto install directories on the host machine." ) + set(qtbi_new_prefix "${qtbi_orig_prefix}") + endif() + set(CMAKE_INSTALL_PREFIX "${qtbi_new_prefix}" CACHE PATH +- "Install path prefix, prepended onto install directories." FORCE) ++ "Install path prefix, prepended onto install directories." ) + unset(qtbi_orig_prefix) + unset(qtbi_real_orig_prefix) + unset(qtbi_new_prefix) +@@ -138,7 +138,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value) + AND NOT __qt_toolchain_cmake_build_type_before_project_call + AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE + AND NOT __qt_internal_extras_is_multi_config) +- set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build." FORCE) ++ set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build.") + endif() + endfunction() + diff --git a/ports/qtbase/env.patch b/ports/qtbase/env.patch new file mode 100644 index 00000000000000..6a371675927ae9 --- /dev/null +++ b/ports/qtbase/env.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake +index 279ab07dd..951fd3d36 100644 +--- a/cmake/QtTestHelpers.cmake ++++ b/cmake/QtTestHelpers.cmake +@@ -653,9 +653,9 @@ function(qt_internal_collect_command_environment out_path out_plugin_path) + # The regular CMAKE_INSTALL_PREFIX can be different for example when building standalone tests. + # Any given CMAKE_INSTALL_PREFIX takes priority over qt_relocatable_install_prefix for the + # PATH environment variable. +- set(install_prefixes "${CMAKE_INSTALL_PREFIX}") ++ set(install_prefixes "${CMAKE_INSTALL_PREFIX}$<$:/debug>") + if(QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX) +- list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}") ++ list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}$<$:/debug>") + endif() + + file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" test_env_path) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 1ae2c92537c43b..9d90b9233d11a2 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -19,6 +19,10 @@ set(${PORT}_PATCHES fix_egl.patch ) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + list(APPEND ${PORT}_PATCHES env.patch) +endif() + if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) list(APPEND ${PORT}_PATCHES ) @@ -55,6 +59,7 @@ foreach(_input IN LISTS input_vars) endforeach() # General features: + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "appstore-compliant" FEATURE_appstore_compliant @@ -70,6 +75,8 @@ FEATURES "widgets" FEATURE_widgets #"xml" FEATURE_xml # Required to build moc "testlib" FEATURE_testlib + "zstd" CMAKE_REQUIRE_FIND_PACKAGE_zstd + ${require_features} INVERTED_FEATURES "zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD "dbus" CMAKE_DISABLE_FIND_PACKAGE_WrapDBus1 @@ -89,10 +96,12 @@ FEATURES "glib" FEATURE_glib "icu" FEATURE_icu "pcre2" FEATURE_pcre2 + #"icu" CMAKE_REQUIRE_FIND_PACKAGE_ICU + "glib" CMAKE_REQUIRE_FIND_PACKAGE_GLIB2 INVERTED_FEATURES #"doubleconversion" CMAKE_DISABLE_FIND_PACKAGE_WrapDoubleConversion # Required - "icu" CMAKE_DISABLE_FIND_PACKAGE_ICU #"pcre2" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemPCRE2 # Bug in qt cannot be deactivated + "icu" CMAKE_DISABLE_FIND_PACKAGE_ICU "glib" CMAKE_DISABLE_FIND_PACKAGE_GLIB2 ) @@ -106,6 +115,8 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON FEATURES "openssl" FEATURE_openssl "brotli" FEATURE_brotli + #"brotli" CMAKE_REQUIRE_FIND_PACKAGE_WrapBrotli + #"openssl" CMAKE_REQUIRE_FIND_PACKAGE_WrapOpenSSL INVERTED_FEATURES "brotli" CMAKE_DISABLE_FIND_PACKAGE_WrapBrotli "openssl" CMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL @@ -136,6 +147,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS "xkbcommon-x11" FEATURE_xkbcommon_x11 "xrender" FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. "xrender" FEATURE_xcb_native_painting # experimental + #"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan + #"egl" CMAKE_REQUIRE_FIND_PACKAGE_EGL + #"fontconfig" CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig + #"harfbuzz" CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz + #"jpeg" CMAKE_REQUIRE_FIND_PACKAGE_JPEG + #"png" CMAKE_REQUIRE_FIND_PACKAGE_PNG + #"xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11 + #"xkb" CMAKE_REQUIRE_FIND_PACKAGE_XKB + #"xcb" CMAKE_REQUIRE_FIND_PACKAGE_XCB + #"xcb-xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11_XCB + #"xkbcommon-x11" CMAKE_REQUIRE_FIND_PACKAGE_XKB_COMMON_X11 + #"xrender" CMAKE_REQUIRE_FIND_PACKAGE_XRender INVERTED_FEATURES "vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan "egl" CMAKE_DISABLE_FIND_PACKAGE_EGL @@ -178,6 +201,8 @@ list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS FEATURES "sql-sqlite" FEATURE_system_sqlite + #"sql-psql" CMAKE_REQUIRE_FIND_PACKAGE_PostgreSQL + #"sql-sqlite" CMAKE_REQUIRE_FIND_PACKAGE_SQLite3 INVERTED_FEATURES "sql-psql" CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL "sql-sqlite" CMAKE_DISABLE_FIND_PACKAGE_SQLite3 diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index c43f2ac357d7ef..df7b8406865674 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtbase", - "version": "6.2.3", + "version": "6.2.4", "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/qtcharts/portfile.cmake b/ports/qtcharts/portfile.cmake index d6a3b2fd0ad24e..0f5be8a036a1d9 100644 --- a/ports/qtcharts/portfile.cmake +++ b/ports/qtcharts/portfile.cmake @@ -5,6 +5,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index a9022752b58bec..5b5bba70571c44 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.2.3", + "version": "6.2.4", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 3eb3a025eb40a4..933dd17eb3f6af 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index 0268353a94529e..9939d05609e022 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 6beebf4ee09a56..7c6ef9986cb4ae 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index f71ce3a6c4988f..a28b939d9d5f60 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index cf146e4e524e32..40887e480c9c0b 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.2.3", + "version": "6.2.4", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 9536a0b2a327b3..9ed06dbe995bd5 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/portfile.cmake b/ports/qtimageformats/portfile.cmake index c72184818458cf..275b927af08580 100644 --- a/ports/qtimageformats/portfile.cmake +++ b/ports/qtimageformats/portfile.cmake @@ -5,6 +5,10 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES no_target_promotion.patch) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + #"jasper" CMAKE_REQUIRE_FIND_PACKAGE_WrapJasper + #"webp" CMAKE_REQUIRE_FIND_PACKAGE_WrapWebP + #"tiff" CMAKE_REQUIRE_FIND_PACKAGE_TIFF INVERTED_FEATURES "jasper" CMAKE_DISABLE_FIND_PACKAGE_WrapJasper "webp" CMAKE_DISABLE_FIND_PACKAGE_WrapWebP diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index 4de7422d30f5cd..8d0bca44af00da 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.2.3", + "version": "6.2.4", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index 263b26a63b157e..302b085e3fe795 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.2.3", - "port-version": 2, + "version": "6.2.4", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index 8d985e8ad4bf67..9fde64ebe440d9 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/portfile.cmake b/ports/qtlottie/portfile.cmake index 9ad5b29e39d465..f07e0c6e2e9fe5 100644 --- a/ports/qtlottie/portfile.cmake +++ b/ports/qtlottie/portfile.cmake @@ -6,6 +6,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 873e46f433298c..f5b37860e2a0e5 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.2.3", + "version": "6.2.4", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index caeb4603574e15..1457f1ebf1a5d2 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index feceb63532f108..67a771a9be75c4 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -23,6 +23,9 @@ set(${PORT}_PATCHES fix_windows_header_include.patch vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "widgets" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Widgets + #"gstreamer" CMAKE_REQUIRE_FIND_PACKAGE_GStreamer INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick "widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets @@ -37,6 +40,7 @@ endif() if(VCPKG_TARGET_IS_LINUX) list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=ON") + list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_ALSA=ON") else() list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON") endif() diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 9af8430a3cda7f..b93a864ba6da94 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index e43545e4b086fe..03ab652c43e2a4 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/portfile.cmake b/ports/qtopcua/portfile.cmake index 6cfe3cdbae8689..80738f36bb885e 100644 --- a/ports/qtopcua/portfile.cmake +++ b/ports/qtopcua/portfile.cmake @@ -9,6 +9,7 @@ FEATURES "uacpp" FEATURE_uacpp "ns0idnames" FEATURE_ns0idnames "ns0idgenerator" FEATURE_ns0idgenerator + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 9fd6237200c4c3..87038f227dcfe4 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/portfile.cmake b/ports/qtpositioning/portfile.cmake index 01c76c93571456..005fe5f33f42a6 100644 --- a/ports/qtpositioning/portfile.cmake +++ b/ports/qtpositioning/portfile.cmake @@ -3,6 +3,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index afef3f03f38f1f..7858af023392b3 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/portfile.cmake b/ports/qtquick3d/portfile.cmake index f7c6c761a65627..af7915a09ed2dd 100644 --- a/ports/qtquick3d/portfile.cmake +++ b/ports/qtquick3d/portfile.cmake @@ -5,6 +5,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "assimp" FEATURE_quick3d_assimp + #"assimp" CMAKE_REQUIRE_FIND_PACKAGE_WrapQuick3DAssimp INVERTED_FEATURES "assimp" CMAKE_DISABLE_FIND_PACKAGE_WrapQuick3DAssimp ) diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 7041023f96c9bc..26d691f985d352 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.2.3", + "version": "6.2.4", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 1703c5279e7f1c..2bcaea99011d5f 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.2.3", + "version": "6.2.4", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/portfile.cmake b/ports/qtremoteobjects/portfile.cmake index 9969bd4eeb9eaa..f2b31ed8e57bef 100644 --- a/ports/qtremoteobjects/portfile.cmake +++ b/ports/qtremoteobjects/portfile.cmake @@ -6,6 +6,7 @@ set(TOOL_NAMES repc) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 6e2929f034d201..b9f5c19b1cafc9 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/portfile.cmake b/ports/qtscxml/portfile.cmake index 1215ca019df642..74fa2ed04f9cc2 100644 --- a/ports/qtscxml/portfile.cmake +++ b/ports/qtscxml/portfile.cmake @@ -7,6 +7,7 @@ set(TOOL_NAMES qscxmlc) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Qml INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml ) diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index e6865d1f165724..b32abdee6f96c9 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.2.3", + "version": "6.2.4", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/portfile.cmake b/ports/qtsensors/portfile.cmake index d6a3b2fd0ad24e..0f5be8a036a1d9 100644 --- a/ports/qtsensors/portfile.cmake +++ b/ports/qtsensors/portfile.cmake @@ -5,6 +5,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index fa33b290a959e0..558c07d258a5bf 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index f01ac65a03ca1c..060fe04e8ed439 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.2.3", + "version": "6.2.4", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index 55d5ab5055ebd2..af1875ab845aab 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 8d640afff4374a..c66a073f4627be 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.2.3", + "version": "6.2.4", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 4f45b6b1ab4be7..f540f80387fb2c 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index 012d5bbd7012b5..d0bf4c9de88c29 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -37,6 +37,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "assistant" FEATURE_assistant "designer" FEATURE_designer "linguist" FEATURE_linguist + "qdoc" CMAKE_REQUIRE_FIND_PACKAGE_Clang + #"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_WrapLibClang + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets INVERTED_FEATURES "qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang "qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 9bbd137bfdcf33..3532d725944f85 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index fb1bec68eee1f3..c6fa365d67392c 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 1bf7f1f89aac59..db0a9deb34a237 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.2.3", + "version": "6.2.4", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/portfile.cmake b/ports/qtwayland/portfile.cmake index d8846384660c96..54d9d939000f8a 100644 --- a/ports/qtwayland/portfile.cmake +++ b/ports/qtwayland/portfile.cmake @@ -12,6 +12,7 @@ set(TOOL_NAMES qtwaylandscanner) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 4e16f588e9bec2..d201b62b7102cb 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.2.3", + "version": "6.2.4", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/portfile.cmake b/ports/qtwebchannel/portfile.cmake index 9ad5b29e39d465..f07e0c6e2e9fe5 100644 --- a/ports/qtwebchannel/portfile.cmake +++ b/ports/qtwebchannel/portfile.cmake @@ -6,6 +6,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index e67abf1616fddd..3dbef769aa6ac6 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index c826a51d85c628..8b44f726a78ba0 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -9,6 +9,8 @@ FEATURES "spellchecker" FEATURE_webengine_spellchecker "geolocation" FEATURE_webengine_geolocation "webchannel" FEATURE_webengine_webchannel + "geolocation" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Positioning + "webchannel" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebChannel INVERTED_FEATURES "geolocation" CMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning "webchannel" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 41109712622a0a..6365ebc0f64943 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.2.3", - "port-version": 1, + "version": "6.2.4", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/portfile.cmake b/ports/qtwebsockets/portfile.cmake index 9ad5b29e39d465..f07e0c6e2e9fe5 100644 --- a/ports/qtwebsockets/portfile.cmake +++ b/ports/qtwebsockets/portfile.cmake @@ -6,6 +6,7 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 5d4b13ad2e2921..953e5ebf49086e 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/portfile.cmake b/ports/qtwebview/portfile.cmake index 7385e5bf29ac6c..8a3f752c50a958 100644 --- a/ports/qtwebview/portfile.cmake +++ b/ports/qtwebview/portfile.cmake @@ -6,6 +6,9 @@ set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebEngineQuick + "webengine" CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 8167e57dca634f..bc94b7435bb917 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.2.3", + "version": "6.2.4", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 565f830af57ce6..c85e43335a3ef2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5629,7 +5629,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5809,7 +5809,7 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qt6betablock": { @@ -5817,52 +5817,52 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.2.3", - "port-version": 1 + "baseline": "6.2.4", + "port-version": 0 }, "qtbase": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtcharts": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtcoap": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtdoc": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtimageformats": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.2.3", - "port-version": 2 + "baseline": "6.2.4", + "port-version": 0 }, "qtkeychain": { "baseline": "0.13.2", @@ -5873,35 +5873,35 @@ "port-version": 0 }, "qtlocation": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtlottie": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtmqtt": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtopcua": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtpositioning": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtquick3d": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtquickcontrols2": { @@ -5909,67 +5909,67 @@ "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtscxml": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtsensors": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtserialbus": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtserialport": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtshadertools": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtsvg": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qttools": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qttranslations": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtwayland": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtwebengine": { - "baseline": "6.2.3", - "port-version": 1 + "baseline": "6.2.4", + "port-version": 0 }, "qtwebsockets": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "qtwebview": { - "baseline": "6.2.3", + "baseline": "6.2.4", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 5c9b941164e414..8d7d766101cc5e 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38c269c72f98a9fd49b28d428ad29cc5f1079fac", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "174cc984a142087680da0f0f42e659b835bb17b8", "version": "6.2.3", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index adc99282ff5f88..b88ffd90ddc2b4 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9ffdd0f5186b67741f04c15121449eb62f21f45", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "d650b3405a677deca9110c6ea6861bfaa24645f2", "version": "6.2.3", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index ecc4f8aa09b88e..ef6edccc242eb0 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f58617e4fa4a6e358daffccd8d286cd9dab162ee", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "bc03ec029e90f445ee878ad27b476b60da06ee3e", "version": "6.2.3", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index baaee179d3992f..2e6fdb2a1a53a0 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d51f980344bfb14ace79b30fbf510e92b4924da8", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "3c971f01c7b3ee85236a451ad93fd00fe4cc17e6", "version": "6.2.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 0549e7a102f860..42f90f865923d8 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35e9386f344f01e0e37df7b2d2ae991db6bbb1cc", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "bfac5075bd2dcb338153b016e27ff8789b05688b", "version": "6.2.3", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index d844c41aaf24d1..b840a15b691b8a 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5e059fea3a95f9b719d3b3069f09be05413ef99", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "f4676a2659098089318793815dcbff8cdb55ea9f", "version": "6.2.3", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 5d4d4767b0733e..3473d9933757be 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f05c6aaeb825647d3c802feeb1b06a0d14a83c0", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "948308d4ae9a45ee3c438fb512b2fe25c3661773", "version": "6.2.3", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index 9f1ac3bded4578..b4b4e974113295 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db0fc2cda2cc383043f8e1fc4b48849183f038b8", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "fbe8db54ab4377615f8328227d21c8bf470551d6", "version": "6.2.3", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 22fa6a236e1c2b..ebd18f8b516cf8 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c35b1ffb8bc3d76b8537e2d5d59176545f4a02bc", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "014813f75ac07a1207692d81609b4cc6e28e5737", "version": "6.2.3", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index f5a33ef2d74bdb..5d3827b0e1452e 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea64315431fd028d453a27e999d7e696f48923d4", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "ede6e28a20ddf3b6d4cc7b1e7ac7dc41f80e64a8", "version": "6.2.3", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index e770498187d333..2b269d377b4756 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a688914d635b3b8f3295bfa76e3581b2db6d3d44", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "91bd6966a66abed85eab29725a1fa838b7416c9f", "version": "6.2.3", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 92d19e5f4af141..5edb3f9b867bea 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e04878cf2a70ff87ae027aaefc5d40c328cffba", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "86089f5d381b17bdd89c9fd7953db2ff38dcec38", "version": "6.2.3", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 2fe4378a5d18fb..52ba49b717584c 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "721c778bc9a6bd4e04a2e1cfb5437ffb7e59abc0", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "fff7150f31fcb2531adcb2f8fa42b6106c2893d1", "version": "6.2.3", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 3dc3a83a7f5cc0..33909a951c90ff 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e36f5d74c2e94aa38c74b0fdfec8778fb7851523", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "42968cd54d91bbbf94a3c5aaaf6f1de876b0efac", "version": "6.2.3", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 20e7061486d4f8..de75ba18c3fa91 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef7c3db0a80c38d01ff341d090a291f4f1a098aa", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "589d851aebfb0c2dd786a5b0a8d7c33e56083223", "version": "6.2.3", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 687a4282b3419c..cf263c8b053501 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57035eea5acd484e3a6a51f5da16046283c58f50", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "ab8ffeb4492e7cabd51fa8c5ead514e4764f67e5", "version": "6.2.3", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index ebf75d0b7d2dce..b62a8368013d56 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b09100a4e32240e79258ab69386b77370d916a0", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "adfab6c76e26f420db304e6d131cab246da43200", "version": "6.2.3", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index aa38ef60343677..fc552d13028239 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0e46329a8e66cf3f95eca5d4018c955a8b54a15", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "3a6cdbf95fd19f196f2e0d7c9ed149e621690a7a", "version": "6.2.3", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 24bdcff81c546d..a524dc86a62ae8 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "edc058f97084276593fa00ebc1ad1dbf865abb57", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "205649afe146022c19e1246083c83c4ca1573959", "version": "6.2.3", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 7a59a4b9d51b2b..47a362cff326ea 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a9e72b88e14594db1752854941cb95174565be6", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "3fef74b1cf459126f776aa964fa6900e7be903fb", "version": "6.2.3", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 626e92145f1ac6..88693a1df33cbb 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26bbae5f5512a6ca58eada26e54c94666174ec71", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "1c16604affb63067fcad166931565e516250434f", "version": "6.2.3", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 74f3ab310305a5..bcbffd2c7201bc 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0782a581d66c7895e5fe12eb225bbd63ff6d0799", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "822ca9b71fbf3eb7ae119c25e87dc8e00f70b0a5", "version": "6.2.3", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index b4fd1a259afd7b..b546a117c6bd33 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7797c7b3d33d915ba656bfc26717623fcd187109", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "d213e9348a705383181332c7448c14b94235f89e", "version": "6.2.3", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 9299131b64d229..2866acc0025d0c 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9f576479ffa0be9262702030362c0b030b1497b", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "a7a71c783e081189c9edb6a9e59707472863738f", "version": "6.2.3", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index eeb52829cd08e7..1073b88269161b 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82cfc4f68723b511524573f7492e44c0326378f7", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "e7c00e022f07f448e2c6d2509bc6986f5b75d3b8", "version": "6.2.3", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 679d6046e0f296..34a1cbb8cbdecf 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b52c1c71cc2c185f936b5e1e278ed4758bae6d6e", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "5515c06070b3f4b8ae13497824653e91d09476d7", "version": "6.2.3", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 80d6c10da4a697..aab2381f8bd7d4 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97a896e4a1812c908a3db8b73676fbda9280569b", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "413e942ee8da80bd4f4f64b4eb4de978740a9d65", "version": "6.2.3", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 3e499241fa73f0..67aa32223d53fd 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a4f36aca9457e6a78f5b6c1f65b1d36f7666fd7", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "e500faa24ed6ecba0cfe64ce061763c47612c767", "version": "6.2.3", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 858c9a556905ff..0c4363ce25b4f1 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d8e8be656c7dc865d98021272c0f716c14866ed", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "cd4279442737df6c5e8ba533f8ce52b0a03cdc08", "version": "6.2.3", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 47fbdf6c17a5bd..763ca70f672471 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df716d6718c7fad4a45e9eecc493c6c4cc752744", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "37349a1661b8bfda73318abcb5db080fb6fc71d6", "version": "6.2.3", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 3e34f143af1086..8f827546361db7 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a00f4470b9264ccffc7dfb230684126e61fb0f2c", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "79247ffe31fa15579c9069634c3d8778672928ca", "version": "6.2.3", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index d1ef10fc73f607..c702c0ccde2864 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d16f4613ad42d01be87aa75bf23013dc7da1845a", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "3df8c89676608f1a4a58aeef4cb6e9edfe5666fb", "version": "6.2.3", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 3e04c8feb2465d..e95d822c844d60 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fcfb5975545e28e64e2f5c71c5f5a2cbc0b22c70", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "7ec572e9663958105a8c2b89c24a93d4280f002c", "version": "6.2.3", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 3850ba0406fd2d..eb7c396874aa7d 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9930653065c44653bdf5f7285799d1a9ebb44d83", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "6eaf26953606c37b93a2e03d2162f80e4d2d4d6a", "version": "6.2.3", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 0d167ca72958fe..55122a8db427d3 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bc22dab6b47734c9163edde8bef8e9088a04301", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "0f4fee2471dba6631d06fcac6a9f99c38fe14649", "version": "6.2.3", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 72b1484513b766..edb49ebc8e8ac0 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7972a7fa77f29d83f91787c942f4f85d50651c05", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "c09764532fe7b4367f6438db92b59f41cb3d4e52", "version": "6.2.3", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 010009b54e722c..459c87c45051d6 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78911113c7407ff6403479ace90d0f4b2656e517", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "cc3e9ce12b12aecdb4372cee226fcb0ddc4b0f34", "version": "6.2.3", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 03401c6c35660e..f4da583d93a505 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a8cb6fb5af80519ad2f3d0e9f80a027f1d16165", + "version": "6.2.4", + "port-version": 0 + }, { "git-tree": "36832dd9f2bf65b94b7b51bf37db50eaf266baf8", "version": "6.2.3", From 601d7f32059066ac229d4efbd9179790ccc57b0f Mon Sep 17 00:00:00 2001 From: Prateek Chokse Date: Thu, 24 Mar 2022 00:53:34 +0530 Subject: [PATCH 036/217] [minizip-ng] Updated minizip version and fixed windows build for previous version (#23684) * [minizip-ng] fix: in windows only compat symbols were exposed * [minzip-ng] updated version * [minzip-ng] updated baseline and versions * Add vcpkg_check_linkage * update version Co-authored-by: prateek.chokse Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/minizip-ng/portfile.cmake | 8 ++++++-- ports/minizip-ng/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/m-/minizip-ng.json | 5 +++++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 9faecfc489567e..8dac2781ff15b4 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -1,8 +1,12 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/minizip-ng - REF 3.0.2 - SHA512 eee4d35d273ab0a32972b119c8faabd8c242e2d9f506fab0dd21fdd24c78b932c01bf7f15e9cf7c452776fc4c2e27a5ff09e376adb7a706336d11114929182fc + REF 3.0.5 + SHA512 da0c230951caafd986331300b840d09a4c27a677183174f8b1782c2515209b51cf00133dd5fc5f9fc88a349134db7f93d3daa7c05b7d0270be99b9cf85a6c133 HEAD_REF master PATCHES Modify-header-file-path.patch diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index eeab4ef8e853e5..a8e680134204da 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "minizip-ng", - "version": "3.0.2", - "port-version": 1, + "version": "3.0.5", "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", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index c85e43335a3ef2..6bedc944d296a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4513,8 +4513,8 @@ "port-version": 10 }, "minizip-ng": { - "baseline": "3.0.2", - "port-version": 1 + "baseline": "3.0.5", + "port-version": 0 }, "mio": { "baseline": "2019-02-10", diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index e71ee7e3321b64..e63af534dcc866 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36ef459c57047fcfc0ddbfc97d7360d7307acb24", + "version": "3.0.5", + "port-version": 0 + }, { "git-tree": "4a8de7f8609b758c48eea13b67d47c22efc832a3", "version": "3.0.2", From ee2fa5303c4b3efc521d58898851949cfe2cac36 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 23 Mar 2022 20:24:10 +0100 Subject: [PATCH 037/217] [libgeotiff] Update to 1.7.1 (#23446) * Update to 1.7.1 * Update versions * CI --- ports/libgeotiff/cmakelists.patch | 18 ------------------ ports/libgeotiff/fix-staticbuild.patch | 16 ---------------- ports/libgeotiff/geotiff-config.patch | 14 -------------- ports/libgeotiff/portfile.cmake | 7 ++----- ports/libgeotiff/skip-doc-install.patch | 8 ++++---- ports/libgeotiff/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libgeotiff.json | 5 +++++ 8 files changed, 14 insertions(+), 61 deletions(-) delete mode 100644 ports/libgeotiff/fix-staticbuild.patch delete mode 100644 ports/libgeotiff/geotiff-config.patch diff --git a/ports/libgeotiff/cmakelists.patch b/ports/libgeotiff/cmakelists.patch index 472ab6f7eb9686..d2790e17d2bbfc 100644 --- a/ports/libgeotiff/cmakelists.patch +++ b/ports/libgeotiff/cmakelists.patch @@ -1,21 +1,3 @@ -diff --git a/libgeotiff/bin/CMakeLists.txt b/libgeotiff/bin/CMakeLists.txt -index 7b12341..b6b1d0c 100644 ---- a/libgeotiff/bin/CMakeLists.txt -+++ b/libgeotiff/bin/CMakeLists.txt -@@ -22,12 +19,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build") - - FOREACH(utility ${GEOTIFF_UTILITIES}) - ADD_EXECUTABLE(${utility} ${utility}.c ${GETOPT_SOURCE}) -- TARGET_LINK_LIBRARIES(${utility} xtiff ${GEOTIFF_LIBRARY_TARGET}) -+ TARGET_LINK_LIBRARIES(${utility} ${GEOTIFF_LIBRARY_TARGET}) - ENDFOREACH() - - ADD_EXECUTABLE(geotifcp geotifcp.c ${GETOPT_SOURCE}) - TARGET_LINK_LIBRARIES(geotifcp -- xtiff - ${GEOTIFF_LIBRARY_TARGET} - ${JPEG_LIBRARIES} - ${ZLIB_LIBRARIES}) diff --git a/libgeotiff/cmake/CMakeLists.txt b/libgeotiff/cmake/CMakeLists.txt index 47a2b00..3809ba3 100644 --- a/libgeotiff/cmake/CMakeLists.txt diff --git a/ports/libgeotiff/fix-staticbuild.patch b/ports/libgeotiff/fix-staticbuild.patch deleted file mode 100644 index 5b47a5daba7842..00000000000000 --- a/ports/libgeotiff/fix-staticbuild.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt -index b4a3cee..fd9f0a5 100644 ---- a/libgeotiff/CMakeLists.txt -+++ b/libgeotiff/CMakeLists.txt -@@ -80,7 +80,11 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) - - IF(WIN32) - IF(MSVC) -+ IF(BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-DBUILD_AS_DLL=1) -+ ELSE() -+ ADD_DEFINITIONS(-DBUILD_AS_DLL=0) -+ ENDIF() - ADD_DEFINITIONS(/DW4) - if (NOT (MSVC_VERSION VERSION_LESS 1400)) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) diff --git a/ports/libgeotiff/geotiff-config.patch b/ports/libgeotiff/geotiff-config.patch deleted file mode 100644 index 59a9b4947ee52d..00000000000000 --- a/ports/libgeotiff/geotiff-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in -index dc5b999..2ce07fd 100644 ---- a/libgeotiff/cmake/project-config.cmake.in -+++ b/libgeotiff/cmake/project-config.cmake.in -@@ -23,6 +23,9 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}") - message (STATUS - "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}") - -+include(CMakeFindDependencyMacro) -+find_dependency(PROJ) -+ - # Tell the user project where to find our headers and libraries - get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE) diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index 4cd525fa35f505..d6cc3d7555f268 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/libgeotiff - REF 7da5bacae7814c65ebb78f0b64e1141fbcb3de1e #v1.7.0 - SHA512 36047778fbbb4a533a7b65e7b32ab8c0955f59b95417b68b68e7ddd398191445e730e00271756213bf657cbf7cd5eb028b25d4b0741e5b309c78c207b4ec01c6 + REF 1.7.1 + SHA512 3c71a19f02a46a86d546777e2afe6bd715098779845967a5253ca949e0cacc0117c697cabd099611247e85e15cf1813733ae0ef445b136d7001f34667a4c8dd6 HEAD_REF master PATCHES cmakelists.patch - geotiff-config.patch - fix-staticbuild.patch skip-doc-install.patch ) @@ -21,7 +19,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/libgeotiff" OPTIONS -DGEOTIFF_BIN_SUBDIR=bin - -DGEOTIFF_DATA_SUBDIR=share -DWITH_TIFF=1 -DHAVE_TIFFOPEN=1 -DHAVE_TIFFMERGEFIELDINFO=1 diff --git a/ports/libgeotiff/skip-doc-install.patch b/ports/libgeotiff/skip-doc-install.patch index 9430751f649c00..bef3fc8605e6b2 100644 --- a/ports/libgeotiff/skip-doc-install.patch +++ b/ports/libgeotiff/skip-doc-install.patch @@ -1,16 +1,16 @@ diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt -index b4a3cee..f838a36 100644 +index 54779a5..30ff29f 100644 --- a/libgeotiff/CMakeLists.txt +++ b/libgeotiff/CMakeLists.txt -@@ -286,6 +286,7 @@ SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR}) +@@ -262,6 +262,7 @@ SET(GEOTIFF_BIN_DIR ${GEOTIFF_BIN_SUBDIR}) + SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR}) SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR}) - SET(GEOTIFF_DATA_DIR ${GEOTIFF_DATA_SUBDIR}) +if(0) # Install doc files INSTALL(FILES AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN -@@ -294,6 +295,7 @@ INSTALL(FILES +@@ -269,6 +270,7 @@ INSTALL(FILES # Install man pages INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1) diff --git a/ports/libgeotiff/vcpkg.json b/ports/libgeotiff/vcpkg.json index e07616b4e8c320..fc3ed37f7b602c 100644 --- a/ports/libgeotiff/vcpkg.json +++ b/ports/libgeotiff/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgeotiff", - "version": "1.7.0", - "port-version": 1, + "version": "1.7.1", "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.", "homepage": "https://github.com/OSGeo/libgeotiff", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6bedc944d296a5..b05230c159b1cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3553,8 +3553,8 @@ "port-version": 1 }, "libgeotiff": { - "baseline": "1.7.0", - "port-version": 1 + "baseline": "1.7.1", + "port-version": 0 }, "libgit2": { "baseline": "1.4.2", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index dbe169b3498f3a..6c93ee7b6d60a5 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f9baab006dd2bd507b6b8f63d2226dc6ce97cd1", + "version": "1.7.1", + "port-version": 0 + }, { "git-tree": "91982f7018b13638993efc70c14bf0996105f0bc", "version": "1.7.0", From e3d66251c9c38a2367eaf7ee71eb162beb6afe7f Mon Sep 17 00:00:00 2001 From: SE2Dev <5873790+SE2Dev@users.noreply.github.com> Date: Wed, 23 Mar 2022 15:55:48 -0400 Subject: [PATCH 038/217] [libjuice] Update to 0.9.8 (#23153) * [libjuice] Update to 0.9.7 * [libjuice] Update to 0.9.8 * delete git-tree Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/libjuice/portfile.cmake | 4 ++-- ports/libjuice/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libjuice.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index c409c4cc9b9ff5..b29ef11c3abfd7 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 3795466e704191dd35f8a46b82ca06cbbc395cd9 #v0.9.6 - SHA512 3c931b47d852ead3027ed077f9ba930e9b5b77de1cf984023dd4bac3b52980f68419517e4edf11e8fd2741bfb2e154d3c748073ed302182e395df0b0acc1910c + REF e2bb4df9c9a2d3a296312925f313bf6f26854010 #v0.9.8 + SHA512 98fa9cf8a1f22c0f43ef7b2dd438bdd299483384b8d81f1196d8a0fe7fa41c63df7d7acfb94b9af3b8edfe569aeb73b33569bea2557ed2d0a554ba3a81603c2f HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index 0630c3c670fbe4..2e87efc9eaa7aa 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "0.9.6", + "version": "0.9.8", "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", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b05230c159b1cd..3a0af79cef04af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3661,7 +3661,7 @@ "port-version": 1 }, "libjuice": { - "baseline": "0.9.6", + "baseline": "0.9.8", "port-version": 0 }, "libjxl": { diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index a08e49635edd06..cce469f9ae596d 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62c215b49c59158589a9bc98d02b20243ef1bf0b", + "version": "0.9.8", + "port-version": 0 + }, { "git-tree": "f544d762be0d7f9016b47f865843d0e575535166", "version": "0.9.6", From 6ad0750a86e5f9ee9f30ac792c3750965f5676fc Mon Sep 17 00:00:00 2001 From: Thomas Gwynne-Timothy Date: Wed, 23 Mar 2022 16:57:59 -0300 Subject: [PATCH 039/217] [nlohmann-json] Add option to control implicit conversions behaviour (#22409) * [nlohmann-json] Add "implicit-conversions" triplet variable * [nlohmann-json] Customize usage to document triplet var * [nlohmann-json] Update version files --- ports/nlohmann-json/portfile.cmake | 8 ++++++++ ports/nlohmann-json/usage | 12 ++++++++++++ ports/nlohmann-json/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nlohmann-json.json | 5 +++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ports/nlohmann-json/usage diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index 74c4c048c4d4f7..19343c426146df 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -6,12 +6,17 @@ vcpkg_from_github( HEAD_REF master ) +if(NOT DEFINED nlohmann-json_IMPLICIT_CONVERSIONS) + set(nlohmann-json_IMPLICIT_CONVERSIONS ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DJSON_Install=ON -DJSON_MultipleHeaders=ON -DJSON_BuildTests=OFF + -DJSON_ImplicitConversions=${nlohmann-json_IMPLICIT_CONVERSIONS} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME "nlohmann_json" CONFIG_PATH "lib/cmake/nlohmann_json") @@ -35,3 +40,6 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/nlohmann_json.natvis") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Handle usage +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/nlohmann-json/usage b/ports/nlohmann-json/usage new file mode 100644 index 00000000000000..3bbef4e28a0a4b --- /dev/null +++ b/ports/nlohmann-json/usage @@ -0,0 +1,12 @@ +The package nlohmann-json provides CMake targets: + + find_package(nlohmann_json CONFIG REQUIRED) + target_link_libraries(main PRIVATE nlohmann_json::nlohmann_json) + +The package nlohmann-json can be configured to not provide implicit conversions via a custom triplet file: + + set(nlohmann_json_JSON_ImplicitConversions OFF) + +For more information, see the docs here: + + https://json.nlohmann.me/features/macros/#json_use_implicit_conversions diff --git a/ports/nlohmann-json/vcpkg.json b/ports/nlohmann-json/vcpkg.json index 2052e976b95678..b59e5437a583eb 100644 --- a/ports/nlohmann-json/vcpkg.json +++ b/ports/nlohmann-json/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nlohmann-json", "version-semver": "3.10.5", + "port-version": 1, "description": "JSON for Modern C++", "homepage": "https://github.com/nlohmann/json", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 3a0af79cef04af..5a0fb74d19f99c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4814,7 +4814,7 @@ }, "nlohmann-json": { "baseline": "3.10.5", - "port-version": 0 + "port-version": 1 }, "nlopt": { "baseline": "2.7.0", diff --git a/versions/n-/nlohmann-json.json b/versions/n-/nlohmann-json.json index 00a57390f36342..ffd36468b9bc07 100644 --- a/versions/n-/nlohmann-json.json +++ b/versions/n-/nlohmann-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa0a087d0444a7f2c79a44bce91c51550d5f2e47", + "version-semver": "3.10.5", + "port-version": 1 + }, { "git-tree": "d1fe747457714c4c43b12502de05b2d006b440d4", "version-semver": "3.10.5", From 7310241d5ddf5a05ce43e2f57cb2ba8f4d2d61f3 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 24 Mar 2022 00:16:17 +0100 Subject: [PATCH 040/217] [vcpk-ci] Trigger some test ports from vcpkg.cmake changes (#23430) * Trigger some test ports from vcpkg.cmake changes * Bump test port version * Revert "Bump test port version" * Use old toolchain version for parent hashes * Add ABI hashing note to vcpkg.cmake * Test vcpkg.cmake with cmake instead vpckg-ci-paraview --- scripts/azure-pipelines/test-modified-ports.ps1 | 9 +++++++++ scripts/buildsystems/vcpkg.cmake | 2 ++ 2 files changed, 11 insertions(+) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index d0b542c57d3cf3..57f13a2b58f26e 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -165,11 +165,20 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' $parentHashes = @("--parent-hashes=$parentHashesFile") & git revert -n -m 1 HEAD | Out-Null + # The vcpkg.cmake toolchain file is not part of ABI hashing, + # but changes must trigger at least some testing. + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" + Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" + Write-Host "Running CI using parent hashes" & git reset --hard HEAD } +# The vcpkg.cmake toolchain file is not part of ABI hashing, +# but changes must trigger at least some testing. +Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" +Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @hostArgs @commonArgs @cachingArgs @parentHashes $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 2bee6cbe86095e..138963133e7b3f 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -4,6 +4,8 @@ mark_as_advanced(CMAKE_TOOLCHAIN_FILE) # NOTE: to figure out what cmake versions are required for different things, # grep for `CMake 3`. All version requirement comments should follow that format. +# Attention: Changes to this file do not affect ABI hashing. + #[===[.md: # z_vcpkg_add_fatal_error Add a fatal error. From 83ad37a90b2b1393c0d7fa8a514425a42468860e Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 23 Mar 2022 16:20:53 -0700 Subject: [PATCH 041/217] [libnoise] Export CMake files (#23682) * [libnoise] Export CMake files * update version * format vcpkg.json * update version * update patch * update version Co-authored-by: Lily Wang --- ports/libnoise/fix-build.patch | 72 +++++++++++++++++++++++++++------- ports/libnoise/portfile.cmake | 15 ++++--- ports/libnoise/vcpkg.json | 17 ++++++-- versions/baseline.json | 2 +- versions/l-/libnoise.json | 5 +++ 5 files changed, 85 insertions(+), 26 deletions(-) diff --git a/ports/libnoise/fix-build.patch b/ports/libnoise/fix-build.patch index c0b7d7ce5a6ba2..e4b07413dcf24e 100644 --- a/ports/libnoise/fix-build.patch +++ b/ports/libnoise/fix-build.patch @@ -1,14 +1,18 @@ diff --git a/noiseutils/CMakeLists.txt b/noiseutils/CMakeLists.txt -index 07747de..08c0bda 100644 +index 07747de..68db2a2 100644 --- a/noiseutils/CMakeLists.txt +++ b/noiseutils/CMakeLists.txt -@@ -22,8 +22,11 @@ if(BUILD_SHARED_LIBS) - target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) +@@ -19,11 +19,14 @@ if(BUILD_SHARED_LIBS) + + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) + target_link_libraries(${TARGET_NAME} noise) +- target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++ target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) # install dynamic libraries (.dll or .so) into /bin - install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") -endif() -+ install(TARGETS ${TARGET_NAME} ++ install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseutilsTargets + RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" + LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" + ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") @@ -16,27 +20,49 @@ index 07747de..08c0bda 100644 #---------------------------------------- # build static lib (it's good practice to include a lib file for the dll) -@@ -35,7 +38,7 @@ target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) +@@ -31,11 +34,22 @@ set(TARGET_NAME "${LIB_NAME}-static") + add_library(${TARGET_NAME} STATIC ${libSrcs}) + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) + target_link_libraries(${TARGET_NAME} noise-static) +-target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) # install static libraries (.lib) into /lib - install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") +-install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") ++install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseutilsTargets DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") #---------------------------------------- - +endif() # install include files into /include install( FILES "${PROJECT_SOURCE_DIR}/noiseutils/noiseutils.h" - DESTINATION "${CMAKE_INSTALL_PREFIX}/include/noise" ) +- DESTINATION "${CMAKE_INSTALL_PREFIX}/include/noise" ) +\ No newline at end of file ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/include/noise" ) ++ ++install(EXPORT unofficial-noiseutilsTargets ++ NAMESPACE unofficial::noiseutils:: ++ DESTINATION share/unofficial-noiseutils ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-noiseutilsTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-noiseutils-config.cmake DESTINATION share/unofficial-noiseutils) ++ \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2757f30..7a135c2 100644 +index 2757f30..47dcc51 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -62,8 +62,11 @@ if(BUILD_SHARED_LIBS) +@@ -60,10 +60,13 @@ if(BUILD_SHARED_LIBS) + add_library(${TARGET_NAME} SHARED ${libSrcs}) + endif() set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) - target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) +- target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++ target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) target_compile_definitions(${TARGET_NAME} PRIVATE NOISE_BUILD_DLL) - install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") -endif() -+ install(TARGETS ${TARGET_NAME} ++ install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseTargets + RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" + LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" + ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") @@ -44,13 +70,31 @@ index 2757f30..7a135c2 100644 #---------------------------------------- # build static lib (it's good practice to include a lib file for the dll) -@@ -76,7 +79,7 @@ target_compile_definitions(${TARGET_NAME} PUBLIC NOISE_STATIC) +@@ -71,12 +74,22 @@ set(TARGET_NAME "${LIB_NAME}-static") + message(STATUS "build ${TARGET_NAME}") + add_library(${TARGET_NAME} STATIC ${libSrcs}) + set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${LIBNOISE_VERSION}) +-target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src) ++target_include_directories(${TARGET_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/src PUBLIC $ $) + target_compile_definitions(${TARGET_NAME} PUBLIC NOISE_STATIC) # install static libraries (.lib) into /lib - install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") +-install(TARGETS ${TARGET_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") ++install(TARGETS ${TARGET_NAME} EXPORT unofficial-noiseTargets DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") #---------------------------------------- - +endif() # install include files into /include install( DIRECTORY "${PROJECT_SOURCE_DIR}/src/noise" - DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) +- DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) \ No newline at end of file ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) ++ ++install(EXPORT unofficial-noiseTargets ++ NAMESPACE unofficial::noise:: ++ DESTINATION share/unofficial-noise ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake.in" ++[[include("${CMAKE_CURRENT_LIST_DIR}/unofficial-noiseTargets.cmake")]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-noise-config.cmake DESTINATION share/unofficial-noise) diff --git a/ports/libnoise/portfile.cmake b/ports/libnoise/portfile.cmake index 5c14ae663cb813..a929f37c693385 100644 --- a/ports/libnoise/portfile.cmake +++ b/ports/libnoise/portfile.cmake @@ -10,9 +10,8 @@ vcpkg_from_github( PATCHES fix-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_WALL=ON -DBUILD_SPEED_OPTIMIZED=ON @@ -21,15 +20,15 @@ vcpkg_configure_cmake( -DBUILD_LIBNOISE_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-noise CONFIG_PATH share/unofficial-noise) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-noiseutils CONFIG_PATH share/unofficial-noiseutils) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/noise/module/modulebase.h "if NOISE_STATIC" "if 1" ) endif() -file(INSTALL ${SOURCE_PATH}/cmake/Modules/FindLibNoise.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libnoise/vcpkg.json b/ports/libnoise/vcpkg.json index d82097ee5cfb8b..640e503bec0229 100644 --- a/ports/libnoise/vcpkg.json +++ b/ports/libnoise/vcpkg.json @@ -1,7 +1,18 @@ { "name": "libnoise", - "version-string": "1.0.0", - "port-version": 2, + "version": "1.0.0", + "port-version": 3, "description": "A general-purpose library that generates three-dimensional coherent noise. Useful for terrain generation and procedural texture generation. Uses a broad number of techniques (Perlin noise, ridged multifractal, etc.) and combinations of those techniques.", - "homepage": "https://github.com/RobertHue/libnoise" + "homepage": "https://github.com/RobertHue/libnoise", + "license": "LGPL-2.1", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5a0fb74d19f99c..3cda0f02fcedbf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3782,7 +3782,7 @@ }, "libnoise": { "baseline": "1.0.0", - "port-version": 2 + "port-version": 3 }, "libnop": { "baseline": "2021-03-01", diff --git a/versions/l-/libnoise.json b/versions/l-/libnoise.json index 1300aa98054509..73a4991faf1f95 100644 --- a/versions/l-/libnoise.json +++ b/versions/l-/libnoise.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24b694017cb633bae1e071413648afdf3623fc38", + "version": "1.0.0", + "port-version": 3 + }, { "git-tree": "d9a3fa0e4772f2c11fe3d177dea6ec8a23b06b07", "version-string": "1.0.0", From 440075a9fccf52cab386521967e4f074acd1bd34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 24 Mar 2022 00:41:00 +0100 Subject: [PATCH 042/217] [libpq] Update version to 14.1 2 (#22516) * update to 14.1 * adjust patches * add lz4 feature on !windows * version stuff * [skip actions] patch configure.ac and run autoreconf * fix some stuff * [skip actions] more details * [libpq] Add license filed to vcpkg json * [libpq] Adjust tcl version to 90g 90s and 90sg * [libpq] fail early from unsupported features * [libpq] lake xslt dependent from xml * [libpq] Update version database * [libpq] quote static * [libpq] Update Version Database Co-authored-by: Alexander Neumann --- ports/libpq/config.pl | 1 + ports/libpq/patches/fix-configure.patch | 64 ++++++ ports/libpq/patches/linux/configure.patch | 4 +- .../patches/mingw/additional-zlib-names.patch | 186 ------------------ .../windows/MSBuildProject-static-lib.patch | 2 +- .../MSBuildProject_fix_gendef_perl.patch | 2 +- .../windows/Mkvcbuild-static-lib.patch | 2 +- ports/libpq/patches/windows/Solution.patch | 40 ++-- .../patches/windows/Solution_DEBUG.patch | 62 +++--- .../patches/windows/Solution_RELEASE.patch | 77 +++++++- .../patches/windows/fix-compile-flag-Zi.patch | 4 +- ports/libpq/patches/windows/install.patch | 38 ++-- .../patches/windows/minimize_install.patch | 28 +-- ports/libpq/patches/windows/msgfmt.patch | 18 +- .../patches/windows/openssl_exe_path.patch | 2 +- .../patches/windows/python3_build_DEBUG.patch | 4 +- .../windows/python3_build_RELEASE.patch | 4 +- ports/libpq/patches/windows/python_lib.patch | 2 +- ports/libpq/patches/windows/tcl_version.patch | 13 ++ .../patches/windows/win_bison_flex.patch | 8 +- ports/libpq/portfile.cmake | 122 ++++++++---- ports/libpq/vcpkg.json | 29 ++- versions/baseline.json | 4 +- versions/l-/libpq.json | 5 + 24 files changed, 368 insertions(+), 353 deletions(-) create mode 100644 ports/libpq/patches/fix-configure.patch delete mode 100644 ports/libpq/patches/mingw/additional-zlib-names.patch create mode 100644 ports/libpq/patches/windows/tcl_version.patch diff --git a/ports/libpq/config.pl b/ports/libpq/config.pl index cbe605ef03ac7b..5538aae22132a2 100644 --- a/ports/libpq/config.pl +++ b/ports/libpq/config.pl @@ -11,6 +11,7 @@ extraver => undef, # --with-extra-version= gss => undef, # --with-gssapi= icu => undef, # --with-icu= + lz4 => undef, # --with-lz4= nls => undef, # --enable-nls= tap_tests => undef, # --enable-tap-tests tcl => undef, # --with-tcl= diff --git a/ports/libpq/patches/fix-configure.patch b/ports/libpq/patches/fix-configure.patch new file mode 100644 index 00000000000000..aa1dd2b9f8bd08 --- /dev/null +++ b/ports/libpq/patches/fix-configure.patch @@ -0,0 +1,64 @@ +diff --git a/configure.ac b/configure.ac +index fba79ee36..4563fa9f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,15 +18,14 @@ dnl + m4_pattern_forbid(^PGAC_)dnl to catch undefined macros + + AC_INIT([PostgreSQL], [14.1], [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. +-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.])]) ++# m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. ++# 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.])]) + AC_COPYRIGHT([Copyright (c) 1996-2021, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config) +-AC_PREFIX_DEFAULT(/usr/local/pgsql) ++#AC_PREFIX_DEFAULT(/usr/local/pgsql) + AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure]) + + [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`] +@@ -1194,7 +1195,7 @@ Use --without-readline to disable readline support.]) + fi + + if test "$with_zlib" = yes; then +- AC_CHECK_LIB(z, inflate, [], ++ AC_SEARCH_LIBS(inflate, [z zlib zlibd], [AC_DEFINE(HAVE_LIBZ,1,[Define to 1 if with zlib])], + [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. +@@ -1247,8 +1248,8 @@ if test "$with_ssl" = openssl ; 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])]) + else +- 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])]) ++ AC_SEARCH_LIBS(CRYPTO_new_ex_data, [libcrypto eay32 crypto], [AC_DEFINE(HAVE_LIBCRYPTO, 1, [Defined to 1 if libcrypto is found])], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) ++ AC_SEARCH_LIBS(SSL_new, [libssl ssleay32 ssl], [AC_DEFINE(HAVE_LIBSSL, 1, [Defined to 1 if libssl is found])], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) + fi + # Function introduced in OpenSSL 1.0.2. + AC_CHECK_FUNCS([X509_get_signature_nid]) +@@ -1273,15 +1274,15 @@ if test "$with_pam" = yes ; then + fi + + if test "$with_libxml" = yes ; then +- AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) ++ AC_SEARCH_LIBS(xmlSaveToBuffer, [xml2 libxml2], [AC_DEFINE(HAVE_LIBXML2,1,[Define to 1 if with xml2])], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) + fi + + if test "$with_libxslt" = yes ; then +- AC_CHECK_LIB(xslt, xsltCleanupGlobals, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) ++ AC_SEARCH_LIBS(xsltCleanupGlobals, [xslt libxslt], [AC_DEFINE(HAVE_LIBXSLT,1,[Define to 1 if with xslt])], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])]) + fi + + if test "$with_lz4" = yes ; then +- AC_CHECK_LIB(lz4, LZ4_compress_default, [], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) ++ AC_SEARCH_LIBS(LZ4_compress_default, [lz4 lz4d], [AC_DEFINE(HAVE_LIBLZ4,1,[Define to 1 if with lz4])], [AC_MSG_ERROR([library 'lz4' is required for LZ4 support])]) + fi + + # Note: We can test for libldap_r only after we know PTHREAD_LIBS; diff --git a/ports/libpq/patches/linux/configure.patch b/ports/libpq/patches/linux/configure.patch index 84ebcbd219137b..cd4b30cf8db955 100644 --- a/ports/libpq/patches/linux/configure.patch +++ b/ports/libpq/patches/linux/configure.patch @@ -2,7 +2,7 @@ diff --git a/configure b/configure index 54c852aca..96e2c89ba 100644 --- a/configure +++ b/configure -@@ -11923,7 +11923,7 @@ if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then : +@@ -12452,7 +12452,7 @@ if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11,7 +11,7 @@ index 54c852aca..96e2c89ba 100644 cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -11958,7 +11958,7 @@ if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes; then : +@@ -12487,7 +12487,7 @@ if test "x$ac_cv_lib_crypto_CRYPTO_new_ex_data" = xyes; then : #define HAVE_LIBCRYPTO 1 _ACEOF diff --git a/ports/libpq/patches/mingw/additional-zlib-names.patch b/ports/libpq/patches/mingw/additional-zlib-names.patch deleted file mode 100644 index e8ab7b06589ddd..00000000000000 --- a/ports/libpq/patches/mingw/additional-zlib-names.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/configure b/configure -index c22d3de..75210f0 100755 ---- a/configure -+++ b/configure -@@ -11777,13 +11789,13 @@ Use --without-readline to disable readline support." "$LINENO" 5 - fi - - if test "$with_zlib" = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5 --$as_echo_n "checking for inflate in -lz... " >&6; } --if ${ac_cv_lib_z_inflate+:} false; then : -+ if test "$enable_debug" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflate" >&5 -+$as_echo_n "checking for library containing inflate... " >&6; } -+if ${ac_cv_search_inflate+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lz $LIBS" -+ ac_func_search_save_LIBS=$LIBS - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -11802,23 +11814,101 @@ return inflate (); - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_z_inflate=yes --else -- ac_cv_lib_z_inflate=no -+for ac_lib in '' zd zlibd zlib1d z zlib zlib1; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_inflate=$ac_res - fi - rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ conftest$ac_exeext -+ if ${ac_cv_search_inflate+:} false; then : -+ break - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5 --$as_echo "$ac_cv_lib_z_inflate" >&6; } --if test "x$ac_cv_lib_z_inflate" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBZ 1 -+done -+if ${ac_cv_search_inflate+:} false; then : -+ -+else -+ ac_cv_search_inflate=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflate" >&5 -+$as_echo "$ac_cv_search_inflate" >&6; } -+ac_res=$ac_cv_search_inflate -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h -+ -+else -+ as_fn_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. -+Use --without-zlib to disable zlib support." "$LINENO" 5 -+fi -+ -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inflate" >&5 -+$as_echo_n "checking for library containing inflate... " >&6; } -+if ${ac_cv_search_inflate+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char inflate (); -+int -+main () -+{ -+return inflate (); -+ ; -+ return 0; -+} - _ACEOF -+for ac_lib in '' z zlib zlib1; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_inflate=$ac_res -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if ${ac_cv_search_inflate+:} false; then : -+ break -+fi -+done -+if ${ac_cv_search_inflate+:} false; then : - -- LIBS="-lz $LIBS" -+else -+ ac_cv_search_inflate=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inflate" >&5 -+$as_echo "$ac_cv_search_inflate" >&6; } -+ac_res=$ac_cv_search_inflate -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+ -+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h - - else - as_fn_error $? "zlib library not found -@@ -11827,6 +11917,7 @@ failure. It is possible the compiler isn't looking in the proper directory. - Use --without-zlib to disable zlib support." "$LINENO" 5 - fi - -+ fi - fi - - if test "$enable_spinlocks" = yes; then -diff --git a/configure.in b/configure.in -index 976f90d..e3cd80b 100644 ---- a/configure.in -+++ b/configure.in -@@ -1170,11 +1170,21 @@ Use --without-readline to disable readline support.]) - fi - - if test "$with_zlib" = yes; then -- AC_CHECK_LIB(z, inflate, [], -- [AC_MSG_ERROR([zlib library not found -+ if test "$enable_debug" = yes; then -+ AC_SEARCH_LIBS(inflate, [zd zlibd zlib1d z zlib zlib1], -+ [AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the `z' library.])], -+ [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. - Use --without-zlib to disable zlib support.])]) -+ else -+ AC_SEARCH_LIBS(inflate, [z zlib zlib1], -+ [AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the `z' library.])], -+ [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. -+Use --without-zlib to disable zlib support.])]) -+ fi - fi - - if test "$enable_spinlocks" = yes; then -diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in -index 244886a..29dd35b 100644 ---- a/src/include/pg_config.h.in -+++ b/src/include/pg_config.h.in -@@ -374,7 +374,7 @@ - /* Define to 1 if you have the `xslt' library (-lxslt). */ - #undef HAVE_LIBXSLT - --/* Define to 1 if you have the `z' library (-lz). */ -+/* Define to 1 if you have the `z' library. */ - #undef HAVE_LIBZ - - /* Define to 1 if the system has the type `locale_t'. */ diff --git a/ports/libpq/patches/windows/MSBuildProject-static-lib.patch b/ports/libpq/patches/windows/MSBuildProject-static-lib.patch index ba72a82bf18ad2..70cd22d60baef7 100644 --- a/ports/libpq/patches/windows/MSBuildProject-static-lib.patch +++ b/ports/libpq/patches/windows/MSBuildProject-static-lib.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm index 823357c02..e1dc59aa7 100644 --- a/src/tools/msvc/MSBuildProject.pm +++ b/src/tools/msvc/MSBuildProject.pm -@@ -262,7 +262,7 @@ sub WriteConfigurationPropertyGroup +@@ -265,7 +265,7 @@ sub WriteConfigurationPropertyGroup my $cfgtype = ($self->{type} eq "exe") ? 'Application' diff --git a/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch b/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch index 6c52713a9930fa..10955c3f98d739 100644 --- a/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch +++ b/ports/libpq/patches/windows/MSBuildProject_fix_gendef_perl.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm index 823357c02..b93992f22 100644 --- a/src/tools/msvc/MSBuildProject.pm +++ b/src/tools/msvc/MSBuildProject.pm -@@ -381,7 +381,7 @@ EOF +@@ -384,7 +384,7 @@ EOF print $f < Generate DEF file diff --git a/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch b/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch index 818134f5c55a4d..554d8527a4367c 100644 --- a/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch +++ b/ports/libpq/patches/windows/Mkvcbuild-static-lib.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 99f39caa5..4f51c12f2 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm -@@ -182,7 +182,7 @@ sub mkvcbuild +@@ -199,7 +199,7 @@ sub mkvcbuild 'syncrep_gram.y'); $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', 'jsonpath_gram.y'); diff --git a/ports/libpq/patches/windows/Solution.patch b/ports/libpq/patches/windows/Solution.patch index 2259e3e8abdf84..4647fe104bb619 100644 --- a/ports/libpq/patches/windows/Solution.patch +++ b/ports/libpq/patches/windows/Solution.patch @@ -2,25 +2,31 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 51711c2bf..d33fdc3b0 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm -@@ -69,9 +69,15 @@ sub DeterminePlatform - my $self = shift; +@@ -63,17 +63,21 @@ sub DeterminePlatform + my $self = shift; - # Examine CL help output to determine if we are in 32 or 64-bit mode. -- my $output = `cl /? 2>&1`; -+ my $output = `cl 2>&1`; - $? >> 8 == 0 or die "cl command not found"; -- $self->{platform} = ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32'; -+ if ($output =~ m/x64\n/) { $self->{platform} = 'x64'; -+ } elsif ($output =~ m/x86\n/) { $self->{platform} = 'Win32'; -+ } elsif ($output =~ m/ARM64\n/) { $self->{platform} = 'ARM64'; -+ } elsif ($output =~ m/ARM\n/) { $self->{platform} = 'ARM'; -+ } else { $self->{platform} = 'Unknown' -+ } -+ print "cl output $output."; - print "Detected hardware platform: $self->{platform}\n"; - return; + if ($^O eq "MSWin32") + { + # Examine CL help output to determine if we are in 32 or 64-bit mode. + my $output = `cl /help 2>&1`; + $? >> 8 == 0 or die "cl command not found"; +- $self->{platform} = +- ($output =~ /^\/favor:<.+AMD64/m) ? 'x64' : 'Win32'; ++ if ($output =~ m/x64\n/) { $self->{platform} = 'x64'; ++ } elsif ($output =~ m/x86\n/) { $self->{platform} = 'Win32'; ++ } elsif ($output =~ m/ARM64\n/) { $self->{platform} = 'ARM64'; ++ } elsif ($output =~ m/ARM\n/) { $self->{platform} = 'ARM'; ++ } else { $self->{platform} = 'Unknown' ++ } + } + else + { + $self->{platform} = 'FAKE'; + } + print "Detected hardware platform: $self->{platform}\n"; + return; } -@@ -526,14 +526,14 @@ EOF +@@ -757,14 +757,14 @@ EOF || confess "Could not open pg_config_paths.h"; print $o <{options}->{zlib}) { $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); @@ -11,43 +11,36 @@ index 51711c2bf..d33fdc3b0 100644 } if ($self->{options}->{openssl}) { -@@ -698,8 +698,8 @@ sub AddProject +@@ -989,8 +989,11 @@ sub AddProject # On both Win32 and Win64 the same library # names are used without a debugging context. $dbgsuffix = 0; - $libsslpath = '\lib\libssl.lib'; - $libcryptopath = '\lib\libcrypto.lib'; -+ $libsslpath = '\debug\lib\libssl.lib'; -+ $libcryptopath = '\debug\lib\libcrypto.lib'; ++ $libsslpath = '\debug\lib\libssl.lib'; # ++ $libcryptopath = '\debug\lib\libcrypto.lib'; # ++ $proj->AddLibrary('crypt32.lib'); ++ $proj->AddLibrary('ws2_32.lib'); ++ $proj->AddLibrary('secur32.lib'); } $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, -@@ -715,16 +715,16 @@ sub AddProject - # to be here, so don't ask for it in last - # parameter. - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\ssleay32.lib', 0); -+ $self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0); - $proj->AddLibrary( -- $self->{options}->{openssl} . '\lib\libeay32.lib', 0); -+ $self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0); - } - } - } +@@ -1024,7 +1024,7 @@ sub AddProject if ($self->{options}->{nls}) { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); ++ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # } if ($self->{options}->{gss}) { -@@ -752,39 +752,39 @@ sub AddProject +@@ -1051,21 +1051,21 @@ sub AddProject + } if ($self->{options}->{iconv}) { $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); - $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); -+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); ++ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # } if ($self->{options}->{icu}) { @@ -57,38 +50,43 @@ index 51711c2bf..d33fdc3b0 100644 - $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # } else { - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # } - } - if ($self->{options}->{xml}) +@@ -1074,22 +1074,22 @@ sub AddProject { $proj->AddIncludeDir($self->{options}->{xml} . '\include'); $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); - $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); -+ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); ++ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # } if ($self->{options}->{xslt}) { $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); - $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); -+ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); ++ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # + } + if ($self->{options}->{lz4}) + { + $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); +- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); ++ $proj->AddLibrary($self->{options}->{lz4} . '\debug\lib\lz4d.lib'); # } if ($self->{options}->{uuid}) { $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); - $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); -+ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); ++ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # } return $proj; } diff --git a/ports/libpq/patches/windows/Solution_RELEASE.patch b/ports/libpq/patches/windows/Solution_RELEASE.patch index b690c18710c23c..8270645ef1a2ec 100644 --- a/ports/libpq/patches/windows/Solution_RELEASE.patch +++ b/ports/libpq/patches/windows/Solution_RELEASE.patch @@ -1,8 +1,8 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index 51711c2bf..d33fdc3b0 100644 ---- a/src/tools/msvc/Solution.pm +index 2820ace22..7fddbf0fb 100644 +--- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm -@@ -658,7 +658,7 @@ sub AddProject +@@ -948,7 +948,7 @@ sub AddProject if ($self->{options}->{zlib}) { $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); @@ -11,25 +11,82 @@ index 51711c2bf..d33fdc3b0 100644 } if ($self->{options}->{openssl}) { -@@ -724,7 +724,7 @@ sub AddProject +@@ -989,8 +989,11 @@ sub AddProject + # On both Win32 and Win64 the same library + # names are used without a debugging context. + $dbgsuffix = 0; +- $libsslpath = '\lib\libssl.lib'; +- $libcryptopath = '\lib\libcrypto.lib'; ++ $libsslpath = '\lib\libssl.lib'; # ++ $libcryptopath = '\lib\libcrypto.lib'; # ++ $proj->AddLibrary('crypt32.lib'); ++ $proj->AddLibrary('ws2_32.lib'); ++ $proj->AddLibrary('secur32.lib'); + } + + $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, +@@ -1024,7 +1024,7 @@ sub AddProject if ($self->{options}->{nls}) { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); - $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib'); -+ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); ++ $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # } if ($self->{options}->{gss}) { -@@ -765,9 +765,9 @@ sub AddProject +@@ -1051,21 +1051,21 @@ sub AddProject + } + if ($self->{options}->{iconv}) + { + $proj->AddIncludeDir($self->{options}->{iconv} . '\include'); +- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); ++ $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # + } + if ($self->{options}->{icu}) + { + $proj->AddIncludeDir($self->{options}->{icu} . '\include'); + if ($self->{platform} eq 'Win32') + { +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); +- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # } else { - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib'); - $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); -+ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # ++ $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # } +@@ -1074,22 +1074,22 @@ sub AddProject + { + $proj->AddIncludeDir($self->{options}->{xml} . '\include'); + $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); +- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); ++ $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # + } + if ($self->{options}->{xslt}) + { + $proj->AddIncludeDir($self->{options}->{xslt} . '\include'); +- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); ++ $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # + } + if ($self->{options}->{lz4}) + { + $proj->AddIncludeDir($self->{options}->{lz4} . '\include'); +- $proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib'); ++ $proj->AddLibrary($self->{options}->{lz4} . '\lib\lz4.lib'); # + } + if ($self->{options}->{uuid}) + { + $proj->AddIncludeDir($self->{options}->{uuid} . '\include'); +- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); ++ $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # } - if ($self->{options}->{xml}) + return $proj; + } diff --git a/ports/libpq/patches/windows/fix-compile-flag-Zi.patch b/ports/libpq/patches/windows/fix-compile-flag-Zi.patch index 04d86811e954ae..b5e3b6cdb33355 100644 --- a/ports/libpq/patches/windows/fix-compile-flag-Zi.patch +++ b/ports/libpq/patches/windows/fix-compile-flag-Zi.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm index b93992f..2397511 100644 --- a/src/tools/msvc/MSBuildProject.pm +++ b/src/tools/msvc/MSBuildProject.pm -@@ -333,7 +333,7 @@ sub WriteItemDefinitionGroup +@@ -336,7 +336,7 @@ sub WriteItemDefinitionGroup false Level3 true @@ -15,7 +15,7 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index e0c9a88..98f9e67 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm -@@ -341,9 +341,12 @@ sub CopySolutionOutput +@@ -352,9 +352,12 @@ sub CopySolutionOutput || croak "Could not copy $pf.$ext\n"; } } diff --git a/ports/libpq/patches/windows/install.patch b/ports/libpq/patches/windows/install.patch index ecc14ac7bf2b6e..0d7a6d69a10491 100644 --- a/ports/libpq/patches/windows/install.patch +++ b/ports/libpq/patches/windows/install.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index d109b2c90..75c7446e6 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm -@@ -86,10 +86,10 @@ sub Install +@@ -89,10 +89,10 @@ sub Install my $majorver = DetermineMajorVersion(); print "Installing version $majorver for $conf in $target\n"; @@ -16,7 +16,7 @@ index d109b2c90..75c7446e6 100644 if ($insttype eq "client") { EnsureDirectories($target, @client_dirs); -@@ -114,7 +114,7 @@ sub Install +@@ -117,7 +117,7 @@ sub Install } }, @top_dir); @@ -25,7 +25,7 @@ index d109b2c90..75c7446e6 100644 CopyFiles( 'Import libraries', $target . '/lib/', -@@ -128,35 +128,35 @@ sub Install +@@ -131,35 +131,35 @@ sub Install CopySetOfFiles( 'timezone names', [ glob('src\timezone\tznames\*.txt') ], @@ -69,7 +69,7 @@ index d109b2c90..75c7446e6 100644 my $pl_extension_files = []; my @pldirs = ('src/pl/plpgsql/src'); -@@ -175,7 +175,7 @@ sub Install +@@ -178,7 +178,7 @@ sub Install }, @pldirs); CopySetOfFiles('PL Extension files', @@ -78,7 +78,7 @@ index d109b2c90..75c7446e6 100644 } GenerateNLSFiles($target, $config->{nls}, $majorver) if ($config->{nls}); -@@ -290,23 +290,26 @@ sub CopySolutionOutput +@@ -293,23 +293,26 @@ sub CopySolutionOutput { if ($1 == 1) { @@ -109,7 +109,7 @@ index d109b2c90..75c7446e6 100644 } } elsif ($vcproj eq 'vcxproj' -@@ -317,11 +317,11 @@ sub CopySolutionOutput +@@ -320,11 +320,11 @@ sub CopySolutionOutput { if ($1 eq 'Application') { @@ -123,7 +123,7 @@ index d109b2c90..75c7446e6 100644 if ($is_sharedlib) { push(@{ $install_list{'bin'} }, "dll"); -@@ -327,10 +330,9 @@ sub CopySolutionOutput +@@ -333,10 +333,9 @@ sub CopySolutionOutput } else # 'StaticLibrary' { @@ -135,7 +135,7 @@ index d109b2c90..75c7446e6 100644 } } else -@@ -349,7 +349,7 @@ sub CopySolutionOutput +@@ -352,7 +352,7 @@ sub CopySolutionOutput || croak "Could not copy $pf.$ext\n"; } } @@ -144,16 +144,14 @@ index d109b2c90..75c7446e6 100644 || croak "Could not copy $pf.pdb\n"; print "."; } -@@ -366,7 +366,7 @@ sub GenerateTimezoneFiles +@@ -374,5 +374,5 @@ sub GenerateTimezoneFiles print "Generating timezone files..."; - my @args = -- ("$conf/zic/zic", '-d', "$target/share/timezone", -+ ("$conf/zic/zic", '-d', "$target/share/libpq/timezone", - '-p', "$posixrules", '-b', 'fat'); +- my @args = ("$conf/zic/zic", '-d', "$target/share/timezone"); ++ my @args = ("$conf/zic/zic", '-d', "$target/share/libpq/timezone"); foreach (@tzfiles) { -@@ -391,7 +391,7 @@ sub GenerateTsearchFiles +@@ -398,7 +398,7 @@ sub GenerateTsearchFiles $mf =~ /^LANGUAGES\s*=\s*(.*)$/m || die "Could not find LANGUAGES line in snowball Makefile\n"; my @pieces = split /\s+/, $1; @@ -162,7 +160,7 @@ index d109b2c90..75c7446e6 100644 || die "Could not write snowball_create.sql"; print $F read_file('src/backend/snowball/snowball_func.sql.in'); -@@ -476,7 +476,7 @@ sub CopySubdirFiles +@@ -483,7 +483,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f.control", @@ -171,7 +169,7 @@ index d109b2c90..75c7446e6 100644 || croak("Could not copy file $f.control in contrib $module"); print '.'; } -@@ -494,7 +494,7 @@ sub CopySubdirFiles +@@ -501,7 +501,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f", @@ -180,7 +178,7 @@ index d109b2c90..75c7446e6 100644 || croak("Could not copy file $f in contrib $module"); print '.'; } -@@ -509,7 +509,7 @@ sub CopySubdirFiles +@@ -516,7 +516,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f", @@ -189,7 +187,7 @@ index d109b2c90..75c7446e6 100644 || croak("Could not copy file $f in $subdir $module"); print '.'; } -@@ -572,7 +572,7 @@ sub CopySubdirFiles +@@ -579,7 +579,7 @@ sub CopySubdirFiles if ($module eq 'spi'); foreach my $f (split /\s+/, $flist) { @@ -198,7 +196,7 @@ index d109b2c90..75c7446e6 100644 || croak("Could not copy file $f in contrib $module"); print '.'; } -@@ -701,7 +701,7 @@ sub GenerateNLSFiles +@@ -708,7 +708,7 @@ sub GenerateNLSFiles my $majorver = shift; print "Installing NLS files..."; @@ -207,7 +205,7 @@ index d109b2c90..75c7446e6 100644 my @flist; File::Find::find( { -@@ -723,12 +723,12 @@ sub GenerateNLSFiles +@@ -730,12 +730,12 @@ sub GenerateNLSFiles next unless /([^\/]+)\.po/; $lang = $1; diff --git a/ports/libpq/patches/windows/minimize_install.patch b/ports/libpq/patches/windows/minimize_install.patch index 1d1eb2b5769885..1a57c275f757b0 100644 --- a/ports/libpq/patches/windows/minimize_install.patch +++ b/ports/libpq/patches/windows/minimize_install.patch @@ -2,28 +2,28 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index d109b2c90..75c7446e6 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm -@@ -19,13 +19,13 @@ our (@ISA, @EXPORT_OK); +@@ -22,13 +22,13 @@ our (@ISA, @EXPORT_OK); my $insttype; my @client_contribs = ('oid2name', 'pgbench', 'vacuumlo'); -my @client_program_files = ( -- 'clusterdb', 'createdb', 'createuser', 'dropdb', -- 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', -- 'libpgtypes', 'libpq', 'pg_basebackup', 'pg_config', -- 'pg_dump', 'pg_dumpall', 'pg_isready', 'pg_receivewal', -- 'pg_recvlogical', 'pg_restore', 'psql', 'reindexdb', -- 'vacuumdb', @client_contribs); +- 'clusterdb', 'createdb', 'createuser', 'dropdb', +- 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', +- 'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', +- 'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', +- 'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', +- 'reindexdb', 'vacuumdb', @client_contribs); +my @client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' ); -+ # 'clusterdb', 'createdb', 'createuser', 'dropdb', -+ # 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', -+ #'libpgtypes', 'libpq', 'pg_basebackup', 'pg_config', -+ #'pg_dump', 'pg_dumpall', 'pg_isready', 'pg_receivewal', -+ #'pg_recvlogical', 'pg_restore', 'psql', 'reindexdb', -+ #'vacuumdb', @client_contribs); ++ #'clusterdb', 'createdb', 'createuser', 'dropdb', ++ #'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', ++ #'libpgtypes', 'libpq', 'pg_amcheck', 'pg_basebackup', ++ #'pg_config', 'pg_dump', 'pg_dumpall', 'pg_isready', ++ #'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', ++ #'reindexdb', 'vacuumdb', @client_contribs); sub lcopy { -@@ -110,7 +110,7 @@ sub Install +@@ -121,7 +121,7 @@ sub Install CopyFiles( 'Import libraries', $target . '/lib/', diff --git a/ports/libpq/patches/windows/msgfmt.patch b/ports/libpq/patches/windows/msgfmt.patch index 352daed870ee9a..98be285bcfb1c3 100644 --- a/ports/libpq/patches/windows/msgfmt.patch +++ b/ports/libpq/patches/windows/msgfmt.patch @@ -2,12 +2,12 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 66c0c3483..2154c6cf6 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm -@@ -728,7 +728,7 @@ sub GenerateNLSFiles - EnsureDirectories($target, "share/libpq/locale/$lang", - "share/libpq/locale/$lang/LC_MESSAGES"); - my @args = ( -- "$nlspath\\bin\\msgfmt", -+ "msgfmt.exe", - '-o', - "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", - $_); +@@ -733,7 +733,7 @@ sub GenerateNLSFiles + EnsureDirectories($target, "share/libpq/locale/$lang", + "share/libpq/locale/$lang/LC_MESSAGES"); + my @args = ( +- "$nlspath\\bin\\msgfmt", ++ "msgfmt.exe", + '-o', + "$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo", + $_); diff --git a/ports/libpq/patches/windows/openssl_exe_path.patch b/ports/libpq/patches/windows/openssl_exe_path.patch index 533f1c4fd7b8af..813ea58b1b3552 100644 --- a/ports/libpq/patches/windows/openssl_exe_path.patch +++ b/ports/libpq/patches/windows/openssl_exe_path.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 51711c2bf..d33fdc3b0 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm -@@ -133,7 +133,7 @@ sub GetOpenSSLVersion +@@ -129,7 +129,7 @@ sub GetOpenSSLVersion # openssl.exe is in the specified directory. # Quote the .exe name in case it has spaces my $opensslcmd = diff --git a/ports/libpq/patches/windows/python3_build_DEBUG.patch b/ports/libpq/patches/windows/python3_build_DEBUG.patch index 0a261038638931..f6124d8ec27c11 100644 --- a/ports/libpq/patches/windows/python3_build_DEBUG.patch +++ b/ports/libpq/patches/windows/python3_build_DEBUG.patch @@ -22,7 +22,7 @@ index 99f39caa5..21b5559d6 100644 + #die "Could not query for python version!\n" if $?; + #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); + my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 39; ++ my $pyver = 310; # Sometimes (always?) if python is not present, the execution # appears to work, but gives no data... die "Failed to query python for version information\n" @@ -32,7 +32,7 @@ index 99f39caa5..21b5559d6 100644 'dll', 'PLs', 'src/pl/plpython'); - $plpython->AddIncludeDir($pyprefix . '/include'); - $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.9'); ++ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); + $plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly! + $plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib"); $plpython->AddReference($postgres); diff --git a/ports/libpq/patches/windows/python3_build_RELEASE.patch b/ports/libpq/patches/windows/python3_build_RELEASE.patch index 5631d55e09d48a..f559e9af4964f2 100644 --- a/ports/libpq/patches/windows/python3_build_RELEASE.patch +++ b/ports/libpq/patches/windows/python3_build_RELEASE.patch @@ -22,7 +22,7 @@ index 99f39caa5..21b5559d6 100644 + #die "Could not query for python version!\n" if $?; + #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); + my $pyprefix = $solution->{options}->{python}; -+ my $pyver = 39; ++ my $pyver = 310; # Sometimes (always?) if python is not present, the execution # appears to work, but gives no data... die "Failed to query python for version information\n" @@ -32,7 +32,7 @@ index 99f39caa5..21b5559d6 100644 'dll', 'PLs', 'src/pl/plpython'); - $plpython->AddIncludeDir($pyprefix . '/include'); - $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); -+ $plpython->AddIncludeDir($pyprefix . '/include/python3.9'); ++ $plpython->AddIncludeDir($pyprefix . '/include/python3.10'); + $plpython->AddLibrary($pyprefix . "/lib/python$pyver.lib"); $plpython->AddReference($postgres); diff --git a/ports/libpq/patches/windows/python_lib.patch b/ports/libpq/patches/windows/python_lib.patch index 8b52e26c7c1a2a..cd012329f36f51 100644 --- a/ports/libpq/patches/windows/python_lib.patch +++ b/ports/libpq/patches/windows/python_lib.patch @@ -2,7 +2,7 @@ diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h index 3a1f0d56d..6a8a09a20 100644 --- a/src/pl/plpython/plpython.h +++ b/src/pl/plpython/plpython.h -@@ -46,12 +46,10 @@ +@@ -45,12 +45,10 @@ #if defined(_MSC_VER) && defined(_DEBUG) /* Python uses #pragma to bring in a non-default libpython on VC++ if * _DEBUG is defined */ diff --git a/ports/libpq/patches/windows/tcl_version.patch b/ports/libpq/patches/windows/tcl_version.patch new file mode 100644 index 00000000000000..5518949a3a092a --- /dev/null +++ b/ports/libpq/patches/windows/tcl_version.patch @@ -0,0 +1,13 @@ +diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm +index e2fbe95..8c4f279 100644 +--- a/src/tools/msvc/Mkvcbuild.pm ++++ b/src/tools/msvc/Mkvcbuild.pm +@@ -226,7 +226,7 @@ sub mkvcbuild + $pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include'); + $pltcl->AddReference($postgres); + +- for my $tclver (qw(86t 86 85 84)) ++ for my $tclver (qw(90 90g 90s 90sg)) + { + my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib"; + if (-e $tcllib) diff --git a/ports/libpq/patches/windows/win_bison_flex.patch b/ports/libpq/patches/windows/win_bison_flex.patch index fecf0bd365ebe8..645d53af2194cf 100644 --- a/ports/libpq/patches/windows/win_bison_flex.patch +++ b/ports/libpq/patches/windows/win_bison_flex.patch @@ -2,7 +2,7 @@ diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl index aceed5ffd..f6ed215e8 100644 --- a/src/tools/msvc/pgflex.pl +++ b/src/tools/msvc/pgflex.pl -@@ -12,7 +12,7 @@ $ENV{CYGWIN} = 'nodosfilewarning'; +@@ -16,7 +16,7 @@ $ENV{CYGWIN} = 'nodosfilewarning'; do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; @@ -11,7 +11,7 @@ index aceed5ffd..f6ed215e8 100644 $flexver = (split(/\s+/, $flexver))[1]; $flexver =~ s/[^0-9.]//g; my @verparts = split(/\./, $flexver); -@@ -48,7 +48,7 @@ close($mf); +@@ -52,7 +52,7 @@ close($mf); my $basetarg = basename($output); my $flexflags = ($make =~ /^$basetarg:\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : ''); @@ -24,7 +24,7 @@ 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 -@@ -9,7 +9,7 @@ use File::Basename; +@@ -13,7 +13,7 @@ use File::Basename; do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; @@ -33,7 +33,7 @@ index 895e398c0..f5b524a5d 100644 $bisonver = (split(/\s+/, $bisonver))[3]; # grab version number unless ($bisonver eq '1.875' || $bisonver ge '2.2') -@@ -45,5 +45,5 @@ close($mf); +@@ -51,5 +51,5 @@ close($mf); my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : ""; diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 8d44094eebcb90..5bacb17eefda1a 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,4 +1,4 @@ -set(PORT_VERSION 12.9) +set(PORT_VERSION 14.1) # NOTE: the python patches must be regenerated on version update macro(feature_unsupported) @@ -22,6 +22,9 @@ if(VCPKG_TARGET_IS_WINDOWS) # the configuration header depends on zlib, nls, uuid, xml, xlst,gss,openssl,icu feature_unsupported(readline bonjour libedit systemd llvm) feature_not_implemented_yet(uuid) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + feature_not_implemented_yet(client python tcl) + endif() elseif(VCPKG_TARGET_IS_OSX) feature_not_implemented_yet(readline libedit systemd llvm python tcl uuid) else() @@ -32,7 +35,7 @@ endif() vcpkg_download_distfile(ARCHIVE URLS "https://ftp.postgresql.org/pub/source/v${PORT_VERSION}/postgresql-${PORT_VERSION}.tar.bz2" FILENAME "postgresql-${PORT_VERSION}.tar.bz2" - SHA512 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f + SHA512 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd ) set(PATCHES @@ -43,20 +46,22 @@ set(PATCHES patches/windows/MSBuildProject_fix_gendef_perl.patch patches/windows/msgfmt.patch patches/windows/python_lib.patch - patches/windows/fix-compile-flag-Zi.patch) + patches/windows/fix-compile-flag-Zi.patch + patches/windows/tcl_version.patch + patches/fix-configure.patch + ) if(VCPKG_TARGET_IS_MINGW) - list(APPEND PATCHES patches/mingw/additional-zlib-names.patch) list(APPEND PATCHES patches/mingw/link-with-crypt32.patch) endif() if(VCPKG_TARGET_IS_LINUX) list(APPEND PATCHES patches/linux/configure.patch) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND PATCHES patches/windows/MSBuildProject-static-lib.patch) list(APPEND PATCHES patches/windows/Mkvcbuild-static-lib.patch) endif() -if(VCPKG_CRT_LINKAGE STREQUAL static) +if(VCPKG_CRT_LINKAGE STREQUAL "static") list(APPEND PATCHES patches/windows/MSBuildProject-static-crt.patch) endif() if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") @@ -70,7 +75,7 @@ else() endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES ${PATCHES} ) unset(buildenv_contents) @@ -106,12 +111,12 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg set(INSTALL_PATH_SUFFIX_${_buildtype} "/debug") set(BUILDPATH_${_buildtype} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${_short}") file(REMOVE_RECURSE "${BUILDPATH_${_buildtype}}") #Clean old builds - set(PACKAGE_DIR_${_buildtype} ${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}) + set(PACKAGE_DIR_${_buildtype} "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}") unset(_short) unset(_buildtype) endif() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") ## Do the build if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -184,14 +189,15 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) string(REPLACE "xml => undef" "xml => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") string(REPLACE "iconv => undef" "iconv => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") endif() - if("${FEATURES}" MATCHES "xslt") string(REPLACE "xslt => undef" "xslt => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") endif() - if("${FEATURES}" MATCHES "zlib") string(REPLACE "zlib => undef" "zlib => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") endif() + if("${FEATURES}" MATCHES "lz4") + string(REPLACE "lz4 => undef" "lz4 => \"${CURRENT_INSTALLED_DIR}\"" _contents "${_contents}") + endif() file(WRITE "${CONFIG_FILE}" "${_contents}") file(WRITE "${BUILDPATH_${_buildtype}}/src/tools/msvc/buildenv.pl" "${buildenv_contents}") @@ -212,8 +218,8 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}...") vcpkg_execute_required_process( COMMAND ${PERL} build.pl ${_buildtype} - WORKING_DIRECTORY ${BUILDPATH_${_buildtype}}/src/tools/msvc - LOGNAME build-${TARGET_TRIPLET}-${_buildtype} + WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" + LOGNAME "build-${TARGET_TRIPLET}-${_buildtype}" ) message(STATUS "Building libpq ${TARGET_TRIPLET}-${_buildtype}... done") else() @@ -222,8 +228,8 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}...") vcpkg_execute_required_process( COMMAND ${PERL} build.pl ${_buildtype} ${build_lib} - WORKING_DIRECTORY ${BUILDPATH_${_buildtype}}/src/tools/msvc - LOGNAME build-${build_lib}-${TARGET_TRIPLET}-${_buildtype} + WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" + LOGNAME "build-${build_lib}-${TARGET_TRIPLET}-${_buildtype}" ) message(STATUS "Building ${build_lib} ${TARGET_TRIPLET}-${_buildtype}... done") endforeach() @@ -231,9 +237,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}...") vcpkg_execute_required_process( - COMMAND ${PERL} install.pl ${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}} client - WORKING_DIRECTORY ${BUILDPATH_${_buildtype}}/src/tools/msvc - LOGNAME install-${TARGET_TRIPLET}-${_buildtype} + COMMAND ${PERL} install.pl "${CURRENT_PACKAGES_DIR}${INSTALL_PATH_SUFFIX_${_buildtype}}" client + WORKING_DIRECTORY "${BUILDPATH_${_buildtype}}/src/tools/msvc" + LOGNAME "install-${TARGET_TRIPLET}-${_buildtype}" ) message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}... done") endforeach() @@ -241,28 +247,34 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Cleanup libpq ${TARGET_TRIPLET}...") #Cleanup - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/symbols) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/symbols) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/symbols") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/symbols") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() if(NOT HAS_TOOLS) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") else() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() message(STATUS "Cleanup libpq ${TARGET_TRIPLET}... - done") set(USE_DL OFF) else() - file(COPY ${CMAKE_CURRENT_LIST_DIR}/Makefile DESTINATION ${SOURCE_PATH}) - + file(COPY "${CMAKE_CURRENT_LIST_DIR}/Makefile" DESTINATION "${SOURCE_PATH}") + + if("nls" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --enable-nls) + set(ENV{MSGFMT} "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin/msgfmt${VCPKG_HOST_EXECUTABLE_SUFFIX}") + else() + list(APPEND BUILD_OPTS --disable-nls) + endif() if("openssl" IN_LIST FEATURES) list(APPEND BUILD_OPTS --with-openssl) else() @@ -273,11 +285,36 @@ else() else() list(APPEND BUILD_OPTS --without-zlib) endif() + if("icu" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-icu) + else() + list(APPEND BUILD_OPTS --without-icu) + endif() + if("lz4" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-lz4) + else() + list(APPEND BUILD_OPTS --without-lz4) + endif() if("readline" IN_LIST FEATURES) list(APPEND BUILD_OPTS --with-readline) else() list(APPEND BUILD_OPTS --without-readline) endif() + if("xml" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-libxml) + else() + list(APPEND BUILD_OPTS --without-libxml) + endif() + if("xslt" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-libxslt) + else() + list(APPEND BUILD_OPTS --without-libxslt) + endif() + if("python" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-python) + else() + list(APPEND BUILD_OPTS --without-python) + endif() if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26) list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no) endif() @@ -285,7 +322,8 @@ else() list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_OSX_SYSROOT}") endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" COPY_SOURCE DETERMINE_BUILD_TRIPLET OPTIONS @@ -304,25 +342,25 @@ else() endif() vcpkg_install_make() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(NOT HAS_TOOLS) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") else() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") endif() if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpq.a ${CURRENT_PACKAGES_DIR}/lib/libpq.dll.a) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpq.dll ${CURRENT_PACKAGES_DIR}/bin/libpq.dll) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/lib/libpq.dll.a") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/bin/libpq.dll") endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpq.a ${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll.a) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libpq.dll) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll.a") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libpq.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/libpq.dll") endif() endif() if(VCPKG_TARGET_IS_MINGW) diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index dc7adc983ce160..84b4ca2b73dc5a 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libpq", - "version": "12.9", - "port-version": 1, + "version": "14.1", "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", + "license": "PostgreSQL", "supports": "!uwp", "dependencies": [ { @@ -16,6 +16,7 @@ } ], "default-features": [ + "lz4", "openssl", "zlib" ], @@ -24,7 +25,7 @@ "description": "Build with Bonjour support (--with-bonjour)" }, "client": { - "description": "Build all client tools and libraries." + "description": "Build all client tools and libraries (dynamic only?)" }, "icu": { "description": "Build with support for the ICU library (--with-icu)", @@ -44,10 +45,23 @@ "llvm" ] }, + "lz4": { + "description": "Use lz4 (else --without-lz4)", + "dependencies": [ + "lz4" + ] + }, "nls": { "description": "Native Language Support (--enable-nls[=LANGUAGES])", "dependencies": [ - "gettext" + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + } ] }, "openssl": { @@ -103,6 +117,13 @@ "xslt": { "description": "Build with libxslt (--with-libxslt)", "dependencies": [ + { + "name": "libpq", + "default-features": false, + "features": [ + "xml" + ] + }, "libxslt" ] }, diff --git a/versions/baseline.json b/versions/baseline.json index 3cda0f02fcedbf..32a9091125eae4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3869,8 +3869,8 @@ "port-version": 14 }, "libpq": { - "baseline": "12.9", - "port-version": 1 + "baseline": "14.1", + "port-version": 0 }, "libpqxx": { "baseline": "7.6.0", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index bdad019f865a81..f40eb33b34192d 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f33ace97e90816fb5aa827168d87aec2f1f95705", + "version": "14.1", + "port-version": 0 + }, { "git-tree": "099cade84111279ffa4a909061cb8f4f36137842", "version": "12.9", From f65d6947c7212618c00dcc99ecd53c47db97f8cd Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 25 Mar 2022 03:09:15 +0800 Subject: [PATCH 043/217] [unicorn] update to latest version v1.0.3 (#23745) * [unicorn] update to latest version v1.0.3 * update version * add licenses * overwrite version --- ports/unicorn/portfile.cmake | 4 ++-- ports/unicorn/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/u-/unicorn.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/unicorn/portfile.cmake b/ports/unicorn/portfile.cmake index aee7b65b9790fc..cccfbfe21d8683 100644 --- a/ports/unicorn/portfile.cmake +++ b/ports/unicorn/portfile.cmake @@ -12,8 +12,8 @@ set(VCPKG_CRT_LINKAGE "static") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO unicorn-engine/unicorn - REF abe452babc13299f598a47f7c87873a4ae34bf09 # accessed on 2020-09-14 - SHA512 8ad4b76cc98fc9d21421c93ad7084665622fd0ed4de87cb189c5d7ed1bbc83ccd365bd08c4ccfa81539e42fa3a74ffc7e2e33a74f2bfdfd4b2b9e2e5425f2fc9 + REF 52f90cda023abaca510d59f021c88629270ad6c0 # v1.0.3 + SHA512 bb47e7d680b122e38bd9390f44a3f7e3c3e314ea3ac86dbab3e755b7bcc2db5daca3a4432276a874f59675f811f7785d68ec0d39696c955d3718d6a720adf70b HEAD_REF master ) diff --git a/ports/unicorn/vcpkg.json b/ports/unicorn/vcpkg.json index 0f636649c02787..e4ea908ad2dc75 100644 --- a/ports/unicorn/vcpkg.json +++ b/ports/unicorn/vcpkg.json @@ -1,8 +1,8 @@ { "name": "unicorn", - "version-date": "2020-09-14", - "port-version": 2, + "version": "1.0.3", "description": "Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework", "homepage": "https://github.com/unicorn-engine/unicorn", + "license": "GPL-2.0-only", "supports": "windows & !uwp & !arm" } diff --git a/versions/baseline.json b/versions/baseline.json index 32a9091125eae4..233438d26a6b6e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7129,8 +7129,8 @@ "port-version": 0 }, "unicorn": { - "baseline": "2020-09-14", - "port-version": 2 + "baseline": "1.0.3", + "port-version": 0 }, "unicorn-lib": { "baseline": "2022-01-24", diff --git a/versions/u-/unicorn.json b/versions/u-/unicorn.json index 611d03bceef023..3ff8b2895ed8c8 100644 --- a/versions/u-/unicorn.json +++ b/versions/u-/unicorn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec4ae5e99d2204a11e112c2f1a596ac2d4f5f2f9", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "78e0a5d0840a6e2ae29d4922f34c858b821ab377", "version-date": "2020-09-14", From 83dd8264fbf928a06ae587f4112442bc47e1f6e3 Mon Sep 17 00:00:00 2001 From: SvenPStarFinanz Date: Thu, 24 Mar 2022 20:10:28 +0100 Subject: [PATCH 044/217] [xmlsec] Bump to 1.2.33 (#23733) * Bump version to 1.2.33 * x-add-version --- ports/xmlsec/portfile.cmake | 17 +++++++---------- ports/xmlsec/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/x-/xmlsec.json | 5 +++++ 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ports/xmlsec/portfile.cmake b/ports/xmlsec/portfile.cmake index 280f9aea7448e9..06100e4c159d61 100644 --- a/ports/xmlsec/portfile.cmake +++ b/ports/xmlsec/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lsh123/xmlsec - REF xmlsec-1_2_32 - SHA512 45e2efc6bdf6ec09db6ff01b521c3fbcf44aa9804d5692bea5296e80d7fc2f05fac322868f82840a7b67e0abd4233222098aa94a29ec9a6a7d049180cf131c57 + REF e628e70040cb0d81a561462472806aeaac1d1bc7 #xmlsec-1_2_33 + SHA512 2d4485941d354160f7fabd84394c61eef9dcea8be572d78bf7da7370880747f86ff76127fa000f8b0de06f462abef17d653270dee680fa35d96cc8200fb4d1a6 HEAD_REF master PATCHES pkgconfig_fixes.patch @@ -10,18 +10,15 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DPORT_DIR=${CMAKE_CURRENT_LIST_DIR} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS_TOOLS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/xmlsec/vcpkg.json b/ports/xmlsec/vcpkg.json index 0d2c235da2d803..446cfcf1a72626 100644 --- a/ports/xmlsec/vcpkg.json +++ b/ports/xmlsec/vcpkg.json @@ -1,10 +1,18 @@ { "name": "xmlsec", - "version": "1.2.32", + "version": "1.2.33", "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", "homepage": "https://www.aleksey.com/xmlsec/", "dependencies": [ "libxml2", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 233438d26a6b6e..2a6213ccd3cbb5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7517,7 +7517,7 @@ "port-version": 0 }, "xmlsec": { - "baseline": "1.2.32", + "baseline": "1.2.33", "port-version": 0 }, "xnnpack": { diff --git a/versions/x-/xmlsec.json b/versions/x-/xmlsec.json index 29672537a2c996..0667e390fb267b 100644 --- a/versions/x-/xmlsec.json +++ b/versions/x-/xmlsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "635a9b0883829c524cc712d552d9a265ef984bf7", + "version": "1.2.33", + "port-version": 0 + }, { "git-tree": "f15cb0d0c8dd69a916421866901a7bce6d81666c", "version": "1.2.32", From e53a24b3beca9ea590bb82b16d2e2890adf67567 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 24 Mar 2022 12:44:35 -0700 Subject: [PATCH 045/217] Fix the VS2022 'unstable' queues. (#23742) Also remove file lists from the unstable queue. --- scripts/azure-pipelines/windows-unstable/job.yml | 15 --------------- .../rearrange-msvc-drop-layout.ps1 | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/scripts/azure-pipelines/windows-unstable/job.yml b/scripts/azure-pipelines/windows-unstable/job.yml index 346e2bcf3b2aac..bac59834b25d30 100644 --- a/scripts/azure-pipelines/windows-unstable/job.yml +++ b/scripts/azure-pipelines/windows-unstable/job.yml @@ -86,18 +86,3 @@ jobs: PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs' ArtifactName: 'failure logs for ${{ parameters.triplet }}' condition: always() - - task: PowerShell@2 - displayName: 'Build a file list for all packages' - condition: always() - inputs: - targetType: inline - script: | - ./vcpkg.exe fetch python3 - & $(.\vcpkg fetch python3) .\scripts\file_script.py D:\installed\vcpkg\info\ - pwsh: true - - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: file lists for ${{ parameters.triplet }}' - condition: always() - inputs: - PathtoPublish: scripts/list_files - ArtifactName: 'file lists for ${{ parameters.triplet }}' diff --git a/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 b/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 index d409bc2085516f..b8087328246926 100644 --- a/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 +++ b/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 @@ -20,7 +20,7 @@ param( Set-StrictMode -Version Latest -$MSVCRoot = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC" +$MSVCRoot = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC" $ErrorActionPreference = "Stop" From 18433251dd595f383096e4c3fe90bc634f9f2de3 Mon Sep 17 00:00:00 2001 From: Charles-Auguste Marois Date: Thu, 24 Mar 2022 16:17:19 -0400 Subject: [PATCH 046/217] [aws-sdk-cpp] update to 1.9.220 (#23729) * [aws-sdk-cpp] update to 1.9.220 * Change port version after update. --- ports/aws-sdk-cpp/fix-config.patch | 12 ------------ ports/aws-sdk-cpp/portfile.cmake | 5 ++--- ports/aws-sdk-cpp/vcpkg.json | 3 +-- versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 5 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 ports/aws-sdk-cpp/fix-config.patch diff --git a/ports/aws-sdk-cpp/fix-config.patch b/ports/aws-sdk-cpp/fix-config.patch deleted file mode 100644 index 8b9e3a76dba828..00000000000000 --- a/ports/aws-sdk-cpp/fix-config.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake ---- a/cmake/AWSSDKConfig.cmake (revision e2d3e09f6f50167bb7886109eb15605eb2a0b578) -+++ b/cmake/AWSSDKConfig.cmake (date 1637856904387) -@@ -129,7 +129,7 @@ - get_filename_component(TEMP_PATH "${AWSSDK_CORE_LIB_FILE}" PATH) - get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) - --while (NOT TEMP_NAME STREQUAL ${LIB_SEARCH_PREFIX}) -+while (NOT TEMP_NAME STREQUAL "${LIB_SEARCH_PREFIX}") - set(TEMP_PLATFORM_PREFIX "${TEMP_NAME}/${TEMP_PLATFORM_PREFIX}") - get_filename_component(TEMP_PATH "${TEMP_PATH}" PATH) - get_filename_component(TEMP_NAME "${TEMP_PATH}" NAME) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 42c09123d36823..b520a17ae3a474 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF 26fa78673ec93dc703e80b741d8b437237798297 # 1.9.160 - SHA512 dfc6c1017dd1e76196861f0bd7e270736c2e74d55da1e394f7d64d8b1e2d978ad21f273ba4cd5d476d5f7dbe21eb0e3f170017dff97d3c3cca951f3ac68cf6f8 + REF a72b841c91bd421fbb6deb516400b51c06bc596c # 1.9.220 + SHA512 9b7fa80ee155fa3c15e3e86c30b75c6019dc1672df711c4f656133fe005f104e4a30f5a99f1c0a0c6dab42007b5695169cd312bd0938b272c4c7b05765ce3421 PATCHES - fix-config.patch patch-relocatable-rpath.patch fix-aws-root.patch ) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index a1a7850ce5a05f..5f1abf964fabd9 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,8 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.9.160", - "port-version": 1, + "version": "1.9.220", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "supports": "!(windows & arm) & !uwp", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 4db798d38b4ff0..6edd85b84f1108 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fc21526c4465a7e399683055a6df0096cad218e", + "version": "1.9.220", + "port-version": 0 + }, { "git-tree": "e1d4dde6c824e40b0a0dce27f48539dfa4f64eed", "version": "1.9.160", diff --git a/versions/baseline.json b/versions/baseline.json index 2a6213ccd3cbb5..b90059e6f5e5fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -305,8 +305,8 @@ "port-version": 1 }, "aws-sdk-cpp": { - "baseline": "1.9.160", - "port-version": 1 + "baseline": "1.9.220", + "port-version": 0 }, "azmq": { "baseline": "2020-03-03", From fc69905ed0af724de8d93625fc3b6e8d970d8501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 25 Mar 2022 05:00:01 +0800 Subject: [PATCH 047/217] [arb] Support dynamic build (#23743) * [arb] Support dynamic build * version --- ports/arb/portfile.cmake | 2 -- ports/arb/vcpkg.json | 2 ++ versions/a-/arb.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/arb/portfile.cmake b/ports/arb/portfile.cmake index b6c60304b75ffc..62879730adc43d 100644 --- a/ports/arb/portfile.cmake +++ b/ports/arb/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fredrik-johansson/arb diff --git a/ports/arb/vcpkg.json b/ports/arb/vcpkg.json index 66b04428a7d41b..9cfb617f355509 100644 --- a/ports/arb/vcpkg.json +++ b/ports/arb/vcpkg.json @@ -1,8 +1,10 @@ { "name": "arb", "version": "2.21.1", + "port-version": 1, "description": "a C library for arbitrary-precision interval arithmetic", "homepage": "https://github.com/fredrik-johansson/arb", + "license": "LGPL-2.1", "dependencies": [ "flint", { diff --git a/versions/a-/arb.json b/versions/a-/arb.json index d59b40a282688d..f01bc86bd1010a 100644 --- a/versions/a-/arb.json +++ b/versions/a-/arb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1b560a5a2aa835d54da9fdabac5eea48255e93d", + "version": "2.21.1", + "port-version": 1 + }, { "git-tree": "06326497117fb757651649225284d2fe4100ef79", "version": "2.21.1", diff --git a/versions/baseline.json b/versions/baseline.json index b90059e6f5e5fc..38f097f924524f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -122,7 +122,7 @@ }, "arb": { "baseline": "2.21.1", - "port-version": 0 + "port-version": 1 }, "arcus": { "baseline": "4.10.0", From 933d718910a9b4d8ff5a6e1883a667127c72384a Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 24 Mar 2022 14:01:21 -0700 Subject: [PATCH 048/217] [winsparkle] Fix header file and debug path (#23739) * [winsparkle] Fix header file and debug path * update version Co-authored-by: Lily Wang --- ports/winsparkle/portfile.cmake | 18 ++++++++++-------- ports/winsparkle/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/w-/winsparkle.json | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/winsparkle/portfile.cmake b/ports/winsparkle/portfile.cmake index ca90f074323ddf..1c86809a6e9466 100644 --- a/ports/winsparkle/portfile.cmake +++ b/ports/winsparkle/portfile.cmake @@ -9,8 +9,10 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} ) -file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") -file(INSTALL "${SOURCE_PATH}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" FILES_MATCHING PATTERN "*.bat") +file(GLOB HEADER_LIST "${SOURCE_PATH}/include/*.h") +file(INSTALL ${HEADER_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(GLOB TOOLS_LIST "${SOURCE_PATH}/bin/*.bat") +file(INSTALL ${TOOLS_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") # Note: It is an explicit design goal for WinSparkle to be a single @@ -26,18 +28,18 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well - file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") - file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") - file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/lib") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well - file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") - file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/bin") - file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/Debug/lib") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") else() message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() diff --git a/ports/winsparkle/vcpkg.json b/ports/winsparkle/vcpkg.json index f7c289514275ee..b2055e91ac8a21 100644 --- a/ports/winsparkle/vcpkg.json +++ b/ports/winsparkle/vcpkg.json @@ -1,6 +1,7 @@ { "name": "winsparkle", "version": "0.7.0", + "port-version": 1, "description": "WinSparkle is an easy-to-use software update library for Windows developers.", "homepage": "https://winsparkle.org", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 38f097f924524f..6cb226cef3780e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7430,7 +7430,7 @@ }, "winsparkle": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "wintoast": { "baseline": "1.2.0", diff --git a/versions/w-/winsparkle.json b/versions/w-/winsparkle.json index 49297b7f6e97df..b642ca7d94c263 100644 --- a/versions/w-/winsparkle.json +++ b/versions/w-/winsparkle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f1aed9d3a5aac4c967bc6e8be9b8bbe0ce09a76", + "version": "0.7.0", + "port-version": 1 + }, { "git-tree": "0d756f506e6a79a2a79706f9080c05b45e7df882", "version": "0.7.0", From a76eb002a71b6cf7bad343f5e3376dfe6bb83c5c Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 24 Mar 2022 21:03:32 +0000 Subject: [PATCH 049/217] [fontconfig] Do not create symlinks (microsoft#23735) (#23736) * [fontconfig] Do not create symlinks (microsoft#23735) * [fontconfig] Add a license identifier * Regenerate versions file --- ports/fontconfig/no-etc-symlinks.patch | 19 +++++++++++++++++++ ports/fontconfig/portfile.cmake | 2 ++ ports/fontconfig/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/f-/fontconfig.json | 5 +++++ 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 ports/fontconfig/no-etc-symlinks.patch diff --git a/ports/fontconfig/no-etc-symlinks.patch b/ports/fontconfig/no-etc-symlinks.patch new file mode 100644 index 00000000000000..275797d6583fd6 --- /dev/null +++ b/ports/fontconfig/no-etc-symlinks.patch @@ -0,0 +1,19 @@ +--- a/conf.d/link_confs.py 2022-03-24 04:13:59.000982000 +0900 ++++ b/conf.d/link_confs.py 2022-03-24 04:14:46.271964000 +0900 +@@ -4,6 +4,7 @@ + import sys + import argparse + import platform ++import shutil + + if __name__=='__main__': + parser = argparse.ArgumentParser() +@@ -32,7 +33,7 @@ + except FileNotFoundError: + pass + try: +- os.symlink(src, dst) ++ shutil.copyfile(src, dst) + except NotImplementedError: + # Not supported on this version of Windows + break diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 887846569ac269..55c0238fd80c00 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_gitlab( REF ${FONTCONFIG_VERSION} SHA512 815f999146970c7f0e6c15a21f218d4b3f75b26d4ef14d36711bc0a1de19e59cc62d6a2c53993dd38b963ae30820c4db29f103380d5001886d55b6a7df361154 HEAD_REF master + PATCHES + no-etc-symlinks.patch ) vcpkg_find_acquire_program(GPERF) diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 9d260f08db1052..fd4487d6f6eb19 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fontconfig", "version": "2.13.94", - "port-version": 5, + "port-version": 6, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", + "license": "MIT", "dependencies": [ "dirent", "expat", diff --git a/versions/baseline.json b/versions/baseline.json index 6cb226cef3780e..830818f52a56c4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2262,7 +2262,7 @@ }, "fontconfig": { "baseline": "2.13.94", - "port-version": 5 + "port-version": 6 }, "foonathan-memory": { "baseline": "2019-07-21", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index c5d5a8d137b37b..a5d90d2537ac87 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f782f79dc3a2c6834a7e5de4a941b11822067dd", + "version": "2.13.94", + "port-version": 6 + }, { "git-tree": "2f32046747209c234e60dc297b48d5bdc7ee4494", "version": "2.13.94", From c11ee6b3a71a11072e45f4ffb993a85b13684522 Mon Sep 17 00:00:00 2001 From: Thomas Gwynne-Timothy Date: Fri, 25 Mar 2022 15:16:24 -0300 Subject: [PATCH 050/217] [nlohmann-json] Fix usage text (#23749) * [nlohmann-json] Fix usage snippet * [nlohmann-json] Update port version --- ports/nlohmann-json/usage | 2 +- ports/nlohmann-json/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nlohmann-json.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nlohmann-json/usage b/ports/nlohmann-json/usage index 3bbef4e28a0a4b..a078bbd38aed35 100644 --- a/ports/nlohmann-json/usage +++ b/ports/nlohmann-json/usage @@ -5,7 +5,7 @@ The package nlohmann-json provides CMake targets: The package nlohmann-json can be configured to not provide implicit conversions via a custom triplet file: - set(nlohmann_json_JSON_ImplicitConversions OFF) + set(nlohmann-json_IMPLICIT_CONVERSIONS OFF) For more information, see the docs here: diff --git a/ports/nlohmann-json/vcpkg.json b/ports/nlohmann-json/vcpkg.json index b59e5437a583eb..bccb3d74bc6610 100644 --- a/ports/nlohmann-json/vcpkg.json +++ b/ports/nlohmann-json/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nlohmann-json", "version-semver": "3.10.5", - "port-version": 1, + "port-version": 2, "description": "JSON for Modern C++", "homepage": "https://github.com/nlohmann/json", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 830818f52a56c4..5648fb36b5c960 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4814,7 +4814,7 @@ }, "nlohmann-json": { "baseline": "3.10.5", - "port-version": 1 + "port-version": 2 }, "nlopt": { "baseline": "2.7.0", diff --git a/versions/n-/nlohmann-json.json b/versions/n-/nlohmann-json.json index ffd36468b9bc07..2b6fa1d436915a 100644 --- a/versions/n-/nlohmann-json.json +++ b/versions/n-/nlohmann-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "becf6a86f7e28342840fc807840c68b133c6fad8", + "version-semver": "3.10.5", + "port-version": 2 + }, { "git-tree": "fa0a087d0444a7f2c79a44bce91c51550d5f2e47", "version-semver": "3.10.5", From ea5c1a6e5d3bcb0bd629ea10e780a061b530c34f Mon Sep 17 00:00:00 2001 From: Particle_G <38580644+ParticleG@users.noreply.github.com> Date: Sat, 26 Mar 2022 02:18:05 +0800 Subject: [PATCH 051/217] =?UTF-8?q?[cpp-redis]=20Fix=20=E2=80=98sleep=5Ffo?= =?UTF-8?q?r=E2=80=99=20is=20not=20a=20member=20of=20=E2=80=98std::this=5F?= =?UTF-8?q?thread=E2=80=99=20(#23762)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Apply patch: ‘sleep_for’ is not a member of ‘std::this_thread’ * Run with `./vcpkg x-add-version --all` * update version-string * update version * Replace deprecated methods * Add neccesary dependencies Add missing license field according to original repo's license * Run with `./vcpkg x-add-version --all` * Bump port version Run with `./vcpkg x-add-version --all` * update version * delets git-tree * update git tree * update vcpkg.json * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/cpp-redis/fix-sleep_for.patch | 12 ++++++++++++ ports/cpp-redis/portfile.cmake | 7 ++++--- ports/cpp-redis/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 2 +- versions/c-/cpp-redis.json | 5 +++++ 5 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 ports/cpp-redis/fix-sleep_for.patch diff --git a/ports/cpp-redis/fix-sleep_for.patch b/ports/cpp-redis/fix-sleep_for.patch new file mode 100644 index 00000000000000..54bc953f3a9625 --- /dev/null +++ b/ports/cpp-redis/fix-sleep_for.patch @@ -0,0 +1,12 @@ +diff --git a/sources/core/client.cpp b/sources/core/client.cpp +index 7ea20e2..c5d2c40 100644 +--- a/sources/core/client.cpp ++++ b/sources/core/client.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + namespace cpp_redis { + diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake index 033878abff6fe2..f12a5709bee255 100644 --- a/ports/cpp-redis/portfile.cmake +++ b/ports/cpp-redis/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 4.3.1 SHA512 abf372542c53f37f504b3211b840b100d07a8f4b2e7f5584cc7550ab16ed617838e2df79064374c7a409458d8567f4834686318ea3a40249c767e36c744c7a47 HEAD_REF master + PATCHES + "fix-sleep_for.patch" ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/tacopie/CMakeLists.txt DESTINATION ${SOURCE_PATH}/tacopie) @@ -22,14 +24,13 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM set(VCPKG_C_FLAGS_DEBUG "${VCPKG_C_FLAGS_DEBUG} -RTC1") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DMSVC_RUNTIME_LIBRARY_CONFIG=${MSVC_RUNTIME_LIBRARY_CONFIG} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/cpp-redis/vcpkg.json b/ports/cpp-redis/vcpkg.json index e04ec8d84b1224..604bfd19d78a70 100644 --- a/ports/cpp-redis/vcpkg.json +++ b/ports/cpp-redis/vcpkg.json @@ -1,10 +1,19 @@ { "name": "cpp-redis", - "version-string": "4.3.1", - "port-version": 4, + "version": "4.3.1", + "port-version": 5, "description": "cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.", "homepage": "https://github.com/cpp-redis/cpp_redis", + "license": "MIT", "dependencies": [ - "tacopie" + "tacopie", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5648fb36b5c960..d04ca64dca2678 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1562,7 +1562,7 @@ }, "cpp-redis": { "baseline": "4.3.1", - "port-version": 4 + "port-version": 5 }, "cpp-taskflow": { "baseline": "2.6.0", diff --git a/versions/c-/cpp-redis.json b/versions/c-/cpp-redis.json index 866315dc8b6759..e280eaa7f4e2da 100644 --- a/versions/c-/cpp-redis.json +++ b/versions/c-/cpp-redis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9714d8cf0b5557d4362f54f0906295b10a154832", + "version": "4.3.1", + "port-version": 5 + }, { "git-tree": "5ba5958862c17ab2f3943b0134b2ad756ae73613", "version-string": "4.3.1", From e29f8ab7b124d324126a7e9326d22848c8c77c0f Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 25 Mar 2022 20:18:21 +0100 Subject: [PATCH 052/217] [fuzzylite] Fix Linux build (#23658) * [fuzzylite] fix unix build * update version scheme * version * unsupported on UWP * remove from CI baseline * version * fix typo * version * windows only * version * Add fuzzylite:x64-osx * Fix typo * cr * version * Fix string replace on static * version * Don't rename artifacts * version --- ports/fuzzylite/portfile.cmake | 36 ++++++++++++++-------------------- ports/fuzzylite/vcpkg.json | 14 ++++++++++--- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/f-/fuzzylite.json | 5 +++++ 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/ports/fuzzylite/portfile.cmake b/ports/fuzzylite/portfile.cmake index cd79ecc7cdbb07..79ec38f106b12a 100644 --- a/ports/fuzzylite/portfile.cmake +++ b/ports/fuzzylite/portfile.cmake @@ -6,17 +6,11 @@ vcpkg_from_github( HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(FL_BUILD_SHARED ON) - set(FL_BUILD_STATIC OFF) -else() - set(FL_BUILD_SHARED OFF) - set(FL_BUILD_STATIC ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FL_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FL_BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/fuzzylite - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/fuzzylite" OPTIONS -DFL_BUILD_SHARED=${FL_BUILD_SHARED} -DFL_BUILD_STATIC=${FL_BUILD_STATIC} @@ -24,23 +18,23 @@ vcpkg_configure_cmake( -DFL_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fuzzylite-static.lib ${CURRENT_PACKAGES_DIR}/lib/fuzzylite.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-static-debug.lib ${CURRENT_PACKAGES_DIR}/debug/lib/fuzzylite-debug.lib) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h" "#elif defined(FL_IMPORT_LIBRARY)" "#elif 1" ) +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fl/fuzzylite.h" + "#elif defined(FL_IMPORT_LIBRARY)" + "#elif 0" + ) endif() -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) diff --git a/ports/fuzzylite/vcpkg.json b/ports/fuzzylite/vcpkg.json index 2bddccc38c22ce..98bb4ba80c44f7 100644 --- a/ports/fuzzylite/vcpkg.json +++ b/ports/fuzzylite/vcpkg.json @@ -1,7 +1,15 @@ { "name": "fuzzylite", - "version-string": "6.0", - "port-version": 4, + "version": "6.0", + "port-version": 5, "description": "A fuzzy logic control library in C++", - "homepage": "https://github.com/fuzzylite/fuzzylite" + "homepage": "https://github.com/fuzzylite/fuzzylite", + "license": "GPL-3.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 587b21418c3e46..53df3b66d3d731 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -310,10 +310,7 @@ freetype-gl:x64-uwp=fail ftgl:x64-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 functions-framework-cpp:x64-uwp=fail -fuzzylite:arm-uwp=fail -fuzzylite:x64-linux=fail fuzzylite:x64-osx=fail -fuzzylite:x64-uwp=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip diff --git a/versions/baseline.json b/versions/baseline.json index d04ca64dca2678..97e103671f6586 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2358,7 +2358,7 @@ }, "fuzzylite": { "baseline": "6.0", - "port-version": 4 + "port-version": 5 }, "fxdiv": { "baseline": "2021-02-21", diff --git a/versions/f-/fuzzylite.json b/versions/f-/fuzzylite.json index 735d20e80735ed..8741a481eaa282 100644 --- a/versions/f-/fuzzylite.json +++ b/versions/f-/fuzzylite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27926f33e6bab79f1eefa5c7999645f855c5fda3", + "version": "6.0", + "port-version": 5 + }, { "git-tree": "df47396ca528792e73f67bb8f297a064b46ef21b", "version-string": "6.0", From 01c9942610e062d4ec5273e5a01ce5f7646c785b Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 25 Mar 2022 20:52:30 +0100 Subject: [PATCH 053/217] [sciter] escape quotes (#23752) * [sciter] escape quotes * version * update vcpkg.json * update vcpkg.json * update vcpkg.json Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/sciter/portfile.cmake | 2 +- ports/sciter/vcpkg.json | 3 ++- versions/baseline.json | 4 ++-- versions/s-/sciter.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index 8c8fe9f83956b1..781259cb643138 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -6,7 +6,7 @@ Upstream has stopped active development of sciter and instead encourage users to Options for existing users are: 1. Depend upon `sciter-js` and change your code to work with the new library -2. Use `"overrides"` in manifest mode to pin to `"version-string": "4.4.8.3#1"` +2. Use `\"overrides\"` in manifest mode to pin to `\"version-string\": \"4.4.8.3#1\"` 3. Copy the last available `sciter` version into an overlay port (commit 756f1845537a916ba706f6af544b2f490c30fbb1 at subpath `ports/sciter`) 4. Use the community registry `https://github.com/VuYeK/vcpkg-registry` which may have newer versions of `sciter` available (not affiliated with Microsoft) ") diff --git a/ports/sciter/vcpkg.json b/ports/sciter/vcpkg.json index f0af85560ce818..fb5784988b9998 100644 --- a/ports/sciter/vcpkg.json +++ b/ports/sciter/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sciter", - "version-string": "deprecated", + "version": "0", + "port-version": 1, "description": "Sciter is an embeddable HTML/CSS/scripting engine.", "homepage": "https://github.com/c-smile/sciter-sdk" } diff --git a/versions/baseline.json b/versions/baseline.json index 97e103671f6586..63ecfcb6fdc270 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6297,8 +6297,8 @@ "port-version": 0 }, "sciter": { - "baseline": "deprecated", - "port-version": 0 + "baseline": "0", + "port-version": 1 }, "sciter-js": { "baseline": "4.4.8.31", diff --git a/versions/s-/sciter.json b/versions/s-/sciter.json index 2acb342cc50b27..4ace0cff55e007 100644 --- a/versions/s-/sciter.json +++ b/versions/s-/sciter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fac1265134a68da104d27106ec6b409b23ba377", + "version": "0", + "port-version": 1 + }, { "git-tree": "1ff6683a2d398db76e1791b994dc157ffb21e88c", "version-string": "deprecated", From f1080d10e8a0d8617c42db95bd2bda0614b07fcc Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 25 Mar 2022 20:59:36 +0100 Subject: [PATCH 054/217] Fix of Python in vcpkgTools.xml (#23751) --- scripts/vcpkgTools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 6a70c26c2a4b60..c3b5459104fb06 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,7 +1,7 @@ - 3.10.1 + 3.10.2 python.exe https://www.python.org/ftp/python/3.10.2/python-3.10.2-embed-win32.zip d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9 From a95ee822670d42d365d823f6bf9b6700098cf688 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Fri, 25 Mar 2022 13:11:22 -0700 Subject: [PATCH 055/217] [lmdb] don't use msvc parameters with non-msvc compiler (#23653) * don't use msvc parameters with non-msvc compiler * change condition * Update version * add license field * updated the license field * formatted the manifest file. * updated version --- ports/lmdb/cmake/CMakeLists.txt | 3 +-- ports/lmdb/vcpkg.json | 7 ++++--- versions/baseline.json | 2 +- versions/l-/lmdb.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/lmdb/cmake/CMakeLists.txt b/ports/lmdb/cmake/CMakeLists.txt index dfa61785f58665..b7ef12450b748b 100644 --- a/ports/lmdb/cmake/CMakeLists.txt +++ b/ports/lmdb/cmake/CMakeLists.txt @@ -20,8 +20,7 @@ set(LMDB_LIBRARY_INSTALL_DIR lib CACHE PATH "Install directory for library") set(LMDB_RUNTIME_INSTALL_DIR bin CACHE PATH "Install directory for binaries/dlls") set(LMDB_CONFIG_INSTALL_DIR share/lmdb CACHE PATH "Install directory for cmake config files") - -if(BUILD_SHARED_LIBS) +if(MSVC AND BUILD_SHARED_LIBS) set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdbd.def\"") set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/lmdb.def\"") endif() diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json index 011be1311074e1..2c2b59092bb1c5 100644 --- a/ports/lmdb/vcpkg.json +++ b/ports/lmdb/vcpkg.json @@ -1,7 +1,8 @@ { "name": "lmdb", - "version-string": "0.9.24", - "port-version": 1, + "version": "0.9.24", + "port-version": 2, "description": "LMDB is an extraordinarily fast, memory-efficient database", - "homepage": "https://github.com/LMDB/lmdb" + "homepage": "https://github.com/LMDB/lmdb", + "license": null } diff --git a/versions/baseline.json b/versions/baseline.json index 63ecfcb6fdc270..d59cf643f751ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4234,7 +4234,7 @@ }, "lmdb": { "baseline": "0.9.24", - "port-version": 1 + "port-version": 2 }, "lodepng": { "baseline": "2021-12-04", diff --git a/versions/l-/lmdb.json b/versions/l-/lmdb.json index e33bdad9827c25..5166dd8f1e370f 100644 --- a/versions/l-/lmdb.json +++ b/versions/l-/lmdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "022fa44ff8c5ef9ea4b308468259c0775d4a72c1", + "version": "0.9.24", + "port-version": 2 + }, { "git-tree": "f3599ec6a6285945a3eeeac1f9b0db810855ec5a", "version-string": "0.9.24", From 85d85f3873ad9487d907f46bc7bb7815fc952e42 Mon Sep 17 00:00:00 2001 From: Max Khon Date: Sat, 26 Mar 2022 04:47:40 +0700 Subject: [PATCH 056/217] [libmesh] (#22775) - build only opt flavor for release build - build only dbg flavor for debug build - install libmesh examples under tools/libmesh/ --- ports/libmesh/portfile.cmake | 22 +++++++++------------- ports/libmesh/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/l-/libmesh.json | 5 +++++ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ports/libmesh/portfile.cmake b/ports/libmesh/portfile.cmake index 9a16dbf98bf666..b9384dd2847030 100644 --- a/ports/libmesh/portfile.cmake +++ b/ports/libmesh/portfile.cmake @@ -18,27 +18,23 @@ endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${OPTIONS} + OPTIONS_DEBUG --with-methods=dbg + OPTIONS_RELEASE --with-methods=opt ) vcpkg_install_make() if (EXISTS ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool) - file(COPY ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(COPY ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE ${CURRENT_PACKAGES_DIR}/contrib/bin/libtool) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/contrib ${CURRENT_PACKAGES_DIR}/debug/contrib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/contrib) -file(GLOB ${CURRENT_PACKAGES_DIR}/bin LIBMESH_TOOLS) -foreach (LIBMESH_TOOL ${LIBMESH_TOOLS}) - file(COPY ${LIBMESH_TOOL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE ${LIBMESH_TOOL}) -endforeach() - -file(GLOB LIBMESH_TOOLS ${CURRENT_PACKAGES_DIR}/examples/*) -foreach (LIBMESH_TOOL ${LIBMESH_TOOLS}) - file(COPY ${LIBMESH_TOOL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE ${LIBMESH_TOOL}) +file(GLOB LIBMESH_EXAMPLES ${CURRENT_PACKAGES_DIR}/examples/*) +foreach (LIBMESH_EXAMPLE ${LIBMESH_EXAMPLES}) + file(COPY ${LIBMESH_EXAMPLE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) endforeach() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) @@ -47,7 +43,7 @@ endif() # Remove tools and debug include directories file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/contrib ${CURRENT_PACKAGES_DIR}/debug/etc ${CURRENT_PACKAGES_DIR}/debug/examples ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/tools/libmesh/debug ${CURRENT_PACKAGES_DIR}/Make.common ${CURRENT_PACKAGES_DIR}/debug/Make.common) vcpkg_copy_pdbs() diff --git a/ports/libmesh/vcpkg.json b/ports/libmesh/vcpkg.json index 7c4b273f1c3ce3..20ec6ce66395fe 100644 --- a/ports/libmesh/vcpkg.json +++ b/ports/libmesh/vcpkg.json @@ -1,7 +1,8 @@ { "name": "libmesh", "version-string": "1.5.0", - "port-version": 2, + "port-version": 3, "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.", - "homepage": "https://github.com/libMesh/libmesh" + "homepage": "https://github.com/libMesh/libmesh", + "license": "LGPL-2.1-only" } diff --git a/versions/baseline.json b/versions/baseline.json index d59cf643f751ae..8249070f424d3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3726,7 +3726,7 @@ }, "libmesh": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 3 }, "libmicrohttpd": { "baseline": "0.9.75", diff --git a/versions/l-/libmesh.json b/versions/l-/libmesh.json index a8ebbf98af0841..e648680eff1def 100644 --- a/versions/l-/libmesh.json +++ b/versions/l-/libmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8583d8a15a7b694bb7a8346580c5f8a3f7478f28", + "version-string": "1.5.0", + "port-version": 3 + }, { "git-tree": "99d2914d8591e790d8d9e16eeb572b2dfa6776d7", "version-string": "1.5.0", From 0537d52181787db0f1069e49874ebec8ea05204a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 25 Mar 2022 22:56:02 +0100 Subject: [PATCH 057/217] [libvorbis] Fix mingw-dynamic, modernize port (#23761) * Fix mingw-dynamic builds * Modernize portfile * Add explicit usage * Update versions * Drop obsolete PREFER_NINJA * Update versions --- ports/libvorbis/0003-def-mingw-compat.patch | 33 +++++++++++++++++++++ ports/libvorbis/portfile.cmake | 25 +++++++--------- ports/libvorbis/usage | 13 ++++++++ ports/libvorbis/vcpkg.json | 14 +++++++-- versions/baseline.json | 2 +- versions/l-/libvorbis.json | 5 ++++ 6 files changed, 73 insertions(+), 19 deletions(-) create mode 100644 ports/libvorbis/0003-def-mingw-compat.patch create mode 100644 ports/libvorbis/usage diff --git a/ports/libvorbis/0003-def-mingw-compat.patch b/ports/libvorbis/0003-def-mingw-compat.patch new file mode 100644 index 00000000000000..f1622d9823a177 --- /dev/null +++ b/ports/libvorbis/0003-def-mingw-compat.patch @@ -0,0 +1,33 @@ +diff --git a/win32/vorbis.def b/win32/vorbis.def +index 1310b6c..de14385 100644 +--- a/win32/vorbis.def ++++ b/win32/vorbis.def +@@ -1,6 +1,5 @@ + ; vorbis.def + ; +-LIBRARY + EXPORTS + _floor_P + _mapping_P +diff --git a/win32/vorbisenc.def b/win32/vorbisenc.def +index 79af064..40a3e39 100644 +--- a/win32/vorbisenc.def ++++ b/win32/vorbisenc.def +@@ -1,6 +1,5 @@ + ; vorbisenc.def + ; +-LIBRARY + + EXPORTS + vorbis_encode_init +diff --git a/win32/vorbisfile.def b/win32/vorbisfile.def +index 4dc5549..243795d 100644 +--- a/win32/vorbisfile.def ++++ b/win32/vorbisfile.def +@@ -1,6 +1,5 @@ + ; vorbisfile.def + ; +-LIBRARY + EXPORTS + ov_clear + ov_open diff --git a/ports/libvorbis/portfile.cmake b/ports/libvorbis/portfile.cmake index a015e0e8c5e244..95f2825b705e93 100644 --- a/ports/libvorbis/portfile.cmake +++ b/ports/libvorbis/portfile.cmake @@ -7,24 +7,19 @@ vcpkg_from_github( PATCHES 0001-Dont-export-vorbisenc-functions.patch 0002-Fixup-pkgconfig-libs.patch + 0003-def-mingw-compat.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/Vorbis - TARGET_PATH share/Vorbis -) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME Vorbis CONFIG_PATH "lib/cmake/Vorbis") +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${CMAKE_CURRENT_LIST_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/libvorbis/usage b/ports/libvorbis/usage new file mode 100644 index 00000000000000..c20766a90af564 --- /dev/null +++ b/ports/libvorbis/usage @@ -0,0 +1,13 @@ +The package libvorbis provides CMake targets: + + # Vorbis reference encoder and decoder, low-level API + find_package(Vorbis CONFIG REQUIRED) + target_link_libraries(main PRIVATE Vorbis::vorbis) + + # Audio stream decoding and basic manipulation, high-level API + find_package(Vorbis CONFIG REQUIRED) + target_link_libraries(main PRIVATE Vorbis::vorbisfile) + + # Convenience API for setting up an encoding environment + find_package(Vorbis CONFIG REQUIRED) + target_link_libraries(main PRIVATE Vorbis::vorbisenc) diff --git a/ports/libvorbis/vcpkg.json b/ports/libvorbis/vcpkg.json index af19c1851b15c4..65c5edd8546dc0 100644 --- a/ports/libvorbis/vcpkg.json +++ b/ports/libvorbis/vcpkg.json @@ -1,11 +1,19 @@ { "name": "libvorbis", - "version-string": "1.3.7", - "port-version": 1, + "version": "1.3.7", + "port-version": 2, "description": "Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format", "homepage": "https://github.com/xiph/vorbis", "license": "BSD-3-Clause", "dependencies": [ - "libogg" + "libogg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 8249070f424d3f..188af15d1d9322 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4126,7 +4126,7 @@ }, "libvorbis": { "baseline": "1.3.7", - "port-version": 1 + "port-version": 2 }, "libvpx": { "baseline": "1.10.0", diff --git a/versions/l-/libvorbis.json b/versions/l-/libvorbis.json index 03309caf18c533..0df7ea5b3c2eb9 100644 --- a/versions/l-/libvorbis.json +++ b/versions/l-/libvorbis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c4c646a26ce3e6ad63992d3e4a55cb185159b23c", + "version": "1.3.7", + "port-version": 2 + }, { "git-tree": "54dcb5ab354422e9518a905d501ccc22dcb69098", "version-string": "1.3.7", From 9ff4659a075d5f4f30aaca9f7c4e7f059ecc1d6d Mon Sep 17 00:00:00 2001 From: Matt Hughes Date: Sat, 26 Mar 2022 07:57:39 +1000 Subject: [PATCH 058/217] [ebml] fix linux build by including (#23760) * [ebml] fix linux build by including * update version * udpate version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/ebml/include-limits.patch | 24 ++++++++++++++++++++++++ ports/ebml/portfile.cmake | 2 ++ ports/ebml/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/ebml.json | 5 +++++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 ports/ebml/include-limits.patch diff --git a/ports/ebml/include-limits.patch b/ports/ebml/include-limits.patch new file mode 100644 index 00000000000000..3d548edd3b30c3 --- /dev/null +++ b/ports/ebml/include-limits.patch @@ -0,0 +1,24 @@ +diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp +index 27e55fd..4c05fcf 100644 +--- a/src/EbmlString.cpp ++++ b/src/EbmlString.cpp +@@ -34,6 +34,7 @@ + \author Steve Lhomme + */ + #include ++#include + + #include "ebml/EbmlString.h" + +diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp +index 496a16a..99fc073 100644 +--- a/src/EbmlUnicodeString.cpp ++++ b/src/EbmlUnicodeString.cpp +@@ -36,6 +36,7 @@ + */ + + #include ++#include + + #include "ebml/EbmlUnicodeString.h" + diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake index 2a4d232ae9fe72..e92897923bc19f 100644 --- a/ports/ebml/portfile.cmake +++ b/ports/ebml/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF release-1.4.2 SHA512 2A03CA1D82A41EE05CFE4DD2726CC79295FA06A4D8ECEB93FE8F41BDFF09F04897B434B49DD1F496E1C014289B14C3F3416EAB4C8B1E745652FF1AB4A620BF83 HEAD_REF master + PATCHES + include-limits.patch ) vcpkg_cmake_configure( diff --git a/ports/ebml/vcpkg.json b/ports/ebml/vcpkg.json index f90e93d79f9fcb..18e817f2603d44 100644 --- a/ports/ebml/vcpkg.json +++ b/ports/ebml/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ebml", "version": "1.4.2", + "port-version": 1, "description": "A C++ library to parse EBML files", "homepage": "https://github.com/Matroska-Org/libebml", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 188af15d1d9322..71358c249f693a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1990,7 +1990,7 @@ }, "ebml": { "baseline": "1.4.2", - "port-version": 0 + "port-version": 1 }, "ecm": { "baseline": "5.89.0", diff --git a/versions/e-/ebml.json b/versions/e-/ebml.json index 3d935cba33adb8..d6ea50e463bd1b 100644 --- a/versions/e-/ebml.json +++ b/versions/e-/ebml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fc7059101f067e639c84844996c77eaba7908e6", + "version": "1.4.2", + "port-version": 1 + }, { "git-tree": "ba8376ad269930aee17a0890ccbd267639122616", "version": "1.4.2", From 821d0d20d7e2cf81d8a47dfd1d63c986a2763eea Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 28 Mar 2022 11:33:04 -0700 Subject: [PATCH 059/217] [leptonica] Update to 1.82.0 and fix link 'openjp2.lib' failed (#23624) * [leptonica] Fix find openjpeg * update version * update patch * update version * format portfile.cmake * update version * update patch * update version * format portfile.cmake * update version * update to 1.82.0 * update version * update patches * update version * update patches * update version * Revise patching and configuration * Update versions * update patch * update version * update version * update patch * update version Co-authored-by: Lily Wang Co-authored-by: Kai Pastor --- ports/leptonica/find-dependency.patch | 20 ------- ports/leptonica/fix-CMakeDependency.patch | 64 +++++++++++++++++++++++ ports/leptonica/fix-cmakelists.patch | 39 -------------- ports/leptonica/fix-src-cmakelists.patch | 19 ------- ports/leptonica/portfile.cmake | 24 ++++----- ports/leptonica/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/l-/leptonica.json | 5 ++ 8 files changed, 83 insertions(+), 96 deletions(-) delete mode 100644 ports/leptonica/find-dependency.patch create mode 100644 ports/leptonica/fix-CMakeDependency.patch delete mode 100644 ports/leptonica/fix-cmakelists.patch delete mode 100644 ports/leptonica/fix-src-cmakelists.patch diff --git a/ports/leptonica/find-dependency.patch b/ports/leptonica/find-dependency.patch deleted file mode 100644 index 9bae1260937f89..00000000000000 --- a/ports/leptonica/find-dependency.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in -index 342c37d..b358b7b 100644 ---- a/cmake/templates/LeptonicaConfig.cmake.in -+++ b/cmake/templates/LeptonicaConfig.cmake.in -@@ -20,6 +20,15 @@ - # - # =================================================================================== - -+include(CMakeFindDependencyMacro) -+find_dependency(JPEG) -+find_dependency(ZLIB) -+find_dependency(PNG) -+find_dependency(TIFF) -+find_dependency(GIF) -+find_dependency(WebP) -+find_dependency(OpenJPEG) -+ - include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake) - - # ====================================================== diff --git a/ports/leptonica/fix-CMakeDependency.patch b/ports/leptonica/fix-CMakeDependency.patch new file mode 100644 index 00000000000000..9234fbfb391d56 --- /dev/null +++ b/ports/leptonica/fix-CMakeDependency.patch @@ -0,0 +1,64 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d300da..fae4ca7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,8 +66,28 @@ if(NOT SW_BUILD) + find_package(PNG) + find_package(TIFF) + find_package(ZLIB) +- find_package(PkgConfig) +- if (PKG_CONFIG_FOUND) ++ find_package(WEBP NAMES WebP REQUIRED) ++ find_package(JP2K NAMES OpenJPEG REQUIRED) ++ ++ set(GIF_LIBRARIES GIF::GIF) ++ set(JPEG_LIBRARIES JPEG::JPEG) ++ set(PNG_LIBRARIES PNG::PNG) ++ set(TIFF_LIBRARIES TIFF::TIFF) ++ set(ZLIB_LIBRARIES ZLIB::ZLIB) ++ ++ set(JP2K "${JP2K_FOUND}") ++ set(JP2K_INCLUDE_DIRS "") ++ set(HAVE_LIBJP2K 1) ++ set(JP2K_LIBRARIES openjp2) # imported target ++ ++ set(WEBP "${WEBP_FOUND}") ++ set(WEBP_INCLUDE_DIRS "") ++ set(WEBPMUX 1) ++ set(HAVE_LIBWEBP_ANIM 1) ++ set(WEBPMUX_FOUND TRUE) ++ set(WEBP_LIBRARIES WebP::libwebpmux WebP::webp) ++ ++ if (0) + pkg_check_modules(WEBP libwebp QUIET) + pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET) + pkg_check_modules(JP2K libopenjp2>=2.0 QUIET) +diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in +index 342c37d..506fb2a 100644 +--- a/cmake/templates/LeptonicaConfig.cmake.in ++++ b/cmake/templates/LeptonicaConfig.cmake.in +@@ -19,6 +19,14 @@ + # - Leptonica_VERSION_PATCH : Patch version part of Leptonica_VERSION: "@VERSION_PATCH@" + # + # =================================================================================== ++include(CMakeFindDependencyMacro) ++find_dependency(JPEG) ++find_dependency(ZLIB) ++find_dependency(PNG) ++find_dependency(TIFF) ++find_dependency(GIF) ++find_dependency(WebP) ++find_dependency(OpenJPEG) + + include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake) + +@@ -36,7 +44,8 @@ SET(Leptonica_VERSION_PATCH @VERSION_PATCH@) + # ====================================================== + + # Provide the include directories to the caller +-set(Leptonica_INCLUDE_DIRS "@INCLUDE_DIR@") ++get_filename_component(Leptonica_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include" ABSOLUTE) ++list(APPEND Leptonica_INCLUDE_DIRS "${Leptonica_INCLUDE_DIRS}/leptonica") + + # ==================================================================== + # Link libraries: diff --git a/ports/leptonica/fix-cmakelists.patch b/ports/leptonica/fix-cmakelists.patch deleted file mode 100644 index 86063c46355275..00000000000000 --- a/ports/leptonica/fix-cmakelists.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,20 +58,19 @@ if(UNIX) - endif() - - if(NOT SW_BUILD) -- find_package(GIF) -- find_package(JPEG) -- find_package(PNG) -- find_package(TIFF) -- find_package(ZLIB) -+ find_package(GIF REQUIRED) -+ find_package(JPEG REQUIRED) -+ find_package(PNG REQUIRED) -+ find_package(TIFF REQUIRED) -+ find_package(ZLIB REQUIRED) - find_package(PkgConfig) -+ find_package(OpenJPEG REQUIRED) - if (PKG_CONFIG_FOUND) - pkg_check_modules(WEBP libwebp QUIET) - pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET) -- pkg_check_modules(JP2K libopenjp2>=2.0 QUIET) - endif() - if(NOT WEBP) -- find_path(WEBP_INCLUDE_DIR /webp/decode.h) -- find_library(WEBP_LIBRARY NAMES webp) -+ find_package(WebP CONFIG REQUIRED) - if (WEBP_INCLUDE_DIR AND WEBP_LIBRARY) - set(WEBP 1) - set(WEBP_FOUND TRUE) -@@ -213,7 +212,7 @@ include(Configure) - - configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY) - --set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/leptonica") -+set(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include" "\${CMAKE_CURRENT_LIST_DIR}/../../include/leptonica") - - ############################################################################### - # diff --git a/ports/leptonica/fix-src-cmakelists.patch b/ports/leptonica/fix-src-cmakelists.patch deleted file mode 100644 index d31153541c0a5e..00000000000000 --- a/ports/leptonica/fix-src-cmakelists.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -14,7 +14,6 @@ if (MSVC) - set_source_files_properties(${src} PROPERTIES LANGUAGE CXX) - endif() - --string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") - - add_library (leptonica ${src} ${hdr}) - set_target_properties (leptonica PROPERTIES VERSION ${VERSION_PLAIN}) -@@ -52,7 +52,7 @@ if (TIFF_LIBRARIES) - endif() - if (WEBP_FOUND) - target_include_directories (leptonica PUBLIC ${WEBP_INCLUDE_DIRS}) -- target_link_libraries (leptonica ${WEBP_LIBRARIES}) -+ target_link_libraries (leptonica WebP::webp WebP::libwebpmux) - endif() - if (ZLIB_LIBRARIES) - target_include_directories (leptonica PUBLIC ${ZLIB_INCLUDE_DIRS}) diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake index b9fb57b5eea533..94b64a6f3729e9 100644 --- a/ports/leptonica/portfile.cmake +++ b/ports/leptonica/portfile.cmake @@ -1,33 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DanBloomberg/leptonica - REF 2ff4313a85427ceb272540c570106b2f893da097 # 1.81.1 - SHA512 0e35538f1407e7220e68d635e5fd4c82219b58fb4b6ca8132d72892f52853e13451a2a160644a122c47598f77d2e87046cfb072be261be9a941342f476dc6376 + REF f4138265b390f1921b9891d6669674d3157887d8 # 1.82.0 + SHA512 cd8c55454fc2cb4d23c2b3f01870e154766fa5a35c07b79d25c2d85dc2675dcb224d9be8a1cdcb7e9a0bd3c17e90141aa4084f67a311a1c327d7ac2439ba196a HEAD_REF master PATCHES - fix-cmakelists.patch - fix-src-cmakelists.patch - find-dependency.patch + fix-CMakeDependency.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC) - vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSW_BUILD=OFF - -DCPPAN_BUILD=OFF - -DSTATIC=${STATIC} - -DCMAKE_REQUIRED_INCLUDES=${CURRENT_INSTALLED_DIR}/include # for check_include_file() - MAYBE_UNUSED_VARIABLES - STATIC + -DCMAKE_REQUIRE_FIND_PACKAGE_GIF=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_PNG=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_TIFF=TRUE + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=TRUE ) vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/leptonica) vcpkg_copy_pdbs() diff --git a/ports/leptonica/vcpkg.json b/ports/leptonica/vcpkg.json index 7d6bfe4861ab6f..ba9bcaf7ea9f86 100644 --- a/ports/leptonica/vcpkg.json +++ b/ports/leptonica/vcpkg.json @@ -1,9 +1,9 @@ { "name": "leptonica", - "version": "1.81.1", - "port-version": 1, + "version": "1.82.0", "description": "An open source library containing software that is broadly useful for image processing and image analysis applications", "homepage": "https://github.com/DanBloomberg/leptonica", + "license": null, "dependencies": [ "giflib", "libjpeg-turbo", diff --git a/versions/baseline.json b/versions/baseline.json index 71358c249f693a..76f925e07f5a2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3333,8 +3333,8 @@ "port-version": 1 }, "leptonica": { - "baseline": "1.81.1", - "port-version": 1 + "baseline": "1.82.0", + "port-version": 0 }, "lerc": { "baseline": "2.2", diff --git a/versions/l-/leptonica.json b/versions/l-/leptonica.json index 4ee606ff8613af..c0de573652981a 100644 --- a/versions/l-/leptonica.json +++ b/versions/l-/leptonica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d69fc1cdb4cfb42aa1b6e608418f313fbbb3f9ab", + "version": "1.82.0", + "port-version": 0 + }, { "git-tree": "677775654e1914afaf5791361e9de3fac4762edc", "version": "1.81.1", From 3b3bd424827a1f7f4813216f6b32b6c61e386b2e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 28 Mar 2022 20:45:40 +0200 Subject: [PATCH 060/217] [openssl] Don't switch from jom to nmake, fix cflags (#23726) * Don't switch from jom to nmake * Use CFLAGS for build type * Update versions * Fix flags for clang * Update versions --- ports/openssl/unix/CMakeLists.txt | 7 ++++--- ports/openssl/vcpkg.json | 1 + ports/openssl/windows/portfile.cmake | 8 ++++---- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 7bf45e27bb73e0..52bfcfff3c5e0b 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -60,9 +60,10 @@ message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}") message("CMAKE_INCLUDE_SYSTEM_FLAG_C=${CMAKE_INCLUDE_SYSTEM_FLAG_C}") message("CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG=${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}") -set(CFLAGS "${CMAKE_C_FLAGS}") -if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(CFLAGS "-Wno-error=unused-command-line-argument ${CMAKE_C_FLAGS}") +string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE) +set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BUILD_TYPE}}") +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(CFLAGS "${CFLAGS} -Wno-error=unused-command-line-argument") endif() if(CMAKE_C_COMPILER_TARGET AND CMAKE_C_COMPILE_OPTIONS_TARGET) set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_TARGET}${CMAKE_C_COMPILER_TARGET}") diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 22c64c1d9cff38..beb5807743e1ae 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version-string": "1.1.1n", + "port-version": 1, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "OpenSSL", diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index e4469ef3269984..5a0dec0b730ac0 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -76,13 +76,13 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build. make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl) execute_process( - COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE} + COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log ) vcpkg_execute_required_process( - COMMAND nmake -f ${OPENSSL_MAKEFILE} install_sw install_ssldirs + COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} LOGNAME build-${TARGET_TRIPLET}-rel-1) @@ -113,13 +113,13 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Build ${TARGET_TRIPLET}-dbg") make_directory(${SOURCE_PATH_DEBUG}/inc32/openssl) execute_process( - COMMAND "${JOM}" -k -j ${VCPKG_CONCURRENCY} -f "${OPENSSL_MAKEFILE}" + COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log ) vcpkg_execute_required_process( - COMMAND nmake -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs + COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} LOGNAME build-${TARGET_TRIPLET}-dbg-1) diff --git a/versions/baseline.json b/versions/baseline.json index 76f925e07f5a2e..ddbbe52a3f8c6e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5130,7 +5130,7 @@ }, "openssl": { "baseline": "1.1.1n", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 38142e831a1c37..7a4a3ffabb1141 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06b9e0464af9c7c73227ba9f0fa93c77ef62496e", + "version-string": "1.1.1n", + "port-version": 1 + }, { "git-tree": "7e4d802e3bde4154c227c0dd1da75c719be9f07a", "version-string": "1.1.1n", From 5a457b90d62744a5826a2e08771fff6cc384232d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 28 Mar 2022 20:46:02 +0200 Subject: [PATCH 061/217] [nettle] Switch sources on windows away from SMP fork. (#23519) * [gmp] use native buildsystem on windows * fix stuff from merge * fix version * version stuff * trying patching some symbols for dynamic builds * fix nettle build * fix more dependent ports using gmpd * fix uwp builds by copying tools * missing host dep * fix mpfr * version-string nettle * port-version mpfr * version stuff * remove patch from portfile * version stuff * [nettle] use native build system * fix cross build * manifest format * add license * version stuff * version stuff * @Thomas1664's suggestions Co-authored-by: Alexander Neumann Co-authored-by: nicole mazzuca --- ports/nettle/compile.patch | 39 +++ ports/nettle/gmp.patch | 205 ------------ ports/nettle/hogweed-x64.def | 288 ++++++++++++++++ ports/nettle/hogweed-x86.def | 281 ++++++++++++++++ ports/nettle/libname-windows.patch | 67 ++++ ports/nettle/name.dir.patch | 381 --------------------- ports/nettle/nettle-x64.def | 509 +++++++++++++++++++++++++++++ ports/nettle/nettle-x86.def | 496 ++++++++++++++++++++++++++++ ports/nettle/portfile.cmake | 223 ++++++------- ports/nettle/runtime.patch | 168 ---------- ports/nettle/vcpkg.json | 14 +- ports/nettle/yasm.patch | 96 ++++++ versions/baseline.json | 4 +- versions/n-/nettle.json | 5 + 14 files changed, 1893 insertions(+), 883 deletions(-) create mode 100644 ports/nettle/compile.patch delete mode 100644 ports/nettle/gmp.patch create mode 100644 ports/nettle/hogweed-x64.def create mode 100644 ports/nettle/hogweed-x86.def create mode 100644 ports/nettle/libname-windows.patch delete mode 100644 ports/nettle/name.dir.patch create mode 100644 ports/nettle/nettle-x64.def create mode 100644 ports/nettle/nettle-x86.def delete mode 100644 ports/nettle/runtime.patch create mode 100644 ports/nettle/yasm.patch diff --git a/ports/nettle/compile.patch b/ports/nettle/compile.patch new file mode 100644 index 00000000000000..2aa1891c811b74 --- /dev/null +++ b/ports/nettle/compile.patch @@ -0,0 +1,39 @@ +diff --git a/examples/Makefile.in b/examples/Makefile.in +index eb6a81790..1d927079c 100644 +--- a/examples/Makefile.in ++++ b/examples/Makefile.in +@@ -11,7 +11,7 @@ PRE_CPPFLAGS = -I.. -I$(top_srcdir) + PRE_LDFLAGS = -L.. + + OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@ +-BENCH_LIBS = @BENCH_LIBS@ -lm ++BENCH_LIBS = @BENCH_LIBS@ + + HOGWEED_TARGETS = rsa-keygen$(EXEEXT) rsa-sign$(EXEEXT) \ + rsa-verify$(EXEEXT) rsa-encrypt$(EXEEXT) rsa-decrypt$(EXEEXT) \ +diff --git a/streebog.c b/streebog.c +index 7ad619d5e..85609a473 100644 +--- a/streebog.c ++++ b/streebog.c +@@ -1233,7 +1233,7 @@ streebog512_compress (struct streebog512_ctx *ctx, const uint8_t *input, uint64_ + static void + streebog_final (struct streebog512_ctx *ctx) + { +- uint64_t Z[8] = {}; ++ uint64_t Z[8] = {0,0,0,0,0,0,0,0}; + unsigned int i; + + /* PAD. It does not count towards message length */ +diff --git a/Makefile.in b/Makefile.in +index b65ff4960..3887d0c8f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -322,7 +322,7 @@ $(LIBHOGWEED_FORLINK): $(hogweed_OBJS) $(LIBNETTLE_FORLINK) + + # For building the various *data.c programs. -lm needed for shadata. + %$(EXEEXT_FOR_BUILD): %.c +- $(CC_FOR_BUILD) $< $(CFLAGS) -lm -o $@ ++ $(CC_FOR_BUILD) $< $(CFLAGS) -o $@ + + # Explicit dependency. + eccdata$(EXEEXT_FOR_BUILD): mini-gmp.c mini-gmp.h diff --git a/ports/nettle/gmp.patch b/ports/nettle/gmp.patch deleted file mode 100644 index b9eec5e1e64935..00000000000000 --- a/ports/nettle/gmp.patch +++ /dev/null @@ -1,205 +0,0 @@ -diff --git a/SMP/config.h b/SMP/config.h -index e4de0f1..ba41eb4 100644 ---- a/SMP/config.h -+++ b/SMP/config.h -@@ -102,7 +102,7 @@ - #define HAVE_SYS_TYPES_H 1 - - /* Define to 1 if you have the header file. */ --#define HAVE_UNISTD_H 1 -+//#define HAVE_UNISTD_H 1 - - /* Define to 1 if you have the header file. */ - /* #undef HAVE_VALGRIND_MEMCHECK_H */ -diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj -index 476f7a7..308bd0b 100644 ---- a/SMP/libhogweed_winrt.vcxproj -+++ b/SMP/libhogweed_winrt.vcxproj -@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies) -+ nettled_winrt.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettled_winrt.lib;gmpd_winrt.lib;%(AdditionalDependencies) -+ nettled_winrt.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies) -+ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettle_winrt.lib;gmp_winrt.lib;%(AdditionalDependencies) -+ nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj -index 088cb85..cc2cbeb 100644 ---- a/SMP/libnettle.vcxproj -+++ b/SMP/libnettle.vcxproj -@@ -18,7 +18,7 @@ - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmpd.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmpd.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmp.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -586,7 +586,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmp.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -815,7 +815,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- libgmp.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -1043,7 +1043,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- libgmp.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -diff --git a/SMP/libnettle_winrt.vcxproj b/SMP/libnettle_winrt.vcxproj -index cb650ab..188f67a 100644 ---- a/SMP/libnettle_winrt.vcxproj -+++ b/SMP/libnettle_winrt.vcxproj -@@ -18,7 +18,7 @@ - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmpd_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -131,7 +131,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmpd_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -245,7 +245,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- gmpd_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -359,7 +359,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- gmpd_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -472,7 +472,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmp_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -585,7 +585,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4244;4146;4267;4098;%(DisableSpecificWarnings) - - -- libgmp_winrt.lib;%(AdditionalDependencies) -+ %(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -699,7 +699,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- gmp_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -813,7 +813,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- libgmp_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -927,7 +927,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- gmp_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include -@@ -1041,7 +1041,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libnettle.def -- libgmp_winrt.lib;%(AdditionalDependencies) -+ gmp.lib;%(AdditionalDependencies) - - - mkdir "$(OutDir)"\include diff --git a/ports/nettle/hogweed-x64.def b/ports/nettle/hogweed-x64.def new file mode 100644 index 00000000000000..14a8bcad7ea8ed --- /dev/null +++ b/ports/nettle/hogweed-x64.def @@ -0,0 +1,288 @@ +EXPORTS + _nettle_ecc_curve448_modp + _nettle_ecc_curve25519_modp + _nettle_ecc_secp521r1_modp + _nettle_ecc_secp384r1_modp + _nettle_ecc_secp256r1_redc + _nettle_ecc_secp224r1_modp + _nettle_ecc_secp192r1_modp + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify + _nettle_eddsa_verify_itch + _nettle_eddsa_sign + _nettle_eddsa_sign_itch + _nettle_eddsa_public_key + _nettle_eddsa_public_key_itch + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress + _nettle_eddsa_decompress_itch + _nettle_eddsa_compress + _nettle_eddsa_compress_itch + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_clear + nettle_ecc_scalar_get + nettle_ecc_scalar_init + nettle_ecc_scalar_set + nettle_ecc_point_clear + nettle_ecc_point_get + nettle_ecc_point_init + nettle_ecc_point_set + _nettle_ecc_mod_random + nettle_ecc_scalar_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_add + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_sub + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_gmp_alloc + _nettle_gmp_alloc_limbs + _nettle_gmp_free + _nettle_gmp_free_limbs + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpz_limbs_cmp + _nettle_mpz_limbs_copy + _nettle_mpz_limbs_read_n + _nettle_mpz_set_n + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_openssl_private_key_from_der_iterator + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_keypair_from_der + nettle_rsa_private_key_from_der_iterator + nettle_rsa_public_key_from_der_iterator + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_get_bignum + nettle_asn1_der_get_uint32 + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_rsa_keypair_to_openpgp + nettle_pgp_armor + nettle_pgp_crc24 + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_put_length + nettle_pgp_put_mpi + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_string + nettle_pgp_put_sub_packet + nettle_pgp_put_uint16 + nettle_pgp_put_uint32 + nettle_pgp_put_userid + nettle_pgp_sub_packet_end + nettle_pgp_sub_packet_start + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_private_key_clear + nettle_dsa_private_key_init + nettle_dsa_public_key_clear + nettle_dsa_public_key_init + nettle_dsa_params_clear + nettle_dsa_params_init + nettle_dsa_signature_clear + nettle_dsa_signature_init + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_verify + _nettle_rsa_verify_recover + _nettle_rsa_sec_compute_root_tr + nettle_rsa_compute_root_tr + nettle_rsa_compute_root + nettle_rsa_private_key_clear + nettle_rsa_private_key_init + nettle_rsa_private_key_prepare + _nettle_rsa_check_size + nettle_rsa_public_key_clear + nettle_rsa_public_key_init + nettle_rsa_public_key_prepare + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + _nettle_generate_pocklington_prime + nettle_random_prime + nettle_mpz_random + nettle_mpz_random_size + nettle_mpz_get_str_256 + nettle_mpz_init_set_str_256_s + nettle_mpz_init_set_str_256_u + nettle_mpz_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_assoc + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_first + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_next + nettle_sexp_iterator_subexpr diff --git a/ports/nettle/hogweed-x86.def b/ports/nettle/hogweed-x86.def new file mode 100644 index 00000000000000..8824a537c841bb --- /dev/null +++ b/ports/nettle/hogweed-x86.def @@ -0,0 +1,281 @@ +EXPORTS + nettle_ed448_shake256_verify + nettle_ed448_shake256_sign + nettle_ed448_shake256_public_key + _nettle_ed448_shake256 + nettle_ed25519_sha512_verify + nettle_ed25519_sha512_sign + nettle_ed25519_sha512_public_key + _nettle_ed25519_sha512 + _nettle_eddsa_verify + _nettle_eddsa_verify_itch + _nettle_eddsa_sign + _nettle_eddsa_sign_itch + _nettle_eddsa_public_key + _nettle_eddsa_public_key_itch + _nettle_eddsa_hash + _nettle_eddsa_expand_key + _nettle_eddsa_decompress + _nettle_eddsa_decompress_itch + _nettle_eddsa_compress + _nettle_eddsa_compress_itch + _nettle_curve448_eh_to_x + nettle_curve448_mul + nettle_curve448_mul_g + _nettle_curve25519_eh_to_x + nettle_curve25519_mul + nettle_curve25519_mul_g + nettle_gostdsa_vko + nettle_gostdsa_verify + nettle_ecc_gostdsa_verify + nettle_ecc_gostdsa_verify_itch + nettle_gostdsa_sign + nettle_ecc_gostdsa_sign + nettle_ecc_gostdsa_sign_itch + nettle_ecdsa_generate_keypair + nettle_ecdsa_verify + nettle_ecc_ecdsa_verify + nettle_ecc_ecdsa_verify_itch + nettle_ecdsa_sign + nettle_ecc_ecdsa_sign + nettle_ecc_ecdsa_sign_itch + nettle_ecc_point_mul_g + nettle_ecc_point_mul + nettle_ecc_scalar_clear + nettle_ecc_scalar_get + nettle_ecc_scalar_init + nettle_ecc_scalar_set + nettle_ecc_point_clear + nettle_ecc_point_get + nettle_ecc_point_init + nettle_ecc_point_set + _nettle_ecc_mod_random + nettle_ecc_scalar_random + _nettle_ecc_hash + _nettle_gost_hash + _nettle_ecc_mul_a + _nettle_ecc_mul_g + _nettle_ecc_mul_m + _nettle_ecc_mul_a_eh + _nettle_ecc_mul_g_eh + _nettle_ecc_add_thh + _nettle_ecc_add_th + _nettle_ecc_dup_th + _nettle_ecc_add_ehh + _nettle_ecc_add_eh + _nettle_ecc_dup_eh + _nettle_ecc_eh_to_a + _nettle_ecc_add_jjj + _nettle_ecc_add_jja + _nettle_ecc_dup_jj + _nettle_ecc_a_to_j + _nettle_ecc_j_to_a + nettle_ecc_bit_size + nettle_ecc_size + nettle_ecc_size_a + nettle_ecc_size_j + _nettle_secp_521r1 + nettle_get_secp_521r1 + _nettle_secp_384r1 + nettle_get_secp_384r1 + _nettle_secp_256r1 + nettle_get_secp_256r1 + _nettle_secp_224r1 + nettle_get_secp_224r1 + _nettle_secp_192r1 + nettle_get_secp_192r1 + _nettle_gost_gc512a + nettle_get_gost_gc512a + _nettle_gost_gc256b + nettle_get_gost_gc256b + _nettle_curve448 + _nettle_curve25519 + _nettle_ecc_pm1_redc + _nettle_ecc_pp1_redc + _nettle_ecc_mod_add + _nettle_ecc_mod_addmul_1 + _nettle_ecc_mod_mul + _nettle_ecc_mod_mul_1 + _nettle_ecc_mod_mul_canonical + _nettle_ecc_mod_pow_2k + _nettle_ecc_mod_pow_2k_mul + _nettle_ecc_mod_sqr + _nettle_ecc_mod_sqr_canonical + _nettle_ecc_mod_sub + _nettle_ecc_mod_submul_1 + _nettle_ecc_mod_inv + _nettle_ecc_mod + _nettle_cnd_copy + _nettle_gmp_alloc + _nettle_gmp_alloc_limbs + _nettle_gmp_free + _nettle_gmp_free_limbs + _nettle_mpn_get_base256 + _nettle_mpn_get_base256_le + _nettle_mpn_set_base256 + _nettle_mpn_set_base256_le + _nettle_mpz_limbs_cmp + _nettle_mpz_limbs_copy + _nettle_mpz_limbs_read_n + _nettle_mpz_set_n + _nettle_sec_tabselect + _nettle_sec_sub_1 + _nettle_sec_add_1 + nettle_dsa_openssl_private_key_from_der_iterator + nettle_dsa_params_from_der_iterator + nettle_dsa_public_key_from_der_iterator + nettle_openssl_provate_key_from_der + nettle_rsa_keypair_from_der + nettle_rsa_private_key_from_der_iterator + nettle_rsa_public_key_from_der_iterator + nettle_asn1_der_decode_bitstring + nettle_asn1_der_decode_bitstring_last + nettle_asn1_der_decode_constructed + nettle_asn1_der_decode_constructed_last + nettle_asn1_der_get_bignum + nettle_asn1_der_get_uint32 + nettle_asn1_der_iterator_first + nettle_asn1_der_iterator_next + nettle_rsa_keypair_to_openpgp + nettle_pgp_armor + nettle_pgp_crc24 + nettle_pgp_put_header + nettle_pgp_put_header_length + nettle_pgp_put_length + nettle_pgp_put_mpi + nettle_pgp_put_public_rsa_key + nettle_pgp_put_rsa_sha1_signature + nettle_pgp_put_string + nettle_pgp_put_sub_packet + nettle_pgp_put_uint16 + nettle_pgp_put_uint32 + nettle_pgp_put_userid + nettle_pgp_sub_packet_end + nettle_pgp_sub_packet_start + nettle_dsa_keypair_from_sexp_alist + nettle_dsa_sha1_keypair_from_sexp + nettle_dsa_sha256_keypair_from_sexp + nettle_dsa_signature_from_sexp + nettle_dsa_keypair_to_sexp + nettle_dsa_sha256_verify + nettle_dsa_sha256_verify_digest + nettle_dsa_sha256_sign + nettle_dsa_sha256_sign_digest + nettle_dsa_sha1_verify + nettle_dsa_sha1_verify_digest + nettle_dsa_sha1_sign + nettle_dsa_sha1_sign_digest + _nettle_dsa_hash + nettle_dsa_generate_keypair + nettle_dsa_verify + nettle_dsa_sign + nettle_dsa_generate_params + nettle_dsa_compat_generate_keypair + nettle_dsa_private_key_clear + nettle_dsa_private_key_init + nettle_dsa_public_key_clear + nettle_dsa_public_key_init + nettle_dsa_params_clear + nettle_dsa_params_init + nettle_dsa_signature_clear + nettle_dsa_signature_init + nettle_rsa_keypair_from_sexp + nettle_rsa_keypair_from_sexp_alist + nettle_rsa_keypair_to_sexp + _nettle_rsa_blind + _nettle_rsa_unblind + nettle_rsa_generate_keypair + nettle_rsa_decrypt_tr + nettle_rsa_sec_decrypt + nettle_rsa_decrypt + nettle_rsa_encrypt + nettle_rsa_pss_sha384_verify_digest + nettle_rsa_pss_sha512_verify_digest + nettle_rsa_pss_sha384_sign_digest_tr + nettle_rsa_pss_sha512_sign_digest_tr + nettle_rsa_pss_sha256_verify_digest + nettle_rsa_pss_sha256_sign_digest_tr + nettle_rsa_sha512_verify + nettle_rsa_sha512_verify_digest + nettle_rsa_sha512_sign_digest_tr + nettle_rsa_sha512_sign_tr + nettle_rsa_sha512_sign + nettle_rsa_sha512_sign_digest + nettle_rsa_sha256_verify + nettle_rsa_sha256_verify_digest + nettle_rsa_sha256_sign_digest_tr + nettle_rsa_sha256_sign_tr + nettle_rsa_sha256_sign + nettle_rsa_sha256_sign_digest + nettle_rsa_sha1_verify + nettle_rsa_sha1_verify_digest + nettle_rsa_sha1_sign_digest_tr + nettle_rsa_sha1_sign_tr + nettle_rsa_sha1_sign + nettle_rsa_sha1_sign_digest + nettle_rsa_md5_verify + nettle_rsa_md5_verify_digest + nettle_rsa_md5_sign_digest_tr + nettle_rsa_md5_sign_tr + nettle_rsa_md5_sign + nettle_rsa_md5_sign_digest + nettle_rsa_pkcs1_verify + nettle_rsa_pkcs1_sign_tr + nettle_rsa_pkcs1_sign + _nettle_rsa_sec_compute_root + _nettle_rsa_sec_compute_root_itch + _nettle_rsa_verify + _nettle_rsa_verify_recover + _nettle_rsa_sec_compute_root_tr + nettle_rsa_compute_root_tr + nettle_rsa_compute_root + nettle_rsa_private_key_clear + nettle_rsa_private_key_init + nettle_rsa_private_key_prepare + _nettle_rsa_check_size + nettle_rsa_public_key_clear + nettle_rsa_public_key_init + nettle_rsa_public_key_prepare + nettle_pss_mgf1 + nettle_pss_encode_mgf1 + nettle_pss_verify_mgf1 + nettle_pkcs1_rsa_sha512_encode + nettle_pkcs1_rsa_sha512_encode_digest + nettle_pkcs1_rsa_sha256_encode + nettle_pkcs1_rsa_sha256_encode_digest + nettle_pkcs1_rsa_sha1_encode + nettle_pkcs1_rsa_sha1_encode_digest + nettle_pkcs1_rsa_md5_encode + nettle_pkcs1_rsa_md5_encode_digest + nettle_pkcs1_rsa_digest_encode + _nettle_pkcs1_sec_decrypt + _nettle_pkcs1_sec_decrypt_variable + nettle_pkcs1_decrypt + nettle_pkcs1_encrypt + _nettle_pkcs1_signature_prefix + nettle_mpz_set_sexp + _nettle_generate_pocklington_prime + nettle_random_prime + nettle_mpz_random + nettle_mpz_random_size + nettle_mpz_get_str_256 + nettle_mpz_init_set_str_256_s + nettle_mpz_init_set_str_256_u + nettle_mpz_set_str_256_s + nettle_mpz_set_str_256_u + nettle_mpz_sizeinbase_256_s + nettle_mpz_sizeinbase_256_u + nettle_sexp_transport_format + nettle_sexp_transport_vformat + nettle_sexp_transport_iterator_first + nettle_sexp_format + nettle_sexp_vformat + nettle_sexp_iterator_assoc + nettle_sexp_iterator_check_type + nettle_sexp_iterator_check_types + nettle_sexp_iterator_enter_list + nettle_sexp_iterator_exit_list + nettle_sexp_iterator_first + nettle_sexp_iterator_get_uint32 + nettle_sexp_iterator_next + nettle_sexp_iterator_subexpr diff --git a/ports/nettle/libname-windows.patch b/ports/nettle/libname-windows.patch new file mode 100644 index 00000000000000..6a4e38cf4b4194 --- /dev/null +++ b/ports/nettle/libname-windows.patch @@ -0,0 +1,67 @@ +diff --git a/Makefile.in b/Makefile.in +index b65ff4960..3887d0c8f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,7 +27,7 @@ PRE_CPPFLAGS = -I. + EXTRA_CFLAGS = $(CCPIC) + + # FIXME: Add configuration of LIBEXT? +-LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a ++LIBTARGETS = @IF_STATIC@ $(LIBNETTLE_FILE) @IF_HOGWEED@ $(LIBHOGWEED_FILE) + SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) + + getopt_SOURCES = getopt.c getopt1.c +@@ -277,13 +277,13 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) \ + hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \ + $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT) + +-libnettle.a: $(nettle_OBJS) ++$(LIBNETTLE_FILE): $(nettle_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(nettle_OBJS) + $(RANLIB) $@ + echo nettle > libnettle.stamp + +-libhogweed.a: $(hogweed_OBJS) ++$(LIBHOGWEED_FILE): $(hogweed_OBJS) + -rm -f $@ + $(AR) $(ARFLAGS) $@ $(hogweed_OBJS) + $(RANLIB) $@ +diff --git a/configure.ac b/configure.ac +index e95f1c825..1d7ef36bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -662,8 +665,8 @@ case "$host_os" in + # linking to the DLL, is installed into the lib dir. + case "$host_os" in + mingw32*) +- LIBNETTLE_FORLINK='libnettle-$(LIBNETTLE_MAJOR).dll' +- LIBHOGWEED_FORLINK='libhogweed-$(LIBHOGWEED_MAJOR).dll' ++ LIBNETTLE_FORLINK='nettle-$(LIBNETTLE_MAJOR).dll' ++ LIBHOGWEED_FORLINK='hogweed-$(LIBHOGWEED_MAJOR).dll' + ;; + cygwin*) + LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR).dll' +@@ -684,16 +687,16 @@ case "$host_os" in + W64_ABI=yes + fi + LIBNETTLE_SONAME='' +- LIBNETTLE_FILE='libnettle.dll.a' ++ LIBNETTLE_FILE='nettle.lib' + LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)' +- LIBNETTLE_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBNETTLE_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive' ++ LIBNETTLE_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBNETTLE_FILE) -Wl,-DEF:nettle.def' +- LIBNETTLE_LIBS='-Wl,--no-whole-archive $(LIBS)' ++ LIBNETTLE_LIBS='$(LIBS)' + + LIBHOGWEED_SONAME='' +- LIBHOGWEED_FILE='libhogweed.dll.a' ++ LIBHOGWEED_FILE='hogweed.lib' + LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FILE)' +- LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBHOGWEED_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive' ++ LIBHOGWEED_LINK='$(CC) $(CPPFLAGS) -Wl,$(LDFLAGS) -Wl,-DLL -Wl,-IMPLIB:$(LIBHOGWEED_FILE) -Wl,-DEF:hogweed.def' +- LIBHOGWEED_LIBS='-Wl,--no-whole-archive $(LIBS) libnettle.dll.a' ++ LIBHOGWEED_LIBS='$(LIBS) $(LIBNETTLE_FILE)' + IF_DLL='' + ;; + darwin*) diff --git a/ports/nettle/name.dir.patch b/ports/nettle/name.dir.patch deleted file mode 100644 index ff1ce206afd115..00000000000000 --- a/ports/nettle/name.dir.patch +++ /dev/null @@ -1,381 +0,0 @@ -diff --git a/SMP/libhogweed.vcxproj b/SMP/libhogweed.vcxproj -index 976d9fc..5fd42ba 100644 ---- a/SMP/libhogweed.vcxproj -+++ b/SMP/libhogweed.vcxproj -@@ -18,7 +18,7 @@ - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettled.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettled.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettle.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettle.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- libnettle.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- libnettle.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -diff --git a/SMP/libhogweed_winrt.vcxproj b/SMP/libhogweed_winrt.vcxproj -index 308bd0b..a436c69 100644 ---- a/SMP/libhogweed_winrt.vcxproj -+++ b/SMP/libhogweed_winrt.vcxproj -@@ -18,7 +18,7 @@ - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettled_winrt.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -132,7 +132,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettled_winrt.lib;%(AdditionalDependencies) -+ nettled.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -247,7 +247,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettled_winrt.lib;gmp.lib;%(AdditionalDependencies) -+ nettled.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -362,7 +362,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettled_winrt.lib;gmp.lib;%(AdditionalDependencies) -+ nettled.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -476,7 +476,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettle_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -590,7 +590,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - 4146;4267;4028;4244;%(DisableSpecificWarnings) - - -- libnettle_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -705,7 +705,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -820,7 +820,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- libnettle_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -935,7 +935,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- nettle_winrt.lib;gmp.lib;%(AdditionalDependencies) -+ nettle.lib;gmp.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -@@ -1050,7 +1050,7 @@ del /f /q $(OutDir)\licenses\nettle.txt - - - libhogweed.def -- libnettle_winrt.lib;%(AdditionalDependencies) -+ nettle.lib;%(AdditionalDependencies) - /IGNORE:4006,4221,4078 %(AdditionalOptions) - - -diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props -index 487099d..1eade47 100644 ---- a/SMP/smp_deps.props -+++ b/SMP/smp_deps.props -@@ -104,16 +104,16 @@ - - - -- lib$(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -121,7 +121,7 @@ - - - $(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -129,23 +129,23 @@ - - - $(RootNamespace)d -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -153,7 +153,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -161,7 +161,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -169,7 +169,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -@@ -177,7 +177,7 @@ - - - $(RootNamespace) -- $(ProjectDir)..\..\..\msvc\ -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props -index d44408a..b44482c 100644 ---- a/SMP/smp_winrt_deps.props -+++ b/SMP/smp_winrt_deps.props -@@ -115,80 +115,80 @@ - - - -- lib$(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)d_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace)d -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- lib$(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean - MSB8012 - - -- $(RootNamespace)_winrt -- $(ProjectDir)..\..\..\msvc\ -+ $(RootNamespace) -+ $(ProjectDir)..\msvc\ - $(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\ - $(ProjectDir)obj\Generated - Clean -diff --git a/hogweed.pc.in b/hogweed.pc.in -index 97fb9d4..ce977c0 100644 ---- a/hogweed.pc.in -+++ b/hogweed.pc.in -@@ -13,7 +13,7 @@ URL: http://www.lysator.liu.se/~nisse/nettle - Version: @PACKAGE_VERSION@ - Requires: @IF_NOT_SHARED@ nettle - Requires.private: @IF_SHARED@ nettle --Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@ -+Libs: -L${libdir} @HOGWEED@ @IF_NOT_SHARED@ @LIBS@ - Libs.private: @IF_SHARED@ @LIBS@ - Cflags: -I${includedir} - -diff --git a/nettle.pc.in b/nettle.pc.in -index eb0020c..6e3ed1e 100644 ---- a/nettle.pc.in -+++ b/nettle.pc.in -@@ -7,5 +7,6 @@ Name: Nettle - Description: Nettle low-level cryptographic library (symmetric algorithms) - URL: http://www.lysator.liu.se/~nisse/nettle - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lnettle -+Requires.private: gmp -+Libs: -L${libdir} @LIBS@ - Cflags: -I${includedir} diff --git a/ports/nettle/nettle-x64.def b/ports/nettle/nettle-x64.def new file mode 100644 index 00000000000000..e202f46fb5fc57 --- /dev/null +++ b/ports/nettle/nettle-x64.def @@ -0,0 +1,509 @@ +EXPORTS + _nettle_sha256_compress_sha_ni + _nettle_sha1_compress_sha_ni + _nettle_salsa20_2core + _nettle_memxor_sse2 + _nettle_aes_decrypt_aesni + _nettle_aes_encrypt_aesni + _nettle_cpuid + _nettle_gcm_hash8 + _nettle_aes_decrypt + _nettle_aes_encrypt + _nettle_sha256_compress + nettle_memxor + nettle_sha1_compress + nettle_xts_aes256_decrypt_message + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes128_decrypt_message + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_set_encrypt_key + nettle_xts_decrypt_message + nettle_xts_encrypt_message + nettle_yarrow_key_event_estimate + nettle_yarrow_key_event_init + nettle_yarrow256_fast_reseed + nettle_yarrow256_init + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_random + nettle_yarrow256_seed + nettle_yarrow256_slow_reseed + nettle_yarrow256_update + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_digest + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac96_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac64_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac32_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3 + _nettle_umac_l3_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_l2_init + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_decrypt + nettle_twofish_encrypt + nettle_twofish_set_key + nettle_streebog256 + nettle_streebog512 + nettle_streebog256_digest + nettle_streebog256_init + nettle_streebog512_digest + nettle_streebog512_init + nettle_streebog512_update + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_serpent_set_key + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_digest + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_384 + nettle_sha3_384_digest + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_256 + nettle_sha3_256_digest + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_224 + nettle_sha3_224_digest + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_permute + _nettle_sha3_pad + _nettle_sha3_update + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha384_digest + nettle_sha384_init + nettle_sha512_224_digest + nettle_sha512_224_init + nettle_sha512_256_digest + nettle_sha512_256_init + nettle_sha512_digest + nettle_sha512_init + nettle_sha512_update + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress_x86_64 + nettle_sha224_digest + nettle_sha224_init + nettle_sha256_digest + nettle_sha256_init + nettle_sha256_update + nettle_sha1 + _nettle_sha1_compress_x86_64 + nettle_sha1_digest + nettle_sha1_init + nettle_sha1_update + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_digest + nettle_ripemd160_init + nettle_ripemd160_update + nettle_realloc + nettle_xrealloc + _nettle_poly1305_block + _nettle_poly1305_digest + _nettle_poly1305_set_key + nettle_poly1305_aes_digest + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + _nettle_memxor_x86_64 + nettle_memeql_sec + nettle_md5 + nettle_MD5Final + nettle_MD5Init + nettle_MD5Update + nettle_md5_compress + nettle_md5_digest + nettle_md5_init + nettle_md5_update + nettle_md4 + nettle_md4_digest + nettle_md4_init + nettle_md4_update + nettle_md2 + nettle_md2_digest + nettle_md2_init + nettle_md2_update + nettle_hkdf_expand + nettle_hkdf_extract + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_init + nettle_knuth_lfib_random + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_streebog256_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog512_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_sha512_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha384_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha256_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha224_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha1_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_ripemd160_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_md5_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_digest + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94cp_digest + nettle_gosthash94cp_update + _nettle_gost28147_encrypt_block + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_param_test_3411 + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_digest + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_aes256_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes128_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac64_digest + nettle_cmac64_init + nettle_cmac64_set_key + nettle_cmac64_update + nettle_cmac128_digest + nettle_cmac128_init + nettle_cmac128_set_key + nettle_cmac128_update + nettle_gcm_camellia256 + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_update + nettle_gcm_camellia128 + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_update + nettle_gcm_aes256 + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes192 + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes128 + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_aes_encrypt + nettle_gcm_aes_set_iv + nettle_gcm_aes_set_key + nettle_gcm_aes_update + nettle_gcm_decrypt + nettle_gcm_digest + nettle_gcm_encrypt + nettle_gcm_set_iv + nettle_gcm_set_key + nettle_gcm_update + nettle_eax_aes128 + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_aes128_encrypt + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_decrypt + nettle_eax_digest + nettle_eax_encrypt + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_des3_decrypt + nettle_des3_encrypt + nettle_des3_set_key + nettle_des_check_parity + nettle_des_decrypt + nettle_des_encrypt + nettle_des_fix_parity + nettle_des_set_key + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_decrypt_message + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_set_key + nettle_cfb8_decrypt + nettle_cfb8_encrypt + nettle_cfb_decrypt + nettle_cfb_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_decrypt_message + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_decrypt + nettle_ccm_decrypt_message + nettle_ccm_digest + nettle_ccm_encrypt + nettle_ccm_encrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_cbc_decrypt + nettle_cbc_encrypt + nettle_cast128 + nettle_cast128_decrypt + nettle_cast128_encrypt + nettle_cast128_set_key + nettle_cast5_set_key + nettle_camellia256 + nettle_camellia192_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia256_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia192_set_encrypt_key + nettle_camellia256_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia128_invert_key + nettle_camellia_set_decrypt_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_clear + nettle_buffer_copy + nettle_buffer_grow + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_reset + nettle_buffer_space + nettle_buffer_write + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_final + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_encode_final + nettle_base64_encode_group + nettle_base64_encode_init + nettle_base64_encode_raw + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base16 + nettle_base16_decode_final + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_encround + _nettle_blowfish_initial_ctx + nettle_blowfish128_set_key + nettle_blowfish_decrypt + nettle_blowfish_encrypt + nettle_blowfish_set_key + nettle_arctwo128 + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo_gutmann128 + nettle_arctwo128_set_key + nettle_arctwo128_set_key_gutmann + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo_decrypt + nettle_arctwo_encrypt + nettle_arctwo_set_key + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key_gutmann + nettle_arcfour_crypt + nettle_arcfour128_set_key + nettle_arcfour_set_key + nettle_aes256 + nettle_aes256_invert_key + nettle_aes256_set_decrypt_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_invert_key + nettle_aes192_set_decrypt_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_invert_key + nettle_aes128_set_decrypt_key + nettle_aes128_set_encrypt_key + nettle_aes_invert_key + nettle_aes_set_decrypt_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + _nettle_aes_encrypt_table + nettle_aes128_encrypt + nettle_aes192_encrypt + nettle_aes256_encrypt + nettle_aes_encrypt + _nettle_aes_encrypt_x86_64 + nettle_aes128_decrypt + nettle_aes192_decrypt + nettle_aes256_decrypt + nettle_aes_decrypt + _nettle_aes_decrypt_x86_64 diff --git a/ports/nettle/nettle-x86.def b/ports/nettle/nettle-x86.def new file mode 100644 index 00000000000000..213449531518ce --- /dev/null +++ b/ports/nettle/nettle-x86.def @@ -0,0 +1,496 @@ +EXPORTS + nettle_xts_aes256_decrypt_message + nettle_xts_aes256_encrypt_message + nettle_xts_aes256_set_decrypt_key + nettle_xts_aes256_set_encrypt_key + nettle_xts_aes128_decrypt_message + nettle_xts_aes128_encrypt_message + nettle_xts_aes128_set_decrypt_key + nettle_xts_aes128_set_encrypt_key + nettle_xts_decrypt_message + nettle_xts_encrypt_message + nettle_yarrow_key_event_estimate + nettle_yarrow_key_event_init + nettle_yarrow256_fast_reseed + nettle_yarrow256_init + nettle_yarrow256_is_seeded + nettle_yarrow256_needed_sources + nettle_yarrow256_random + nettle_yarrow256_seed + nettle_yarrow256_slow_reseed + nettle_yarrow256_update + _nettle_write_le64 + _nettle_write_le32 + _nettle_write_be32 + nettle_version_major + nettle_version_minor + nettle_umac128_digest + nettle_umac128_set_key + nettle_umac128_set_nonce + nettle_umac128_update + nettle_umac96_digest + nettle_umac96_set_key + nettle_umac96_set_nonce + nettle_umac96_update + nettle_umac64_digest + nettle_umac64_set_key + nettle_umac64_set_nonce + nettle_umac64_update + nettle_umac32_digest + nettle_umac32_set_key + nettle_umac32_set_nonce + nettle_umac32_update + _nettle_umac_set_key + _nettle_umac_poly128 + _nettle_umac_poly64 + _nettle_umac_l3 + _nettle_umac_l3_init + _nettle_umac_l2 + _nettle_umac_l2_final + _nettle_umac_l2_init + _nettle_umac_nh_n + _nettle_umac_nh + nettle_twofish128 + nettle_twofish192 + nettle_twofish256 + nettle_twofish128_set_key + nettle_twofish192_set_key + nettle_twofish256_set_key + nettle_twofish_decrypt + nettle_twofish_encrypt + nettle_twofish_set_key + nettle_streebog256 + nettle_streebog512 + nettle_streebog256_digest + nettle_streebog256_init + nettle_streebog512_digest + nettle_streebog512_init + nettle_streebog512_update + nettle_serpent128 + nettle_serpent192 + nettle_serpent256 + nettle_serpent_decrypt + nettle_serpent_encrypt + nettle_serpent128_set_key + nettle_serpent192_set_key + nettle_serpent256_set_key + nettle_serpent_set_key + nettle_sha3_256_shake + nettle_sha3_512 + nettle_sha3_512_digest + nettle_sha3_512_init + nettle_sha3_512_update + nettle_sha3_384 + nettle_sha3_384_digest + nettle_sha3_384_init + nettle_sha3_384_update + nettle_sha3_256 + nettle_sha3_256_digest + nettle_sha3_256_init + nettle_sha3_256_update + nettle_sha3_224 + nettle_sha3_224_digest + nettle_sha3_224_init + nettle_sha3_224_update + nettle_sha3_permute + _nettle_sha3_pad + _nettle_sha3_update + nettle_sha512_256 + nettle_sha512_224 + nettle_sha512 + nettle_sha384 + _nettle_sha512_compress + nettle_sha384_digest + nettle_sha384_init + nettle_sha512_224_digest + nettle_sha512_224_init + nettle_sha512_256_digest + nettle_sha512_256_init + nettle_sha512_digest + nettle_sha512_init + nettle_sha512_update + nettle_sha256 + nettle_sha224 + _nettle_sha256_compress + nettle_sha224_digest + nettle_sha224_init + nettle_sha256_digest + nettle_sha256_init + nettle_sha256_update + nettle_sha1 + nettle_sha1_compress + nettle_sha1_digest + nettle_sha1_init + nettle_sha1_update + nettle_salsa20_256_set_key + nettle_salsa20_128_set_key + nettle_salsa20_set_nonce + nettle_salsa20_set_key + nettle_salsa20r12_crypt + nettle_salsa20_crypt + _nettle_salsa20_crypt + _nettle_salsa20_core + nettle_ripemd160 + _nettle_ripemd160_compress + nettle_ripemd160_digest + nettle_ripemd160_init + nettle_ripemd160_update + nettle_realloc + nettle_xrealloc + _nettle_poly1305_block + _nettle_poly1305_digest + _nettle_poly1305_set_key + nettle_poly1305_aes_digest + nettle_poly1305_aes_set_key + nettle_poly1305_aes_set_nonce + nettle_poly1305_aes_update + nettle_pbkdf2_hmac_sha512 + nettle_pbkdf2_hmac_sha384 + nettle_pbkdf2_hmac_sha256 + nettle_pbkdf2_hmac_sha1 + nettle_pbkdf2_hmac_gosthash94cp + nettle_pbkdf2 + _nettle_macs + nettle_get_macs + _nettle_hashes + nettle_get_hashes + _nettle_ciphers + nettle_get_ciphers + _nettle_armors + nettle_get_armors + _nettle_aeads + nettle_get_aeads + nettle_lookup_hash + nettle_memxor3 + nettle_memxor + nettle_memeql_sec + nettle_md5 + nettle_MD5Final + nettle_MD5Init + nettle_MD5Update + nettle_md5_compress + nettle_md5_digest + nettle_md5_init + nettle_md5_update + nettle_md4 + nettle_md4_digest + nettle_md4_init + nettle_md4_update + nettle_md2 + nettle_md2_digest + nettle_md2_init + nettle_md2_update + nettle_hkdf_expand + nettle_hkdf_extract + nettle_knuth_lfib_get + nettle_knuth_lfib_get_array + nettle_knuth_lfib_init + nettle_knuth_lfib_random + nettle_hmac_streebog256 + nettle_hmac_streebog512 + nettle_hmac_sha512 + nettle_hmac_sha384 + nettle_hmac_sha256 + nettle_hmac_sha224 + nettle_hmac_sha1 + nettle_hmac_ripemd160 + nettle_hmac_md5 + nettle_hmac_streebog256_digest + nettle_hmac_streebog256_set_key + nettle_hmac_streebog512_digest + nettle_hmac_streebog512_set_key + nettle_hmac_streebog512_update + nettle_hmac_sha512_digest + nettle_hmac_sha512_set_key + nettle_hmac_sha512_update + nettle_hmac_sha384_digest + nettle_hmac_sha384_set_key + nettle_hmac_sha256_digest + nettle_hmac_sha256_set_key + nettle_hmac_sha256_update + nettle_hmac_sha224_digest + nettle_hmac_sha224_set_key + nettle_hmac_sha1_digest + nettle_hmac_sha1_set_key + nettle_hmac_sha1_update + nettle_hmac_ripemd160_digest + nettle_hmac_ripemd160_set_key + nettle_hmac_ripemd160_update + nettle_hmac_md5_digest + nettle_hmac_md5_set_key + nettle_hmac_md5_update + nettle_hmac_gosthash94_digest + nettle_hmac_gosthash94_set_key + nettle_hmac_gosthash94_update + nettle_hmac_gosthash94cp_digest + nettle_hmac_gosthash94cp_set_key + nettle_hmac_gosthash94cp_update + nettle_hmac_digest + nettle_hmac_set_key + nettle_hmac_update + nettle_gosthash94 + nettle_gosthash94cp + nettle_gosthash94_digest + nettle_gosthash94_init + nettle_gosthash94_update + nettle_gosthash94cp_digest + nettle_gosthash94cp_update + _nettle_gost28147_encrypt_block + _nettle_gost28147_param_CryptoPro_3411 + _nettle_gost28147_param_test_3411 + nettle_cmac_des3 + nettle_cmac_aes256 + nettle_cmac_aes128 + nettle_cmac_des3_digest + nettle_cmac_des3_set_key + nettle_cmac_des3_update + nettle_cmac_aes256_digest + nettle_cmac_aes256_set_key + nettle_cmac_aes256_update + nettle_cmac_aes128_digest + nettle_cmac_aes128_set_key + nettle_cmac_aes128_update + nettle_cmac64_digest + nettle_cmac64_init + nettle_cmac64_set_key + nettle_cmac64_update + nettle_cmac128_digest + nettle_cmac128_init + nettle_cmac128_set_key + nettle_cmac128_update + nettle_gcm_camellia256 + nettle_gcm_camellia256_decrypt + nettle_gcm_camellia256_digest + nettle_gcm_camellia256_encrypt + nettle_gcm_camellia256_set_iv + nettle_gcm_camellia256_set_key + nettle_gcm_camellia256_update + nettle_gcm_camellia128 + nettle_gcm_camellia128_decrypt + nettle_gcm_camellia128_digest + nettle_gcm_camellia128_encrypt + nettle_gcm_camellia128_set_iv + nettle_gcm_camellia128_set_key + nettle_gcm_camellia128_update + nettle_gcm_aes256 + nettle_gcm_aes256_decrypt + nettle_gcm_aes256_digest + nettle_gcm_aes256_encrypt + nettle_gcm_aes256_set_iv + nettle_gcm_aes256_set_key + nettle_gcm_aes256_update + nettle_gcm_aes192 + nettle_gcm_aes192_decrypt + nettle_gcm_aes192_digest + nettle_gcm_aes192_encrypt + nettle_gcm_aes192_set_iv + nettle_gcm_aes192_set_key + nettle_gcm_aes192_update + nettle_gcm_aes128 + nettle_gcm_aes128_decrypt + nettle_gcm_aes128_digest + nettle_gcm_aes128_encrypt + nettle_gcm_aes128_set_iv + nettle_gcm_aes128_set_key + nettle_gcm_aes128_update + nettle_gcm_aes_decrypt + nettle_gcm_aes_digest + nettle_gcm_aes_encrypt + nettle_gcm_aes_set_iv + nettle_gcm_aes_set_key + nettle_gcm_aes_update + nettle_gcm_decrypt + nettle_gcm_digest + nettle_gcm_encrypt + nettle_gcm_set_iv + nettle_gcm_set_key + nettle_gcm_update + nettle_eax_aes128 + nettle_eax_aes128_decrypt + nettle_eax_aes128_digest + nettle_eax_aes128_encrypt + nettle_eax_aes128_set_key + nettle_eax_aes128_set_nonce + nettle_eax_aes128_update + nettle_eax_decrypt + nettle_eax_digest + nettle_eax_encrypt + nettle_eax_set_key + nettle_eax_set_nonce + nettle_eax_update + nettle_des3_decrypt + nettle_des3_encrypt + nettle_des3_set_key + nettle_des_check_parity + nettle_des_decrypt + nettle_des_encrypt + nettle_des_fix_parity + nettle_des_set_key + _nettle_ctr_crypt16 + nettle_ctr_crypt + nettle_chacha_set_counter + nettle_chacha_set_counter32 + nettle_chacha_set_nonce + nettle_chacha_set_nonce96 + nettle_chacha_set_key + nettle_chacha_poly1305 + nettle_chacha_poly1305_decrypt + nettle_chacha_poly1305_digest + nettle_chacha_poly1305_encrypt + nettle_chacha_poly1305_set_key + nettle_chacha_poly1305_set_nonce + nettle_chacha_poly1305_update + _nettle_chacha_core + nettle_chacha_crypt + nettle_chacha_crypt32 + nettle_cnd_memcpy + nettle_siv_cmac_aes256_decrypt_message + nettle_siv_cmac_aes256_encrypt_message + nettle_siv_cmac_aes256_set_key + nettle_siv_cmac_aes128_decrypt_message + nettle_siv_cmac_aes128_encrypt_message + nettle_siv_cmac_aes128_set_key + nettle_siv_cmac_decrypt_message + nettle_siv_cmac_encrypt_message + nettle_siv_cmac_set_key + nettle_cfb8_decrypt + nettle_cfb8_encrypt + nettle_cfb_decrypt + nettle_cfb_encrypt + nettle_ccm_aes256_decrypt + nettle_ccm_aes256_decrypt_message + nettle_ccm_aes256_digest + nettle_ccm_aes256_encrypt + nettle_ccm_aes256_encrypt_message + nettle_ccm_aes256_set_key + nettle_ccm_aes256_set_nonce + nettle_ccm_aes256_update + nettle_ccm_aes192_decrypt + nettle_ccm_aes192_decrypt_message + nettle_ccm_aes192_digest + nettle_ccm_aes192_encrypt + nettle_ccm_aes192_encrypt_message + nettle_ccm_aes192_set_key + nettle_ccm_aes192_set_nonce + nettle_ccm_aes192_update + nettle_ccm_aes128_decrypt + nettle_ccm_aes128_decrypt_message + nettle_ccm_aes128_digest + nettle_ccm_aes128_encrypt + nettle_ccm_aes128_encrypt_message + nettle_ccm_aes128_set_key + nettle_ccm_aes128_set_nonce + nettle_ccm_aes128_update + nettle_ccm_decrypt + nettle_ccm_decrypt_message + nettle_ccm_digest + nettle_ccm_encrypt + nettle_ccm_encrypt_message + nettle_ccm_set_nonce + nettle_ccm_update + nettle_cbc_decrypt + nettle_cbc_encrypt + nettle_cast128 + nettle_cast128_decrypt + nettle_cast128_encrypt + nettle_cast128_set_key + nettle_cast5_set_key + nettle_camellia256 + nettle_camellia192_set_decrypt_key + nettle_camellia256_invert_key + nettle_camellia256_set_decrypt_key + nettle_camellia256_crypt + nettle_camellia192_set_encrypt_key + nettle_camellia256_set_encrypt_key + nettle_camellia192 + nettle_camellia128 + nettle_camellia128_invert_key + nettle_camellia_set_decrypt_key + nettle_camellia128_crypt + nettle_camellia128_set_encrypt_key + _nettle_camellia_invert_key + _nettle_camellia_absorb + _nettle_camellia_table + _nettle_camellia_crypt + nettle_buffer_init + nettle_buffer_clear + nettle_buffer_copy + nettle_buffer_grow + nettle_buffer_init_realloc + nettle_buffer_init_size + nettle_buffer_reset + nettle_buffer_space + nettle_buffer_write + nettle_base64url + nettle_base64url_decode_init + nettle_base64url_encode_init + nettle_base64 + nettle_base64_decode_final + nettle_base64_decode_init + nettle_base64_decode_single + nettle_base64_decode_update + nettle_base64_encode_final + nettle_base64_encode_group + nettle_base64_encode_init + nettle_base64_encode_raw + nettle_base64_encode_single + nettle_base64_encode_update + nettle_base16 + nettle_base16_decode_final + nettle_base16_decode_init + nettle_base16_decode_single + nettle_base16_decode_update + nettle_base16_encode_single + nettle_base16_encode_update + nettle_blowfish_bcrypt_hash + nettle_blowfish_bcrypt_verify + _nettle_blowfish_encround + _nettle_blowfish_initial_ctx + nettle_blowfish128_set_key + nettle_blowfish_decrypt + nettle_blowfish_encrypt + nettle_blowfish_set_key + nettle_arctwo128 + nettle_arctwo40 + nettle_arctwo64 + nettle_arctwo_gutmann128 + nettle_arctwo128_set_key + nettle_arctwo128_set_key_gutmann + nettle_arctwo40_set_key + nettle_arctwo64_set_key + nettle_arctwo_decrypt + nettle_arctwo_encrypt + nettle_arctwo_set_key + nettle_arctwo_set_key_ekb + nettle_arctwo_set_key_gutmann + nettle_arcfour_crypt + nettle_arcfour128_set_key + nettle_arcfour_set_key + nettle_aes256 + nettle_aes256_invert_key + nettle_aes256_set_decrypt_key + nettle_aes256_set_encrypt_key + nettle_aes192 + nettle_aes192_invert_key + nettle_aes192_set_decrypt_key + nettle_aes192_set_encrypt_key + nettle_aes128 + nettle_aes128_invert_key + nettle_aes128_set_decrypt_key + nettle_aes128_set_encrypt_key + nettle_aes_invert_key + nettle_aes_set_decrypt_key + nettle_aes_set_encrypt_key + _nettle_aes_set_key + _nettle_aes_invert + _nettle_aes_encrypt_table + nettle_aes128_encrypt + nettle_aes192_encrypt + nettle_aes256_encrypt + nettle_aes_encrypt + _nettle_aes_encrypt + nettle_aes128_decrypt + nettle_aes192_decrypt + nettle_aes256_decrypt + nettle_aes_decrypt + _nettle_aes_decrypt diff --git a/ports/nettle/portfile.cmake b/ports/nettle/portfile.cmake index 5f0fba4f24163d..329cbddc13b5b6 100644 --- a/ports/nettle/portfile.cmake +++ b/ports/nettle/portfile.cmake @@ -1,137 +1,116 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ShiftMediaProject/nettle - REF bf483378326c67d634977287dd576279734b7acc #v3.6 - SHA512 ba125a27c81a800be8bc8d1b0d4f3125587330ef64d8a605b4d3ae211fb675c5ef89e9bf4bcf63b07d0f004c6c5ff851630690cdd1eda6b5b8a526d84edffe73 - HEAD_REF master - PATCHES - gmp.patch - name.dir.patch - runtime.patch - remove_gmpd.patch +vcpkg_list(SET patches) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_list(SET patches + yasm.patch # the asm changes are a downgrade to an older version + compile.patch + libname-windows.patch # Apply common libtool rules for lib naming. ) +endif() - include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) - yasm_tool_helper(OUT_VAR YASM) - file(TO_NATIVE_PATH "${YASM}" YASM) - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(CONFIGURATION_RELEASE ReleaseDLL) - set(CONFIGURATION_DEBUG DebugDLL) - else() - set(CONFIGURATION_RELEASE Release) - set(CONFIGURATION_DEBUG Debug) - endif() +vcpkg_from_gitlab( + GITLAB_URL https://git.lysator.liu.se/ + OUT_SOURCE_PATH SOURCE_PATH + REPO nettle/nettle + REF 52bacacaf4339fd78289f58919732f1f35bea1c1 #v3.7.3 + SHA512 0130d14195274eeec11e8299793e3037f4b84d8fb4b5c5c9392b63ee693ed5713434070744b1a44e14a6a5090d655917c1dd296e2011cd99e3c316ef5d8ee395 + HEAD_REF master + PATCHES + fix-InstallLibPath.patch + flags.patch + ${patches} +) - if(VCPKG_TARGET_IS_UWP) - string(APPEND CONFIGURATION_RELEASE WinRT) - string(APPEND CONFIGURATION_DEBUG WinRT) - endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_list(SET OPTIONS --disable-static) +else() + vcpkg_list(SET OPTIONS --disable-shared) +endif() - #Setup YASM integration - set(_nettleproject) - set(_hogweedproject) - if(VCPKG_TARGET_IS_UWP) - set(_nettleproject "${SOURCE_PATH}/SMP/libnettle_winrt.vcxproj") - set(_hogweedproject "${SOURCE_PATH}/SMP/libhogweed_winrt.vcxproj") - else() - set(_nettleproject "${SOURCE_PATH}/SMP/libnettle.vcxproj") - set(_hogweedproject "${SOURCE_PATH}/SMP/libhogweed.vcxproj") +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ENV{CCAS} "${CURRENT_HOST_INSTALLED_DIR}/tools/yasm/yasm${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(asmflag win64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(asmflag win32) endif() + set(ENV{ASMFLAGS} "-Xvc -f ${asmflag} -pgas -rraw") + vcpkg_list(APPEND OPTIONS + ac_cv_func_memset=yes + nettle_cv_asm_type_percent_function=no + nettle_cv_asm_align_log=no + ) +endif() - file(READ "${_nettleproject}" _contents) - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already - file(WRITE "${_nettleproject}" "${_contents}") +if(VCPKG_CROSSCOMPILING) + # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. + set(ENV{CC_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") +endif() - file(READ "${_hogweedproject}" _contents) - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REPLACE [[]] - "" - _contents "${_contents}") - string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already - file(WRITE "${_hogweedproject}" "${_contents}") +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS + --disable-documentation + --disable-openssl + ${OPTIONS} +) - vcpkg_install_msbuild( - USE_VCPKG_INTEGRATION - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH SMP/libnettle.sln - PLATFORM ${TRIPLET_SYSTEM_ARCH} - LICENSE_SUBPATH COPYING.LESSERv3 - TARGET Rebuild - RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE} - DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG} - SKIP_CLEAN - OPTIONS "/p:YasmPath=${YASM}" - ) +set(tool_names des ecc) # aes gcm sha twofish? +list(TRANSFORM tool_names APPEND "data") +list(TRANSFORM tool_names APPEND "${VCPKG_HOST_EXECUTABLE_SUFFIX}") - get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) - file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include") - set(PACKAGE_VERSION 3.6) - set(prefix "${CURRENT_INSTALLED_DIR}") - set(exec_prefix "\${prefix}") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/include") - set(LIBS "-lnettle -lgmp") - configure_file("${SOURCE_PATH}/nettle.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/nettle.pc" @ONLY) - set(HOGWEED -lhogweed) - set(LIBS -lnettle) - configure_file("${SOURCE_PATH}/hogweed.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libhogweed.pc" @ONLY) - set(prefix "${CURRENT_INSTALLED_DIR}/debug") - set(exec_prefix "\${prefix}") - set(libdir "\${prefix}/lib") - set(includedir "\${prefix}/../include") - set(LIBS "-lnettled -lgmp") - configure_file("${SOURCE_PATH}/nettle.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/nettle.pc" @ONLY) - set(LIBS -lnettled) - set(HOGWEED -lhogweedd) - configure_file("${SOURCE_PATH}/hogweed.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libhogweed.pc" @ONLY) - vcpkg_fixup_pkgconfig() -else() - vcpkg_from_gitlab( - GITLAB_URL https://git.lysator.liu.se/ - OUT_SOURCE_PATH SOURCE_PATH - REPO nettle/nettle - REF 9e2bea82b9fb606bffd2d3f648e05248e146e54f #v3.6 - SHA512 008089eba2ef197a0ec6a266baac485e72051e646d19861f3fb605915a591bc2dd38edcb4ea7eaad958ea5d56f7744d42c25b691b49921a1285edd22f9c90b7f - HEAD_REF master - PATCHES - fix-InstallLibPath.patch - flags.patch - ) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OPTIONS --disable-static) - else() - set(OPTIONS --disable-shared) +if(VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/") + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + if(NOT VCPKG_BUILD_TYPE) + file(COPY ${tool_names} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") + endif() +endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # def files are created by running 'llvm-nm | findstr /R /C:"[RT] _*nettle_"' on the static build and replacing '00[0-9abcdef]+ [RT]' with spaces + # please update the defs if the version is bumped + set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + configure_file( + "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/nettle.def" + COPYONLY + ) + configure_file( + "${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/hogweed.def" + COPYONLY + ) + if(NOT VCPKG_BUILD_TYPE) + set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/") + configure_file( + "${CURRENT_PORT_DIR}/nettle-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/nettle.def" + COPYONLY + ) + configure_file("${CURRENT_PORT_DIR}/hogweed-${VCPKG_TARGET_ARCHITECTURE}.def" + "${build_dir}/hogweed.def" + COPYONLY + ) + endif() endif() +endif() +vcpkg_install_make() - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - OPTIONS - --disable-documentation - --disable-openssl - ${OPTIONS} - ) +if(NOT VCPKG_CROSSCOMPILING) + list(TRANSFORM tool_names PREPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/") + file(COPY ${tool_names} DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") +endif() - vcpkg_install_make() - vcpkg_fixup_pkgconfig() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - # # Handle copyright - file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYINGv3" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/nettle/runtime.patch b/ports/nettle/runtime.patch deleted file mode 100644 index 3c232d882a7e06..00000000000000 --- a/ports/nettle/runtime.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props -index 1eade47..ab279f4 100644 ---- a/SMP/smp_deps.props -+++ b/SMP/smp_deps.props -@@ -193,6 +193,7 @@ - $(OutDir)\lib\x86\$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -211,6 +212,7 @@ - $(OutDir)\lib\x64\$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -230,6 +232,7 @@ - $(IntDir)$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x86\$(TargetName)$(TargetExt) -@@ -253,6 +256,7 @@ - $(IntDir)$(TargetName).pdb - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -282,6 +286,7 @@ - SingleFile - $(OutDir)\lib\x86\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -307,6 +312,7 @@ - SingleFile - $(OutDir)\lib\x64\$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -331,6 +337,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -362,6 +369,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -392,6 +400,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -423,6 +432,7 @@ - $(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories) - $(IntDir)$(TargetName).pdb - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props -index b44482c..35ae231 100644 ---- a/SMP/smp_winrt_deps.props -+++ b/SMP/smp_winrt_deps.props -@@ -206,6 +206,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -226,6 +227,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebug - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -247,6 +249,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x86\$(TargetName)$(TargetExt) -@@ -274,6 +277,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDebugDLL - - - $(OutDir)\bin\x64\$(TargetName)$(TargetExt) -@@ -307,6 +311,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x86\$(TargetName)$(TargetExt) -@@ -335,6 +340,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreaded - - - $(OutDir)\lib\x64\$(TargetName)$(TargetExt) -@@ -361,6 +367,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -396,6 +403,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -430,6 +438,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true -@@ -465,6 +474,7 @@ - NotUsing - false - 4113;%(TreatSpecificWarningsAsErrors) -+ MultiThreadedDLL - - - true diff --git a/ports/nettle/vcpkg.json b/ports/nettle/vcpkg.json index 87833d1211cc79..e9f7830bdb5941 100644 --- a/ports/nettle/vcpkg.json +++ b/ports/nettle/vcpkg.json @@ -1,17 +1,21 @@ { "name": "nettle", - "version": "3.6", - "port-version": 2, + "version": "3.7.3", "description": "Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.", "homepage": "https://git.lysator.liu.se/nettle/nettle", + "license": null, "dependencies": [ "gmp", { - "name": "vs-yasm", - "platform": "windows" + "name": "nettle", + "host": true }, { - "name": "yasm-tool-helper", + "name": "yasm", + "host": true, + "features": [ + "tools" + ], "platform": "windows" } ] diff --git a/ports/nettle/yasm.patch b/ports/nettle/yasm.patch new file mode 100644 index 00000000000000..4fa449f32f4220 --- /dev/null +++ b/ports/nettle/yasm.patch @@ -0,0 +1,96 @@ +diff --git a/Makefile.in b/Makefile.in +index b65ff4960..3887d0c8f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -291,7 +291,7 @@ libhogweed.a: $(hogweed_OBJS) + + %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 + $(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s +- $(COMPILE) -c $*.s ++ $(COMPILE_AS) -o $*.$(OBJEXT) $*.s + + %.$(OBJEXT): %.c + $(COMPILE) -c $< \ +diff --git a/config.make.in b/config.make.in +index f8e1f74ef..3ae593385 100644 +--- a/config.make.in ++++ b/config.make.in +@@ -73,6 +73,7 @@ TEST_SHLIB_DIR = ${abs_top_builddir}/.lib + # flags before CPPFLAGS and LDFLAGS. While EXTRA_CFLAGS are added at the end. + + COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(DEP_FLAGS) ++COMPILE_AS = $(CCAS) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(ASMFLAGS) $(DEP_FLAGS) + COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DEP_FLAGS) + LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) + LINK_CXX = $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS) +diff --git a/configure.ac b/configure.ac +index e95f1c825..1d7ef36bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -118,6 +118,9 @@ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ + + # Checks for programs. + AC_PROG_CC ++# Copied from gmp ++test -n "$CCAS" || CCAS="$CC -c" ++AC_SUBST(CCAS) + + NETTLE_CHECK_IFUNC + +@@ -302,7 +305,7 @@ ABI=standard + case "$host_cpu" in + [x86_64 | amd64]) + AC_TRY_COMPILE([ +-#if defined(__x86_64__) || defined(__arch64__) ++#if defined(__x86_64__) || defined(__arch64__) || defined(_M_AMD64) + #error 64-bit x86 + #endif + ], [], [ +diff --git a/x86_64/aes.m4 b/x86_64/aes.m4 +index 3bec9eae2..85cafc046 100644 +--- a/x86_64/aes.m4 ++++ b/x86_64/aes.m4 +@@ -77,9 +77,9 @@ define(`AES_STORE', ` + dnl AES_ROUND(table,a,b,c,d,out,ptr) + dnl Computes one word of the AES round. Leaves result in $6. + define(`AES_ROUND', ` +- movzb LREG($2), $7 ++ movzbq LREG($2), $7 + movl AES_TABLE0 ($1, $7, 4),$6 +- movzb HREG($3), XREG($7) ++ movzbq HREG($3), XREG($7) + xorl AES_TABLE1 ($1, $7, 4),$6 + movl $4,XREG($7) + shr `$'16,$7 +@@ -94,7 +94,7 @@ dnl Computes one word of the final round. Leaves result in $6. Also + dnl performs the first substitution step, on the least significant + dnl byte, and rotates 8 bits. + define(`AES_FINAL_ROUND', ` +- movzb LREG($1),$7 ++ movzbq LREG($1),$7 + movzbl ($5, $7), $6 + movl $2,XREG($7) + andl `$'0x0000ff00,XREG($7) +@@ -113,18 +113,18 @@ dnl each of eax, ebx, ecx and edx, and also rotates + dnl the words one byte to the left. + dnl Uses that AES_SBOX == 0 + define(`AES_SUBST_BYTE', ` +- movzb LREG($1),$6 ++ movzbq LREG($1),$6 + movb ($5, $6),LREG($1) + roll `$'8,$1 + +- movzb LREG($2),$6 ++ movzbq LREG($2),$6 + movb ($5, $6),LREG($2) + roll `$'8,$2 + +- movzb LREG($3),$6 ++ movzbq LREG($3),$6 + movb ($5, $6),LREG($3) + roll `$'8,$3 + +- movzb LREG($4),$6 ++ movzbq LREG($4),$6 + movb ($5, $6),LREG($4) + roll `$'8,$4')dnl diff --git a/versions/baseline.json b/versions/baseline.json index ddbbe52a3f8c6e..3af7a47340744b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4785,8 +4785,8 @@ "port-version": 2 }, "nettle": { - "baseline": "3.6", - "port-version": 2 + "baseline": "3.7.3", + "port-version": 0 }, "networkdirect-sdk": { "baseline": "2.0.1", diff --git a/versions/n-/nettle.json b/versions/n-/nettle.json index 07261c08a58e40..45061924536ceb 100644 --- a/versions/n-/nettle.json +++ b/versions/n-/nettle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17fa323aae2ecee658549bd9a8951a2ce6c9880a", + "version": "3.7.3", + "port-version": 0 + }, { "git-tree": "2d7735edc12e985fbe6bae0489a8c01ff18413cd", "version": "3.6", From b68a5e9bb390adc541a5424ff7bf6f882e566d66 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:57:11 +0200 Subject: [PATCH 062/217] [mailio] no absolute paths (#23772) --- ports/mailio/portfile.cmake | 3 ++- ports/mailio/vcpkg.json | 5 +++++ versions/baseline.json | 2 +- versions/m-/mailio.json | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/mailio/portfile.cmake b/ports/mailio/portfile.cmake index ce7e7fadbcadae..b3c7ca807e39e9 100644 --- a/ports/mailio/portfile.cmake +++ b/ports/mailio/portfile.cmake @@ -9,13 +9,14 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DMAILIO_BUILD_DOCUMENTATION=OFF -DMAILIO_BUILD_EXAMPLES=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() diff --git a/ports/mailio/vcpkg.json b/ports/mailio/vcpkg.json index 3d8a9406b1fb20..b2bfb27b7d15f7 100644 --- a/ports/mailio/vcpkg.json +++ b/ports/mailio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mailio", "version": "0.21.0", + "port-version": 1, "maintainers": "Tomislav Karastojković ", "description": "mailio is a cross platform C++ library for MIME format and SMTP, POP3 and IMAP protocols. It is based on the standard C++ 17 and Boost library.", "homepage": "https://github.com/karastojko/mailio", @@ -15,6 +16,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 3af7a47340744b..7e0ba3eaa5860d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4334,7 +4334,7 @@ }, "mailio": { "baseline": "0.21.0", - "port-version": 0 + "port-version": 1 }, "mapbox-geojson-cpp": { "baseline": "0.5.1", diff --git a/versions/m-/mailio.json b/versions/m-/mailio.json index 5611b81ae2c520..571caa9984cd3a 100644 --- a/versions/m-/mailio.json +++ b/versions/m-/mailio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80186942edc09cad3c911ebbc6dd77d30af68502", + "version": "0.21.0", + "port-version": 1 + }, { "git-tree": "cd8eea3c3ba5b6d465f5c799861571294c795d50", "version": "0.21.0", From 7e755c2ace9b0420024d95704d70568febc6ede2 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 28 Mar 2022 21:57:34 +0200 Subject: [PATCH 063/217] [libssh2] no absolute paths (#23773) --- ports/libssh2/portfile.cmake | 1 + ports/libssh2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libssh2.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index e99db47049eceb..71722356e5296b 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -44,5 +44,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") +vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index e57d86d68b822e..9c3d2806601c33 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libssh2", "version": "1.10.0", - "port-version": 2, + "port-version": 3, "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 7e0ba3eaa5860d..0a64a69abb647d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4018,7 +4018,7 @@ }, "libssh2": { "baseline": "1.10.0", - "port-version": 2 + "port-version": 3 }, "libstemmer": { "baseline": "2017-9", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index baafe9a00fc65f..4cc59c7e0bf9a0 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1a340be6b7c2a25f42cf4de44c836a577477bfc", + "version": "1.10.0", + "port-version": 3 + }, { "git-tree": "944feb4094c60226c2526be764fed688bb8b334f", "version": "1.10.0", From 671db8ae9d4b62d1c4303332144dd493da7d4057 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 28 Mar 2022 13:17:35 -0700 Subject: [PATCH 064/217] Update vcpkg-tool to 2022-03-25 (#23757) * Update vcpkg-tool to 2022-03-24 * Hook up https://github.com/microsoft/vcpkg-tool/pull/345 * Hook up https://github.com/microsoft/vcpkg-tool/pull/442 * Update vcpkg-tool to 2022-03-25 * Analysis of failures. * [Most recent nightly build failed](https://dev.azure.com/vcpkg/public/_build/results?buildId=69427) * [Validation of this tool update failed](https://dev.azure.com/vcpkg/public/_build/results?buildId=69417) ## Common to both: PASSING, REMOVE FROM FAIL LIST: chartdir:x64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: chartdir:x64-windows-static-md (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: chartdir:x86-windows (.\scripts\ci.baseline.txt) Probably fixed by https://github.com/microsoft/vcpkg/pull/23701 PASSING, REMOVE FROM FAIL LIST: gmp:x64-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: gmp:x64-windows-static-md (.\scripts\ci.baseline.txt) Probably fixed by https://github.com/microsoft/vcpkg/pull/23466 ? REGRESSION: colmap:x64-windows-static-md failed with BUILD_FAILED. If expected, add colmap:x64-windows-static-md=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. I don't know exactly what changed. I observe that * this thing depends on a *lot* of stuff * on March 14 we didn't even attempt to build this * the x64-windows ones are already in the baseline so I skipped it. REGRESSION: qtdeclarative:x64-windows. If expected, add qtdeclarative:x64-windows=fail to .\scripts\ci.baseline.txt. REGRESSION: qtdeclarative:x64-windows failed with BUILD_FAILED. If expected, add qtdeclarative:x64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtdeclarative:x64-windows failed with BUILD_FAILED. If expected, add qtdeclarative:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtdeclarative:x64-windows failed with BUILD_FAILED. If expected, add qtdeclarative:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtdeclarative:x64-windows failed with BUILD_FAILED. If expected, add qtdeclarative:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtdeclarative:x64-windows failed with BUILD_FAILED. If expected, add qtdeclarative:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtdeclarative:x64-windows failed with BUILD_FAILED. If expected, add qtdeclarative:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: qtdeclarative:x64-windows failed with BUILD_FAILED. If expected, add qtdeclarative:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. This is a reporting change: The new world order also includes host build failures which is why it's duplicated. See also https://github.com/microsoft/vcpkg/issues/23714 See also https://github.com/microsoft/vcpkg/issues/23490 I'm nervous about baslining this because it seems most of the qt world is built on top of this port I filed https://github.com/microsoft/vcpkg/issues/23824 about this and @Neumann-A indicated this should be fixed by https://github.com/microsoft/vcpkg/pull/23755 REGRESSION: nettle:x64-uwp. If expected, add nettle:x64-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: nettle:x64-windows-static-md. If expected, add nettle:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. REGRESSION: nettle:x64-uwp failed with BUILD_FAILED. If expected, add nettle:x64-uwp=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: nettle:x64-windows-static-md failed with POST_BUILD_CHECKS_FAILED. If expected, add nettle:x64-windows-static-md=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. Didn't analyze, probably fixed by https://github.com/microsoft/vcpkg/pull/23519 ? REGRESSION: libgpg-error:x64-uwp. If expected, add libgpg-error:x64-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: libgpg-error:x64-uwp failed with BUILD_FAILED. If expected, add libgpg-error:x64-uwp=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. This was broken by VS2022 update: ``` C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VisualStudio\v17.0\AppxPackage\Microsoft.AppXPackage.Targets(892,25): error MSB4086: A numeric comparison was attempted on "$(TargetPlatformMinVersion)" that evaluates to "" instead of a number, in condition "'$(TargetPlatformMinVersion)' >= '10.0.17200.0'". [C:\Dev\vcpkg\buildtrees\libgpg-error\x64-uwp-rel\error-1.42-2324ddbc71.clean\SMP\libgpg-error_winrt.vcxproj] ``` REGRESSION: libmikmod:x64-osx. If expected, add libmikmod:x64-osx=fail to .\scripts\ci.baseline.txt. REGRESSION: libmikmod:x64-osx failed with BUILD_FAILED. If expected, add libmikmod:x64-osx=fail to /Users/vagrant/Data/work/2/s/scripts/azure-pipelines/../ci.baseline.txt. Broken between [2022-03-16](https://dev.azure.com/vcpkg/public/_build/results?buildId=68947) and [2022-03-18](https://dev.azure.com/vcpkg/public/_build/results?buildId=69051). Unfortunately I don't see obvious reasons why. Nothing else depends on this and nobody has noticed in 2 weeks, so I'm baslining it for now. (Will investigate shortly...) ## Only broken in tool update: REGRESSION: mesa:x64-windows failed with BUILD_FAILED. If expected, add mesa:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` -- Downloading https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-21.2.5/mesa-mesa-21.2.5.tar.gz -> mesa-mesa-mesa-21.2.5-1.tar.gz... -- Extracting source /Users/vagrant/Data/downloads/mesa-mesa-mesa-21.2.5-1.tar.gz -- Applying patch swravx512-post-static-link.patch -- Applying patch swr-msvc-2.patch -- Applying patch swr-llvm13.patch -- Applying patch radv-msvc-llvm13-2.patch -- Applying patch d3d10sw.patch -- Using source at /Users/vagrant/Data/buildtrees/mesa/src/esa-21.2.5-2df234d2b1.clean Traceback (most recent call last): File "", line 1, in ModuleNotFoundError: No module named 'mako' CMake Error at ports/mesa/portfile.cmake:85 (message): Python package 'mako' needs to be installed for port 'mesa'. Complete list of required python packages: setuptools;mako Call Stack (most recent call first): ports/mesa/portfile.cmake:91 (vcpkg_get_python_package) scripts/ports.cmake:145 (include) ``` Looks like this is being tracked by https://github.com/microsoft/vcpkg/pull/23089 ; perhaps that we don't have as aggressive a recycling strategy for macos boxes as we do for the others has let different machines give different results? ## Only broken without tool update: REGRESSION: chromium-base:x64-osx. If expected, add chromium-base:x64-osx=fail to .\scripts\ci.baseline.txt. This one has been constantly flaky; I baselined it. REGRESSION: libxml2:x64-osx. If expected, add libxml2:x64-osx=fail to .\scripts\ci.baseline.txt. This port uses vcpkg_from_git and the upstream server was down during the build. * Restore chartdir to the baseline, I thought https://github.com/microsoft/vcpkg/pull/23732 had been merged. --- .../azure-pipelines/analyze-test-results.ps1 | 453 ------------------ .../azure-pipelines/generate-skip-list.ps1 | 83 ---- .../azure-pipelines/test-modified-ports.ps1 | 22 +- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +- scripts/ci.baseline.txt | 40 +- 6 files changed, 29 insertions(+), 581 deletions(-) delete mode 100755 scripts/azure-pipelines/analyze-test-results.ps1 delete mode 100755 scripts/azure-pipelines/generate-skip-list.ps1 diff --git a/scripts/azure-pipelines/analyze-test-results.ps1 b/scripts/azure-pipelines/analyze-test-results.ps1 deleted file mode 100755 index 29cf01cc30d04d..00000000000000 --- a/scripts/azure-pipelines/analyze-test-results.ps1 +++ /dev/null @@ -1,453 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: MIT -# - -<# -.SYNOPSIS -Analyze the test results as output by the CI system. - -.DESCRIPTION -Takes the set of port test results from $logDir, -and the baseline from $baselineFile, and makes certain that the set -of failures we expected are exactly the set of failures we got. -Then, uploads the logs from any unexpected failures. - -.PARAMETER logDir -Directory of xml test logs to analyze. - -.PARAMETER allResults -Include tests that have no change from the baseline in the output. - -.PARAMETER triplet -The triplet to analyze. - -.PARAMETER baselineFile -The path to the ci.baseline.txt file in the vcpkg repository. - -.PARAMETER passingIsPassing -Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used -when using vcpkg to test a prerelease MSVC++ compiler) -#> -[CmdletBinding()] -Param( - [Parameter(Mandatory = $true)] - [string]$logDir, - [switch]$allResults, - [Parameter(Mandatory = $true)] - [string]$triplet, - [Parameter(Mandatory = $true)] - [string]$baselineFile, - [switch]$passingIsPassing = $false -) - -$ErrorActionPreference = 'Stop' - -if ( -not (Test-Path $logDir) ) { - [System.Console]::Error.WriteLine("Log directory does not exist: $logDir") - exit -} - -<# -.SYNOPSIS -Creates an object the represents the test run. - -.DESCRIPTION -build_test_results takes an XML file of results from the CI run, -and constructs an object based on that XML file for further -processing. - -.OUTPUTS -An object with the following elements: - assemblyName: - assemblyStartDate: - assemblyStartTime: - assemblyTime: - collectionName: - collectionTime: - allTests: A hashtable with an entry for each port tested - The key is the name of the port - The value is an object with the following elements: - name: Name of the port (Does not include the triplet name) - result: Pass/Fail/Skip result from xunit - time: Test time in seconds - originalResult: Result as defined by Build.h in vcpkg source code - abi_tag: The port hash - features: The features installed - -.PARAMETER xmlFilename -The path to the XML file to parse. -#> -function build_test_results { - [CmdletBinding()] - Param - ( - [string]$xmlFilename - ) - if ( ($xmlFilename.Length -eq 0) -or ( -not( Test-Path $xmlFilename))) { - #write-error "Missing file: $xmlFilename" - return $null - } - - Write-Verbose "building test hash for $xmlFilename" - - [xml]$xmlContents = Get-Content $xmlFilename - - # This currently only supports one collection per assembly, which is the way - # the vcpkg tests are designed to run in the pipeline. - $xmlAssembly = $xmlContents.assemblies.assembly - $assemblyName = $xmlAssembly.name - $assemblyStartDate = $xmlAssembly."run-date" - $assemblyStartTime = $xmlAssembly."run-time" - $assemblyTime = $xmlAssembly.time - $xmlCollection = $xmlAssembly.collection - $collectionName = $xmlCollection.name - $collectionTime = $xmlCollection.time - - $allTestResults = @{ } - foreach ( $test in $xmlCollection.test) { - if (!$test.name.endswith(":$triplet")) - { - continue - } - $name = ($test.name -replace ":.*$") - - # Reconstruct the original BuildResult enumeration (defined in Build.h) - # failure.message - why the test failed (valid only on test failure) - # reason - why the test was skipped (valid only when the test is skipped) - # case BuildResult::POST_BUILD_CHECKS_FAILED: - # case BuildResult::FILE_CONFLICTS: - # case BuildResult::BUILD_FAILED: - # case BuildResult::EXCLUDED: - # case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: - $originalResult = "NULLVALUE" - switch ($test.result) { - "Skip" { - $originalResult = $test.reason.InnerText - } - "Fail" { - $originalResult = $test.failure.message.InnerText - } - "Pass" { - $originalResult = "SUCCEEDED" - } - } - - $abi_tag = "" - $features = "" - foreach ( $trait in $test.traits.trait) { - switch ( $trait.name ) { - "abi_tag" { $abi_tag = $trait.value } - "features" { $features = $trait.value } - } - } - - # If additional fields get saved in the XML, then they should be added to this hash - # also consider using a PSCustomObject here instead of a hash - $testHash = @{ name = $name; result = $test.result; time = $test.time; originalResult = $originalResult; abi_tag = $abi_tag; features = $features } - $allTestResults[$name] = $testHash - } - - return @{ - assemblyName = $assemblyName; - assemblyStartDate = $assemblyStartDate; - assemblyStartTime = $assemblyStartTime; - assemblyTime = $assemblyTime; - collectionName = $collectionName; - collectionTime = $collectionTime; - allTests = $allTestResults - } -} - -<# -.SYNOPSIS -Creates an object that represents the baseline expectations. - -.DESCRIPTION -build_baseline_results converts the baseline file to an object representing -the expectations set up by the baseline file. It records four states: - 1) fail - 2) skip - 3) ignore - 4) pass -- this is represented by not being recorded -In other words, if a port is not contained in the object returned by this -cmdlet, expect it to pass. - -.OUTPUTS -An object containing the following fields: - collectionName: the triplet - fail: ports marked as fail - skip: ports marked as skipped - ignore: ports marked as ignore - -.PARAMETER baselineFile -The path to vcpkg's ci.baseline.txt. - -.PARAMETER triplet -The triplet to create the result object for. -#> -function build_baseline_results { - [CmdletBinding()] - Param( - $baselineFile, - $triplet - ) - #read in the file, strip out comments and blank lines and spaces, leave only the current triplet - #remove comments, remove empty lines, remove whitespace, then keep only those lines for $triplet - $baseline_list_raw = Get-Content -Path $baselineFile ` - | Where-Object { -not ($_ -match "\s*#") } ` - | Where-Object { -not ( $_ -match "^\s*$") } ` - | ForEach-Object { $_ -replace "\s" } ` - | Where-Object { $_ -match ":$triplet=" } - - #filter to skipped and trim the triplet - $skip_hash = @{ } - foreach ( $port in $baseline_list_raw | ? { $_ -match "=skip$" } | % { $_ -replace ":.*$" }) { - if ($skip_hash[$port] -ne $null) { - [System.Console]::Error.WriteLine("$($port):$($triplet) has multiple definitions in $baselineFile") - } - $skip_hash[$port] = $true - } - $fail_hash = @{ } - $baseline_list_raw | ? { $_ -match "=fail$" } | % { $_ -replace ":.*$" } | ? { $fail_hash[$_] = $true } | Out-Null - $ignore_hash = @{ } - $baseline_list_raw | ? { $_ -match "=ignore$" } | % { $_ -replace ":.*$" } | ? { $ignore_hash[$_] = $true } | Out-Null - - return @{ - collectionName = $triplet; - skip = $skip_hash; - fail = $fail_hash; - ignore = $ignore_hash - } -} - -<# -.SYNOPSIS -Analyzes the results of the current run against the baseline. - -.DESCRIPTION -combine_results compares the results to the baselie, and generates the results -for the CI -- whether it should pass or fail. - -.OUTPUTS -An object containing the following: -(Note that this is not the same data structure as build_test_results) - assemblyName: - assemblyStartDate: - assemblyStartTime: - assemblyTime: - collectionName: - collectionTime: - allTests: A hashtable of each port with a different status from the baseline - The key is the name of the port - The value is an object with the following data members: - name: The name of the port - result: xunit test result Pass/Fail/Skip - message: Human readable message describing the test result - time: time the current test results took to run. - baselineResult: - currentResult: - features: - ignored: list of ignored tests - -.PARAMETER baseline -The baseline object to use from build_baseline_results. - -.PARAMETER current -The results object to use from build_test_results. -#> -function combine_results { - [CmdletBinding()] - Param - ( - $baseline, - $current - ) - - if ($baseline.collectionName -ne $current.collectionName) { - Write-Warning "Comparing mismatched collections $($baseline.collectionName) and $($current.collectionName)" - } - - $currentTests = $current.allTests - - # lookup table with the results of all of the tests - $allTestResults = @{ } - - $ignoredList = @() - - Write-Verbose "analyzing $($currentTests.count) tests" - - foreach ($key in $currentTests.keys) { - Write-Verbose "analyzing $key" - - $message = $null - $result = $null - $time = $null - $currentResult = $null - $features = $currentTest.features - - $baselineResult = "Pass" - if ($baseline.fail[$key] -ne $null) { - Write-Verbose "$key is failing" - $baselineResult = "Fail" - } - elseif ( $baseline.skip[$key] -ne $null) { - Write-Verbose "$key is skipped" - $baselineResult = "Skip" - } - elseif ( $baseline.ignore[$key] -ne $null) { - $baselineResult = "ignore" - } - - $currentTest = $currentTests[$key] - - if ( $currentTest.result -eq $baselineResult) { - Write-Verbose "$key has no change from baseline" - $currentResult = $currentTest.result - if ($allResults) { - # Only marking regressions as failures but keep the skipped status - if ($currentResult -eq "Skip") { - $result = "Skip" - } - else { - $result = "Pass" - } - $message = "No change from baseline" - $time = $currentTest.time - } - } - elseif ( $baselineResult -eq "ignore") { - if ( $currentTest.result -eq "Fail" ) { - Write-Verbose "ignoring failure on $key" - $ignoredList += $key - } - } - else { - Write-Verbose "$key had a change from the baseline" - - $currentResult = $currentTest.result - # Test exists in both test runs but does not match. Determine if this is a regression - # Pass -> Fail = Fail (Regression) - # Pass -> Skip = Skip - # Fail -> Pass = Fail (need to update baseline) - # Fail -> Skip = Skip - # Skip -> Fail = Fail (Should not happen) - # Skip -> Pass = Fail (should not happen) - - $lookupTable = @{ - 'Pass' = @{ - 'Fail' = @('Fail', "Test passes in baseline but fails in current run. If expected update ci.baseline.txt with '$($key):$($current.collectionName)=fail'"); - 'Skip' = @($null, 'Test was skipped due to missing dependencies') - }; - 'Fail' = @{ - 'Pass' = @('Fail', "Test fails in baseline but now passes. Update ci.baseline.txt with '$($key):$($current.collectionName)=pass'"); - 'Skip' = @($null, 'Test fails in baseline but is skipped in current run') - }; - 'Skip' = @{ - 'Fail' = @('Skip', "Test is skipped in baseline but fails in current run. Results are ignored") - 'Pass' = @('Skip', "Test is skipped in baseline but passes in current run. Results are ignored") - } - } - $resultList = $lookupTable[$baselineResult][$currentResult] - $result = $resultList[0] - $message = $resultList[1] - $time = $currentTest.time - Write-Verbose ">$key $message" - } - - if ($result -ne $null) { - Write-Verbose "Adding $key to result list" - $allTestResults[$key] = @{ name = $key; result = $result; message = $message; time = $time; abi_tag = $currentTest.abi_tag; baselineResult = $baselineResult; currentResult = $currentResult; features = $features } - } - } - - return @{ - assemblyName = $current.assemblyName; - assemblyStartDate = $current.assemblyStartDate; - assemblyStartTime = $current.assemblyStartTime; - assemblyTime = $current.assemblyTime; - collectionName = $current.collectionName; - collectionTime = $current.collectionTime; - allTests = $allTestResults; - ignored = $ignoredList - } -} - -<# -.SYNOPSIS -Writes short errors to the CI logs. - -.DESCRIPTION -write_errors_for_summary takes a hashtable from triplets to combine_results -objects, and writes short errors to the CI logs. - -.PARAMETER complete_results -A hashtable from triplets to combine_results objects. -#> -function write_errors_for_summary { - [CmdletBinding()] - Param( - $complete_results - ) - - $failure_found = $false - - Write-Verbose "preparing error output for Azure Devops" - - foreach ($triplet in $complete_results.Keys) { - $triplet_results = $complete_results[$triplet] - - Write-Verbose "searching $triplet triplet" - - # add each port results - foreach ($testName in $triplet_results.allTests.Keys) { - $test = $triplet_results.allTests[$testName] - - Write-Verbose "checking $($testName):$triplet $($test.result)" - - if ($test.result -eq 'Fail') { - if (($test.currentResult) -eq "pass" -and $passingIsPassing) { - continue; - } - - $failure_found = $true - if ($test.currentResult -eq "pass") { - [System.Console]::Error.WriteLine( ` - "PASSING, REMOVE FROM FAIL LIST: $($test.name):$triplet ($baselineFile)" ` - ) - } - else { - [System.Console]::Error.WriteLine( ` - "REGRESSION: $($test.name):$triplet. If expected, add $($test.name):$triplet=fail to $baselineFile." ` - ) - } - } - } - } -} - - -$complete_results = @{ } -Write-Verbose "looking for $triplet logs" - -# The standard name for logs is: -# .xml -# for example: -# x64-linux.xml - -$current_test_hash = build_test_results( Convert-Path "$logDir\$($triplet).xml" ) -$baseline_results = build_baseline_results -baselineFile $baselineFile -triplet $triplet - -if ($current_test_hash -eq $null) { - [System.Console]::Error.WriteLine("Missing $triplet test results in current test run") - $missing_triplets[$triplet] = "test" -} -else { - Write-Verbose "combining results..." - $complete_results[$triplet] = combine_results -baseline $baseline_results -current $current_test_hash -} - -Write-Verbose "done analyzing results" - -# emit error last. Unlike the table output this is going to be seen in the "status" section of the pipeline -# and needs to be formatted for a single line. -write_errors_for_summary -complete_results $complete_results diff --git a/scripts/azure-pipelines/generate-skip-list.ps1 b/scripts/azure-pipelines/generate-skip-list.ps1 deleted file mode 100755 index 84b78b33878721..00000000000000 --- a/scripts/azure-pipelines/generate-skip-list.ps1 +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: MIT -# - -<# -.SYNOPSIS -Generates a list of ports to skip in the CI. - -.DESCRIPTION -generate-skip-list takes a triplet, and the path to the ci.baseline.txt -file, and generates a skip list string to pass to vcpkg. - -.PARAMETER Triplet -The triplet to find skipped ports for. - -.PARAMETER BaselineFile -The path to the ci.baseline.txt file. -#> -[CmdletBinding()] -Param( - [string]$Triplet, - [string]$BaselineFile, - [switch]$SkipFailures = $false -) - -$ErrorActionPreference = 'Stop' - -if (-not (Test-Path -Path $BaselineFile)) { - Write-Error "Unable to find baseline file $BaselineFile" - throw -} - -#read in the file, strip out comments and blank lines and spaces -$baselineListRaw = Get-Content -Path $BaselineFile ` - | Where-Object { -not ($_ -match "\s*#") } ` - | Where-Object { -not ( $_ -match "^\s*$") } ` - | ForEach-Object { $_ -replace "\s" } - -############################################################### -# This script is running at the beginning of the CI test, so do a little extra -# checking so things can fail early. - -#verify everything has a valid value -$missingValues = $baselineListRaw | Where-Object { -not ($_ -match "=\w") } - -if ($missingValues) { - Write-Error "The following are missing values: $missingValues" - throw -} - -$invalidValues = $baselineListRaw ` - | Where-Object { -not ($_ -match "=(skip|pass|fail|ignore)$") } - -if ($invalidValues) { - Write-Error "The following have invalid values: $invalidValues" - throw -} - -$baselineForTriplet = $baselineListRaw ` - | Where-Object { $_ -match ":$Triplet=" } - -# Verify there are no duplicates (redefinitions are not allowed) -$file_map = @{ } -foreach ($port in $baselineForTriplet | ForEach-Object { $_ -replace ":.*$" }) { - if ($null -ne $file_map[$port]) { - Write-Error ` - "$($port):$($Triplet) has multiple definitions in $baselineFile" - throw - } - $file_map[$port] = $true -} - -# Format the skip list for the command line -if ($SkipFailures) { - $targetRegex = "=(?:skip|fail)$" -} else { - $targetRegex = "=skip$" -} - -$skip_list = $baselineForTriplet ` - | Where-Object { $_ -match $targetRegex } ` - | ForEach-Object { $_ -replace ":.*$" } -[string]::Join(",", $skip_list) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 57f13a2b58f26e..80f0ac40ad182e 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -136,19 +136,6 @@ if ($LASTEXITCODE -ne 0) throw "vcpkg clean failed" } -$skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` - -Triplet $Triplet ` - -BaselineFile "$PSScriptRoot/../ci.baseline.txt" ` - -SkipFailures:$skipFailures - -$hostArgs = @() -if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) -{ - # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. - # The workaround is to pass the skip list as host-excludes as well. - $hostArgs = @("--host-exclude=$skipList") -} - $parentHashes = @() if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) { @@ -169,7 +156,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) # but changes must trigger at least some testing. Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" - & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" + & "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" Write-Host "Running CI using parent hashes" & git reset --hard HEAD @@ -179,7 +166,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) # but changes must trigger at least some testing. Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" -& "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @hostArgs @commonArgs @cachingArgs @parentHashes +& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --x-xunit=$xmlFile --failure-logs=$failureLogs "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" @@ -188,8 +175,3 @@ if ($LASTEXITCODE -ne 0) { throw "vcpkg ci failed" } - -& "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` - -triplet $Triplet ` - -baselineFile .\scripts\ci.baseline.txt ` - -passingIsPassing:$PassingIsPassing diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 1d695cb3d7de07..4c1a66450aef41 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-03-09' +$versionDate = '2022-03-25' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 6877dc11c6a98a..88936de330856c 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-03-09" +vcpkgToolReleaseTag="2022-03-25" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="fc04f2db2676e9b5958c3bf2c8537f470acb1ed9e0a2b6be1145feebbb701251644dc73311fe5cc4d791272b90e3810d358ded6ca9436700a531634d405180c2" + vcpkgToolReleaseSha="a48a35949362182a792124a6088a2ac24e1992e4ef2604ae369d44b2b7745a422dd78f74cba5807f52312674ea7bcd11d79435faffb8391b3703bc43c0d95605" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="0d9dc5669a389601d919893e9e742ec41e5ee09c7aaea7d2f89e8f388f6e08296dea4132f016e44dac771c8b40aabcf195dd228ade8cd0a199cde037d8fdce49" + vcpkgToolReleaseSha="d0995018de0b20188291aeabafff5296ab33ef334b67c7512f3cd511dfc1740af62d8ad863e48df5731a6d44e2fbdfe060410494449d61743bd767e87fe68b20" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="1bc60ca03d76d75033d3cc864e96ff8f36843661c744e6bb7554ee50d5bd8dd027d5b7cdc7909801e75a72b44ac04d66dac29bb6669569c65c62f06f0064dd88" + vcpkgToolReleaseSha="c66e74d4469849c063e9e165b034a529e61e8245fd608a9bfb6c5e25a5a530951ea6995f5b1ee20aac1632f094f49ba3067516506dd2a81122a686ff5826efd9" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="409480568f161055ba1bb41fc6e9ed99e196f180731ee05422ab4ba182d6277b5a59048b1b10fe39e10c8f4cc8becd2f752fabb775b4623e6888a00af7af782f" + vcpkgToolReleaseSha="15188f9c7370b308d54df3a47bba56d7cbcf437252c3c4545b8aaa7e459e06c47cbdf3d3a8d98bd1ef0d39ccbf2e70b4c0a6d99ce0a58db866b95606d46f92d6" fi # Do the download or build. diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 53df3b66d3d731..9d2203203ece46 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -118,23 +118,27 @@ charls:x64-windows-static=skip charls:x64-windows-static-md=skip charls:x86-windows=skip # chartdir does not offer stable download URLs -chartdir:arm64-windows=fail -chartdir:arm-uwp=fail -chartdir:x64-uwp=fail -chartdir:x64-windows-static=fail -chartdir:x86-windows=fail -chartdir:x64-windows=fail -chartdir:x64-windows-static-md=fail -chartdir:x64-osx=fail +chartdir:arm64-windows=skip +chartdir:arm-uwp=skip +chartdir:x64-uwp=skip +chartdir:x64-windows-static=skip +chartdir:x86-windows=skip +chartdir:x64-windows=skip +chartdir:x64-windows-static-md=skip +chartdir:x64-osx=skip chmlib:arm-uwp=fail chmlib:x64-uwp=fail -# chromium-base does not yet support VS2022 -chromium-base:x64-windows=fail -chromium-base:x64-windows-static=fail - -# Chromium Base requires a recent version of Clang to be installed. +# chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI +# broken on Windows because it does not yet support VS2022 +chromium-base:x64-windows=skip +chromium-base:x64-windows-static=skip +chromium-base:x64-windows-static-md=skip +# broken on Linux because chromium-base:x64-linux=skip +# broken on OSX for unknown reasons; it appears to be messing with some form of system-wide cache +# because the first attempt to build it fails, but subsequent attempts succeed +chromium-base:x64-osx=skip civetweb:arm64-windows = skip civetweb:arm-uwp = skip @@ -159,6 +163,7 @@ coin:x64-uwp=fail colmap:x86-windows=fail colmap:x64-windows=fail colmap:x64-windows-static=fail +colmap:x64-windows-static-md=fail concurrencpp:x64-linux=fail constexpr-contracts:x64-linux=fail @@ -360,9 +365,6 @@ gmmlib:x64-windows-static=fail gmmlib:x64-windows-static-md=fail gmmlib:x86-windows=fail -# the msbuild for gmp:x64-uwp is broken on VS2022 due to TargetPlatformMinVersion not existing -gmp:x64-uwp=fail - google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail gppanel:x64-osx=fail @@ -513,8 +515,9 @@ libgo:arm-uwp=fail libgo:x64-uwp=fail libgo:arm64-windows=fail -# the msbuild for libgpg:x64-uwp is broken on VS2022 due to TargetPlatformMinVersion not existing +# the msbuild for libgpg:x64-uwp and libgpg-error:x64-uwp are broken on VS2022 due to TargetPlatformMinVersion not existing libgpg:x64-uwp=fail +libgpg-error:x64-uwp=fail libhdfs3:x64-linux=fail libhdfs3:x64-osx=fail @@ -558,6 +561,7 @@ libmesh:x64-windows-static-md=skip libmesh:x86-windows=skip libmesh:x64-osx=skip libmesh:x64-linux=skip +libmikmod:x64-osx=fail libmodman:arm-uwp=fail libmodman:x64-uwp=fail libmodman:x64-windows-static=fail @@ -1404,10 +1408,8 @@ lapack-reference:x64-uwp=skip # failures for x64-windows-static-md ace:x64-windows-static-md=fail akali:x64-windows-static-md=fail -chromium-base:x64-windows-static-md=fail clockutils:x64-windows-static-md=fail fastcgi:x64-windows-static-md=fail -gmp:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail From e446b36db2eabe8eca5b50c89ae53d32e49b70f8 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 28 Mar 2022 22:21:48 +0200 Subject: [PATCH 065/217] [libmesh] no absolute paths (#23779) --- ports/libmesh/portfile.cmake | 1 + ports/libmesh/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libmesh.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/libmesh/portfile.cmake b/ports/libmesh/portfile.cmake index b9384dd2847030..c4810b560cd63d 100644 --- a/ports/libmesh/portfile.cmake +++ b/ports/libmesh/portfile.cmake @@ -47,6 +47,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/contrib ${CURRENT_PACKAGES_DIR ${CURRENT_PACKAGES_DIR}/Make.common ${CURRENT_PACKAGES_DIR}/debug/Make.common) vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/libmesh/vcpkg.json b/ports/libmesh/vcpkg.json index 20ec6ce66395fe..d7240de5559b7e 100644 --- a/ports/libmesh/vcpkg.json +++ b/ports/libmesh/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmesh", - "version-string": "1.5.0", - "port-version": 3, + "version": "1.5.0", + "port-version": 4, "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.", "homepage": "https://github.com/libMesh/libmesh", "license": "LGPL-2.1-only" diff --git a/versions/baseline.json b/versions/baseline.json index 0a64a69abb647d..a6b0bcbbf5345e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3726,7 +3726,7 @@ }, "libmesh": { "baseline": "1.5.0", - "port-version": 3 + "port-version": 4 }, "libmicrohttpd": { "baseline": "0.9.75", diff --git a/versions/l-/libmesh.json b/versions/l-/libmesh.json index e648680eff1def..555e78ddddd4bf 100644 --- a/versions/l-/libmesh.json +++ b/versions/l-/libmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "347e56f7cd6e4bf1ca5621c564e4421a7f5a45cd", + "version": "1.5.0", + "port-version": 4 + }, { "git-tree": "8583d8a15a7b694bb7a8346580c5f8a3f7478f28", "version-string": "1.5.0", From 38ea7762498f4040b51d17bef9218e755934f3cb Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 28 Mar 2022 22:23:46 +0200 Subject: [PATCH 066/217] [realsense2] no absolute paths (#23778) --- ports/realsense2/portfile.cmake | 1 + ports/realsense2/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/r-/realsense2.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index e9fd00b552d1e2..e9ab6c89b8995d 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -49,6 +49,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}") endif() vcpkg_copy_pdbs() diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index df3a95a3146d9d..4414ef1af99447 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,8 +1,10 @@ { "name": "realsense2", "version": "2.50.0", + "port-version": 1, "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", "dependencies": [ { "name": "libusb", diff --git a/versions/baseline.json b/versions/baseline.json index a6b0bcbbf5345e..fc5a55e1ff248f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6102,7 +6102,7 @@ }, "realsense2": { "baseline": "2.50.0", - "port-version": 0 + "port-version": 1 }, "recast": { "baseline": "1.5.1", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index aa0a3998d8ab7a..8a9edfebcc38ca 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b967b8979ae93b95b16a7021348e04f534f28c0", + "version": "2.50.0", + "port-version": 1 + }, { "git-tree": "310025edf50886cce00c7864f6f21d1eda53b51b", "version": "2.50.0", From fca3a520b9fb7570ff688139e1d75d745123e707 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 28 Mar 2022 22:30:04 +0200 Subject: [PATCH 067/217] [xqilla] no absolute paths (#23776) --- ports/xqilla/CMakeLists.txt | 9 ++++----- ports/xqilla/portfile.cmake | 7 +------ ports/xqilla/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/x-/xqilla.json | 5 +++++ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ports/xqilla/CMakeLists.txt b/ports/xqilla/CMakeLists.txt index d2caaa2230f9c0..85ecad2182f1f6 100644 --- a/ports/xqilla/CMakeLists.txt +++ b/ports/xqilla/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.21) cmake_policy(VERSION 3.21) -if (XQILLA_STATIC) - add_definitions("-DXQILLA_API=") -else() +if (BUILD_SHARED_LIBS) add_definitions("-DXQILLA_APIS=") +else() + add_definitions("-DXQILLA_API=") endif() project(xqilla C CXX) @@ -430,7 +430,7 @@ find_package(XercesC REQUIRED) target_include_directories(xqilla PRIVATE "${XercesC_INCLUDE_DIRS}") target_include_directories(xqilla PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include") -if (NOT XQILLA_STATIC) +if (BUILD_SHARED_LIBS) target_link_libraries(xqilla PUBLIC debug "${XercesC_LIBRARY_DEBUG}") target_link_libraries(xqilla PUBLIC optimized "${XercesC_LIBRARY_RELEASE}") endif() @@ -454,5 +454,4 @@ install( DESTINATION share/unofficial-xqilla FILE unofficial-xqillaConfig.cmake NAMESPACE unofficial::xqilla:: - CONFIGURATIONS Release ) diff --git a/ports/xqilla/portfile.cmake b/ports/xqilla/portfile.cmake index ffc48298c81811..c02aa27533d005 100644 --- a/ports/xqilla/portfile.cmake +++ b/ports/xqilla/portfile.cmake @@ -10,19 +10,14 @@ vcpkg_extract_source_archive_ex( PATCHES "fix-compare.patch" ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND COMPILE_OPTIONS "-DXQILLA_STATIC=static") -endif() - - file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" NO_CHARSET_FLAG - OPTIONS ${COMPILE_OPTIONS} ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-xqilla) vcpkg_copy_pdbs() diff --git a/ports/xqilla/vcpkg.json b/ports/xqilla/vcpkg.json index 7b7d535aab1c3d..5206797d1f4e91 100644 --- a/ports/xqilla/vcpkg.json +++ b/ports/xqilla/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xqilla", "version": "2.3.4", + "port-version": 1, "description": "XQuery and XPath 2 library", "homepage": "http://xqilla.sourceforge.net/HomePage", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index fc5a55e1ff248f..46ecd7539f286e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7534,7 +7534,7 @@ }, "xqilla": { "baseline": "2.3.4", - "port-version": 0 + "port-version": 1 }, "xsimd": { "baseline": "8.0.3", diff --git a/versions/x-/xqilla.json b/versions/x-/xqilla.json index 46f07c53b0e253..edca35147760dd 100644 --- a/versions/x-/xqilla.json +++ b/versions/x-/xqilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "110b08065d892a635f1a8f2dd76f42727788020f", + "version": "2.3.4", + "port-version": 1 + }, { "git-tree": "5e0e7d4ac944e58a70a8a71a8a715598b22c7e73", "version": "2.3.4", From 82e66412ee293f6a3d8ffd16f2b92642f19ed657 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Mon, 28 Mar 2022 16:31:07 -0400 Subject: [PATCH 068/217] [gtest] Remove -Werror (#23780) * [gtest] Remove -Werror Fails to compile with latest clang * Update version * Fix lints in portfile.cmake/vcpkg.json * Update version --- ports/gtest/portfile.cmake | 10 ++++------ ports/gtest/remove-werror.patch | 20 ++++++++++++++++++++ ports/gtest/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 2 +- versions/g-/gtest.json | 5 +++++ 5 files changed, 43 insertions(+), 9 deletions(-) create mode 100644 ports/gtest/remove-werror.patch diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 524ac7c3269640..4cdab172e3bbfd 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -10,22 +10,20 @@ vcpkg_from_github( HEAD_REF main PATCHES fix-main-lib-path.patch + remove-werror.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_GMOCK=ON - -DBUILD_GTEST=ON - -DCMAKE_DEBUG_POSTFIX=d -Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/GTest TARGET_PATH share/GTest) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GTest) file( INSTALL diff --git a/ports/gtest/remove-werror.patch b/ports/gtest/remove-werror.patch new file mode 100644 index 00000000000000..96eba02027091b --- /dev/null +++ b/ports/gtest/remove-werror.patch @@ -0,0 +1,20 @@ +diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake +index 8d8d60a8..58fc9bfb 100644 +--- a/googletest/cmake/internal_utils.cmake ++++ b/googletest/cmake/internal_utils.cmake +@@ -84,13 +84,13 @@ macro(config_compiler_and_linker) + # Ensure MSVC treats source files as UTF-8 encoded. + set(cxx_base_flags "${cxx_base_flags} -utf-8") + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- set(cxx_base_flags "-Wall -Wshadow -Werror -Wconversion") ++ set(cxx_base_flags "-Wall -Wshadow -Wconversion") + set(cxx_exception_flags "-fexceptions") + set(cxx_no_exception_flags "-fno-exceptions") + set(cxx_strict_flags "-W -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wunused-parameter -Wcast-align -Wchar-subscripts -Winline -Wredundant-decls") + set(cxx_no_rtti_flags "-fno-rtti") + elseif (CMAKE_COMPILER_IS_GNUCXX) +- set(cxx_base_flags "-Wall -Wshadow -Werror") ++ set(cxx_base_flags "-Wall -Wshadow") + if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0) + set(cxx_base_flags "${cxx_base_flags} -Wno-error=dangling-else") + endif() diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index 100b83fadc877a..25a80dcf42b096 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,7 +1,18 @@ { "name": "gtest", "version-semver": "1.11.0", - "port-version": 3, + "port-version": 4, "description": "GoogleTest and GoogleMock testing frameworks", - "homepage": "https://github.com/google/googletest" + "homepage": "https://github.com/google/googletest", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 46ecd7539f286e..c8709738dfb7ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2650,7 +2650,7 @@ }, "gtest": { "baseline": "1.11.0", - "port-version": 3 + "port-version": 4 }, "gtk": { "baseline": "4.6.0", diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index ee080567eb7e42..00c8edbccc34e5 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b9432e429e940c2d86eeef6fcf03bc74418c4c5", + "version-semver": "1.11.0", + "port-version": 4 + }, { "git-tree": "bc195b45d4d766498fb51de96427835c7c4d5748", "version-semver": "1.11.0", From 61efb16e6c3fb21d8d38941f419d7c4179afdb3e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 28 Mar 2022 22:32:04 +0200 Subject: [PATCH 069/217] [ezc3d] Update and fix port (#23781) * Update to ezc3d 1.4.7 * Revise portfile * Update versions --- ports/ezc3d/portfile.cmake | 40 +++++++++++++------------------------- ports/ezc3d/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/e-/ezc3d.json | 5 +++++ 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/ports/ezc3d/portfile.cmake b/ports/ezc3d/portfile.cmake index 3c402b6f9cb6d7..8a334db2a861a3 100644 --- a/ports/ezc3d/portfile.cmake +++ b/ports/ezc3d/portfile.cmake @@ -1,39 +1,27 @@ -vcpkg_from_github(ARCHIVE +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pyomeca/ezc3d - REF Release_1.4.6 - SHA512 f63da7e715c09c6a757fe923fd397c09e1cbd0a58a78b1d8fa52bd1a41230ecab2cbb17ecc3d4f66656f3234bfe4c8588164f1d4964dcce729da091e99daab2d + REF Release_1.4.7 + SHA512 ba234be76b5d95b9527952c7e1bf67d9725fc280bf991f45e7cbd68f1aeeab7e963c8c4d928e720d02ebc02ec2b0e41f1c28036cd728ccb4c5a77c6fa81a74ad HEAD_REF dev ) -if(WIN32) - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_EXAMPLE=OFF - -Dezc3d_LIB_FOLDER="lib" - -Dezc3d_BIN_FOLDER="bin" - ) -else() - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_EXAMPLE=OFF - ) -endif() - +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-Dezc3d_BIN_FOLDER=bin" + "-Dezc3d_LIB_FOLDER=lib" + -DBUILD_EXAMPLE=OFF +) vcpkg_cmake_install() +vcpkg_copy_pdbs() -if(WIN32) +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_cmake_config_fixup(CONFIG_PATH "CMake") else() - vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ezc3d") endif() -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -# # Remove duplicated include directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ezc3d/vcpkg.json b/ports/ezc3d/vcpkg.json index 36a9afbf17dc69..aa503641fcd709 100644 --- a/ports/ezc3d/vcpkg.json +++ b/ports/ezc3d/vcpkg.json @@ -1,8 +1,9 @@ { "name": "ezc3d", - "version": "1.4.6", + "version": "1.4.7", "description": "C3D reader/writer", "homepage": "https://github.com/pyomeca/ezc3d", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index c8709738dfb7ac..c97d12b419a10f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2097,7 +2097,7 @@ "port-version": 2 }, "ezc3d": { - "baseline": "1.4.6", + "baseline": "1.4.7", "port-version": 0 }, "faad2": { diff --git a/versions/e-/ezc3d.json b/versions/e-/ezc3d.json index 27adf4358083a5..116bab01aad63b 100644 --- a/versions/e-/ezc3d.json +++ b/versions/e-/ezc3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21ec5f8371f785c406c466171aadff744e2b34e2", + "version": "1.4.7", + "port-version": 0 + }, { "git-tree": "555219f96920ec01fc38ecd89e0a19188206be22", "version": "1.4.6", From f0cb4229c6e49ddca2cd5abc42b029905cc745f3 Mon Sep 17 00:00:00 2001 From: ZeeWanderer Date: Mon, 28 Mar 2022 23:35:15 +0300 Subject: [PATCH 070/217] [osgearth] port patch (#23786) * [osgearth] port patch * [osgearth] update versions --- ports/osgearth/blend2d-fix.patch | 15 +++++++++++++++ ports/osgearth/portfile.cmake | 1 + ports/osgearth/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/osgearth.json | 5 +++++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ports/osgearth/blend2d-fix.patch diff --git a/ports/osgearth/blend2d-fix.patch b/ports/osgearth/blend2d-fix.patch new file mode 100644 index 00000000000000..2b706573ef7305 --- /dev/null +++ b/ports/osgearth/blend2d-fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/osgEarth/FeatureRasterizer.cpp b/src/osgEarth/FeatureRasterizer.cpp +index 84007aee9..de8e511df 100644 +--- a/src/osgEarth/FeatureRasterizer.cpp ++++ b/src/osgEarth/FeatureRasterizer.cpp +@@ -245,8 +245,8 @@ namespace osgEarth { + }); + + Color color(Color::White); +- uint32_t cap = BL_STROKE_CAP_ROUND; +- uint32_t join = BL_STROKE_JOIN_ROUND; ++ auto cap = BL_STROKE_CAP_ROUND; ++ auto join = BL_STROKE_JOIN_ROUND; + + if (symbol->stroke().isSet()) + { diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 7d49d9ac370d3e..edc87e6eb42458 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_github( remove-tool-debug-suffix.patch fix-imgui.patch fix-gcc11-compilation.patch + blend2d-fix.patch ) # Upstream bug, see https://github.com/gwaldron/osgearth/issues/1002 diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 3d0ca822204074..f9dcae84cef2af 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osgearth", "version": "3.2", - "port-version": 3, + "port-version": 4, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "supports": "!(x86 | wasm32)", diff --git a/versions/baseline.json b/versions/baseline.json index c97d12b419a10f..ec0cf6e0a71af8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5210,7 +5210,7 @@ }, "osgearth": { "baseline": "3.2", - "port-version": 3 + "port-version": 4 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 7c76807e2496c6..80893cbe434fbe 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99b20c5ff2821870694fdc973b7f44d4b54db2ba", + "version": "3.2", + "port-version": 4 + }, { "git-tree": "2e3d8cf49728cdb23060f31152768a2292c24ab8", "version": "3.2", From b4bf366c7ac1ec3ce358eddb543e39676c57f904 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Mon, 28 Mar 2022 16:36:33 -0400 Subject: [PATCH 071/217] [mbedtls] Update to latest 2.x LTS version (#23787) * [mbedtls] Update to latest 2.28 LTS version * Update version --- ports/mbedtls/portfile.cmake | 13 ++++++------- ports/mbedtls/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 4 ++-- versions/m-/mbedtls.json | 5 +++++ 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index a6f1e152b53868..1f65fff5ba4eb0 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -3,9 +3,9 @@ set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ARMmbed/mbedtls - REF 523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8 # mbedtls-2.24.0 - SHA512 1ce78f34e8d87c2ce0454e0a08f4c6e5b3129d4b24cfa44162af21c2e8b5dc7feabf849e4fa547ce3781b5ce11aaf675cfed47412bae40091fbdd87bbcdbee07 - HEAD_REF master + REF 8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0 # mbedtls-2.28.0 + SHA512 a5d2694ae87347be7ebf5c32b86d7bb809cc696b549947efb3d12d41d5f726d4f7caed3cc6ee3f3c9b9e46b3c42c4ce8a5f9741b1b0a3c644b6ae615d2f4c55a + HEAD_REF mbedtls-2.28 PATCHES enable-pthread.patch ) @@ -13,12 +13,11 @@ vcpkg_from_github( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - pthreads ENABLE_PTHREAD + pthreads ENABLE_PTHREAD ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DENABLE_TESTING=OFF @@ -26,7 +25,7 @@ vcpkg_configure_cmake( -DMBEDTLS_FATAL_WARNINGS=FALSE ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/mbedtls/vcpkg.json b/ports/mbedtls/vcpkg.json index d3079e1259afb4..93c0e9b222b4fa 100644 --- a/ports/mbedtls/vcpkg.json +++ b/ports/mbedtls/vcpkg.json @@ -1,10 +1,20 @@ { "name": "mbedtls", - "version": "2.24.0", - "port-version": 4, + "version": "2.28.0", "description": "An open source, portable, easy to use, readable and flexible SSL library", "homepage": "https://github.com/ARMmbed/mbedtls", + "license": "Apache-2.0", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "pthreads": { "description": "Multi-threading support", diff --git a/versions/baseline.json b/versions/baseline.json index ec0cf6e0a71af8..9f1a353be9058e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4397,8 +4397,8 @@ "port-version": 0 }, "mbedtls": { - "baseline": "2.24.0", - "port-version": 4 + "baseline": "2.28.0", + "port-version": 0 }, "mcpp": { "baseline": "2.7.2.14", diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json index f1e254f7f5c03f..440fc362ea25de 100644 --- a/versions/m-/mbedtls.json +++ b/versions/m-/mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50e6870207f6a1f0b1e2197978b4403de775eac2", + "version": "2.28.0", + "port-version": 0 + }, { "git-tree": "676b36c2f6fc72a2fbbbe521ae46fdefe5db67ca", "version": "2.24.0", From d97abe65b5bdcfdef3e955a831ede1e086415027 Mon Sep 17 00:00:00 2001 From: talregev Date: Mon, 28 Mar 2022 23:38:29 +0300 Subject: [PATCH 072/217] Update sockpp to 0.7.1 (#23790) --- ports/sockpp/portfile.cmake | 4 ++-- ports/sockpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sockpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/sockpp/portfile.cmake b/ports/sockpp/portfile.cmake index dae3ff31943876..f9af412b42dde3 100644 --- a/ports/sockpp/portfile.cmake +++ b/ports/sockpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fpagliughi/sockpp - REF 4c57ef4a30a9d8e6fda89cf07410066d2cee12f8 - SHA512 0b3031e792b2bc58d868b7dd2462c06f184547e4e094ce395ee1cd2496e1e505f767d8389ce17ecf3d8fb838abae8282c911201f1730cffbf0357a09addab776 + REF 999ad87296e34d5a8e4edf15d985315d0d84eda7 + SHA512 159b9288f45d5f5144a002f35caf520e55a66c2d45cdb1fe325021f100db0770601e973b86ec5b032e5bea1542203b30eba3e6be20e03c78f0504b62da1900b3 HEAD_REF master ) diff --git a/ports/sockpp/vcpkg.json b/ports/sockpp/vcpkg.json index ef8fc05ffa38f9..c985086f14128b 100644 --- a/ports/sockpp/vcpkg.json +++ b/ports/sockpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sockpp", - "version-date": "2022-01-24", + "version": "0.7.1", "description": "Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages.", "homepage": "https://github.com/fpagliughi/sockpp", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 9f1a353be9058e..28777e0a79c9f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6541,7 +6541,7 @@ "port-version": 0 }, "sockpp": { - "baseline": "2022-01-24", + "baseline": "0.7.1", "port-version": 0 }, "soem": { diff --git a/versions/s-/sockpp.json b/versions/s-/sockpp.json index dd37bb850e19b4..d54217a9c59dd8 100644 --- a/versions/s-/sockpp.json +++ b/versions/s-/sockpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d54d2c1ee9ebaae60a83c72c50207b83d56f3917", + "version": "0.7.1", + "port-version": 0 + }, { "git-tree": "18dad1cf56b14fdf423311b6f277014e0c3f6762", "version-date": "2022-01-24", From fed5cf1d9baa48978d7ca03d11a2afd213f6ddff Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 28 Mar 2022 22:39:28 +0200 Subject: [PATCH 073/217] [folly-fbthrift2] no absolute paths (#23792) --- .../add-missing-algorithm-include.patch | 28 ------------------- ports/fbthrift/portfile.cmake | 10 ++++--- ports/fbthrift/vcpkg.json | 3 +- ports/fizz/portfile.cmake | 4 +-- ports/fizz/vcpkg.json | 2 +- ports/folly/portfile.cmake | 4 +-- ports/folly/vcpkg.json | 3 +- ports/mvfst/portfile.cmake | 4 +-- ports/mvfst/vcpkg.json | 3 +- ports/proxygen/portfile.cmake | 4 +-- ports/proxygen/vcpkg.json | 2 +- ports/wangle/portfile.cmake | 4 +-- ports/wangle/vcpkg.json | 2 +- versions/baseline.json | 18 ++++++------ versions/f-/fbthrift.json | 5 ++++ versions/f-/fizz.json | 5 ++++ versions/f-/folly.json | 5 ++++ versions/m-/mvfst.json | 5 ++++ versions/p-/proxygen.json | 5 ++++ versions/w-/wangle.json | 5 ++++ 20 files changed, 61 insertions(+), 60 deletions(-) delete mode 100644 ports/fbthrift/add-missing-algorithm-include.patch diff --git a/ports/fbthrift/add-missing-algorithm-include.patch b/ports/fbthrift/add-missing-algorithm-include.patch deleted file mode 100644 index 311a8f09619890..00000000000000 --- a/ports/fbthrift/add-missing-algorithm-include.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f2151fa730058a1baf23ed3dc082c91df6351da1 Mon Sep 17 00:00:00 2001 -From: "Zeyi (Rice) Fan" -Date: Fri, 4 Feb 2022 15:17:53 -0800 -Subject: [PATCH] fix build failure on Windows - -Summary: Fix a build error on Windows where `std::mismatch` is not found. - -Reviewed By: xavierd - -Differential Revision: D34012963 - -fbshipit-source-id: 9f5aa21d03a92fdadf5bc83943a159a2f7872144 ---- - thrift/compiler/generate/build_templates.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/thrift/compiler/generate/build_templates.cc b/thrift/compiler/generate/build_templates.cc -index 56f13e8dde8..acd9dd30a75 100644 ---- a/thrift/compiler/generate/build_templates.cc -+++ b/thrift/compiler/generate/build_templates.cc -@@ -14,6 +14,7 @@ - * limitations under the License. - */ - -+#include - #include - #include - #include diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index bda0676fd08147..3cafd5feb91862 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift - REF v2022.01.31.00 - SHA512 159457398fdc0c89c34364b8a89068127c3519ce35af349776016e0ae37ae9508689853e0e371c2065fd715451f466e37c7e3799e054eca02cbc4717809150ab + REF v2022.03.21.00 + SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab HEAD_REF master - PATCHES - add-missing-algorithm-include.patch # https://github.com/facebook/fbthrift/commit/f2151fa730058a1baf23ed3dc082c91df6351da1 ) vcpkg_cmake_configure( @@ -41,6 +39,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/visitation/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/server/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation" @@ -58,5 +57,8 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftConfig.cmake") "${PACKAGE_PREFIX_DIR}/bin/thrift1" "${PACKAGE_PREFIX_DIR}/tools/fbthrift/thrift1") endif() +# Only used internally and removed in master +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fbthrift/FBThriftTargets.cmake" "LOCATION_HH=\\\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/thrift/compiler/location.hh\\\"" "") + # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index c7c4b3aeaa6aed..8e95527876dc25 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fbthrift", - "version-string": "2022.01.31.00", - "port-version": 2, + "version-string": "2022.03.21.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index bf0eb4a468b325..1fe719a785dad2 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz - REF v2022.01.31.00 - SHA512 544f843f47cb6113d0ad804079e6d767f33723d9d529c2751c5c6317d65c35bd327b43852904b2a37c2af615276176fe2de667907a9a460c0dfc7593eca46459 + REF v2022.03.21.00 + SHA512 81a7b764c2c2e17fd5df32a69ecb368eb01df04df6dbd1155a40b68fc39cda4f86ce81afc5c89425a5751ef7f4dbb8a40df8b5095685e72ce5e9043c0a74682e HEAD_REF master PATCHES 0001-fix-libsodium.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index 3688b945eb5f49..84d086bf1bc076 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2022.01.31.00", + "version-string": "2022.03.21.00", "port-version": 1, "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index be3a59bf4866c7..79536aae799d99 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2022.01.31.00 - SHA512 fef065c8a879e5b80eb521eaa09d2ac4eb22563e759834e60f665f07df5c2863c76217798680381bc51fad8c44f4b5d5abfb924a94c89635a41708abf6d70133 + REF v2022.03.21.00 + SHA512 4e0fda55f007179883af30024fe1d389642159b1b4c915f7ef1a3c1003c8c52e2370f53ffa79d5fa75533d33becfb946d2bcbb2abdc62b9a297f977403d13dd7 HEAD_REF main PATCHES reorder-glog-gflags.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 9c5c1941625b7e..dd9c35fec786c3 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,6 @@ { "name": "folly", - "version-string": "2022.01.31.00", - "port-version": 1, + "version-string": "2022.03.21.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index b830c685883366..79dbbeba3d6dfb 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/mvfst - REF e569853 - SHA512 66697d8149defe43f7b91ed509117a6330556ad89dfb64a3a778c6cdd706f01d8df7d356e2896d04dffc91e51c68735283b2a27915f3d909834dd0b0a95640de + REF 7c52380a5c445fe478096d7ca10e92797747ae87 + SHA512 5ccebec9652e7a481b599b20a07b0d6585d300cdde3e6b62985c5ce448c0890d537bced6c9dbd77009f89c16311c56fde1f2131064ff5cc3fcb34bf69cb11f06 HEAD_REF main ) diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index 3e91aee1d2b2e1..4e3df9f61eceb0 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mvfst", - "version": "0.2", - "port-version": 1, + "version-date": "2022-03-27", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebookincubator/mvfst", "supports": "!windows", diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 445e6e25bf505e..0901716a122b05 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF v2022.01.31.00 - SHA512 f340466fb52e01bb71289f7cf1e8aee2ef8a0d5db21998ea85aaf07b128144de05747ececcac65e99d1d452bddc0d0dc60ba17087311c8337e31fbdda6f4ce3a + REF v2022.03.21.00 + SHA512 66dfd40e45b884d64be9c06b110caaa9333116c402312ee8eb0c21f0ab569ea31b9e4fb676c68b96730abbff0b74d139f5e39e702cd958c24ce0fe76f353fbe9 HEAD_REF master PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 6221e52a37de54..3b1ce8a4d4cbb5 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2022.01.31.00", + "version-string": "2022.03.21.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "supports": "!windows", diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index db56a648edffa4..bf8313befecfdd 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF v2022.01.31.00 - SHA512 bb0ce38e7a54c094a828dbf75c0b719e49b2c39420bb648d54dbc13a083c982c31f104903d8d93558e254bdf1133dbf320f170a83c30fec78bdb9eeaf085a10a + REF v2022.03.21.00 + SHA512 069fe7758ccb2f33665f53109047f2e0158e248fda8c760eddd978afd6980acbc6421db60721bf320deca557369377c8757f13c67f8685e3a98394324e75e72e HEAD_REF master PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index ed42769bf0f268..fb51f4338a1ea7 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2022.01.31.00", + "version-string": "2022.03.21.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 28777e0a79c9f3..63157add8b1066 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2161,8 +2161,8 @@ "port-version": 3 }, "fbthrift": { - "baseline": "2022.01.31.00", - "port-version": 2 + "baseline": "2022.03.21.00", + "port-version": 0 }, "fcl": { "baseline": "0.7.0", @@ -2197,7 +2197,7 @@ "port-version": 1 }, "fizz": { - "baseline": "2022.01.31.00", + "baseline": "2022.03.21.00", "port-version": 1 }, "flann": { @@ -2253,8 +2253,8 @@ "port-version": 1 }, "folly": { - "baseline": "2022.01.31.00", - "port-version": 1 + "baseline": "2022.03.21.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", @@ -4685,8 +4685,8 @@ "port-version": 5 }, "mvfst": { - "baseline": "0.2", - "port-version": 1 + "baseline": "2022-03-27", + "port-version": 0 }, "mygui": { "baseline": "3.4.1", @@ -5553,7 +5553,7 @@ "port-version": 1 }, "proxygen": { - "baseline": "2022.01.31.00", + "baseline": "2022.03.21.00", "port-version": 0 }, "psimd": { @@ -7373,7 +7373,7 @@ "port-version": 3 }, "wangle": { - "baseline": "2022.01.31.00", + "baseline": "2022.03.21.00", "port-version": 0 }, "wavelib": { diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index e54a4e83efa7d6..2418aeecd53aed 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cd01b0f0f6c77c87eea5331b75b01c9e9a20e2c", + "version-string": "2022.03.21.00", + "port-version": 0 + }, { "git-tree": "228608a7708d80532948eec3a0987f2e85e4a43c", "version-string": "2022.01.31.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 13c383d1583429..77febcf198a51c 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a4e5784b588827080b88e75299923149b842c4d", + "version-string": "2022.03.21.00", + "port-version": 1 + }, { "git-tree": "57fdd6342f89ccc3569b1a3416be67cd8dd7b59d", "version-string": "2022.01.31.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 112c1639c645f7..ab08aaad8da4c2 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb704ec83012c1ef40ba934b0d5f3ae45471e4bd", + "version-string": "2022.03.21.00", + "port-version": 0 + }, { "git-tree": "10d3306d94114d0916a4691c131e233c08dc9090", "version-string": "2022.01.31.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index 707fce61700c87..54b8bdcd4ccae3 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b054de2d05773c286f25528132a496dd075d3914", + "version-date": "2022-03-27", + "port-version": 0 + }, { "git-tree": "042a5236f46c787daf8334a8ca9c0cd3f71ab1b4", "version": "0.2", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index cb1289d40e6159..6a445cf43a3506 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d4554283cc0401f123164636046763fa9808475", + "version-string": "2022.03.21.00", + "port-version": 0 + }, { "git-tree": "d17fc3eb415126e6e9d5d77eb2de69ffd3c30869", "version-string": "2022.01.31.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index e52206307b869a..d764dcfead5c76 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f0fec69eddf934964ee77b9923f68da2c3c7724", + "version-string": "2022.03.21.00", + "port-version": 0 + }, { "git-tree": "387fe8f00443c17cf01fe0ebc235dd8cc5dd3f03", "version-string": "2022.01.31.00", From 33961bb0edc709bdd0000dd08756f59ddfbd7db2 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 28 Mar 2022 22:40:11 +0200 Subject: [PATCH 074/217] [armadillo] no absolute paths (#23793) --- ports/armadillo/portfile.cmake | 2 +- ports/armadillo/vcpkg.json | 2 +- versions/a-/armadillo.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 30030dcd8e65b0..aa501fc5d57314 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -44,7 +44,7 @@ endif() set(filename "${CURRENT_PACKAGES_DIR}/include/armadillo_bits/config.hpp") if(EXISTS "${filename}") file(READ "${filename}" contents) - string(REGEX REPLACE "\n#define ARMA_AUX_LIBS [^\\n]*\n" "\n" contents "${contents}") + string(REGEX REPLACE "\n#define ARMA_AUX_LIBS [^\n]*\n" "\n" contents "${contents}") file(WRITE "${filename}" "${contents}") endif() diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index 7cceca21897898..27e432049a8852 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "armadillo", "version": "10.6.2", - "port-version": 4, + "port-version": 5, "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", "homepage": "http://arma.sourceforge.net", "dependencies": [ diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 51a586f56ea946..395d93271eca38 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb3b2fb5c5daeea857a0b9952dbef5c980fa14c9", + "version": "10.6.2", + "port-version": 5 + }, { "git-tree": "ddc4477e6ecc2d66e429e18e9ccd96367da2ce88", "version": "10.6.2", diff --git a/versions/baseline.json b/versions/baseline.json index 63157add8b1066..52c2cab6bfc13e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -162,7 +162,7 @@ }, "armadillo": { "baseline": "10.6.2", - "port-version": 4 + "port-version": 5 }, "arrayfire": { "baseline": "3.8.0", From e71f053e1d05d0d8077586fb797fedd9dcf02665 Mon Sep 17 00:00:00 2001 From: Sandy Date: Mon, 28 Mar 2022 16:42:25 -0400 Subject: [PATCH 075/217] [bullet3] Update to 3.22 (#23801) * [bullet3]: Add zlib license to manifest file * [bullet3] Update to 3.22 Remove both patches which have been merged. --- ports/bullet3/portfile.cmake | 6 ++--- ports/bullet3/uwp-deltav-fix.patch | 26 ---------------------- ports/bullet3/vcpkg.json | 4 ++-- ports/bullet3/windows-arm64-sse-fix.patch | 27 ----------------------- versions/b-/bullet3.json | 5 +++++ versions/baseline.json | 4 ++-- 6 files changed, 11 insertions(+), 61 deletions(-) delete mode 100644 ports/bullet3/uwp-deltav-fix.patch delete mode 100644 ports/bullet3/windows-arm64-sse-fix.patch diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 42be5fd5502b6d..4c70019d3061e5 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -3,13 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bulletphysics/bullet3 - REF 3.17 - SHA512 a5105bf5f1dd365a64a350755c7d2c97942f74897a18dcdb3651e6732fd55cc1030a096f5808cf50575281f05e3ac09aa50a48d271a47b94cd61f5167a72b7cc + REF 3.22 + SHA512 edacf643ca9621523812effe69a7499716bc65282c58c1f5b4eb4f17b2b1ab55a4f71b06a73483f57e57a5b032c234d09ba5fab9881321f2cbc3c27b43fdc95d HEAD_REF master PATCHES cmake-fix.patch - windows-arm64-sse-fix.patch - uwp-deltav-fix.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/bullet3/uwp-deltav-fix.patch b/ports/bullet3/uwp-deltav-fix.patch deleted file mode 100644 index 4df866b9119a6c..00000000000000 --- a/ports/bullet3/uwp-deltav-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 35264f81bb63c4d4e5cf195e3b9db7ea6b761396 Mon Sep 17 00:00:00 2001 -From: Sandy Carter -Date: Sun, 20 Mar 2022 15:46:58 -0400 -Subject: [PATCH] UWP: Fix potentially uninitialized local pointer variable - error - ---- - src/BulletSoftBody/btSoftBody.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/BulletSoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp -index 933f3edc5..e91c1b9a4 100644 ---- a/src/BulletSoftBody/btSoftBody.cpp -+++ b/src/BulletSoftBody/btSoftBody.cpp -@@ -3897,7 +3897,7 @@ void btSoftBody::PSolve_RContacts(btSoftBody* psb, btScalar kst, btScalar ti) - btVector3 va(0, 0, 0); - btRigidBody* rigidCol = 0; - btMultiBodyLinkCollider* multibodyLinkCol = 0; -- btScalar* deltaV; -+ btScalar* deltaV = NULL; - - if (cti.m_colObj->getInternalType() == btCollisionObject::CO_RIGID_BODY) - { --- -2.35.1 - diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json index ec7966767267f2..50853901d10597 100644 --- a/ports/bullet3/vcpkg.json +++ b/ports/bullet3/vcpkg.json @@ -1,9 +1,9 @@ { "name": "bullet3", - "version": "3.17", - "port-version": 5, + "version": "3.22", "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", "homepage": "https://github.com/bulletphysics/bullet3", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/bullet3/windows-arm64-sse-fix.patch b/ports/bullet3/windows-arm64-sse-fix.patch deleted file mode 100644 index cecea6ff3b9849..00000000000000 --- a/ports/bullet3/windows-arm64-sse-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e4414c80232d66f8a250aa83f934594bcba3c605 Mon Sep 17 00:00:00 2001 -From: Sandy -Date: Sun, 20 Mar 2022 15:41:07 -0400 -Subject: [PATCH] Fix compile on windows 64 bit arm architecture - -When building 64 bit arm with visual studio, btScalar will try to include SSE headers meant for x86 and x64 architectures. -This gives the following error in many source files: -``` -C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.31.31103\include\emmintrin.h(20): fatal error C1189: #error: This header is specific to X86 and X64 targets -``` ---- - src/LinearMath/btScalar.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h -index 28c03b2868..e47baadd6b 100644 ---- a/src/LinearMath/btScalar.h -+++ b/src/LinearMath/btScalar.h -@@ -107,7 +107,7 @@ inline int btIsDoublePrecision() - #define btFsel(a,b,c) __fsel((a),(b),(c)) - #else - --#if defined (_M_ARM) -+#if defined (_M_ARM) || defined (_M_ARM64) - //Do not turn SSE on for ARM (may want to turn on BT_USE_NEON however) - #elif (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION)) - diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json index 6ac41d9e06bcf0..073216c264162a 100644 --- a/versions/b-/bullet3.json +++ b/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d196c1956b370bd43889ddf5279600092e1af718", + "version": "3.22", + "port-version": 0 + }, { "git-tree": "f526f9d9698251590883fcc52ac8bf0f7ef9c5a4", "version": "3.17", diff --git a/versions/baseline.json b/versions/baseline.json index 52c2cab6bfc13e..3b48c17b966f84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1173,8 +1173,8 @@ "port-version": 1 }, "bullet3": { - "baseline": "3.17", - "port-version": 5 + "baseline": "3.22", + "port-version": 0 }, "bustache": { "baseline": "1.1.0", From 9b7e03938d7211b7605879fd3d114367e8564d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 28 Mar 2022 22:43:39 +0200 Subject: [PATCH 076/217] [mimalloc] Update the CMake configuration options (#23802) * [mimalloc] Portfile configuration fixes and improvements * [mimalloc] Update version files --- ports/mimalloc/fix-cmake.patch | 12 +----------- ports/mimalloc/portfile.cmake | 6 ++---- ports/mimalloc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/mimalloc.json | 5 +++++ 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/ports/mimalloc/fix-cmake.patch b/ports/mimalloc/fix-cmake.patch index eb43278d04b58e..dc8740a0a40249 100644 --- a/ports/mimalloc/fix-cmake.patch +++ b/ports/mimalloc/fix-cmake.patch @@ -9,18 +9,8 @@ endif() - install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) ++ install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${mi_install_libdir} NAMELINK_SKIP) install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) -+ install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION lib RUNTIME DESTINATION bin LIBRARY DESTINATION lib NAMELINK_SKIP) endif() # static library -@@ -370,9 +370,6 @@ # install(TARGETS mimalloc-obj EXPORT mimalloc DESTINATION ${mi_install_objdir}) - - # the FILES expression can also be: $ - # but that fails cmake versions less than 3.10 so we leave it as is for now -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION} -- DESTINATION ${mi_install_objdir} -- RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} ) - endif() - - # ----------------------------------------------------------------------------- diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index ff0f06366fb238..c1a47d2bdf4b3e 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -24,15 +24,13 @@ vcpkg_cmake_configure( OPTIONS_RELEASE -DMI_DEBUG_FULL=OFF OPTIONS - -DMI_INTERPOSE=ON - -DMI_USE_CXX=OFF + -DMI_USE_CXX=ON -DMI_BUILD_TESTS=OFF + -DMI_BUILD_OBJECT=OFF ${FEATURE_OPTIONS} -DMI_BUILD_STATIC=${MI_BUILD_STATIC} -DMI_BUILD_SHARED=${MI_BUILD_SHARED} -DMI_INSTALL_TOPLEVEL=ON - MAYBE_UNUSED_VARIABLES - MI_INTERPOSE ) vcpkg_cmake_install() diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 31f7d57b752ca5..1a9c98b72160b0 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mimalloc", "version": "2.0.5", + "port-version": 1, "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 3b48c17b966f84..52f8efe6900276 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4470,7 +4470,7 @@ }, "mimalloc": { "baseline": "2.0.5", - "port-version": 0 + "port-version": 1 }, "minc": { "baseline": "2.4.03", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index 8c6494be1d8d57..d5427e0d180c94 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4dc5fc89e8c1f860b9f07b3d449a5d67f56cfd4", + "version": "2.0.5", + "port-version": 1 + }, { "git-tree": "370692d9dc2cb2bc9f013041003e069e47febb67", "version": "2.0.5", From 16659d00274c7425022c9f2a8c6fdc7245b6052b Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 29 Mar 2022 04:44:37 +0800 Subject: [PATCH 077/217] [FluidSynth] update to 2.2.6 (#23808) * [FluidSynth] update to 2.2.6 * add version * update version --- ports/fluidsynth/portfile.cmake | 4 ++-- ports/fluidsynth/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/f-/fluidsynth.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index d237b8d4a30e46..fd9f48d465e8b4 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth - REF 6c807bdd37748411801e93c48fcd5789d5a6a278 #v2.2.4 - SHA512 5fab3b4d58fa47825cf6afc816828fb57879523b8d7659fb20deacdf5439e74fd4b0f2b3f03a8db89cc4106b3b36f2ec450a858e02af30245b6413db70060a11 + REF 8b00644751578ba67b709a827cbe5133d849d339 #v2.2.6 + SHA512 37361c6fdbb54eba78e59f03c9ca702129f0fb522721dfb4e744fdc9a8721e665728fa5606bc68c2fb2ce971b4829cfc472f0a7cd72ce3fe14b3a335b098f7ec HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index 19da38b9419270..0cb01fc4bf469f 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,9 +1,9 @@ { "name": "fluidsynth", - "version": "2.2.4", - "port-version": 1, + "version": "2.2.6", "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", + "license": "LGPL-2.1-or-later", "dependencies": [ { "name": "fluidsynth", diff --git a/versions/baseline.json b/versions/baseline.json index 52f8efe6900276..ebb32b7506b840 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2233,8 +2233,8 @@ "port-version": 2 }, "fluidsynth": { - "baseline": "2.2.4", - "port-version": 1 + "baseline": "2.2.6", + "port-version": 0 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 09153fa1a04dbe..8b85a542fe4951 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7740f8dfb97fa273a9f9ed740ade48f9953ff393", + "version": "2.2.6", + "port-version": 0 + }, { "git-tree": "5ffab5df62c9846a6daa5acbd13fd6966594ed77", "version": "2.2.4", From 2be25464ed42e2fae2a4ea33e0fd8da50e54191b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 29 Mar 2022 04:51:28 +0800 Subject: [PATCH 078/217] [nsync] Export cmake targets (#23811) * [nsync] Export cmake targets * version * Forgot the patch * version * Also export the include path * version --- ports/nsync/export-targets.patch | 36 ++++++++++++++++++++++++++++++++ ports/nsync/portfile.cmake | 14 +++++++------ ports/nsync/vcpkg.json | 14 ++++++++++++- versions/baseline.json | 2 +- versions/n-/nsync.json | 5 +++++ 5 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 ports/nsync/export-targets.patch diff --git a/ports/nsync/export-targets.patch b/ports/nsync/export-targets.patch new file mode 100644 index 00000000000000..cbae3d366b1288 --- /dev/null +++ b/ports/nsync/export-targets.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 328f9b6..6a71b5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,9 @@ function (set_cpp_target tgtname files) + "${PROJECT_SOURCE_DIR}/platform/c++11.futex" + ) + endif () ++ ++ target_include_directories("${tgtname}" PUBLIC $) ++ + + target_compile_definitions ("${tgtname}" PRIVATE "${NSYNC_CPP_DEFINITIONS}") + +@@ -399,14 +402,19 @@ endif () + # By default, install nsync always + # set (CMAKE_SKIP_INSTALL_ALL_DEPENDENCY ON) + +-install (TARGETS nsync ++install (TARGETS nsync EXPORT unofficial-nsyncConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) + +-install (TARGETS nsync_cpp OPTIONAL ++install (TARGETS nsync_cpp OPTIONAL EXPORT unofficial-nsyncConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) + ++install(EXPORT unofficial-nsyncConfig ++ NAMESPACE unofficial::nsync:: ++ DESTINATION share/unofficial-nsync ++) ++ + set (NSYNC_INCLUDES + "public/nsync.h" + "public/nsync_atomic.h" diff --git a/ports/nsync/portfile.cmake b/ports/nsync/portfile.cmake index 65abd9c87f5239..fe2ff4d5157c2e 100644 --- a/ports/nsync/portfile.cmake +++ b/ports/nsync/portfile.cmake @@ -10,16 +10,18 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-install.patch + export-targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNSYNC_ENABLE_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nsync CONFIG_PATH share/unofficial-nsync) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nsync/vcpkg.json b/ports/nsync/vcpkg.json index 292da006c9059a..54c24f43f12149 100644 --- a/ports/nsync/vcpkg.json +++ b/ports/nsync/vcpkg.json @@ -1,6 +1,18 @@ { "name": "nsync", "version": "1.24.0", + "port-version": 1, "description": "nsync is a C library that exports various synchronization primitives, such as mutexes", - "homepage": "https://github.com/google/nsync" + "homepage": "https://github.com/google/nsync", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ebb32b7506b840..ba5357f795cf4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4862,7 +4862,7 @@ }, "nsync": { "baseline": "1.24.0", - "port-version": 0 + "port-version": 1 }, "nt-wrapper": { "baseline": "2019-08-10", diff --git a/versions/n-/nsync.json b/versions/n-/nsync.json index 44af83133ddb9f..e88b93ba9e19d3 100644 --- a/versions/n-/nsync.json +++ b/versions/n-/nsync.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2333cb932309608aa164aadaacb8d4592c71068", + "version": "1.24.0", + "port-version": 1 + }, { "git-tree": "65f07dbc95a609c95de7befffbf37da598652cee", "version": "1.24.0", From fa4685031dd00ee304b1a497820d936820519f93 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 28 Mar 2022 13:52:09 -0700 Subject: [PATCH 079/217] [directxtk, directxtk12, directxmesh, directxtex, uvatlas] ports updates March 2022 (#23791) * [directxtk, directxtk12, directxmesh, directxtex, uvatlas] ports updated for March 2022 releases * Update baseline --- ports/directxmesh/portfile.cmake | 12 ++++++------ ports/directxmesh/vcpkg.json | 2 +- ports/directxtex/portfile.cmake | 28 ++++++++++++++-------------- ports/directxtex/vcpkg.json | 2 +- ports/directxtk/portfile.cmake | 20 ++++++++++---------- ports/directxtk/vcpkg.json | 2 +- ports/directxtk12/portfile.cmake | 20 ++++++++++---------- ports/directxtk12/vcpkg.json | 2 +- ports/uvatlas/portfile.cmake | 12 ++++++------ ports/uvatlas/vcpkg.json | 2 +- versions/baseline.json | 10 +++++----- versions/d-/directxmesh.json | 5 +++++ versions/d-/directxtex.json | 5 +++++ versions/d-/directxtk.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ versions/u-/uvatlas.json | 5 +++++ 16 files changed, 81 insertions(+), 56 deletions(-) diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index aaee42dc10e0dd..293a475e1956f9 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF feb2022 - SHA512 7a34ff8a484e5693efbc3e3f1ecb32978b32d71c6d795c0de14ee29fc61230213448039ac30f74d9836e1703cbcd6026b285e85984f0e30d8005c034d5419809 + REF mar2022 + SHA512 ec5cfcbba0f361a2a7d572284c77a88464fcf38a10b113f12b1e51a1c0c42a651abd6f8bbf257a3470b35c62c8d25af9a79925f2e0c79eb33a8b1c9ca6a9191b HEAD_REF main ) @@ -35,9 +35,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MESHCONVERT_EXE - URLS "https://github.com/Microsoft/DirectXMesh/releases/download/feb2022/meshconvert.exe" - FILENAME "meshconvert-feb2022.exe" - SHA512 687bec9c9f6c5fc08fc86370bb5b247f751c96fbbf047293364c75c43ec63a769ad737898a3b36acd95f7c3f6b0e97c756043d7a7ccdf750090594e1e2b97271 + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/mar2022/meshconvert.exe" + FILENAME "meshconvert-mar2022.exe" + SHA512 43b4305b73994eccc086bf1812147a5156359f5d927475b915bbf8edde70189cc419b96703aeb736f76d9d52037657f10ba0c104f9713c1f0defb28ce7a46ac1 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") @@ -46,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${MESHCONVERT_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-feb2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-mar2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 42cb9610bb5e3e..1180f4b5ee46c0 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2022-02-28", + "version-date": "2022-03-24", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 1a69224b023223..62e43378aacfd1 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF feb2022 - SHA512 7e30e38f97e944e49f5d2a6d3035d201016ac7ec5ca1042475485f7cbac165d66f4c5a2c84f2a47dad755c59b3f8947e1251b00b3e577fbc3e58f1957d8a224e + REF mar2022 + SHA512 04f898b2cf2c76edd400147db9144e196fc8441739de3293f8851952ce8153bab033deba52a0d35e51c4fbc9705ffe183f1606a0fae29970dc2babe65ed78e19 HEAD_REF main ) @@ -62,23 +62,23 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/feb2022/texassemble.exe" - FILENAME "texassemble-feb2022.exe" - SHA512 ea1f9fff62a5ebc9c33221852a843063d58405be7529f663e4567b138bca79e73e47b1e0fb6054c4e024a630323c72aba505eee35414cf14970c331afa9ff43f + URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texassemble.exe" + FILENAME "texassemble-mar2022.exe" + SHA512 2a2bec1f012ba6778d99f53a3b4f015f84e4ab76dd68a1980d77cdac588c60a21b30abbfc0de9f0b0ef790ef5ed8444f1648b80990053f8a1f967a04d20d3c33 ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/feb2022/texconv.exe" - FILENAME "texconv-feb2022.exe" - SHA512 1565f5a4bd08de88e01ece59df6658975bfd8551a912d65ac03c0ddd5ab536c8794811d3e49d14e8fe4c61fa2a6c9d50994d372f5d3efab7d9aeb6f3f92d56c9 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texconv.exe" + FILENAME "texconv-mar2022.exe" + SHA512 fa0b12dcc7e4688f356bb591dedd07dcb27b6029c6490438b39368f72b77f90112360544e035f89e1098dc09b26fb921840ecae851ad5eba6a339cd46316c4e3 ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/feb2022/texdiag.exe" - FILENAME "texdiag-feb2022.exe" - SHA512 5dd93da696eff959b5c93ba8ac763ff6df52fbfc6ca3a3adf1b9da0121beaea2c16008e097f74d562b7a69ed20ada50fd5d35d47311338e6c819e3483bc54ee3 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/mar2022/texdiag.exe" + FILENAME "texdiag-mar2022.exe" + SHA512 7fe074a08599edca9ad8ad5ff930c9c4dbc74faad6502c288e9a555a4a79f51affbce51758c99518d54c4698457e0edb379ffaebfd3dcae0bd16a343195f8292 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -89,9 +89,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index 0bf007aa309625..297f6f2203c190 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-date": "2022-02-28", + "version-date": "2022-03-24", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 701d0abc59ba44..ab5b1db563d451 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF feb2022 - SHA512 18105ccf037b96b198fae086b17e678063efbed38c4212bc0c224090e7b6cd8c4197ae514f22c4b8da78f6a3e5cf6a6cd7437a79ff363baa740f01e3b1eed89b + REF mar2022 + SHA512 09264e19ff786b1f8cf56f0a789ce9df60b3682adba6dbb3e9c8c8c7d869b464c0ad869299fc5cda2d535db19c7a96b43cba2fd40d8cb6aa9dc14914b181d410 HEAD_REF main ) @@ -33,16 +33,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/feb2022/MakeSpriteFont.exe" - FILENAME "makespritefont-feb2022.exe" - SHA512 d3454c679db269a29e845382f5cd9cceab2452aa91486238e38f79e71666718ea5d9fa1e676ffbe6875ee69310e17018690998dfb741530ea068fb0616fa4886 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/mar2022/MakeSpriteFont.exe" + FILENAME "makespritefont-mar2022.exe" + SHA512 a24f76781ddb2c9baa2550d3ef26bf4cf6cb03bfd97caa3b202232a04730fd81e299a9f3549c3ff58c03fda827e44deac5e0b311e8e3fc795e393651ecb51752 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/feb2022/XWBTool.exe" - FILENAME "xwbtool-feb2022.exe" - SHA512 f27170227be1268591757caaccda65d46ad81a2ac38ab1772d9e2d5c722a1d094a9b891f66fc6673d96a6b980a45c8fde501e2d9681f557039f8084ddf648aea + URLS "https://github.com/Microsoft/DirectXTK/releases/download/mar2022/XWBTool.exe" + FILENAME "xwbtool-mar2022.exe" + SHA512 32dd88e742211deaf0ca83e51ec510490456473c07fabbd6627960dc9abfa32289d99f2c8f53d7590a6a6733b3068ba25bff9a512fcf7d1072791dce931d463f ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -52,8 +52,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") elseif(NOT VCPKG_TARGET_IS_UWP) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index 24cc30972c5dda..e0379377dc9d02 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-date": "2022-02-28", + "version-date": "2022-03-24", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 05defae6f0f53c..c980b3de6c41bf 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF feb2022 - SHA512 e61acd191b9ee5c7d76293f2feb158207f9e63d8f3d5a30144c04367c15d0c1d6a17d6905843d2ca80e9af713a83fa2ab2f52c206569993943997653ae6ad729 + REF mar2022 + SHA512 fc41450aad51491f4ac89f87bfd76a62179052db1b98ee626561ef3edb8716578c8dfee01613731cdd9fd91f03ed54a8ec73595374ae16e217cfc87d6f11eca4 HEAD_REF main ) @@ -19,16 +19,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/feb2022/MakeSpriteFont.exe" - FILENAME "makespritefont-feb2022.exe" - SHA512 d3454c679db269a29e845382f5cd9cceab2452aa91486238e38f79e71666718ea5d9fa1e676ffbe6875ee69310e17018690998dfb741530ea068fb0616fa4886 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/mar2022/MakeSpriteFont.exe" + FILENAME "makespritefont-mar2022.exe" + SHA512 a24f76781ddb2c9baa2550d3ef26bf4cf6cb03bfd97caa3b202232a04730fd81e299a9f3549c3ff58c03fda827e44deac5e0b311e8e3fc795e393651ecb51752 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/feb2022/XWBTool.exe" - FILENAME "xwbtool-feb2022.exe" - SHA512 f27170227be1268591757caaccda65d46ad81a2ac38ab1772d9e2d5c722a1d094a9b891f66fc6673d96a6b980a45c8fde501e2d9681f557039f8084ddf648aea + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/mar2022/XWBTool.exe" + FILENAME "xwbtool-mar2022.exe" + SHA512 32dd88e742211deaf0ca83e51ec510490456473c07fabbd6627960dc9abfa32289d99f2c8f53d7590a6a6733b3068ba25bff9a512fcf7d1072791dce931d463f ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -38,8 +38,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-feb2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-mar2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index e1db3a877a4de9..e6e83a029f702f 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2022-02-28", + "version-date": "2022-03-24", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 78b8cbab4d85b8..21defe3fb0d99e 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF feb2022 - SHA512 20f9c38dd68edfca8179d26ab7f772b3190e843c01442ae3d7c7c1cd9a5a21a68455c124f0e8aab7efd3aacc9f6fb5907591b35a6a901683dad2a2f91d785106 + REF mar2022 + SHA512 8e532a754d1b07108c98e099221a1c6eb39e1386e2e61d8694e041fcdf0556d1aeaed703018b18aa0cc2972c1b874fedd4d7b5e5694c504e70d623a78e6eb421 HEAD_REF main ) @@ -35,9 +35,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES))) vcpkg_download_distfile( UVATLASTOOL_EXE - URLS "https://github.com/Microsoft/UVAtlas/releases/download/feb2022/uvatlastool.exe" - FILENAME "uvatlastool-feb2022.exe" - SHA512 bc7e00b67e9f7adda52882fdd6b0e54d3a34eb11164f189d5423efcbc7ee0dce5b2c0fbadce592e10917ab215f5d6c380bbc70597ac1001ea169364d563dff5f + URLS "https://github.com/Microsoft/UVAtlas/releases/download/mar2022/uvatlastool.exe" + FILENAME "uvatlastool-mar2022.exe" + SHA512 d4179b755a9f8d81c180c86ae7e2d177dd0842f78fc81d96b87fa6551407a038edb8250529e45a9b783514e27cbe2a806bac4af47c3db5c34a6e4adc602f5ff4 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") @@ -46,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${UVATLASTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-feb2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-mar2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 532df10c73fed7..98c6954a724e7c 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-date": "2022-02-28", + "version-date": "2022-03-24", "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", diff --git a/versions/baseline.json b/versions/baseline.json index ba5357f795cf4c..af86cefeac4c47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1849,7 +1849,7 @@ "port-version": 0 }, "directxmesh": { - "baseline": "2022-02-28", + "baseline": "2022-03-24", "port-version": 0 }, "directxsdk": { @@ -1857,15 +1857,15 @@ "port-version": 5 }, "directxtex": { - "baseline": "2022-02-28", + "baseline": "2022-03-24", "port-version": 0 }, "directxtk": { - "baseline": "2022-02-28", + "baseline": "2022-03-24", "port-version": 0 }, "directxtk12": { - "baseline": "2022-02-28", + "baseline": "2022-03-24", "port-version": 0 }, "dirent": { @@ -7217,7 +7217,7 @@ "port-version": 1 }, "uvatlas": { - "baseline": "2022-02-28", + "baseline": "2022-03-24", "port-version": 0 }, "uvw": { diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index d22dbc28242776..6204eb5a3f81d0 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "799bc935afc5a0b5d8d50037f28807512fc7c38e", + "version-date": "2022-03-24", + "port-version": 0 + }, { "git-tree": "aef77bf208f6e95c682fd8d41590c5b0516f1f0f", "version-date": "2022-02-28", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 613d5345c2b74f..a3b3dc8cd76dd7 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15870041c7dc7d9db536c8770c6334f96af9f92c", + "version-date": "2022-03-24", + "port-version": 0 + }, { "git-tree": "424610ae5719fee5f738756146719d13d1483879", "version-date": "2022-02-28", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 347b73c7e84381..12018a7aa4b97e 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6e54dc5cc77469ecc88f949b6c149cb01f5a335", + "version-date": "2022-03-24", + "port-version": 0 + }, { "git-tree": "64937ca8d8ec8cc57bfdea9fea74bd39cd0ea507", "version-date": "2022-02-28", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index a7f248db1a4f61..6f3eac0f7b5388 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c89638b81272f98ae99cfb782c1269ad7b1836a5", + "version-date": "2022-03-24", + "port-version": 0 + }, { "git-tree": "e324f5499354e15e49fa1c591ab864b114518e74", "version-date": "2022-02-28", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index b523cbb8d89b2b..c1980b0485ea54 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "100ee1b04f5da317153da9c52eb0c0def30e9b49", + "version-date": "2022-03-24", + "port-version": 0 + }, { "git-tree": "fe5522a95b1f9ef72d43c019948fd94055b42410", "version-date": "2022-02-28", From 5f62686b96cecc91a5d02ea188857a24efd3ef4f Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 28 Mar 2022 23:54:15 +0200 Subject: [PATCH 080/217] [glibmm] no absolute paths (#23775) * [glibmm] no absolute paths * Nicole CRs Co-authored-by: nicole mazzuca --- ports/glibmm/portfile.cmake | 6 +++++- ports/glibmm/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/g-/glibmm.json | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index 9d14499a5d2352..4e81c03de17c38 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -22,7 +22,11 @@ vcpkg_configure_meson( vcpkg_install_meson() vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.70/proc" "${CURRENT_PACKAGES_DIR}/lib/glibmm-2.70/proc") +# intentionally 2.68 - glib does not install glibmm-2.70 files +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/lib/glibmm-2.68/proc" + "${CURRENT_PACKAGES_DIR}/lib/glibmm-2.68/proc" +) vcpkg_fixup_pkgconfig() diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index 6fa34378a6d623..65316647d873f7 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,8 +1,10 @@ { "name": "glibmm", "version": "2.70.0", + "port-version": 1, "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", + "license": "LGPL-2.1-or-later", "supports": "!uwp", "dependencies": [ "gettext", diff --git a/versions/baseline.json b/versions/baseline.json index af86cefeac4c47..316e85cdcc6041 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2518,7 +2518,7 @@ }, "glibmm": { "baseline": "2.70.0", - "port-version": 0 + "port-version": 1 }, "glm": { "baseline": "0.9.9.8", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index f6ffc0678ededb..69d42a04756547 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75f0e8e579c069e71bdb773c9e741fc7182e0379", + "version": "2.70.0", + "port-version": 1 + }, { "git-tree": "d485de58180f1755b67cb2b829c7c73e4dfae13a", "version": "2.70.0", From 773516ecf6014d89cc69b11bb54605ad4be56694 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 28 Mar 2022 17:30:37 -0700 Subject: [PATCH 081/217] Fix VS2022 testing of the compilers. (#23826) * Workaround GetChildItem returning a non-array when there's only one result. * Apply Nicole's code review comment. --- .../windows-unstable/rearrange-msvc-drop-layout.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 b/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 index b8087328246926..53692532e31c7e 100644 --- a/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 +++ b/scripts/azure-pipelines/windows-unstable/rearrange-msvc-drop-layout.ps1 @@ -54,7 +54,7 @@ Move-Item "$DropRoot\binaries.x86$BuildType\atlmfc\include" "$tempRoot\atlmfc\in Move-Item "$DropRoot\binaries.x86$BuildType\atlmfc\lib\i386" "$tempRoot\atlmfc\lib\x86" Move-Item "$DropRoot\binaries.amd64$BuildType\atlmfc\lib\amd64" "$tempRoot\atlmfc\lib\x64" -$toolsets = Get-ChildItem -Path $MSVCRoot -Directory | Sort-Object -Descending +[string[]]$toolsets = Get-ChildItem -Path $MSVCRoot -Directory | Sort-Object -Descending if ($toolsets.Length -eq 0) { throw "Could not find Visual Studio toolset!" } From d2fd9975f6b1974abe9254edf7225b59a5e531b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 30 Mar 2022 08:08:32 +0800 Subject: [PATCH 082/217] [vcpkg baseline][qtinterfaceframework] Temporary set to fail in baseline (#23837) --- scripts/ci.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9d2203203ece46..188e42af740fae 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1023,6 +1023,9 @@ qt5-base:arm64-windows=fail # qtwebengine:x64-windows has an ICE in VS2022 qtwebengine:x64-windows=fail +# upstream bug, see https://github.com/microsoft/vcpkg/issues/23766 +qtinterfaceframework:x64-windows=fail + # Skip deprecated Qt module # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) qt5-canvas3d:x64-linux=skip From 16ebf7b9b83ea79020ed6caa39ea3301e7890de1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 30 Mar 2022 02:12:24 +0200 Subject: [PATCH 083/217] [vcpkg.cmake] don't clobber cmake program path (#23755) * more filtering of tool paths. * test it in CI * only use tools/* and tools/*/bin * debugging * test removal of tools/* if tools/*/bin is available * fix variable naming * cleanup * revert ports/qtdeclarative/portfile.cmake --- scripts/buildsystems/vcpkg.cmake | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 138963133e7b3f..ce3a9bbe1d6ab1 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -538,15 +538,24 @@ if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools") endif() list(APPEND CMAKE_PROGRAM_PATH "${tools_base_path}") - file(GLOB_RECURSE Z_VCPKG_TOOLS_DIRS LIST_DIRECTORIES true "${tools_base_path}/*") - file(GLOB_RECURSE Z_VCPKG_TOOLS_FILES LIST_DIRECTORIES false "${tools_base_path}/*") + file(GLOB Z_VCPKG_TOOLS_DIRS LIST_DIRECTORIES true "${tools_base_path}/*") + file(GLOB Z_VCPKG_TOOLS_FILES LIST_DIRECTORIES false "${tools_base_path}/*") + file(GLOB Z_VCPKG_TOOLS_DIRS_BIN LIST_DIRECTORIES true "${tools_base_path}/*/bin") + file(GLOB Z_VCPKG_TOOLS_FILES_BIN LIST_DIRECTORIES false "${tools_base_path}/*/bin") list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_FILES} "") # need at least one item for REMOVE_ITEM if CMake <= 3.19 - list(FILTER Z_VCPKG_TOOLS_DIRS EXCLUDE REGEX "/debug/") + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS_BIN ${Z_VCPKG_TOOLS_FILES_BIN} "") + string(REPLACE "/bin" "" Z_VCPKG_TOOLS_DIRS_TO_REMOVE "${Z_VCPKG_TOOLS_DIRS_BIN}") + list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_DIRS_TO_REMOVE} "") + list(APPEND Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_DIRS_BIN}) foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") endforeach() - unset(Z_VCPKG_TOOLS_DIRS) unset(Z_VCPKG_TOOLS_DIR) + unset(Z_VCPKG_TOOLS_DIRS) + unset(Z_VCPKG_TOOLS_FILES) + unset(Z_VCPKG_TOOLS_DIRS_BIN) + unset(Z_VCPKG_TOOLS_FILES_BIN) + unset(Z_VCPKG_TOOLS_DIRS_TO_REMOVE) unset(tools_base_path) endif() From 96bc551b191eb9c31daf31f8fcc0e767562c0cf8 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 30 Mar 2022 02:19:19 +0200 Subject: [PATCH 084/217] [liblsl] Update to 1.16.0 (#21284) * Start adapting liblsl for version 1.15.2 * Use vcpkg Boost package * Minor updates * Switch to master branch * Update git-tree hash * Fix hash * Update git-tree hash * Add missing boost dependencies * Update git-tree hash * Try to remove entries from ci.baseline.txt * Use asio package from vcpkg * Update git-tree hash * Update version to upcoming 1.16.0 * Set liblsl license * Update CI baseline * Remove obsolete version * Update reference * Update CI baseline Co-authored-by: chausner --- ports/liblsl/portfile.cmake | 26 ++++++++++----------- ports/liblsl/use-find-package-asio.patch | 15 ++++++++++++ ports/liblsl/vcpkg.json | 29 ++++++++++++++++++++---- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 4 ++-- versions/l-/liblsl.json | 5 ++++ 6 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 ports/liblsl/use-find-package-asio.patch diff --git a/ports/liblsl/portfile.cmake b/ports/liblsl/portfile.cmake index a8d56b0bdb664f..f41ac73180c953 100644 --- a/ports/liblsl/portfile.cmake +++ b/ports/liblsl/portfile.cmake @@ -1,29 +1,29 @@ -# static builds are currently not supported since liblsl always also builds shared binaries -# which need to be deleted for vcpkg but then the CMake target can no longer be imported because it still references them -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sccn/liblsl - REF v1.14.0 # NOTE: when updating version, also change it in the parameter to vcpkg_configure_cmake - SHA512 b4ec379339d174c457c8c1ec69f9e51ea78a738e72ecc96b9193f07b5273acb296b5b1f90c9dfe16591ecab0eef9aae9add640c1936d3769cae0bd96617205ec + REF v1.16.0 # NOTE: when updating version, also change it in the parameter to vcpkg_cmake_configure + SHA512 bfd54c6cca944ed33622da74dc1417ab75b542002c02c83bb86c917fd5968936c4b56ec734bd6d757e9fa67364f9dc85fd15ed28697ed410305df4928cf6790b HEAD_REF master + PATCHES + use-find-package-asio.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LSL_BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DLSL_BUILD_STATIC=OFF + -DLSL_BUILD_STATIC=${LSL_BUILD_STATIC} + -DLSL_BUNDLED_BOOST=OFF # we use the boost vcpkg packages instead -DLSL_BUNDLED_PUGIXML=OFF # we use the pugixml vcpkg package instead - -Dlslgitrevision=v1.14.0 + -Dlslgitrevision=v1.16.0 -Dlslgitbranch=master ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() - vcpkg_copy_tools(TOOL_NAMES lslver AUTO_CLEAN) +vcpkg_cmake_config_fixup(PACKAGE_NAME LSL CONFIG_PATH lib/cmake/LSL) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/liblsl/use-find-package-asio.patch b/ports/liblsl/use-find-package-asio.patch new file mode 100644 index 00000000000000..be837c67409898 --- /dev/null +++ b/ports/liblsl/use-find-package-asio.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b47cb7f8..bd12f519 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -203,8 +203,9 @@ target_include_directories(lslobj + target_include_directories(lslobj + SYSTEM PUBLIC + $ +- $ + ) ++find_package(asio CONFIG REQUIRED) ++target_link_libraries(lslobj PUBLIC asio::asio) + target_compile_definitions(lslobj PRIVATE + LIBLSL_EXPORTS + LOGURU_DEBUG_LOGGING=$ diff --git a/ports/liblsl/vcpkg.json b/ports/liblsl/vcpkg.json index dfacb5398718b3..4b91b069dca485 100644 --- a/ports/liblsl/vcpkg.json +++ b/ports/liblsl/vcpkg.json @@ -1,11 +1,32 @@ { "name": "liblsl", - "version-string": "1.14.0", - "port-version": 2, + "version": "1.16.0", "description": "C++ lsl library for multi-modal time-synched data transmission over the local network", "homepage": "https://github.com/sccn/liblsl", - "supports": "!staticcrt", + "license": "MIT", "dependencies": [ - "pugixml" + "asio", + "boost-atomic", + "boost-bind", + "boost-chrono", + "boost-config", + "boost-endian", + "boost-functional", + "boost-integer", + "boost-lexical-cast", + "boost-math", + "boost-serialization", + "boost-smart-ptr", + "boost-thread", + "boost-uuid", + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 188e42af740fae..4cebf5926c1d33 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -535,9 +535,6 @@ liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail liblo:x64-uwp=fail -liblsl:arm64-windows=fail -liblsl:arm-uwp=fail -liblsl:x64-uwp=fail libmad:arm-uwp=fail libmad:x64-uwp=fail libmagic:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 316e85cdcc6041..8d8b987a47ab5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3697,8 +3697,8 @@ "port-version": 2 }, "liblsl": { - "baseline": "1.14.0", - "port-version": 2 + "baseline": "1.16.0", + "port-version": 0 }, "liblzma": { "baseline": "5.2.5", diff --git a/versions/l-/liblsl.json b/versions/l-/liblsl.json index d62780f239e024..37c645f7adad55 100644 --- a/versions/l-/liblsl.json +++ b/versions/l-/liblsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "282fee909d2df5c818b0577a4c063c146376cef5", + "version": "1.16.0", + "port-version": 0 + }, { "git-tree": "451923eac66cd517eb01dbf297e207e0760c4414", "version-string": "1.14.0", From be10867edc21d318fccccf5b8722eeba8c3deab4 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Wed, 30 Mar 2022 03:19:54 +0300 Subject: [PATCH 085/217] [lionkor-commandline] Update library to 2.0.0 (#23803) * Update lionkor-commandline to 2.0.0 * Run x-add-version * unsupport uwp * Update lionkor-commandline.json --- ports/lionkor-commandline/portfile.cmake | 4 ++-- ports/lionkor-commandline/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/lionkor-commandline.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/lionkor-commandline/portfile.cmake b/ports/lionkor-commandline/portfile.cmake index cecb25de34f0ee..51232f1b42c430 100644 --- a/ports/lionkor-commandline/portfile.cmake +++ b/ports/lionkor-commandline/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lionkor/commandline - REF 4a8000d6b767263a79c589fcc74099a4454e07a9 - SHA512 81ee2716b7048e51d26f75033be7a6d3a1aec9bfef833ad067112b26144023dfad8f5f8d145b4162dba2de3ad09de223dbe9143cf9e2f5f5102374d3412aebf7 + REF 01434c11aaf82d37a126dc70f5aa02cc523dbbb4 + SHA512 fb9554c07d13aa4c5d84f8288ad39e67ab302da4b286172e0f8fbc22b351234a83fb60f1c085a238d10477a379fded32302338cbddbe7ee0fdda54c6c4a75593 HEAD_REF master PATCHES add-install.patch diff --git a/ports/lionkor-commandline/vcpkg.json b/ports/lionkor-commandline/vcpkg.json index 0aaffc9833b4db..f9256896ca62f6 100644 --- a/ports/lionkor-commandline/vcpkg.json +++ b/ports/lionkor-commandline/vcpkg.json @@ -1,10 +1,10 @@ { "name": "lionkor-commandline", - "version-semver": "1.0.0", + "version-semver": "2.0.0", "description": "A C++ commandline for use in servers and chat software. Provides very simple asynchronous input/output.", "homepage": "https://github.com/lionkor/commandline/", "license": "MIT", - "supports": "!osx", + "supports": "!osx & !uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 8d8b987a47ab5a..a305c487790fa5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4213,7 +4213,7 @@ "port-version": 2 }, "lionkor-commandline": { - "baseline": "1.0.0", + "baseline": "2.0.0", "port-version": 0 }, "live555": { diff --git a/versions/l-/lionkor-commandline.json b/versions/l-/lionkor-commandline.json index d5d8277faa1e43..0283efb574f1c2 100644 --- a/versions/l-/lionkor-commandline.json +++ b/versions/l-/lionkor-commandline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb56d3f901805ac69ea5d7bd27a07b789f3232e5", + "version-semver": "2.0.0", + "port-version": 0 + }, { "git-tree": "857618e8e62e8395973a0c48c61c837877b65fac", "version-semver": "1.0.0", From 08226406cc54f179d44a1e8e8b2ecb838191b1c6 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 30 Mar 2022 08:21:18 +0800 Subject: [PATCH 086/217] [simpleini] update to v4.1.9 (#23810) * [simpleini] update to v4.1.9 * update version * install source files * overwrite version --- ports/simpleini/portfile.cmake | 9 ++++----- ports/simpleini/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/s-/simpleini.json | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ports/simpleini/portfile.cmake b/ports/simpleini/portfile.cmake index 46f1d25625659d..beb99a048a9c38 100644 --- a/ports/simpleini/portfile.cmake +++ b/ports/simpleini/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brofield/simpleini - REF fe082fa81f4a55ddceb55056622136be616b3c6f - SHA512 9ba3fc0e5d4d426a7943a6783f3e66203d3b822a9ac6bc2b261e877f70e099495ad22e03fd6ad3dd7aab422192701b2b450ace750ebd3bc6b4e6266c6d15184d + REF 9b3ed7ec815997bc8c5b9edf140d6bde653e1458 #v4.19 + SHA512 80358c8e5b8d8ea6183c685d002378805450ee3d65599f5966c1c24c20869be4680b044a4443f00d64740e131d1c0efcdaaf0a53d5cbce26b185cdf946630d8a HEAD_REF master ) @@ -14,7 +14,6 @@ set(SIMPLEINI_SOURCE ${SOURCE_PATH}/SimpleIni.h ) file(INSTALL ${SIMPLEINI_SOURCE} DESTINATION ${CURRENT_PACKAGES_DIR}/include) -# Install sample -file(INSTALL ${SOURCE_PATH}/snippets.cpp DESTINATION ${CURRENT_PACKAGES_DIR}/share/sample) -file(INSTALL ${SOURCE_PATH}/LICENCE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +# copyright +file(INSTALL "${SOURCE_PATH}/LICENCE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/simpleini/vcpkg.json b/ports/simpleini/vcpkg.json index 020a8f5ddb14ab..0cc26e223486bc 100644 --- a/ports/simpleini/vcpkg.json +++ b/ports/simpleini/vcpkg.json @@ -1,7 +1,7 @@ { "name": "simpleini", - "version-string": "2018-08-31", - "port-version": 5, + "version": "4.19", "description": "Cross-platform C++ library providing a simple API to read and write INI-style configuration files", - "homepage": "https://github.com/brofield/simpleini" + "homepage": "https://github.com/brofield/simpleini", + "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index a305c487790fa5..75fe755444fc6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6473,8 +6473,8 @@ "port-version": 1 }, "simpleini": { - "baseline": "2018-08-31", - "port-version": 5 + "baseline": "4.19", + "port-version": 0 }, "sjpeg": { "baseline": "2021-10-31", diff --git a/versions/s-/simpleini.json b/versions/s-/simpleini.json index 90cba4bbbd40b2..e4583be99fa3fe 100644 --- a/versions/s-/simpleini.json +++ b/versions/s-/simpleini.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "edfed522ec88f3bd721e2ee1b09c177b0d93d378", + "version": "4.19", + "port-version": 0 + }, { "git-tree": "da811f3fb2f252e4f1eff0f42047c539315b60dd", "version-string": "2018-08-31", From 7f8d1606176ddbbacdee868eefa11c95dcdb4a82 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 30 Mar 2022 08:21:57 +0800 Subject: [PATCH 087/217] [openimageio] Fix openjpeg linkage (#23812) --- ports/openimageio/fix-openjpeg-linkage.patch | 13 +++++++++++++ ports/openimageio/portfile.cmake | 1 + ports/openimageio/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/openimageio/fix-openjpeg-linkage.patch diff --git a/ports/openimageio/fix-openjpeg-linkage.patch b/ports/openimageio/fix-openjpeg-linkage.patch new file mode 100644 index 00000000000000..7d3a24c2fef0da --- /dev/null +++ b/ports/openimageio/fix-openjpeg-linkage.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 1fc2059..62c4efb 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -222,7 +222,7 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER + # set (LIBRAW_FOUND 0) + endif () + +-checked_find_package (OpenJPEG VERSION_MIN 2.0) ++checked_find_package (OpenJPEG PREFER_CONFIG VERSION_MIN 2.0) + + checked_find_package (OpenVDB + VERSION_MIN 5.0 diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index a69fae17c95323..4f93c86cf99dcc 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-dependencies.patch fix-config-cmake.patch + fix-openjpeg-linkage.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index e5b6a47cd883a7..e361f995522d5b 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "openimageio", "version": "2.3.10.1", - "port-version": 2, + "port-version": 3, "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", "dependencies": [ "boost-algorithm", "boost-asio", diff --git a/versions/baseline.json b/versions/baseline.json index 75fe755444fc6d..a1bfe937345382 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5094,7 +5094,7 @@ }, "openimageio": { "baseline": "2.3.10.1", - "port-version": 2 + "port-version": 3 }, "openjpeg": { "baseline": "2.4.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index ea3310044ddadc..821542404b5f77 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca", + "version": "2.3.10.1", + "port-version": 3 + }, { "git-tree": "a52afa5ed0495b47dd1c123d975746fdfa0b3459", "version": "2.3.10.1", From fef8dcb8bcd0c010ff4f7f146906b3dfe14a2d33 Mon Sep 17 00:00:00 2001 From: IronsDu Date: Wed, 30 Mar 2022 08:23:45 +0800 Subject: [PATCH 088/217] [brynet] upgrade to 1.11.2 (#23817) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [brynet] upgrade to 1.11.2 * [brynet] upgrade to 1.11.2 * Update ports/brynet/vcpkg.json * Update versions/b-/brynet.json * Update versions/b-/brynet.json * Update ports/brynet/vcpkg.json * Update versions/b-/brynet.json * Update versions/baseline.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/brynet/portfile.cmake | 4 ++-- ports/brynet/vcpkg.json | 3 +-- versions/b-/brynet.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/brynet/portfile.cmake b/ports/brynet/portfile.cmake index 43e28bdb7740a7..fc3865a37f2361 100644 --- a/ports/brynet/portfile.cmake +++ b/ports/brynet/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IronsDu/brynet - REF 1a48a74ba5c6074cf6f478d6a52e3c37ce3b9cc8 # v1.11.1 - SHA512 5f04ee74a1ba8955ddb355286aa2bcd29d50b2a8bb7c2c3296fd000ab5e2060ceb3a5254e54e48f6c090f16883aea07178001532da39f28dcafbcf8df7a7304c + REF 4d162460372b2385cea121da0403f55582b4e39b # v1.11.2 + SHA512 656e8e0bdf44e2fb9f17c622d517cafc5ff965402ccab4b96e6f4663e715396a962df0ebb2baaec871336e27c0129ceb47b80352bfcd28cdff731d46aad08d8a HEAD_REF master ) diff --git a/ports/brynet/vcpkg.json b/ports/brynet/vcpkg.json index 173ca0bd92ed6f..026f2d895488b2 100644 --- a/ports/brynet/vcpkg.json +++ b/ports/brynet/vcpkg.json @@ -1,7 +1,6 @@ { "name": "brynet", - "version-string": "1.11.1", - "port-version": 1, + "version": "1.11.2", "description": "A C++ header only cross platform high performance tcp network library, and support SSL/HTTP/Websocket.", "homepage": "https://github.com/IronsDu/brynet" } diff --git a/versions/b-/brynet.json b/versions/b-/brynet.json index 60d187b01065b7..1d9da2e43ac310 100644 --- a/versions/b-/brynet.json +++ b/versions/b-/brynet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a4cea82b4e937b478bd400d4a975dde33b3f741", + "version": "1.11.2", + "port-version": 0 + }, { "git-tree": "1700fdb373d8d3789f510b64aeee7d79859393f1", "version-string": "1.11.1", diff --git a/versions/baseline.json b/versions/baseline.json index a1bfe937345382..d5a0026705968a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1153,8 +1153,8 @@ "port-version": 0 }, "brynet": { - "baseline": "1.11.1", - "port-version": 1 + "baseline": "1.11.2", + "port-version": 0 }, "bshoshany-thread-pool": { "baseline": "2.0.0", From a22aaa389f4cae55ae874f8bd84e7b0e47669c94 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Wed, 30 Mar 2022 00:24:57 +0000 Subject: [PATCH 089/217] [pango] update to 15.6 (microsoft#23819) (#23820) Overview of changes in 1.50.6, 19-03-2022 ========================================= - Drop hb-glib dependency - Fix test font configuration - Maintain order in pango_attr_list_change - Fix a use-after-free in pango_attr_list_change Overview of changes in 1.50.5, 03-03-2022 ========================================= * Fix compiler warnings * Enable cairo by default * pango-view: Show more baselines * layout: Handle baselines * Windows: build cleanups Overview of changes in 1.50.4, 09-02-2022 ========================================= * Tweak synthetic space sizes * itemize: Try harder to avoid NULL fonts * docs: Some additions * Pass synthetic slant to harfbuzz * Make sloped carets work with uneven scales * Fix serialiation on arm * Avoid an uninitialized variable warning * Reinstate previous behavior of pango_attr_list_splice * Deprecated pango_coverage_ref/unref * Fix serialization on non-glibc systems * Fix allow-breaks handling Co-authored-by: Schaich --- ports/pango/portfile.cmake | 4 ++-- ports/pango/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/pango.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 6345bfdfc4f77f..3dd0e5b96f94da 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/pango - REF 26aadb2508f9022cbfc72e73b558c6791f5d46d9 #v1.50.3 - SHA512 09c2578300d391b406c14dfbf7f28968d326c6861f7eb1a3a8d1d8c4700d6e9f74c8621a3f2d181abe1f695324c6e5fc3a55eb038ebbe53a53be086983e3a186 + REF 37a427018c92a2bc679ef104097e07a619609c9c #v1.50.6 + SHA512 4990022cae2130b4842d0d9d3161545c7214ac3dd445d85a7ec49b0a89e39319b404fecc66d4025965cd2407823c7476b937e6ee53e2e6763b35048db8ff387f HEAD_REF master # branch name ) diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 498ca48fd4a5a7..faf48574fff6ca 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,8 +1,9 @@ { "name": "pango", - "version": "1.50.3", + "version": "1.50.6", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", + "license": "LGPL-2.0-only", "dependencies": [ { "name": "cairo", diff --git a/versions/baseline.json b/versions/baseline.json index d5a0026705968a..5d62a27ecd7a4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5249,7 +5249,7 @@ "port-version": 0 }, "pango": { - "baseline": "1.50.3", + "baseline": "1.50.6", "port-version": 0 }, "pangolin": { diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 59ae5304a99b65..4533caaec0fc11 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db85fd904e40578950bcc478e2bfad06c70e787a", + "version": "1.50.6", + "port-version": 0 + }, { "git-tree": "024f716f80c8454769393287ef14a75de4785f32", "version": "1.50.3", From 6c74a6d7b9ddc906d1c735f29332ff14b0ee013a Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 30 Mar 2022 02:25:31 +0200 Subject: [PATCH 090/217] [volk] update port (#23821) * update volk * volk version * add license * version --- ports/volk/portfile.cmake | 22 +++++++++++----------- ports/volk/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 4 ++-- versions/v-/volk.json | 5 +++++ 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ports/volk/portfile.cmake b/ports/volk/portfile.cmake index e2083887df3840..fe58d799843f54 100644 --- a/ports/volk/portfile.cmake +++ b/ports/volk/portfile.cmake @@ -4,22 +4,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/volk - REF 5a605f5d6997bd929b666700a36ca3d9bd1d7a47 - SHA512 ed6faf13828f3e47c4f12f8d19952c94589420539e98405bf2a4b7959518357dcc2f210746f3683d3862ac8c80821f3c863d49f4625e2dac85d2a680567e4f00 + REF 1.3.204 + SHA512 73108aff5bed08f711730948c80070a8d913f2ba2e7886232cd981272fe47bc85cff84eabfdf14d4261c658b58ee098a9bd837222f65323f304d6abcdbeb8613 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DVOLK_INSTALL=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVOLK_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/volk) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/volk) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Put the file containing the license where vcpkg expects it -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/volk/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/volk/README.md ${CURRENT_PACKAGES_DIR}/share/volk/copyright) +file(COPY "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/volk/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/volk/README.md" "${CURRENT_PACKAGES_DIR}/share/volk/copyright") diff --git a/ports/volk/vcpkg.json b/ports/volk/vcpkg.json index 3d3f4a1e64f8b0..32734f12851ac7 100644 --- a/ports/volk/vcpkg.json +++ b/ports/volk/vcpkg.json @@ -1,14 +1,22 @@ { "name": "volk", - "version-string": "2019-09-26", - "port-version": 1, + "version": "1.3.204", "description": [ "Meta loader for Vulkan API.", "Note that the static library target volk::volk is built without platform-specific defines.", "Use the header-only target volk::volk_headers if you require platform-specific extensions." ], "homepage": "https://github.com/zeux/volk", + "license": "MIT", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "vulkan" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5d62a27ecd7a4a..809465e0785393 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7329,8 +7329,8 @@ "port-version": 2 }, "volk": { - "baseline": "2019-09-26", - "port-version": 1 + "baseline": "1.3.204", + "port-version": 0 }, "vs-yasm": { "baseline": "0.5.0", diff --git a/versions/v-/volk.json b/versions/v-/volk.json index 774ef5f91c18b1..c5394f454970e5 100644 --- a/versions/v-/volk.json +++ b/versions/v-/volk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83175cabc17042125828c2e0230f75b60d140cc0", + "version": "1.3.204", + "port-version": 0 + }, { "git-tree": "0018a72c45ad8b5f9776d41ff067292b73cb7a31", "version-string": "2019-09-26", From 4f778cf094a65f836167eb301bdf62b7ba632c68 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 29 Mar 2022 17:25:46 -0700 Subject: [PATCH 091/217] [vulkan-memory-allocator] update to 3.0.0 (#23831) * [vulkan-memory-allocator] update to 3.0.0 * update version * format portfile.cmake * update version Co-authored-by: Lily Wang --- ports/vulkan-memory-allocator/portfile.cmake | 8 ++++---- ports/vulkan-memory-allocator/vcpkg.json | 7 ++++--- versions/baseline.json | 4 ++-- versions/v-/vulkan-memory-allocator.json | 5 +++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ports/vulkan-memory-allocator/portfile.cmake b/ports/vulkan-memory-allocator/portfile.cmake index c0b27259ace19c..32a96bdbf17cd7 100644 --- a/ports/vulkan-memory-allocator/portfile.cmake +++ b/ports/vulkan-memory-allocator/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator - REF 55868965ae1fa956c07695d4642e1add8c9450f7 - SHA512 433d8a961a1fa4c80894f014fdfbbcafeb94932a3eea2eced9c7109dcbf7350a60efb9fb1d8f3c621f2d72c118f47f82f8e9e6f4db75038fbad3a727b5896479 + REF 42be483bd5c6605e789e011aac684e0b95d05359 #v3.0.0 + SHA512 5bb2240481511e51f1617f2c010a3e93a1c72a63713ed4aecf94488e7f46c78a3cfc591e8f94e14b1262b264bc06e1a78cfe69967b41e02441fad1a433747ee6 HEAD_REF master ) file(COPY "${SOURCE_PATH}/include/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-vulkan-memory-allocator) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-vulkan-memory-allocator") -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vulkan-memory-allocator/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/vulkan-memory-allocator/vcpkg.json b/ports/vulkan-memory-allocator/vcpkg.json index fe8efacdc1818c..50a39ecc528698 100644 --- a/ports/vulkan-memory-allocator/vcpkg.json +++ b/ports/vulkan-memory-allocator/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vulkan-memory-allocator", - "version-string": "2021-07-07", - "port-version": 1, - "description": "Easy to integrate Vulkan memory allocation library from GPUOpen" + "version": "3.0.0", + "description": "Easy to integrate Vulkan memory allocation library from GPUOpen", + "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", + "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index 809465e0785393..a63c42fda604b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7361,8 +7361,8 @@ "port-version": 0 }, "vulkan-memory-allocator": { - "baseline": "2021-07-07", - "port-version": 1 + "baseline": "3.0.0", + "port-version": 0 }, "vxl": { "baseline": "2.0.2", diff --git a/versions/v-/vulkan-memory-allocator.json b/versions/v-/vulkan-memory-allocator.json index 44e4393e1beefd..c54e345f907941 100644 --- a/versions/v-/vulkan-memory-allocator.json +++ b/versions/v-/vulkan-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1803d4239d0058bbdb03b3711dc69383895f4ea1", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "9d6994b1a6f6cbaba84a63a78b3d97784a0722f5", "version-string": "2021-07-07", From e5b3177ecebebba0c6f4be18ad343aed5bcffaee Mon Sep 17 00:00:00 2001 From: Arsen Tufankjian Date: Wed, 30 Mar 2022 13:29:42 -0700 Subject: [PATCH 092/217] [Tracy] Updating versionto 0.8.0 (#23859) * Adding tracy port * Formatting tracy port * Tidying up the port * Formatting again * Making sure git-tree is correct * Adding correct vcpkg dependencies * Newline at file end again * Update version database * Making sure to mark tracy as not supporting x86 at all * Updating version again * Responding to feedback and double checking which builds will work * Updating versions * Tidying up some loose ends * Updating port version again * Removing port-version 1 * Removing tracy from ci baseline * Removing unnecessary include copy * Updating version * Resolving feedback * Updating version and formatting * Version for the version god * tweaking tracy supports * Formatting and version * Version * Adding pthreads dependency to tracy for non-windows platforms * Version * Fixing tracy port * Fixing version * TRACY_IMPORTS should be an INTERFACE define * Updating patch to tracy to place it in the correct namespace * Fixing issue in patch file * Updating version * Forgot to put the :: in the namespace * Updating version * Bumping port version * Updating version * Updating version database * Fixing incorrect version of tracy * Update version * Updating tracy to 0.8.0 * Updating version Co-authored-by: nicole mazzuca --- ports/tracy/add-install.patch | 117 ---------------------------------- ports/tracy/portfile.cmake | 6 +- ports/tracy/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/t-/tracy.json | 5 ++ 5 files changed, 10 insertions(+), 125 deletions(-) delete mode 100644 ports/tracy/add-install.patch diff --git a/ports/tracy/add-install.patch b/ports/tracy/add-install.patch deleted file mode 100644 index f616ba38d0c524..00000000000000 --- a/ports/tracy/add-install.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 00000000..601d2a4d ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,111 @@ -+cmake_minimum_required(VERSION 3.10) -+ -+project(Tracy LANGUAGES CXX) -+ -+find_package(Threads REQUIRED) -+ -+add_library(TracyClient TracyClient.cpp) -+target_compile_features(TracyClient PUBLIC cxx_std_11) -+target_include_directories(TracyClient SYSTEM PUBLIC -+ $ -+ $) -+target_link_libraries( -+ TracyClient -+ PUBLIC -+ Threads::Threads -+ ${CMAKE_DL_LIBS} -+) -+ -+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ find_library(EXECINFO_LIBRARY NAMES execinfo REQUIRED) -+ target_link_libraries(TracyClient PUBLIC ${EXECINFO_LIBRARY}) -+endif() -+ -+add_library(Tracy::TracyClient ALIAS TracyClient) -+ -+macro(set_option option help value) -+ option(${option} ${help} ${value}) -+ if(${option}) -+ message(STATUS "${option}: ON") -+ target_compile_definitions(TracyClient PUBLIC ${option}) -+ else() -+ message(STATUS "${option}: OFF") -+ endif() -+endmacro() -+ -+set_option(TRACY_ENABLE "Enable profiling" ON) -+set_option(TRACY_ON_DEMAND "On-demand profiling" OFF) -+set_option(TRACY_CALLSTACK "Collect call stacks" OFF) -+set_option(TRACY_ONLY_LOCALHOST "Only listen on the localhost interface" OFF) -+set_option(TRACY_NO_BROADCAST "Disable client discovery by broadcast to local network" OFF) -+set_option(TRACY_NO_CODE_TRANSFER "Disable collection of source code" OFF) -+set_option(TRACY_NO_CONTEXT_SWITCH "Disable capture of context switches" OFF) -+set_option(TRACY_NO_EXIT "Client executable does not exit until all profile data is sent to server" OFF) -+set_option(TRACY_NO_FRAME_IMAGE "Disable capture of frame images" OFF) -+set_option(TRACY_NO_SAMPLING "Disable call stack sampling" OFF) -+set_option(TRACY_NO_VERIFY "Disable zone validation for C API" OFF) -+set_option(TRACY_NO_VSYNC_CAPTURE "Disable capture of hardware Vsync events" OFF) -+ -+if(BUILD_SHARED_LIBS) -+ target_compile_definitions(TracyClient PRIVATE TRACY_EXPORTS) -+ target_compile_definitions(TracyClient PUBLIC TRACY_IMPORTS) -+endif() -+ -+include(CMakePackageConfigHelpers) -+include(GNUInstallDirs) -+ -+set(includes -+ ${CMAKE_CURRENT_LIST_DIR}/TracyC.h -+ ${CMAKE_CURRENT_LIST_DIR}/Tracy.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyD3D11.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyD3D12.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyLua.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyOpenCL.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyOpenGL.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/TracyVulkan.hpp) -+ -+set(client_includes -+ ${CMAKE_CURRENT_LIST_DIR}/client/tracy_concurrentqueue.h -+ ${CMAKE_CURRENT_LIST_DIR}/client/tracy_rpmalloc.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyArmCpuTable.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyCallstack.h -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyCallstack.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyDxt1.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyFastVector.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyLock.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyProfiler.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyRingBuffer.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyScoped.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracySysTime.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracySysTrace.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/client/TracyThread.hpp) -+ -+set(common_includes -+ ${CMAKE_CURRENT_LIST_DIR}/common/tracy_lz4.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/tracy_lz4hc.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracyAlign.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracyAlloc.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracyApi.h -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracyColor.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracyForceInline.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracyMutex.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracyProtocol.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracyQueue.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracySocket.hpp -+ ${CMAKE_CURRENT_LIST_DIR}/common/TracySystem.hpp) -+ -+install(TARGETS TracyClient -+ EXPORT TracyConfig -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES ${includes} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES ${client_includes} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/client) -+install(FILES ${common_includes} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common) -+install(EXPORT TracyConfig -+ NAMESPACE Tracy:: -+ FILE TracyConfig.cmake -+ DESTINATION share/Tracy) diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 384628e3ac3fac..d5063151dcc514 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF 07778badcced109b8190805fbf2d7abfaef0d3b9 - SHA512 17f52d2b9558a2a6ebada5a405f74a8c6eb51c8dfb794a182cf7635cbe48206e1edce3bf6f5e9358ec8b24e9c0cba4019c8eb14bb37524ea762a80aece04652f + REF 9ba7171c3dd6f728268a820ee268a62c75f2dfb6 + SHA512 a2898cd04a532a5cc71fd6c5fd3893ebff68df25fc38e8d988ba4a8a6cbe33e3d0049661029d002160b94b57421e5c5b7400658b404e51bfab721d204dd0cc5d HEAD_REF master - PATCHES - add-install.patch ) vcpkg_cmake_configure( diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 8b5169e393e962..9821d14bf10bb9 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tracy", - "version": "0.7.8", - "port-version": 2, + "version": "0.8.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", "supports": "!(windows & (arm | uwp))", diff --git a/versions/baseline.json b/versions/baseline.json index a63c42fda604b0..f3537b7b5e5ad5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7049,8 +7049,8 @@ "port-version": 3 }, "tracy": { - "baseline": "0.7.8", - "port-version": 2 + "baseline": "0.8.0", + "port-version": 0 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 30e4cbde5cf508..8274402c9f5606 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b34c2e1fb20aa7f46e350fbf5b90e8dda71aaf3a", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "4495b1e35b5ce98b10a2a6f28eebdda0088903e2", "version": "0.7.8", From 9b78caf392f96a45bfd92dac21826a051657b022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 31 Mar 2022 04:30:27 +0800 Subject: [PATCH 093/217] [libde265] Add feature sse (#23845) * [libde265] Add feature sse * version --- ports/libde265/portfile.cmake | 6 ++++++ ports/libde265/vcpkg.json | 9 +++++++-- versions/baseline.json | 2 +- versions/l-/libde265.json | 5 +++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 2280ff18a07970..87418395ba5425 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -10,10 +10,16 @@ vcpkg_from_github( fix-libde265-headers.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + sse DISABLE_SSE +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index 76a03dc5ddcf7b..49e6569eeddf43 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libde265", "version": "1.0.8", - "port-version": 4, + "port-version": 5, "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", "license": "LGPL-3.0-only", @@ -15,5 +15,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "sse": { + "description": "Enable SSE optimizations" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index f3537b7b5e5ad5..405932dda95596 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3466,7 +3466,7 @@ }, "libde265": { "baseline": "1.0.8", - "port-version": 4 + "port-version": 5 }, "libdisasm": { "baseline": "0.23", diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index 19996e838cd39a..3ebc23251ab9a4 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "404108a20a6a0699d08f867b7da085ef3d91360b", + "version": "1.0.8", + "port-version": 5 + }, { "git-tree": "f69d985ecdaa897d5efd10422f739d450373e26d", "version": "1.0.8", From 19c5249f43548febf7cd072c205cc234394690c1 Mon Sep 17 00:00:00 2001 From: Burak Arslan Date: Wed, 30 Mar 2022 13:31:09 -0700 Subject: [PATCH 094/217] [Nss] Update to version 3.76.1 (#23841) * [nss] Version 3.76.1 * [nss] update version --- ports/nss/portfile.cmake | 4 ++-- ports/nss/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nss.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nss/portfile.cmake b/ports/nss/portfile.cmake index 79593dae847cc7..09b8aebea4c7d3 100644 --- a/ports/nss/portfile.cmake +++ b/ports/nss/portfile.cmake @@ -1,10 +1,10 @@ -set(NSS_VERSION "3.76") +set(NSS_VERSION "3.76.1") string(REPLACE "." "_" V_URL ${NSS_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${NSS_VERSION}.tar.gz" FILENAME "nss-${NSS_VERSION}.tar.gz" - SHA512 ffbdd8a27f60b796e1204912cde2fa62ac99747ce550258ccdd6fe96d60a46c6ac3f82758a7aba3c7ee58da4e7bf09f1bf817fb9f0fa4e62faaea08a6301b8bd + SHA512 80d32a97501cbc05312caa5cec54fe6dd8708f01e6d15693e36a40d70433be7a35565fcc5fadfc324c998ee9093b10b2f7a89643882f06a850eda4ffd3b19c54 ) vcpkg_extract_source_archive_ex( diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json index 8a528257bab9dd..6763a3fc239e71 100644 --- a/ports/nss/vcpkg.json +++ b/ports/nss/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nss", - "version": "3.76", + "version": "3.76.1", "description": "Network Security Services from Mozilla", "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 405932dda95596..69ede66d0dd312 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4857,7 +4857,7 @@ "port-version": 0 }, "nss": { - "baseline": "3.76", + "baseline": "3.76.1", "port-version": 0 }, "nsync": { diff --git a/versions/n-/nss.json b/versions/n-/nss.json index 0fd85cbb1a14bd..ba30569823e466 100644 --- a/versions/n-/nss.json +++ b/versions/n-/nss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5eabb67b345be280f94a3615aa3e08886ad4ec7", + "version": "3.76.1", + "port-version": 0 + }, { "git-tree": "ffcb42dbcb29e96a2e367dbbe473f447d67f54ce", "version": "3.76", From e319196767373ce0b07b7977dd78fd2559dae5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 31 Mar 2022 04:33:12 +0800 Subject: [PATCH 095/217] [vcpkg baseline][qtiterfaceframework] Change fail to skip (#23866) --- scripts/ci.baseline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4cebf5926c1d33..1f58327463eb07 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1021,7 +1021,7 @@ qt5-base:arm64-windows=fail qtwebengine:x64-windows=fail # upstream bug, see https://github.com/microsoft/vcpkg/issues/23766 -qtinterfaceframework:x64-windows=fail +qtinterfaceframework:x64-windows=skip # Skip deprecated Qt module # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) From 3048b9ab12f8fd4a3bc3edbdbc4070fc7d95c00b Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Wed, 30 Mar 2022 13:44:10 -0700 Subject: [PATCH 096/217] [vcpkg-ci-ffmpeg] remove tensorflow feature from dependencies (#23857) * [ci] stop ffmpeg depending on tensorflow vcpkg-ci-ffmpeg -> ffmpeg[all-nonfree] -> ffmpeg[tensorflow] * Robert CRs Co-authored-by: nicole mazzuca --- scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 132 +++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json index 356aab21a25013..48c23accf60da2 100644 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -7,9 +7,139 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ - "all-nonfree" + "avcodec", + "avdevice", + "avfilter", + "avformat", + "avresample", + "bzip2", + "fdk-aac", + "freetype", + "gpl", + "iconv", + "lzma", + "mp3lame", + "nonfree", + "openjpeg", + "openssl", + "opus", + "postproc", + "snappy", + "soxr", + "speex", + "swresample", + "swscale", + "theora", + "vorbis", + "vpx", + "webp", + "xml2", + "zlib" ] + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "alsa" + ], + "platform": "linux" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "sdl2" + ], + "platform": "!osx" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ass", + "fontconfig", + "fribidi", + "modplug", + "opencl", + "openh264" + ], + "platform": "!uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ilbc" + ], + "platform": "!(arm & uwp)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "ssh", + "x265" + ], + "platform": "!(uwp | arm)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "x264" + ], + "platform": "!(arm & windows)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "aom" + ], + "platform": "!(windows & arm & !uwp)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "dav1d" + ], + "platform": "!(uwp | arm | x86 | osx)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "opengl" + ], + "platform": "!uwp & !(arm64 & windows)" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avisynthplus" + ], + "platform": "windows & !arm & !uwp & !static" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "tesseract" + ], + "platform": "!(windows & arm) & !static & !uwp" + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "nvcodec" + ], + "platform": "linux | (!osx & !uwp & !(arm64 & windows))" } ] } From 54951282f33d1ffed5fa9fa9a73a6c0466ac246d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 30 Mar 2022 14:52:25 -0700 Subject: [PATCH 097/217] [boost-modular-build-helper] Pass flags more correctly into b2 (#23001) * [vcpkg-cmake][boost-modular-build-helper] Rework vcpkg_cmake_get_vars to produce fully cooked flags * [ffmpeg] Fix arm-uwp builds * [ffmpeg] Fix arm-uwp builds * [ffmpeg] Fix arm64-windows * [ffmpeg] Fix arm64-windows * [ffmpeg] Update version after merge * [boost-modular-build-helper] Add to requirements * Address PR comments Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Victor Romero --- .../ports/vcpkg-cmake/vcpkg_cmake_get_vars.md | 10 + .../boost-modular-build-helper/CMakeLists.txt | 212 ++++++------------ .../boost-modular-build.cmake | 11 + .../user-config.jam.in | 2 +- ports/boost-modular-build-helper/vcpkg.json | 3 +- ports/ffmpeg/build.sh.in | 4 +- ports/ffmpeg/portfile.cmake | 190 ++++++++-------- ports/ffmpeg/vcpkg.json | 2 +- .../vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 104 ++++++--- ports/vcpkg-cmake/vcpkg.json | 3 +- ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake | 10 + ports/vcpkg-qmake/vcpkg.json | 3 +- ports/vcpkg-qmake/vcpkg_qmake_configure.cmake | 12 +- versions/b-/boost-modular-build-helper.json | 5 + versions/baseline.json | 8 +- versions/f-/ffmpeg.json | 5 + versions/v-/vcpkg-cmake.json | 5 + versions/v-/vcpkg-qmake.json | 5 + 18 files changed, 312 insertions(+), 282 deletions(-) diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md index 68e51333c42b23..50e7abde7c2ddd 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md @@ -13,6 +13,16 @@ vcpkg_cmake_get_vars() a path to a generated CMake file, with the detected `CMAKE_*` variables re-exported as `VCPKG_DETECTED_CMAKE_*`. +Additionally sets, for `RELEASE` and `DEBUG`: +- VCPKG_COMBINED_CXX_FLAGS_ +- VCPKG_COMBINED_C_FLAGS_ +- VCPKG_COMBINED_SHARED_LINKER_FLAGS_ +- VCPKG_COMBINED_STATIC_LINKER_FLAGS_ +- VCPKG_COMBINED_EXE_LINKER_FLAGS_ + +Most users should use these pre-combined flags instead of attempting +to read the `VCPKG_DETECTED_*` flags directly. + ## Notes Avoid usage in portfiles. diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index dfc10343a7f519..368c601748784c 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -1,15 +1,18 @@ cmake_minimum_required(VERSION 3.9) -project(boost CXX) +project(boost NONE) # The following variables are used in user-config.jam file -set(USER_CONFIG_TOOLSET) -set(USER_CONFIG_TOOLSET_VERSION) -set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND) -set(USER_CONFIG_TOOLSET_OPTIONS) -set(USER_CONFIG_EXTRA_LINES) +set(USER_CONFIG_TOOLSET "") +set(USER_CONFIG_TOOLSET_VERSION "") +set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "") +set(USER_CONFIG_TOOLSET_OPTIONS "") +set(USER_CONFIG_EXTRA_LINES "") +set(USER_CONFIG_REQUIREMENTS "") set(B2_OPTIONS) +include("${VCPKG_CMAKE_VARS_FILE}") + # Add build type specific options if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") list(APPEND B2_OPTIONS runtime-link=shared) @@ -23,13 +26,13 @@ else() list(APPEND B2_OPTIONS link=static) endif() -if(CMAKE_SIZEOF_VOID_P EQUAL 8) +if(VCPKG_DETECTED_CMAKE_SIZEOF_VOID_P EQUAL "8") list(APPEND B2_OPTIONS address-model=64) else() list(APPEND B2_OPTIONS address-model=32) endif() -if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "s390x") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x") list(APPEND B2_OPTIONS architecture=s390x) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") list(APPEND B2_OPTIONS architecture=arm) @@ -43,178 +46,103 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32) list(APPEND B2_OPTIONS "asmflags=/safeseh") endif() -if(WIN32) - if(MSVC) - if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(USER_CONFIG_TOOLSET clang-win) - else() - set(USER_CONFIG_TOOLSET msvc) - endif() - if(MSVC_VERSION LESS 1900) - math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 60") - else() - math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 50") - endif() +if(VCPKG_DETECTED_MSVC) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(USER_CONFIG_TOOLSET clang-win) else() - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(USER_CONFIG_TOOLSET clang) - else() - set(USER_CONFIG_TOOLSET gcc) - endif() + set(USER_CONFIG_TOOLSET msvc) endif() - list(APPEND B2_OPTIONS target-os=windows) -elseif(APPLE) - if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(USER_CONFIG_TOOLSET clang) + if(VCPKG_DETECTED_MSVC_VERSION LESS "1900") + math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60") else() - set(USER_CONFIG_TOOLSET gcc) + math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 50") endif() +elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(USER_CONFIG_TOOLSET clang) +else() + set(USER_CONFIG_TOOLSET gcc) +endif() + +if(WIN32) + list(APPEND B2_OPTIONS target-os=windows) +elseif(APPLE) list(APPEND B2_OPTIONS target-os=darwin) elseif(ANDROID) - set(USER_CONFIG_TOOLSET gcc) list(APPEND B2_OPTIONS target-os=android) else() - if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(USER_CONFIG_TOOLSET clang) - else() - set(USER_CONFIG_TOOLSET gcc) - endif() list(APPEND B2_OPTIONS target-os=linux) endif() # Properly handle compiler and linker flags passed by VCPKG -if(CMAKE_BUILD_TYPE STREQUAL "Release") - set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") - set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}") - if(BUILD_SHARED_LIBS) - set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") - else() - set(LDFLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_RELEASE}") - endif() -elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") - set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}") - if(BUILD_SHARED_LIBS) - set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}") - else() - set(LDFLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_DEBUG}") - endif() -endif() - -if(APPLE) - if(CMAKE_OSX_DEPLOYMENT_TARGET) - set(CXXFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CXXFLAGS}") - set(CFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CFLAGS}") - set(LDFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${LDFLAGS}") - endif() - - if(CMAKE_OSX_SYSROOT) - set(CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${CXXFLAGS}") - set(CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${CFLAGS}") - set(LDFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${LDFLAGS}") - endif() +string(TOUPPER "${CMAKE_BUILD_TYPE}" UPPER_BUILD_TYPE) - # if specific architectures are set, configure them, - # if not set, this will still default to current arch - foreach(ARCH IN LISTS CMAKE_OSX_ARCHITECTURES) - set(CXXFLAGS "-arch ${ARCH} ${CXXFLAGS}") - set(CFLAGS "-arch ${ARCH} ${CFLAGS}") - set(LDFLAGS "-arch ${ARCH} ${LDFLAGS}") - endforeach() -endif() - -string(REGEX REPLACE "[ \t\r\n]+" " " CXXFLAGS "${CXXFLAGS}") -string(STRIP "${CXXFLAGS}" CXXFLAGS) -string(REGEX REPLACE "[ \t\r\n]+" " " CFLAGS "${CFLAGS}") -string(STRIP "${CFLAGS}" CFLAGS) -string(REGEX REPLACE "[ \t\r\n]+" " " LDFLAGS "${LDFLAGS}") -string(STRIP "${LDFLAGS}" LDFLAGS) - -if(NOT CXXFLAGS STREQUAL "") - string(REPLACE " " " " CXXFLAGS "${CXXFLAGS}") -endif() -if(NOT CFLAGS STREQUAL "") - string(REPLACE " " " " CFLAGS "${CFLAGS}") -endif() -if(NOT LDFLAGS STREQUAL "") - string(REPLACE " " " " LDFLAGS "${LDFLAGS}") -endif() - -if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") - else() - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") - endif() -endif() - -if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - else() - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - endif() -endif() - -if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT) - string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") - string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") -endif() -foreach(INCDIR IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) - string(APPEND CXXFLAGS " ${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}") -endforeach() +set(CXXFLAGS "${VCPKG_COMBINED_CXX_FLAGS_${UPPER_BUILD_TYPE}}") +set(CFLAGS "${VCPKG_COMBINED_C_FLAGS_${UPPER_BUILD_TYPE}}") +set(LDFLAGS "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") +set(ARFLAGS "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${UPPER_BUILD_TYPE}}") if(APPLE) - if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - string(APPEND CXXFLAGS " -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") - string(APPEND LDFLAGS " -stdlib=libc++") - else() - string(APPEND CXXFLAGS " -D_DARWIN_C_SOURCE -std=c++11") + string(APPEND COMPILEFLAGS " -D_DARWIN_C_SOURCE") + if(NOT CXXFLAGS MATCHES " -std=") + # If the user hasn't provided their own standard flag, use at least c++11 + string(APPEND CXXFLAGS " -std=c++11") endif() endif() -if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # cl in b2 appears to not receive `LIBPATH` for finding winmd files, so we transform them to `/AI` options. set(libpath_args "$ENV{LIBPATH}") # Apply: {x -> /AI"x"} list(TRANSFORM libpath_args PREPEND "/AI\"") list(TRANSFORM libpath_args APPEND "\"") - # Apply: {\ -> \\} - list(TRANSFORM libpath_args REPLACE "\\\\" "\\\\\\\\") - # Apply: {" -> \"} - list(TRANSFORM libpath_args REPLACE "\\\"" "\\\\\"") list(JOIN libpath_args " " libpath_arg) - string(APPEND CXXFLAGS " \"${libpath_arg}\" /ZW \"/D_WIN32_WINNT=0x0A00\"") - string(APPEND CFLAGS " -Zl") + string(APPEND CXXFLAGS " /ZW") + string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") + string(APPEND CFLAGS " -Zl") list(APPEND B2_OPTIONS windows-api=store) list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) endif() -set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${CMAKE_CXX_COMPILER}\"") +set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${VCPKG_DETECTED_CMAKE_CXX_COMPILER}\"") + +string(APPEND CXXFLAGS "${COMPILEFLAGS}") +string(APPEND CFLAGS "${COMPILEFLAGS}") + +foreach(var CXXFLAGS CFLAGS LDFLAGS ARFLAGS) + string(REPLACE [[\]] [[\\]] ${var} "${${var}}") + string(REPLACE [["]] [[\"]] ${var} "${${var}}") + string(REGEX REPLACE "[ \t\r\n]+" " " ${var} "${${var}}") + string(STRIP "${${var}}" ${var}) +endforeach() if(USER_CONFIG_TOOLSET STREQUAL "msvc") file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${NOTHING_BAT}\"\n" - " ${CXXFLAGS}\n" - " ${CFLAGS}\n" - " ${LDFLAGS}\n" ) + if(NOT ARFLAGS STREQUAL "") + # Only apply these flags for MSVC + string(APPEND USER_CONFIG_REQUIREMENTS "\"${ARFLAGS}\"\n ") + endif() else() string(APPEND USER_CONFIG_TOOLSET_OPTIONS - " \"${CMAKE_RANLIB}\"\n" - " \"${CMAKE_AR}\"\n" - " ${CXXFLAGS}\n" - " ${CFLAGS}\n" - " ${LDFLAGS}\n" + " \"${VCPKG_DETECTED_CMAKE_RANLIB}\"\n" + " \"${VCPKG_DETECTED_CMAKE_AR}\"\n" ) endif() +if(NOT CXXFLAGS STREQUAL "") + string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${CXXFLAGS}\"\n") +endif() +if(NOT CFLAGS STREQUAL "") + string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${CFLAGS}\"\n \"${CFLAGS}\"\n") +endif() +if(NOT LDFLAGS STREQUAL "") + string(APPEND USER_CONFIG_REQUIREMENTS "\"${LDFLAGS}\"\n ") + string(APPEND USER_CONFIG_TOOLSET_OPTIONS " \"${LDFLAGS}\"\n") +endif() + if(WIN32 AND NOT USER_CONFIG_TOOLSET STREQUAL "msvc") # MINGW here causes b2 to not run cygpath string(APPEND USER_CONFIG_TOOLSET_OPTIONS @@ -255,7 +183,7 @@ endif() # Handle Python set(python_versions "") -if("python2" IN_LIST FEATURES) +if(WITH_PYTHON2) # Find Python2 in the current installed directory file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") @@ -266,7 +194,7 @@ if("python2" IN_LIST FEATURES) list(APPEND python_versions "${python2_version}") endif() -if("python3" IN_LIST FEATURES) +if(WITH_PYTHON3) # Find Python3 in the current installed directory file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 4cff5eab9bf8b1..344deb615620bc 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -105,17 +105,28 @@ function(boost_modular_build) list(APPEND configure_options "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}") endif() + vcpkg_cmake_get_vars(cmake_vars_file) + + vcpkg_check_features( + OUT_FEATURE_OPTIONS feature_options + FEATURES + python2 WITH_PYTHON2 + python3 WITH_PYTHON3 + ) + vcpkg_cmake_configure( SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build GENERATOR Ninja OPTIONS "-DPORT=${PORT}" "-DFEATURES=${FEATURES}" + ${feature_options} "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" "-DB2_EXE=${B2_EXE}" "-DSOURCE_PATH=${_bm_SOURCE_PATH}" "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}" "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" + "-DVCPKG_CMAKE_VARS_FILE=${cmake_vars_file}" ${configure_options} MAYBE_UNUSED_VARIABLES FEATURES diff --git a/ports/boost-modular-build-helper/user-config.jam.in b/ports/boost-modular-build-helper/user-config.jam.in index fd9b9f0a91dc7d..fccfa1a43ee028 100644 --- a/ports/boost-modular-build-helper/user-config.jam.in +++ b/ports/boost-modular-build-helper/user-config.jam.in @@ -7,7 +7,7 @@ using @USER_CONFIG_TOOLSET@ : @USER_CONFIG_TOOLSET_VERSION@ : @USER_CONFIG_TOOLS @USER_CONFIG_EXTRA_LINES@ -project user-config : ; +project user-config : requirements @USER_CONFIG_REQUIREMENTS@ ; if "@USER_CONFIG_TOOLSET@" = "msvc" || "@USER_CONFIG_TOOLSET@" = "clang-win" { diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 31ea55e28933e1..a70e222808d242 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-modular-build-helper", "version": "1.78.0", - "port-version": 2, + "port-version": 3, "description": "Internal vcpkg port used to build Boost libraries", + "license": "MIT", "dependencies": [ "boost-uninstall", "vcpkg-cmake" diff --git a/ports/ffmpeg/build.sh.in b/ports/ffmpeg/build.sh.in index b7e53982c14f2c..c6f94fa87d3c81 100644 --- a/ports/ffmpeg/build.sh.in +++ b/ports/ffmpeg/build.sh.in @@ -91,11 +91,11 @@ OSX_ARCH_COUNT=0@OSX_ARCH_COUNT@ build_ffmpeg() { echo "=== CONFIGURING ===" - sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@ $@ + sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" "--cc=$CC" @CONFIGURE_OPTIONS@ $@ echo "=== BUILDING ===" - make -j${JOBS} + make -j${JOBS} V=1 echo "=== INSTALLING ===" diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 7a879dae1ad1f8..1d32c992ed24d7 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -34,12 +34,12 @@ endif() if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") # ffmpeg nasm build gives link error on x86, so fall back to yasm vcpkg_find_acquire_program(YASM) - get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) - vcpkg_add_to_path(${YASM_EXE_PATH}) + get_filename_component(YASM_EXE_PATH "${YASM}" DIRECTORY) + vcpkg_add_to_path("${YASM_EXE_PATH}") else() vcpkg_find_acquire_program(NASM) - get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) - vcpkg_add_to_path(${NASM_EXE_PATH}) + get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) + vcpkg_add_to_path("${NASM_EXE_PATH}") endif() if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -85,29 +85,40 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_acquire_msys(MSYS_ROOT) endif() - set(SHELL ${MSYS_ROOT}/usr/bin/bash.exe) - if(VCPKG_TARGET_IS_MINGW) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(OPTIONS "--target-os=mingw32 ${OPTIONS}") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(OPTIONS "--target-os=mingw64 ${OPTIONS}") - endif() - else() - set(OPTIONS "--toolchain=msvc ${OPTIONS}") - endif() + set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe") else() set(SHELL /bin/sh) endif() +if(VCPKG_TARGET_IS_MINGW) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + string(APPEND OPTIONS " --target-os=mingw32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND OPTIONS " --target-os=mingw64") + endif() +elseif(VCPKG_TARGET_IS_WINDOWS) + string(APPEND OPTIONS " --target-os=win32") +elseif(VCPKG_TARGET_IS_OSX) + string(APPEND OPTIONS " --target-os=darwin") +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") + string(APPEND OPTIONS " --target-os=android") +else() +endif() + vcpkg_cmake_get_vars(cmake_vars_file) include("${cmake_vars_file}") -if(VCPKG_TARGET_IS_OSX AND VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET) - set(OPTIONS "--extra-cflags=-mmacosx-version-min=${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET} ${OPTIONS}") - set(OPTIONS "--extra-ldflags=-mmacosx-version-min=${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET} ${OPTIONS}") +if(VCPKG_DETECTED_MSVC) + set(OPTIONS "--toolchain=msvc ${OPTIONS}") + # This is required because ffmpeg depends upon optimizations to link correctly + string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -O2") + string(REPLACE " -RTC1 " "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REPLACE " -Od " "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REPLACE " -Ob0 " "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") endif() -set(ENV{${INCLUDE_VAR}} "${CURRENT_INSTALLED_DIR}/include${VCPKG_HOST_PATH_SEPARATOR}$ENV{${INCLUDE_VAR}}") +string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -I \"${CURRENT_INSTALLED_DIR}/include\"") +string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " -I \"${CURRENT_INSTALLED_DIR}/include\"") set(_csc_PROJECT_PATH ffmpeg) @@ -442,80 +453,48 @@ else() endif() if (VCPKG_TARGET_IS_OSX) - # if the sysroot isn't set in the triplet we fall back to whatever CMake detected for us - if ("${VCPKG_OSX_SYSROOT}" STREQUAL "") - set(VCPKG_OSX_SYSROOT ${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}) - endif() - set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX - set(OPTIONS "${OPTIONS} --extra-cflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"") - set(OPTIONS "${OPTIONS} --extra-ldflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"") - - list(JOIN VCPKG_OSX_ARCHITECTURES " " OSX_ARCHS) - LIST(LENGTH VCPKG_OSX_ARCHITECTURES OSX_ARCH_COUNT) endif() -set(OPTIONS_CROSS "") +set(OPTIONS_CROSS " --enable-cross-compile") + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + string(APPEND OPTIONS_CROSS " --arch=x86_64") +else() + string(APPEND OPTIONS_CROSS " --arch=${VCPKG_TARGET_ARCHITECTURE}") +endif() if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") if(VCPKG_TARGET_IS_WINDOWS) - set(OPTIONS_CROSS " --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}") vcpkg_find_acquire_program(GASPREPROCESSOR) foreach(GAS_PATH ${GASPREPROCESSOR}) get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}") endforeach(GAS_PATH) - elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") - # get the number of architectures requested - list(LENGTH VCPKG_OSX_ARCHITECTURES ARCHITECTURE_COUNT) - - # ideally we should check the CMAKE_HOST_SYSTEM_PROCESSOR, but that seems to be - # broken when inside a vcpkg port, so we only set it when doing a simple build - # for a single platform. multi-platform builds use a different script - if (ARCHITECTURE_COUNT LESS 2) - message(STATUS "Building on host: ${CMAKE_SYSTEM_PROCESSOR}") - set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=arm64 --extra-ldflags=-arch --extra-ldflags=arm64 --extra-cflags=-arch --extra-cflags=arm64 --extra-cxxflags=-arch --extra-cxxflags=arm64") - endif() endif() -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - if(VCPKG_TARGET_IS_OSX) - set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=x86_64 --extra-ldflags=-arch --extra-ldflags=x86_64 --extra-cflags=-arch --extra-cflags=x86_64 --extra-cxxflags=-arch --extra-cxxflags=x86_64") - endif() -elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") -else() - message(FATAL_ERROR "Unsupported architecture") endif() if(VCPKG_TARGET_IS_UWP) set(ENV{LIBPATH} "$ENV{LIBPATH};$ENV{_WKITS10}references\\windows.foundation.foundationcontract\\2.0.0.0\\;$ENV{_WKITS10}references\\windows.foundation.universalapicontract\\3.0.0.0\\") - set(OPTIONS "${OPTIONS} --disable-programs") - set(OPTIONS "${OPTIONS} --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00") - set(OPTIONS_CROSS " --enable-cross-compile --target-os=win32 --arch=${VCPKG_TARGET_ARCHITECTURE}") + string(APPEND OPTIONS " --disable-programs") + string(APPEND OPTIONS " --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00") + string(APPEND OPTIONS " --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib") endif() -set(OPTIONS_DEBUG "--debug") # Note: --disable-optimizations can't be used due to https://ffmpeg.org/pipermail/libav-user/2013-March/003945.html +# Note: --disable-optimizations can't be used due to https://ffmpeg.org/pipermail/libav-user/2013-March/003945.html +set(OPTIONS_DEBUG "--debug") set(OPTIONS_RELEASE "") set(OPTIONS "${OPTIONS} ${OPTIONS_CROSS}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPTIONS "${OPTIONS} --disable-static --enable-shared") - if (VCPKG_TARGET_IS_UWP) - set(OPTIONS "${OPTIONS} --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib") - endif() endif() if(VCPKG_TARGET_IS_MINGW) set(OPTIONS "${OPTIONS} --extra_cflags=-D_WIN32_WINNT=0x0601") elseif(VCPKG_TARGET_IS_WINDOWS) set(OPTIONS "${OPTIONS} --extra-cflags=-DHAVE_UNISTD_H=0") - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MDd --extra-cxxflags=-MDd") - set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MD --extra-cxxflags=-MD") - else() - set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-cflags=-MTd --extra-cxxflags=-MTd") - set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-cflags=-MT --extra-cxxflags=-MT") - endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -524,17 +503,34 @@ endif() set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}") +get_filename_component(CC_path "${VCPKG_DETECTED_CMAKE_C_COMPILER}" DIRECTORY) +get_filename_component(CC_filename "${VCPKG_DETECTED_CMAKE_C_COMPILER}" NAME) +set(ENV{CC} "${CC_filename}") +if(CC_path) + vcpkg_add_to_path(PREPEND "${CC_path}") +endif() + message(STATUS "Building Options: ${OPTIONS}") # Release build if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") 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{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}") - set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}") set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") message(STATUS "Building ${_csc_PROJECT_PATH} for Release") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + # We use response files here as the only known way to handle spaces in paths + set(crsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/cflags.rsp") + file(WRITE "${crsp}" "${VCPKG_COMBINED_C_FLAGS_RELEASE}") + set(ldrsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/ldflags.rsp") + file(WRITE "${ldrsp}" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}") + set(ENV{CFLAGS} "@${crsp}") + # All tools except the msvc arm{,64} assembler accept @... as response file syntax. + # For that assembler, there is no known way to pass in flags. We must hope that not passing flags will work acceptably. + if(NOT VCPKG_DETECTED_MSVC OR NOT VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + set(ENV{ASFLAGS} "@${crsp}") + endif() + set(ENV{LDFLAGS} "@${ldrsp}") set(BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") set(CONFIGURE_OPTIONS "${OPTIONS} ${OPTIONS_RELEASE}") @@ -543,9 +539,9 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") configure_file("${CMAKE_CURRENT_LIST_DIR}/build.sh.in" "${BUILD_DIR}/build.sh" @ONLY) vcpkg_execute_required_process( - COMMAND ${SHELL} ./build.sh - WORKING_DIRECTORY ${BUILD_DIR} - LOGNAME build-${TARGET_TRIPLET}-rel + COMMAND "${SHELL}" ./build.sh + WORKING_DIRECTORY "${BUILD_DIR}" + LOGNAME "build-${TARGET_TRIPLET}-rel" ) endif() @@ -553,11 +549,19 @@ endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") 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{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG}") - set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}") + set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig") message(STATUS "Building ${_csc_PROJECT_PATH} for Debug") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + set(crsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/cflags.rsp") + file(WRITE "${crsp}" "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + set(ldrsp "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/ldflags.rsp") + file(WRITE "${ldrsp}" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") + set(ENV{CFLAGS} "@${crsp}") + if(NOT VCPKG_DETECTED_MSVC OR NOT VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") + set(ENV{ASFLAGS} "@${crsp}") + endif() + set(ENV{LDFLAGS} "@${ldrsp}") set(BUILD_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") set(CONFIGURE_OPTIONS "${OPTIONS} ${OPTIONS_DEBUG}") @@ -566,14 +570,14 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") configure_file("${CMAKE_CURRENT_LIST_DIR}/build.sh.in" "${BUILD_DIR}/build.sh" @ONLY) vcpkg_execute_required_process( - COMMAND ${SHELL} ./build.sh - WORKING_DIRECTORY ${BUILD_DIR} - LOGNAME build-${TARGET_TRIPLET}-dbg + COMMAND "${SHELL}" ./build.sh + WORKING_DIRECTORY "${BUILD_DIR}" + LOGNAME "build-${TARGET_TRIPLET}-dbg" ) endif() if(VCPKG_TARGET_IS_WINDOWS) - file(GLOB DEF_FILES ${CURRENT_PACKAGES_DIR}/lib/*.def ${CURRENT_PACKAGES_DIR}/debug/lib/*.def) + file(GLOB DEF_FILES "${CURRENT_PACKAGES_DIR}/lib/*.def" "${CURRENT_PACKAGES_DIR}/debug/lib/*.def") if(NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") @@ -596,21 +600,21 @@ if(VCPKG_TARGET_IS_WINDOWS) file(TO_NATIVE_PATH "${DEF_FILE_DIR}/${OUT_FILE_NAME}" OUT_FILE_NATIVE) message(STATUS "Generating ${OUT_FILE_NATIVE}") vcpkg_execute_required_process( - COMMAND lib.exe /def:${DEF_FILE_NATIVE} /out:${OUT_FILE_NATIVE} ${LIB_MACHINE_ARG} - WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR} - LOGNAME libconvert-${TARGET_TRIPLET} + COMMAND lib.exe "/def:${DEF_FILE_NATIVE}" "/out:${OUT_FILE_NATIVE}" ${LIB_MACHINE_ARG} + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}" + LOGNAME "libconvert-${TARGET_TRIPLET}" ) endforeach() endif() - file(GLOB EXP_FILES ${CURRENT_PACKAGES_DIR}/lib/*.exp ${CURRENT_PACKAGES_DIR}/debug/lib/*.exp) - file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) + file(GLOB EXP_FILES "${CURRENT_PACKAGES_DIR}/lib/*.exp" "${CURRENT_PACKAGES_DIR}/debug/lib/*.exp") + file(GLOB LIB_FILES "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") if(VCPKG_TARGET_IS_MINGW) - file(GLOB LIB_FILES_2 ${CURRENT_PACKAGES_DIR}/bin/*.lib ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) + file(GLOB LIB_FILES_2 "${CURRENT_PACKAGES_DIR}/bin/*.lib" "${CURRENT_PACKAGES_DIR}/debug/bin/*.lib") endif() - list(APPEND FILES_TO_REMOVE ${EXP_FILES} ${LIB_FILES} ${LIB_FILES_2} ${DEF_FILES}) - if(FILES_TO_REMOVE) - file(REMOVE ${FILES_TO_REMOVE}) + set(files_to_remove ${EXP_FILES} ${LIB_FILES} ${LIB_FILES_2} ${DEF_FILES}) + if(files_to_remove) + file(REMOVE ${files_to_remove}) endif() endif() @@ -624,10 +628,10 @@ if("ffplay" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES ffplay AUTO_CLEAN) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() @@ -725,8 +729,8 @@ list(REMOVE_DUPLICATES FFMPEG_DEPENDENCIES_DEBUG) list(REVERSE FFMPEG_DEPENDENCIES_RELEASE) list(REVERSE FFMPEG_DEPENDENCIES_DEBUG) -message("Dependencies (release): ${FFMPEG_DEPENDENCIES_RELEASE}") -message("Dependencies (debug): ${FFMPEG_DEPENDENCIES_DEBUG}") +message(STATUS "Dependencies (release): ${FFMPEG_DEPENDENCIES_RELEASE}") +message(STATUS "Dependencies (debug): ${FFMPEG_DEPENDENCIES_DEBUG}") # Handle version strings @@ -785,7 +789,7 @@ extract_version_from_component(LIBSWSCALE_VERSION COMPONENT libswscale) # Handle copyright -file(STRINGS ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-out.log LICENSE_STRING REGEX "License: .*" LIMIT_COUNT 1) +file(STRINGS "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-out.log" LICENSE_STRING REGEX "License: .*" LIMIT_COUNT 1) if(LICENSE_STRING STREQUAL "License: LGPL version 2.1 or later") set(LICENSE_FILE "COPYING.LGPLv2.1") elseif(LICENSE_STRING STREQUAL "License: LGPL version 3 or later") @@ -796,11 +800,11 @@ elseif(LICENSE_STRING STREQUAL "License: GPL version 3 or later") set(LICENSE_FILE "COPYING.GPLv3") elseif(LICENSE_STRING STREQUAL "License: nonfree and unredistributable") set(LICENSE_FILE "COPYING.NONFREE") - file(WRITE ${SOURCE_PATH}/${LICENSE_FILE} ${LICENSE_STRING}) + file(WRITE "${SOURCE_PATH}/${LICENSE_FILE}" "${LICENSE_STRING}") else() message(FATAL_ERROR "Failed to identify license (${LICENSE_STRING})") endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/FindFFMPEG.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/FindFFMPEG.cmake @ONLY) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/${LICENSE_FILE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/FindFFMPEG.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindFFMPEG.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/${LICENSE_FILE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index b217c8908d1a64..d29f83270fd81b 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 10, + "port-version": 11, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt index 084042fb116ab2..dded67b4eceef2 100644 --- a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -8,7 +8,10 @@ list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_CROSSCOMPILING CMAKE_SYSTEM_NAME CMAKE_HOST_SYSTEM_NAME CMAKE_SYSTEM_PROCESSOR - CMAKE_HOST_SYSTEM_PROCESSOR) + CMAKE_HOST_SYSTEM_PROCESSOR + CMAKE_SIZEOF_VOID_P + MSVC + MSVC_VERSION) if(CMAKE_SYSTEM_NAME MATCHES "Darwin") list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT) @@ -21,6 +24,7 @@ endforeach() set(COMPILERS ${VCPKG_LANGUAGES} RC) foreach(prog IN LISTS COMPILERS) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER_ID) endforeach() # Variables to check foreach(_lang IN LISTS VCPKG_LANGUAGES) @@ -74,7 +78,7 @@ endif() project(get_cmake_vars LANGUAGES ${VCPKG_LANGUAGES}) -foreach(VAR IN LISTS VCPKG_VARS_TO_CHECK) +foreach(VAR IN LISTS VCPKG_VARS_TO_CHECK VCPKG_FLAGS_TO_CHECK) string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${VAR} \"${${VAR}}\")\n") endforeach() @@ -87,38 +91,64 @@ foreach(_env IN LISTS VCPKG_ENV_VARS_TO_CHECK) endif() endforeach() -macro(_vcpkg_adjust_flags flag_var) - if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. - string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") - endif() - if(CMAKE_SYSTEM_NAME MATCHES "Darwin") - if("${flag_var}" IN_LIST VCPKG_LANG_FLAGS) - # macOS - append arch and isysroot if cross-compiling - if(NOT "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}") - - foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) - string(APPEND ${flag_var} " -arch ${arch}") - endforeach() - string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}") - endif() - endif() +set(EXTRA_FLAGS "") + +if(APPLE) + if(CMAKE_OSX_SYSROOT) + string(APPEND EXTRA_FLAGS " -isysroot \"${CMAKE_OSX_SYSROOT}\"") endif() -endmacro() - -foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) - string(STRIP "${${flag}}" ${flag}) # Strip leading and trailing whitespaces - _vcpkg_adjust_flags(${flag}) - string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag} \" ${${flag}}\")\n") - foreach(config IN LISTS VCPKG_CONFIGS) - string(STRIP "${${flag}_${config}}" ${flag}_${config}) - _vcpkg_adjust_flags(${flag}_${config}) - string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag}_${config} \"${CMAKE_${flag}_FLAGS_${config}}\")\n") - set(COMBINED_${flag}_${config} "${${flag}} ${${flag}_${config}}") - string(STRIP "${COMBINED_${flag}_${config}}" COMBINED_${flag}_${config}) - string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${flag}_${config} \"${COMBINED_${flag}_${config}}\")\n") + foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) + string(APPEND EXTRA_FLAGS " -arch ${arch}") endforeach() + if(CMAKE_OSX_DEPLOYMENT_TARGET) + string(APPEND EXTRA_FLAGS " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") + endif() +endif() +if(CMAKE_CXX_COMPILER_TARGET) + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}\"") + else() + string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} \"${CMAKE_CXX_COMPILER_TARGET}\"") + endif() +endif() +if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN) + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"") + else() + string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} \"${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"") + endif() +endif() +if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT) + string(APPEND EXTRA_FLAGS " \"${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}\"") +endif() + +foreach(flags CXX C SHARED_LINKER EXE_LINKER) + set(${flags}_FLAGS "${CMAKE_${flags}_FLAGS} ${CMAKE_${flags}_FLAGS_${VCPKG_CONFIGS}} ${EXTRA_FLAGS}") +endforeach() + +foreach(flags STATIC_LINKER RC) + set(${flags}_FLAGS "${CMAKE_${flags}_FLAGS} ${CMAKE_${flags}_FLAGS_${VCPKG_CONFIGS}}") endforeach() +foreach(incdir IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) + string(APPEND CXX_FLAGS " \"${CMAKE_INCLUDE_FLAG_CXX}${incdir}\"") +endforeach() + +foreach(incdir IN LISTS CMAKE_C_STANDARD_INCLUDE_DIRECTORIES) + string(APPEND C_FLAGS " \"${CMAKE_INCLUDE_FLAG_C}${incdir}\"") +endforeach() + +foreach(flag CXX C SHARED_LINKER EXE_LINKER STATIC_LINKER RC) + if(MSVC) + # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. + # This is imperfect because it fails on directories with trailing spaces, but those are exceedingly rare + string(REGEX REPLACE "(^| )/" "\\1-" ${flag}_FLAGS "${${flag}_FLAGS}") + endif() + string(REPLACE "\\" "\\\\" ${flag}_FLAGS "${${flag}_FLAGS}") + string(REPLACE "\"" "\\\"" ${flag}_FLAGS "${${flag}_FLAGS}") + string(REPLACE "\$" "\\\$" ${flag}_FLAGS "${${flag}_FLAGS}") + string(APPEND OUTPUT_STRING "set(VCPKG_COMBINED_${flag}_FLAGS_${VCPKG_CONFIGS} \"${${flag}_FLAGS}\")\n") +endforeach() file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}") @@ -137,12 +167,26 @@ file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}") # CMAKE_CXX_COMPILER # CMAKE_RC_COMPILER +# Program details: +# CMAKE__COMPILER_ID +# MSVC +# MSVC_VERSION + # Flags: # CMAKE__FLAGS # CMAKE__FLAGS_ # CMAKE_RC_FLAGS # CMAKE_SHARED_LINKER_FLAGS +# CMAKE_SHARED_LINKER_FLAGS_ # CMAKE_STATIC_LINKER_FLAGS # CMAKE_STATIC_LINKER_FLAGS_ # CMAKE_EXE_LINKER_FLAGS # CMAKE_EXE_LINKER_FLAGS_ + +# Additional information: +# CMAKE_SIZEOF_VOID_P +# CMAKE_CROSSCOMPILING +# CMAKE_SYSTEM_NAME +# CMAKE_HOST_SYSTEM_NAME +# CMAKE_SYSTEM_PROCESSOR +# CMAKE_HOST_SYSTEM_PROCESSOR diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 0061a046eab5c0..7cf193990473d9 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-01-19" + "version-date": "2022-02-14", + "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake b/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake index ec1a9980901c98..e8a1feec481832 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake @@ -12,6 +12,16 @@ vcpkg_cmake_get_vars() a path to a generated CMake file, with the detected `CMAKE_*` variables re-exported as `VCPKG_DETECTED_CMAKE_*`. +Additionally sets, for `RELEASE` and `DEBUG`: +- VCPKG_COMBINED_CXX_FLAGS_ +- VCPKG_COMBINED_C_FLAGS_ +- VCPKG_COMBINED_SHARED_LINKER_FLAGS_ +- VCPKG_COMBINED_STATIC_LINKER_FLAGS_ +- VCPKG_COMBINED_EXE_LINKER_FLAGS_ + +Most users should use these pre-combined flags instead of attempting +to read the `VCPKG_DETECTED_*` flags directly. + ## Notes Avoid usage in portfiles. diff --git a/ports/vcpkg-qmake/vcpkg.json b/ports/vcpkg-qmake/vcpkg.json index eed2100359a32d..af140d3c24cbb4 100644 --- a/ports/vcpkg-qmake/vcpkg.json +++ b/ports/vcpkg-qmake/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vcpkg-qmake", - "version-date": "2021-10-23", + "version-date": "2022-02-14", + "license": "MIT", "supports": "native", "dependencies": [ "pkgconf", diff --git a/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake b/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake index b0483e8cfd6ab5..86222e0993d5f2 100644 --- a/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake +++ b/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake @@ -131,12 +131,12 @@ function(vcpkg_qmake_configure) set(qmake_comp_flags "") # Note sure about these. VCPKG_QMAKE_OPTIONS offers a way to opt out of these. (earlier values being overwritten by later values; = set +=append *=append unique -=remove) vcpkg_list(APPEND qmake_comp_flags "QMAKE_LIBS+=${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}" - "QMAKE_RC+=${VCPKG_DETECTED_CMAKE_RC_FLAGS_${buildtype}}" - "QMAKE_CFLAGS_${buildtype}*=${VCPKG_DETECTED_CMAKE_C_FLAGS_${buildtype}}" - "QMAKE_CXXFLAGS_${buildtype}*=${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${buildtype}}" - "QMAKE_LFLAGS*=${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${buildtype}}" - "QMAKE_LFLAGS_DLL*=${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${buildtype}}" - "QMAKE_LFLAGS_EXE*=${VCPKG_DETECTED_CMAKE_EXE_LINKER_FLAGS_${buildtype}}" + "QMAKE_RC+=${VCPKG_COMBINED_RC_FLAGS_${buildtype}}" + "QMAKE_CFLAGS_${buildtype}*=${VCPKG_COMBINED_C_FLAGS_${buildtype}}" + "QMAKE_CXXFLAGS_${buildtype}*=${VCPKG_COMBINED_CXX_FLAGS_${buildtype}}" + "QMAKE_LFLAGS*=${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${buildtype}}" + "QMAKE_LIBFLAGS*=${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${buildtype}}" + "QMAKE_LFLAGS_EXE*=${VCPKG_COMBINED_EXE_LINKER_FLAGS_${buildtype}}" ) message(STATUS "Configuring ${config_triplet}") diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index e45e0fbada2b09..7abc1eca933f86 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee3c3c2a3ecfb2bcff50d0758da7d6c36479a3c4", + "version": "1.78.0", + "port-version": 3 + }, { "git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6", "version": "1.78.0", diff --git a/versions/baseline.json b/versions/baseline.json index 69ede66d0dd312..ee67b10eaf96ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -822,7 +822,7 @@ }, "boost-modular-build-helper": { "baseline": "1.78.0", - "port-version": 2 + "port-version": 3 }, "boost-move": { "baseline": "1.78.0", @@ -2178,7 +2178,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 10 + "port-version": 11 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -7261,7 +7261,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-01-19", + "baseline": "2022-02-14", "port-version": 0 }, "vcpkg-cmake-config": { @@ -7281,7 +7281,7 @@ "port-version": 0 }, "vcpkg-qmake": { - "baseline": "2021-10-23", + "baseline": "2022-02-14", "port-version": 0 }, "vcpkg-tool-gyp-nss": { diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 0ca67085003988..8698734d413796 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4be11b342853200f575143c5bb5353b044621293", + "version": "4.4.1", + "port-version": 11 + }, { "git-tree": "d525f98e7146a1fd731febe7c472232142d62821", "version": "4.4.1", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index b61a6fe25f1beb..56a6f595e74967 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", + "version-date": "2022-02-14", + "port-version": 0 + }, { "git-tree": "b7c050fe60f91dcedef6d87a3f87584151bf8aee", "version-date": "2022-01-19", diff --git a/versions/v-/vcpkg-qmake.json b/versions/v-/vcpkg-qmake.json index baef9ddc82fc48..5a33b40061d1ff 100644 --- a/versions/v-/vcpkg-qmake.json +++ b/versions/v-/vcpkg-qmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5096e32d02b21d8f2546edf3829cbb8ee2d50425", + "version-date": "2022-02-14", + "port-version": 0 + }, { "git-tree": "1b1cd1cfcca489897822287c15af473fa4380cb1", "version-date": "2021-10-23", From 1953a8dcc25a87b447c613dd418878c13a477c94 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 31 Mar 2022 01:30:03 +0200 Subject: [PATCH 098/217] [benchmark] Update to 1.6.1 (#23882) * Update benchmark to 1.6.1 * Update CI baseline Co-authored-by: chausner --- ports/benchmark/portfile.cmake | 4 ++-- ports/benchmark/vcpkg.json | 3 +-- versions/b-/benchmark.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index a5cf1ea0ad6dea..c89c45bb12ca18 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF f91b6b42b1b9854772a90ae9501464a161707d1e # v1.6.0 - SHA512 5e3db75fcaa86b766d33e368f58cec5c5b2b9ba7fde658d13868d577679c13069756e68e86323b972daccc4f7d5e392d24d2d42e5308c1ae7e9955e651d45866 + REF v1.6.1 + SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67 HEAD_REF master ) diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json index 833ba8759d8943..d0764894cb59cc 100644 --- a/ports/benchmark/vcpkg.json +++ b/ports/benchmark/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "name": "benchmark", - "version-semver": "1.6.0", - "port-version": 1, + "version-semver": "1.6.1", "description": "A library to support the benchmarking of functions, similar to unit-tests.", "homepage": "https://github.com/google/benchmark", "supports": "!uwp", diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json index d75a984b843f30..195c2a9814e158 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b248363b29630caf5f45a42d2d82c12b29979e1", + "version-semver": "1.6.1", + "port-version": 0 + }, { "git-tree": "7856168d2b0dcaf058c077798ca47f767c6444f5", "version-semver": "1.6.0", diff --git a/versions/baseline.json b/versions/baseline.json index ee67b10eaf96ee..d68f479f631e73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -417,8 +417,8 @@ "port-version": 2 }, "benchmark": { - "baseline": "1.6.0", - "port-version": 1 + "baseline": "1.6.1", + "port-version": 0 }, "bento4": { "baseline": "1.5.1", From 9b064ff07b987c8f213fdbf4358122fd4fe38ef1 Mon Sep 17 00:00:00 2001 From: Magnus Edenhill Date: Thu, 31 Mar 2022 01:53:20 +0200 Subject: [PATCH 099/217] [zlib] Update to 1.2.12 since 1.2.11 has been redacted by upstream (#23871) * [zlib] Update to 1.2.12 since 1.2.11 has been redacted by upstream * [zlib] 1.2.12 x-add-version --- ports/zlib/cmake_dont_build_more_than_needed.patch | 2 +- ports/zlib/portfile.cmake | 8 ++++---- ports/zlib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/z-/zlib.json | 5 +++++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/zlib/cmake_dont_build_more_than_needed.patch b/ports/zlib/cmake_dont_build_more_than_needed.patch index a374f76d628096..ed073e0410500c 100644 --- a/ports/zlib/cmake_dont_build_more_than_needed.patch +++ b/ports/zlib/cmake_dont_build_more_than_needed.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fe939d..a1291d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -7,6 +7,7 @@ set(VERSION "1.2.11") +@@ -7,6 +7,7 @@ set(VERSION "1.2.12") option(ASM686 "Enable building i686 assembly implementation") option(AMD64 "Enable building amd64 assembly implementation") diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 88e9e0fe486f5c..f1699178f92f8f 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -1,9 +1,9 @@ -set(VERSION 1.2.11) +set(VERSION 1.2.12) vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.zlib.net/zlib-${VERSION}.tar.gz" "https://downloads.sourceforge.net/project/libpng/zlib/${VERSION}/zlib-${VERSION}.tar.gz" - FILENAME "zlib1211.tar.gz" - SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae + URLS "https://www.zlib.net/zlib-${VERSION}.tar.gz" + FILENAME "zlib1212.tar.gz" + SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 ) vcpkg_extract_source_archive_ex( diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json index 4308e45a4b8273..d147fad30bfc28 100644 --- a/ports/zlib/vcpkg.json +++ b/ports/zlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zlib", - "version": "1.2.11", - "port-version": 13, + "version": "1.2.12", "description": "A compression library", "homepage": "https://www.zlib.net/" } diff --git a/versions/baseline.json b/versions/baseline.json index d68f479f631e73..b793999df7f034 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7629,8 +7629,8 @@ "port-version": 2 }, "zlib": { - "baseline": "1.2.11", - "port-version": 13 + "baseline": "1.2.12", + "port-version": 0 }, "zlib-ng": { "baseline": "2.0.5", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index 7c0d68f33de55e..b7830cc6d249e0 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c4edb1fabbd87dd236a200ba55eaf241cd8c8d0", + "version": "1.2.12", + "port-version": 0 + }, { "git-tree": "92cfe30c807d343c6359d272242f0765ad906740", "version": "1.2.11", From bcabf9be904b9cad969a57674a280699f9e84a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 31 Mar 2022 07:59:55 +0800 Subject: [PATCH 100/217] [eigen3] Fix usage in Linux (#23869) * [eigen3] Fix usage in Linux * version --- .../fix-vectorized-reductions-half.patch | 26 +++++++++++++++++++ ports/eigen3/portfile.cmake | 4 ++- ports/eigen3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/eigen3.json | 5 ++++ 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 ports/eigen3/fix-vectorized-reductions-half.patch diff --git a/ports/eigen3/fix-vectorized-reductions-half.patch b/ports/eigen3/fix-vectorized-reductions-half.patch new file mode 100644 index 00000000000000..1c5e592db52fa5 --- /dev/null +++ b/ports/eigen3/fix-vectorized-reductions-half.patch @@ -0,0 +1,26 @@ +diff --git a/Eigen/src/Core/PartialReduxEvaluator.h b/Eigen/src/Core/PartialReduxEvaluator.h +index 29abf35..4051fcf 100644 +--- a/Eigen/src/Core/PartialReduxEvaluator.h ++++ b/Eigen/src/Core/PartialReduxEvaluator.h +@@ -54,12 +54,19 @@ struct packetwise_redux_traits + /* Value to be returned when size==0 , by default let's return 0 */ + template + EIGEN_DEVICE_FUNC +-PacketType packetwise_redux_empty_value(const Func& ) { return pset1(0); } ++PacketType packetwise_redux_empty_value(const Func& ) { ++ const typename unpacket_traits::type zero(0); ++ return pset1(zero); ++} ++ + + /* For products the default is 1 */ + template + EIGEN_DEVICE_FUNC +-PacketType packetwise_redux_empty_value(const scalar_product_op& ) { return pset1(1); } ++PacketType packetwise_redux_empty_value(const scalar_product_op& ) { ++ return pset1(Scalar(1)); ++} ++ + + /* Perform the actual reduction */ + template Date: Thu, 31 Mar 2022 02:00:18 +0200 Subject: [PATCH 101/217] [asio-grpc] Update to 1.5.1 (#23844) Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/asio-grpc/portfile.cmake | 4 ++-- ports/asio-grpc/vcpkg.json | 2 +- versions/a-/asio-grpc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index 28b16b55d15a20..d20401ff85efde 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc - REF v1.4.0 - SHA512 2888c4abd5a531983a647a51971fd09eeb3e9f5bc7d2f95aa10f455d2d0f852367a8b039c867730c604be5e248cb0aacaf55fd0b23d05322c23d94dee719a7ad + REF v1.5.1 + SHA512 528a790a7414db1b03b20d4d82d510a08cba9fc3c99501955c60c28ce4d768202a4339241b9e99f0199deb379345dc75934f991bad735eda0b32eb6cb3cef587 HEAD_REF master ) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index 242dacb6f0ed20..2e29237459b240 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "1.4.0", + "version": "1.5.1", "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", "license": "Apache-2.0", diff --git a/versions/a-/asio-grpc.json b/versions/a-/asio-grpc.json index 319764cf18610c..86b491f9a3ddad 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56b29ba569fb72539675ca51ecf3c83fcf8eb0ba", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "895af5509d20a5f310a5fa7285bd2e8e24e75548", "version": "1.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 80be147c2ff528..a75feff462c439 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -181,7 +181,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "1.4.0", + "baseline": "1.5.1", "port-version": 0 }, "asiosdk": { From 98a971d30b2b4a3b7461ae67831ebfee7fdac49d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 31 Mar 2022 19:55:31 +0200 Subject: [PATCH 102/217] [paraview] no absolute paths (#23877) --- ports/paraview/portfile.cmake | 3 +++ ports/paraview/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/paraview.json | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 784efa6be443ea..94ccea1a6f8f46 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -113,6 +113,9 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/paraview-${VERSION}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +# see https://gitlab.kitware.com/paraview/paraview/-/issues/21328 +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/paraview-${VERSION}/vtkCPConfig.h") + set(TOOLVER pv${VERSION}) set(TOOLS paraview pvbatch diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json index 85570e754d082a..c531933dcbb93b 100644 --- a/ports/paraview/vcpkg.json +++ b/ports/paraview/vcpkg.json @@ -1,6 +1,7 @@ { "name": "paraview", "version-semver": "5.9.1", + "port-version": 1, "description": "VTK-based Data Analysis and Visualization Application", "homepage": "https://www.paraview.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a75feff462c439..c20f6cdb4c5347 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5270,7 +5270,7 @@ }, "paraview": { "baseline": "5.9.1", - "port-version": 0 + "port-version": 1 }, "parmetis": { "baseline": "4.0.3", diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json index c90ffe0d8995c4..d3c3cbbab4bb15 100644 --- a/versions/p-/paraview.json +++ b/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7011d869273b8aa610ef7b302587c614137c73e5", + "version-semver": "5.9.1", + "port-version": 1 + }, { "git-tree": "a43b7d1bc53e7bdafcb4b73c3e9d84b9f80ecc22", "version-semver": "5.9.1", From 0497767b46fbda2fdb6f4462ee4d545a7b5079bc Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 31 Mar 2022 19:56:04 +0200 Subject: [PATCH 103/217] [libpq] no absolute paths (#23774) --- ports/libpq/portfile.cmake | 3 +++ ports/libpq/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 5bacb17eefda1a..02d7e5a97de3f1 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -368,6 +368,9 @@ else() else() set(USE_DL ON) endif() + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/postgresql/server/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pg_config.h" "#define CONFIGURE_ARGS" "// #define CONFIGURE_ARGS") endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/postgresql/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 84b4ca2b73dc5a..210c6e1d74c7ad 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libpq", "version": "14.1", + "port-version": 1, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", diff --git a/versions/baseline.json b/versions/baseline.json index c20f6cdb4c5347..ace992755c9f99 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3870,7 +3870,7 @@ }, "libpq": { "baseline": "14.1", - "port-version": 0 + "port-version": 1 }, "libpqxx": { "baseline": "7.6.0", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index f40eb33b34192d..2944d48a557760 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f614944d19861d7751cd9c880c6b61d87f36a3d", + "version": "14.1", + "port-version": 1 + }, { "git-tree": "f33ace97e90816fb5aa827168d87aec2f1f95705", "version": "14.1", From 303eebf8afce66f1071a90a306fb6592f32e5fac Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 1 Apr 2022 01:58:32 +0800 Subject: [PATCH 104/217] [ogre-next] update to v2.3.0 (#22058) * [ogre-next] update to v2.2.5 * update version * update patch * update version * delete FLAGES * update version * update patch * update version * update EOL Conversion in portfile.cmake * update version * update patch and set OGRE_COPY_DEPENDENCIES=OFF * update version * update * update version * udpate features * update version * fix path * update version * fix path * update version * update * update version * Add new feature to fix build on triplet static * update version * update * overwrite version * update to 2.3.0 * update version * update message * overwrite version * delete unused feature * update version * add license * overwrite version --- ports/ogre-next/fix_find_package_sdl2.patch | 83 ++++++++++++++++--- ports/ogre-next/portfile.cmake | 64 ++++++++------- ports/ogre-next/rename_config_cmake.patch | 22 ------ ports/ogre-next/toolchain_fixes.patch | 88 ++++----------------- ports/ogre-next/vcpkg.json | 12 ++- versions/baseline.json | 4 +- versions/o-/ogre-next.json | 5 ++ 7 files changed, 133 insertions(+), 145 deletions(-) delete mode 100644 ports/ogre-next/rename_config_cmake.patch diff --git a/ports/ogre-next/fix_find_package_sdl2.patch b/ports/ogre-next/fix_find_package_sdl2.patch index aa72be664bc03a..47aa01afbd205c 100644 --- a/ports/ogre-next/fix_find_package_sdl2.patch +++ b/ports/ogre-next/fix_find_package_sdl2.patch @@ -1,18 +1,77 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake -index 4b67ed8cb..7da194820 100644 +index 3f3e2d7..0cc9606 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake -@@ -292,11 +292,11 @@ macro_log_feature(PYTHONLIBS_FOUND "Python" "Language bindings to use OGRE from +@@ -267,7 +267,7 @@ endif() + ####################################################################### + # Find sdl2 - if(NOT ANDROID AND NOT EMSCRIPTEN) - # find script does not work in cross compilation environment -- find_package(SDL2) -+ find_package(SDL2 CONFIG) - macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "") - if(SDL2_FOUND AND WIN32 AND NOT SDL2_BINARY) - # fix linking static SDL2 on windows -- set(SDL2_LIBRARY ${SDL2_LIBRARY} winmm.lib imm32.lib version.lib) -+ set(SDL2_LIBRARY SDL2::SDL2 winmm.lib imm32.lib version.lib) - endif() +-find_package(SDL2) ++find_package(SDL2 CONFIG REQUIRED) + macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "") + + ####################################################################### +diff --git a/CMake/InstallDependencies.cmake b/CMake/InstallDependencies.cmake +index f98b358..e5eb9ed 100644 +--- a/CMake/InstallDependencies.cmake ++++ b/CMake/InstallDependencies.cmake +@@ -100,8 +100,6 @@ if (OGRE_INSTALL_DEPENDENCIES) + endif () + + if( OGRE_BUILD_SAMPLES2 ) +- install_debug(SDL2.dll) +- install_release(SDL2.dll) + install_debug(openvr_api.dll) + install_release(openvr_api.dll) + install_debug(openvr_api.pdb) +diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake +index 4b42a51..793eb71 100644 +--- a/CMake/Packages/FindSDL2.cmake ++++ b/CMake/Packages/FindSDL2.cmake +@@ -182,7 +182,7 @@ ENDIF(SDL2_LIBRARY_TEMP) + INCLUDE(FindPackageHandleStandardArgs) + + FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 +- REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) ++ REQUIRED_VARS SDL2::SDL2 SDL2_INCLUDE_DIR) + + if (WIN32) + set(SDL2_BIN_SEARCH_PATH ${OGRE_DEPENDENCIES_DIR}/bin ${CMAKE_SOURCE_DIR}/Dependencies/bin ${SDL2_HOME}/dll +@@ -201,6 +201,6 @@ IF(SDL2_STATIC) + if (UNIX AND NOT APPLE) + EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS) + STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}") +- SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS}) ++ SET(SDL2::SDL2 ${SDL2_LINK_FLAGS}) + ENDIF() + ENDIF(SDL2_STATIC) +diff --git a/Samples/2.0/Common/CMakeLists.txt b/Samples/2.0/Common/CMakeLists.txt +index b21601e..4ef90bd 100644 +--- a/Samples/2.0/Common/CMakeLists.txt ++++ b/Samples/2.0/Common/CMakeLists.txt +@@ -49,4 +49,4 @@ add_library(${OGRE_SAMPLES_COMMON_LIBRARY} STATIC ${SOURCE_FILES} ${HEADER_FILES + + link_directories(${CMAKE_CURRENT_BINARY_DIR}) + +-target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${SDL2_LIBRARY} OgreHlmsPbs OgreHlmsUnlit) ++target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} SDL2::SDL2 OgreHlmsPbs OgreHlmsUnlit) +diff --git a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake +index 5e80709..3ba9b5a 100644 +--- a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake ++++ b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake +@@ -224,13 +224,13 @@ endif() + + if( NOT IOS ) + set( CMAKE_PREFIX_PATH "${OGRE_SOURCE}/Dependencies ${CMAKE_PREFIX_PATH}" ) +- find_package( SDL2 ) ++ find_package(SDL2 CONFIG REQUIRED) + if( NOT SDL2_FOUND ) + message( "Could not find SDL2. https://www.libsdl.org/" ) + else() + message( STATUS "Found SDL2" ) + include_directories( ${SDL2_INCLUDE_DIR} ) +- set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} ${SDL2_LIBRARY} ) ++ set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} SDL2::SDL2 ) + endif() endif() diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 02f147ab85b963..5766b5d9c692df 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -1,5 +1,4 @@ # This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile. - if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt") message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.") endif() @@ -11,12 +10,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre-next - REF 8083067c1835147de5d82015347d95c710e36bc0 - SHA512 2660f739def7076b42009ba932a27532f2a20e7be8ec2674aff29116c7dcd7f2d75564d8ce07bef3dba13ece5293d604573ad4f8734f6086c1750127f52834cd + REF 10b56694f33fd6ead1c501eb90379bcac671d841 #v2.3.0 + SHA512 b2f1c55655582b2844b7c10cce965cc5268829a0702b09abcfe04fba8db00ad032f605d683c88811f77f9b7b4fb8a1095079f1a1c96bbe9fd022621f4ff4cf81 HEAD_REF master PATCHES toolchain_fixes.patch - rename_config_cmake.patch fix_find_package_sdl2.patch ) @@ -28,18 +26,21 @@ else() set(OGRE_STATIC OFF) endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 - java OGRE_BUILD_COMPONENT_JAVA - python OGRE_BUILD_COMPONENT_PYTHON - csharp OGRE_BUILD_COMPONENT_CSHARP + FEATURES + d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + java OGRE_BUILD_COMPONENT_JAVA + python OGRE_BUILD_COMPONENT_PYTHON + csharp OGRE_BUILD_COMPONENT_CSHARP ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DOGRE_BUILD_DEPENDENCIES=OFF + -DOGRE_COPY_DEPENDENCIES=OFF -DOGRE_BUILD_SAMPLES=OFF -DOGRE_BUILD_TESTS=OFF -DOGRE_BUILD_TOOLS=OFF @@ -50,7 +51,6 @@ vcpkg_configure_cmake( -DOGRE_INSTALL_PDB=OFF -DOGRE_INSTALL_SAMPLES=OFF -DOGRE_INSTALL_TOOLS=OFF - -DOGRE_INSTALL_CMAKE=ON -DOGRE_INSTALL_VSPROPS=OFF -DOGRE_STATIC=${OGRE_STATIC} -DOGRE_CONFIG_THREAD_PROVIDER=std @@ -59,55 +59,52 @@ vcpkg_configure_cmake( -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -# Optional stuff - ${FEATURE_OPTIONS} -# vcpkg specific stuff -DOGRE_CMAKE_DIR=share/ogre-next ) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup() -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB REL_CFGS ${CURRENT_PACKAGES_DIR}/bin/*.cfg) +file(GLOB REL_CFGS "${CURRENT_PACKAGES_DIR}/bin/*.cfg") if(REL_CFGS) - file(COPY ${REL_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(REMOVE ${REL_CFGS}) endif() -file(GLOB DBG_CFGS ${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg) +file(GLOB DBG_CFGS "${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg") if(DBG_CFGS) - file(COPY ${DBG_CFGS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${DBG_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") file(REMOVE ${DBG_CFGS}) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() #Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #manual-link subfolder is here to the rescue! if(VCPKG_TARGET_IS_WINDOWS) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMain.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib") else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/OgreMainStatic.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib") endif() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMain_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib") else() - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/OgreMainStatic_d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib") endif() endif() - file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake) + file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake") foreach(SHARE_FILE ${SHARE_FILES}) file(READ "${SHARE_FILE}" _contents) string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}") @@ -116,6 +113,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/ogre-next/rename_config_cmake.patch b/ports/ogre-next/rename_config_cmake.patch deleted file mode 100644 index d85603290c455c..00000000000000 --- a/ports/ogre-next/rename_config_cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake -index 79f7514..79bc033 100644 ---- a/CMake/InstallResources.cmake -+++ b/CMake/InstallResources.cmake -@@ -215,7 +215,7 @@ if(NOT DEFINED OGRE_CMAKE_DIR) - set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") - endif() - endif() --configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake -+configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/ogre-nextConfig.cmake - INSTALL_DESTINATION ${OGRE_CMAKE_DIR} - PATH_VARS CMAKE_INSTALL_PREFIX) - write_basic_package_version_file( -@@ -223,7 +223,7 @@ write_basic_package_version_file( - VERSION ${OGRE_VERSION} - COMPATIBILITY SameMajorVersion) - install(FILES -- ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake -+ ${PROJECT_BINARY_DIR}/cmake/ogre-nextConfig.cmake - ${PROJECT_BINARY_DIR}/cmake/OGREConfigVersion.cmake - DESTINATION ${OGRE_CMAKE_DIR} - ) diff --git a/ports/ogre-next/toolchain_fixes.patch b/ports/ogre-next/toolchain_fixes.patch index 9ff2d87dfe6b1d..ff5eb485068143 100644 --- a/ports/ogre-next/toolchain_fixes.patch +++ b/ports/ogre-next/toolchain_fixes.patch @@ -1,5 +1,5 @@ diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt -index a7a3796..2e21403 100644 +index f3a62f2..b53df6f 100644 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt @@ -13,10 +13,12 @@ @@ -18,41 +18,7 @@ index a7a3796..2e21403 100644 + endif() endif() - set(INST_FILES Utils/FindPkgMacros.cmake) -diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake -index 783755e..79f7514 100644 ---- a/CMake/InstallResources.cmake -+++ b/CMake/InstallResources.cmake -@@ -208,10 +208,12 @@ endif () - # Create the CMake package files - include(CMakePackageConfigHelpers) - --if(WIN32 OR APPLE) -- set(OGRE_CMAKE_DIR "CMake") --else() -- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+if(NOT DEFINED OGRE_CMAKE_DIR) -+ if(WIN32 OR APPLE) -+ set(OGRE_CMAKE_DIR "CMake") -+ else() -+ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/OGRE/cmake") -+ endif() - endif() - configure_package_config_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake - INSTALL_DESTINATION ${OGRE_CMAKE_DIR} -diff --git a/CMake/Packages/FindCg.cmake b/CMake/Packages/FindCg.cmake -index 4501cf9..7eb57c3 100644 ---- a/CMake/Packages/FindCg.cmake -+++ b/CMake/Packages/FindCg.cmake -@@ -56,7 +56,7 @@ endif() - - find_library(Cg_LIBRARY_REL NAMES ${Cg_LIBRARY_NAMES} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) - find_library(Cg_LIBRARY_DBG NAMES ${Cg_LIBRARY_NAMES_DBG} HINTS ${Cg_LIB_SEARCH_PATH} ${Cg_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) --make_library_set(Cg_LIBRARY) -+make_library_set(Cg) - - if (WIN32) - if (CMAKE_CL_64) + set(INST_FILES diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake index 7c89ec5..d8314f0 100644 --- a/CMake/Packages/FindFreeImage.cmake @@ -93,7 +59,7 @@ index 7125895..13a306f 100644 findpkg_finish(HLSL2GLSL) add_parent_dir(HLSL2GLSL_INCLUDE_DIRS HLSL2GLSL_INCLUDE_DIR) diff --git a/CMake/Packages/FindNVAPI.cmake b/CMake/Packages/FindNVAPI.cmake -index 2b9deba..f33a298 100644 +index 95c70cd..893ce01 100644 --- a/CMake/Packages/FindNVAPI.cmake +++ b/CMake/Packages/FindNVAPI.cmake @@ -44,7 +44,7 @@ findpkg_framework(NVAPI) @@ -155,7 +121,7 @@ index 6b6d7fa..3667b8b 100644 findpkg_finish(POCO_XML) diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake -index 0c48510..c121966 100644 +index 4200aa0..35e4ea3 100644 --- a/CMake/Packages/FindTBB.cmake +++ b/CMake/Packages/FindTBB.cmake @@ -104,7 +104,7 @@ findpkg_framework(TBB) @@ -184,7 +150,7 @@ index 0c48510..c121966 100644 +make_library_set(TBB_MALLOC_PROXY) findpkg_finish(TBB_MALLOC_PROXY) diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip.cmake -index e97951e..54c2567 100644 +index c112071..214d9e5 100644 --- a/CMake/Packages/FindZZip.cmake +++ b/CMake/Packages/FindZZip.cmake @@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib) @@ -203,7 +169,7 @@ index e97951e..54c2567 100644 findpkg_finish(ZZip) diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake -index 374f84b..dc7066d 100644 +index 53111e0..8dffbbc 100644 --- a/CMake/Utils/FindPkgMacros.cmake +++ b/CMake/Utils/FindPkgMacros.cmake @@ -79,15 +79,21 @@ endmacro (use_pkgconfig) @@ -238,54 +204,28 @@ index 374f84b..dc7066d 100644 # Generate debug names from given release names diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3e09d2d..58968f0 100644 +index 48af55b..b18ac57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -274,7 +274,7 @@ elseif(EMSCRIPTEN) - elseif (APPLE AND NOT APPLE_IOS) +@@ -282,7 +282,7 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS) - set(XCODE_ATTRIBUTE_SDKROOT macosx) + # Set build variables + set(XCODE_ATTRIBUTE_SDKROOT iphoneos) - if(CMAKE_GENERATOR STREQUAL "Unix Makefiles") + if(1) execute_process(COMMAND xcodebuild -version -sdk "${XCODE_ATTRIBUTE_SDKROOT}" Path | head -n 1 OUTPUT_VARIABLE CMAKE_OSX_SYSROOT) string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") else() -diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt -index bdb303d..d9cc221 100644 ---- a/Components/Overlay/CMakeLists.txt -+++ b/Components/Overlay/CMakeLists.txt -@@ -21,7 +21,7 @@ file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") - # setup target - add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES}) - set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE "${FREETYPE_LIBRARIES}" ZLIB::ZLIB) -+target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB) - target_include_directories(OgreOverlay PUBLIC - "$" - $ diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt -index 6ec4e34..cc9cb9d 100644 +index 0424ebb..b019269 100644 --- a/OgreMain/CMakeLists.txt +++ b/OgreMain/CMakeLists.txt -@@ -225,8 +225,6 @@ if (APPLE) +@@ -434,8 +434,6 @@ if (APPLE) set_target_properties(OgreMain PROPERTIES LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo" ) - - set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)") - if(OGRE_BUILD_LIBS_AS_FRAMEWORKS) - add_custom_command(TARGET OgreMain POST_BUILD -diff --git a/PlugIns/EXRCodec/CMakeLists.txt b/PlugIns/EXRCodec/CMakeLists.txt -index e9c936a..bb8747e 100644 ---- a/PlugIns/EXRCodec/CMakeLists.txt -+++ b/PlugIns/EXRCodec/CMakeLists.txt -@@ -16,7 +16,7 @@ target_link_libraries(Codec_EXR OgreMain ${OPENEXR_LIBRARIES}) - target_include_directories(Codec_EXR PUBLIC - "$" - $) --target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}/OpenEXR") -+target_include_directories(Codec_EXR SYSTEM PRIVATE "${OPENEXR_INCLUDE_DIR}") - - ogre_config_framework(Codec_EXR) - ogre_config_plugin(Codec_EXR) + add_custom_command(TARGET OgreMain POST_BUILD + COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index a729f0bfd84319..7a6a81bd94281b 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ogre-next", - "version-string": "2019-10-20", - "port-version": 2, + "version": "2.3.0", "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", + "license": "MIT", "dependencies": [ "boost-date-time", "boost-thread", @@ -15,6 +15,14 @@ "sdl2", "tbb", "tinyxml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib", "zziplib" ], diff --git a/versions/baseline.json b/versions/baseline.json index ace992755c9f99..6900ebf996356c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4973,8 +4973,8 @@ "port-version": 7 }, "ogre-next": { - "baseline": "2019-10-20", - "port-version": 2 + "baseline": "2.3.0", + "port-version": 0 }, "ois": { "baseline": "1.5.1", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 88181a1f30e37c..40f6f7475f653b 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b1cca4f491d535e198fc79195bf357811b4122a", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "8d2e2e06d0b21779df8bd6579387805dc06ca6ff", "version-string": "2019-10-20", From c2960201e3c6218128471b71833e2c2a65ceac31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 1 Apr 2022 02:11:30 +0800 Subject: [PATCH 105/217] [wxwidgets] Fix linux build (#23765) * [wxwidgets] Fix linux build * clean up baseline * version * Fix --libs output * version * Use system pkg-config on linux (#6) * Use system pkg-config for linux * Update versions * Revert baseline changes * Add double quotes to paths * version * Fix incorrect double quotes place * version Co-authored-by: Kai Pastor --- ports/wxwidgets/fix-linux-configure.patch | 49 +++++++++++++++ ports/wxwidgets/portfile.cmake | 74 ++++++++++++++--------- ports/wxwidgets/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 ++ 5 files changed, 101 insertions(+), 32 deletions(-) create mode 100644 ports/wxwidgets/fix-linux-configure.patch diff --git a/ports/wxwidgets/fix-linux-configure.patch b/ports/wxwidgets/fix-linux-configure.patch new file mode 100644 index 00000000000000..059bb42b7bb097 --- /dev/null +++ b/ports/wxwidgets/fix-linux-configure.patch @@ -0,0 +1,49 @@ +diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake +index bb69643..09b52a6 100644 +--- a/build/cmake/modules/cotire.cmake ++++ b/build/cmake/modules/cotire.cmake +@@ -2316,6 +2316,10 @@ function (cotire_generate_target_script _language _configurations _target _targe + "${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig}) + cotire_get_target_compiler_flags( + "${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}) ++ string(REPLACE ++ "" "" ++ COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig} "${COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}}" ++ ) + cotire_get_source_files_compile_definitions( + "${_config}" "${_language}" COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig} ${_targetSources}) + endforeach() +diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake +index 91d11ac..2791466 100644 +--- a/build/cmake/config.cmake ++++ b/build/cmake/config.cmake +@@ -41,9 +41,27 @@ macro(wx_get_dependencies var lib) + endif() + set(dep_name "-l${dep_name}") + else() +- get_filename_component(dep_name ${dep} NAME) ++ # For the value like $<$:LIB_PATH> ++ # Or $<$>:LIB_PATH> ++ string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_name ${dep}) ++ if (NOT dep_name) ++ set(dep_name ${dep}) ++ endif() ++ endif() ++ if(dep_name STREQUAL "libc.so") ++ # don't include this library ++ elseif(dep_name MATCHES "^-(.*)$") # -l, -framework, -weak_framework ++ wx_string_append(${var} "${dep_name} ") ++ elseif(dep_name MATCHES "^lib(.*)(.so|.dylib|.tbd|.a)$") ++ wx_string_append(${var} "-l${CMAKE_MATCH_1} ") ++ elseif(dep_name) ++ get_filename_component(abs_path ${dep_name} PATH) ++ if (abs_path) # value contains path ++ wx_string_append(${var} "${dep_name} ") ++ else() ++ wx_string_append(${var} "-l${dep_name} ") ++ endif() + endif() +- wx_string_append(${var} "${dep_name} ") + endforeach() + string(STRIP ${${var}} ${var}) + endif() diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 3e3a057992ff7d..441943a4a18f41 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES disable-platform-lib-dir.patch fix-build.patch + fix-linux-configure.patch # Remove this patch in the next update ) set(OPTIONS) @@ -21,6 +22,15 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUA ) endif() +# wxWidgets on Linux currently needs to find the system's `gtk+-3.0.pc`. +# vcpkg's port pkgconf would prevent this lookup. +if(VCPKG_TARGET_IS_LINUX AND NOT VCPKG_CROSSCOMPILING AND NOT DEFINED ENV{PKG_CONFIG}) + find_program(system_pkg_config NAMES pkg-config) + if(system_pkg_config) + set(ENV{PKG_CONFIG} "${system_pkg_config}") + endif() +endif() + # This may be set to ON by users in a custom triplet. # The use of 'wxUSE_STL' and 'WXWIDGETS_USE_STD_CONTAINERS' (ON or OFF) are not API compatible # which is why they must be set in a custom triplet rather than a port feature. @@ -33,7 +43,7 @@ if(NOT DEFINED WXWIDGETS_USE_STD_CONTAINERS) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DwxUSE_REGEX=builtin -DwxUSE_ZLIB=sys @@ -49,21 +59,23 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") -if(DLLS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - foreach(DLL ${DLLS}) - get_filename_component(N "${DLL}" NAME) - file(RENAME ${DLL} ${CURRENT_PACKAGES_DIR}/bin/${N}) - endforeach() -endif() -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") -if(DLLS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - foreach(DLL ${DLLS}) - get_filename_component(N "${DLL}" NAME) - file(RENAME ${DLL} ${CURRENT_PACKAGES_DIR}/debug/bin/${N}) - endforeach() +if (VCPKG_TARGET_IS_WINDOWS) + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") + if(DLLS) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + foreach(DLL IN LISTS DLLS) + get_filename_component(N "${DLL}" NAME) + file(RENAME "${DLL}" "${CURRENT_PACKAGES_DIR}/bin/${N}") + endforeach() + endif() + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") + if(DLLS) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + foreach(DLL IN LISTS DLLS) + get_filename_component(N "${DLL}" NAME) + file(RENAME "${DLL}" "${CURRENT_PACKAGES_DIR}/debug/bin/${N}") + endforeach() + endif() endif() if(VCPKG_TARGET_IS_WINDOWS) @@ -75,14 +87,14 @@ endif() # do the copy pdbs now after the dlls got moved to the expected /bin folder above vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB_RECURSE INCLUDES ${CURRENT_PACKAGES_DIR}/include/*.h) -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h) - list(APPEND INCLUDES ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/msvc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(GLOB_RECURSE INCLUDES "${CURRENT_PACKAGES_DIR}/include/*.h") +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h") + list(APPEND INCLUDES "${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h) - list(APPEND INCLUDES ${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") + list(APPEND INCLUDES "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") endif() foreach(INC IN LISTS INCLUDES) file(READ "${INC}" _contents) @@ -96,9 +108,9 @@ foreach(INC IN LISTS INCLUDES) file(WRITE "${INC}" "${_contents}") endforeach() -if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/wx/setup.h) - file(GLOB_RECURSE WX_SETUP_H_FILES_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/*.h) - file(GLOB_RECURSE WX_SETUP_H_FILES_REL ${CURRENT_PACKAGES_DIR}/lib/*.h) +if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/wx/setup.h") + file(GLOB_RECURSE WX_SETUP_H_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/*.h") + file(GLOB_RECURSE WX_SETUP_H_FILES_REL "${CURRENT_PACKAGES_DIR}/lib/*.h") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") vcpkg_replace_string("${WX_SETUP_H_FILES_REL}" "${CURRENT_PACKAGES_DIR}" "") @@ -113,8 +125,10 @@ if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/wx/setup.h) string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}") endif() - configure_file(${CMAKE_CURRENT_LIST_DIR}/setup.h.in ${CURRENT_PACKAGES_DIR}/include/wx/setup.h @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/setup.h.in" "${CURRENT_PACKAGES_DIR}/include/wx/setup.h" @ONLY) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets) -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/wxwidgets/usage COPYONLY) -file(INSTALL ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) + +file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 1663c7812e2516..9a4cdf2a8fb8a1 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,13 +1,14 @@ { "name": "wxwidgets", "version-semver": "3.1.5", - "port-version": 7, + "port-version": 8, "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.", "Set WXWIDGETS_USE_STD_CONTAINERS in a custom triplet to build with the wxUSE_STD_CONTAINERS build option." ], "homepage": "https://github.com/wxWidgets/wxWidgets", + "license": "wxWindows", "supports": "!uwp", "dependencies": [ "expat", diff --git a/versions/baseline.json b/versions/baseline.json index 6900ebf996356c..a095414ad645f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7470,7 +7470,7 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 7 + "port-version": 8 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index c8da366d3717e7..ec844293847ab8 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dba058c37782edf771e7a62ae1bef98274c86b9f", + "version-semver": "3.1.5", + "port-version": 8 + }, { "git-tree": "9184caa631070403a5fd8c177b56907a313ad197", "version-semver": "3.1.5", From 6c617b9f5570a34cfded5864c8edaa1047022c9e Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Thu, 31 Mar 2022 19:08:09 -0700 Subject: [PATCH 106/217] [vcpkg-tool] update to 2022-03-30 (#23886) * [vcpkg-tool] update to 2022-03-30 * add --allow-unexpected-passing, --skip-failures * Robert CR Co-authored-by: nicole mazzuca --- scripts/addPoshVcpkgToPowershellProfile.ps1 | 215 ++++++++++++++++++ .../azure-pipelines/test-modified-ports.ps1 | 6 +- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +- scripts/buildsystems/msbuild/applocal.ps1 | 215 ++++++++++++++++++ scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 | 215 ++++++++++++++++++ 6 files changed, 654 insertions(+), 9 deletions(-) diff --git a/scripts/addPoshVcpkgToPowershellProfile.ps1 b/scripts/addPoshVcpkgToPowershellProfile.ps1 index 185f658c984a0d..8dedc3d2bbf756 100644 --- a/scripts/addPoshVcpkgToPowershellProfile.ps1 +++ b/scripts/addPoshVcpkgToPowershellProfile.ps1 @@ -54,3 +54,218 @@ if (Test-Path $profilePath) Add-Content $profilePath -Value "`n$profileEntry" -Encoding UTF8 Write-Host "`nSuccessfully added posh-vcpkg to your PowerShell profile. Please start a new PowerShell window for the changes to take effect." + +# SIG # Begin signature block +# MIIntwYJKoZIhvcNAQcCoIInqDCCJ6QCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAQI5pjINs39W5V +# cJzzNG3YZ5LACp5BEUv+jJq20JhbqKCCDYEwggX/MIID56ADAgECAhMzAAACUosz +# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I +# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O +# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA +# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o +# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 +# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 +# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp +# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 +# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u +# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 +# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti +# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z +# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf +# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK +# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW +# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F +# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjDCCGYgCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgFlYOVUKP +# feFpp2ZyGIN6cbgH7sLzLcNZk6To9Qy5/jkwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQASfzadUptMi09w6TyqkqH2acAq4SQ7IRAUsfgo9VZU +# keZ0yk54zc2JhMq2EdD9BodoqWUHty/Kd/ii54KlaIilcg1eu7fxI23ApMDqRyd5 +# pej24Gi7fpx/kOPedQMRITZj+2DLBWWxlGnlSqLJ88HOhQ7IUPK6n0orv6o3aoW+ +# vmIz1KVf/WpQ0Bmnuf6KvidtlXwq9Z6F6t78v3ulfFhl/rQkar/kqwKh9h2rfTbO +# NL52WccwEzk1uk/7jRY3biG7vegymoFHVgGqHirscNa0XeGXt+GgqAXo/ppXDxFW +# U/9CUSV3oQt+H+4YHoKEuTpNpJ+nRDyz84l4emm5PwWXoYIXFjCCFxIGCisGAQQB +# gjcDAwExghcCMIIW/gYJKoZIhvcNAQcCoIIW7zCCFusCAQMxDzANBglghkgBZQME +# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIAufT8fqkLAoNnmK8tlDtjF5YfpJIAKOXej3J0eq +# YJSlAgZiF5g+l2EYEzIwMjIwMzMwMjE1MjEwLjY3NVowBIACAfSggdikgdUwgdIx +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p +# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh +# bGVzIFRTUyBFU046RDA4Mi00QkZELUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBU +# aW1lLVN0YW1wIFNlcnZpY2WgghFlMIIHFDCCBPygAwIBAgITMwAAAY/zUajrWnLd +# zAABAAABjzANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMDAeFw0yMTEwMjgxOTI3NDZaFw0yMzAxMjYxOTI3NDZaMIHSMQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkQwODItNEJGRC1FRUJBMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmVc+/rXP +# Fx6Fk4+CpLrubDrLTa3QuAHRVXuy+zsxXwkogkT0a+XWuBabwHyqj8RRiZQQvdvb +# Oq5NRExOeHiaCtkUsQ02ESAe9Cz+loBNtsfCq846u3otWHCJlqkvDrSr7mMBqwcR +# Y7cfhAGfLvlpMSojoAnk7Rej+jcJnYxIeN34F3h9JwANY360oGYCIS7pLOosWV+b +# xug9uiTZYE/XclyYNF6XdzZ/zD/4U5pxT4MZQmzBGvDs+8cDdA/stZfj/ry+i0XU +# YNFPhuqc+UKkwm/XNHB+CDsGQl+ZS0GcbUUun4VPThHJm6mRAwL5y8zptWEIocbT +# eRSTmZnUa2iYH2EOBV7eCjx0Sdb6kLc1xdFRckDeQGR4J1yFyybuZsUP8x0dOsEE +# oLQuOhuKlDLQEg7D6ZxmZJnS8B03ewk/SpVLqsb66U2qyF4BwDt1uZkjEZ7finIo +# UgSz4B7fWLYIeO2OCYxIE0XvwsVop9PvTXTZtGPzzmHU753GarKyuM6oa/qaTzYv +# rAfUb7KYhvVQKxGUPkL9+eKiM7G0qenJCFrXzZPwRWoccAR33PhNEuuzzKZFJ4De +# aTCLg/8uK0Q4QjFRef5n4H+2KQIEibZ7zIeBX3jgsrICbzzSm0QX3SRVmZH//Aqp +# 8YxkwcoI1WCBizv84z9eqwRBdQ4HYcNbQMMCAwEAAaOCATYwggEyMB0GA1UdDgQW +# BBTzBuZ0a65JzuKhzoWb25f7NyNxvDAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl +# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx +# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh +# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG +# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQDNf9Oo9zyhC5n1jC8iU7NJY39F +# izjhxZwJbJY/Ytwn63plMlTSaBperan566fuRojGJSv3EwZs+RruOU2T/ZRDx4VH +# esLHtclE8GmMM1qTMaZPL8I2FrRmf5Oop4GqcxNdNECBClVZmn0KzFdPMqRa5/0R +# 6CmgqJh0muvImikgHubvohsavPEyyHQa94HD4/LNKd/YIaCKKPz9SA5fAa4phQ4E +# vz2auY9SUluId5MK9H5cjWVwBxCvYAD+1CW9z7GshJlNjqBvWtKO6J0Aemfg6z28 +# g7qc7G/tCtrlH4/y27y+stuwWXNvwdsSd1lvB4M63AuMl9Yp6au/XFknGzJPF6n/ +# uWR6JhQvzh40ILgeThLmYhf8z+aDb4r2OBLG1P2B6aCTW2YQkt7TpUnzI0cKGr21 +# 3CbKtGk/OOIHSsDOxasmeGJ+FiUJCiV15wh3aZT/VT/PkL9E4hDBAwGt49G88gSC +# O0x9jfdDZWdWGbELXlSmA3EP4eTYq7RrolY04G8fGtF0pzuZu43A29zaI9lIr5ul +# KRz8EoQHU6cu0PxUw0B9H8cAkvQxaMumRZ/4fCbqNb4TcPkPcWOI24QYlvpbtT9p +# 31flYElmc5wjGplAky/nkJcT0HZENXenxWtPvt4gcoqppeJPA3S/1D57KL3667ep +# Ir0yV290E2otZbAW8DCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw +# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv +# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg +# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO +# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 +# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 +# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL +# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 +# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj +# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE +# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 +# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 +# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB +# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE +# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG +# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 +# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV +# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV +# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo +# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m +# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j +# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN +# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 +# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 +# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX +# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew +# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 +# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd +# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr +# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh +# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n +# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ +# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw +# ZvKhggLUMIICPQIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RDA4Mi00QkZE +# LUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB +# ATAHBgUrDgMCGgMVAD5NL4IEdudIBwdGoCaV0WBbQZpqoIGDMIGApH4wfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7ubRMCIY +# DzIwMjIwMzMwMjIyNTIxWhgPMjAyMjAzMzEyMjI1MjFaMHQwOgYKKwYBBAGEWQoE +# ATEsMCowCgIFAOXu5tECAQAwBwIBAAICCl0wBwIBAAICET4wCgIFAOXwOFECAQAw +# NgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEKMAgC +# AQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQBjidsY/frY7jVCC5L43gm9MoaMnxjT +# 8gVLXcdbhJzGYftD84JlTWvw/WyGSHpoeg+oCe01IIgdTicq0MKjxoca+LefqaS8 +# vlAf9s1JdIa2Je7u5CzOt2Gru9C00znmx6hI8XCkV+Gj+ZopC4kESoaSGiyaqt+S +# YZHTJ1hNVg79dTGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBD +# QSAyMDEwAhMzAAABj/NRqOtact3MAAEAAAGPMA0GCWCGSAFlAwQCAQUAoIIBSjAa +# BgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIH26YOfE +# UVgRTz6SOkQa9frVJcK+7EUHy9BNy3DCqIG2MIH6BgsqhkiG9w0BCRACLzGB6jCB +# 5zCB5DCBvQQgl3IFT+LGxguVjiKm22ItmO6dFDWW8nShu6O6g8yFxx8wgZgwgYCk +# fjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQD +# Ex1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY/zUajrWnLdzAAB +# AAABjzAiBCB0UdAt+5LFhsYAoTd2lnVnE0JExPii63XeZzU2N7NElDANBgkqhkiG +# 9w0BAQsFAASCAgCSm1motOpztHnppo7OFCG/NumEpmOgH4Ma58pjV7mgxfoLQllg +# lLpGzBwlXfHSdOLg/q0ip6REZrSnvPw3rffeLl7oTgfAnUZTyGCQbXZgYKmHyqBN +# ys7PaaULzR4UrsyhJ+lEQwY3aombMshmo/rwolFsgUCauvCpVPiPhpHy8+2Wqm4r +# 9Xj1X7H9THSzFJmD3Qu6bT9yburwrSZNEtnYybO+SYYgzjy3CiTfAUag/iETGj4k +# C5K3dfxuz6qWfe0Qr3bT7sLlA0FjQn3ZSNyjPqHr3/1Uf2S6VYKipYvdvLezbJ8X +# 9SE5QUJPc+WWHDMd7LW+EEak/CF/N+I77bHuMN1iyiG7DRGIbOge3jKtD9XgBb25 +# N2+4ilsoN3GYe63bMGsL+525ApITbcnhxbpd35UiZP6Nw9ab9WKYIUILI4vdjSyx +# LX+HZZV1cpqU4d5HjPS9exHgDS6RwJvYtvx9N0moBJYz8X+C4HDJKO6EAFY1i8tT +# HKu3TGsqofehtTtlc9QCEimSTBSmeGxEiPmSDjwfaO2erTzwnJcZL5UqDNHoEouN +# Z5+u1f2LfIidCBznb4tRlG9GNe1JKF3bp16tsNwD6GFuKfcDaP8/+ee14qzHPUJm +# niaVz5RlKUh2M0Uphl+hmnHzIWHOjhUQsUSaoyXy0n+Wz01P1TJ+CBiA1w== +# SIG # End signature block diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 80f0ac40ad182e..4fb4a180b58235 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -83,7 +83,7 @@ $commonArgs = @( ) $cachingArgs = @() -$skipFailures = $false +$skipFailuresArg = @() if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { $cachingArgs = @('--no-binarycaching') } else { @@ -94,7 +94,7 @@ if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { } elseif ($BuildReason -eq 'PullRequest') { Write-Host 'Build reason was Pull Request, using binary caching in read write mode, skipping failures.' - $skipFailures = $true + $skipFailuresArg = @('--skip-failures') } else { Write-Host "Build reason was $BuildReason, using binary caching in write only mode." @@ -166,7 +166,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) # but changes must trigger at least some testing. Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" -& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --x-xunit=$xmlFile --failure-logs=$failureLogs "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes +& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --x-xunit=$xmlFile --failure-logs=$failureLogs "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 4c1a66450aef41..ea1edb8e87a645 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-03-25' +$versionDate = '2022-03-30' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 88936de330856c..474d56cfea4190 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-03-25" +vcpkgToolReleaseTag="2022-03-30" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="a48a35949362182a792124a6088a2ac24e1992e4ef2604ae369d44b2b7745a422dd78f74cba5807f52312674ea7bcd11d79435faffb8391b3703bc43c0d95605" + vcpkgToolReleaseSha="8bf65bc52b48c0c048c465036dfab60c0d6b84d2c61bf36c948b58d2da0a6f9f21b00dbc888fe5b163c275e901a0014482e50895ee607408cf533057b66a4e73" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="d0995018de0b20188291aeabafff5296ab33ef334b67c7512f3cd511dfc1740af62d8ad863e48df5731a6d44e2fbdfe060410494449d61743bd767e87fe68b20" + vcpkgToolReleaseSha="d5a0a67ef966b1db5ded37986ccabd8a6dc2531209e07945c32679faab45c0f001b95eef342e41f8937234e8efa6b038847b78f77c19d949a7d2aa7857b6a019" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="c66e74d4469849c063e9e165b034a529e61e8245fd608a9bfb6c5e25a5a530951ea6995f5b1ee20aac1632f094f49ba3067516506dd2a81122a686ff5826efd9" + vcpkgToolReleaseSha="14dae353ce576e688cd93f0607f4eb7d724fb34f4c78c62d90db0c0fc4806e21c0da2b4fbe0b2a776ac3e8c669685e8d26990b5828be252645ac9289c7d015f9" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="15188f9c7370b308d54df3a47bba56d7cbcf437252c3c4545b8aaa7e459e06c47cbdf3d3a8d98bd1ef0d39ccbf2e70b4c0a6d99ce0a58db866b95606d46f92d6" + vcpkgToolReleaseSha="d1fba2655e04dbf599129e688b40be6b61cc23c41943b5d0d4ac23a7cb5df195fadfe252a8c9ea619d4730352eb40e424ef50919ecfad6e52a76b2b4627dbb16" fi # Do the download or build. diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index 39de365d3b2afd..64427819c99eaf 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -161,3 +161,218 @@ if (Test-Path "$g_install_root\tools\azure-kinect-sensor-sdk\k4adeploy.ps1") { resolve($targetBinary) Write-Verbose $($g_searched | out-string) + +# SIG # Begin signature block +# MIIntwYJKoZIhvcNAQcCoIInqDCCJ6QCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAw4oRiVyZP7w6g +# qWIJMRXurO+EoO/lf/MY7lRybXYZ/aCCDYEwggX/MIID56ADAgECAhMzAAACUosz +# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I +# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O +# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA +# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o +# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 +# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 +# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp +# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 +# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u +# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 +# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti +# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z +# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf +# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK +# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW +# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F +# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjDCCGYgCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQg2MF7lLSS +# iHnyjtq+Z0sSiFhMa8sDtjZ1Nc7FC4mwGqMwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQAqEYCzEH7PFdQYSqxft5YV6SCCmSoewMjGLeF7EDCM +# pUGrB+R+wzzky7P3AaKej+ph7f0BW26gQrTOcQ7BpJ5Y7F9o6gdrxN9BHejxKVIi +# OcW24WL/Gf15UqL403/Zya9FhZFHdsvCtZ+V9wdcZfouZFfxxAqWbmkExzVHU271 +# GdTPCNaD5VGj1njzbpAZ+GPGSAMNTAwm8ipnTEwTsXlOc8QiPRFAmgfNPTuwpXL6 +# I3vMrRGDXk0U6w7uk/7IsVlLkDE2KPorbkOKS5JmeNgMigex1ezqYUJvEtst1JSn +# GmvSh1GboX9iU1CEUfbKqollz8dLQ+5Jt9M28hX2GwdGoYIXFjCCFxIGCisGAQQB +# gjcDAwExghcCMIIW/gYJKoZIhvcNAQcCoIIW7zCCFusCAQMxDzANBglghkgBZQME +# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIE+CqTK27oCz06797kOsvD1C/uO67e4Zgv0+P8NY +# 0dYxAgZiF5g+l0YYEzIwMjIwMzMwMjE1MjEwLjMzOVowBIACAfSggdikgdUwgdIx +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p +# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh +# bGVzIFRTUyBFU046RDA4Mi00QkZELUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBU +# aW1lLVN0YW1wIFNlcnZpY2WgghFlMIIHFDCCBPygAwIBAgITMwAAAY/zUajrWnLd +# zAABAAABjzANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMDAeFw0yMTEwMjgxOTI3NDZaFw0yMzAxMjYxOTI3NDZaMIHSMQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkQwODItNEJGRC1FRUJBMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmVc+/rXP +# Fx6Fk4+CpLrubDrLTa3QuAHRVXuy+zsxXwkogkT0a+XWuBabwHyqj8RRiZQQvdvb +# Oq5NRExOeHiaCtkUsQ02ESAe9Cz+loBNtsfCq846u3otWHCJlqkvDrSr7mMBqwcR +# Y7cfhAGfLvlpMSojoAnk7Rej+jcJnYxIeN34F3h9JwANY360oGYCIS7pLOosWV+b +# xug9uiTZYE/XclyYNF6XdzZ/zD/4U5pxT4MZQmzBGvDs+8cDdA/stZfj/ry+i0XU +# YNFPhuqc+UKkwm/XNHB+CDsGQl+ZS0GcbUUun4VPThHJm6mRAwL5y8zptWEIocbT +# eRSTmZnUa2iYH2EOBV7eCjx0Sdb6kLc1xdFRckDeQGR4J1yFyybuZsUP8x0dOsEE +# oLQuOhuKlDLQEg7D6ZxmZJnS8B03ewk/SpVLqsb66U2qyF4BwDt1uZkjEZ7finIo +# UgSz4B7fWLYIeO2OCYxIE0XvwsVop9PvTXTZtGPzzmHU753GarKyuM6oa/qaTzYv +# rAfUb7KYhvVQKxGUPkL9+eKiM7G0qenJCFrXzZPwRWoccAR33PhNEuuzzKZFJ4De +# aTCLg/8uK0Q4QjFRef5n4H+2KQIEibZ7zIeBX3jgsrICbzzSm0QX3SRVmZH//Aqp +# 8YxkwcoI1WCBizv84z9eqwRBdQ4HYcNbQMMCAwEAAaOCATYwggEyMB0GA1UdDgQW +# BBTzBuZ0a65JzuKhzoWb25f7NyNxvDAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl +# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx +# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh +# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG +# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQDNf9Oo9zyhC5n1jC8iU7NJY39F +# izjhxZwJbJY/Ytwn63plMlTSaBperan566fuRojGJSv3EwZs+RruOU2T/ZRDx4VH +# esLHtclE8GmMM1qTMaZPL8I2FrRmf5Oop4GqcxNdNECBClVZmn0KzFdPMqRa5/0R +# 6CmgqJh0muvImikgHubvohsavPEyyHQa94HD4/LNKd/YIaCKKPz9SA5fAa4phQ4E +# vz2auY9SUluId5MK9H5cjWVwBxCvYAD+1CW9z7GshJlNjqBvWtKO6J0Aemfg6z28 +# g7qc7G/tCtrlH4/y27y+stuwWXNvwdsSd1lvB4M63AuMl9Yp6au/XFknGzJPF6n/ +# uWR6JhQvzh40ILgeThLmYhf8z+aDb4r2OBLG1P2B6aCTW2YQkt7TpUnzI0cKGr21 +# 3CbKtGk/OOIHSsDOxasmeGJ+FiUJCiV15wh3aZT/VT/PkL9E4hDBAwGt49G88gSC +# O0x9jfdDZWdWGbELXlSmA3EP4eTYq7RrolY04G8fGtF0pzuZu43A29zaI9lIr5ul +# KRz8EoQHU6cu0PxUw0B9H8cAkvQxaMumRZ/4fCbqNb4TcPkPcWOI24QYlvpbtT9p +# 31flYElmc5wjGplAky/nkJcT0HZENXenxWtPvt4gcoqppeJPA3S/1D57KL3667ep +# Ir0yV290E2otZbAW8DCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw +# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv +# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg +# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO +# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 +# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 +# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL +# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 +# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj +# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE +# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 +# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 +# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB +# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE +# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG +# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 +# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV +# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV +# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo +# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m +# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j +# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN +# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 +# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 +# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX +# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew +# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 +# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd +# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr +# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh +# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n +# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ +# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw +# ZvKhggLUMIICPQIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RDA4Mi00QkZE +# LUVFQkExJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB +# ATAHBgUrDgMCGgMVAD5NL4IEdudIBwdGoCaV0WBbQZpqoIGDMIGApH4wfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7ubRMCIY +# DzIwMjIwMzMwMjIyNTIxWhgPMjAyMjAzMzEyMjI1MjFaMHQwOgYKKwYBBAGEWQoE +# ATEsMCowCgIFAOXu5tECAQAwBwIBAAICCl0wBwIBAAICET4wCgIFAOXwOFECAQAw +# NgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEKMAgC +# AQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQBjidsY/frY7jVCC5L43gm9MoaMnxjT +# 8gVLXcdbhJzGYftD84JlTWvw/WyGSHpoeg+oCe01IIgdTicq0MKjxoca+LefqaS8 +# vlAf9s1JdIa2Je7u5CzOt2Gru9C00znmx6hI8XCkV+Gj+ZopC4kESoaSGiyaqt+S +# YZHTJ1hNVg79dTGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBD +# QSAyMDEwAhMzAAABj/NRqOtact3MAAEAAAGPMA0GCWCGSAFlAwQCAQUAoIIBSjAa +# BgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEINiK/M5f +# XbrPmiX51J8Q0509SaHo+kaJINrM63rv2CC0MIH6BgsqhkiG9w0BCRACLzGB6jCB +# 5zCB5DCBvQQgl3IFT+LGxguVjiKm22ItmO6dFDWW8nShu6O6g8yFxx8wgZgwgYCk +# fjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQD +# Ex1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY/zUajrWnLdzAAB +# AAABjzAiBCB0UdAt+5LFhsYAoTd2lnVnE0JExPii63XeZzU2N7NElDANBgkqhkiG +# 9w0BAQsFAASCAgBVZGqKHCmTLQiez5m9TN0oZdkN914Fcgdy7d+ZecfYKIQEpM4b +# OkppRGaHzUinbjDnbY3qGc+fejleoGLr/KQoW/qpXG6vm4Fd78QJeyoYJ91zu97K +# dxHDqNPFBgUSI59dz/xZv6yE4dvaLrvT/5K84Wh0266JTbBovUSoeGdHvXML+Ou8 +# Emrocd+XorK0YmAUOP5yhytSIruzyDd4tLCfz8OUSug4dA8u7HWxPx31L10/Qpaq +# EE+TEUNWDaRunnV+ZY7YkyQkdsN+I1Mbe2/KC85Eiy2X04qwPd5ACF68aMrdSGvI +# e4eO5pJEHRGkimm9Mm44QCLrxx0zbQIU16GBOWbSyD/oy54MkOreoiIuWhCVS6lN +# oJrOEaFbCsrUVMcGAc13YgcLbCw0V/YZNRLMakT9sbjYqfn4xRE3DO8PmyHlzDw8 +# g6CzIZQExAVkyxY+ZHXf8HcR5n3DHfLGMxCu7o4O7+os0axGBrdSmHJBVuSF+0Q3 +# 0OaF2MDIrMNYfhlQt5DxB2sw8EnyLctrW2Ve7wuq02gBM+BT2Ln66a9wzNK7HPKs +# rSkQg2stGl0hoCRPZ9geSm++3pbtFhzUMosPpfA9mirBELDpWg5YRF9gftRdUfJZ +# bLYStWVOB5OFNv2LpxoOdvVzqiigK3+LRrnlcWxPt6/6QqlC5EIFYOkMUw== +# SIG # End signature block diff --git a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 index 25ef99609f6f74..1c142c84f04ad2 100644 --- a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 +++ b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 @@ -37,3 +37,218 @@ $exportModuleMemberParams = @{ } Export-ModuleMember @exportModuleMemberParams + +# SIG # Begin signature block +# MIInugYJKoZIhvcNAQcCoIInqzCCJ6cCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDHZjpMevSjAPcs +# /aTP8aVTWBuPE0L4AxomP0cA936m/KCCDYEwggX/MIID56ADAgECAhMzAAACUosz +# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I +# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O +# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA +# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o +# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 +# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 +# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp +# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 +# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u +# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 +# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti +# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z +# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf +# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK +# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW +# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F +# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS +# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 +# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla +# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT +# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG +# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S +# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz +# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 +# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u +# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 +# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl +# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP +# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB +# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF +# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM +# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ +# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud +# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO +# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 +# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p +# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y +# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB +# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw +# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA +# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY +# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj +# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd +# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ +# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf +# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ +# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j +# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B +# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 +# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 +# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I +# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjzCCGYsCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgXfYXu2P9 +# Xl5soetYGYSmu5lwyqTv6FS3BnPtgTQd11AwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQB0AjnChoWv+UO2eEgknT4P1WMsswzSKL9O1ucsOUJ2 +# TIE8ioVKds7PwtQY5YfxAbjgWl2NF/B6dEZjIBvvJB3B6qGvXyU6APj+yE6LRFnm +# YX4Z/u8MXWuDnMX6HF/UMDFlzFpmK5hee585P5sJzVJpVkviMKDNK3mNNg6jMSI1 +# k0MB2tN7oJViiS/9S7l81p/9mulUKlTcyoy3lzZLSH1iXbF80oT2vv18AT6bCOAP +# TFVW0E6pjatJdjL40WHN+MZ076QhdzYMhiCD/rOPBAaO5ymcT7i94gp43GlkjcVb +# x2jNCCP4NGF4Zd3OujlwIyNc/I50upsaZMXmcuYbKm42oYIXGTCCFxUGCisGAQQB +# gjcDAwExghcFMIIXAQYJKoZIhvcNAQcCoIIW8jCCFu4CAQMxDzANBglghkgBZQME +# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIINYetTs4pGQvctdg51u+7aIG0JApdU1hE1hgt0m +# co6dAgZiF5hMAQQYEzIwMjIwMzMwMjE1MjEwLjY2OVowBIACAfSggdikgdUwgdIx +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p +# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh +# bGVzIFRTUyBFU046RkM0MS00QkQ0LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBU +# aW1lLVN0YW1wIFNlcnZpY2WgghFoMIIHFDCCBPygAwIBAgITMwAAAY5Z20YAqBCU +# zAABAAABjjANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMDAeFw0yMTEwMjgxOTI3NDVaFw0yMzAxMjYxOTI3NDVaMIHSMQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkZDNDEtNEJENC1EMjIwMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqiMCq6OM +# zLa5wrtcf7Bf9f1WXW9kpqbOBzgPJvaGLrZG7twgwqTRWf1FkjpJKBOG5QPIRy7a +# 6IFVAy0W+tBaFX4In4DbBf2tGubyY9+hRU+hRewPJH5CYOvpPh77FfGM63+OlwRX +# p5YER6tC0WRKn3mryWpt4CwADuGv0LD2QjnhhgtRVidsiDnn9+aLjMuNapUhstGq +# Cr7JcQZt0ZrPUHW/TqTJymeU1eqgNorEbTed6UQyLaTVAmhXNQXDChfa526nW7RQ +# 7L4tXX9Lc0oguiCSkPlu5drNA6NM8z+UXQOAHxVfIQXmi+Y3SV2hr2dcxby9nlTz +# Yvf4ZDr5Wpcwt7tTdRIJibXHsXWMKrmOziliGDToLx34a/ctZE4NOLnlrKQWN9ZG +# +Ox5zRarK1EhShahM0uQNhb6BJjp3+c0eNzMFJ2qLZqDp2/3Yl5Q+4k+MDHLTipP +# 6VBdxcdVfd4mgrVTx3afO5KNfgMngGGfhSawGraRW28EhrLOspmIxii92E7vjncJ +# 2tcjhLCjBArVpPh3cZG5g3ZVy5iiAaoDaswpNgnMFAK5Un1reK+MFhPi9iMnvUPw +# tTDDJt5YED5DAT3mBUxp5QH3t7RhZwAJNLWLtpTeGF7ub81sSKYv2ardazAe9XLS +# 10tV2oOPrcniGJzlXW7VPvxqQNxe8lCDA20CAwEAAaOCATYwggEyMB0GA1UdDgQW +# BBTsQfkz9gT44N/5G8vNHayep+aV5DAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl +# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx +# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh +# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG +# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQA1UK9xzIeTlKhSbLn0bekR5gYh +# 6bB1XQpluCqCA15skZ37UilaFJw8+GklDLzlNhSP2mOiOzVyCq8kkpqnfUc01ZaB +# ezQxg77qevj2iMyg39YJfeiCIhxYOFugwepYrPO8MlB/oue/VhIiDb1eNYTlPSmv +# 3palsgtkrb0oo0F0uWmX4EQVGKRo0UENtZetVIxa0J9DpUdjQWPeEh9cEM+RgE26 +# 5w5WAVb+WNx0iWiF4iTbCmrWaVEOX92dNqBm9bT1U7nGwN5CygpNAgEaYnrTMx1N +# 4AjxObACDN5DdvGlu/O0DfMWVc6qk6iKDFC6WpXQSkMlrlXII/Nhp+0+noU6tfEp +# HKLt7fYm9of5i/QomcCwo/ekiOCjYktp393ovoC1O2uLtbLnMVlE5raBLBNSbINZ +# 6QLxiA41lXnVVLIzDihUL8MU9CMvG4sdbhk2FX8zvrsP5PeBIw1faenMZuz0V3UX +# CtU5Okx5fmioWiiLZSCi1ljaxX+BEwQiinCi+vE59bTYI5FbuR8tDuGLiVu/JSpV +# FXrzWMP2Kn11sCLAGEjqJYUmO1tRY29Kd7HcIj2niSB0PQOCjYlnCnywnDinqS1C +# XvRsisjVlS1Rp4Tmuks+pGxiMGzF58zcb+hoFKyONuL3b+tgxTAz3sF3BVX9uk9M +# 5F+OEoeyLyGfLekNAjCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw +# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv +# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg +# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO +# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 +# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 +# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL +# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 +# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj +# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE +# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 +# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 +# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB +# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE +# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG +# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 +# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV +# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV +# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo +# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m +# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j +# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN +# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 +# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 +# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX +# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew +# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 +# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd +# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr +# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh +# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n +# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ +# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw +# ZvKhggLXMIICQAIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RkM0MS00QkQ0 +# LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB +# ATAHBgUrDgMCGgMVAD1iK+pPThHqgpa5xsPmiYruWVuMoIGDMIGApH4wfDELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7udOMCIY +# DzIwMjIwMzMwMjIyNzI2WhgPMjAyMjAzMzEyMjI3MjZaMHcwPQYKKwYBBAGEWQoE +# ATEvMC0wCgIFAOXu504CAQAwCgIBAAICEPsCAf8wBwIBAAICH6MwCgIFAOXwOM4C +# AQAwNgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEK +# MAgCAQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQDRvkQ+8tl/rST6Q19W3HCLiL76 +# 5jAlwfOPE9qK2auMHZnHWlcofAenCxyLoB0QAqj3UFflJ0bGic1xRb+OsKq+X/dz +# CPN2ik0cRkqUh8p3qjwRLquQ3HQp5BNxlyvdMNKSk+YdcK8SAGiO2HsnNE3LWwXP +# lko3/5Oq0+Oz7mdtpDGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1w +# IFBDQSAyMDEwAhMzAAABjlnbRgCoEJTMAAEAAAGOMA0GCWCGSAFlAwQCAQUAoIIB +# SjAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIL3n +# o4olI1N5U/f6eBrubu/yvZtoslP7/FdMYNVskLVDMIH6BgsqhkiG9w0BCRACLzGB +# 6jCB5zCB5DCBvQQgvQWPITvigaUuV5+f/lWs3BXZwJ/l1mf+yelu5nXmxCUwgZgw +# gYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UE +# BxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYD +# VQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY5Z20YAqBCU +# zAABAAABjjAiBCDoji5HoyFgeYnb2i9yFZjrBiELTJNC0CmqBLawXNEDPjANBgkq +# hkiG9w0BAQsFAASCAgCgDJqUfA65UksIsoC921eUPYQZsrbCZS1SpU7D6Pyn/xQ4 +# zbNu8vgxPpYqUz5/wdl0GnNMU6HkJWpYW0oT9PzsSIquvXlisaydTrEl6Q2t8z1c +# +kpJ0+Hm+ULHl1iRQc1sVfl7Zfzl2jy4OMZCO2lCLybDHMqeLSjx4bcRceTjPT0P +# TmFspYmlGxzh4V2snGcR4vkXYp3G7k7vcKgkI5rePj5re5Pp1AytGSK6AyNJ+Tm3 +# T6TWjaeiN+uzapzvbThNEwFMhad5yHe0xaTCYACT0XE9rULziUJk22kZrJ9UucNj +# s3GBxsLyv3T5RhNwpwGtMWhahc1lM01Xggw/bpodaRf2hWhl3ngJzEUysXPz4H+h +# HV713DUGIvfY5P6J1MA50Nufjv2MXeGKVbdD7jeEye0KFiz8uCin3uS5v4lny0t6 +# wddkWe4faFc0lPscDewubi2hQqUucGMVRt/lj120Bq0OUiLUNlQ0pucTC9NhQmCx +# eqlxR3tDVleAq5WI/VDUSVaNp9MBqT2RBpA3Ur1+kzE7lHL+WT/vmfcuoeXxsn9e +# 5tq9KwsTXctJWJrRrE9j9O94VR1G6isOYthtNOFXcN8kdT7vK/eyVJrQYKEj71xH +# efYWPLvRhkzisRAiYfC/cTlbkR2y8BvPhjtXTjcyFyyA57rsnpLb7IEvQbqn7g== +# SIG # End signature block From 27fd32e91c172e8b8a2ee338efc088a0c0103348 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 1 Apr 2022 04:27:44 +0200 Subject: [PATCH 107/217] [vcpkg baseline][quickfix] Remove from CI baseline (#23878) * Fix deprecated cmake * Remove from CI baseline * Fix trailing whitespaces * version * Also mark "supports": "!uwp" Co-authored-by: Billy Robert O'Neal III --- ports/quickfix/portfile.cmake | 19 +++++++++---------- ports/quickfix/vcpkg.json | 15 ++++++++++++--- scripts/ci.baseline.txt | 7 ------- scripts/templates/portfile.in.cmake | 2 +- versions/baseline.json | 2 +- versions/q-/quickfix.json | 5 +++++ 6 files changed, 28 insertions(+), 22 deletions(-) diff --git a/ports/quickfix/portfile.cmake b/ports/quickfix/portfile.cmake index d41a13c7c7436d..6ae5f2991a6718 100644 --- a/ports/quickfix/portfile.cmake +++ b/ports/quickfix/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( fix_wsl_symlink_error.patch ) -file(GLOB_RECURSE SRC_FILES RELATIVE ${SOURCE_PATH} +file(GLOB_RECURSE SRC_FILES RELATIVE "${SOURCE_PATH}" "${SOURCE_PATH}/src/*.cpp" "${SOURCE_PATH}/src/*.h" ) @@ -26,8 +26,8 @@ foreach(SRC_FILE IN LISTS SRC_FILES) file(WRITE "${SOURCE_PATH}/${SRC_FILE}" "${_contents}") endforeach() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DHAVE_EMX=OFF -DHAVE_MYSQL=OFF @@ -36,15 +36,14 @@ vcpkg_configure_cmake( -DHAVE_PYTHON2=OFF -DHAVE_PYTHON3=OFF -DHAVE_SSL=ON - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/quickfix) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/quickfix) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -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}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/quickfix/vcpkg.json b/ports/quickfix/vcpkg.json index 5a6e940a3b69bd..f9cc60c36dfde2 100644 --- a/ports/quickfix/vcpkg.json +++ b/ports/quickfix/vcpkg.json @@ -1,10 +1,19 @@ { "name": "quickfix", - "version-string": "1.15.1", - "port-version": 5, + "version": "1.15.1", + "port-version": 6, "description": "QuickFIX is a free and open source implementation of the FIX protocol.", "homepage": "https://github.com/quickfix/quickfix", + "supports": "!uwp", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1f58327463eb07..2597ccae1bbc4a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1053,13 +1053,6 @@ qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail qt5-x11extras:x64-windows-static-md=fail -quickfix:arm-uwp=fail -quickfix:arm64-windows=fail -quickfix:x64-uwp=fail -quickfix:x64-windows-static=fail -quickfix:x64-windows-static-md=fail -quickfix:x64-windows=fail -quickfix:x86-windows=fail qwt:x64-osx=fail qwt-qt6:x64-osx=fail qwtw:x64-windows=fail diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index 2ca68351a5dbea..3ceac93d11fa7b 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -68,7 +68,7 @@ vcpkg_cmake_install() # # Moves all .cmake files from /debug/share/@PORT@/ to /share/@PORT@/ # # See /docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md for more details # When you uncomment "vcpkg_cmake_config_fixup()", you need to add the following to "dependencies" vcpkg.json: -#{ +#{ # "name": "vcpkg-cmake-config", # "host": true #} diff --git a/versions/baseline.json b/versions/baseline.json index a095414ad645f7..efc94fc022287b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5994,7 +5994,7 @@ }, "quickfix": { "baseline": "1.15.1", - "port-version": 5 + "port-version": 6 }, "quill": { "baseline": "1.6.3", diff --git a/versions/q-/quickfix.json b/versions/q-/quickfix.json index 45666d9a0f4d95..dc3fb096ce29f3 100644 --- a/versions/q-/quickfix.json +++ b/versions/q-/quickfix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9ec8c3d5dfd310a3f5d5c54bebc6030b4cad0c6", + "version": "1.15.1", + "port-version": 6 + }, { "git-tree": "d374a1da06a6765ceeb510d6b65afd8ee97194ad", "version-string": "1.15.1", From cb91b416cb8f85f0a55853baad23fb18d306148a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 1 Apr 2022 22:30:43 +0200 Subject: [PATCH 108/217] [cmake-user] Verify library location for debug vs. release, fix ports (#21641) * Verify library location for debug vs. release * Use existing variables for wrapper * Always install freetype wrapper * Quote @expressions * Set policies for freetype wrapper (#19459) * Test JPEG * Fix jpeg wrapper for CMake < 3.12 * Test TIFF * Test with current and oldest supported CMake * Test and fix icu cmake wrapper * CMake policy fixes [skip actions] * Update versions * CI * CI * Nicole CRs * Disable Curses test * Prefer _VAR over _VAR Co-authored-by: JackBoosY Co-authored-by: nicole mazzuca Co-authored-by: Billy Robert O'Neal III --- ports/freetype/portfile.cmake | 22 +--- ports/freetype/vcpkg-cmake-wrapper.cmake | 107 +++++++++--------- ports/freetype/vcpkg.json | 1 + ports/icu/vcpkg-cmake-wrapper.cmake | 2 +- ports/icu/vcpkg.json | 2 +- ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake | 10 +- ports/libjpeg-turbo/vcpkg.json | 2 +- scripts/test_ports/cmake-user/portfile.cmake | 73 +++++++----- .../cmake-user/project/CMakeLists.txt | 49 ++++++-- scripts/test_ports/cmake-user/vcpkg.json | 21 +++- versions/baseline.json | 6 +- versions/f-/freetype.json | 5 + versions/i-/icu.json | 5 + versions/l-/libjpeg-turbo.json | 5 + 14 files changed, 185 insertions(+), 125 deletions(-) diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index a473ecc377b7fd..92e544feab3cbd 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -72,26 +72,8 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if("zlib" IN_LIST FEATURES) - set(USE_ZLIB ON) - endif() - - if("bzip2" IN_LIST FEATURES) - set(USE_BZIP2 ON) - endif() - - if("png" IN_LIST FEATURES) - set(USE_PNG ON) - endif() - - if("brotli" IN_LIST FEATURES) - set(USE_BROTLI ON) - endif() - - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" - "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) -endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(COPY "${SOURCE_PATH}/docs/FTL.TXT" diff --git a/ports/freetype/vcpkg-cmake-wrapper.cmake b/ports/freetype/vcpkg-cmake-wrapper.cmake index 2f4656bf143995..ee332c3c6f29f1 100644 --- a/ports/freetype/vcpkg-cmake-wrapper.cmake +++ b/ports/freetype/vcpkg-cmake-wrapper.cmake @@ -1,65 +1,64 @@ -_find_package(${ARGS}) - -if(@USE_ZLIB@) - find_package(ZLIB) -endif() - -if(@USE_BZIP2@) - find_package(BZip2) -endif() - -if(@USE_PNG@) - find_package(PNG) -endif() +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) -if(@USE_BROTLI@) - find_library(BROTLIDEC_LIBRARY_RELEASE NAMES brotlidec brotlidec-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) - find_library(BROTLIDEC_LIBRARY_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) - find_library(BROTLICOMMON_LIBRARY_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) - find_library(BROTLICOMMON_LIBRARY_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) - include(SelectLibraryConfigurations) - select_library_configurations(BROTLIDEC) - select_library_configurations(BROTLICOMMON) -endif(@USE_BROTLI@) +_find_package(${ARGS}) -if(TARGET Freetype::Freetype) - if(@USE_ZLIB@) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + if("@FT_REQUIRE_ZLIB@") + find_package(ZLIB) endif() - - if(@USE_BZIP2@) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2) + if("@FT_REQUIRE_BZIP2@") + find_package(BZip2) endif() - - if(@USE_PNG@) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG) + if("@FT_REQUIRE_PNG@") + find_package(PNG) endif() - if(@USE_BROTLI@) - if(BROTLIDEC_LIBRARY_DEBUG) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$:${BROTLIDEC_LIBRARY_DEBUG}>) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$:${BROTLICOMMON_LIBRARY_DEBUG}>) + if("@FT_REQUIRE_BROTLI@") + find_library(BROTLIDEC_LIBRARY_RELEASE NAMES brotlidec brotlidec-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLIDEC_LIBRARY_DEBUG NAMES brotlidec brotlidec-static brotlidecd brotlidec-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLICOMMON_LIBRARY_RELEASE NAMES brotlicommon brotlicommon-static PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) + find_library(BROTLICOMMON_LIBRARY_DEBUG NAMES brotlicommon brotlicommon-static brotlicommond brotlicommon-staticd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) + include(SelectLibraryConfigurations) + select_library_configurations(BROTLIDEC) + select_library_configurations(BROTLICOMMON) + endif("@FT_REQUIRE_BROTLI@") + + if(TARGET Freetype::Freetype) + if("@FT_REQUIRE_ZLIB@") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) endif() - if(BROTLIDEC_LIBRARY_RELEASE) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$>:${BROTLIDEC_LIBRARY_RELEASE}>) - set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$>:${BROTLICOMMON_LIBRARY_RELEASE}>) + if("@FT_REQUIRE_BZIP2@") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2) + endif() + if("@FT_REQUIRE_PNG@") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG) + endif() + if("@FT_REQUIRE_BROTLI@") + if(BROTLIDEC_LIBRARY_DEBUG) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$:${BROTLIDEC_LIBRARY_DEBUG}>") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$:${BROTLICOMMON_LIBRARY_DEBUG}>") + endif() + if(BROTLIDEC_LIBRARY_RELEASE) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$>:${BROTLIDEC_LIBRARY_RELEASE}>") + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$<\$>:${BROTLICOMMON_LIBRARY_RELEASE}>") + endif() endif() - endif() -endif() - -if(FREETYPE_LIBRARIES) - if(@USE_ZLIB@) - list(APPEND FREETYPE_LIBRARIES ${ZLIB_LIBRARIES}) - endif() - - if(@USE_BZIP2@) - list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES}) - endif() - - if(@USE_PNG@) - list(APPEND FREETYPE_LIBRARIES ${PNG_LIBRARIES}) endif() - if(@USE_BROTLI@) - list(APPEND FREETYPE_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + if(FREETYPE_LIBRARIES) + if("@FT_REQUIRE_ZLIB@") + list(APPEND FREETYPE_LIBRARIES ${ZLIB_LIBRARIES}) + endif() + if("@FT_REQUIRE_BZIP2@") + list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES}) + endif() + if("@FT_REQUIRE_PNG@") + list(APPEND FREETYPE_LIBRARIES ${PNG_LIBRARIES}) + endif() + if("@FT_REQUIRE_BROTLI@") + list(APPEND FREETYPE_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + endif() endif() endif() +cmake_policy(POP) diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json index 970cd829c5c704..68cb6186878743 100644 --- a/ports/freetype/vcpkg.json +++ b/ports/freetype/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freetype", "version-semver": "2.11.1", + "port-version": 1, "description": "A library to render fonts.", "homepage": "https://www.freetype.org/", "dependencies": [ diff --git a/ports/icu/vcpkg-cmake-wrapper.cmake b/ports/icu/vcpkg-cmake-wrapper.cmake index 7d7a818a0691b8..cb9d60157e38d8 100644 --- a/ports/icu/vcpkg-cmake-wrapper.cmake +++ b/ports/icu/vcpkg-cmake-wrapper.cmake @@ -1,5 +1,5 @@ list(FIND ARGS "COMPONENTS" COMPONENTS_IDX) -if(NOT COMPONENTS_IDX EQUAL -1) +if(COMPONENTS_IDX EQUAL -1) _find_package(${ARGS} COMPONENTS data) else() _find_package(${ARGS}) diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 456560655e7775..d1e99c9c38984d 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 18, + "port-version": 19, "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "supports": "!uwp", diff --git a/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake index 0c1a883c0383f8..d63c58b0aaac9a 100644 --- a/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake +++ b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake @@ -1,10 +1,11 @@ +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) find_library(JPEG_LIBRARY_RELEASE NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) find_library(JPEG_LIBRARY_DEBUG NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) -if(CMAKE_VERSION VERSION_LESS 3.12) - include(SelectLibraryConfigurations) - select_library_configurations(JPEG) - unset(JPEG_FOUND) +if(CMAKE_VERSION VERSION_LESS 3.12 AND CMAKE_BUILD_TYPE STREQUAL "Debug") + set(JPEG_LIBRARY "${JPEG_LIBRARY_DEBUG}" CACHE FILEPATH "") endif() _find_package(${ARGS}) if(JPEG_FOUND AND NOT TARGET JPEG::JPEG) @@ -34,3 +35,4 @@ if(JPEG_FOUND AND NOT TARGET JPEG::JPEG) IMPORTED_LOCATION_DEBUG "${JPEG_LIBRARY_DEBUG}") endif() endif() +cmake_policy(POP) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 97e1b2566a3b23..5365b84212c84c 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libjpeg-turbo", "version": "2.1.3", - "port-version": 1, + "port-version": 2, "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/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake index 34d222b6890b5b..7d640a194a0498 100644 --- a/scripts/test_ports/cmake-user/portfile.cmake +++ b/scripts/test_ports/cmake-user/portfile.cmake @@ -1,6 +1,9 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -set(cmake_version OFF) +set(cmake_commands "") +if("cmake-current" IN_LIST FEATURES) + list(APPEND cmake_commands "${CMAKE_COMMAND}") +endif() if("cmake-3-7" IN_LIST FEATURES) set(cmake_version 3.7.2) string(REGEX REPLACE "([^.]*[.][^.]*).*" "\\1" cmake_major_minor "${cmake_version}") @@ -41,7 +44,7 @@ if("cmake-3-7" IN_LIST FEATURES) REF "${cmake_version}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${name}" ) - set(CMAKE_COMMAND "${legacy_cmake}${cmake_bin_dir}/cmake") + list(APPEND cmake_commands "${legacy_cmake}${cmake_bin_dir}/cmake") endif() set(packages "") @@ -68,12 +71,25 @@ else() endif() function(test_cmake_project) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "NAME" "OPTIONS") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "CMAKE_COMMAND;NAME" "OPTIONS") if(NOT arg_NAME) message(FATAL_ERROR "The NAME argument is mandatory.") endif() + if(NOT arg_CMAKE_COMMAND) + set(arg_CMAKE_COMMAND "${CMAKE_COMMAND}") + endif() + + execute_process( + COMMAND "${arg_CMAKE_COMMAND}" --version + OUTPUT_VARIABLE cmake_version_output + RESULT_VARIABLE cmake_version_result + ) + string(REGEX MATCH "[1-9][0-9]*\\.[0-9]*\\.[0-9]*" cmake_version "${cmake_version_output}") + if(cmake_version_result OR NOT cmake_version) + message(FATAL_ERROR "Unable to determine version for '${arg_CMAKE_COMMAND}'.") + endif() - set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${arg_NAME}") + set(build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-${arg_NAME}") set(base_options -G "Ninja" "-DCMAKE_MAKE_PROGRAM=${NINJA}" @@ -82,6 +98,7 @@ function(test_cmake_project) "-DCMAKE_INSTALL_PREFIX=${build_dir}/install" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" "-DVCPKG_MANIFEST_MODE=OFF" + "-DCHECK_CMAKE_VERSION=${cmake_version}" ) if(DEFINED VCPKG_CMAKE_SYSTEM_NAME AND VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") @@ -100,22 +117,22 @@ function(test_cmake_project) list(APPEND base_options -DBUILD_SHARED_LIBS=OFF) endif() - message(STATUS "Running tests for '${arg_NAME}'") + message(STATUS "Running tests with CMake ${cmake_version} for '${arg_NAME}'") file(REMOVE_RECURSE "${build_dir}") file(MAKE_DIRECTORY "${build_dir}") vcpkg_execute_required_process( COMMAND - "${CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" + "${arg_CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" ${base_options} ${arg_OPTIONS} WORKING_DIRECTORY "${build_dir}" - LOGNAME "${TARGET_TRIPLET}-${arg_NAME}-config" + LOGNAME "${TARGET_TRIPLET}-${cmake_version}-${arg_NAME}-config" ) vcpkg_execute_required_process( COMMAND - "${CMAKE_COMMAND}" --build . --target install + "${arg_CMAKE_COMMAND}" --build . --target install WORKING_DIRECTORY "${build_dir}" - LOGNAME "${TARGET_TRIPLET}-${arg_NAME}-build" + LOGNAME "${TARGET_TRIPLET}-${cmake_version}-${arg_NAME}-build" ) # To produce better error messages for failing wrappers, # we run execute_process directly here, for each wrapper. @@ -130,16 +147,16 @@ function(test_cmake_project) endif() foreach(package IN LISTS packages) string(MAKE_C_IDENTIFIER "${package}" package_string) - set(find_package_build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-find-package-${package_string}-${arg_NAME}") - set(log_out "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-find-package-${package_string}-${arg_NAME}-out.log") - set(log_err "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-find-package-${package_string}-${arg_NAME}-err.log") + set(find_package_build_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}") + set(log_out "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-out.log") + set(log_err "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${cmake_version}-find-package-${package_string}-${arg_NAME}-err.log") message(STATUS " find_package(${package})") file(REMOVE_RECURSE "${find_package_build_dir}") file(MAKE_DIRECTORY "${find_package_build_dir}") execute_process( COMMAND - "${CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" + "${arg_CMAKE_COMMAND}" "${CMAKE_CURRENT_LIST_DIR}/project" ${base_options} ${arg_OPTIONS} "-DFIND_PACKAGES=${package}" @@ -155,17 +172,19 @@ function(test_cmake_project) endforeach() endfunction() -test_cmake_project(NAME "release" - OPTIONS - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS - "-DVCPKG_PREFER_SYSTEM_LIBS=OFF" - "-DCHECK_CMAKE_VERSION=${cmake_version}" -) -test_cmake_project(NAME "debug" - OPTIONS - "-DCMAKE_BUILD_TYPE=Debug" - "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS - "-DVCPKG_PREFER_SYSTEM_LIBS=ON" - "-DCHECK_CMAKE_VERSION=${cmake_version}" -) +foreach(executable IN LISTS cmake_commands) + test_cmake_project(NAME "release" + CMAKE_COMMAND "${executable}" + OPTIONS + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS + "-DVCPKG_PREFER_SYSTEM_LIBS=OFF" + ) + test_cmake_project(NAME "debug" + CMAKE_COMMAND "${executable}" + OPTIONS + "-DCMAKE_BUILD_TYPE=Debug" + "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS + "-DVCPKG_PREFER_SYSTEM_LIBS=ON" + ) +endforeach() diff --git a/scripts/test_ports/cmake-user/project/CMakeLists.txt b/scripts/test_ports/cmake-user/project/CMakeLists.txt index bd6b05dfe65285..921559a7ceac36 100644 --- a/scripts/test_ports/cmake-user/project/CMakeLists.txt +++ b/scripts/test_ports/cmake-user/project/CMakeLists.txt @@ -51,16 +51,47 @@ foreach(package ${FIND_PACKAGES}) set(CMAKE_FIND_DEBUG_MODE OFF) if(NOT ${package}_FOUND AND NOT ${package_upper}_FOUND) message(SEND_ERROR "find_package(${package}) check: failed") + continue() + endif() + message(STATUS "find_package(${package}) check: success") + + set(libraries_var "") + if(DEFINED ${package}_LIBRARIES) + set(libraries_var "${package_upper}_LIBRARIES") elseif(DEFINED ${package_upper}_LIBRARIES) - message(STATUS "${package_upper}_LIBRARIES: ${${package_upper}_LIBRARIES}") - message(STATUS "find_package(${package}) check: success") - target_link_libraries(exe PRIVATE ${${package_upper}_LIBRARIES}) - elseif(DEFINED ${package}_LIBRARIES) - message(STATUS "${package}_LIBRARIES: ${${package}_LIBRARIES}") - message(STATUS "find_package(${package}) check: success") - target_link_libraries(exe PRIVATE ${${package}_LIBRARIES}) + set(libraries_var "${package}_LIBRARIES") + elseif(DEFINED ${package}_LIBRARY) + set(libraries_var "${package_upper}_LIBRARY") + elseif(DEFINED ${package_upper}_LIBRARY) + set(libraries_var "${package}_LIBRARY") else() - message(STATUS "${package}_LIBRARIES: undefined") - message(STATUS "find_package(${package}) check: success") + message(STATUS "${package}_LIBRARY/IES: undefined") + continue() + endif() + set(libraries "${${libraries_var}}") + message(STATUS "${libraries_var}: ${libraries}") + + if(package STREQUAL "Intl" AND NOT Intl_LIBRARY) + continue() # using libintl.h from C runtime library + endif() + target_link_libraries(exe PRIVATE ${libraries}) + + if(CMAKE_BUILD_TYPE STREQUAL "Release") + string(REPLACE "debug;" "ignore:" libraries "${libraries}") + elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") + string(REPLACE "optimized;" "ignore:" libraries "${libraries}") endif() + foreach(item IN LISTS libraries) + string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/" starts_with_vcpkg) + if(NOT starts_with_vcpkg EQUAL "0") + continue() + endif() + string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/" starts_with_release) + string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/" starts_with_debug) + if(CMAKE_BUILD_TYPE STREQUAL "Release" AND starts_with_debug EQUAL "0") + message(SEND_ERROR "Debug lib in release build: ${item}") + elseif(CMAKE_BUILD_TYPE STREQUAL "Debug" AND starts_with_release EQUAL "0") + message(SEND_ERROR "Release lib in debug build: ${item}") + endif() + endforeach() endforeach() diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index 7f6e5161ad5552..73907dfdcdfc7b 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cmake-user", - "version-date": "2022-02-28", + "version-date": "2022-03-18", "description": "Test port to verify the vcpkg toolchain in cmake user projects", "default-features": [ "ci" @@ -13,6 +13,7 @@ "name": "cmake-user", "default-features": false, "features": [ + "cmake-current", "find-package" ] }, @@ -27,7 +28,10 @@ ] }, "cmake-3-7": { - "description": "Use CMake 3.7 to build the test project" + "description": "Run the tests with CMake 3.7" + }, + "cmake-current": { + "description": "Run the tests with vcpkg's current version of CMake" }, "find-package": { "description": "Ports to be tested via find_package($package)", @@ -44,6 +48,10 @@ "$package": "Freetype", "name": "freetype" }, + { + "$package": "ICU", + "name": "icu" + }, { "$package": "Intl", "name": "gettext" @@ -52,14 +60,17 @@ "$package": "GIF", "name": "giflib" }, + { + "$package": "JPEG", + "name": "libjpeg-turbo" + }, { "$package": "LibLZMA", "name": "liblzma" }, { - "$package": "Curses", - "name": "ncurses", - "platform": "!windows & !uwp" + "$package": "TIFF", + "name": "tiff" }, { "$package": "ZLIB", diff --git a/versions/baseline.json b/versions/baseline.json index efc94fc022287b..22c565ca3b05d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2314,7 +2314,7 @@ }, "freetype": { "baseline": "2.11.1", - "port-version": 0 + "port-version": 1 }, "freetype-gl": { "baseline": "2020-09-14", @@ -2786,7 +2786,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 18 + "port-version": 19 }, "ideviceinstaller": { "baseline": "1.1.2.23", @@ -3658,7 +3658,7 @@ }, "libjpeg-turbo": { "baseline": "2.1.3", - "port-version": 1 + "port-version": 2 }, "libjuice": { "baseline": "0.9.8", diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json index 44e5af5bd0ed34..50198e1b2243e5 100644 --- a/versions/f-/freetype.json +++ b/versions/f-/freetype.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab8f5879ab23ffa292c80169f750b7edd6c2b4f1", + "version-semver": "2.11.1", + "port-version": 1 + }, { "git-tree": "dadbf4b6e5f5670bf49489e26de326be6a72f962", "version-semver": "2.11.1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 2218ab8e55bc7e..eaebc031ef45ae 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d1bac4d5b2a05af577b0aa5bb8f600e5cf15427", + "version": "69.1", + "port-version": 19 + }, { "git-tree": "789755812260e6c4759e305d1591938513023c07", "version": "69.1", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 64cd6ea781538c..857413fbe9d08e 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd9bb6eb0d4e28d2b3ef0d83b6b9ef736555621d", + "version": "2.1.3", + "port-version": 2 + }, { "git-tree": "7373af20f73237f0453fb02a1ba097e5f710d2f5", "version": "2.1.3", From 253b3035e9dd694573a80fb3917bac8cdccb053b Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 1 Apr 2022 14:28:43 -0700 Subject: [PATCH 109/217] [nvtt] Fix build failed with Visual Studio 2022 (#23916) * [nvtt] Fix build failed on Visual Studio 2022 * update version Co-authored-by: Lily Wang --- ports/nvtt/fix-intrinsic-function.patch | 19 +++++++++++++++++++ ports/nvtt/portfile.cmake | 18 +++++++++--------- ports/nvtt/vcpkg.json | 9 +++++++-- versions/baseline.json | 2 +- versions/n-/nvtt.json | 5 +++++ 5 files changed, 41 insertions(+), 12 deletions(-) create mode 100644 ports/nvtt/fix-intrinsic-function.patch diff --git a/ports/nvtt/fix-intrinsic-function.patch b/ports/nvtt/fix-intrinsic-function.patch new file mode 100644 index 00000000000000..397e816817e3a2 --- /dev/null +++ b/ports/nvtt/fix-intrinsic-function.patch @@ -0,0 +1,19 @@ +diff --git a/src/nvmath/nvmath.h b/src/nvmath/nvmath.h +index 38532eb..e68d8f8 100644 +--- a/src/nvmath/nvmath.h ++++ b/src/nvmath/nvmath.h +@@ -118,12 +118,12 @@ inline float asinf_assert(const float f) + #endif + + #if NV_CC_MSVC +-NV_FORCEINLINE float log2f(float x) ++NV_FORCEINLINE float nv_log2f(float x) + { + nvCheck(x >= 0); + return logf(x) / logf(2.0f); + } +-NV_FORCEINLINE float exp2f(float x) ++NV_FORCEINLINE float nv_exp2f(float x) + { + return powf(2.0f, x); + } diff --git a/ports/nvtt/portfile.cmake b/ports/nvtt/portfile.cmake index def4097606d321..8ede400965742b 100644 --- a/ports/nvtt/portfile.cmake +++ b/ports/nvtt/portfile.cmake @@ -14,27 +14,27 @@ vcpkg_from_github( fix-build-error.patch add-compile-options-for-osx.patch skip-building-libsquish.patch + fix-intrinsic-function.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNVTT_SHARED=0 -DCMAKE_DEBUG_POSTFIX=_d # required by OSG ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(REMOVE ${CURRENT_PACKAGES_DIR}/share/doc/nvtt/LICENSE) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/doc/nvtt/LICENSE") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nvtt/vcpkg.json b/ports/nvtt/vcpkg.json index 3e9688b2453f97..931bca6b8fbc70 100644 --- a/ports/nvtt/vcpkg.json +++ b/ports/nvtt/vcpkg.json @@ -1,11 +1,16 @@ { "name": "nvtt", "version": "2.1.2", - "port-version": 3, + "port-version": 4, "description": "Texture processing tools with support for Direct3D 10 and 11 formats.", "homepage": "https://github.com/castano/nvidia-texture-tools", + "license": "MIT", "supports": "!x86", "dependencies": [ - "libsquish" + "libsquish", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 22c565ca3b05d7..44c7af3d6b831a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4890,7 +4890,7 @@ }, "nvtt": { "baseline": "2.1.2", - "port-version": 3 + "port-version": 4 }, "oatpp": { "baseline": "1.3.0", diff --git a/versions/n-/nvtt.json b/versions/n-/nvtt.json index 5bb7e4278dcf18..9eb4a0ee08566b 100644 --- a/versions/n-/nvtt.json +++ b/versions/n-/nvtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5889b2b68d1c3b13bf681c75e0b8347fff3d72fc", + "version": "2.1.2", + "port-version": 4 + }, { "git-tree": "e2db690561d6b3d44308bd53e0da9d3dc5794ea1", "version": "2.1.2", From d8cd44e7026e294ad82c49eaf2cb6a046cf2c994 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 1 Apr 2022 14:29:11 -0700 Subject: [PATCH 110/217] [azure-core-cpp] Update to 1.5.0 (#23912) ## 1.5.0 (2022-03-31) ### Features Added - When a `RequestFailedException` exception is thrown, the `what()` method now includes information about the HTTP request which failed. - Adding option `WinHttpTransportOptions.IgnoreUnknownCertificateAuthority`. It can be used to disable verifying server certificate for the `WinHttpTransport`. ### Breaking Changes - Enforce TLS 1.2 or greater for `CurlTransport` and `WinHttpTransport`. ### Other Changes - Improve output message for `Azure::Core::Http::TransportException`. --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 5 +++-- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 3f6a0c7e37874a..262cdf715a7d6d 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.4.0 - SHA512 08359026469beeeaf9e7318da00683fa58943a093fc690fc0701ed99d4baf28834b42a19794eeae9df8fca70f35cda34809298bba45cb04a363b2475e93ad974 + REF azure-core_1.5.0 + SHA512 7a0b8ed9345b565e4476cb66c1e7a44350f5cd4f79a9d40a11b77f646eff353d94762803ca5931264689d390255cd9d361c5d4a54ccc89548cf640f76a26e74c ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index b5a171ae335848..57bba11bd29ab6 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.4.0", + "version-semver": "1.5.0", "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++." @@ -10,7 +10,8 @@ "dependencies": [ { "name": "openssl", - "platform": "!windows & !uwp" + "platform": "!windows & !uwp", + "version>=": "1.1.1n" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index c790d0328454ca..016f38eceefa51 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8940f6b17c33b8076e08c931fcf2ccdafa2fe2f2", + "version-semver": "1.5.0", + "port-version": 0 + }, { "git-tree": "73975ac66807a0477bcaa3fa75fdfaf0f74bdb06", "version-semver": "1.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 44c7af3d6b831a..fb233ac795f061 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -317,7 +317,7 @@ "port-version": 2 }, "azure-core-cpp": { - "baseline": "1.4.0", + "baseline": "1.5.0", "port-version": 0 }, "azure-identity-cpp": { From 89e00e66f71fe8337cf06cbf94c517015a61d03d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 2 Apr 2022 05:31:35 +0800 Subject: [PATCH 111/217] [yara ] update to v4.2.0 (#23901) * [yara ] update to v4.2.0 * update version * modern function * update version --- ports/yara/CMakeLists.txt | 3 +++ ports/yara/portfile.cmake | 15 +++++++-------- ports/yara/vcpkg.json | 9 +++++++-- versions/baseline.json | 2 +- versions/y-/yara.json | 5 +++++ 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ports/yara/CMakeLists.txt b/ports/yara/CMakeLists.txt index b25a162b135757..659fd48d2673ab 100644 --- a/ports/yara/CMakeLists.txt +++ b/ports/yara/CMakeLists.txt @@ -52,6 +52,7 @@ set( libyara/libyara.c libyara/mem.c libyara/modules.c + libyara/modules/console/console.c libyara/modules/cuckoo/cuckoo.c libyara/modules/dotnet/dotnet.c libyara/modules/elf/elf.c @@ -84,11 +85,13 @@ set( set( yara_sources cli/args.c + cli/common.c cli/threading.c cli/yara.c ) set( yarac_sources cli/args.c + cli/common.c cli/yarac.c ) diff --git a/ports/yara/portfile.cmake b/ports/yara/portfile.cmake index b7ab617b77e6cf..5d179593a24690 100644 --- a/ports/yara/portfile.cmake +++ b/ports/yara/portfile.cmake @@ -3,22 +3,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VirusTotal/yara - REF v4.1.1 - SHA512 e4474254249d5b3fbb7231fdec5f4e080be042098e1b2bc953aa93513ce0b4742e34acac2911687e75055ecd589d942f71b79c58ca47eee243626ab3ec8add71 + REF 136794355c51242b595af42309a234846d534e8b #v4.2.0 + SHA512 b0aabbf4d0ba585e3adab7dbdb708264c4d4140179e69c8bc57a2ea85cdd6d97f61e67e2ce06c8436450b4e0add7f475ff76d7ca549a9b1168ac057a6cbae776 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/yara/vcpkg.json b/ports/yara/vcpkg.json index 22f217411e549e..0dee97a5df2ad1 100644 --- a/ports/yara/vcpkg.json +++ b/ports/yara/vcpkg.json @@ -1,10 +1,15 @@ { "name": "yara", - "version": "4.1.1", + "version": "4.2.0", "description": "The pattern matching swiss knife", "homepage": "https://github.com/VirusTotal/yara", + "license": "BSD-3-Clause", "dependencies": [ "jansson", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index fb233ac795f061..16d4638db6883e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7573,7 +7573,7 @@ "port-version": 1 }, "yara": { - "baseline": "4.1.1", + "baseline": "4.2.0", "port-version": 0 }, "yas": { diff --git a/versions/y-/yara.json b/versions/y-/yara.json index 4bbf6d7c230664..5931955d992dd3 100644 --- a/versions/y-/yara.json +++ b/versions/y-/yara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f071df4391cee4f96e8f7bb5820d7d3f70db50e1", + "version": "4.2.0", + "port-version": 0 + }, { "git-tree": "081abbbfc62033c4254ae833f61d48c5cea4151c", "version": "4.1.1", From 775d7a403bdcece0185178d1cfb56d16790b715e Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 1 Apr 2022 14:33:20 -0700 Subject: [PATCH 112/217] [args] Update to 6.3.0 (#23891) * update to 6.3.0 * remove pointless copy command * add license field * update versions --- ports/args/portfile.cmake | 6 ++---- ports/args/vcpkg.json | 3 ++- versions/a-/args.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake index d91ae99fb16ed3..bf4f674a7df804 100644 --- a/ports/args/portfile.cmake +++ b/ports/args/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Taywee/args - REF 6.2.7 - SHA512 a6491b2680979feb2f09e7ffb4f3c939b75057b6b4b90136b6cb72eaf5a462d3079dfb5836744e53bf4946bd575d4449f87129d6e50045732d7fba11c2be57dd + REF 6.3.0 + SHA512 7d554719781d5a096883e37cd5c1706782d06c2c4d7a9598142aec7f2e38d63438e82960b60a705baeb2aa5d31143c83fa6c0d1331a36b16f564a5ea56ad451d HEAD_REF master ) @@ -22,5 +22,3 @@ vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() diff --git a/ports/args/vcpkg.json b/ports/args/vcpkg.json index 720c1be9725121..01789e2e57de98 100644 --- a/ports/args/vcpkg.json +++ b/ports/args/vcpkg.json @@ -1,8 +1,9 @@ { "name": "args", - "version": "6.2.7", + "version": "6.3.0", "description": "A simple header-only C++ argument parser library.", "homepage": "https://github.com/Taywee/args", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/a-/args.json b/versions/a-/args.json index cba126cefeca7c..f011bbad0575a9 100644 --- a/versions/a-/args.json +++ b/versions/a-/args.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6da2a8e30a8640e0cb9fe55decd3a634d8c42cb6", + "version": "6.3.0", + "port-version": 0 + }, { "git-tree": "8f102bf551068e71d94c7d1f21295bb9bf29dcdc", "version": "6.2.7", diff --git a/versions/baseline.json b/versions/baseline.json index 16d4638db6883e..ccd76eb74c8f1c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -141,7 +141,7 @@ "port-version": 0 }, "args": { - "baseline": "6.2.7", + "baseline": "6.3.0", "port-version": 0 }, "argtable2": { From 0acd2c6bf8f1bf84da48355228d0668af70fe4bc Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 1 Apr 2022 14:33:33 -0700 Subject: [PATCH 113/217] [pybind11] Update to 2.9.2 (#23893) * update to 2.9.2 * add versions --- ports/pybind11/portfile.cmake | 4 ++-- ports/pybind11/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/pybind11.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index b0a329c91d4868..113a679c967faf 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.9.1 - SHA512 1f268cc6df1f572658bfc3e60f7f010bec9b9444d6a6d6c95f7b26f7b4b7dd42846e65ae5a611c01c0341335fdfa84b01272b5c1b2cc11a418f64fecabfa0588 + REF v2.9.2 + SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272 HEAD_REF master ) diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json index 4e51db6aaaf25c..6c9dcf63d7373b 100644 --- a/ports/pybind11/vcpkg.json +++ b/ports/pybind11/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pybind11", - "version": "2.9.1", - "port-version": 1, + "version": "2.9.2", "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "homepage": "https://github.com/pybind/pybind11", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index ccd76eb74c8f1c..e7eaf8daef2876 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5585,8 +5585,8 @@ "port-version": 1 }, "pybind11": { - "baseline": "2.9.1", - "port-version": 1 + "baseline": "2.9.2", + "port-version": 0 }, "pystring": { "baseline": "1.1.3", diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json index 179d5c534a8c99..9340b71f17e6f1 100644 --- a/versions/p-/pybind11.json +++ b/versions/p-/pybind11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0723f5ac350935e5d68d8087c82883dffa706812", + "version": "2.9.2", + "port-version": 0 + }, { "git-tree": "b1eb3bb762f1ba08ffd2ffb216df9504ed9fda3c", "version": "2.9.1", From cd3a132c7abf50146cb7f7417433dc9214db7c67 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 1 Apr 2022 14:33:56 -0700 Subject: [PATCH 114/217] [rsm-bsa] Update to 4.0.3 (#23894) * update to 4.0.3 * update versions --- ports/rsm-bsa/portfile.cmake | 4 ++-- ports/rsm-bsa/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rsm-bsa.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/rsm-bsa/portfile.cmake b/ports/rsm-bsa/portfile.cmake index afa0602e9730b8..03b46262bedcb1 100644 --- a/ports/rsm-bsa/portfile.cmake +++ b/ports/rsm-bsa/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/bsa - REF 4.0.2 - SHA512 075a8c3ec9cdd74d9346defa0d9f96cd776f945816cdff2dd39d3964623d68899afe2d73664aa1990fc7f97d756f813cf7ef29aba568cdc235b8d76172df49ca + REF 4.0.3 + SHA512 ec8a2aff1c833d7bffd6345ab989bc57137eee3fb2c5b7509027f068783d42d61bcc4b694b53a7961c1c69ee52834efadef9b3c82e1a739c0c5491af75e8dde7 HEAD_REF master ) diff --git a/ports/rsm-bsa/vcpkg.json b/ports/rsm-bsa/vcpkg.json index 1becec84805a9a..354a0f17d90e71 100644 --- a/ports/rsm-bsa/vcpkg.json +++ b/ports/rsm-bsa/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rsm-bsa", - "version-semver": "4.0.2", + "version-semver": "4.0.3", "description": "A C++ library for working with the Bethesda archive file format", "homepage": "https://github.com/Ryan-rsm-McKenzie/bsa", "documentation": "https://ryan-rsm-mckenzie.github.io/bsa/", diff --git a/versions/baseline.json b/versions/baseline.json index e7eaf8daef2876..092bd557fa0f28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6205,7 +6205,7 @@ "port-version": 1 }, "rsm-bsa": { - "baseline": "4.0.2", + "baseline": "4.0.3", "port-version": 0 }, "rsm-mmio": { diff --git a/versions/r-/rsm-bsa.json b/versions/r-/rsm-bsa.json index 200aa322982cca..4211b79cdbf61c 100644 --- a/versions/r-/rsm-bsa.json +++ b/versions/r-/rsm-bsa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f91c3a5ffa0abe0eb4b3dc47421fb302dd258b05", + "version-semver": "4.0.3", + "port-version": 0 + }, { "git-tree": "c1791d77c435bd1a78a330e3c0bab2da49b8f183", "version-semver": "4.0.2", From 25eaff753310a010dddfad26941cbfecd1d24423 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Fri, 1 Apr 2022 21:39:10 +0000 Subject: [PATCH 115/217] [cairo] update to 1.7.6 (#23849) * [cairo] upgrade cairo to 1.7.6 (microsoft#23848) * [cairo] remove patch (microsoft#23848) 0001-meson-fix-macOS-build-and-add-macOS-ci.patch has been merged into the upstream repository and is part of the 1.7.6 release. * [cairo] use meson option to disable bfd (microsoft#23848) Upstream has introduced an option to disable bfd. Use the option to disable it (See microsoft#23022) * [cairo] chase upstream cflags handling (microsoft#23848) Upstream has put all cflags handling into the top-level meson. Move our static compilation indicator definition to the top level, too. * [cairo] force-disable xcb (microsoft#23848) This is the next update * [cairo] format vcpkg.json (microsoft#23848) * [cairo] update version registries (microsoft#23848) * [cairo] add license (microsoft#23848) * [cairo] regenerate versions registry (microsoft#23848) Co-authored-by: Schaich --- ...son-fix-macOS-build-and-add-macOS-ci.patch | 112 ------------------ ports/cairo/cairo_static_fix.patch | 94 ++------------- ports/cairo/meson-fix-bfd.patch | 11 -- ports/cairo/portfile.cmake | 11 +- ports/cairo/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/c-/cairo.json | 5 + 7 files changed, 23 insertions(+), 218 deletions(-) delete mode 100644 ports/cairo/0001-meson-fix-macOS-build-and-add-macOS-ci.patch delete mode 100644 ports/cairo/meson-fix-bfd.patch diff --git a/ports/cairo/0001-meson-fix-macOS-build-and-add-macOS-ci.patch b/ports/cairo/0001-meson-fix-macOS-build-and-add-macOS-ci.patch deleted file mode 100644 index 5bc6ca8855267a..00000000000000 --- a/ports/cairo/0001-meson-fix-macOS-build-and-add-macOS-ci.patch +++ /dev/null @@ -1,112 +0,0 @@ -From d8d16562ec094593eba4446432e918704590ab20 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= -Date: Sat, 26 Sep 2020 19:25:21 +0100 -Subject: [PATCH] meson: fix macOS build and add macOS ci - -Fixes #441 ---- - .gitlab-ci.yml | 26 ++++++++++++++++++++ - meson.build | 61 ++++++++++++++++++++++------------------------- - meson_options.txt | 1 + - 3 files changed, 56 insertions(+), 32 deletions(-) - -diff --git a/meson.build b/meson.build -index 53a9af343..fe7757b1f 100644 ---- a/meson.build -+++ b/meson.build -@@ -371,37 +371,34 @@ if qtgui_dep.found() and false - deps += [qtgui_dep] - endif - --# Untested --if cc.has_header('ApplicationServices/ApplicationServices.h') -- if cc.has_header('CoreGraphics/CoreGraphics.h') -- quartz_extra_libs = ['-Xlinker', '-framework', '-Xlinker', 'CoreGraphics'] -- else -- quartz_extra_libs = ['-Xlinker', '-framework', '-Xlinker', 'ApplicationServices'] -+if host_machine.system() == 'darwin' and not get_option('quartz').disabled() -+ quartz_deps = dependency('appleframeworks', modules : ['CoreFoundation', 'ApplicationServices'], required: get_option('quartz')) -+ -+ if quartz_deps.found() -+ deps += [quartz_deps] -+ -+ feature_conf.set('CAIRO_HAS_QUARTZ_SURFACE', 1) -+ feature_conf.set('CAIRO_HAS_QUARTZ_FONT', 1) -+ feature_conf.set('CAIRO_HAS_QUARTZ_IMAGE_SURFACE', 1) -+ -+ built_features += [ -+ { -+ 'name': 'cairo-quartz', -+ 'description': 'Quartz surface backend', -+ 'deps': quartz_deps, -+ }, -+ { -+ 'name': 'cairo-quartz-image', -+ 'description': 'Quartz Image surface backend', -+ 'deps': quartz_deps, -+ }, -+ { -+ 'name': 'cairo-quartz-font', -+ 'description': 'Quartz font backend', -+ 'deps': quartz_deps, -+ }, -+ ] - endif -- -- extra_link_args += quartz_extra_libs -- -- feature_conf.set('CAIRO_HAS_QUARTZ_SURFACE', 1) -- feature_conf.set('CAIRO_HAS_QUARTZ_FONT', 1) -- feature_conf.set('CAIRO_HAS_QUARTZ_IMAGE_SURFACE', 1) -- -- built_features += [ -- { -- 'name': 'cairo-quartz', -- 'description': 'Quartz surface backend', -- 'libs': quartz_extra_libs, -- }, -- { -- 'name': 'cairo-quartz-image', -- 'description': 'Quartz Image surface backend', -- 'libs': quartz_extra_libs, -- }, -- { -- 'name': 'cairo-quartz-font', -- 'description': 'Quartz font backend', -- 'libs': quartz_extra_libs, -- }, -- ] - endif - - if host_machine.system() == 'windows' -@@ -887,13 +884,13 @@ foreach feature: built_features - feature_deps = feature.get('deps', []) - feature_libs = feature.get('libs', []) - feature_compile_deps = feature.get('compile-deps', []) -- pkgmod.generate(libraries: [libcairo] + feature_deps + feature_libs, -+ pkgmod.generate(libraries: [libcairo, feature_deps, feature_libs], - name: feature['name'], - description: feature['description'] + ' for cairo graphics library', - ) - meson.override_dependency(feature['name'], - declare_dependency(link_with: libcairo, -- dependencies: feature_deps + feature_compile_deps, -+ dependencies: [feature_deps, feature_compile_deps], - link_args: feature_libs, - ) - ) -diff --git a/meson_options.txt b/meson_options.txt -index ff11fe7ed..5cafe8bda 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,6 +13,7 @@ option('glesv3', type : 'feature', value : 'disabled') - option('drm', type : 'feature', value : 'disabled') - option('openvg', type : 'feature', value : 'disabled') - option('png', type : 'feature', value : 'auto') # png and svg surfaces -+option('quartz', type : 'feature', value : 'auto') - option('qt', type : 'feature', value : 'disabled') - option('tee', type : 'feature', value : 'disabled') - option('xcb', type : 'feature', value : 'auto') --- -2.29.2 - diff --git a/ports/cairo/cairo_static_fix.patch b/ports/cairo/cairo_static_fix.patch index 8030679b1dfaf3..20c1c287720510 100644 --- a/ports/cairo/cairo_static_fix.patch +++ b/ports/cairo/cairo_static_fix.patch @@ -1,92 +1,16 @@ -diff --git a/util/cairo-fdr/meson.build b/util/cairo-fdr/meson.build -index 3cb66c678..b12b90036 100644 ---- a/util/cairo-fdr/meson.build -+++ b/util/cairo-fdr/meson.build -@@ -4,7 +4,7 @@ cairo_fdr_sources = [ +--- meson.build.orig 2022-03-19 03:40:07.000000000 +0900 ++++ meson.build 2022-03-29 21:32:41.000000000 +0900 +@@ -100,6 +100,13 @@ + # Autotools compatibility + add_project_arguments('-DHAVE_CONFIG_H', language: 'c') - libcairofdr = library('cairo-fdr', cairo_fdr_sources, - include_directories: [incbase, incsrc], -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - dependencies: deps, - install: true, - install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'), -diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build -index a782ec63f..7e21f6c04 100644 ---- a/util/cairo-script/meson.build -+++ b/util/cairo-script/meson.build -@@ -26,7 +26,7 @@ csi_trace_sources = [ - - libcairoscript = library('cairo-script-interpreter', - cairoscript_interpreter_sources, -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - include_directories: [incbase, incsrc], - dependencies: deps, - link_with: [libcairo], -@@ -41,14 +41,14 @@ libcairoscript_dep = declare_dependency(link_with: libcairoscript, - include_directories: [incbase, inccairoscript]) - - csi_replay_exe = executable('csi-replay', csi_replay_sources, -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - include_directories: [incbase, incsrc], - link_with: [libcairo, libcairoscript], - dependencies: deps, - ) - - csi_exec_exe = executable('csi-exec', csi_exec_sources, -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - include_directories: [incbase, incsrc], - link_with: [libcairo, libcairoscript], - dependencies: deps, -@@ -56,7 +56,7 @@ csi_exec_exe = executable('csi-exec', csi_exec_sources, - - if feature_conf.get('CAIRO_HAS_SCRIPT_SURFACE', 0) == 1 and conf.get('HAVE_LIBGEN_H', 0) == 1 - csi_trace_exe = executable('csi-trace', csi_trace_sources, -- c_args: ['-DHAVE_CONFIG_H'], -+ c_args: ['-DHAVE_CONFIG_H'] + static_definition, - include_directories: [incbase, incsrc], - link_with: [libcairo, libcairoscript], - dependencies: deps, -diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build -index e836f98cf..76ee372a2 100644 ---- a/util/cairo-trace/meson.build -+++ b/util/cairo-trace/meson.build -@@ -12,7 +12,7 @@ libcairotrace = library('cairo-trace', cairo_trace_sources, - include_directories: [incbase, incsrc], - dependencies: deps, - link_args: extra_link_args, -- c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext), '-DHAVE_CONFIG_H'] + pthread_c_args, -+ c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext), '-DHAVE_CONFIG_H'] + pthread_c_args + static_definition, - install: true, - install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'), - ) -diff --git a/util/meson.build b/util/meson.build -index 016955cea..a90363115 100644 ---- a/util/meson.build -+++ b/util/meson.build -@@ -2,6 +2,14 @@ subdir('cairo-missing') - - cairo_utils = [] - -+static_definition=[] +if host_machine.system() == 'windows' + lib_default = get_option('default_library') + if lib_default == 'static' -+ static_definition=['-DCAIRO_WIN32_STATIC_BUILD'] ++ add_project_arguments('-DCAIRO_WIN32_STATIC_BUILD', language: 'c') + endif +endif + - if feature_conf.get('CAIRO_HAS_GOBJECT_FUNCTIONS', 0) == 1 - subdir('cairo-gobject') - endif -@@ -55,6 +63,7 @@ foreach util : cairo_utils - include_directories: [incbase, incsrc, inccairoscript], - dependencies: deps + util_deps, - link_with: [libcairo, libcairoscript], -+ c_args: static_definition - ) - endforeach - + # Make sure source directory hasn't been configured with autotools + fs = import('fs') + if fs.exists('config.h') or fs.exists('src/cairo-features.h') or fs.exists('src/cairo-supported-features.h') diff --git a/ports/cairo/meson-fix-bfd.patch b/ports/cairo/meson-fix-bfd.patch deleted file mode 100644 index a0bf0fd5f0b920..00000000000000 --- a/ports/cairo/meson-fix-bfd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -656,7 +656,7 @@ endif - - # Untested, libiberty.h is in a libiberty subfolder for me - # FIXME: automagic --bfd_dep = cc.find_library('bfd', required: false) -+bfd_dep = cc.find_library('', required: false) - if bfd_dep.found() and cc.has_function('bfd_openr', dependencies: [bfd_dep]) - if cc.has_header('libiberty.h') - conf.set('HAVE_BFD', 1) diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 5c19ffc469bce0..f52af9b502a2bd 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -4,12 +4,10 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO cairo/cairo - REF 156cd3eaaebfd8635517c2baf61fcf3627ff7ec2 #v1.17.4 - SHA512 2c516ad3ffe56cf646b2435d6ef3cf25e8c05aeb13d95dd18a7d0510d134d9990cba1b376063352ff99483cfc4e5d2af849afd2f9538f9136f22d44d34be362c + REF b43e7c6f3cf7855e16170a06d3a9c7234c60ca94 #v1.17.6 + SHA512 2d8f0cbb11638610eda104a370bb8450e28d835852b0f861928738a60949e0aaba7a554a9f9efabbefda10a37616d4cd0d3021b3fbb4ced1d52db1edb49bc358 HEAD_REF master - PATCHES 0001-meson-fix-macOS-build-and-add-macOS-ci.patch - cairo_static_fix.patch - meson-fix-bfd.patch + PATCHES cairo_static_fix.patch ) if("fontconfig" IN_LIST FEATURES) @@ -34,7 +32,7 @@ else() list(APPEND OPTIONS -Dxlib=disabled) endif() list(APPEND OPTIONS -Dxcb=disabled) -#list(APPEND OPTIONS -Dxlib-xcb=disabled) don't forget this option with the next update! +list(APPEND OPTIONS -Dxlib-xcb=disabled) if("gobject" IN_LIST FEATURES) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -57,6 +55,7 @@ vcpkg_configure_meson( -Dpng=enabled -Dspectre=auto -Dgtk2-utils=disabled + -Dsymbol-lookup=disabled ) vcpkg_install_meson() diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 7b9e476aefffba..2e4e890662e68d 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,9 +1,9 @@ { "name": "cairo", - "version": "1.17.4", - "port-version": 4, + "version": "1.17.6", "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", + "license": "MPL-1.1", "dependencies": [ "dirent", "expat", diff --git a/versions/baseline.json b/versions/baseline.json index 092bd557fa0f28..a7b423f00020fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1217,8 +1217,8 @@ "port-version": 5 }, "cairo": { - "baseline": "1.17.4", - "port-version": 4 + "baseline": "1.17.6", + "port-version": 0 }, "cairomm": { "baseline": "1.16.0", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 4d52ec12077d9e..8cc079259af131 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f67515a6cf8aaeb6c9dcd2263ce913bd596249d", + "version": "1.17.6", + "port-version": 0 + }, { "git-tree": "c024050e140b5174c6ef3094bad3cb2d6a710f82", "version": "1.17.4", From 6739ac6ca791a6e21c396766536ab9edb17bff1c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 1 Apr 2022 23:39:28 +0200 Subject: [PATCH 116/217] [concurrencpp] Update to 0.1.4 (#23880) * Update concurrencpp to 0.1.4 * Update CI baseline * Update ports/concurrencpp/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Add license * Update CI baseline Co-authored-by: chausner Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/concurrencpp/portfile.cmake | 6 +++--- ports/concurrencpp/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/concurrencpp.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/concurrencpp/portfile.cmake b/ports/concurrencpp/portfile.cmake index 43578ea8849048..64231d30bc2679 100644 --- a/ports/concurrencpp/portfile.cmake +++ b/ports/concurrencpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO David-Haim/concurrencpp - REF v.0.1.3 - SHA512 2f4530ba93d768a7a1ae14c532c8ef443745e48cceeca8a0e9da9f91633876ae4971caad70eeff9e18c7a45e8cf7c0b7bb79720a62026850244fb2377ad10df7 + REF v.0.1.4 + SHA512 494680b8a642d9c2ad1e31a6b52ecac672af7b8ba2213fc6b0d525968bd27122c9b3c7105286af22fd6ebfa3cee4bb3b2c8948062418ad8419a305f7c3df0d4b HEAD_REF master PATCHES fix-include-path.patch @@ -16,6 +16,6 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.3) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.4) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrencpp RENAME copyright) diff --git a/ports/concurrencpp/vcpkg.json b/ports/concurrencpp/vcpkg.json index c4c8482f1de4b0..85ab61dc319bab 100644 --- a/ports/concurrencpp/vcpkg.json +++ b/ports/concurrencpp/vcpkg.json @@ -1,8 +1,9 @@ { "name": "concurrencpp", - "version-string": "0.1.3", + "version": "0.1.4", "description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.", "homepage": "https://github.com/David-Haim/concurrencpp/", + "license": "MIT", "supports": "(windows & static) | linux | osx", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index a7b423f00020fa..a446728a547e10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1501,7 +1501,7 @@ "port-version": 0 }, "concurrencpp": { - "baseline": "0.1.3", + "baseline": "0.1.4", "port-version": 0 }, "concurrentqueue": { diff --git a/versions/c-/concurrencpp.json b/versions/c-/concurrencpp.json index 269d3c43f7bdd2..9f314987f74748 100644 --- a/versions/c-/concurrencpp.json +++ b/versions/c-/concurrencpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "180b2c3ae47ddd4832fd3d6f8359728a6eda1094", + "version": "0.1.4", + "port-version": 0 + }, { "git-tree": "a6aa7450d44761622be41ef803ef3b92c6388f23", "version-string": "0.1.3", From 6fa767aca9474519b737f56fcf0a519023c8ee56 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 2 Apr 2022 05:39:46 +0800 Subject: [PATCH 117/217] [WinReg] update to v5.1.0 (#23865) * [WinReg] update to v5.1.0 * update version --- ports/winreg/portfile.cmake | 4 ++-- ports/winreg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/winreg.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/winreg/portfile.cmake b/ports/winreg/portfile.cmake index 7f09a788f2f66d..085f76d808b7d5 100644 --- a/ports/winreg/portfile.cmake +++ b/ports/winreg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF d2cae6b398d3e5a4ac3f2b5215de9084609d7cff #v5.0.1 - SHA512 52f9a4cb57a59590349a20120b113e9926eea40a4aff05d7ffeaca73236add74685c160e37d37303684bc47f70b96998b816d2f3b9ea18777ec678dad02b7b7b + REF 4ac74bfec290ec4376100372f59dbc2554e54692 #v5.1.0 + SHA512 3d25725c9fc781ffdfa1bbd3ed143a8381d40a1613d4786861e13b180098a5ce92ff193cf25d7490be0096c2eafcace45e6a2f94fbfaa28964d12b80b55d0637 HEAD_REF master ) diff --git a/ports/winreg/vcpkg.json b/ports/winreg/vcpkg.json index 70afef0d4b485c..cfe7aeac9a0036 100644 --- a/ports/winreg/vcpkg.json +++ b/ports/winreg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "winreg", - "version": "5.0.1", + "version": "5.1.0", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a446728a547e10..96912bb2467247 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7421,7 +7421,7 @@ "port-version": 0 }, "winreg": { - "baseline": "5.0.1", + "baseline": "5.1.0", "port-version": 0 }, "winsock2": { diff --git a/versions/w-/winreg.json b/versions/w-/winreg.json index 2e6a0cc0efd245..2b55d506cc139d 100644 --- a/versions/w-/winreg.json +++ b/versions/w-/winreg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdcb9cb9581869670509de4d2928b8821038d962", + "version": "5.1.0", + "port-version": 0 + }, { "git-tree": "a355bab9791bca02dc9ad9bc2b61f6ba72486a23", "version": "5.0.1", From 656e0afa0d307297bfc5fde97bf0895e195af243 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 2 Apr 2022 06:57:36 +0800 Subject: [PATCH 118/217] [expat]update to 2.4.8 (#22575) * [expat]update to 2.4.3 * update version * delete patch * update version * delete patch * overwrite version * update version 2.4.4 * update version * delete git-tree * update version to 2.4.7 * update version * delete version-json * update to 2.4.8 * update version --- ports/expat/pkgconfig.patch | 13 ------------- ports/expat/portfile.cmake | 25 +++++++++++-------------- ports/expat/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/e-/expat.json | 5 +++++ 5 files changed, 29 insertions(+), 30 deletions(-) delete mode 100644 ports/expat/pkgconfig.patch diff --git a/ports/expat/pkgconfig.patch b/ports/expat/pkgconfig.patch deleted file mode 100644 index 98ea4b2df9c1fb..00000000000000 --- a/ports/expat/pkgconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt -index cd12a99..03c2c4d 100644 ---- a/expat/CMakeLists.txt -+++ b/expat/CMakeLists.txt -@@ -419,6 +419,8 @@ expat_install(FILES lib/expat.h lib/expat_external.h DESTINATION ${CMAKE_INSTALL - # - # pkg-config file - # -+string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UPPER) -+set(_EXPAT_OUTPUT_NAME ${_EXPAT_OUTPUT_NAME}${CMAKE_${BUILD_TYPE_UPPER}_POSTFIX}) - if(EXPAT_BUILD_PKGCONFIG) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\${prefix}") diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake index 4de88bce1134b6..402a33f8d3fd0c 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -1,13 +1,11 @@ -set (EX_VERSION 2.4.1) +set (EX_VERSION 2.4.8) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libexpat/libexpat - REF a28238bdeebc087071777001245df1876a11f5ee #v2.4.1 - SHA512 2c22f2dfab50644637a7777229849c91630ae8c50683df6ad6409d473690ce01b59ce9f98e66b0aeac8c650507f04edbb5d9738130c88b87bbc1adb7831c22a9 + REF 3bab6c09bbe8bf42d84b81563ddbcf4cca4be838 #v2.4.8 + SHA512 6bddf6514183b3bfa6bf869e63cf838cfe2912941ef04543bce00bee84a305f494368fb7cbd80404d06877a1d8da82de5ac2b44074b25e34aeaee7949d37e451 HEAD_REF master - PATCHES - pkgconfig.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -16,9 +14,8 @@ else() set(EXPAT_LINKAGE OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/expat - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/expat" OPTIONS -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF @@ -27,13 +24,13 @@ vcpkg_configure_cmake( -DEXPAT_BUILD_PKGCONFIG=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/expat-${EX_VERSION}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/expat-${EX_VERSION}") vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/expat_external.h @@ -45,6 +42,6 @@ endif() vcpkg_copy_pdbs() #Handle copyright -file(INSTALL ${SOURCE_PATH}/expat/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/expat/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/expat/vcpkg.json b/ports/expat/vcpkg.json index 6444ec7d2a62e0..909693ed00058a 100644 --- a/ports/expat/vcpkg.json +++ b/ports/expat/vcpkg.json @@ -1,6 +1,16 @@ { "name": "expat", - "version-semver": "2.4.1", + "version": "2.4.8", "description": "XML parser library written in C", - "homepage": "https://github.com/libexpat/libexpat" + "homepage": "https://github.com/libexpat/libexpat", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 96912bb2467247..0685e63f34c153 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2085,7 +2085,7 @@ "port-version": 1 }, "expat": { - "baseline": "2.4.1", + "baseline": "2.4.8", "port-version": 0 }, "expected-lite": { diff --git a/versions/e-/expat.json b/versions/e-/expat.json index 6ebce1bf311bda..6e98367de2ce43 100644 --- a/versions/e-/expat.json +++ b/versions/e-/expat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35013cd612175defc1832114f6a841888a6f6aad", + "version": "2.4.8", + "port-version": 0 + }, { "git-tree": "d63d8c6684bc73856e3f684601761939e32feeb3", "version-semver": "2.4.1", From 01d6f6ff1e5332b926099f0c23bda996940ad4e8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 2 Apr 2022 06:58:02 +0800 Subject: [PATCH 119/217] [libmt32emu] update from 2.5.3 to 2.6.2 (#23836) * [libmt32emu] update from 2.5.3 to 2.6.2 * update version * Add license * update version * Update license * update version --- ports/libmt32emu/portfile.cmake | 11 +++++++---- ports/libmt32emu/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/libmt32emu.json | 5 +++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ports/libmt32emu/portfile.cmake b/ports/libmt32emu/portfile.cmake index 706307693acd88..9eea719a55cb4f 100644 --- a/ports/libmt32emu/portfile.cmake +++ b/ports/libmt32emu/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO munt/munt - REF libmt32emu_2_5_3 - SHA512 c801e22e861898281316109533ca6264f5a9cf778d4f0bb14b49bb6d04d53b7e60cd8320d5b29a63534f6c470b4feb67c881e86c49b7860a98639ce01b99debf + REF 004800c20b1edaab921e08f69133fc2a4bd3b8e8 #vlibmt32emu_2_6_2 + SHA512 3a47c269d285f3930eefda4cae6f1c7e157fc4e88d7d64ad029542586b6592b32d5f9bf0e22344e27a21869aea2191051505f3727e52dff268cf2be4d52f15c3 HEAD_REF master ) @@ -15,6 +15,11 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME MT32Emu CONFIG_PATH lib/cmake/MT32Emu) + +vcpkg_fixup_pkgconfig() + vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -23,5 +28,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") file(INSTALL "${SOURCE_PATH}/mt32emu/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/ports/libmt32emu/vcpkg.json b/ports/libmt32emu/vcpkg.json index 79ead6f26c5b85..115c3206e2b7e1 100644 --- a/ports/libmt32emu/vcpkg.json +++ b/ports/libmt32emu/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libmt32emu", - "version": "2.5.3", - "port-version": 1, + "version": "2.6.2", "description": "A MT-32 emulator", "homepage": "https://github.com/munt/munt/tree/master/mt32emu", + "license": "GPL-2.0-or-later", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 0685e63f34c153..9b5c1056e7a70b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3765,8 +3765,8 @@ "port-version": 4 }, "libmt32emu": { - "baseline": "2.5.3", - "port-version": 1 + "baseline": "2.6.2", + "port-version": 0 }, "libmupdf": { "baseline": "1.19.0-rc2", diff --git a/versions/l-/libmt32emu.json b/versions/l-/libmt32emu.json index 5fd4ad5af52c40..76e96543d70af6 100644 --- a/versions/l-/libmt32emu.json +++ b/versions/l-/libmt32emu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de283dae22ced9be75cf6356a02732fec8b4eb11", + "version": "2.6.2", + "port-version": 0 + }, { "git-tree": "da8f12396b75ff5163acd190bf7f79a3d0b5098a", "version": "2.5.3", From ab76042ca5a87e7b5789c651d7d562a90d808469 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Tue, 5 Apr 2022 17:53:08 +0000 Subject: [PATCH 120/217] [fontconfig] update to 2.14.0 (#23922) * [fontconfig] update to 2.14.0 (microsoft#23920) 2.14 Alan Coopersmith (1): Update address for reporting msgid bugs from bugzilla to gitlab 2.13.96 (2.14 RC6) Akira TAGOH (2): Add a missing file 48-spacing.conf Merge branch 'main' of ssh://gitlab.freedesktop.org/fontconfig/fontconfig 2.13.95 (2.14 RC5) Akira TAGOH (18): Do not set different score to non-string values Enable 11-lcdfilter-default.conf by default Bump the cache version to 8 Reflect matching results to binding in FcPattern Fix a memory leak when trying to open a non-existing file Fix score estimation for postscriptname Resolves symlinks against Add the option to not build fontconfig cache during installation conf.d/60-latin.conf: Make Noto default. Fix some testcase fails for 14c265a1 Fix the issue fail to obtain the style name Apply the change made by 23e46d1 again Initialize variable Add more description for fc-conflist.1 and FcConfigFileInfoIterInit.3 Update CaseFolding.txt to Unicode 14 Add an user font directory for Win32 to the default font path Add test/wrapper-script.sh to the archive Fix possible memory leaks in FcPatternObjectAddWithBinding Alex Richardson (3): fcint: add casts to allow building with stricter compilers Add support for C11 stdatomic atomics FcCharSetPutLeaf(): Fix missing move of new_leaves contents Behdad Esfahbod (1): If a varfont has 'opsz' axis, set FC_SIZE on default instant pattern Ben Wagner (6): Add memory order constraints to C11 atomics Free local FcCache lock on contention Extend test thread args lifetime Fix warning about os2->achVendID cannot be NULL Back FcSerialize with open addressing hash table. Actually skip leading spaces in style name Francesco Pretto (1): WIN32: Fix pGetSystemWindowsDirectory found initialized during FcConfigParseAndLoadFromMemory Mehdi Sabwat (1): fcstat: add support for wasm-emscripten Nirbheek Chauhan (1): meson: Remove summary() from version_compare() block Pierre Ducroquet (5): Add a configuration to switch to monospace if spacing=100 is requested Reference the new configuration file Remove configuration file from POTFILES It seems this qual doesn't work on integers Always add the family name from spacing=100 Ryan Gonzalez (1): Ensure config.h is always included before stdlib headers Ryan Schmidt (5): Avoid PCRE syntax when using grep Remove Bugzilla references Fix run-test.sh to work with BSD mktemp Restore fcatomic compatibility with Mac OS X 10.4. Fix FC_DEFAULT_FONTS on macOS and with BSD sed sed * [fontconfig] do not run fc-cache (microsoft#23920) The fc-cache application is run on installation per default. Font caches of the build system are useless to anyone unless deploying fontconfig on just that build system, and even then, the user will most likely be deploying his own fonts.conf and correspondinly explicitly setup his users fc-cache path. In fact, all the fc-cache run does is to generate data for us to delete. Instruct meson not to run fc-cache, saving us the need to delete the cache, too. * [fontconfig] disable tests (microsoft#23920) * [fontconfig] remove json-c dependency (microsoft#23920) The only code that needs json-c is in the tests ... which are disabled from being built. * [fontconfig] update versions registry (microsoft#23920) * [fontconfig] do not run fc-cache on linux either (microsoft#23920) * [fontconfig] regenerate version registries (microsoft#23920) --- ports/fontconfig/portfile.cmake | 21 ++++----------------- ports/fontconfig/vcpkg.json | 4 +--- versions/baseline.json | 4 ++-- versions/f-/fontconfig.json | 5 +++++ 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 55c0238fd80c00..1ad11bfb27eddc 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -1,11 +1,11 @@ -set(FONTCONFIG_VERSION 2.13.94) +set(FONTCONFIG_VERSION 2.14.0) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO fontconfig/fontconfig REF ${FONTCONFIG_VERSION} - SHA512 815f999146970c7f0e6c15a21f218d4b3f75b26d4ef14d36711bc0a1de19e59cc62d6a2c53993dd38b963ae30820c4db29f103380d5001886d55b6a7df361154 + SHA512 0f36fa503c0277750ff253534f9305c9b4c86fd0d88a470e3b666080951714c51f13a69eecab382d0a7883a07494fc71730213e6086194a92aa5dfc075789e85 HEAD_REF master PATCHES no-etc-symlinks.patch @@ -19,6 +19,8 @@ vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS -Ddoc=disabled + -Dcache-build=disabled + -Dtests=disabled ) vcpkg_install_meson(ADD_BIN_TO_PATH) @@ -67,21 +69,6 @@ endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -# Build the fontconfig cache -if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING) - set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts") - set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") - vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose - WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin" - LOGNAME fc-cache-${TARGET_TRIPLET}) -endif() - -if(VCPKG_TARGET_IS_WINDOWS) - # Unnecessary make rule creating the fontconfig cache dir on windows. - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}LOCAL_APPDATA_FONTCONFIG_CACHE") -endif() - if(NOT VCPKG_TARGET_IS_LINUX) set(VCPKG_TARGET_IS_LINUX 0) # To not leave empty AND statements in the wrapper endif() diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index fd4487d6f6eb19..0ab7edc10ef79b 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fontconfig", - "version": "2.13.94", - "port-version": 6, + "version": "2.14.0", "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "license": "MIT", @@ -10,7 +9,6 @@ "expat", "freetype", "gettext", - "json-c", "libiconv", { "name": "libuuid", diff --git a/versions/baseline.json b/versions/baseline.json index 9b5c1056e7a70b..421186d9ac6f32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2261,8 +2261,8 @@ "port-version": 0 }, "fontconfig": { - "baseline": "2.13.94", - "port-version": 6 + "baseline": "2.14.0", + "port-version": 0 }, "foonathan-memory": { "baseline": "2019-07-21", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index a5d90d2537ac87..70a3570d97b9dd 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49816baac2cb555355f7e0176c5d36b2701cfceb", + "version": "2.14.0", + "port-version": 0 + }, { "git-tree": "8f782f79dc3a2c6834a7e5de4a941b11822067dd", "version": "2.13.94", From a7be23bf9fe0ce05bef0daadff66474c1b1cd6b9 Mon Sep 17 00:00:00 2001 From: Burak Arslan Date: Tue, 5 Apr 2022 10:54:16 -0700 Subject: [PATCH 121/217] [nss] Version bump to 3.77 (#23917) * [nss] Update version to 3.77 * [nss] add version --- ports/nss/portfile.cmake | 4 ++-- ports/nss/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nss.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nss/portfile.cmake b/ports/nss/portfile.cmake index 09b8aebea4c7d3..3e60e20dc6b350 100644 --- a/ports/nss/portfile.cmake +++ b/ports/nss/portfile.cmake @@ -1,10 +1,10 @@ -set(NSS_VERSION "3.76.1") +set(NSS_VERSION "3.77") string(REPLACE "." "_" V_URL ${NSS_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${NSS_VERSION}.tar.gz" FILENAME "nss-${NSS_VERSION}.tar.gz" - SHA512 80d32a97501cbc05312caa5cec54fe6dd8708f01e6d15693e36a40d70433be7a35565fcc5fadfc324c998ee9093b10b2f7a89643882f06a850eda4ffd3b19c54 + SHA512 bd62eeb8f90ecd2d3999fd78fea6652736c02a6530f29e98d0cad0707f3b901b30409132eb6a6d53b9f5c05c6b464615a946a2a3e255553c793e44d0ed93179e ) vcpkg_extract_source_archive_ex( diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json index 6763a3fc239e71..83143405c36be8 100644 --- a/ports/nss/vcpkg.json +++ b/ports/nss/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nss", - "version": "3.76.1", + "version": "3.77", "description": "Network Security Services from Mozilla", "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 421186d9ac6f32..9ce0fd06c80bfc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4857,7 +4857,7 @@ "port-version": 0 }, "nss": { - "baseline": "3.76.1", + "baseline": "3.77", "port-version": 0 }, "nsync": { diff --git a/versions/n-/nss.json b/versions/n-/nss.json index ba30569823e466..f715e04fbd61d6 100644 --- a/versions/n-/nss.json +++ b/versions/n-/nss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06e7680df336bb6be816c75e42c6304d11566a3d", + "version": "3.77", + "port-version": 0 + }, { "git-tree": "a5eabb67b345be280f94a3615aa3e08886ad4ec7", "version": "3.76.1", From 6f1028b1847a82144adf3a6a2d66ed11ce89a8ad Mon Sep 17 00:00:00 2001 From: Silvano Galliani Date: Tue, 5 Apr 2022 19:57:13 +0200 Subject: [PATCH 122/217] [gtest] Fix clang-tidy error in gtest (#23906) * Nolinux gtest matchers * Typo * Update version database * update port version * Update version database --- ports/gtest/clang-tidy-no-lint.patch | 13 +++++++++++++ ports/gtest/portfile.cmake | 1 + ports/gtest/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gtest.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/gtest/clang-tidy-no-lint.patch diff --git a/ports/gtest/clang-tidy-no-lint.patch b/ports/gtest/clang-tidy-no-lint.patch new file mode 100644 index 00000000000000..588a1d637f4050 --- /dev/null +++ b/ports/gtest/clang-tidy-no-lint.patch @@ -0,0 +1,13 @@ +diff --git a/googletest/include/gtest/gtest-matchers.h b/googletest/include/gtest/gtest-matchers.h +index 2bd3dcf6..12cd60f6 100644 +--- a/googletest/include/gtest/gtest-matchers.h ++++ b/googletest/include/gtest/gtest-matchers.h +@@ -403,6 +403,7 @@ class MatcherBase : private MatcherDescriberInterface { + }; + + void Destroy() { ++ // NOLINTNEXTLINE + if (IsShared() && buffer_.shared->Unref()) { + vtable_->shared_destroy(buffer_.shared); + } + diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 4cdab172e3bbfd..b2bff3768ccc69 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28 HEAD_REF main PATCHES + clang-tidy-no-lint.patch fix-main-lib-path.patch remove-werror.patch ) diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index 25a80dcf42b096..9bd6e01942b472 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gtest", "version-semver": "1.11.0", - "port-version": 4, + "port-version": 5, "description": "GoogleTest and GoogleMock testing frameworks", "homepage": "https://github.com/google/googletest", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 9ce0fd06c80bfc..648173a2d218f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2650,7 +2650,7 @@ }, "gtest": { "baseline": "1.11.0", - "port-version": 4 + "port-version": 5 }, "gtk": { "baseline": "4.6.0", diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 00c8edbccc34e5..58f9b691a467a3 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9731f44f8b0ecbc67eafccd0440700357d2cdfc4", + "version-semver": "1.11.0", + "port-version": 5 + }, { "git-tree": "9b9432e429e940c2d86eeef6fcf03bc74418c4c5", "version-semver": "1.11.0", From 3f7655c70ae10ac1683d62dbc0fc9903b74a0a50 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Tue, 5 Apr 2022 18:03:16 +0000 Subject: [PATCH 123/217] [cairomm] update to 1.16.1 (#23904) * [cairomm] update to 1.16.1 (microsoft#23903) Cairo: * Surface::Type: Deprecate WIN32, add WIN32_SURFACE (Kjell Ahlstedt) Issue #26, merge request !14 Build: * cairommconfig.h.*: Don't dllimport on MinGW (Chun-wei Fan) Merge reqest !16 (Chun-wei Fan) Issue gtkmm#90 (Lukas K.) * Meson build: Make it possible to use cairomm as a subproject (Kjell Ahlstedt) * Meson build: No implicit_include_directories (Kjell Ahlstedt) * MSVC build: exception.h: Export Cairo::logic_error selectively (Chun-wei Fan) Merge request !17 * [cairomm] remove patch (microsoft#23903) The WIN32 constant has been renamed to WIN32_SURFACE , and the WIN32 -> WIN32_SURFACE alias is only provided for non-win32 sytems, therefore our previous patch is no longer needed. * [cairomm] Support MSVC2022 (microsoft#23903) Manually add ed1ce9a630b375b0f43435e34fbe690eb8276178 from upstream, which prevents MSVC 2022 toolchains from being overridden by the meson port file, resulting in corrupted binarycache metadata * [cairomm] update version registries (microsoft#23903) * [cairomm] add license (microsoft#23903) * [cairomm] regenerate license registry (microsoft#23903) Co-authored-by: Schaich --- ports/cairomm/build-support-msvc2022.diff | 41 +++++++++++++++++++++++ ports/cairomm/portfile.cmake | 6 ++-- ports/cairomm/undef.win32.patch | 12 ------- ports/cairomm/vcpkg.json | 4 +-- versions/baseline.json | 4 +-- versions/c-/cairomm.json | 5 +++ 6 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 ports/cairomm/build-support-msvc2022.diff delete mode 100644 ports/cairomm/undef.win32.patch diff --git a/ports/cairomm/build-support-msvc2022.diff b/ports/cairomm/build-support-msvc2022.diff new file mode 100644 index 00000000000000..b83bdd85f3f740 --- /dev/null +++ b/ports/cairomm/build-support-msvc2022.diff @@ -0,0 +1,41 @@ +commit ed1ce9a630b375b0f43435e34fbe690eb8276178 +Author: Chun-wei Fan +Date: Wed Nov 10 16:11:04 2021 +0800 + + build: Support Visual Studio 2022 + + Make these builds distinct from the Visual Studio 2019 builds. + +diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak +index bf2e906..58b7092 100644 +--- a/MSVC_NMake/detectenv-msvc.mak ++++ b/MSVC_NMake/detectenv-msvc.mak +@@ -98,9 +98,12 @@ PDBVER = 14 + !if $(VCVERSION) > 1909 && $(VCVERSION) < 1920 + VSVER_SUFFIX = 1 + VSVER = 15 +-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000 ++!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930 + VSVER_SUFFIX = 2 + VSVER = 16 ++!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000 ++VSVER_SUFFIX = 3 ++VSVER = 17 + !else + VSVER = $(PDBVER) + !endif +diff --git a/meson.build b/meson.build +index 8b18fc2..1fa2da0 100644 +--- a/meson.build ++++ b/meson.build +@@ -238,7 +238,9 @@ if is_msvc + add_project_arguments(disabled_warning, language: 'cpp') + endforeach + if use_msvc14x_toolset_ver +- if cpp_compiler.version().version_compare('>=19.20') ++ if cpp_compiler.version().version_compare('>=19.30') ++ msvc14x_toolset_ver = '-vc143' ++ elif cpp_compiler.version().version_compare('>=19.20') + msvc14x_toolset_ver = '-vc142' + elif cpp_compiler.version().version_compare('>=19.10') + msvc14x_toolset_ver = '-vc141' diff --git a/ports/cairomm/portfile.cmake b/ports/cairomm/portfile.cmake index c20887b0da9064..212310565f4445 100644 --- a/ports/cairomm/portfile.cmake +++ b/ports/cairomm/portfile.cmake @@ -1,5 +1,5 @@ -set(CAIROMM_VERSION 1.16.0) -set(CAIROMM_HASH 51929620feeac45377da5d486ea7a091bbd10ad8376fb16525328947b9e6ee740cdc8e8bd190a247b457cc9fec685a829c81de29b26cabaf95383ef04cce80d3) +set(CAIROMM_VERSION 1.16.1) +set(CAIROMM_HASH 2dbdd41f712d43573ad3118f37d443d2b9ae98737c240d5db8d830ef38f2b4a95182b2fc857577c7564eb94649e629f70380f16ee84f4978759f40e19d802757) vcpkg_download_distfile(ARCHIVE URLS "https://www.cairographics.org/releases/cairomm-${CAIROMM_VERSION}.tar.xz" @@ -11,7 +11,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - undef.win32.patch # because WIN32 is used as an ENUM identifier. + build-support-msvc2022.diff ) vcpkg_configure_meson( diff --git a/ports/cairomm/undef.win32.patch b/ports/cairomm/undef.win32.patch deleted file mode 100644 index e91db0bfe42b06..00000000000000 --- a/ports/cairomm/undef.win32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cairomm/surface.h b/cairomm/surface.h -index c923e6086..8cfaa76a3 100644 ---- a/cairomm/surface.h -+++ b/cairomm/surface.h -@@ -49,6 +49,7 @@ - #include - #endif // CAIRO_HAS_GLITZ_SURFACE - -+#undef WIN32 - - namespace Cairo - { diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json index b1f937ba6cb2b0..467d320c6ab062 100644 --- a/ports/cairomm/vcpkg.json +++ b/ports/cairomm/vcpkg.json @@ -1,9 +1,9 @@ { "name": "cairomm", - "version": "1.16.0", - "port-version": 1, + "version": "1.16.1", "description": "A C++ wrapper for the cairo graphics library", "homepage": "https://www.cairographics.org", + "license": "LGPL-2.0-only", "dependencies": [ "cairo", "libsigcpp", diff --git a/versions/baseline.json b/versions/baseline.json index 648173a2d218f3..62c6e1ce891459 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1221,8 +1221,8 @@ "port-version": 0 }, "cairomm": { - "baseline": "1.16.0", - "port-version": 1 + "baseline": "1.16.1", + "port-version": 0 }, "calceph": { "baseline": "3.5.1", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index 8b828b0c228e0b..7bfd0bf732e058 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ae92557bdcf5f6dc8364cb179fd8fe57b0698ce", + "version": "1.16.1", + "port-version": 0 + }, { "git-tree": "6cf38af57700ebdb1933bd3e4f4c0580de8aaab9", "version": "1.16.0", From 6dff39f1344572bddbff81845ccdb098340d347d Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 5 Apr 2022 21:07:47 +0300 Subject: [PATCH 124/217] [lunasvg] Add new port (#23867) * [lunasvg] Add new port * Run x-add-version * Update portfile.cmake * Add license to vcpkg.json * Update lunasvg.json * Replace tabs with spaces * Run x-add-version * Update vcpkg.json * Update lunasvg.json --- ports/lunasvg/fix-install.patch | 26 ++++++++++++++++++++++++++ ports/lunasvg/portfile.cmake | 24 ++++++++++++++++++++++++ ports/lunasvg/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/lunasvg.json | 9 +++++++++ 5 files changed, 80 insertions(+) create mode 100644 ports/lunasvg/fix-install.patch create mode 100644 ports/lunasvg/portfile.cmake create mode 100644 ports/lunasvg/vcpkg.json create mode 100644 versions/l-/lunasvg.json diff --git a/ports/lunasvg/fix-install.patch b/ports/lunasvg/fix-install.patch new file mode 100644 index 00000000000000..73b63487540d6b --- /dev/null +++ b/ports/lunasvg/fix-install.patch @@ -0,0 +1,26 @@ + CMakeLists.txt | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9916c67..159f3a6 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,16 +24,5 @@ if(LUNASVG_BUILD_EXAMPLES) + add_subdirectory(example) + endif() + +-set(LUNASVG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) +-set(LUNASVG_INCDIR ${CMAKE_INSTALL_PREFIX}/include) +- +-install(FILES +- include/lunasvg.h +- DESTINATION ${LUNASVG_INCDIR} +-) +- +-install(TARGETS lunasvg +- LIBRARY DESTINATION ${LUNASVG_LIBDIR} +- ARCHIVE DESTINATION ${LUNASVG_LIBDIR} +- INCLUDES DESTINATION ${LUNASVG_INCDIR} +-) ++set_target_properties(lunasvg PROPERTIES PUBLIC_HEADER "include/lunasvg.h") ++install(TARGETS lunasvg RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include) diff --git a/ports/lunasvg/portfile.cmake b/ports/lunasvg/portfile.cmake new file mode 100644 index 00000000000000..9b40c58421d863 --- /dev/null +++ b/ports/lunasvg/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sammycage/lunasvg + REF e612abda858b53160041381a23422cd2b4f42fbd #2.3.1 + SHA512 44f5d013d918cb5af90114a12857bdd2c204caff761516ef98b12b08d8b6215e91f6d963c281500c386f287b9d0ecd5b3d986d4c8c33423c0c34d539d744e09d + HEAD_REF master + PATCHES + fix-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLUNASVG_BUILD_EXAMPLES=OFF + -DBUILD_SHARED_LIBS=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lunasvg/vcpkg.json b/ports/lunasvg/vcpkg.json new file mode 100644 index 00000000000000..df3d8aaa0769f1 --- /dev/null +++ b/ports/lunasvg/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lunasvg", + "version": "2.3.1", + "description": "lunasvg is a standalone SVG rendering library in C++", + "homepage": "https://github.com/sammycage/lunasvg", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 62c6e1ce891459..bfaa1e9914d612 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4288,6 +4288,10 @@ "baseline": "2020-09-14", "port-version": 2 }, + "lunasvg": { + "baseline": "2.3.1", + "port-version": 0 + }, "lv2": { "baseline": "1.18.2", "port-version": 1 diff --git a/versions/l-/lunasvg.json b/versions/l-/lunasvg.json new file mode 100644 index 00000000000000..fb076139e32d59 --- /dev/null +++ b/versions/l-/lunasvg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bf20380ca537151f7d1e02a6ca5b19c302db18c7", + "version": "2.3.1", + "port-version": 0 + } + ] +} From 90fdea2c82fe4a8a23fc6965d37df7cc235cef13 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 5 Apr 2022 20:14:30 +0200 Subject: [PATCH 125/217] [freeglut] Update to 3.2.2, fix X11 dependencies (#23807) * Update to 3.2.2 * Extend X11 dependencies patch * Update the FindGLUT wrapper * Update versions * Modernize portfile * Set policies * Update versions * Switch to github * Update versions * CI * Replace GLUT_LIBRARIES with GLUT_LINK_LIBRARIES * Update versions --- ports/freeglut/gcc10.patch | 31 --------- ports/freeglut/portfile.cmake | 65 +++++-------------- ...use_targets_to_export_x11_dependency.patch | 23 ------- ports/freeglut/vcpkg-cmake-wrapper.cmake | 35 ++++++++-- ports/freeglut/vcpkg.json | 16 ++++- .../freeglut/windows-static-output-name.patch | 29 +++++++++ ports/freeglut/x11-dependencies-export.patch | 63 ++++++++++++++++++ versions/baseline.json | 4 +- versions/f-/freeglut.json | 5 ++ 9 files changed, 159 insertions(+), 112 deletions(-) delete mode 100644 ports/freeglut/gcc10.patch delete mode 100644 ports/freeglut/use_targets_to_export_x11_dependency.patch create mode 100644 ports/freeglut/windows-static-output-name.patch create mode 100644 ports/freeglut/x11-dependencies-export.patch diff --git a/ports/freeglut/gcc10.patch b/ports/freeglut/gcc10.patch deleted file mode 100644 index dc5193b6ac090f..00000000000000 --- a/ports/freeglut/gcc10.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/fg_gl2.h b/src/fg_gl2.h -index ab8ba5c..a1a52da 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,19 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#if __GNUC__ > 9 -+#define FG_ATTRIBUTE_COMMON __attribute__((__common__)) -+#else -+#define FG_ATTRIBUTE_COMMON -+#endif -+ -+FGH_PFNGLGENBUFFERSPROC FG_ATTRIBUTE_COMMON fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC FG_ATTRIBUTE_COMMON fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC FG_ATTRIBUTE_COMMON fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC FG_ATTRIBUTE_COMMON fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC FG_ATTRIBUTE_COMMON fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC FG_ATTRIBUTE_COMMON fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC FG_ATTRIBUTE_COMMON fghVertexAttribPointer; - - # endif - diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index b281d12c7ef1e3..714a393a6a61d9 100755 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -1,61 +1,39 @@ -vcpkg_from_sourceforge( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO freeglut/freeglut - REF 3.2.1 - FILENAME "freeglut-3.2.1.tar.gz" - SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08 + REPO FreeGLUTProject/freeglut + REF v3.2.2 + SHA512 caaed8af95c2d0ecbc785229e26433978a0f606ae2b9f0b3cd794bb5bb70a1cc54d21f941a1a03e20c7e0fa3eba9d54a21d6e23e44f243899c0fdf146066cf29 + HEAD_REF master PATCHES - use_targets_to_export_x11_dependency.patch + x11-dependencies-export.patch macOS_Xquartz.patch - gcc10.patch fix-debug-macro.patch no_x64_enforcement.patch + windows-static-output-name.patch ) if(NOT VCPKG_TARGET_IS_WINDOWS) message("Freeglut currently requires the following libraries from the system package manager:\n opengl\n glu\n libx11\n xrandr\n xi\n xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.") endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(FREEGLUT_STATIC OFF) - set(FREEGLUT_DYNAMIC ON) -else() - set(FREEGLUT_STATIC ON) - set(FREEGLUT_DYNAMIC OFF) -endif() - -# Patch header -file(READ ${SOURCE_PATH}/include/GL/freeglut_std.h FREEGLUT_STDH) -string(REGEX REPLACE "\"freeglut_static.lib\"" - "\"freeglut.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}") -string(REGEX REPLACE "\"freeglut_staticd.lib\"" - "\"freeglutd.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}") -file(WRITE ${SOURCE_PATH}/include/GL/freeglut_std.h "${FREEGLUT_STDH}") +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FREEGLUT_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FREEGLUT_DYNAMIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFREEGLUT_BUILD_STATIC_LIBS=${FREEGLUT_STATIC} -DFREEGLUT_BUILD_SHARED_LIBS=${FREEGLUT_DYNAMIC} -DFREEGLUT_BUILD_DEMOS=OFF -DINSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it ) - -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeGLUT) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeGLUT) +vcpkg_fixup_pkgconfig() # Rename static lib (otherwise it's incompatible with FindGLUT.cmake) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib) - endif() - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglutd.lib) - endif() - endif() - vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h" "ifdef FREEGLUT_STATIC" @@ -66,14 +44,7 @@ endif() # Clean file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright -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/glut") -vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/glut) -endif() - -vcpkg_fixup_pkgconfig() +file(INSTALL "${CMAKE_CURRENT_LIST_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/freeglut/use_targets_to_export_x11_dependency.patch b/ports/freeglut/use_targets_to_export_x11_dependency.patch deleted file mode 100644 index 2f9e6b1bf29f52..00000000000000 --- a/ports/freeglut/use_targets_to_export_x11_dependency.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6f403af..4ced28a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -72,7 +72,7 @@ SET(FREEGLUT_HEADERS - include/GL/freeglut_ext.h - include/GL/freeglut_std.h - ) --IF(FREEGLUT_REPLACE_GLUT) -+IF(TRUE) - LIST(APPEND FREEGLUT_HEADERS - include/GL/glut.h - ) -@@ -312,8 +312,7 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC) - INCLUDE(CheckIncludeFiles) - IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) - FIND_PACKAGE(X11 REQUIRED) -- INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH}) -- LIST(APPEND LIBS ${X11_X11_LIB}) -+ LIST(APPEND LIBS X11::X11) - IF(X11_Xrandr_FOUND) - SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) - LIST(APPEND LIBS ${X11_Xrandr_LIB}) diff --git a/ports/freeglut/vcpkg-cmake-wrapper.cmake b/ports/freeglut/vcpkg-cmake-wrapper.cmake index 5d57ad49020929..c8cfa25162c6de 100644 --- a/ports/freeglut/vcpkg-cmake-wrapper.cmake +++ b/ports/freeglut/vcpkg-cmake-wrapper.cmake @@ -1,10 +1,33 @@ _find_package(${ARGS}) -if(GLUT_FOUND) - find_library(XRANDR_LIBRARY NAMES xrandr Xrandr) - if(XRANDR_LIBRARY) - list(APPEND GLUT_LIBRARIES ${XRANDR_LIBRARY}) - if(TARGET GLUT::GLUT) - set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${XRANDR_LIBRARY}) +if(GLUT_FOUND AND UNIX AND NOT ANDROID) + cmake_policy(PUSH) + cmake_policy(SET CMP0012 NEW) + cmake_policy(SET CMP0054 NEW) + cmake_policy(SET CMP0057 NEW) + + if(GLUT_LINK_LIBRARIES) + # Since CMake 3.22, FindGLUT.cmake loads the glut pkg-config module. + # We need `-lglut` resolved to an absolute path. + set(GLUT_LIBRARIES "${GLUT_LINK_LIBRARIES}") + else() + find_package(X11) + # Before CMake 3.14, FindX11.cmake doesn't create imported targets. + # For X11, we simply assume shared linkage of system libs, + # so order and transitive usage requirements don't matter. + if(X11_Xrandr_FOUND AND NOT "Xrandr" IN_LIST GLUT_LIBRARIES) + list(APPEND GLUT_LIBRARIES "${X11_Xrandr_LIB}") + set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xrandr_LIB}") + endif() + # X11_xf86vmode_FOUND for CMake < 3.14 + if((X11_xf86vm_FOUND OR X11_xf86vmode_FOUND) AND NOT "Xxf86vm" IN_LIST GLUT_LIBRARIES) + list(APPEND GLUT_LIBRARIES "${X11_Xxf86vm_LIB}") + set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xxf86vm_LIB}") + endif() + if(X11_Xi_FOUND AND NOT GLUT_Xi_LIBRARY AND NOT "Xi" IN_LIST GLUT_LIBRARIES) + list(APPEND GLUT_LIBRARIES "${X11_Xi_LIB}") + set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${X11_Xi_LIB}") endif() endif() + + cmake_policy(POP) endif() diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json index dc95985d8a1d84..d1708bd73a8555 100644 --- a/ports/freeglut/vcpkg.json +++ b/ports/freeglut/vcpkg.json @@ -1,7 +1,17 @@ { "name": "freeglut", - "version-string": "3.2.1", - "port-version": 7, + "version": "3.2.2", "description": "Open source implementation of GLUT with source and binary backwards compatibility.", - "homepage": "https://sourceforge.net/projects/freeglut/" + "homepage": "https://sourceforge.net/projects/freeglut/", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/freeglut/windows-static-output-name.patch b/ports/freeglut/windows-static-output-name.patch new file mode 100644 index 00000000000000..750d4bee01fb4b --- /dev/null +++ b/ports/freeglut/windows-static-output-name.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aec0a27..73ccbdb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -429,7 +429,7 @@ IF(WIN32) + ENDIF() + IF(FREEGLUT_BUILD_STATIC_LIBS) + TARGET_COMPILE_DEFINITIONS(freeglut_static PUBLIC FREEGLUT_STATIC) +- IF(FREEGLUT_REPLACE_GLUT) ++ IF(1) + SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME}) + ENDIF() + ENDIF() +diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h +index a5efb3b..6bdcdfb 100644 +--- a/include/GL/freeglut_std.h ++++ b/include/GL/freeglut_std.h +@@ -71,9 +71,9 @@ + /* Link with Win32 static freeglut lib */ + # if FREEGLUT_LIB_PRAGMAS + # if defined(NDEBUG) || !defined(_DEBUG) +-# pragma comment (lib, "freeglut_static.lib") ++# pragma comment (lib, "freeglut.lib") + # else +-# pragma comment (lib, "freeglut_staticd.lib") ++# pragma comment (lib, "freeglutd.lib") + # endif + # endif + diff --git a/ports/freeglut/x11-dependencies-export.patch b/ports/freeglut/x11-dependencies-export.patch new file mode 100644 index 00000000000000..814802f333aa91 --- /dev/null +++ b/ports/freeglut/x11-dependencies-export.patch @@ -0,0 +1,63 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f403af..4ced28a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,7 +72,7 @@ SET(FREEGLUT_HEADERS + include/GL/freeglut_ext.h + include/GL/freeglut_std.h + ) +-IF(FREEGLUT_REPLACE_GLUT) ++IF(TRUE) + LIST(APPEND FREEGLUT_HEADERS + include/GL/glut.h + ) +@@ -319,23 +319,27 @@ IF(CMAKE_COMPILER_IS_GNUCC) + ENDIF() + ENDIF(CMAKE_COMPILER_IS_GNUCC) + ++SET(xlibs_private "") + INCLUDE(CheckIncludeFiles) + IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) + FIND_PACKAGE(X11 REQUIRED) +- INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH}) +- LIST(APPEND LIBS ${X11_X11_LIB}) ++ LIST(APPEND LIBS X11::X11) ++ set(xlibs_private "-lX11") + IF(X11_Xrandr_FOUND) + SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) +- LIST(APPEND LIBS ${X11_Xrandr_LIB}) ++ LIST(APPEND LIBS X11::Xrandr) ++ STRING(APPEND xlibs_private " -lXrandr") + ENDIF() +- IF(X11_xf86vmode_FOUND) ++ IF(X11_Xxf86vm_FOUND) + SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE) +- LIST(APPEND LIBS ${X11_Xxf86vm_LIB}) ++ LIST(APPEND LIBS X11::Xxf86vm) ++ STRING(APPEND xlibs_private " -lXxf86vm") + ENDIF() + IF(X11_Xinput_FOUND) + # Needed for multi-touch: + CHECK_INCLUDE_FILES("${X11_Xinput_INCLUDE_PATH}/X11/extensions/XInput2.h" HAVE_X11_EXTENSIONS_XINPUT2_H) +- LIST(APPEND LIBS ${X11_Xinput_LIB}) ++ LIST(APPEND LIBS X11::Xi) ++ STRING(APPEND xlibs_private " -lXi") + ELSE() + MESSAGE(FATAL_ERROR "Missing X11's XInput.h (X11/extensions/XInput.h)") + ENDIF() +@@ -586,13 +590,13 @@ ELSEIF(FREEGLUT_GLES) + ELSEIF(FREEGLUT_WAYLAND) + SET(PC_LIBS_PRIVATE "-lwayland-client -lwayland-cursor -lwayland-egl -lGLESv2 -lGLESv1_CM -lEGL -lxkbcommon -lm") + ELSE() +- SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGLESv2 -lGLESv1_CM -lEGL -lm") ++ SET(PC_LIBS_PRIVATE "${xlibs_private} -lGLESv2 -lGLESv1_CM -lEGL -lm") + ENDIF() + ELSE() + IF(FREEGLUT_WAYLAND) + SET(PC_LIBS_PRIVATE "-lwayland-client -lwayland-cursor -lwayland-egl -lGL -lxkbcommon -lm") + ELSE() +- SET(PC_LIBS_PRIVATE "-lX11 -lXxf86vm -lXrandr -lGL -lm") ++ SET(PC_LIBS_PRIVATE "${xlibs_private} -lGL -lm") + ENDIF() + ENDIF() + # Client applications need to define FreeGLUT GLES version to diff --git a/versions/baseline.json b/versions/baseline.json index bfaa1e9914d612..ef3d2afe0fdb35 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2293,8 +2293,8 @@ "port-version": 1 }, "freeglut": { - "baseline": "3.2.1", - "port-version": 7 + "baseline": "3.2.2", + "port-version": 0 }, "freeimage": { "baseline": "3.18.0", diff --git a/versions/f-/freeglut.json b/versions/f-/freeglut.json index c2006f58908b6f..8a79d81a43b4db 100644 --- a/versions/f-/freeglut.json +++ b/versions/f-/freeglut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4eceb7b1ee13b64d859833d2dce4152233c99bc", + "version": "3.2.2", + "port-version": 0 + }, { "git-tree": "bf1c06d0a07b6bc80a63c3825a4d136f5307a2f4", "version-string": "3.2.1", From bfda0438034c165557eace411247375d6e77c238 Mon Sep 17 00:00:00 2001 From: David <48836389+david-antiteum@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:17:23 +0200 Subject: [PATCH 126/217] [mailio] correct hint (#23799) * Solves #23798 * Updated baseline * Replace deprecated functions * Updated baseline * Updated hash * new port version required after merging * add version * remove duplicate line * updated hash --- ports/mailio/portfile.cmake | 8 +++----- ports/mailio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mailio.json | 7 ++++++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ports/mailio/portfile.cmake b/ports/mailio/portfile.cmake index b3c7ca807e39e9..9171b35eae0449 100644 --- a/ports/mailio/portfile.cmake +++ b/ports/mailio/portfile.cmake @@ -6,20 +6,18 @@ vcpkg_from_github( HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DMAILIO_BUILD_DOCUMENTATION=OFF -DMAILIO_BUILD_EXAMPLES=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup( + CONFIG_PATH share/mailio/cmake +) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mailio/vcpkg.json b/ports/mailio/vcpkg.json index b2bfb27b7d15f7..c2f639f9e8c6d0 100644 --- a/ports/mailio/vcpkg.json +++ b/ports/mailio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mailio", "version": "0.21.0", - "port-version": 1, + "port-version": 2, "maintainers": "Tomislav Karastojković ", "description": "mailio is a cross platform C++ library for MIME format and SMTP, POP3 and IMAP protocols. It is based on the standard C++ 17 and Boost library.", "homepage": "https://github.com/karastojko/mailio", diff --git a/versions/baseline.json b/versions/baseline.json index ef3d2afe0fdb35..d83977c3833b8b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4338,7 +4338,7 @@ }, "mailio": { "baseline": "0.21.0", - "port-version": 1 + "port-version": 2 }, "mapbox-geojson-cpp": { "baseline": "0.5.1", diff --git a/versions/m-/mailio.json b/versions/m-/mailio.json index 571caa9984cd3a..156df34a5fc274 100644 --- a/versions/m-/mailio.json +++ b/versions/m-/mailio.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "80186942edc09cad3c911ebbc6dd77d30af68502", + "git-tree": "a9f20b309b2d9f68c5e10eb193ef19c3c51a3faa", + "version": "0.21.0", + "port-version": 2 + }, + { + "git-tree": "f0fde0f6599aacd2b890c94326f504bf2af8f642", "version": "0.21.0", "port-version": 1 }, From 1143d75d55f3ddfd3ec520d054972d45b0c9f785 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 6 Apr 2022 02:18:28 +0800 Subject: [PATCH 127/217] [date] Fix uninitialized values (#23710) * [date] Fix uninitialized values * update version * add notes for patch * update version --- ports/date/fix-uninitialized-values.patch | 40 +++++++++++++++++++++++ ports/date/portfile.cmake | 1 + ports/date/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/date.json | 5 +++ 5 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 ports/date/fix-uninitialized-values.patch diff --git a/ports/date/fix-uninitialized-values.patch b/ports/date/fix-uninitialized-values.patch new file mode 100644 index 00000000000000..422696e70577dc --- /dev/null +++ b/ports/date/fix-uninitialized-values.patch @@ -0,0 +1,40 @@ +diff --git a/include/date/date.h b/include/date/date.h +index 9c6f335..3967d6b 100644 +--- a/include/date/date.h ++++ b/include/date/date.h +@@ -6767,7 +6767,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; + int tH; + int tM; +- long double S; ++ long double S{}; + read(is, ru{tH, 1, 2}, CharT{':'}, ru{tM, 1, 2}, + CharT{':'}, rld{S, 1, w}); + checked_set(H, tH, not_a_hour, is); +@@ -7202,7 +7202,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + // "%I:%M:%S %p" + using dfs = detail::decimal_format_seconds; + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; +- long double S; ++ long double S{}; + int tI = not_a_hour_12_value; + int tM = not_a_minute; + read(is, ru{tI, 1, 2}, CharT{':'}, ru{tM, 1, 2}, +@@ -7258,7 +7258,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + { + using dfs = detail::decimal_format_seconds; + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; +- long double S; ++ long double S{}; + read(is, rld{S, 1, width == -1 ? w : static_cast(width)}); + checked_set(s, round_i(duration{S}), + not_a_second, is); +@@ -7292,7 +7292,7 @@ from_stream(std::basic_istream& is, const CharT* fmt, + CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width; + int tH = not_a_hour; + int tM = not_a_minute; +- long double S; ++ long double S{}; + read(is, ru{tH, 1, 2}, CharT{':'}, ru{tM, 1, 2}, + CharT{':'}, rld{S, 1, w}); + checked_set(H, tH, not_a_hour, is); diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index 0882961fc4507f..876e0529f6f108 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( PATCHES 0001-fix-uwp.patch 0002-fix-cmake-3.14.patch + fix-uninitialized-values.patch #Update the new version please remove this patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/date/vcpkg.json b/ports/date/vcpkg.json index 5b2aa172d50466..35e75e42174a64 100644 --- a/ports/date/vcpkg.json +++ b/ports/date/vcpkg.json @@ -1,7 +1,7 @@ { "name": "date", "version": "3.0.1", - "port-version": 1, + "port-version": 2, "description": "A date and time library based on the C++17 header", "homepage": "https://github.com/HowardHinnant/date", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d83977c3833b8b..d70eb3f1f7a15e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1778,7 +1778,7 @@ }, "date": { "baseline": "3.0.1", - "port-version": 1 + "port-version": 2 }, "dav1d": { "baseline": "0.8.2", diff --git a/versions/d-/date.json b/versions/d-/date.json index 61c6c4941d1f1d..e845993b0951dc 100644 --- a/versions/d-/date.json +++ b/versions/d-/date.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14d5c6822908ad2fd1d700cca2067ae4b8ef4404", + "version": "3.0.1", + "port-version": 2 + }, { "git-tree": "e281c60aee492a2be56e78ce6a53cb5db927b1dc", "version": "3.0.1", From 20ac8a66f4f8fef944bb1f7457232b429c697a16 Mon Sep 17 00:00:00 2001 From: ZeeWanderer Date: Tue, 5 Apr 2022 21:19:17 +0300 Subject: [PATCH 128/217] [blend2d] Update to 2022-02-19 (#22138) * [blend2d] Update to 2022-02-19 * [blend2d] update versions --- ports/blend2d/portfile.cmake | 16 ++++++++-------- ports/blend2d/vcpkg.json | 18 ++++++++++++++++-- versions/b-/blend2d.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/ports/blend2d/portfile.cmake b/ports/blend2d/portfile.cmake index 8ad40fa4148c13..09c8cf8d77460a 100644 --- a/ports/blend2d/portfile.cmake +++ b/ports/blend2d/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO blend2d/blend2d - REF 92ba4eaa2f22331bc9823ddb47f53dd8ce683c8b - SHA512 bb5585d0b73c2acc815a96d613c53c334b5f0d398e99cbaa7b7cf0c63b7a17d36a9f505779d9f5b549b6c6de69414183aadf1b2b8117552bdb273ad7167d761e + REF 63db360c7eb2c1c3ca9cd92a867dbb23dc95ca7d + SHA512 cf83dd36e51fc92587633dec315b3ad8570137ab0b58836c43b8c73ba934dfc0ad03a58e633bd76b79753b12831007c2a5b3fde237d671594c62a3919507c39a HEAD_REF master ) @@ -10,6 +10,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BLEND2D_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES + futex BLEND2D_NO_FUTEX jit BLEND2D_NO_JIT logging BLEND2D_NO_JIT_LOGGING tls BLEND2D_NO_TLS @@ -19,8 +20,8 @@ if(NOT BLEND2D_NO_JIT) vcpkg_from_github( OUT_SOURCE_PATH ASMJIT_SOURCE_PATH REPO asmjit/asmjit - REF e7a728018e5d88ffa477430fa63bdebbf480fb02 - SHA512 99e0f40d6d90ff194cb9e3238c5090a7fb09f871eeaad24283c461214ef584002d4b00c066b303698f71c55b2ccdb926704ec485956d35fc70ea829eff4888a7 + REF a4e1e88374142f4a842892f9c4bd0b0776fdcd0a + SHA512 c8588e2185502c9d045a63ebf722d1cf14eb7373423ef36f0e410525837430f117ad6c841aac16af17246c4d348c3e9094a848b917985de3f677098c1e32606f HEAD_REF master ) @@ -31,18 +32,17 @@ if(NOT BLEND2D_NO_JIT) file(RENAME ${SOURCE_PATH}/3rdparty/${ASMJIT_SOURCE_DIR_NAME} ${SOURCE_PATH}/3rdparty/asmjit) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBLEND2D_STATIC=${BLEND2D_STATIC} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/blend2d/vcpkg.json b/ports/blend2d/vcpkg.json index 9462adb6d1ef36..5db3d5ce2e52cc 100644 --- a/ports/blend2d/vcpkg.json +++ b/ports/blend2d/vcpkg.json @@ -1,17 +1,31 @@ { "name": "blend2d", - "version-date": "2021-03-17", - "port-version": 1, + "version-date": "2022-02-19", "description": "Beta 2D Vector Graphics Powered by a JIT Compiler", "homepage": "https://github.com/blend2d/blend2d", "documentation": "https://blend2d.com/doc/index.html", + "license": "Zlib", "supports": "!arm & !uwp & !wasm32", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ + "futex", "jit", "logging", "tls" ], "features": { + "futex": { + "description": "Default feature. Enables use of futex." + }, "jit": { "description": "Default feature. Enables jit pipeline compilation. Not supported for ARM and UWP." }, diff --git a/versions/b-/blend2d.json b/versions/b-/blend2d.json index 7c62a93d4e4ea8..280aafcce37456 100644 --- a/versions/b-/blend2d.json +++ b/versions/b-/blend2d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ceedb664deed987cc4e4493554ae3aa58088f08c", + "version-date": "2022-02-19", + "port-version": 0 + }, { "git-tree": "401153e8f3407e68e96c4ea60f8c71c633b08e1d", "version-date": "2021-03-17", diff --git a/versions/baseline.json b/versions/baseline.json index d70eb3f1f7a15e..ae3fad6e6dc38f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -493,8 +493,8 @@ "port-version": 2 }, "blend2d": { - "baseline": "2021-03-17", - "port-version": 1 + "baseline": "2022-02-19", + "port-version": 0 }, "blitz": { "baseline": "2020-03-25", From 5bf1323378a2f10a368a50a3e19b964f23ba94be Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 5 Apr 2022 20:21:01 +0200 Subject: [PATCH 129/217] [vcpkg-get-python-packages] add helper to manage python and pip (#23089) * add vcpkg-get-python-packages * version stuff * use vcpkg_execute_required_process * use function in mesa. * version stuff * fix the last call which needs to use vcpkg_execute_in_download_mode * version update * set WORKING_DIRECTORY * version stuff * use include_guard; remove HEAD_REF * version stuff * Apply suggestions from code review Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * fine tuning after CR * version stuff * add "supports": "native" * version stuff * remove message since vcpkg will tell you that it is unsupported * version stuff * make sure we only do stuff on windows hosts. * version stuff Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: Alexander Neumann --- ports/mesa/portfile.cmake | 54 +------------- ports/mesa/vcpkg.json | 7 +- ports/vcpkg-get-python-packages/README.md | 6 ++ ports/vcpkg-get-python-packages/copyright | 23 ++++++ .../vcpkg-get-python-packages/portfile.cmake | 7 ++ .../vcpkg-port-config.cmake | 1 + ports/vcpkg-get-python-packages/vcpkg.json | 6 ++ .../x_vcpkg_get_python_packages.cmake | 70 +++++++++++++++++++ versions/baseline.json | 6 +- versions/m-/mesa.json | 5 ++ versions/v-/vcpkg-get-python-packages.json | 9 +++ 11 files changed, 139 insertions(+), 55 deletions(-) create mode 100644 ports/vcpkg-get-python-packages/README.md create mode 100644 ports/vcpkg-get-python-packages/copyright create mode 100644 ports/vcpkg-get-python-packages/portfile.cmake create mode 100644 ports/vcpkg-get-python-packages/vcpkg-port-config.cmake create mode 100644 ports/vcpkg-get-python-packages/vcpkg.json create mode 100644 ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake create mode 100644 versions/v-/vcpkg-get-python-packages.json diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index f0277f0b924d0f..5fa919888dacef 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -36,59 +36,7 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") set(ENV{PYTHON} "${PYTHON3}") -function(vcpkg_get_python_package PYTHON_DIR ) - cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") - - if(NOT _vgpp_PYTHON_EXECUTABLE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") - endif() - if(NOT _vgpp_PACKAGES) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") - endif() - if(NOT _vgpp_PYTHON_DIR) - get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) - endif() - - if (WIN32) - set(PYTHON_OPTION "") - else() - set(PYTHON_OPTION "--user") - endif() - - if("${_vgpp_PYTHON_DIR}" MATCHES "${DOWNLOADS}") # inside vcpkg - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() - else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() - endif() - if(NOT VCPKG_TARGET_IS_WINDOWS) - execute_process(COMMAND pip3 install ${_vgpp_PACKAGES}) - endif() - else() # outside vcpkg - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND ${_vgpp_PYTHON_EXECUTABLE} -c "import ${_package}" RESULT_VARIABLE HAS_ERROR) - if(HAS_ERROR) - message(FATAL_ERROR "Python package '${_package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${_vgpp_PACKAGES}") - endif() - endforeach() - endif() -endfunction() - -vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES setuptools mako) +x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES setuptools mako) vcpkg_find_acquire_program(FLEX) get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 31d79225cf2bd2..8643b1e8823539 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,11 +1,16 @@ { "name": "mesa", "version": "21.2.5", - "port-version": 2, + "port-version": 3, "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", + "license": "MIT AND BSL-1.0 AND SGI-B-2.0", "supports": "!(windows & arm)", "dependencies": [ + { + "name": "vcpkg-get-python-packages", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/ports/vcpkg-get-python-packages/README.md b/ports/vcpkg-get-python-packages/README.md new file mode 100644 index 00000000000000..8061d05d92730b --- /dev/null +++ b/ports/vcpkg-get-python-packages/README.md @@ -0,0 +1,6 @@ +# vcpkg-get-python-packages + +**Experimental: will change or be removed at any time** + +`vcpkg-get-python-packages` provides `x_vcpkg_get_python_packages()`, a function which simplifies getting +python packages. diff --git a/ports/vcpkg-get-python-packages/copyright b/ports/vcpkg-get-python-packages/copyright new file mode 100644 index 00000000000000..2e4eac8264fa4c --- /dev/null +++ b/ports/vcpkg-get-python-packages/copyright @@ -0,0 +1,23 @@ +Copyright (c) Microsoft Corporation + +All rights reserved. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/ports/vcpkg-get-python-packages/portfile.cmake b/ports/vcpkg-get-python-packages/portfile.cmake new file mode 100644 index 00000000000000..7df06a5bc67337 --- /dev/null +++ b/ports/vcpkg-get-python-packages/portfile.cmake @@ -0,0 +1,7 @@ +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" + "${CMAKE_CURRENT_LIST_DIR}/copyright" + "${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake b/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..a061a712883843 --- /dev/null +++ b/ports/vcpkg-get-python-packages/vcpkg-port-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake") diff --git a/ports/vcpkg-get-python-packages/vcpkg.json b/ports/vcpkg-get-python-packages/vcpkg.json new file mode 100644 index 00000000000000..36e86bb1b330b2 --- /dev/null +++ b/ports/vcpkg-get-python-packages/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vcpkg-get-python-packages", + "version-date": "2022-02-12", + "license": "MIT", + "supports": "native" +} diff --git a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake new file mode 100644 index 00000000000000..c13019651e6a41 --- /dev/null +++ b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake @@ -0,0 +1,70 @@ +#[===[.md: +# x_vcpkg_get_python_packages + +Experimental +Retrieve needed python packages + +## Usage +```cmake +x_vcpkg_get_python_packages( + PYTHON_EXECUTABLE + PACKAGES ... +) +``` +## Parameters + +### PYTHON_EXECUTABLE +Full path to the python executable + +### PACKAGES +List of python packages to acquire + +#]===] +include_guard(GLOBAL) + +function(x_vcpkg_get_python_packages) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "PYTHON_EXECUTABLE" "PACKAGES") + + if(NOT DEFINED arg_PYTHON_EXECUTABLE) + message(FATAL_ERROR "PYTHON_EXECUTABLE must be specified.") + endif() + if(NOT DEFINED arg_PACKAGES) + message(FATAL_ERROR "PACKAGES must be specified.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + get_filename_component(python_dir "${arg_PYTHON_EXECUTABLE}" DIRECTORY) + + if("${python_dir}" MATCHES "(${DOWNLOADS}|${CURRENT_HOST_INSTALLED_DIR})" AND CMAKE_HOST_WIN32) # inside vcpkg and windows host. + if(NOT EXISTS "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") + if(NOT EXISTS "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_from_github( + OUT_SOURCE_PATH PYFILE_PATH + REPO pypa/get-pip + REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 + SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a + ) + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}") + endif() + foreach(_package IN LISTS arg_PACKAGES) + vcpkg_execute_required_process(COMMAND "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}") + endforeach() + else() + foreach(_package IN LISTS arg_PACKAGES) + vcpkg_execute_required_process(COMMAND "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}") + endforeach() + endif() + else() # outside vcpkg + foreach(package IN LISTS arg_PACKAGES) + vcpkg_execute_in_download_mode(COMMAND ${arg_PYTHON_EXECUTABLE} -c "import ${package}" RESULT_VARIABLE HAS_ERROR) + if(HAS_ERROR) + message(FATAL_ERROR "Python package '${package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${arg_PACKAGES}") + endif() + endforeach() + endif() +endfunction() diff --git a/versions/baseline.json b/versions/baseline.json index ae3fad6e6dc38f..b5732b29213d4d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4430,7 +4430,7 @@ }, "mesa": { "baseline": "21.2.5", - "port-version": 2 + "port-version": 3 }, "meschach": { "baseline": "1.2b", @@ -7272,6 +7272,10 @@ "baseline": "2022-02-06", "port-version": 0 }, + "vcpkg-get-python-packages": { + "baseline": "2022-02-12", + "port-version": 0 + }, "vcpkg-gfortran": { "baseline": "3", "port-version": 2 diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index f526039cdd9f5c..37187a0e383f88 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa75375f1cc9c3c4697c8fa8df4e647fb60f0125", + "version": "21.2.5", + "port-version": 3 + }, { "git-tree": "60ae9e5d7081930a0e736be1742db18b01a0114b", "version": "21.2.5", diff --git a/versions/v-/vcpkg-get-python-packages.json b/versions/v-/vcpkg-get-python-packages.json new file mode 100644 index 00000000000000..6101d3fc2eccad --- /dev/null +++ b/versions/v-/vcpkg-get-python-packages.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e429a4c957711115ea1b795327843acb05fc8b29", + "version-date": "2022-02-12", + "port-version": 0 + } + ] +} From e79aaaaf3c1b157d29388951b5aa2672defc78b8 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 5 Apr 2022 20:50:48 +0200 Subject: [PATCH 130/217] [CUDA, CUDNN] fix support clause (#23900) * [CUDA, CUDNN] fix support clause * [cuda] use version key * [opencv2] format manifest * fix references * Update vcpkg.json * Update vcpkg.json * Update version database * Update version database. * fix feature descriptions * fix references * add missing licenses * fix references Co-authored-by: Billy Robert O'Neal III --- ports/cuda/vcpkg.json | 7 ++++--- ports/cudnn/vcpkg.json | 5 +++-- ports/opencv2/portfile.cmake | 10 ++-------- ports/opencv2/vcpkg.json | 6 ++++-- ports/opencv3/portfile.cmake | 4 +++- ports/opencv3/vcpkg.json | 2 +- ports/opencv4/portfile.cmake | 4 +++- ports/opencv4/vcpkg.json | 3 ++- versions/baseline.json | 10 +++++----- versions/c-/cuda.json | 5 +++++ versions/c-/cudnn.json | 5 +++++ versions/o-/opencv2.json | 5 +++++ versions/o-/opencv3.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 14 files changed, 52 insertions(+), 24 deletions(-) diff --git a/ports/cuda/vcpkg.json b/ports/cuda/vcpkg.json index e6e874a57ebbe2..61a3ce96ce8540 100644 --- a/ports/cuda/vcpkg.json +++ b/ports/cuda/vcpkg.json @@ -1,8 +1,9 @@ { "name": "cuda", - "version-string": "10.1", - "port-version": 9, + "version": "10.1", + "port-version": 10, "description": "A parallel computing platform and programming model", "homepage": "https://developer.nvidia.com/cuda-toolkit", - "supports": "linux | (!osx & !uwp & !(arm64 & windows))" + "license": null, + "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)" } diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json index 7c52ccc7ac8219..50b47fe7a01878 100644 --- a/ports/cudnn/vcpkg.json +++ b/ports/cudnn/vcpkg.json @@ -1,10 +1,11 @@ { "name": "cudnn", "version": "7.6.5", - "port-version": 4, + "port-version": 5, "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", - "supports": "(windows | linux) & x64", + "license": null, + "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)", "dependencies": [ "cuda" ] diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index d06f17ac1b3f2f..d3eff702b11677 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -6,14 +6,8 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") endif() -if (VCPKG_TARGET_IS_UWP) - # - opengl feature is broken on UWP - # - jasper and openexr are not available on UWP due to missing dependencies - # - opencv2 code itself fails even if previous conditions are avoided - message(FATAL_ERROR "${PORT} doesn't support UWP") -endif() - -set(OPENCV_VERSION "2.4.13.7") +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON OPENCV_VERSION GET "${_contents}" version) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index 0ef359dc38f87d..c5964346e0a8fa 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,9 +1,11 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 9, + "port-version": 10, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", + "license": "BSD-3-Clause", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", @@ -70,7 +72,7 @@ ] }, "gtk": { - "description": "GDCM support for opencv", + "description": "GTK support for opencv", "dependencies": [ "gtk" ] diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 8db4a0ef29a4f5..cae0675f60d770 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -6,7 +6,9 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") endif() -set(OPENCV_VERSION "3.4.16") +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON OPENCV_VERSION GET "${_contents}" version) + set(USE_QT_VERSION "5") vcpkg_from_github( diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index abc32bdfb84ea7..06404f6590d9f0 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.16", - "port-version": 4, + "port-version": 5, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index e01547d3c1259e..6681d667698d2f 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,7 +6,9 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") endif() -set(OPENCV_VERSION "4.5.5") +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON OPENCV_VERSION GET "${_contents}" version) + set(USE_QT_VERSION "5") vcpkg_from_github( diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 4d3ec55d05e08b..bf3293b2734784 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv4", "version": "4.5.5", + "port-version": 1, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -136,7 +137,7 @@ ] }, "gtk": { - "description": "GDCM support for opencv", + "description": "GTK support for opencv", "dependencies": [ "gtk" ] diff --git a/versions/baseline.json b/versions/baseline.json index b5732b29213d4d..64265c9a685ed9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1714,11 +1714,11 @@ }, "cuda": { "baseline": "10.1", - "port-version": 9 + "port-version": 10 }, "cudnn": { "baseline": "7.6.5", - "port-version": 4 + "port-version": 5 }, "cunit": { "baseline": "2.1.3", @@ -5062,15 +5062,15 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 9 + "port-version": 10 }, "opencv3": { "baseline": "3.4.16", - "port-version": 4 + "port-version": 5 }, "opencv4": { "baseline": "4.5.5", - "port-version": 0 + "port-version": 1 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/c-/cuda.json b/versions/c-/cuda.json index 464080212fcb99..878a0c33fb6292 100644 --- a/versions/c-/cuda.json +++ b/versions/c-/cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e8939c3547a570a73098c091da7b9e28f71015c", + "version": "10.1", + "port-version": 10 + }, { "git-tree": "7895738a8a164beddfb53c4c69352b202d8e13e9", "version-string": "10.1", diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index 6e6a6fd9264477..9fa8f53a35d661 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62f2616b19fe2b3b7dbc8a81e190900819f2ba3e", + "version": "7.6.5", + "port-version": 5 + }, { "git-tree": "c23360a6cfba2b5c8962c0c106d165ca31224162", "version": "7.6.5", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index c52b5ccf671079..4d9c219728cd68 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04d0949582f825d8a93c13fe0be0acbe8183073b", + "version": "2.4.13.7", + "port-version": 10 + }, { "git-tree": "e02e468ae088086be3b3579366e0bc4c3c8be6cc", "version": "2.4.13.7", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 9f39b0559ec81a..c767104acaea1e 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55064c574fa80aef66dd85a330f669ba7ad402e9", + "version": "3.4.16", + "port-version": 5 + }, { "git-tree": "7060d481bf3045fdd24aa8ef0d83cf2db3b13a50", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index aa1ddf5aed8d80..63730e2feb0520 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcdd746ffc69d5f3234b67ee17fdd54966c8f5cb", + "version": "4.5.5", + "port-version": 1 + }, { "git-tree": "afed148d21295bf99e8ac657fdb808ed82467871", "version": "4.5.5", From f4e370b9688077e0f21088d12dcefd7f32ca078a Mon Sep 17 00:00:00 2001 From: Chen Yufei Date: Wed, 6 Apr 2022 06:50:35 +0800 Subject: [PATCH 131/217] [librdkafka] fix find_dependency LZ4. (#23815) * [librdkafka] fix find_dependency LZ4. Include `FindLZ4.cmake` will result following error message: ``` CMake Warning (dev) at /usr/local/lib/python3.6/dist-packages/cmake/data/share/cmake-3.22/Modules/FindPackageHandleStandardArgs.cmake:438 (message): The package name passed to `find_package_handle_standard_args` (LZ4) does not match the name of the calling package (RdKafka). This can lead to problems in calling code that expects `find_package` result variables (e.g., `_FOUND`) to follow a certain pattern. ``` * [librdkafka] update port-version. * Prepend and restore cmake module path. * Update version database * Update ports/librdkafka/portfile.cmake * use the lz4 config files Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca --- ports/librdkafka/lz4.patch | 28 ++++++++++++++++++++++++++++ ports/librdkafka/portfile.cmake | 10 +--------- ports/librdkafka/vcpkg.json | 9 ++------- versions/baseline.json | 2 +- versions/l-/librdkafka.json | 5 +++++ 5 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 ports/librdkafka/lz4.patch diff --git a/ports/librdkafka/lz4.patch b/ports/librdkafka/lz4.patch new file mode 100644 index 00000000000000..a4cd7a93d0dafe --- /dev/null +++ b/ports/librdkafka/lz4.patch @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,7 +152,7 @@ # LZ4 { + option(ENABLE_LZ4_EXT "Enable external LZ4 library support" ON) + set(WITH_LZ4_EXT OFF) +-if(ENABLE_LZ4_EXT) +- find_package(LZ4) +- if(LZ4_FOUND) ++if(1) ++ find_package(lz4 CONFIG REQUIRED) ++ if(1) + set(WITH_LZ4_EXT ON) + list(APPEND BUILT_WITH "LZ4_EXT") +@@ -248,4 +248,4 @@ # LZ4 { + install( +- FILES "${project_config}" "${project_version}" "packaging/cmake/Modules/FindLZ4.cmake" ++ FILES "${project_config}" "${project_version}" + DESTINATION "${config_install_dir}" + ) + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -241,4 +241,3 @@ + if(WITH_LZ4_EXT) +- target_include_directories(rdkafka PRIVATE ${LZ4_INCLUDE_DIRS}) +- target_link_libraries(rdkafka PUBLIC LZ4::LZ4) ++ target_link_libraries(rdkafka PUBLIC lz4::lz4) + endif() diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index 0ef9d5b7e0db61..27dee9a2752010 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -4,13 +4,13 @@ vcpkg_from_github( REF v1.8.2 SHA512 8c8ae291129b78e3b8367307ad1b1715af1438cd76d7160d64d13a58adf84c7c9f51efeba4656f55e101c25e4cb744db0d8bb5c01a2decb229e4567d16bdcb22 HEAD_REF master + PATCHES lz4.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - lz4 ENABLE_LZ4_EXT ssl WITH_SSL zlib WITH_ZLIB zstd WITH_ZSTD @@ -48,14 +48,6 @@ vcpkg_cmake_config_fixup( CONFIG_PATH lib/cmake/RdKafka ) -if("lz4" IN_LIST FEATURES) - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/share/rdkafka/RdKafkaConfig.cmake" - "find_dependency(LZ4)" - "include(\"\${CMAKE_CURRENT_LIST_DIR}/FindLZ4.cmake\")\n find_dependency(LZ4)" - ) -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index 4af84c47e98c79..8ab425445c515a 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,12 +1,13 @@ { "name": "librdkafka", "version": "1.8.2", - "port-version": 1, + "port-version": 2, "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", "license": null, "supports": "!uwp", "dependencies": [ + "lz4", { "name": "vcpkg-cmake", "host": true @@ -17,12 +18,6 @@ } ], "features": { - "lz4": { - "description": "Enable external LZ4 library support", - "dependencies": [ - "lz4" - ] - }, "snappy": { "description": "Build with snappy" }, diff --git a/versions/baseline.json b/versions/baseline.json index 64265c9a685ed9..f340d9b478256f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3910,7 +3910,7 @@ }, "librdkafka": { "baseline": "1.8.2", - "port-version": 1 + "port-version": 2 }, "libressl": { "baseline": "3.4.2", diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index 5f65dbef337b90..ff08e20cbdf18b 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0583e5dcb6a79a29685250e2b43ca1cd2a798d96", + "version": "1.8.2", + "port-version": 2 + }, { "git-tree": "2f7a6da2edf664e544914466d1cc8994d1ea475a", "version": "1.8.2", From 89295c9fe22e97ca9e380a6c771ccf2ff09dca95 Mon Sep 17 00:00:00 2001 From: Victor Vazquez Date: Tue, 5 Apr 2022 18:16:54 -0700 Subject: [PATCH 132/217] [Azure SDK Attestation] Apr 2022 release - First beta port (#23996) * adding azure sdk attestation beta * fix version * format * sha --- .../portfile.cmake | 19 ++++++++++++ .../azure-security-attestation-cpp/vcpkg.json | 29 +++++++++++++++++++ .../a-/azure-security-attestation-cpp.json | 9 ++++++ versions/baseline.json | 4 +++ 4 files changed, 61 insertions(+) create mode 100644 ports/azure-security-attestation-cpp/portfile.cmake create mode 100644 ports/azure-security-attestation-cpp/vcpkg.json create mode 100644 versions/a-/azure-security-attestation-cpp.json diff --git a/ports/azure-security-attestation-cpp/portfile.cmake b/ports/azure-security-attestation-cpp/portfile.cmake new file mode 100644 index 00000000000000..c6406d6e9b5a84 --- /dev/null +++ b/ports/azure-security-attestation-cpp/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-security-attestation_1.0.0-beta.1 + SHA512 bb408ffa209c6d6416836296472f391d3418d6768f74d3fcf7962f93a991319f4f53b8588b2e82b2b366c060ad71cd1a2ad4a5515f19db97e5e5ef4bd222b926 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/attestation/azure-security-attestation/ + OPTIONS + ${FEATURE_OPTIONS} + -DWARNINGS_AS_ERRORS=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-security-attestation-cpp/vcpkg.json b/ports/azure-security-attestation-cpp/vcpkg.json new file mode 100644 index 00000000000000..34c912c60d9877 --- /dev/null +++ b/ports/azure-security-attestation-cpp/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "azure-security-attestation-cpp", + "version-semver": "1.0.0-beta.1", + "description": [ + "Microsoft Azure Attestation Service SDK for C++", + "This library provides API access to the Microsoft Azure Attestation service." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/attestation/azure-security-attestation", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.5.0" + }, + { + "name": "openssl", + "version>=": "1.1.1n" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/azure-security-attestation-cpp.json b/versions/a-/azure-security-attestation-cpp.json new file mode 100644 index 00000000000000..697ef92ba57801 --- /dev/null +++ b/versions/a-/azure-security-attestation-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9b6b2e71b9d94791a1481a40367fc5ec5607b8aa", + "version-semver": "1.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f340d9b478256f..b512beb0c5cc34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -336,6 +336,10 @@ "baseline": "2022-01-21", "port-version": 0 }, + "azure-security-attestation-cpp": { + "baseline": "1.0.0-beta.1", + "port-version": 0 + }, "azure-security-keyvault-certificates-cpp": { "baseline": "4.0.0-beta.2", "port-version": 0 From 407bc79b391a8e30866c95294babca5b111f6006 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:04:46 +0200 Subject: [PATCH 133/217] [openssl] update to 3.0.2 (#22878) * Create package openssl3 * Create package openssl3 * Delete openssl3 * update version to 3.0.1 * Delete openssl3 * Update manifests to 3.0.1 * Fix download url * Update port version * Update version * Remove wrong port version * Fix errors * Fix license * Remove empty folders * Fix post-build errors * Add license field * Fix cmake for uwp * Remove patch file * format manifest * Update version file * Fix port version * version * Test: remove vcvarsall * version * fix version * version * Fix docs in cmake files as well * wrong branch * Add port openssl-1 * Fix directories * delete openssl-1 * [openssl-1] Add port * version * Fix UWP build * version * migrate uthenticode * version * Fix UWP build for librabbitmq * version * Fix UWP warnings * version * Fix patch * version * Disable C4996 on UWP * version * [idevicerestore] disable C4996 * remove warning fixes * Revert uthenticode * Final newlines * version * Remove winsock replace * version * [libwebsockets] Disable /WX on Windows * version * Typo * version * Disable C4996 in patch instead * version * [luasec] Use openssl-1 * version * revert luasec * migrate luasec * version * revert winsock * version * revert winsock * version * revert revert * version * Fix platform for luasec * Fix supports * version * . * version * uthenticode * libmysql * azure-c-shared-utility * version * remove azure-c-shared-utility * revert all * uthenticode * version * azure * version * libmysql * version * remove mysql * [libdatachannel] disable warnings on UWP * version * Fix patches * version * Add openssl-1 to CI baseline * openssl-1: check if copyright exists * version * revert azure * [libssh2] disable c4996 * version * [aws-sdk-cpp] -Wno-deprecated * version * fix aws patch * version * fix aws patch * version * [qpid-proton] disable warning * version * Fix patch * version * [librtmp] disable c4996 * version * [libu2f-server] disablec4996 * switch version scheme * version * [idevicerestore] disable c4996 * version * typo * version * fix cmake * version * fix cmake again * version * [uthenticode] patch to support Openssl 3 * version * fix idevicerestore * version * search for conflicting copyrights * version * Fix luasec * fix version * version * fix azure * version * Remove debug stuff * version * [open62541] patch * update port version * version * [libmysql] patch * version * Fix patch * version * Format openssl * Format openssl portfiles * Check for conflicting copyrights * Fix typo * Rename openssl-1 to openssl1 * Rename openssl-1 to openssl1 * version * Update ci baseline * version * resolve conflicting port versions * version * apply latest openssl security fix * version * Fix qpid-proton * version * retrigger Bbuild of qtbase * version * revert qtbase * Remove openssl1 * version * version * fix openssl_version_fix Co-authored-by: nicole mazzuca --- ports/aws-sdk-cpp/fix-openssl3.patch | 13 ++ ports/aws-sdk-cpp/portfile.cmake | 1 + ports/aws-sdk-cpp/vcpkg.json | 1 + ports/azure-c-shared-utility/openssl.patch | 13 ++ ports/azure-c-shared-utility/portfile.cmake | 1 + ports/azure-c-shared-utility/vcpkg.json | 2 +- .../{libcurl_d.patch => fix-vcxproj.patch} | 31 +++- ports/idevicerestore/portfile.cmake | 2 +- ports/idevicerestore/vcpkg.json | 4 +- ports/libdatachannel/portfile.cmake | 10 +- ports/libdatachannel/uwp-warnings.patch | 14 ++ ports/libdatachannel/vcpkg.json | 1 + ports/libmysql/openssl.patch | 125 +++++++++++++ ports/libmysql/portfile.cmake | 1 + ports/libmysql/vcpkg.json | 2 +- ports/librabbitmq/fix-uwpwarning.patch | 19 +- ports/librabbitmq/vcpkg.json | 1 + ports/librtmp/CMakeLists.txt | 1 + ports/librtmp/vcpkg.json | 2 +- ports/libssh2/0003-fix-openssl3.patch | 13 ++ ports/libssh2/portfile.cmake | 1 + ports/libssh2/vcpkg.json | 2 +- ports/libu2f-server/CMakeLists.txt | 1 + ports/libu2f-server/vcpkg.json | 4 +- ports/libwebsockets/fix-build-error.patch | 2 +- ports/libwebsockets/vcpkg.json | 2 +- ports/luasec/vcpkg.json | 2 + ports/open62541/openssl.patch | 22 +++ ports/open62541/portfile.cmake | 2 + ports/open62541/vcpkg.json | 1 + ports/openssl/portfile.cmake | 9 +- ports/openssl/unix/portfile.cmake | 12 +- ports/openssl/uwp/EnableUWPSupport.patch | 170 ------------------ ports/openssl/uwp/portfile.cmake | 9 +- ports/openssl/vcpkg-cmake-wrapper.cmake.in | 4 + ports/openssl/vcpkg.json | 3 +- ports/openssl/windows/portfile.cmake | 28 ++- ports/qpid-proton/fix-openssl3.patch | 22 +++ ports/qpid-proton/portfile.cmake | 2 + ports/qpid-proton/vcpkg.json | 2 +- ports/uthenticode/openssl.patch | 72 ++++++++ ports/uthenticode/portfile.cmake | 2 + ports/uthenticode/vcpkg.json | 2 +- versions/a-/aws-sdk-cpp.json | 5 + versions/a-/azure-c-shared-utility.json | 5 + versions/baseline.json | 32 ++-- versions/i-/idevicerestore.json | 5 + versions/l-/libdatachannel.json | 5 + versions/l-/libmysql.json | 5 + versions/l-/librabbitmq.json | 5 + versions/l-/librtmp.json | 5 + versions/l-/libssh2.json | 5 + versions/l-/libu2f-server.json | 5 + versions/l-/libwebsockets.json | 5 + versions/l-/luasec.json | 5 + versions/o-/open62541.json | 5 + versions/o-/openssl.json | 5 + versions/q-/qpid-proton.json | 5 + versions/u-/uthenticode.json | 5 + 59 files changed, 506 insertions(+), 234 deletions(-) create mode 100644 ports/aws-sdk-cpp/fix-openssl3.patch create mode 100644 ports/azure-c-shared-utility/openssl.patch rename ports/idevicerestore/{libcurl_d.patch => fix-vcxproj.patch} (58%) create mode 100644 ports/libdatachannel/uwp-warnings.patch create mode 100644 ports/libmysql/openssl.patch create mode 100644 ports/libssh2/0003-fix-openssl3.patch create mode 100644 ports/open62541/openssl.patch delete mode 100644 ports/openssl/uwp/EnableUWPSupport.patch create mode 100644 ports/qpid-proton/fix-openssl3.patch create mode 100644 ports/uthenticode/openssl.patch diff --git a/ports/aws-sdk-cpp/fix-openssl3.patch b/ports/aws-sdk-cpp/fix-openssl3.patch new file mode 100644 index 00000000000000..bd79678924cfa8 --- /dev/null +++ b/ports/aws-sdk-cpp/fix-openssl3.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake +index cae5b92248..1aa728b01c 100644 +--- a/cmake/compiler_settings.cmake ++++ b/cmake/compiler_settings.cmake +@@ -53,7 +53,7 @@ macro(set_gcc_flags) + endmacro() + + macro(set_gcc_warnings) +- list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra") ++ list(APPEND AWS_COMPILER_WARNINGS "-Wno-deprecated-declarations" "-Wall" "-Werror" "-pedantic" "-Wextra") + if(COMPILER_CLANG) + if(PLATFORM_ANDROID) + # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning. diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index b520a17ae3a474..35873a4c925749 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( PATCHES patch-relocatable-rpath.patch fix-aws-root.patch + fix-openssl3.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 5f1abf964fabd9..7931c10a5f8734 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.9.220", + "port-version": 1, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "supports": "!(windows & arm) & !uwp", diff --git a/ports/azure-c-shared-utility/openssl.patch b/ports/azure-c-shared-utility/openssl.patch new file mode 100644 index 00000000000000..bdf46dd1d981e7 --- /dev/null +++ b/ports/azure-c-shared-utility/openssl.patch @@ -0,0 +1,13 @@ +diff --git a/adapters/x509_openssl.c b/adapters/x509_openssl.c +index 5a9e5ac2..bb946c2d 100644 +--- a/adapters/x509_openssl.c ++++ b/adapters/x509_openssl.c +@@ -75,7 +75,7 @@ static int load_certificate_chain(SSL_CTX* ssl_ctx, const char* certificate) + // certificates. + + /* Codes_SRS_X509_OPENSSL_07_006: [ If successful x509_openssl_add_ecc_credentials shall to import each certificate in the cert chain. ] */ +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) + SSL_CTX_clear_extra_chain_certs(ssl_ctx); + #else + if (ssl_ctx->extra_certs != NULL) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 674f6156faa709..5b9a85d1a9606e 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -21,6 +21,7 @@ else() SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd HEAD_REF master PATCHES + openssl.patch fix-install-location.patch fix-utilityFunctions-conditions.patch disable-error.patch diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index 547d08ee976b41..f5f3c1abd2998b 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-c-shared-utility", "version-date": "2022-01-21", - "port-version": 2, + "port-version": 3, "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", "license": "MIT", diff --git a/ports/idevicerestore/libcurl_d.patch b/ports/idevicerestore/fix-vcxproj.patch similarity index 58% rename from ports/idevicerestore/libcurl_d.patch rename to ports/idevicerestore/fix-vcxproj.patch index 1d9d3f3d7eb573..79ff322b30ad64 100644 --- a/ports/idevicerestore/libcurl_d.patch +++ b/ports/idevicerestore/fix-vcxproj.patch @@ -1,9 +1,12 @@ diff --git a/idevicerestore.vcxproj b/idevicerestore.vcxproj -index fa209fae..cf89306b 100644 +index fa209fa..6afa088 100644 --- a/idevicerestore.vcxproj -+++ b/idevicerestore.vcxproj -@@ -94,7 +94,7 @@ ++++ b/idevicerestore.vcxproj +@@ -92,9 +92,10 @@ + Disabled + true _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies) @@ -11,8 +14,11 @@ index fa209fae..cf89306b 100644 -@@ -105,7 +105,7 @@ +@@ -103,9 +104,10 @@ + Disabled + true _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Ws2_32.lib;libcurl.lib;%(AdditionalDependencies) @@ -20,4 +26,19 @@ index fa209fae..cf89306b 100644 - +@@ -116,6 +118,7 @@ + true + true + _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 + + + true +@@ -131,6 +134,7 @@ + true + true + _MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_WINSOCK_DEPRECATED_NO_WARNINGS ++ 4996 + + + true diff --git a/ports/idevicerestore/portfile.cmake b/ports/idevicerestore/portfile.cmake index 23202a2a4c5eb0..0bc503cea4629a 100644 --- a/ports/idevicerestore/portfile.cmake +++ b/ports/idevicerestore/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( SHA512 ba623be56c2f37853516d7d4c32e16f1ec72f33d512f18aa812ce6830af4b9e389f7af5321888dd0ddd168e282b652e379b60f90970680e213eabf489f406915 HEAD_REF msvc-master PATCHES - libcurl_d.patch + fix-vcxproj.patch fix-libgen.h-cannot-be-found.patch ) diff --git a/ports/idevicerestore/vcpkg.json b/ports/idevicerestore/vcpkg.json index 1ca1202bc2ead4..056ccaf123a48a 100644 --- a/ports/idevicerestore/vcpkg.json +++ b/ports/idevicerestore/vcpkg.json @@ -1,7 +1,7 @@ { "name": "idevicerestore", - "version-string": "1.0.12", - "port-version": 6, + "version": "1.0.12", + "port-version": 7, "description": "Restore/upgrade firmware of iOS devices", "supports": "windows", "dependencies": [ diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 4f6c398e2df201..b41e17cc50d0f9 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -1,3 +1,9 @@ +set(PATCHES 0001-fix-for-vcpkg.patch) + +if(VCPKG_TARGET_IS_UWP) + list(APPEND PATCHES uwp-warnings.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel @@ -5,7 +11,7 @@ vcpkg_from_github( SHA512 ef7d1f652af031c13260a4c436c949eb566d40d15dcde5b56ab782e9e9d7b5e287f4a6a61bc4eb3fcdbb835c102637b0368f3c43af6f9fa9c87cd99d15bde454 HEAD_REF master PATCHES - 0001-fix-for-vcpkg.patch + ${PATCHES} ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -40,4 +46,4 @@ ${DATACHANNEL_CONFIG}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libdatachannel/uwp-warnings.patch b/ports/libdatachannel/uwp-warnings.patch new file mode 100644 index 00000000000000..023bf888e1bd07 --- /dev/null +++ b/ports/libdatachannel/uwp-warnings.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b79b458..790bf95 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -385,6 +385,9 @@ if(WARNINGS_AS_ERRORS) + endif() + endif() + ++target_compile_options(datachannel PRIVATE /wd4996) ++target_compile_options(datachannel-static PRIVATE /wd4996) ++ + install(TARGETS datachannel EXPORT LibDataChannelTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 464798d98405ac..3f67b93a43188b 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdatachannel", "version-semver": "0.16.4", + "port-version": 1, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "dependencies": [ diff --git a/ports/libmysql/openssl.patch b/ports/libmysql/openssl.patch new file mode 100644 index 00000000000000..3abbcf98f17e8a --- /dev/null +++ b/ports/libmysql/openssl.patch @@ -0,0 +1,125 @@ +diff --git a/mysys/my_md5.cc b/mysys/my_md5.cc +index dea997b252c..81484f0652b 100644 +--- a/mysys/my_md5.cc ++++ b/mysys/my_md5.cc +@@ -35,6 +35,10 @@ + #include + #include + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#include ++#endif ++ + static void my_md5_hash(unsigned char *digest, unsigned const char *buf, + int len) { + MD5_CTX ctx; +@@ -56,7 +60,11 @@ static void my_md5_hash(unsigned char *digest, unsigned const char *buf, + int compute_md5_hash(char *digest, const char *buf, int len) { + int retval = 0; + int fips_mode = 0; ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + fips_mode = FIPS_mode(); ++ #else ++ fips_mode = EVP_default_properties_is_fips_enabled(NULL); ++ #endif + /* If fips mode is ON/STRICT restricted method calls will result into abort, + * skipping call. */ + if (fips_mode == 0) { +diff --git a/plugin/x/client/xconnection_impl.cc b/plugin/x/client/xconnection_impl.cc +index 13bc6794ea5..8752bcea9bf 100644 +--- a/plugin/x/client/xconnection_impl.cc ++++ b/plugin/x/client/xconnection_impl.cc +@@ -51,6 +51,10 @@ + #include "plugin/x/src/config/config.h" + #include "sql-common/net_ns.h" + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#include ++#endif ++ + #ifndef WIN32 + #include + #include +@@ -524,12 +528,20 @@ int set_fips_mode(const uint32_t fips_mode, + if (fips_mode > 2) { + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + fips_mode_old = FIPS_mode(); ++ #else ++ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); ++ #endif + if (fips_mode_old == fips_mode) { + rc = 1; + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + if (!(rc = FIPS_mode_set(fips_mode))) { ++ #else ++ if (!(rc = EVP_default_properties_enable_fips(fips_mode))) { ++ #endif + err_library = ERR_get_error(); + ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); + err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; +diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc +index 6c04029ccb0..164b727e3dc 100644 +--- a/vio/viosslfactories.cc ++++ b/vio/viosslfactories.cc +@@ -40,6 +40,10 @@ + + #include + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#include ++#endif ++ + #if OPENSSL_VERSION_NUMBER < 0x10002000L + #include + #endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */ +@@ -498,12 +502,20 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { + if (fips_mode > 2) { + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + fips_mode_old = FIPS_mode(); ++ #else ++ fips_mode_old = EVP_default_properties_is_fips_enabled(NULL); ++ #endif + if (fips_mode_old == fips_mode) { + rc = 1; + goto EXIT; + } ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + if (!(rc = FIPS_mode_set(fips_mode))) { ++ #else ++ if (!(rc = EVP_default_properties_enable_fips(NULL, fips_mode))) { ++ #endif + /* + If OS doesn't have FIPS enabled openssl library and user sets FIPS mode + ON, It fails with proper error. But in the same time it doesn't allow to +@@ -511,7 +523,11 @@ int set_fips_mode(const uint fips_mode, char err_string[OPENSSL_ERROR_LENGTH]) { + error, setting old working FIPS mode value in the OpenSSL library. It will + allow successful cryptographic operation and will not abort the server. + */ ++ #if OPENSSL_VERSION_NUMBER < 0x30000000L + FIPS_mode_set(fips_mode_old); ++ #else ++ EVP_default_properties_enable_fips(NULL, fips_mode_old); ++ #endif + err_library = ERR_get_error(); + ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1); + err_string[OPENSSL_ERROR_LENGTH - 1] = '\0'; +@@ -525,7 +541,13 @@ EXIT: + + @returns openssl current fips mode + */ ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + uint get_fips_mode() { return FIPS_mode(); } ++#else ++uint get_fips_mode() { ++ return EVP_default_properties_is_fips_enabled(NULL); ++} ++#endif + + long process_tls_version(const char *tls_version) { + const char *separator = ","; diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 525a995ee80232..5e331113133827 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( rename-version.patch export-cmake-targets.patch 004-added-limits-include.patch + openssl.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0") diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index 91fc043d171c1d..56880427eabe88 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmysql", "version": "8.0.20", - "port-version": 5, + "port-version": 6, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "supports": "!(windows & x86) & !uwp", diff --git a/ports/librabbitmq/fix-uwpwarning.patch b/ports/librabbitmq/fix-uwpwarning.patch index 89614597000aa0..97b1a3de45f153 100644 --- a/ports/librabbitmq/fix-uwpwarning.patch +++ b/ports/librabbitmq/fix-uwpwarning.patch @@ -1,8 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b353be6..419e983 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,6 +150,10 @@ else() + endif() + endif() + ++if(MSVC) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") ++endif() ++ + option(REGENERATE_AMQP_FRAMING "Regenerate amqp_framing.h/amqp_framing.c sources (for developer use)" OFF) + mark_as_advanced(REGENERATE_AMQP_FRAMING) + diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt -index bd5369a..f6d703f 100644 +index d8dcd26..671840b 100644 --- a/librabbitmq/CMakeLists.txt +++ b/librabbitmq/CMakeLists.txt -@@ -113,7 +113,7 @@ set(RABBITMQ_SOURCES +@@ -108,7 +108,7 @@ set(RABBITMQ_SOURCES ${AMQP_SSL_SRCS} ) diff --git a/ports/librabbitmq/vcpkg.json b/ports/librabbitmq/vcpkg.json index 5204424d5d99de..9e8a333212428f 100644 --- a/ports/librabbitmq/vcpkg.json +++ b/ports/librabbitmq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "librabbitmq", "version": "0.11.0", + "port-version": 1, "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.", "homepage": "https://github.com/alanxz/rabbitmq-c", "dependencies": [ diff --git a/ports/librtmp/CMakeLists.txt b/ports/librtmp/CMakeLists.txt index 9751f3d735212b..c9f77f16bbf63d 100644 --- a/ports/librtmp/CMakeLists.txt +++ b/ports/librtmp/CMakeLists.txt @@ -40,6 +40,7 @@ set(SRCS librtmp/amf.c if(MSVC) set(SRCS_MSVC "librtmp/librtmp.def") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") endif() add_library(librtmp ${SRCS} ${HEADERS} ${SRCS_MSVC}) diff --git a/ports/librtmp/vcpkg.json b/ports/librtmp/vcpkg.json index f917042067e214..90a297315348f6 100644 --- a/ports/librtmp/vcpkg.json +++ b/ports/librtmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librtmp", "version-date": "2019-11-11", - "port-version": 2, + "port-version": 3, "description": "RTMPDump Real-Time Messaging Protocol API", "homepage": "https://rtmpdump.mplayerhq.hu", "dependencies": [ diff --git a/ports/libssh2/0003-fix-openssl3.patch b/ports/libssh2/0003-fix-openssl3.patch new file mode 100644 index 00000000000000..71aa61827c5fa4 --- /dev/null +++ b/ports/libssh2/0003-fix-openssl3.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/max_warnings.cmake b/cmake/max_warnings.cmake +index b176d30..e986461 100644 +--- a/cmake/max_warnings.cmake ++++ b/cmake/max_warnings.cmake +@@ -13,6 +13,8 @@ if(MSVC) + + # Disable broken warnings + add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") + elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 71722356e5296b..d81f25812987fe 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES 0001-Fix-UWP.patch 0002-fix-macros.patch + 0003-fix-openssl3.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index 9c3d2806601c33..157bf7243c553e 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libssh2", "version": "1.10.0", - "port-version": 3, + "port-version": 4, "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", "license": "BSD-3-Clause", diff --git a/ports/libu2f-server/CMakeLists.txt b/ports/libu2f-server/CMakeLists.txt index 5e1f50e521ee46..8bff872434f4d3 100644 --- a/ports/libu2f-server/CMakeLists.txt +++ b/ports/libu2f-server/CMakeLists.txt @@ -9,6 +9,7 @@ add_library(libu2f-server ${LIBU2F_SERVER_SOURCE}) target_include_directories(libu2f-server PUBLIC $ $) target_compile_definitions(libu2f-server PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") find_package(json-c CONFIG REQUIRED) find_package(OpenSSL REQUIRED) diff --git a/ports/libu2f-server/vcpkg.json b/ports/libu2f-server/vcpkg.json index b66f13cee88369..aade166cbf8043 100644 --- a/ports/libu2f-server/vcpkg.json +++ b/ports/libu2f-server/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libu2f-server", - "version-string": "1.1.0", - "port-version": 3, + "version": "1.1.0", + "port-version": 4, "description": "Yubico Universal 2nd Factor (U2F) Server C Library", "homepage": "https://developers.yubico.com/libu2f-server/", "supports": "(x86 | x64) & windows", diff --git a/ports/libwebsockets/fix-build-error.patch b/ports/libwebsockets/fix-build-error.patch index 0bab319af44428..b8590d21237e1a 100644 --- a/ports/libwebsockets/fix-build-error.patch +++ b/ports/libwebsockets/fix-build-error.patch @@ -19,7 +19,7 @@ index 1e737e5..75534c1 100644 add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) # Fail the build if any warnings - add_compile_options(/W3 /WX) -+ add_compile_options(/W3 /WX /wd4142 /wd4267) ++ add_compile_options(/W3 /WX /wd4142 /wd4267 /wd4996) endif(MSVC) if (MINGW) diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json index f86174727d501c..2e4b9582505e8f 100644 --- a/ports/libwebsockets/vcpkg.json +++ b/ports/libwebsockets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libwebsockets", "version-semver": "4.3.0", - "port-version": 2, + "port-version": 3, "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.", "homepage": "https://github.com/warmcat/libwebsockets", "supports": "!uwp", diff --git a/ports/luasec/vcpkg.json b/ports/luasec/vcpkg.json index 4880e8bfa2a5c1..76d24caaa4455c 100644 --- a/ports/luasec/vcpkg.json +++ b/ports/luasec/vcpkg.json @@ -1,9 +1,11 @@ { "name": "luasec", "version": "1.0.1", + "port-version": 1, "maintainers": "Stephen Baker ", "description": "LuaSec depends on OpenSSL, and integrates with LuaSocket to make it easy to add secure connections to any Lua applications or scripts.", "homepage": "https://github.com/brunoos/luasec", + "supports": "!(windows & static)", "dependencies": [ "lua", "luasocket", diff --git a/ports/open62541/openssl.patch b/ports/open62541/openssl.patch new file mode 100644 index 00000000000000..cc68eb570c38ac --- /dev/null +++ b/ports/open62541/openssl.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9184b943..bd9203f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -526,7 +526,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST + check_add_cc_flag("-Wall") # Warnings + check_add_cc_flag("-Wextra") # More warnings + check_add_cc_flag("-Wpedantic") # Standard compliance +- check_add_cc_flag("-Werror") # All warnings are errors ++ #check_add_cc_flag("-Werror") # All warnings are errors + + check_add_cc_flag("-Wno-static-in-inline") # Clang doesn't like the use of static inline methods inside static inline methods + check_add_cc_flag("-Wno-overlength-strings") # May happen in the nodeset compiler when complex values are directly encoded +@@ -659,7 +659,7 @@ if(APPLE) + endif() + + if(MSVC) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996") # Compiler warnings, error on warning ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3 /WX /w44996 /wd4090") # Compiler warnings, error on warning + + if(UA_MSVC_FORCE_STATIC_CRT AND NOT BUILD_SHARED_LIBS) + set(CompilerFlags CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_C_FLAGS diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index b035be3f521cbc..a7536e7586492c 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF "${VERSION}" SHA512 ffcc697901ec978fb9d1f8996f8a4c5114c98a0ec19206cac95d1a84f8d0fcbe38bf73e88f1df59d53bc6be481102aa2f2a6a0efa29797e7ce11123bd23131c2 HEAD_REF master + PATCHES + openssl.patch ) vcpkg_check_features( diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index a4f545428391a6..59c666d5f570bc 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,6 +1,7 @@ { "name": "open62541", "version": "1.2.3", + "port-version": 1, "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/openssl/portfile.cmake b/ports/openssl/portfile.cmake index e94e7a83f02d38..ff65db49b1460f 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -1,13 +1,14 @@ -if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libressl/copyright" + OR EXISTS "${CURRENT_INSTALLED_DIR}/share/boringssl/copyright") message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") endif() -set(OPENSSL_VERSION 1.1.1n) +set(OPENSSL_VERSION 3.0.2) vcpkg_download_distfile( ARCHIVE - URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz" + URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 1937796736613dcf4105a54e42ecb61f95a1cea74677156f9459aea0f2c95159359e766089632bf364ee6b0d28d661eb9957bce8fecc9d2436378d8d79e8d0a4 + SHA512 f986850d5be908b4d6b5fd7091bc4652d7378c9bccebfbc5becd7753843c04c1eb61a1749c432139d263dfac33df0b1f6c773664b485cad47542266823a4eb03 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake index 7a04ae7c9dc3d1..c1c2b0ecbd940f 100644 --- a/ports/openssl/unix/portfile.cmake +++ b/ports/openssl/unix/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_extract_source_archive_ex( if(CMAKE_HOST_WIN32) vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl) - set(MAKE ${MSYS_ROOT}/usr/bin/make.exe) - set(PERL ${MSYS_ROOT}/usr/bin/perl.exe) + set(MAKE "${MSYS_ROOT}/usr/bin/make.exe") + set(PERL "${MSYS_ROOT}/usr/bin/perl.exe") else() find_program(MAKE make) if(NOT MAKE) @@ -16,7 +16,7 @@ else() endif() vcpkg_cmake_configure( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} + SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" OPTIONS -DSOURCE_PATH=${MASTER_COPY_SOURCE_PATH} -DPERL=${PERL} @@ -27,12 +27,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -file(GLOB HEADERS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/include/openssl/*.h) +file(GLOB HEADERS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/include/openssl/*.h") set(RESOLVED_HEADERS) foreach(HEADER ${HEADERS}) get_filename_component(X "${HEADER}" REALPATH) list(APPEND RESOLVED_HEADERS "${X}") endforeach() -file(INSTALL ${RESOLVED_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/openssl) -file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${RESOLVED_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/openssl") +file(INSTALL "${MASTER_COPY_SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openssl/uwp/EnableUWPSupport.patch b/ports/openssl/uwp/EnableUWPSupport.patch deleted file mode 100644 index fe7837445985cf..00000000000000 --- a/ports/openssl/uwp/EnableUWPSupport.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf -index 3c4299d264..99fcb1f713 100644 ---- a/Configurations/10-main.conf -+++ b/Configurations/10-main.conf -@@ -1287,7 +1287,7 @@ my %targets = ( - }, - "VC-WIN64I" => { - inherit_from => [ "VC-WIN64-common", asm("ia64_asm"), -- sub { $disabled{shared} ? () : "ia64_uplink" } ], -+ sub { $disabled{uplink} ? () : "ia64_uplink" } ], - AS => "ias", - ASFLAGS => "-d debug", - asoutflag => "-o ", -@@ -1299,7 +1299,7 @@ my %targets = ( - }, - "VC-WIN64A" => { - inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), -- sub { $disabled{shared} ? () : "x86_64_uplink" } ], -+ sub { $disabled{uplink} ? () : "x86_64_uplink" } ], - AS => sub { vc_win64a_info()->{AS} }, - ASFLAGS => sub { vc_win64a_info()->{ASFLAGS} }, - asoutflag => sub { vc_win64a_info()->{asoutflag} }, -@@ -1312,7 +1312,7 @@ my %targets = ( - }, - "VC-WIN32" => { - inherit_from => [ "VC-noCE-common", asm("x86_asm"), -- sub { $disabled{shared} ? () : "uplink_common" } ], -+ sub { $disabled{uplink} ? () : "uplink_common" } ], - AS => sub { vc_win32_info()->{AS} }, - ASFLAGS => sub { vc_win32_info()->{ASFLAGS} }, - asoutflag => sub { vc_win32_info()->{asoutflag} }, -@@ -1374,7 +1374,7 @@ my %targets = ( - #### MinGW - "mingw" => { - inherit_from => [ "BASE_unix", asm("x86_asm"), -- sub { $disabled{shared} ? () : "x86_uplink" } ], -+ sub { $disabled{uplink} ? () : "x86_uplink" } ], - CC => "gcc", - CFLAGS => picker(default => "-Wall", - debug => "-g -O0", -diff --git a/Configurations/50-win-onecore.conf b/Configurations/50-win-onecore.conf -index d478f42b0f..e0fb70daca 100644 ---- a/Configurations/50-win-onecore.conf -+++ b/Configurations/50-win-onecore.conf -@@ -1,3 +1,4 @@ -+## -*- mode: perl; -*- - # Windows OneCore targets. - # - # OneCore is new API stability "contract" that transcends Desktop, IoT and -@@ -10,6 +11,25 @@ - # TODO: extend error handling to use ETW based eventing - # (Or rework whole error messaging) - -+my $UWP_info = {}; -+sub UWP_info { -+ unless (%$UWP_info) { -+ my $SDKver = `pwsh.exe -Command \"& {\$(Get-Item \\\"hklm:\\SOFTWARE\\WOW6432Node\\Microsoft\\Microsoft SDKs\\Windows\\\").GetValue(\\\"CurrentVersion\\\")}\"`; -+ $SDKver =~ s|\R$||; -+ my @SDKver_split = split(/\./, $SDKver); -+ # SDK version older than 10.0.17763 don't support our ASM builds -+ if ($SDKver_split[0] < 10 -+ || ($SDKver_split[0] == 10 -+ && $SDKver_split[1] == 0 -+ && $SDKver_split[2] < 17763)) { -+ $UWP_info->{disable} = [ 'asm' ]; -+ } else { -+ $UWP_info->{disable} = [ ]; -+ } -+ } -+ return $UWP_info; -+} -+ - my %targets = ( - "VC-WIN32-ONECORE" => { - inherit_from => [ "VC-WIN32" ], -@@ -61,4 +81,57 @@ my %targets = ( - ex_libs => "onecore.lib", - multilib => "-arm64", - }, -+ -+ # Universal Windows Platform (UWP) App Support -+ -+ # TODO -+ # -+ # The 'disable' attribute should have 'uplink'. -+ # however, these are checked in some 'inherit_from', which is processed -+ # very early, before the 'disable' attributes are seen. -+ # This is a problem that needs to be resolved in Configure first. -+ # -+ # But if you want to build library with Windows 10 Version 1809 SDK or -+ # earlier, the 'disable' attribute should also have 'asm'. -+ -+ "VC-WIN32-UWP" => { -+ inherit_from => [ "VC-WIN32-ONECORE" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => sub { [ 'ui-console', 'stdio', 'async', 'uplink', -+ @{ UWP_info()->{disable} } ] }, -+ ex_libs => "WindowsApp.lib", -+ }, -+ "VC-WIN64A-UWP" => { -+ inherit_from => [ "VC-WIN64A-ONECORE" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => sub { [ 'ui-console', 'stdio', 'async', 'uplink', -+ @{ UWP_info()->{disable} } ] }, -+ ex_libs => "WindowsApp.lib", -+ }, -+ "VC-WIN32-ARM-UWP" => { -+ inherit_from => [ "VC-WIN32-ARM" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => sub { [ 'ui-console', 'stdio', 'async', 'uplink', -+ @{ UWP_info()->{disable} } ] }, -+ ex_libs => "WindowsApp.lib", -+ }, -+ "VC-WIN64-ARM-UWP" => { -+ inherit_from => [ "VC-WIN64-ARM" ], -+ lflags => add("/APPCONTAINER"), -+ defines => add("WINAPI_FAMILY=WINAPI_FAMILY_APP", -+ "_WIN32_WINNT=0x0A00"), -+ dso_scheme => "", -+ disable => sub { [ 'ui-console', 'stdio', 'async', 'uplink', -+ @{ UWP_info()->{disable} } ] }, -+ ex_libs => "WindowsApp.lib", -+ }, - ); -diff --git a/Configure b/Configure -index 5a699836f3..de45f1e299 100755 ---- a/Configure -+++ b/Configure -@@ -407,6 +408,7 @@ my @disablables = ( - "ubsan", - "ui-console", - "unit-test", -+ "uplink", - "whirlpool", - "weak-ssl-ciphers", - "zlib", -@@ -491,8 +493,8 @@ my @disable_cascades = ( - - # Without position independent code, there can be no shared libraries or DSOs - "pic" => [ "shared" ], -- "shared" => [ "dynamic-engine" ], -+ "shared" => [ "dynamic-engine", "uplink" ], - "dso" => [ "dynamic-engine" ], - "engine" => [ "afalgeng", "devcryptoeng" ], - - # no-autoalginit is only useful when building non-shared -diff --git a/INSTALL b/INSTALL -index 2119cbae9e..ee54e8c215 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -560,6 +560,10 @@ - likely to complement configuration command line with - suitable compiler-specific option. - -+ no-uplink -+ Don't build support for UPLINK interface. -+ -+ - no- - Don't build support for negotiating the specified SSL/TLS - protocol (one of ssl, ssl3, tls, tls1, tls1_1, tls1_2, diff --git a/ports/openssl/uwp/portfile.cmake b/ports/openssl/uwp/portfile.cmake index 9414634fe2057d..6283806314f368 100644 --- a/ports/openssl/uwp/portfile.cmake +++ b/ports/openssl/uwp/portfile.cmake @@ -10,8 +10,6 @@ endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} - PATCHES - uwp/EnableUWPSupport.patch ) vcpkg_find_acquire_program(NASM) @@ -44,8 +42,7 @@ endif() set(OPENSSL_MAKEFILE "makefile") -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - +file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -71,7 +68,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "Build ${TARGET_TRIPLET}-rel") # Openssl's buildsystem has a race condition which will cause JOM to fail at some point. # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build. - make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl) + make_directory("${SOURCE_PATH_RELEASE}/inc32/openssl") execute_process( COMMAND "${JOM}" -k -j ${VCPKG_CONCURRENCY} -f "${OPENSSL_MAKEFILE}" build_libs WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" @@ -160,4 +157,4 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" "${_contents}") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/ports/openssl/vcpkg-cmake-wrapper.cmake.in index 4a5ee893a2fe28..ee16a896b74eef 100644 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake.in +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake.in @@ -3,6 +3,10 @@ cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0057 NEW) +set(OPENSSL_VERSION_MAJOR 3) +set(OPENSSL_VERSION_MINOR 0) +set(OPENSSL_VERSION_FIX 2) + if(OPENSSL_USE_STATIC_LIBS) if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic") message(WARNING "OPENSSL_USE_STATIC_LIBS is set, but vcpkg port openssl was built with dynamic linkage") diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index beb5807743e1ae..8f6c3067f897ba 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version-string": "1.1.1n", - "port-version": 1, + "version": "3.0.2", "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "OpenSSL", diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 5a0dec0b730ac0..e5356959afe52c 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -78,8 +78,8 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") execute_process( COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} - OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log - ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log" + ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log" ) vcpkg_execute_required_process( COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs @@ -111,29 +111,39 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Configure ${TARGET_TRIPLET}-dbg done") message(STATUS "Build ${TARGET_TRIPLET}-dbg") - make_directory(${SOURCE_PATH_DEBUG}/inc32/openssl) + make_directory("${SOURCE_PATH_DEBUG}/inc32/openssl") execute_process( COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} - OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log - ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log + OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log" + ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log" ) vcpkg_execute_required_process( COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} LOGNAME build-${TARGET_TRIPLET}-dbg-1) - - message(STATUS "Build ${TARGET_TRIPLET}-dbg done") + + message(STATUS "Build ${TARGET_TRIPLET}-dbg done") + + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/certs") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/private") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-1_1") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/engines-3") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/certs") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-1_1") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-3") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/private") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ossl-modules") + file(REMOVE "${CURRENT_PACKAGES_DIR}/ct_log_list.cnf" "${CURRENT_PACKAGES_DIR}/ct_log_list.cnf.dist" @@ -169,4 +179,6 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + + diff --git a/ports/qpid-proton/fix-openssl3.patch b/ports/qpid-proton/fix-openssl3.patch new file mode 100644 index 00000000000000..bf33ee53d99c04 --- /dev/null +++ b/ports/qpid-proton/fix-openssl3.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d75dfdb6..7089c406 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -177,7 +177,7 @@ if (CMAKE_COMPILER_IS_GNUCC) + endif (ENABLE_WARNING_ERROR) + set (COMPILE_WARNING_FLAGS "${WERROR} -Wall -pedantic-errors") + set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS}") +- set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wstrict-prototypes -Wvla -Wsign-compare -Wwrite-strings") ++ set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-deprecated-declarations -Wstrict-prototypes -Wvla -Wsign-compare -Wwrite-strings") + + if (ENABLE_UNDEFINED_ERROR) + set (CATCH_UNDEFINED "-Wl,--no-undefined") +@@ -202,7 +202,7 @@ if (CMAKE_C_COMPILER_ID MATCHES "Clang") + endif (ENABLE_WARNING_ERROR) + # TODO aconway 2016-01-06: we should be able to clean up the code and turn on + # some of these warnings. +- set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-float-equal -Wno-padded -Wno-sign-conversion -Wno-switch-enum -Wno-weak-vtables -Wno-exit-time-destructors -Wno-global-constructors -Wno-shorten-64-to-32 -Wno-documentation -Wno-documentation-unknown-command -Wno-old-style-cast -Wno-missing-noreturn") ++ set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-deprecated-declarations -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-float-equal -Wno-padded -Wno-sign-conversion -Wno-switch-enum -Wno-weak-vtables -Wno-exit-time-destructors -Wno-global-constructors -Wno-shorten-64-to-32 -Wno-documentation -Wno-documentation-unknown-command -Wno-old-style-cast -Wno-missing-noreturn") + endif() + + if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index f82649d132ac94..4df813a93a5e5a 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF dc244b1f7e886883a2bb416407f42ba55d0f5f42 # 0.32.0 SHA512 19f191dd206fd43a8f5b8db95f6ada57bd60b93eb907cf32f463c23cfe8c5f4914c6f4750ebde50c970387fb62baf4451279803eeb000bc8bb5c200692e5d1d7 HEAD_REF next + PATCHES + fix-openssl3.patch ) vcpkg_cmake_configure( diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index 30219802bdcea2..3dd0dcff0496f9 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qpid-proton", "version": "0.32.0", - "port-version": 3, + "port-version": 4, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "dependencies": [ diff --git a/ports/uthenticode/openssl.patch b/ports/uthenticode/openssl.patch new file mode 100644 index 00000000000000..e447c1fade98af --- /dev/null +++ b/ports/uthenticode/openssl.patch @@ -0,0 +1,72 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 75b82ee..47bed29 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -3,11 +3,7 @@ cmake_minimum_required(VERSION 3.10 FATAL_ERROR) + project(uthenticode) + + find_package(pe-parse REQUIRED) +-find_package( +- OpenSSL 1.1 +- COMPONENTS Crypto +- REQUIRED +-) ++find_package(OpenSSL REQUIRED) + + add_library("${PROJECT_NAME}" uthenticode.cpp) + +@@ -38,7 +34,7 @@ else () + target_link_libraries("${PROJECT_NAME}" PUBLIC pe-parse::pe-parser-library) + endif () + +-target_link_libraries("${PROJECT_NAME}" PUBLIC OpenSSL::Crypto) ++target_link_libraries("${PROJECT_NAME}" PUBLIC OpenSSL::SSL OpenSSL::Crypto) + + install( + TARGETS "${PROJECT_NAME}" +diff --git a/src/include/uthenticode.h b/src/include/uthenticode.h +index 8422cc3..938d8b8 100644 +--- a/src/include/uthenticode.h ++++ b/src/include/uthenticode.h +@@ -48,6 +48,7 @@ DECLARE_ASN1_FUNCTIONS(Authenticode_SpcIndirectDataContent) + * So we wrap it here for use with unique_ptr. + */ + void OpenSSL_free(void *ptr); ++void SK_X509_free(stack_st_X509 *ptr); + + /* Convenient self-releasing aliases for libcrypto and custom ASN.1 types. + */ +@@ -56,7 +57,7 @@ using ASN1_OBJECT_ptr = std::unique_ptr; + using OpenSSL_ptr = std::unique_ptr; + using BN_ptr = std::unique_ptr; +-using STACK_OF_X509_ptr = std::unique_ptr; ++using STACK_OF_X509_ptr = std::unique_ptr; + + using SectionList = std::vector; + +diff --git a/src/uthenticode.cpp b/src/uthenticode.cpp +index b1be0bc..7043589 100644 +--- a/src/uthenticode.cpp ++++ b/src/uthenticode.cpp +@@ -39,6 +39,11 @@ IMPLEMENT_ASN1_FUNCTIONS(Authenticode_SpcIndirectDataContent) + void OpenSSL_free(void *ptr) { + OPENSSL_free(ptr); + } ++ ++void SK_X509_free(stack_st_X509 *ptr) { ++ sk_X509_free(ptr); ++} ++ + // clang-format on + } // namespace impl + +@@ -252,7 +257,7 @@ std::vector SignedData::get_signers() const { + if (signers_stack_ptr == nullptr) { + return {}; + } +- auto signers_stack = impl::STACK_OF_X509_ptr(signers_stack_ptr, sk_X509_free); ++ auto signers_stack = impl::STACK_OF_X509_ptr(signers_stack_ptr, impl::SK_X509_free); + + std::vector signers; + for (auto i = 0; i < sk_X509_num(signers_stack.get()); ++i) { diff --git a/ports/uthenticode/portfile.cmake b/ports/uthenticode/portfile.cmake index e97f058c53dfa4..74a6a295753585 100644 --- a/ports/uthenticode/portfile.cmake +++ b/ports/uthenticode/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v1.0.6 SHA512 6C9C4DD9E1FE7C329E10BC39E41927C8B82DD004275A88385C691AD85EF4079EBE2922083D5252019B8B25CC540F48E544B42B8178F256AE987D6B677713B063 HEAD_REF master + PATCHES + openssl.patch ) # compatibility fix for newer versions of pe-parse diff --git a/ports/uthenticode/vcpkg.json b/ports/uthenticode/vcpkg.json index 0fb35e592e493b..13ece8b48f0f7c 100644 --- a/ports/uthenticode/vcpkg.json +++ b/ports/uthenticode/vcpkg.json @@ -1,7 +1,7 @@ { "name": "uthenticode", "version": "1.0.6", - "port-version": 1, + "port-version": 2, "description": "A cross-platform library for verifying Authenticode signatures", "homepage": "https://github.com/trailofbits/uthenticode", "supports": "!uwp", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 6edd85b84f1108..e25338628442fe 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7d142ac1a2667f6ba9650cab2505a71ffaddbd3", + "version": "1.9.220", + "port-version": 1 + }, { "git-tree": "7fc21526c4465a7e399683055a6df0096cad218e", "version": "1.9.220", diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index aab35215bede94..ea11d2ee568e72 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec45ec6a9a5b28ecab27857508355956d151a814", + "version-date": "2022-01-21", + "port-version": 3 + }, { "git-tree": "42be8335b113cba6ca88b9f9789b29fc7be280b4", "version-date": "2022-01-21", diff --git a/versions/baseline.json b/versions/baseline.json index b512beb0c5cc34..4ad7e21acc5fe3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -306,7 +306,7 @@ }, "aws-sdk-cpp": { "baseline": "1.9.220", - "port-version": 0 + "port-version": 1 }, "azmq": { "baseline": "2020-03-03", @@ -314,7 +314,7 @@ }, "azure-c-shared-utility": { "baseline": "2022-01-21", - "port-version": 2 + "port-version": 3 }, "azure-core-cpp": { "baseline": "1.5.0", @@ -2798,7 +2798,7 @@ }, "idevicerestore": { "baseline": "1.0.12", - "port-version": 6 + "port-version": 7 }, "if97": { "baseline": "2.1.2", @@ -3458,7 +3458,7 @@ }, "libdatachannel": { "baseline": "0.16.4", - "port-version": 0 + "port-version": 1 }, "libdatrie": { "baseline": "0.2.13", @@ -3778,7 +3778,7 @@ }, "libmysql": { "baseline": "8.0.20", - "port-version": 5 + "port-version": 6 }, "libnice": { "baseline": "0.1.18", @@ -3902,7 +3902,7 @@ }, "librabbitmq": { "baseline": "0.11.0", - "port-version": 0 + "port-version": 1 }, "libraqm": { "baseline": "0.9.0", @@ -3930,7 +3930,7 @@ }, "librtmp": { "baseline": "2019-11-11", - "port-version": 2 + "port-version": 3 }, "librttopo": { "baseline": "1.1.0", @@ -4022,7 +4022,7 @@ }, "libssh2": { "baseline": "1.10.0", - "port-version": 3 + "port-version": 4 }, "libstemmer": { "baseline": "2017-9", @@ -4070,7 +4070,7 @@ }, "libu2f-server": { "baseline": "1.1.0", - "port-version": 3 + "port-version": 4 }, "libudis86": { "baseline": "2018-01-28-56ff6c87", @@ -4150,7 +4150,7 @@ }, "libwebsockets": { "baseline": "4.3.0", - "port-version": 2 + "port-version": 3 }, "libxdiff": { "baseline": "0.23", @@ -4286,7 +4286,7 @@ }, "luasec": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "luasocket": { "baseline": "2020-09-14", @@ -5022,7 +5022,7 @@ }, "open62541": { "baseline": "1.2.3", - "port-version": 0 + "port-version": 1 }, "openal-soft": { "baseline": "1.21.1", @@ -5137,8 +5137,8 @@ "port-version": 1 }, "openssl": { - "baseline": "1.1.1n", - "port-version": 1 + "baseline": "3.0.2", + "port-version": 0 }, "openssl-unix": { "baseline": "1.1.1h", @@ -5630,7 +5630,7 @@ }, "qpid-proton": { "baseline": "0.32.0", - "port-version": 3 + "port-version": 4 }, "qscintilla": { "baseline": "2.12.0", @@ -7222,7 +7222,7 @@ }, "uthenticode": { "baseline": "1.0.6", - "port-version": 1 + "port-version": 2 }, "uvatlas": { "baseline": "2022-03-24", diff --git a/versions/i-/idevicerestore.json b/versions/i-/idevicerestore.json index 90f22b214c94c5..1db7a148e83b93 100644 --- a/versions/i-/idevicerestore.json +++ b/versions/i-/idevicerestore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0269d10da20f4f0b8d1317f21b71a7e8cac0ff16", + "version": "1.0.12", + "port-version": 7 + }, { "git-tree": "020019d72f9fa90089c2f406edb5938294f2dc3d", "version-string": "1.0.12", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 2027825e4a7276..17279c4e6fd022 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61f3e1e569991d144cb32b0f21c2b1e3baab78a2", + "version-semver": "0.16.4", + "port-version": 1 + }, { "git-tree": "a9f98aa660deca99a714ae3fc0e7a356c5d74cc8", "version-semver": "0.16.4", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index 113bab4268981a..c1a4d97c6ff376 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bc452d4f5cd5392799424e1bb920175f979dd84", + "version": "8.0.20", + "port-version": 6 + }, { "git-tree": "d19f8e799e7eb9dc6c24968d1fa8c31debc38b62", "version": "8.0.20", diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index 84f5a5de2b2687..1184cdf7905eb2 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3131805ba3b7940db19df08d930a13d2fc1c707c", + "version": "0.11.0", + "port-version": 1 + }, { "git-tree": "cfed3947ffb960b8b8bd399093aa21f5981464b7", "version": "0.11.0", diff --git a/versions/l-/librtmp.json b/versions/l-/librtmp.json index 72021cfddbcffd..6f0544b2591129 100644 --- a/versions/l-/librtmp.json +++ b/versions/l-/librtmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "337fb3f8ed2cb44c9ed06d7dc8b00356e077aa40", + "version-date": "2019-11-11", + "port-version": 3 + }, { "git-tree": "f3b156fff5f461b63a2665c4ec4a9a805e5a5447", "version-date": "2019-11-11", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 4cc59c7e0bf9a0..821615909a1778 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d6f965bcf911a4750731aad9785a4b40686a2b3", + "version": "1.10.0", + "port-version": 4 + }, { "git-tree": "d1a340be6b7c2a25f42cf4de44c836a577477bfc", "version": "1.10.0", diff --git a/versions/l-/libu2f-server.json b/versions/l-/libu2f-server.json index cb3a974df37f3e..19fb01c5f7067b 100644 --- a/versions/l-/libu2f-server.json +++ b/versions/l-/libu2f-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb5d1d70d0e3baab221910b12b33e9e34fd383f2", + "version": "1.1.0", + "port-version": 4 + }, { "git-tree": "1939b985161f406db50f8e455a5b7c4ada800596", "version-string": "1.1.0", diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index ddafd222f61cb3..16e498395fe947 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52c31e301f0eaa969b7850c20be357ec3f845994", + "version-semver": "4.3.0", + "port-version": 3 + }, { "git-tree": "d8b0df2d428b6902450b58a8dc5e0743549d16b0", "version-semver": "4.3.0", diff --git a/versions/l-/luasec.json b/versions/l-/luasec.json index 7e85956506adf4..29c704691d8713 100644 --- a/versions/l-/luasec.json +++ b/versions/l-/luasec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac5ef37f939164b6bc4a63bf7eeec24e8e8c5a79", + "version": "1.0.1", + "port-version": 1 + }, { "git-tree": "2529ee34af0b23fb576f0e8ed672ceba83c4c305", "version": "1.0.1", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index 40cad68db7cdf9..30f520ebd540fd 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78181e46126a93ba6bbea749a985ba675fb53c03", + "version": "1.2.3", + "port-version": 1 + }, { "git-tree": "7a42ce1cf8d2a5f4380a4dcc2807a0d86962d49d", "version": "1.2.3", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 7a4a3ffabb1141..1ea6e851f5f691 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ba2e59ee4f32c11e30aeccc0ecabc09b69c5d22", + "version": "3.0.2", + "port-version": 0 + }, { "git-tree": "06b9e0464af9c7c73227ba9f0fa93c77ef62496e", "version-string": "1.1.1n", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index 19532ceadc92bb..f96fe6984196f7 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be327f08d64834a36d80a140832abbbc66e67207", + "version": "0.32.0", + "port-version": 4 + }, { "git-tree": "109a9bb4fac5d5c5a52cd620d7ddb22da6fe47f7", "version": "0.32.0", diff --git a/versions/u-/uthenticode.json b/versions/u-/uthenticode.json index b4f7957ef03362..f33c0b6cfbf5c1 100644 --- a/versions/u-/uthenticode.json +++ b/versions/u-/uthenticode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "673c5ea6d0982481405bbe54c1e993f696d29d23", + "version": "1.0.6", + "port-version": 2 + }, { "git-tree": "bc0bd0b234a79de442f7001bd1a216716333e067", "version": "1.0.6", From 9029caf52a340a5a66ef7f36b1477d3321d4f443 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Apr 2022 21:01:01 +0200 Subject: [PATCH 134/217] [argtable3] actually disable examples (#23990) * [argtable3] actually don't build examples * version * Fix version * version * switch back to "version" * after 0 comes 1! * ... and after 1 comes 2! * version Co-authored-by: nicole mazzuca --- ports/argtable3/portfile.cmake | 13 +++++-------- ports/argtable3/vcpkg.json | 2 +- versions/a-/argtable3.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ports/argtable3/portfile.cmake b/ports/argtable3/portfile.cmake index 90615e522ca812..428b9fa87477ea 100644 --- a/ports/argtable3/portfile.cmake +++ b/ports/argtable3/portfile.cmake @@ -1,12 +1,9 @@ -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/argtable/argtable3/releases/download/v3.2.1.52f24e5/argtable-v3.2.1.52f24e5.tar.gz" - FILENAME "argtable-v3.2.1.52f24e5.tar.gz" - SHA512 cec77d56048b38bb7af8553cb660e745972bbd90378eeea4e928579af78190c8a41fdb29c972263e18955e3a497e09c42f705f7c4d548c3c523c5cb104c97a10 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + REPO argtable/argtable3 + REF 7704006f3cbb556e11da80a5b97469075a32892e # 3.2.1 + minor patches including ARGTABLE3_ENABLE_EXAMPLES support + SHA512 c51aa0a33a247c3801e36ca5d9523acefa31f21a34c1e86965a39290c1b437785e4d7e0ae80a65d811803b8fcbbc3a96ba3d6aefaea9bda15abc0f38bd1f45cc + HEAD_REF master ) vcpkg_cmake_configure( diff --git a/ports/argtable3/vcpkg.json b/ports/argtable3/vcpkg.json index 29d863dee2d1b3..527cc3bdf67396 100644 --- a/ports/argtable3/vcpkg.json +++ b/ports/argtable3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "argtable3", "version": "3.2.1", - "port-version": 1, + "port-version": 2, "description": "A single-file, ANSI C, command-line parsing library that parses GNU-style command-line options", "homepage": "https://www.argtable.org/", "license": "BSD-2-Clause-FreeBSD", diff --git a/versions/a-/argtable3.json b/versions/a-/argtable3.json index 73a0032169c245..a859cfbabe6b42 100644 --- a/versions/a-/argtable3.json +++ b/versions/a-/argtable3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe3b1c9a876237412e7ba925a3b41f62e7fc1d99", + "version": "3.2.1", + "port-version": 2 + }, { "git-tree": "acbbb26e54e658b8af673a112fb338274275ad6b", "version": "3.2.1", diff --git a/versions/baseline.json b/versions/baseline.json index 4ad7e21acc5fe3..b938f79f37fa61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -150,7 +150,7 @@ }, "argtable3": { "baseline": "3.2.1", - "port-version": 1 + "port-version": 2 }, "argumentum": { "baseline": "0.3.1", From 65ce4683884f5d70a96402b0aa98a49ee245fd96 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Wed, 6 Apr 2022 12:01:56 -0700 Subject: [PATCH 135/217] [google-cloud-cpp] update to latest release (v1.39.0) (#23988) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- .../google-cloud-cpp/support_absl_cxx17.patch | 23 +++++++++---------- ports/google-cloud-cpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 ++++ 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 12526e4caedfce..40ed37f4b2689c 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.38.0 - SHA512 8d13450d5d669c8f736a6b8cb57291e7de997ab8dcd3dbce8dabd6d71ff81096ef92f02cf64711d40a1465b47f8fd5ce21a355c9526c5900adc076e25b062fa7 + REF v1.39.0 + SHA512 d61ebcdb6680797f20147ee1d37b9d29c82e8c7267b944a346685bfa607cf0b7f1772854874b967f19b4f54ddcefc94a771a4686cafcd6a5fed426d64e553205 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/support_absl_cxx17.patch b/ports/google-cloud-cpp/support_absl_cxx17.patch index 0f8074b1d547e3..5697fd3a99a9ee 100644 --- a/ports/google-cloud-cpp/support_absl_cxx17.patch +++ b/ports/google-cloud-cpp/support_absl_cxx17.patch @@ -1,25 +1,24 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0e2b703..7097f06 100644 +diff --git a//CMakeLists.txt b/CMakeLists.txt +index 4d03fee..42bb13c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,8 +28,13 @@ project( - VERSION 1.38.0 - LANGUAGES CXX C) +@@ -43,6 +43,14 @@ if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) + endif () --# Allow applications to override the CMAKE_CXX_STANDARD, but if not set use 11. --if (NOT CMAKE_CXX_STANDARD) +find_package(absl CONFIG REQUIRED) + +# Use CMAKE_CXX_STANDARD=17 if ABSL_USE_CXX17 is set +if (ABSL_USE_CXX17) + message(STATUS "Found absl uses CXX17, enable CXX17 feature.") + set(CMAKE_CXX_STANDARD 17) -+elseif (NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) - endif () - if (CMAKE_CXX_STANDARD VERSION_LESS 11) ++endif () ++ + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) + message( diff --git a/google/cloud/internal/port_platform.h b/google/cloud/internal/port_platform.h -index c9f34cf..e624004 100644 +index f02cb7a..0ea8c9c 100644 --- a/google/cloud/internal/port_platform.h +++ b/google/cloud/internal/port_platform.h @@ -49,6 +49,8 @@ diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 86e32b1fe501fc..83c3f122f81660 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.38.0", - "port-version": 2, + "version": "1.39.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b938f79f37fa61..eead62417bdf61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2569,8 +2569,8 @@ "port-version": 1 }, "google-cloud-cpp": { - "baseline": "1.38.0", - "port-version": 2 + "baseline": "1.39.0", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 860a02692d973c..1245664a09560d 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca8e8015d59f4f5e03b0a257d46506c2b0219a71", + "version": "1.39.0", + "port-version": 0 + }, { "git-tree": "a22f467e483356f9ce6b6d8502385d447c28912a", "version": "1.38.0", From f34e5902f1fe2afe677c6a77cd0bae0ed0c68a78 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Apr 2022 21:03:32 +0200 Subject: [PATCH 136/217] [cpr] update to 1.8.1 (#23984) * [cpr] update to 1.8.1 * version * license * version * Don't use curl default features * version --- ports/cpr/001-cpr-config.patch | 18 +++++------------- ports/cpr/portfile.cmake | 15 ++++++++------- ports/cpr/vcpkg.json | 26 ++++++++++++++++++++++++-- versions/baseline.json | 2 +- versions/c-/cpr.json | 5 +++++ 5 files changed, 43 insertions(+), 23 deletions(-) diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch index 7d8dc593354756..9d666553d6be4c 100644 --- a/ports/cpr/001-cpr-config.patch +++ b/ports/cpr/001-cpr-config.patch @@ -1,23 +1,15 @@ diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index d43fc1d..d6a3992 100644 +index 66fc9eb..cc00c72 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt -@@ -29,6 +29,10 @@ set_target_properties(cpr - PROPERTIES +@@ -30,6 +30,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) ++ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) +endif() - ++ # Import GNU common install directory variables include(GNUInstallDirs) -@@ -37,6 +41,7 @@ if(CPR_FORCE_USE_SYSTEM_CURL) - install(TARGETS cpr - EXPORT cprTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - # Include CMake helpers for package config files diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index ad7ecc0bdd1868..24790b9b663c79 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -3,30 +3,31 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF 1.7.2 - SHA512 b2af6ab13a5dab435cc298c74ba79c365569c1e5ccfaffeea9dab0ad28cd918a198f83446761ac2e2101abb4be3a2f669f991e854e541851c1d250f34e16c414 + REF 1.8.1 + SHA512 f586b63ddbd9bd03e5c5aa385aad0d4f16f79847e1a14f6dc8a5e0cad4ed89e097ab83484c9ed19e034abf0d2eece13a7609652bc6a1a9caba43189cf0a782db HEAD_REF master PATCHES 001-cpr-config.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + ssl CPR_ENABLE_SSL +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCPR_BUILD_TESTS=OFF -DCPR_FORCE_USE_SYSTEM_CURL=ON + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) vcpkg_cmake_install() - - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr) -vcpkg_copy_pdbs() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 9ff4893cbe2a14..be243b70c93129 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,8 +1,9 @@ { "name": "cpr", - "version-semver": "1.7.2", + "version-semver": "1.8.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", "dependencies": [ { "name": "curl", @@ -16,5 +17,26 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "ssl" + ], + "features": { + "ssl": { + "description": "Enable SSL support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ] + }, + { + "name": "openssl", + "platform": "linux" + } + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index eead62417bdf61..527014dc76433e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1641,7 +1641,7 @@ "port-version": 0 }, "cpr": { - "baseline": "1.7.2", + "baseline": "1.8.1", "port-version": 0 }, "cpu-features": { diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index f272c9fa5e8faa..823f87fb6522ea 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a73ff58e720c30c96a1f7d12f98c9553a62a0d7", + "version-semver": "1.8.1", + "port-version": 0 + }, { "git-tree": "ada43417fa0d4613e92e3daafc717b83079d7959", "version-semver": "1.7.2", From 489a63708e2c662e53aa4df0855835c52d36d243 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 6 Apr 2022 21:37:21 +0200 Subject: [PATCH 137/217] [glslang] update port to v11.8.0 (#23959) * update glslang * version --- ports/glslang/portfile.cmake | 6 +++--- ports/glslang/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glslang.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 08609f2a7e8e2f..e153195dcaf384 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang - REF 2fb89a0072ae7316af1c856f22663fde4928128a #11.6.0 - SHA512 e22b85bb0c98d35c80f06dd6352d98c34ea0b965c5bec077d122d9aa346293672a11aec4964b410db8a6050c70dbc0a46fbbb599e178424d78234608075c110e + REF 11.8.0 + SHA512 b60d328fab6d5319e49fbf8aeb86c31a7c8dfb4bc75d39c081cbb72f90750fd98f2a4f3ab091614187ad9e0d2e27471f9dab7ca5547cabb856d17bff694f8c98 HEAD_REF master PATCHES ignore-crt.patch @@ -52,4 +52,4 @@ file(COPY DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index e17f25a972bfca..b09ee8dedbd1b6 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glslang", - "version": "11.6.0", + "version": "11.8.0", "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", "homepage": "https://github.com/KhronosGroup/glslang", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 527014dc76433e..0b0922f2b1dc35 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2541,7 +2541,7 @@ "port-version": 0 }, "glslang": { - "baseline": "11.6.0", + "baseline": "11.8.0", "port-version": 0 }, "glui": { diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 080c80f8f9e9ec..2d97b899d6d6fa 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d7780995e9523d16a56714fcef0159f18ecfa52", + "version": "11.8.0", + "port-version": 0 + }, { "git-tree": "0e89013d81f909760cdc3ce9015f84ce74621eec", "version": "11.6.0", From e1970558e2861d92d10ce23b0c07ecba7064fce0 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 6 Apr 2022 21:39:56 +0200 Subject: [PATCH 138/217] [darknet] update to latest version (#23978) * [darknet] update * update references * move to updated vcpkg tools * fix references --- ports/darknet/portfile.cmake | 35 +++++++++++++++++------------------ ports/darknet/vcpkg.json | 14 +++++++++++--- versions/baseline.json | 4 ++-- versions/d-/darknet.json | 5 +++++ 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index cd1f9716f3a133..5274e101b6330e 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AlexeyAB/darknet - REF 5853e51d604712918bd2fb23bab0ec82d19a88f9 - SHA512 d61e94209d66db3b71ad14d83c83a4d562879119b67881e9eacc60efb16e44496b291000c8c545055db5ae0e542cfb149fdbed2058584962fa52b604353ddccd + REF 8a0bf84c19e38214219dbd3345f04ce778426c57 + SHA512 6253d5b498f4f6eba7fc539d5a4b4e163139f4841623f11d84760bcf1ffabe6519f85e98e3d4aeac6846313fea3b98451407134b6b6f5b91137c62d1647109d9 HEAD_REF master ) @@ -26,39 +26,38 @@ if ("cuda" IN_LIST FEATURES) endif() #make sure we don't use any integrated pre-built library nor any unnecessary CMake module -file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindPThreads_windows.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindCUDNN.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindStb.cmake) +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty") +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindPThreads_windows.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindCUDNN.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindStb.cmake") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DINSTALL_BIN_DIR:STRING=bin -DINSTALL_LIB_DIR:STRING=lib -DENABLE_OPENCV:BOOL=${ENABLE_OPENCV} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES darknet uselib) if ("opencv-cuda" IN_LIST FEATURES OR "opencv3-cuda" IN_LIST FEATURES) vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES uselib_track) endif() -file(COPY ${SOURCE_PATH}/cfg DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(COPY ${SOURCE_PATH}/data DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(COPY "${SOURCE_PATH}/cfg" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(COPY "${SOURCE_PATH}/data" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/scripts/download_weights.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/scripts) +file(INSTALL "${SOURCE_PATH}/scripts/download_weights.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/scripts") message(STATUS "To download weight files, please go to ${CURRENT_INSTALLED_DIR}/tools/${PORT}/scripts and run ./download_weights.ps1") -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) diff --git a/ports/darknet/vcpkg.json b/ports/darknet/vcpkg.json index d599397c63f908..0f4c99a52c1514 100644 --- a/ports/darknet/vcpkg.json +++ b/ports/darknet/vcpkg.json @@ -1,12 +1,20 @@ { "name": "darknet", - "version-date": "2021-04-16", - "port-version": 1, + "version-date": "2022-03-06", "description": "Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.", "homepage": "https://github.com/alexeyab/darknet", + "license": null, "dependencies": [ "pthreads", - "stb" + "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cuda": { diff --git a/versions/baseline.json b/versions/baseline.json index 0b0922f2b1dc35..87e648cfdd5ba8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1765,8 +1765,8 @@ "port-version": 0 }, "darknet": { - "baseline": "2021-04-16", - "port-version": 1 + "baseline": "2022-03-06", + "port-version": 0 }, "darts-clone": { "baseline": "1767ab87cffe", diff --git a/versions/d-/darknet.json b/versions/d-/darknet.json index 7db7849e0dee58..644996618bdb0f 100644 --- a/versions/d-/darknet.json +++ b/versions/d-/darknet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9b918e6e0af651d83b284cd0f423b6b49951aef", + "version-date": "2022-03-06", + "port-version": 0 + }, { "git-tree": "cb0cb4dcba244d4b82cdd65fa0c993cfd4691992", "version-date": "2021-04-16", From 59d355b5ec30d83aea2b18de5746f9c40224da9e Mon Sep 17 00:00:00 2001 From: Simon Altschuler Date: Wed, 6 Apr 2022 21:41:11 +0200 Subject: [PATCH 139/217] [immer] update to latest version (#23970) --- ports/immer/portfile.cmake | 4 ++-- ports/immer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/immer.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake index c6c2a0bb0c93bb..f2cae1a905ccf4 100644 --- a/ports/immer/portfile.cmake +++ b/ports/immer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arximboldi/immer - REF a11df7243cb516a1aeffc83c31366d7259c79e82 - SHA512 7aefa894d57167e8606ffd20c78490731885da610da084ffdc4ee677e40c7a3b4edcd0fbf74e354fc68866d09ec7a35a7c549f78ce91f2f1a84bb6ccc605e135 + REF a1271fa712342f5c6dfad876820da17e10c28214 + SHA512 7ea544c88b7a3742ebeedabe5ff7ba78178b3523c1c8564b5c0daae4044dda22340b0531e1382618557d1c118222da4a7ce06dde02e4bc05833514dde1cf2dd1 HEAD_REF master ) diff --git a/ports/immer/vcpkg.json b/ports/immer/vcpkg.json index c52c0f02cf550e..df1f3ea4f4d24a 100644 --- a/ports/immer/vcpkg.json +++ b/ports/immer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "immer", - "version-date": "2021-05-03", + "version-date": "2022-02-12", "description": "Postmodern immutable and persistent data structures for C++", "homepage": "https://sinusoid.es/immer/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 87e648cfdd5ba8..ecb507e00e1724 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2905,7 +2905,7 @@ "port-version": 0 }, "immer": { - "baseline": "2021-05-03", + "baseline": "2022-02-12", "port-version": 0 }, "implot": { diff --git a/versions/i-/immer.json b/versions/i-/immer.json index 0ab115f21b67a5..0e018380b304c3 100644 --- a/versions/i-/immer.json +++ b/versions/i-/immer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37adfac25bfa3c7df3718c1cb0c9be295eb34cb3", + "version-date": "2022-02-12", + "port-version": 0 + }, { "git-tree": "0ee78459721140ead0ace0a031bbb9d28039b19e", "version-date": "2021-05-03", From a3dbfe8aa7bcc2d38dd55c66aeefd6822cbf2d02 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Apr 2022 23:01:36 +0200 Subject: [PATCH 140/217] [drlibs] Update to 2022-04-03 (#23962) * Update drlibs to 2022-04-03 * Update CI baseline * Add license * Update CI baseline Co-authored-by: chausner --- ports/drlibs/portfile.cmake | 4 ++-- ports/drlibs/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/d-/drlibs.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/drlibs/portfile.cmake b/ports/drlibs/portfile.cmake index 5e4fa4419a6a01..9919d67a6376f0 100644 --- a/ports/drlibs/portfile.cmake +++ b/ports/drlibs/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mackron/dr_libs - REF f13cbcfd06afe7287f99b1bb5982cefdf3d6a974 - SHA512 c108db409389f912bdcb979bc0dfe31658b8bcd7ce327145a77bdb9a168512e2c1a94cb59677b5d6bfa213e412498360a8ec25d5424bb2ba292edaf88bf5f195 + REF c729134b41cf09542542b5da841ac2f933b36cba + SHA512 3760a5921d120db21c9351e7edf1877b7052783e20dd7f6ab673992db0f6e4014c07c559f993f7870f6e7fe021b5e47b10b27ea0ed3895d07077b0eea8e13078 HEAD_REF master ) diff --git a/ports/drlibs/vcpkg.json b/ports/drlibs/vcpkg.json index 73a1cb4e2f3cfc..db59c2fe4c02f3 100644 --- a/ports/drlibs/vcpkg.json +++ b/ports/drlibs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "drlibs", - "version-date": "2021-11-02", + "version-date": "2022-04-03", "description": "Single-file audio decoding libraries for C/C++", - "homepage": "https://github.com/mackron/dr_libs" + "homepage": "https://github.com/mackron/dr_libs", + "license": "Unlicense OR MIT-0" } diff --git a/versions/baseline.json b/versions/baseline.json index ecb507e00e1724..c6501e3c86a1a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1929,7 +1929,7 @@ "port-version": 0 }, "drlibs": { - "baseline": "2021-11-02", + "baseline": "2022-04-03", "port-version": 0 }, "drogon": { diff --git a/versions/d-/drlibs.json b/versions/d-/drlibs.json index e579979206b50f..79c361f3d11d37 100644 --- a/versions/d-/drlibs.json +++ b/versions/d-/drlibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fbb06000e3d4c3699920debbc828cc279362d91", + "version-date": "2022-04-03", + "port-version": 0 + }, { "git-tree": "80b487d4ce97c60609cdba15430c0d8b34fb6235", "version-date": "2021-11-02", From f387f27f138196ec2244cc875b3318df9060fbc9 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Apr 2022 23:02:37 +0200 Subject: [PATCH 141/217] [libiconv] Fix usage (#23961) * [libiconv] Fix usage * version --- ports/libiconv/portfile.cmake | 21 ++++++++++++--------- ports/libiconv/usage | 4 ++++ ports/libiconv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libiconv.json | 5 +++++ 5 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 ports/libiconv/usage diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index ee3d63c50a353f..3cca1b292cd0d0 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -26,15 +26,16 @@ if (NOT VCPKG_TARGET_IS_ANDROID) list(APPEND OPTIONS --enable-relocatable) endif() -vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" - DETERMINE_BUILD_TRIPLET - USE_WRAPPERS - OPTIONS - --enable-extra-encodings - --without-libiconv-prefix - --without-libintl-prefix - ${OPTIONS} - ) +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + OPTIONS + --enable-extra-encodings + --without-libiconv-prefix + --without-libintl-prefix + ${OPTIONS} +) vcpkg_install_make() vcpkg_copy_pdbs() @@ -47,4 +48,6 @@ set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains unneeded doc files +# Please keep, the default usage is broken +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libiconv/usage b/ports/libiconv/usage new file mode 100644 index 00000000000000..db47c33e81be8c --- /dev/null +++ b/ports/libiconv/usage @@ -0,0 +1,4 @@ +The package libiconv provides CMake targets: + + find_package(Iconv) + target_link_libraries(main PRIVATE Iconv::Iconv) diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json index bda238d6824337..b567aee18bb77a 100644 --- a/ports/libiconv/vcpkg.json +++ b/ports/libiconv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libiconv", "version": "1.16", - "port-version": 12, + "port-version": 13, "description": "GNU Unicode text conversion", "homepage": "https://www.gnu.org/software/libiconv/" } diff --git a/versions/baseline.json b/versions/baseline.json index c6501e3c86a1a5..d7e3291727b330 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3630,7 +3630,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 12 + "port-version": 13 }, "libics": { "baseline": "1.6.5", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index 4ea73baa6a3c6e..24335a8f50aa59 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc4f1edf5a444934d4a757420a6cd3fed596e1d5", + "version": "1.16", + "port-version": 13 + }, { "git-tree": "3942643a4d682982e61b60611394e4315dfc42a1", "version": "1.16", From ddb98dda38da733169c5fb8cba29825b34bf0f15 Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Wed, 6 Apr 2022 23:04:12 +0200 Subject: [PATCH 142/217] [ashes] Updated port to 2022-04-03 (#23964) * [ashes] Updated port to 2022-04-03 * [ashes] Added license field. * Nicole CR Co-authored-by: nicole mazzuca --- ports/ashes/fix-cast.patch | 39 ------------------------------ ports/ashes/portfile.cmake | 49 ++++++++++++++++++++++---------------- ports/ashes/vcpkg.json | 12 ++++++++-- versions/a-/ashes.json | 5 ++++ versions/baseline.json | 4 ++-- 5 files changed, 46 insertions(+), 63 deletions(-) delete mode 100644 ports/ashes/fix-cast.patch diff --git a/ports/ashes/fix-cast.patch b/ports/ashes/fix-cast.patch deleted file mode 100644 index 27db3d2eb8c7fd..00000000000000 --- a/ports/ashes/fix-cast.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp -index fb9a195a..3a97e126 100644 ---- a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp -+++ b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp -@@ -1688,7 +1688,7 @@ namespace ashes::d3d11 - VkPeerMemoryFeatureFlags * pPeerMemoryFeatures ) - { - reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" ); -- *pPeerMemoryFeatures = VK_NULL_HANDLE; -+ *pPeerMemoryFeatures = static_cast(0); - } - - void VKAPI_CALL vkCmdSetDeviceMask( -diff --git a/source/ashes/renderer/GlRenderer/ash_opengl.cpp b/source/ashes/renderer/GlRenderer/ash_opengl.cpp -index 45a17148..eec2419f 100644 ---- a/source/ashes/renderer/GlRenderer/ash_opengl.cpp -+++ b/source/ashes/renderer/GlRenderer/ash_opengl.cpp -@@ -1700,7 +1700,7 @@ namespace ashes::gl - VkPeerMemoryFeatureFlags* pPeerMemoryFeatures ) - { - reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" ); -- *pPeerMemoryFeatures = VK_NULL_HANDLE; -+ *pPeerMemoryFeatures = static_cast(0); - } - - void VKAPI_CALL vkCmdSetDeviceMask( -diff --git a/source/ashes/renderer/TestRenderer/ash_test.cpp b/source/ashes/renderer/TestRenderer/ash_test.cpp -index 741dd75c..b34647b8 100644 ---- a/source/ashes/renderer/TestRenderer/ash_test.cpp -+++ b/source/ashes/renderer/TestRenderer/ash_test.cpp -@@ -1735,7 +1735,7 @@ namespace ashes::test - VkPeerMemoryFeatureFlags* pPeerMemoryFeatures ) - { - reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" ); -- *pPeerMemoryFeatures = VK_NULL_HANDLE; -+ *pPeerMemoryFeatures = static_cast(0); - } - - void VKAPI_CALL vkCmdSetDeviceMask( diff --git a/ports/ashes/portfile.cmake b/ports/ashes/portfile.cmake index 5b4bb03aa5954e..438c62bc916c7d 100644 --- a/ports/ashes/portfile.cmake +++ b/ports/ashes/portfile.cmake @@ -1,27 +1,36 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO DragonJoker/Ashes - REF 0f4e6d0ea308eb60ae32274acc9a4d345a4977ff - SHA512 0ce74780786d018e7a447c4e49d3cd83ad53b238a79fc484025e2034cd49a64253363cd592d2da367befa7cd5443b90eb1c5dae54b22756f7b4a0cdecb93c588 - PATCHES - fix-cast.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO DragonJoker/Ashes + REF f39ca2db24a9d7a2d586c85c78bb6eacd8d63b49 + HEAD_REF master + SHA512 a45d443797ffe31305acca154640530c6ed767af9982d857b6e59841add3b0a373723f5f7b590512c1b0dd4064dfbae8aa8445fec59a3c3c2b8a3c002b180609 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DCMAKE_INSTALL_PREFIX=${CURRENT_INSTALLED_DIR} - -DPROJECTS_USE_PRECOMPILED_HEADERS=OFF - -DVCPKG_PACKAGE_BUILD=ON - -DASHES_BUILD_TEMPLATES=OFF - -DASHES_BUILD_TESTS=OFF - -DASHES_BUILD_INFO=OFF - -DASHES_BUILD_SAMPLES=OFF + +vcpkg_from_github( + OUT_SOURCE_PATH CMAKE_SOURCE_PATH + REPO DragonJoker/CMakeUtils + REF e2a9d422a02dab0e04f54b3e1bc515eba652a9d1 + HEAD_REF master + SHA512 4ebd6141b9e5aa5283f31892da7108aa09fbd59292f0e98f2c9fe67577856f0af253184d41fdc16bb11094c4635401f181ea2e3abfa560adcf5c029f0d663b24 +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/CMake") +file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake") + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DCMAKE_INSTALL_PREFIX=${CURRENT_INSTALLED_DIR} + -DVCPKG_PACKAGE_BUILD=ON + -DASHES_BUILD_TEMPLATES=OFF + -DASHES_BUILD_TESTS=OFF + -DASHES_BUILD_INFO=OFF + -DASHES_BUILD_SAMPLES=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ashes) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ashes) -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) diff --git a/ports/ashes/vcpkg.json b/ports/ashes/vcpkg.json index b2141ba204ee63..0cee851d91bf88 100644 --- a/ports/ashes/vcpkg.json +++ b/ports/ashes/vcpkg.json @@ -1,13 +1,21 @@ { "name": "ashes", - "version-date": "2021-06-18", - "port-version": 1, + "version-date": "2022-04-03", "description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.", "homepage": "https://github.com/DragonJoker/Ashes", + "license": "MIT", "supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static", "dependencies": [ "opengl", "spirv-cross", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "vulkan-headers" ] } diff --git a/versions/a-/ashes.json b/versions/a-/ashes.json index 09d4352195d363..62c56ba6454729 100644 --- a/versions/a-/ashes.json +++ b/versions/a-/ashes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "365d042da082df035fb7dba0a53e1a4ac306f469", + "version-date": "2022-04-03", + "port-version": 0 + }, { "git-tree": "68557018b215aba6325caf97248c62955fdef397", "version-date": "2021-06-18", diff --git a/versions/baseline.json b/versions/baseline.json index d7e3291727b330..9eac8c1f112875 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -173,8 +173,8 @@ "port-version": 2 }, "ashes": { - "baseline": "2021-06-18", - "port-version": 1 + "baseline": "2022-04-03", + "port-version": 0 }, "asio": { "baseline": "1.22.1", From 0b1eb07403750779b58e2e4edd93d50aa3d417d2 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Apr 2022 23:16:09 +0200 Subject: [PATCH 143/217] [libpff] Fix zlib import (#23953) * [libpff] Fix Linux configure * version * unsupported on UNIX * version --- ports/libpff/CMakeLists.txt | 2 +- ports/libpff/portfile.cmake | 16 +++++++--------- ports/libpff/vcpkg.json | 15 +++++++++++++-- scripts/ci.baseline.txt | 6 ------ versions/baseline.json | 2 +- versions/l-/libpff.json | 5 +++++ 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/ports/libpff/CMakeLists.txt b/ports/libpff/CMakeLists.txt index 276db5d80a1f65..44317432d7dc96 100644 --- a/ports/libpff/CMakeLists.txt +++ b/ports/libpff/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12) project(libpff C) -find_package(zlib REQUIRED) +find_package(ZLIB REQUIRED) if(MSVC) add_compile_definitions(_CRT_SECURE_NO_DEPRECATE) diff --git a/ports/libpff/portfile.cmake b/ports/libpff/portfile.cmake index 5a3e81388e18b3..00be14f6675b7e 100644 --- a/ports/libpff/portfile.cmake +++ b/ports/libpff/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_download_distfile(ARCHIVE SHA512 7207ba87607ea2fd4609a081c2f4b061344a783e188605e88df99fd473f2a8da1269b065e57b054f4622888d40aa8f2b8272dc4748334ddfe358b28d443d6ad1 ) - vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${LIB_VERSION} @@ -20,18 +20,16 @@ vcpkg_download_distfile(ARCHIVE file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libpff TARGET_PATH share/unofficial-libpff) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpff PACKAGE_NAME unofficial-libpff) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_copy_pdbs() -# License and man -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libpff" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libpff/vcpkg.json b/ports/libpff/vcpkg.json index 5480dbdaa84ffa..b8eaba407ed2ac 100644 --- a/ports/libpff/vcpkg.json +++ b/ports/libpff/vcpkg.json @@ -1,9 +1,20 @@ { "name": "libpff", - "version-string": "2018-07-14", - "port-version": 2, + "version-date": "2018-07-14", + "port-version": 3, "description": "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.", + "homepage": "https://github.com/libyal/libpff", + "license": "LGPL-3.0", + "supports": "windows & !(static & windows) & !uwp", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2597ccae1bbc4a..96581b199b7927 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -574,12 +574,6 @@ libmysql:arm64-windows=fail libopusenc:arm-uwp=fail libopusenc:x64-uwp=fail libosip2:x64-windows-static-md=fail -libpff:arm-uwp=fail -libpff:x64-linux=fail -libpff:x64-osx=fail -libpff:x64-uwp=fail -libpff:x64-windows-static=fail -libpff:x64-windows-static-md=fail libplist:x64-windows-static=fail libpng-apng:arm64-windows = skip libpng-apng:arm-uwp = skip diff --git a/versions/baseline.json b/versions/baseline.json index 9eac8c1f112875..9c2ad5a2d27f5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3854,7 +3854,7 @@ }, "libpff": { "baseline": "2018-07-14", - "port-version": 2 + "port-version": 3 }, "libplist": { "baseline": "1.3.6", diff --git a/versions/l-/libpff.json b/versions/l-/libpff.json index ddaf67af575652..7d305a1681c936 100644 --- a/versions/l-/libpff.json +++ b/versions/l-/libpff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24cc99a6c6ead368c4711dc67e8e7a7ae4444f09", + "version-date": "2018-07-14", + "port-version": 3 + }, { "git-tree": "fc83ea1c4fe9bd9731134772ff7df1c1f3ff6ab9", "version-string": "2018-07-14", From 1f31840e88d3cc3bae9af545fa6653f579800fcb Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Apr 2022 23:17:21 +0200 Subject: [PATCH 144/217] [sleef] Fix unused configure variable (#23951) * [sleef] Fix unused configure variable * version * Try remove from CI baseline * Still compiler error --- ports/sleef/portfile.cmake | 8 ++++---- ports/sleef/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sleef.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/sleef/portfile.cmake b/ports/sleef/portfile.cmake index 77dddf19c86b9b..04fd4a7b876444 100644 --- a/ports/sleef/portfile.cmake +++ b/ports/sleef/portfile.cmake @@ -7,12 +7,12 @@ vcpkg_from_github( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_LIBM=ON -DBUILD_DFT=ON -DBUILD_QUAD=ON - -DBUILD_GNUABILIBS=${VCPKG_TARGET_IS_LINUX} + -DBUILD_GNUABI_LIBS=${VCPKG_TARGET_IS_LINUX} -DBUILD_TESTS=OFF -DBUILD_INLINE_HEADERS=OFF ) @@ -20,5 +20,5 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +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/sleef/vcpkg.json b/ports/sleef/vcpkg.json index 5c12aaf36da7aa..cc7e923faa8325 100644 --- a/ports/sleef/vcpkg.json +++ b/ports/sleef/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sleef", "version": "3.5.1", - "port-version": 1, + "port-version": 2, "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT", "homepage": "https://sleef.org/", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9c2ad5a2d27f5a..c582a84ad386b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6502,7 +6502,7 @@ }, "sleef": { "baseline": "3.5.1", - "port-version": 1 + "port-version": 2 }, "sleepy-discord": { "baseline": "2022-02-05", diff --git a/versions/s-/sleef.json b/versions/s-/sleef.json index 706ae99f1a8d05..445a52d6cb7f66 100644 --- a/versions/s-/sleef.json +++ b/versions/s-/sleef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24d704091e9827b6e0192fb51f0798422da9707e", + "version": "3.5.1", + "port-version": 2 + }, { "git-tree": "ea33cc5343944b32ab14b772d5242a07fb84865b", "version": "3.5.1", From d5595bff008286c6cfd4ffc85607216f867a5216 Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Wed, 6 Apr 2022 23:18:50 +0200 Subject: [PATCH 145/217] [shaderwriter] Updated to version 2.2.0. (#23957) * [shaderwriter] Updated to version 2.2.0. * [shaderwriter] Trying to fix use of concepts with gcc. * better git submodules Co-authored-by: nicole mazzuca --- ports/shaderwriter/portfile.cmake | 22 +++++++++------------- ports/shaderwriter/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/shaderwriter.json | 5 +++++ 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ports/shaderwriter/portfile.cmake b/ports/shaderwriter/portfile.cmake index 2d80e3fba9620c..b785430a7b1bd3 100644 --- a/ports/shaderwriter/portfile.cmake +++ b/ports/shaderwriter/portfile.cmake @@ -1,24 +1,19 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/ShaderWriter - REF bcebc67feb99d98066dfb51a3857155ddcfa9d57 - HEAD_REF master - SHA512 675a9db22c3593426c9a364a8a2934e41f65447d450347dd5683a89e4f38dfbc914dca7f6fbfa77b0afd1fb0fd12c2316c11eded1453ae4498b448ae2267fdac + REF 8b1b0614f49c27ab08ff16ce632fcac44f24d6d5 + HEAD_REF development + SHA512 697ecfee5dc9cbfe3cc724b7acd90107ea40bba58448536b1726eb3755f8c96e77b9a31317b567d77ed9e9b5c6decede73c4c7f1a760f11eff0cba2711b3c548 ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF 27747f5c91acf76107220986f114efdab0a09a68 + REF acbce0a4966d0689148975aaa3c581af2b4e33a7 HEAD_REF master - SHA512 acd5dafc74e197886a9b1ac52b59bdbf2d136cc8b49683eda48b8ccc45eced5f68aa334c8f9c01c7d8bf5c8908b64cbf19a97c6e3666370111bb3d2551c3b469 + SHA512 f2f45520554b576b3896ef9068549878e05a57a8bd0a3a4ab8c218bba9dee49febfe8cb7edb85b8ff51bdd86dee576cace6b8506a6226484d2b640408a3246ba ) -get_filename_component(SRC_PATH ${CMAKE_SOURCE_PATH} DIRECTORY) -if (EXISTS ${SRC_PATH}/CMake) - file(REMOVE_RECURSE ${SRC_PATH}/CMake) -endif() -file(RENAME ${CMAKE_SOURCE_PATH} ${SRC_PATH}/CMake) -set(CMAKE_SOURCE_PATH ${SRC_PATH}/CMake) -file(COPY ${CMAKE_SOURCE_PATH} DESTINATION ${SOURCE_PATH}) +file(REMOVE_RECURSE "${SOURCE_PATH}/CMake") +file(COPY "${CMAKE_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/CMake") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -31,9 +26,10 @@ vcpkg_cmake_configure( -DSDW_BUILD_TESTS=OFF -DSDW_BUILD_STATIC_SDW=${BUILD_STATIC} -DSDW_BUILD_STATIC_SDAST=${BUILD_STATIC} + -DSDW_UNITY_BUILD=ON ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shaderwriter) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/shaderwriter/vcpkg.json b/ports/shaderwriter/vcpkg.json index efd2516bb2687f..524382657b5bff 100644 --- a/ports/shaderwriter/vcpkg.json +++ b/ports/shaderwriter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "shaderwriter", - "version": "2.1.0", + "version": "2.2.0", "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.", "homepage": "https://github.com/DragonJoker/ShaderWriter", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c582a84ad386b7..b0f68d655e6d37 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6429,7 +6429,7 @@ "port-version": 2 }, "shaderwriter": { - "baseline": "2.1.0", + "baseline": "2.2.0", "port-version": 0 }, "shapelib": { diff --git a/versions/s-/shaderwriter.json b/versions/s-/shaderwriter.json index 4c30efff0b2774..1e295e8e79bb0c 100644 --- a/versions/s-/shaderwriter.json +++ b/versions/s-/shaderwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09802faaae65b3f6ac6adfe5687bf581f0189dba", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "e9ad5b26c40e2048a99c618972827c8f8e802eaa", "version": "2.1.0", From 4e485c34f5e056327ef00c14e2e3620bc50de098 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 6 Apr 2022 14:19:11 -0700 Subject: [PATCH 146/217] [azure-sdk-for-cpp] Update to latest version (#23998) * [azure-storage-common-cpp] Update to 12.2.3 ## 12.2.3 (2022-04-06) ### Bugs Fixed - Fixed a bug where we got error when XML request body is too big. * [azure-storage-blobs-cpp] Update to 12.4.0 ## 12.4.0 (2022-04-06) ### Other changes - No public changes in this release. * [azure-storage-queues-cpp] Update to 12.0.0 ## 12.0.0 (2022-04-06) ### New Features - This release includes all features from beta.1 to beta.4. This is the first stable release of a ground-up rewrite of our client libraries to ensure consistency, idiomatic design, productivity and an excellent developer experience. It was created following the [Azure SDK Design Guideline for C++](https://azure.github.io/azure-sdk/cpp_introduction.html). * remove version comparison on openssl Co-authored-by: nicole mazzuca --- ports/azure-storage-blobs-cpp/portfile.cmake | 4 ++-- ports/azure-storage-blobs-cpp/vcpkg.json | 4 ++-- ports/azure-storage-common-cpp/portfile.cmake | 4 ++-- ports/azure-storage-common-cpp/vcpkg.json | 4 ++-- ports/azure-storage-queues-cpp/portfile.cmake | 4 ++-- ports/azure-storage-queues-cpp/vcpkg.json | 4 ++-- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/a-/azure-storage-queues-cpp.json | 5 +++++ versions/baseline.json | 6 +++--- 10 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 064a05e539a9a9..3b69597be3cb00 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.3.0 - SHA512 69fb5b32544492d32fdf5d125852b98ccc89688f0c606a8fc6be88bd0e2091df1ccf483cefeb075f17fd78c7e6b1ff6c97d7e3db0f60362fe888bb07ea2a4967 + REF azure-storage-blobs_12.4.0 + SHA512 8d60970d0eff794cfcb6fb8471e7b0086cd8620072845195f67ae2fe2a7e1ecdaf21f10a80a708c981afa3589115f0fd2477a8c398d06b66b4babcd49f0c4c9a ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 4e7e7897bdf6b9..2847c101f2ad8b 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.3.0", + "version-semver": "12.4.0", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.1" + "version>=": "12.2.3" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index e84cb2a07aacc2..a5ce63659cf56f 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.2.2 - SHA512 dff3c48a4177e43b2ca0f28128a6c6002e46f64895c1431cafc8db766de6f3498c9502d671c3ba49122feb8bf271291fda1bd24986bb9ff650ab33be60b14447 + REF azure-storage-common_12.2.3 + SHA512 456854fa39e98fab10e65e0bab148aeb9fee61439bcb1b689c17110343be0162174a8075eb09b0b4eba6c5f59c8d454d78cbd3c4aafb1af3db16d9f984189393 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 6d74341ec20c47..cc7651dd6ec787 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.2.2", + "version-semver": "12.2.3", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.3.1" + "version>=": "1.5.0" }, { "name": "libxml2", diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index cb4c32538acdef..cabef618740f54 100644 --- a/ports/azure-storage-queues-cpp/portfile.cmake +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-queues_12.0.0-beta.4 - SHA512 8330fcbf2a8c22d7e6ac7c0dc86613c8552c645e4344599333fd68eb4a7cb446d6a4f7c0d7f630c8bab947a67d445828901f2c4999b7f27457b1c9d7ef06f988 + REF azure-storage-queues_12.0.0 + SHA512 f393d481a9bb098d1a361605d9d55e1385ec5417a20ea05c53d479dbe4dcb0e8be34c2b9fc31b64e7d78b81fd642461f27beb02b6ed047f87c968c0bb718b85b ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json index b48d71ab27de70..e81924b0dec227 100644 --- a/ports/azure-storage-queues-cpp/vcpkg.json +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-queues-cpp", - "version-semver": "12.0.0-beta.4", + "version-semver": "12.0.0", "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.2" + "version>=": "12.2.3" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 5bd0a98aba4421..1fb64da9763b79 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff9783605f383c1f596ada3a10d2dde88a931f56", + "version-semver": "12.4.0", + "port-version": 0 + }, { "git-tree": "252f2edf841eb01f271d1694f3fea34e63906eba", "version-semver": "12.3.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index e97cad3e30deca..c62ed975355a54 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c972f7321758abde4e5d5862c4abd7398f1f26a6", + "version-semver": "12.2.3", + "port-version": 0 + }, { "git-tree": "de5c104dfa95871220c17e4f8f97a99b5da33920", "version-semver": "12.2.2", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index 886d99170c8eba..bafb23a67ebe03 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a04f50e6f79e53d47d4721529709e8e1f02462e1", + "version-semver": "12.0.0", + "port-version": 0 + }, { "git-tree": "a4fe64dbaeaacf8bfff69155eea6f001ebee8e15", "version-semver": "12.0.0-beta.4", diff --git a/versions/baseline.json b/versions/baseline.json index b0f68d655e6d37..62fe23b914aa8a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -353,11 +353,11 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.3.0", + "baseline": "12.4.0", "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.2.2", + "baseline": "12.2.3", "port-version": 0 }, "azure-storage-cpp": { @@ -373,7 +373,7 @@ "port-version": 0 }, "azure-storage-queues-cpp": { - "baseline": "12.0.0-beta.4", + "baseline": "12.0.0", "port-version": 0 }, "azure-uamqp-c": { From 4620dedb980498bcfaa54a3d6e092ae3474f0f8a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 6 Apr 2022 23:23:22 +0200 Subject: [PATCH 147/217] [mpeg123] fix yasm dependency. (#23949) * [mpeg123] fix yasm dependency. * version stuff * add license * version stuff * fix portfile * version stuff --- ports/mpg123/portfile.cmake | 6 ++++-- ports/mpg123/vcpkg.json | 8 ++++++-- versions/baseline.json | 2 +- versions/m-/mpg123.json | 5 +++++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index ceca50482f06d1..87a07c267a7ae9 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -12,8 +12,10 @@ vcpkg_from_sourceforge( fix-modulejack.patch ) -include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") -yasm_tool_helper(APPEND_TO_PATH) +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_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/ports/cmake" diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index dba644357495be..a2723881a2e763 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mpg123", "version": "1.29.2", - "port-version": 1, + "port-version": 2, "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", "dependencies": [ { "name": "vcpkg-cmake", @@ -13,6 +14,9 @@ "name": "vcpkg-cmake-config", "host": true }, - "yasm-tool-helper" + { + "name": "yasm-tool-helper", + "platform": "windows" + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 62fe23b914aa8a..1b55e37b9fa6ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4614,7 +4614,7 @@ }, "mpg123": { "baseline": "1.29.2", - "port-version": 1 + "port-version": 2 }, "mpi": { "baseline": "1", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 8e7e9b411e140c..ead30f3ac3b684 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f03fbe2d20adf858700d4c90204ff808d00c34b2", + "version": "1.29.2", + "port-version": 2 + }, { "git-tree": "d7d73f2de9ed526b2cc13e39a4bdc100fcd6ab4e", "version": "1.29.2", From d6fa9c5192da2bb1f73b387d536c2c0223241bc7 Mon Sep 17 00:00:00 2001 From: AkshayPS12 <35425004+AkshayPS12@users.noreply.github.com> Date: Thu, 7 Apr 2022 02:54:06 +0530 Subject: [PATCH 148/217] [redis-plus-plus] Update to 1.3.2 (#23948) * redis-plus-plus] Update to 1.3.2 * formatting changes * updated port version --- ports/redis-plus-plus/portfile.cmake | 4 ++-- ports/redis-plus-plus/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/redis-plus-plus.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index eb5b6b644fd56c..93ee71b583883d 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sewenew/redis-plus-plus - REF cff6ab8d8557a113ad97dfb779eb46647f7c92c7 # 1.3.1 - SHA512 2bd179f47b13d05d58358ddf1aeef93fbc9e748a12f07fa5bd59fd75adcf7f3261d5f871d8fd33628d2d9df04e341ed24314fc2e817887ba0079e2711b5da317 + REF e29c63db54653a660d7a0f556f670b7a6fce0a78 # 1.3.2 + SHA512 47b18f41cfaf5e11d6eba1201a3da3a1ed355583cde0772de68e5f0f25953e1467c83249848b25b16c9db9e3f6c5df5e1dd832f4b3dd41289c69111867e48d8c HEAD_REF master PATCHES fix-ws2-linking-windows.patch diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index a789d9c2727462..769edb78d2cd15 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "redis-plus-plus", - "version-semver": "1.3.1", - "port-version": 1, + "version-semver": "1.3.2", "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1b55e37b9fa6ab..32ce27cfa3da9c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6117,8 +6117,8 @@ "port-version": 4 }, "redis-plus-plus": { - "baseline": "1.3.1", - "port-version": 1 + "baseline": "1.3.2", + "port-version": 0 }, "refl-cpp": { "baseline": "0.12.2", diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index 76887d28a2ad0d..de899f3b71847e 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a58c88604be6da2e638127442cc413c0504e2f51", + "version-semver": "1.3.2", + "port-version": 0 + }, { "git-tree": "4da3b8dd26c05426ae7d2a844f854423e9d0624d", "version-semver": "1.3.1", From bafc596898c587967afd9ba5e67cab903f220293 Mon Sep 17 00:00:00 2001 From: ZeeWanderer Date: Thu, 7 Apr 2022 00:30:48 +0300 Subject: [PATCH 149/217] [tgbot-cpp] Update to v1.3 (#23947) * [tgbot-cpp] Update to v1.3 * [tgbot-cpp] update versions --- ports/tgbot-cpp/portfile.cmake | 11 +++++------ ports/tgbot-cpp/vcpkg.json | 8 ++++++-- versions/baseline.json | 4 ++-- versions/t-/tgbot-cpp.json | 5 +++++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ports/tgbot-cpp/portfile.cmake b/ports/tgbot-cpp/portfile.cmake index 859b5d03edc6c1..dba7d1e166e973 100644 --- a/ports/tgbot-cpp/portfile.cmake +++ b/ports/tgbot-cpp/portfile.cmake @@ -1,17 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO reo7sp/tgbot-cpp - REF v1.2.1 - SHA512 b094f9c80dd15b7930b7d7250169b3199d9c84b84826adececa8237111f5ba384ec790dbe969999f362ca2fb35b93950d053777ce5f167007e33c3e4eb133453 + REF v1.3 + SHA512 1b992c7705a5f7bb081df3eb032feb78b2b5eb2e73a7be822cd12552702a4d18ac9eecbd0c842f2d6c48757e91d3f8ceb5965237264b9ec18657e51c3bde7f79 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/tgbot-cpp/vcpkg.json b/ports/tgbot-cpp/vcpkg.json index 360b9c706d1351..3543ee0546a2f1 100644 --- a/ports/tgbot-cpp/vcpkg.json +++ b/ports/tgbot-cpp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "tgbot-cpp", - "version-string": "1.2.1", - "port-version": 1, + "version": "1.3", "description": "C++14 library for Telegram bot API.", "homepage": "https://github.com/reo7sp/tgbot-cpp", + "license": "MIT", "dependencies": [ "boost-algorithm", "boost-asio", @@ -14,6 +14,10 @@ "boost-variant", "curl", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 32ce27cfa3da9c..5df9a442daa4b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6877,8 +6877,8 @@ "port-version": 3 }, "tgbot-cpp": { - "baseline": "1.2.1", - "port-version": 1 + "baseline": "1.3", + "port-version": 0 }, "tgc": { "baseline": "2019-08-11", diff --git a/versions/t-/tgbot-cpp.json b/versions/t-/tgbot-cpp.json index 221b6611c30d5f..e21e04e02cf8f0 100644 --- a/versions/t-/tgbot-cpp.json +++ b/versions/t-/tgbot-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6256e56c77c074f61eaf4dda7bb2962e13e8e4b", + "version": "1.3", + "port-version": 0 + }, { "git-tree": "a48e654a56a7017acf3d0f0b119a96e9235119f9", "version-string": "1.2.1", From baae2dd60b81c77ec6a3f410236ca328ce9e1c34 Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Wed, 6 Apr 2022 23:38:58 +0200 Subject: [PATCH 150/217] [rendergraph] Add port. (#23955) * [rendergraph] Add port. * Fixed vulkan-headers dependency ? * Disabled x86 and uwp builds. * Bumped commit ID. * better git submodules Co-authored-by: nicole mazzuca --- ports/rendergraph/portfile.cmake | 37 ++++++++++++++++++++++++++++++++ ports/rendergraph/vcpkg.json | 19 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/r-/rendergraph.json | 9 ++++++++ 4 files changed, 69 insertions(+) create mode 100644 ports/rendergraph/portfile.cmake create mode 100644 ports/rendergraph/vcpkg.json create mode 100644 versions/r-/rendergraph.json diff --git a/ports/rendergraph/portfile.cmake b/ports/rendergraph/portfile.cmake new file mode 100644 index 00000000000000..c94a695917ad2e --- /dev/null +++ b/ports/rendergraph/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO DragonJoker/RenderGraph + REF 602d8b6f1f027cea2173be16de6ff30d5d8f79e5 + HEAD_REF master + SHA512 4c57983febad7188a69c8fd214e185e62fbab04b926f3efee97bbf3e70387ab6f742b6f62b0a8bf3dde63c174415ab5a793abf775cd4eee37864efd6f1e06d2b +) + +vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH + REPO DragonJoker/CMakeUtils + REF e2a9d422a02dab0e04f54b3e1bc515eba652a9d1 + HEAD_REF master + SHA512 4ebd6141b9e5aa5283f31892da7108aa09fbd59292f0e98f2c9fe67577856f0af253184d41fdc16bb11094c4635401f181ea2e3abfa560adcf5c029f0d663b24 +) + +get_filename_component(SRC_PATH ${CMAKE_SOURCE_PATH} DIRECTORY) +if (EXISTS ${SRC_PATH}/CMake) + file(REMOVE_RECURSE ${SRC_PATH}/CMake) +endif() +file(RENAME ${CMAKE_SOURCE_PATH} ${SRC_PATH}/CMake) +set(CMAKE_SOURCE_PATH ${SRC_PATH}/CMake) +file(COPY ${CMAKE_SOURCE_PATH} DESTINATION ${SOURCE_PATH}) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DPROJECTS_USE_PRECOMPILED_HEADERS=ON + -DCRG_UNITY_BUILD=ON + -DCRG_BUILD_STATIC=${BUILD_STATIC} + -DVULKAN_HEADERS_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RenderGraph) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/rendergraph/vcpkg.json b/ports/rendergraph/vcpkg.json new file mode 100644 index 00000000000000..8a6094b0113cc8 --- /dev/null +++ b/ports/rendergraph/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rendergraph", + "version": "1.0.0", + "description": "Vulkan render graph implementation.", + "homepage": "https://github.com/DragonJoker/RenderGraph", + "license": "MIT", + "supports": "!x86 & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan-headers" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5df9a442daa4b0..97fcb3cfe3969f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6128,6 +6128,10 @@ "baseline": "2019-04-14", "port-version": 1 }, + "rendergraph": { + "baseline": "1.0.0", + "port-version": 0 + }, "replxx": { "baseline": "0.0.4", "port-version": 1 diff --git a/versions/r-/rendergraph.json b/versions/r-/rendergraph.json new file mode 100644 index 00000000000000..8bc394ff12c1af --- /dev/null +++ b/versions/r-/rendergraph.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d9a3f94947632fcba47a0110eecbbc8a72f5f908", + "version": "1.0.0", + "port-version": 0 + } + ] +} From eaed2c31f36c767df795fdb905f48b50b202296d Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Apr 2022 23:40:17 +0200 Subject: [PATCH 151/217] [baseline][quickfix] Don't build tests (#23945) * [quickfix] Don't build tests * version --- ports/quickfix/00001-fix-build.patch | 24 +++++++++++++++++++----- ports/quickfix/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quickfix.json | 5 +++++ 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ports/quickfix/00001-fix-build.patch b/ports/quickfix/00001-fix-build.patch index aa14d7b5c3631e..ddbd6186fdd885 100644 --- a/ports/quickfix/00001-fix-build.patch +++ b/ports/quickfix/00001-fix-build.patch @@ -1,8 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48908ead..5022a019 100644 +index 48908ead..90c17759 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -96,9 +96,12 @@ add_subdirectory(UnitTest++) +@@ -92,13 +92,13 @@ include_directories(${PYTHON_INCLUDE_DIRS}) + endif () + + if( WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" ) +-add_subdirectory(UnitTest++) ++#add_subdirectory(UnitTest++) endif() add_subdirectory(src) @@ -11,12 +16,21 @@ index 48908ead..5022a019 100644 if( WIN32) -add_subdirectory(test) +#add_subdirectory(test) -+target_compile_definitions(TestUnitTest++ PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(UnitTest++ PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(ut PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS) endif() install(DIRECTORY ${CMAKE_SOURCE_DIR}/spec/ DESTINATION share/quickfix +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cb4a60c6..d21fa995 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_subdirectory(C++) + +-if( WIN32 OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" ) ++if(0) + + add_executable(at at.cpp getopt.c) + diff --git a/src/C++/CMakeLists.txt b/src/C++/CMakeLists.txt index 07774c97..27692631 100644 --- a/src/C++/CMakeLists.txt diff --git a/ports/quickfix/vcpkg.json b/ports/quickfix/vcpkg.json index f9cc60c36dfde2..7ad5fb2a37fa47 100644 --- a/ports/quickfix/vcpkg.json +++ b/ports/quickfix/vcpkg.json @@ -1,7 +1,7 @@ { "name": "quickfix", "version": "1.15.1", - "port-version": 6, + "port-version": 7, "description": "QuickFIX is a free and open source implementation of the FIX protocol.", "homepage": "https://github.com/quickfix/quickfix", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 97fcb3cfe3969f..5a94b6294b68ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6002,7 +6002,7 @@ }, "quickfix": { "baseline": "1.15.1", - "port-version": 6 + "port-version": 7 }, "quill": { "baseline": "1.6.3", diff --git a/versions/q-/quickfix.json b/versions/q-/quickfix.json index dc3fb096ce29f3..87b646b8922978 100644 --- a/versions/q-/quickfix.json +++ b/versions/q-/quickfix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73e9e7e7bcc08f6f0f491d68cd2ff93f5571353f", + "version": "1.15.1", + "port-version": 7 + }, { "git-tree": "a9ec8c3d5dfd310a3f5d5c54bebc6030b4cad0c6", "version": "1.15.1", From 59facb4cf71bff961a7a7fe18ffa07539c19183f Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Apr 2022 23:42:04 +0200 Subject: [PATCH 152/217] [clblast] Fix static build (#23943) * [clblast] Fix static build * version * Fix config path * version * Fix release only builds * version --- ports/clblast/portfile.cmake | 23 ++++++++--------------- ports/clblast/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/c-/clblast.json | 5 +++++ 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake index 72b414d9164107..74e7e3d4b87f89 100644 --- a/ports/clblast/portfile.cmake +++ b/ports/clblast/portfile.cmake @@ -8,30 +8,23 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTUNERS=OFF ) vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - -if(VCPKG_TARGET_IS_WINDOWS) - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/clblast.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll") +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll") endif() - file(GLOB EXE "${CURRENT_PACKAGES_DIR}/bin/*.exe") - file(GLOB DEBUG_EXE "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") - if(EXE OR DEBUG_EXE) - file(REMOVE ${EXE} ${DEBUG_EXE}) - endif() endif() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clblast) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLBLast) vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/clblast/vcpkg.json b/ports/clblast/vcpkg.json index 5f90075e1b1b78..bc77f3498f545c 100644 --- a/ports/clblast/vcpkg.json +++ b/ports/clblast/vcpkg.json @@ -1,10 +1,10 @@ { "name": "clblast", "version": "1.5.2", - "port-version": 1, + "port-version": 2, "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", "homepage": "https://github.com/CNugteren/CLBlast", - "supports": "!static", + "license": "Apache-2.0", "dependencies": [ "opencl", { diff --git a/versions/baseline.json b/versions/baseline.json index 5a94b6294b68ec..b07a36c205cbf4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1398,7 +1398,7 @@ }, "clblast": { "baseline": "1.5.2", - "port-version": 1 + "port-version": 2 }, "clfft": { "baseline": "2.12.2", diff --git a/versions/c-/clblast.json b/versions/c-/clblast.json index d6f21f9022ef18..8ae9e3d638a86a 100644 --- a/versions/c-/clblast.json +++ b/versions/c-/clblast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3fc8c351cba8b45e06d835b27101617a5ba74b0", + "version": "1.5.2", + "port-version": 2 + }, { "git-tree": "e85773ea54da7675b468d6fd479871899667aa3a", "version": "1.5.2", From 9c23685b57f811a0664128563174e995fbd6b742 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Apr 2022 23:42:36 +0200 Subject: [PATCH 153/217] [ktx] only remove dlls in static builds (#23942) * [ktx] only remove dlls in static builds * version --- ports/ktx/portfile.cmake | 20 +++++++++++--------- ports/ktx/vcpkg.json | 10 +++++++++- versions/baseline.json | 2 +- versions/k-/ktx.json | 5 +++++ 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake index 46fa8f5dd3170d..ab105302a515c3 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -21,7 +21,7 @@ if(VCPKG_TARGET_IS_WINDOWS) "https://repo.msys2.org/msys/x86_64/util-linux-2.35.2-1-x86_64.pkg.tar.zst" ff951c2cd96d0fda87bacb505c93e4aa1f9aeb35f829c52b5a7862d05e167f69605a4927a0e7197b5ee2b2fa5cb56619ad7a6ba293ede4765fdcacedf2ed35da ) - vcpkg_add_to_path(${MSYS_ROOT}/usr/bin) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") file(REMOVE "${SOURCE_PATH}/other_include/zstd.h" @@ -36,19 +36,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vulkan KTX_FEATURE_VULKAN ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DKTX_VERSION_FULL=v${PORT_VERSION} -DKTX_FEATURE_TESTS=OFF -DKTX_FEATURE_LOADTEST_APPS=OFF -DKTX_FEATURE_STATIC_LIBRARY=${ENABLE_STATIC} ${FEATURE_OPTIONS} + DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_copy_pdbs() if(tools IN_LIST FEATURES) @@ -64,11 +63,14 @@ if(tools IN_LIST FEATURES) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ktx) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ktx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index df4492757e9850..c2d458df23e22b 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,11 +1,19 @@ { "name": "ktx", "version": "4.0.0", - "port-version": 1, + "port-version": 2, "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them", "homepage": "https://github.com/KhronosGroup/KTX-Software", "supports": "!(uwp | x86 | arm64)", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zstd" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index b07a36c205cbf4..b4a41de7f30aaa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3270,7 +3270,7 @@ }, "ktx": { "baseline": "4.0.0", - "port-version": 1 + "port-version": 2 }, "kubazip": { "baseline": "0.1.19", diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index ca6326340b5337..98609c3f7a39b3 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "048534e1a90a5e15ebf065ccfc752c9c5fea77c5", + "version": "4.0.0", + "port-version": 2 + }, { "git-tree": "2d554178c6665e285b8a480dabe83fcf72aa5514", "version": "4.0.0", From a3e9d4d0f84d6a0e040cbdac4b220b478354c093 Mon Sep 17 00:00:00 2001 From: Sam Huang Date: Wed, 6 Apr 2022 14:43:02 -0700 Subject: [PATCH 154/217] [imgui-sfml] Update to 2.5 (#23914) * [imgui-sfml] Update to 2.5 * Update version files * Formatted vcpkg.json * Update version database * Add license ID * Update version database --- ports/imgui-sfml/005-fix-imtextureid-define.patch | 9 --------- ports/imgui-sfml/portfile.cmake | 5 ++--- ports/imgui-sfml/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/i-/imgui-sfml.json | 5 +++++ 5 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 ports/imgui-sfml/005-fix-imtextureid-define.patch diff --git a/ports/imgui-sfml/005-fix-imtextureid-define.patch b/ports/imgui-sfml/005-fix-imtextureid-define.patch deleted file mode 100644 index 7444e00e57472c..00000000000000 --- a/ports/imgui-sfml/005-fix-imtextureid-define.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/imconfig-SFML.h b/imconfig-SFML.h -index ddfe05d..bd7174e 100644 ---- a/imconfig-SFML.h -+++ b/imconfig-SFML.h -@@ -24,4 +24,3 @@ - static_cast(z * 255.f), static_cast(w * 255.f)); \ - } - --#define ImTextureID unsigned int diff --git a/ports/imgui-sfml/portfile.cmake b/ports/imgui-sfml/portfile.cmake index 3e84f0df11a3d0..deb2e8e42f300f 100644 --- a/ports/imgui-sfml/portfile.cmake +++ b/ports/imgui-sfml/portfile.cmake @@ -3,13 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliasdaler/imgui-sfml - REF 9cc8c57a4565551087be0d9aeb3ae55490aa1207 #v2.4 - SHA512 d44d85e44d17d05c4e21f71acbf5bf544364a9bbe4871be896edd29f9926948cd1ea7627b7d54524f7da64c494638fc126744ced57ea7997a4b712dd26eb6183 + REF 004efd85a590343e8c9d166dc9d2524c199c9450 #v2.5 + SHA512 feb11f0a52f89eedc5af4c686b71290a48d69e7bc371f29536eb51752d00b6879d642625f494035d2ccc0500878757709afa2a3810ac17496506db754a3a4ed6 HEAD_REF master PATCHES 0001-fix_find_package.patch 004-fix-find-sfml.patch - 005-fix-imtextureid-define.patch ) vcpkg_cmake_configure( diff --git a/ports/imgui-sfml/vcpkg.json b/ports/imgui-sfml/vcpkg.json index b0fbb42503b888..a01204e05cbcbb 100644 --- a/ports/imgui-sfml/vcpkg.json +++ b/ports/imgui-sfml/vcpkg.json @@ -1,9 +1,9 @@ { "name": "imgui-sfml", - "version": "2.4", - "port-version": 1, + "version": "2.5", "description": "ImGui binding for use with SFML", "homepage": "https://github.com/eliasdaler/imgui-sfml", + "license": "MIT", "dependencies": [ "imgui", "opengl", diff --git a/versions/baseline.json b/versions/baseline.json index b4a41de7f30aaa..672a5299146fd3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2897,8 +2897,8 @@ "port-version": 0 }, "imgui-sfml": { - "baseline": "2.4", - "port-version": 1 + "baseline": "2.5", + "port-version": 0 }, "imguizmo": { "baseline": "1.83", diff --git a/versions/i-/imgui-sfml.json b/versions/i-/imgui-sfml.json index d97501fde9a45a..21b4db84f889d7 100644 --- a/versions/i-/imgui-sfml.json +++ b/versions/i-/imgui-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ece0f7736052672d61d85745b1fb6a3b1362720", + "version": "2.5", + "port-version": 0 + }, { "git-tree": "5a40fbdee68d1f6157c8b5e0784fb701b290d0cc", "version": "2.4", From 620e68b9b5ef8c94ee4c6cad42c746a0083118c4 Mon Sep 17 00:00:00 2001 From: Prateek Joshi Date: Thu, 7 Apr 2022 03:16:26 +0530 Subject: [PATCH 155/217] [hps] Add new port (#23946) * Added hps port * Update version database * added quotes around variables in portfile.cmake * Updated versions/h-/hps.json * add usage file Co-authored-by: Prateek Joshi Co-authored-by: nicole mazzuca --- ports/hps/portfile.cmake | 20 ++++++++++++++++++++ ports/hps/usage | 4 ++++ ports/hps/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/h-/hps.json | 9 +++++++++ 5 files changed, 44 insertions(+) create mode 100644 ports/hps/portfile.cmake create mode 100644 ports/hps/usage create mode 100644 ports/hps/vcpkg.json create mode 100644 versions/h-/hps.json diff --git a/ports/hps/portfile.cmake b/ports/hps/portfile.cmake new file mode 100644 index 00000000000000..2104177fe393ce --- /dev/null +++ b/ports/hps/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jl2922/hps + REF 8d1403697a2fad6ddf02c7afb190596ca68b2105 + SHA512 e0c22de8a684891a5b6faa968c72782ffb44c5359ce53a4cbd74abf5e1b6d5d1ff30ce96a4fc4c38fc7a0222d6874eab47b76c5a87fce1c43285a915d0f55814 + HEAD_REF master +) + +# Install header files +file(INSTALL + DIRECTORY + "${SOURCE_PATH}/src/" + DESTINATION + "${CURRENT_PACKAGES_DIR}/include/${PORT}" + FILES_MATCHING PATTERN "*.h" ) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/benchmark") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hps/usage b/ports/hps/usage new file mode 100644 index 00000000000000..198508212306b3 --- /dev/null +++ b/ports/hps/usage @@ -0,0 +1,4 @@ +The package hps is header only and can be used from CMake via: + + find_path(HPS_INCLUDE_DIRS "hps/hps.h") + target_include_directories(main PRIVATE ${HPS_INCLUDE_DIRS}) diff --git a/ports/hps/vcpkg.json b/ports/hps/vcpkg.json new file mode 100644 index 00000000000000..2e57b32691a763 --- /dev/null +++ b/ports/hps/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "hps", + "version-date": "2022-01-18", + "description": "A C++11 High Performance Serialization Library.", + "homepage": "https://github.com/jl2922/hps", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 672a5299146fd3..315d1ad2b990a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2756,6 +2756,10 @@ "baseline": "1.0.2", "port-version": 3 }, + "hps": { + "baseline": "2022-01-18", + "port-version": 0 + }, "hpx": { "baseline": "1.7.1", "port-version": 5 diff --git a/versions/h-/hps.json b/versions/h-/hps.json new file mode 100644 index 00000000000000..c969995e14528c --- /dev/null +++ b/versions/h-/hps.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8a0ec99ea7523e63fdb09fcf0eeda02739160688", + "version-date": "2022-01-18", + "port-version": 0 + } + ] +} From 8807db6a7fb32699e1aa0ac0c63e6dc87e00dbbf Mon Sep 17 00:00:00 2001 From: "yuehua.jia" Date: Thu, 7 Apr 2022 05:56:27 +0800 Subject: [PATCH 156/217] [proxygen]: fix dependency (#22834) * [proxygen]: fix dependency * [proxygen]: fix zstd zlib dependency --- ports/proxygen/fix-zstd-zlib-dependency.patch | 30 +++++++++++++++++++ ports/proxygen/portfile.cmake | 1 + ports/proxygen/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/proxygen.json | 5 ++++ 5 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 ports/proxygen/fix-zstd-zlib-dependency.patch diff --git a/ports/proxygen/fix-zstd-zlib-dependency.patch b/ports/proxygen/fix-zstd-zlib-dependency.patch new file mode 100644 index 00000000000000..a56485e87c877a --- /dev/null +++ b/ports/proxygen/fix-zstd-zlib-dependency.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea22eab..6bf0f17 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,7 +74,7 @@ if (BUILD_QUIC) + else() + find_package(Fizz REQUIRED) + endif() +-find_package(Zstd REQUIRED) ++find_package(zstd CONFIG REQUIRED) + find_package(ZLIB REQUIRED) + find_package(OpenSSL REQUIRED) + find_package(Threads) +diff --git a/proxygen/lib/CMakeLists.txt b/proxygen/lib/CMakeLists.txt +index b3fa2d1..5c50ee1 100644 +--- a/proxygen/lib/CMakeLists.txt ++++ b/proxygen/lib/CMakeLists.txt +@@ -235,10 +235,10 @@ target_link_libraries( + Folly::folly + fizz::fizz + wangle::wangle +- zstd ++ $,zstd::libzstd_shared,zstd::libzstd_static> + Boost::boost + Boost::iostreams +- -lz ++ ZLIB::ZLIB + ${HTTP3_DEPEND_LIBS} + ) + diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 0901716a122b05..524f98d401cdbe 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES remove-register.patch + fix-zstd-zlib-dependency.patch ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 3b1ce8a4d4cbb5..a0f89963a6353f 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,7 @@ { "name": "proxygen", "version-string": "2022.03.21.00", + "port-version": 1, "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "supports": "!windows", diff --git a/versions/baseline.json b/versions/baseline.json index 315d1ad2b990a9..d7cae6a5a78d1a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5566,7 +5566,7 @@ }, "proxygen": { "baseline": "2022.03.21.00", - "port-version": 0 + "port-version": 1 }, "psimd": { "baseline": "2021-02-21", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 6a445cf43a3506..3b9e342522e8b5 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb9493259e80636642c06b40479c36b6b4c9cba2", + "version-string": "2022.03.21.00", + "port-version": 1 + }, { "git-tree": "3d4554283cc0401f123164636046763fa9808475", "version-string": "2022.03.21.00", From cc2dd8fed39acc588c9a9a04b1ea4d04ce5308f0 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 7 Apr 2022 00:01:51 +0200 Subject: [PATCH 157/217] [crow] update to 1.0 (#23872) * [crow] update to 1.0 * Update versions/c-/crow.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/crow/portfile.cmake | 18 ++++++++++++++---- ports/crow/vcpkg.json | 22 ++++++++++++++++++++-- versions/baseline.json | 2 +- versions/c-/crow.json | 5 +++++ 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake index 8f4e275dce7827..5f792e668d151b 100644 --- a/ports/crow/portfile.cmake +++ b/ports/crow/portfile.cmake @@ -1,11 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow - REF 87adb19e43caf5a060674a9b67a86c8ced944892 #0.3+4 - SHA512 286ff8cc2167a9c828130e4c9587bf62574502cca22da586bcefb4f317112b8bd9c1628976452fc2503042869f961bc08670d261a9e4595388b354c9b32b9a1a - FILE_DISAMBIGUATOR 1 + REF 4d2f26ee8ff2c96c6c93e7e2b7f5162027f2482d # v1.0+1 + SHA512 69a27ae87eaa5523905e80fd1028208f2862cdd76c467e8d12dc1cca388965edb7615ae102bc1af13d824ad681eea17f69a42e790755f88ad57cae11b4268683 HEAD_REF master ) -file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCROW_BUILD_EXAMPLES=OFF + -DCROW_BUILD_TESTS=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Crow) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/crow/vcpkg.json b/ports/crow/vcpkg.json index db4cf47a441941..70e70f380e5133 100644 --- a/ports/crow/vcpkg.json +++ b/ports/crow/vcpkg.json @@ -1,6 +1,24 @@ { "name": "crow", - "version": "0.3.4", + "version": "1.0-1", "description": "Very fast and easy to use C++ micro web framework", - "homepage": "https://github.com/CrowCpp/crow" + "homepage": "https://github.com/CrowCpp/crow", + "license": "BSD-3-Clause", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-asio", + "boost-date-time", + "boost-functional", + "boost-lexical-cast", + "boost-optional", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index d7cae6a5a78d1a..ff7425f139f26b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1685,7 +1685,7 @@ "port-version": 2 }, "crow": { - "baseline": "0.3.4", + "baseline": "1.0-1", "port-version": 0 }, "cryptopp": { diff --git a/versions/c-/crow.json b/versions/c-/crow.json index 15360d025d2e98..703a78aca0087a 100644 --- a/versions/c-/crow.json +++ b/versions/c-/crow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e21a4fb8fd849bfe3ee8d77dbdb3a4953dd08d55", + "version": "1.0-1", + "port-version": 0 + }, { "git-tree": "7e3e9d55fe174a7a7fc05c8afdac245eea49a654", "version": "0.3.4", From 436d98da7f6f06c8dc6bfce2801c543d7cd47ee1 Mon Sep 17 00:00:00 2001 From: Christophe Calmejane Date: Thu, 7 Apr 2022 01:05:16 +0200 Subject: [PATCH 158/217] [vcpkg CMake] Fix for #18529 that broke iOS compilation (#23989) * Fix for #18529 that broke iOS compilation Fix based on https://github.com/microsoft/vcpkg/pull/23001 * Updated version database --- ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 6 +++++- ports/vcpkg-cmake/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt index dded67b4eceef2..190455d9a66969 100644 --- a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt +++ b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -101,7 +101,11 @@ if(APPLE) string(APPEND EXTRA_FLAGS " -arch ${arch}") endforeach() if(CMAKE_OSX_DEPLOYMENT_TARGET) - string(APPEND EXTRA_FLAGS " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") + if(CMAKE_SYSTEM_NAME STREQUAL "iOS") + string(APPEND EXTRA_FLAGS " -mios-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + string(APPEND EXTRA_FLAGS " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") + endif() endif() endif() if(CMAKE_CXX_COMPILER_TARGET) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 7cf193990473d9..cc7dd6bd0b36ac 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-02-14", + "version-date": "2022-04-05", "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index ff7425f139f26b..3e1afbc333755f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7277,7 +7277,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-02-14", + "baseline": "2022-04-05", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 56a6f595e74967..a5fd961e588c33 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34d8604d164edd2903bdb833adf30fe1516c9982", + "version-date": "2022-04-05", + "port-version": 0 + }, { "git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b", "version-date": "2022-02-14", From bfba97651403d117cd9218e1577beabe5fd5f634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 7 Apr 2022 22:45:25 +0800 Subject: [PATCH 159/217] [vcpkg baseline][cairo] Add option atomic-ops and disable it (#23999) * [vcpkg baseline][cairo] Add option atomic-ops and disable it * version * Apply suggestion * version --- ports/cairo/disable-atomic-ops-check.patch | 13 +++++++++++++ ports/cairo/portfile.cmake | 12 +++++++----- ports/cairo/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cairo.json | 5 +++++ 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 ports/cairo/disable-atomic-ops-check.patch diff --git a/ports/cairo/disable-atomic-ops-check.patch b/ports/cairo/disable-atomic-ops-check.patch new file mode 100644 index 00000000000000..b7768013d0fb58 --- /dev/null +++ b/ports/cairo/disable-atomic-ops-check.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index e3ec5d9..7b20c0c 100644 +--- a/meson.build ++++ b/meson.build +@@ -870,7 +870,7 @@ if cc.links(files('meson-cc-tests/atomic-ops-cxx11.c'), name: 'Atomic ops: cxx11 + conf.set('HAVE_CXX11_ATOMIC_PRIMITIVES', 1) + elif cc.links(files('meson-cc-tests/atomic-ops-gcc-legacy.c'), name: 'Atomic ops: gcc legacy') + conf.set('HAVE_GCC_LEGACY_ATOMICS', 1) +-elif cc.has_header('atomic_ops.h') ++elif false + conf.set('HAVE_LIB_ATOMIC_OPS', 1) + elif cc.has_header('libkern/OSAtomic.h') + conf.set('HAVE_OS_ATOMIC_OPS', 1) diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index f52af9b502a2bd..6eff7ba436f966 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -7,7 +7,9 @@ vcpkg_from_gitlab( REF b43e7c6f3cf7855e16170a06d3a9c7234c60ca94 #v1.17.6 SHA512 2d8f0cbb11638610eda104a370bb8450e28d835852b0f861928738a60949e0aaba7a554a9f9efabbefda10a37616d4cd0d3021b3fbb4ced1d52db1edb49bc358 HEAD_REF master - PATCHES cairo_static_fix.patch + PATCHES + cairo_static_fix.patch + disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554 ) if("fontconfig" IN_LIST FEATURES) @@ -48,7 +50,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} -Dtests=disabled -Dzlib=enabled @@ -70,9 +72,6 @@ else() endif() file(WRITE ${_file} "${CAIRO_H}") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() @@ -86,3 +85,6 @@ vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 2e4e890662e68d..1f65b37aac5a33 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cairo", "version": "1.17.6", + "port-version": 1, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "license": "MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 3e1afbc333755f..5d31b8fedf3e61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1222,7 +1222,7 @@ }, "cairo": { "baseline": "1.17.6", - "port-version": 0 + "port-version": 1 }, "cairomm": { "baseline": "1.16.1", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 8cc079259af131..bedb50249f7e05 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f43fb974219928aea5f95efc7c61f27b49051a28", + "version": "1.17.6", + "port-version": 1 + }, { "git-tree": "9f67515a6cf8aaeb6c9dcd2263ce913bd596249d", "version": "1.17.6", From 1b3a783ff15f57bad30bc5fe235e7bca86109706 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 7 Apr 2022 16:48:06 +0200 Subject: [PATCH 160/217] [openssl] Fix building in Release only mode (#24004) * [openssl] Fix building in Release only mode Signed-off-by: Vitalii Koshura * Update ports/openssl/windows/portfile.cmake Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Merging from FrankXie05/dev/Frank/23889 Signed-off-by: Vitalii Koshura Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- ports/openssl/portfile.cmake | 9 +++++++++ ports/openssl/vcpkg.json | 3 ++- ports/openssl/windows/portfile.cmake | 9 ++++++--- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index ff65db49b1460f..4a51777ab1e489 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -3,7 +3,16 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libressl/copyright" message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") endif() +if (VCPKG_TARGET_IS_LINUX) + message(WARNING +[[openssl currently requires the following library from the system package manager: + linux-headers +It can be installed on alpine systems via apk add linux-headers.]] + ) +endif() + set(OPENSSL_VERSION 3.0.2) + vcpkg_download_distfile( ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 8f6c3067f897ba..dd48bdec525cf8 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,9 +1,10 @@ { "name": "openssl", "version": "3.0.2", + "port-version": 1, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", - "license": "OpenSSL", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index e5356959afe52c..2e85ec5f00d432 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -122,9 +122,9 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} LOGNAME build-${TARGET_TRIPLET}-dbg-1) - + message(STATUS "Build ${TARGET_TRIPLET}-dbg done") - + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb") endif() @@ -139,8 +139,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/engines-3") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/private") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll") +if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.dll") +endif() file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.dll" "${CURRENT_PACKAGES_DIR}/bin/legacy.dll") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ossl-modules") diff --git a/versions/baseline.json b/versions/baseline.json index 5d31b8fedf3e61..63f37ea59c9561 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5142,7 +5142,7 @@ }, "openssl": { "baseline": "3.0.2", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 1ea6e851f5f691..113320c810cd84 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3505d3717ae864160fdb273eb2ec9d614eb6711e", + "version": "3.0.2", + "port-version": 1 + }, { "git-tree": "2ba2e59ee4f32c11e30aeccc0ecabc09b69c5d22", "version": "3.0.2", From 611dfc1864afbf9085d0cf3a19765c0cf01e8131 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 7 Apr 2022 16:52:15 +0200 Subject: [PATCH 161/217] [spirv-tools,spirv-reflect,spirv-headers] update ports (#23822) * update volk * spriv * Revert "update volk" This reverts commit a478ebc8674c080d98b5eb61afdd1896c6a0d2c2. * format * versions * versions * update * versions * refix includes? * version * fix header include on linux,macos * version * fix cmake fixup * fix * version * build shared * version * fix opt name * version * fix name... * version * change version to match sdk distribution version * spirv-header version * spirv reflect version --- ports/spirv-headers/portfile.cmake | 4 +- ports/spirv-headers/vcpkg.json | 2 +- ports/spirv-reflect/portfile.cmake | 4 +- ports/spirv-reflect/vcpkg.json | 3 +- ports/spirv-tools/0001-don-t-use-MP4.patch | 58 -------------- ports/spirv-tools/cmake-install.patch | 23 ------ ports/spirv-tools/install-config-typo.patch | 17 ----- ports/spirv-tools/portfile.cmake | 83 ++++++++++++++------- ports/spirv-tools/vcpkg.json | 13 +++- versions/baseline.json | 6 +- versions/s-/spirv-headers.json | 5 ++ versions/s-/spirv-reflect.json | 5 ++ versions/s-/spirv-tools.json | 5 ++ 13 files changed, 93 insertions(+), 135 deletions(-) delete mode 100644 ports/spirv-tools/0001-don-t-use-MP4.patch delete mode 100644 ports/spirv-tools/cmake-install.patch delete mode 100644 ports/spirv-tools/install-config-typo.patch diff --git a/ports/spirv-headers/portfile.cmake b/ports/spirv-headers/portfile.cmake index 2256792e987453..272746438deca3 100644 --- a/ports/spirv-headers/portfile.cmake +++ b/ports/spirv-headers/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Headers - REF bcf55210f13a4fa3c3d0963b509ff1070e434c79 - SHA512 d0553b95f28b77209862059cd0a8c15ca3340f33e13d9bb75340ced07a5aa07b8b9eaa1bdc42daa0dbf78679c3b1ef3d344c73b17518061249cdc67000568c37 + REF sdk-1.3.204.1 + SHA512 ef994e0a5232cb21377ed39ef6a941b59eb45524f1d78092a6476245e4e0fb692780e98f5cc2176fdc2fd95430cce523fa376b0eed97042523b5f14a0586955f HEAD_REF master ) diff --git a/ports/spirv-headers/vcpkg.json b/ports/spirv-headers/vcpkg.json index 53093e4ffa49fc..ff5cf7cf86289c 100644 --- a/ports/spirv-headers/vcpkg.json +++ b/ports/spirv-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-headers", - "version-date": "2021-03-25", + "version": "1.3.204.1", "description": "Machine-readable files for the SPIR-V Registry", "homepage": "https://github.com/KhronosGroup/SPIRV-Headers" } diff --git a/ports/spirv-reflect/portfile.cmake b/ports/spirv-reflect/portfile.cmake index 62d8a16b14cbcf..068652eddde3cc 100644 --- a/ports/spirv-reflect/portfile.cmake +++ b/ports/spirv-reflect/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Reflect - REF d920b79aadafe3ffd52764ac80370b15a611c83a - SHA512 3e94adb9ec80f356bd51665f10e3e1d8e6236632d259a22fab97a156c6cf6fcbd1afc102ac4578fa3f3725b6cc0cbdf530c85fa133154d6c4e313324c1d6bbf4 + REF sdk-1.3.204.1 + SHA512 af0bfcb7a8565cbd981034900760d304792e9dfb0a166b712e3506475fdeff282e0ba0f02d82d671ee05e7ed0792815eba654b66af0739404bf38c9e12ebf4f5 HEAD_REF master ) diff --git a/ports/spirv-reflect/vcpkg.json b/ports/spirv-reflect/vcpkg.json index fc7933148422a3..dc532e47daf3ad 100644 --- a/ports/spirv-reflect/vcpkg.json +++ b/ports/spirv-reflect/vcpkg.json @@ -1,8 +1,9 @@ { "name": "spirv-reflect", - "version-date": "2021-12-31", + "version": "1.3.204.1", "description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.", "homepage": "https://github.com/KhronosGroup/SPIRV-Reflect", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/spirv-tools/0001-don-t-use-MP4.patch b/ports/spirv-tools/0001-don-t-use-MP4.patch deleted file mode 100644 index 0203129be1b3f0..00000000000000 --- a/ports/spirv-tools/0001-don-t-use-MP4.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 8247f6f..e28f6ee 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -420,7 +420,3 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) - install(FILES ${CMAKE_BINARY_DIR}/${SPIRV_TOOLS}Config.cmake DESTINATION ${PACKAGE_DIR}) - endif(ENABLE_SPIRV_TOOLS_INSTALL) - --if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))) -- # Enable parallel builds across four cores for this lib -- add_definitions(/MP4) --endif() -diff --git a/source/fuzz/CMakeLists.txt b/source/fuzz/CMakeLists.txt -index 804fcf0..4915f07 100644 ---- a/source/fuzz/CMakeLists.txt -+++ b/source/fuzz/CMakeLists.txt -@@ -419,10 +419,6 @@ if(SPIRV_BUILD_FUZZER) - ${CMAKE_CURRENT_BINARY_DIR}/protobufs/spvtoolsfuzz.pb.cc - ) - -- if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))) -- # Enable parallel builds across four cores for this lib -- add_definitions(/MP4) -- endif() - - spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz) - -diff --git a/source/opt/CMakeLists.txt b/source/opt/CMakeLists.txt -index 88d5658..e3faab7 100644 ---- a/source/opt/CMakeLists.txt -+++ b/source/opt/CMakeLists.txt -@@ -218,11 +218,6 @@ set(SPIRV_TOOLS_OPT_SOURCES - wrap_opkill.cpp - ) - --if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))) -- # Enable parallel builds across four cores for this lib -- add_definitions(/MP4) --endif() -- - spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch_source_opt) - - add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES}) -diff --git a/source/reduce/CMakeLists.txt b/source/reduce/CMakeLists.txt -index e589ad5..b93a37b 100644 ---- a/source/reduce/CMakeLists.txt -+++ b/source/reduce/CMakeLists.txt -@@ -71,10 +71,6 @@ set(SPIRV_TOOLS_REDUCE_SOURCES - simple_conditional_branch_to_branch_reduction_opportunity.cpp - ) - --if(MSVC AND (NOT ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))) -- # Enable parallel builds across four cores for this lib -- add_definitions(/MP4) --endif() - - spvtools_pch(SPIRV_TOOLS_REDUCE_SOURCES pch_source_reduce) - diff --git a/ports/spirv-tools/cmake-install.patch b/ports/spirv-tools/cmake-install.patch deleted file mode 100644 index ef21cb8f0ca3c1..00000000000000 --- a/ports/spirv-tools/cmake-install.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6ed56a8..66d1e66 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -210,15 +210,9 @@ else() - endif() - - if(ENABLE_SPIRV_TOOLS_INSTALL) -- if(WIN32) -- macro(spvtools_config_package_dir TARGET PATH) -- set(${PATH} ${TARGET}/cmake) -- endmacro() -- else() -- macro(spvtools_config_package_dir TARGET PATH) -- set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET}) -- endmacro() -- endif() -+ macro(spvtools_config_package_dir TARGET PATH) -+ set(${PATH} ${CMAKE_INSTALL_DATADIR}/${TARGET}) -+ endmacro() - - macro(spvtools_generate_config_file TARGET) - file(WRITE ${CMAKE_BINARY_DIR}/${TARGET}Config.cmake diff --git a/ports/spirv-tools/install-config-typo.patch b/ports/spirv-tools/install-config-typo.patch deleted file mode 100644 index c356f4b52ba868..00000000000000 --- a/ports/spirv-tools/install-config-typo.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/source/reduce/CMakeLists.txt b/source/reduce/CMakeLists.txt -index 51e9b1d..90b1cb7 100644 ---- a/source/reduce/CMakeLists.txt -+++ b/source/reduce/CMakeLists.txt -@@ -96,10 +96,10 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- export(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTarget.cmake) -+ export(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTargets.cmake) - - spvtools_config_package_dir(SPIRV-Tools-reduce PACKAGE_DIR) -- install(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTarget.cmake -+ install(EXPORT SPIRV-Tools-reduceTargets FILE SPIRV-Tools-reduceTargets.cmake - DESTINATION ${PACKAGE_DIR}) - - spvtools_generate_config_file(SPIRV-Tools-reduce) diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index 670b70a468a921..3997af9ef9883b 100644 --- a/ports/spirv-tools/portfile.cmake +++ b/ports/spirv-tools/portfile.cmake @@ -1,15 +1,8 @@ - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Tools - REF v2021.1 - SHA512 e8478eacb86415f75a1e5b3f66a0508b01a9f7e9d8b070eb0329ca56be137f5543dd42125a1033cb8552c01f46e11affd7fda866231b3742c66de9b4341930d5 - PATCHES - cmake-install.patch - install-config-typo.patch - 0001-don-t-use-MP4.patch + REF v2022.1 + SHA512 19ff4386c74c15f9b870d5348b76c7d643da5bf1637b1faed153d9ec9f00de941a83a22782f169b4aa5001c715721937c3bb3bc07541a60e503a0455a1d2287e ) vcpkg_find_acquire_program(PYTHON3) @@ -25,33 +18,71 @@ else() set(SKIP_EXECUTABLES OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSPIRV-Headers_SOURCE_DIR=${CURRENT_INSTALLED_DIR} -DSPIRV_WERROR=OFF - -DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES} # option SPIRV_SKIP_TESTS follows this value + -DSPIRV_SKIP_TESTS=ON + -DSPIRV_SKIP_EXECUTABLES=${SKIP_EXECUTABLES} -DENABLE_SPIRV_TOOLS_INSTALL=${TOOLS_INSTALL} -DSPIRV_TOOLS_BUILD_STATIC=ON + -DENABLE_SPIRV_TOOLS_INSTALL=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools TARGET_PATH share/SPIRV-Tools) # the directory name is capitalized as opposed to the package name -vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-link TARGET_PATH share/SPIRV-Tools-link) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-opt TARGET_PATH share/SPIRV-Tools-opt) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/SPIRV-Tools-reduce TARGET_PATH share/SPIRV-Tools-reduce) +vcpkg_cmake_install() + # the directory name is capitalized as opposed to the port name +if(WIN32) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools/cmake PACKAGE_NAME SPIRV-Tools) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-link/cmake PACKAGE_NAME SPIRV-Tools-link) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-lint/cmake PACKAGE_NAME SPIRV-Tools-lint) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-opt/cmake PACKAGE_NAME SPIRV-Tools-opt) + vcpkg_cmake_config_fixup(CONFIG_PATH SPIRV-Tools-reduce/cmake PACKAGE_NAME SPIRV-Tools-reduce) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools PACKAGE_NAME SPIRV-Tools DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-link PACKAGE_NAME SPIRV-Tools-link DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-lint PACKAGE_NAME SPIRV-Tools-lint DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-opt PACKAGE_NAME SPIRV-Tools-opt DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SPIRV-Tools-reduce PACKAGE_NAME SPIRV-Tools-reduce) # now delete +endif() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") # only static linkage, i.e. no need to preserve .dll/.so files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/SPIRV-Tools-shared.dll") -file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libSPIRV-Tools-shared.so") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libSPIRV-Tools-shared.so") if(TOOLS_INSTALL) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_copy_tools( + TOOL_NAMES + spirv-as + spirv-cfg + spirv-dis + spirv-link + spirv-lint + spirv-opt + spirv-reduce + spirv-val + AUTO_CLEAN + ) +endif() + +if(WIN32) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-link" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-lint" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-opt" + "${CURRENT_PACKAGES_DIR}/debug/SPIRV-Tools-reduce" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-link" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-lint" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-opt" + "${CURRENT_PACKAGES_DIR}/SPIRV-Tools-reduce" + ) +endif() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # lesspipe.sh is the only file there + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spirv-tools/vcpkg.json b/ports/spirv-tools/vcpkg.json index bbd48de51ae83e..01d71eb66c1c8e 100644 --- a/ports/spirv-tools/vcpkg.json +++ b/ports/spirv-tools/vcpkg.json @@ -1,9 +1,18 @@ { "name": "spirv-tools", - "version-string": "2021.1", + "version": "2022.1", "description": "API and commands for processing SPIR-V modules", "homepage": "https://github.com/KhronosGroup/SPIRV-Tools", + "license": "Apache-2.0", "dependencies": [ - "spirv-headers" + "spirv-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 63f37ea59c9561..a4355417cb0fcd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6665,15 +6665,15 @@ "port-version": 2 }, "spirv-headers": { - "baseline": "2021-03-25", + "baseline": "1.3.204.1", "port-version": 0 }, "spirv-reflect": { - "baseline": "2021-12-31", + "baseline": "1.3.204.1", "port-version": 0 }, "spirv-tools": { - "baseline": "2021.1", + "baseline": "2022.1", "port-version": 0 }, "spix": { diff --git a/versions/s-/spirv-headers.json b/versions/s-/spirv-headers.json index 4922cc971a8102..99267955d99c89 100644 --- a/versions/s-/spirv-headers.json +++ b/versions/s-/spirv-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b51afa759a0312e325533a909418ed5b7803cda", + "version": "1.3.204.1", + "port-version": 0 + }, { "git-tree": "28d7c25f7908e3ac693c769c3ce6474855a05bcb", "version-date": "2021-03-25", diff --git a/versions/s-/spirv-reflect.json b/versions/s-/spirv-reflect.json index 84a3fee89bdac1..ced99692dd1f74 100644 --- a/versions/s-/spirv-reflect.json +++ b/versions/s-/spirv-reflect.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca2155d2cbf6c3493ac3129f333308976975cb50", + "version": "1.3.204.1", + "port-version": 0 + }, { "git-tree": "bcebcfdd9e9332b68c4185b3127fc898fc91402a", "version-date": "2021-12-31", diff --git a/versions/s-/spirv-tools.json b/versions/s-/spirv-tools.json index 26c205513f1ee6..7d6a5510b407a5 100644 --- a/versions/s-/spirv-tools.json +++ b/versions/s-/spirv-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "459985359177e0c0774ac341db9721650499844b", + "version": "2022.1", + "port-version": 0 + }, { "git-tree": "c18f04e12fa671a9067896ccdf8c932601f81115", "version-string": "2021.1", From c3ff2bffff87e4c268b30dbbcf657eef4a895df5 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Thu, 7 Apr 2022 10:55:26 -0400 Subject: [PATCH 162/217] [DiscordCoreAPI] Adding DiscordCoreAPI Discord bot library package. (#23895) --- ports/discordcoreapi/portfile.cmake | 35 +++++++++++++++++++++++++++++ ports/discordcoreapi/vcpkg.json | 25 +++++++++++++++++++++ scripts/ci.baseline.txt | 4 ++++ versions/baseline.json | 4 ++++ versions/d-/discordcoreapi.json | 9 ++++++++ 5 files changed, 77 insertions(+) create mode 100644 ports/discordcoreapi/portfile.cmake create mode 100644 ports/discordcoreapi/vcpkg.json create mode 100644 versions/d-/discordcoreapi.json diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake new file mode 100644 index 00000000000000..d61b1814374336 --- /dev/null +++ b/ports/discordcoreapi/portfile.cmake @@ -0,0 +1,35 @@ +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "Discordcoreapi only supports g++ 11 on linux.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO RealTimeChris/DiscordCoreAPI + REF 6d7c899f0690513855119aa225259dccf17b10f0 + SHA512 ff42ed8ae799b8f875158842c47fcb5612a5b8861dbfb442c97ab131d952ed59140b2d2431a0d389aefbecb122263f340ff9c8fb863466d0aa91875f8080616e + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION) + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file( + INSTALL "${SOURCE_PATH}/License" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json new file mode 100644 index 00000000000000..e9b175b3ea88f1 --- /dev/null +++ b/ports/discordcoreapi/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "discordcoreapi", + "version-date": "2022-03-30", + "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", + "homepage": "https://discordcoreapi.com", + "license": "AGPL-3.0-or-later", + "supports": "(windows & x64 & !static) | (linux & x64)", + "dependencies": [ + "curl", + "ffmpeg", + "glib", + "libsodium", + "nlohmann-json", + "openssl", + "opus", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 96581b199b7927..7c50ecc6f9e203 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -222,6 +222,10 @@ discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail discord-rpc:x64-uwp=fail + +# requires g++11 +discordcoreapi:x64-linux=fail + dmlc:arm-uwp=fail dmlc:x64-uwp=fail dpdk:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index a4355417cb0fcd..2c3143ceb6f344 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1884,6 +1884,10 @@ "baseline": "3.4.0", "port-version": 1 }, + "discordcoreapi": { + "baseline": "2022-03-30", + "port-version": 0 + }, "discount": { "baseline": "2.2.6", "port-version": 1 diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json new file mode 100644 index 00000000000000..b895d0164b2d86 --- /dev/null +++ b/versions/d-/discordcoreapi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d7e58144cce6a1eeda7ae8cac47726a9edddfbec", + "version-date": "2022-03-30", + "port-version": 0 + } + ] +} From d0f5e56832d5370ab6962f7f660ccba7b484ff61 Mon Sep 17 00:00:00 2001 From: evpobr Date: Thu, 7 Apr 2022 20:05:01 +0500 Subject: [PATCH 163/217] [libsndfile] Update to 1.1.0 (#23800) * [libsndfile] Update to 1.1.0 * Update to 1.1.0 * Add `mpeg` and `regtest` features to sync with upstream. * Add fix for mp3lame * Stop using deprecated functions * Update versions * Update fix * Update versions * More fixes * More updates --- ports/libsndfile/fix-mp3lame.patch | 73 ++++++++++++++++++++++++++++++ ports/libsndfile/fix-uwp.patch | 14 ++++++ ports/libsndfile/portfile.cmake | 26 +++++++---- ports/libsndfile/vcpkg.json | 38 ++++++++++++++-- versions/baseline.json | 2 +- versions/l-/libsndfile.json | 5 ++ 6 files changed, 145 insertions(+), 13 deletions(-) create mode 100644 ports/libsndfile/fix-mp3lame.patch create mode 100644 ports/libsndfile/fix-uwp.patch diff --git a/ports/libsndfile/fix-mp3lame.patch b/ports/libsndfile/fix-mp3lame.patch new file mode 100644 index 00000000000000..9b7d2162e962de --- /dev/null +++ b/ports/libsndfile/fix-mp3lame.patch @@ -0,0 +1,73 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b1b49e9..ae8ebec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,7 @@ set_package_properties (FLAC PROPERTIES + DESCRIPTION "Free Lossless Audio Codec Library" + PURPOSE "Enables FLAC support" + ) +-set_package_properties (Lame PROPERTIES ++set_package_properties (mp3lame PROPERTIES + TYPE RECOMMENDED + URL "https://lame.sourceforge.io/" + DESCRIPTION "High quality MPEG Audio Layer III (MP3) encoder" +@@ -237,20 +237,7 @@ if (INSTALL_PKGCONFIG_MODULE) + endif () + if (ENABLE_MPEG) + set (EXTERNAL_MPEG_REQUIRE "libmpg123") +- get_filename_component(LAME_WE ${LAME_LIBRARY} NAME_WE) +- if (LAME_HIP_LIBRARY) +- get_filename_component(LAME_HIP_WE ${LAME_HIP_LIBRARY} NAME_WE) +- endif () +- if (CMAKE_IMPORT_LIBRARY_PREFIX) +- string (REGEX REPLACE "^${CMAKE_IMPORT_LIBRARY_PREFIX}" "" LAME_WE_NO_PREFIX ${LAME_WE}) +- if (LAME_HIP_LIBRARY) +- string (REGEX REPLACE "^${CMAKE_IMPORT_LIBRARY_PREFIX}" "" LAME_HIP_WE_NO_PREFIX ${LAME_HIP_WE}) +- endif () +- endif () +- set (EXTERNAL_MPEG_LIBS "-l${LAME_WE_NO_PREFIX}") +- if (LAME_HIP_LIBRARY) +- set (EXTERNAL_MPEG_LIBS "${MPEG_LIBS} -l${LAME_HIP_WE}") +- endif () ++ set (EXTERNAL_MPEG_LIBS "-lmp3lame") + endif () + + configure_file (sndfile.pc.in sndfile.pc @ONLY) +@@ -411,7 +398,7 @@ target_link_libraries (sndfile + $<$,$,$>:Speex::Speex> + $<$:Opus::opus> + $<$:MPG123::libmpg123> +- $<$:Lame::Lame> ++ $<$:mp3lame::mp3lame> + ) + set_target_properties (sndfile PROPERTIES + PUBLIC_HEADER "${sndfile_HDRS}" +diff --git a/cmake/SndFileChecks.cmake b/cmake/SndFileChecks.cmake +index f5d5994..2e09ba6 100644 +--- a/cmake/SndFileChecks.cmake ++++ b/cmake/SndFileChecks.cmake +@@ -56,9 +56,9 @@ else () + set (HAVE_EXTERNAL_XIPH_LIBS 0) + endif () + +-find_package (Lame) ++find_package (mp3lame) + find_package (Mpg123 1.25.10) +-if (LAME_FOUND AND (TARGET MPG123::libmpg123)) ++if (TARGET mp3lame::mp3lame AND (TARGET MPG123::libmpg123)) + set (HAVE_MPEG_LIBS 1) + else () + set (HAVE_MPEG_LIBS 0) +diff --git a/cmake/SndFileConfig.cmake.in b/cmake/SndFileConfig.cmake.in +index 1d5463a..0c98e7e 100644 +--- a/cmake/SndFileConfig.cmake.in ++++ b/cmake/SndFileConfig.cmake.in +@@ -18,7 +18,7 @@ if (SndFile_WITH_EXTERNAL_LIBS AND NOT @BUILD_SHARED_LIBS@) + endif () + + if (SndFile_WITH_MPEG AND NOT @BUILD_SHARED_LIBS@) +- find_dependency (Lame) ++ find_dependency (mp3lame) + find_dependency (MPG123) + endif () + diff --git a/ports/libsndfile/fix-uwp.patch b/ports/libsndfile/fix-uwp.patch new file mode 100644 index 00000000000000..92f0a30378caaf --- /dev/null +++ b/ports/libsndfile/fix-uwp.patch @@ -0,0 +1,14 @@ +diff --git a/src/file_io.c b/src/file_io.c +index 334ba2a..90c9608 100644 +--- a/src/file_io.c ++++ b/src/file_io.c +@@ -827,9 +827,6 @@ psf_open_handle (PSF_FILE * pfile) + } ; + + #if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) +- if (!pfile->use_wchar) +- return INVALID_HANDLE_VALUE ; +- + CREATEFILE2_EXTENDED_PARAMETERS cfParams = { 0 } ; + cfParams.dwSize = sizeof (CREATEFILE2_EXTENDED_PARAMETERS) ; + cfParams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL ; diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake index ad84e3315b43ad..7c31e3468a8dc4 100644 --- a/ports/libsndfile/portfile.cmake +++ b/ports/libsndfile/portfile.cmake @@ -1,9 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsndfile/libsndfile - REF 1.0.31 - SHA512 5767ced306f2d300aa2014d383c22f3ee9a4fe1ffb2c463405bc26209ede09a9cfb95e1c08256db36e986d2b30151c38dbe635a3cae0b7138d7de485e2084891 + REF 1.1.0 + SHA512 5e530c33165a2d2be1c22d3a4bd96f0f1817dded3a45d24bad0e3f2c7908ccc1f19327a91d5040c3ea4d591845876019180747a125bf2a6f8bd49a6f67eadacd HEAD_REF master + PATCHES + fix-mp3lame.patch + fix-uwp.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -11,24 +14,31 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES external-libs ENABLE_EXTERNAL_LIBS + FEATURES + external-libs ENABLE_EXTERNAL_LIBS + mpeg ENABLE_MPEG + regtest BUILD_REGTEST ) -vcpkg_configure_cmake( +if(VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") + set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") +endif() + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_EXAMPLES=OFF - -DBUILD_REGTEST=OFF -DBUILD_TESTING=OFF -DENABLE_BOW_DOCS=OFF -DBUILD_PROGRAMS=OFF + -DBUILD_REGTEST=OFF -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DPYTHON_EXECUTABLE=${PYTHON3} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(WIN32 AND (NOT MINGW) AND (NOT CYGWIN)) set(CONFIG_PATH cmake) @@ -36,7 +46,7 @@ else() set(CONFIG_PATH lib/cmake/SndFile) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH ${CONFIG_PATH} TARGET_PATH share/SndFile) +vcpkg_cmake_config_fixup(PACKAGE_NAME SndFile CONFIG_PATH ${CONFIG_PATH}) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) vcpkg_copy_pdbs() diff --git a/ports/libsndfile/vcpkg.json b/ports/libsndfile/vcpkg.json index e0d0acc68c3ae2..20c29ae2ae0734 100644 --- a/ports/libsndfile/vcpkg.json +++ b/ports/libsndfile/vcpkg.json @@ -1,20 +1,50 @@ { "name": "libsndfile", - "version-string": "1.0.31", - "description": "Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo", + "version-semver": "1.1.0", + "description": "A library for reading and writing audio files", "homepage": "https://github.com/erikd/libsndfile", "license": "LGPL-2.1", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ - "external-libs" + "external-libs", + "mpeg" ], "features": { + "experimental": { + "description": "Enable experimental code", + "dependencies": [ + "speex" + ] + }, "external-libs": { - "description": "Default feature. Enables Ogg Vorbis, FLAC and Ogg Opus formats support.", + "description": "Enable FLAC, Vorbis, and Opus codecs", "dependencies": [ "libflac", "libvorbis", "opus" ] + }, + "mpeg": { + "description": "Enable MPEG codecs", + "dependencies": [ + "mp3lame", + "mpg123" + ] + }, + "regtest": { + "description": "Build regtest", + "dependencies": [ + "sqlite3" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 2c3143ceb6f344..6cc00cf675c766 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3985,7 +3985,7 @@ "port-version": 1 }, "libsndfile": { - "baseline": "1.0.31", + "baseline": "1.1.0", "port-version": 0 }, "libsnoretoast": { diff --git a/versions/l-/libsndfile.json b/versions/l-/libsndfile.json index d0206cf84a9e2e..b1d58472db8b50 100644 --- a/versions/l-/libsndfile.json +++ b/versions/l-/libsndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ec8249a4721dda26735a12603defe2aa680c264", + "version-semver": "1.1.0", + "port-version": 0 + }, { "git-tree": "587283d6fa07092beece87351d1361506293ff59", "version-string": "1.0.31", From 0693b010a51f5ba44bd49851503100f74e05166b Mon Sep 17 00:00:00 2001 From: "Alison R. Wu" Date: Thu, 7 Apr 2022 09:46:17 -0700 Subject: [PATCH 164/217] [TinyCBOR] Add new port (#23887) * Add TinyCBOR port * Avoid deprecated helpers * Resolve post-build check problems * Correct baseline (should have latest version, not lowest) * Use same version-semver * No support for older versions * Static lib only * Update commit hash * Add homepage * update hash * Oops indents are off Co-authored-by: Alison Wu --- ports/tinycbor/CMakeLists.txt | 9 +++++++++ ports/tinycbor/portfile.cmake | 20 ++++++++++++++++++++ ports/tinycbor/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/t-/tinycbor.json | 9 +++++++++ 5 files changed, 58 insertions(+) create mode 100644 ports/tinycbor/CMakeLists.txt create mode 100644 ports/tinycbor/portfile.cmake create mode 100644 ports/tinycbor/vcpkg.json create mode 100644 versions/t-/tinycbor.json diff --git a/ports/tinycbor/CMakeLists.txt b/ports/tinycbor/CMakeLists.txt new file mode 100644 index 00000000000000..12fda83ed8fb16 --- /dev/null +++ b/ports/tinycbor/CMakeLists.txt @@ -0,0 +1,9 @@ +cmake_minimum_required(VERSION 3.20) +project(tinycbor C) + +file(GLOB sources src/cbor*.c) +list(FILTER sources EXCLUDE REGEX "cbortojson.c$") +add_library(tinycbor ${sources}) + +install(TARGETS tinycbor) +install(FILES src/cbor.h src/cborjson.h src/tinycbor-version.h DESTINATION include) \ No newline at end of file diff --git a/ports/tinycbor/portfile.cmake b/ports/tinycbor/portfile.cmake new file mode 100644 index 00000000000000..e068692d57222b --- /dev/null +++ b/ports/tinycbor/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/tinycbor + REF v0.6.0 + SHA512 af1ed05c03d3aed56e35fdcaad3235992f96b5043b594c0246e600e4b1f085df78c5345beaac8758c2b5db2952ab83997019de5940857eecb81d84b6fb642093 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) + +vcpkg_cmake_install() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Remove duplicated include headers +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/tinycbor/vcpkg.json b/ports/tinycbor/vcpkg.json new file mode 100644 index 00000000000000..42d54acd4a4f5c --- /dev/null +++ b/ports/tinycbor/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "tinycbor", + "version-semver": "0.6.0", + "description": "Concise Binary Object Representation (CBOR) Library", + "homepage": "https://github.com/intel/tinycbor", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 6cc00cf675c766..b53842595c87e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6952,6 +6952,10 @@ "baseline": "2019-07-31", "port-version": 1 }, + "tinycbor": { + "baseline": "0.6.0", + "port-version": 0 + }, "tinycthread": { "baseline": "2019-08-06", "port-version": 1 diff --git a/versions/t-/tinycbor.json b/versions/t-/tinycbor.json new file mode 100644 index 00000000000000..11e624ee4f94b5 --- /dev/null +++ b/versions/t-/tinycbor.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ecf65457801ba4aa8d8ae75886f87e740fb04783", + "version-semver": "0.6.0", + "port-version": 0 + } + ] +} From 2f453910f2fe953b69eba5f0ec9eed411e1e6af7 Mon Sep 17 00:00:00 2001 From: Sandy Date: Thu, 7 Apr 2022 12:47:57 -0400 Subject: [PATCH 165/217] [openxr-loader] Fix package name and enable arm (#23928) --- ports/openxr-loader/portfile.cmake | 6 +++--- ports/openxr-loader/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/o-/openxr-loader.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake index 275d15b4081f64..04a518602f4190 100644 --- a/ports/openxr-loader/portfile.cmake +++ b/ports/openxr-loader/portfile.cmake @@ -69,9 +69,9 @@ foreach(HEADER ${HEADER_LIST}) endforeach() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -else(VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/openxr) + vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH lib/cmake/openxr) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/openxr-loader/vcpkg.json b/ports/openxr-loader/vcpkg.json index ab539eacb2be37..03edc64d838937 100644 --- a/ports/openxr-loader/vcpkg.json +++ b/ports/openxr-loader/vcpkg.json @@ -1,10 +1,11 @@ { "name": "openxr-loader", "version": "1.0.22", - "port-version": 1, + "port-version": 2, "description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices", "homepage": "https://github.com/KhronosGroup/OpenXR-SDK", - "supports": "!(arm | uwp)", + "license": "Apache-2.0", + "supports": "!uwp", "dependencies": [ "jsoncpp", { diff --git a/versions/baseline.json b/versions/baseline.json index b53842595c87e2..b8611988fc0cee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5186,7 +5186,7 @@ }, "openxr-loader": { "baseline": "1.0.22", - "port-version": 1 + "port-version": 2 }, "optimus-cpp": { "baseline": "0.3.0", diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json index 7ccb3bc16ff0da..48a62f3377f9f2 100644 --- a/versions/o-/openxr-loader.json +++ b/versions/o-/openxr-loader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27baef30397d0db0e6cc01d6f60a86e2ff4df238", + "version": "1.0.22", + "port-version": 2 + }, { "git-tree": "9d673fe500c4b38f0806bd4b3c23a82bba897967", "version": "1.0.22", From e025a0985426f76894ae31a58a432c33210a57ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 8 Apr 2022 00:57:56 +0800 Subject: [PATCH 166/217] [cub] Update to 1.16.0 (#24000) * [cub] Update to 1.16.0 * version --- ports/cub/fix-usage.patch | 24 ++++++++++++++++++++++++ ports/cub/portfile.cmake | 28 ++++++++++++++++++++++++---- ports/cub/usage | 4 ++++ ports/cub/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/c-/cub.json | 5 +++++ 6 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 ports/cub/fix-usage.patch create mode 100644 ports/cub/usage diff --git a/ports/cub/fix-usage.patch b/ports/cub/fix-usage.patch new file mode 100644 index 00000000000000..56801fdb9ef2d3 --- /dev/null +++ b/ports/cub/fix-usage.patch @@ -0,0 +1,24 @@ +diff --git a/cub/cmake/cub-config.cmake b/cub/cmake/cub-config.cmake +index 3d7f64b..213a95e 100644 +--- a/cub/cmake/cub-config.cmake ++++ b/cub/cmake/cub-config.cmake +@@ -8,6 +8,7 @@ if (TARGET CUB::CUB) + return() + endif() + ++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 d15c623f8b643e..69f73ad63c896f 100644 --- a/ports/cub/portfile.cmake +++ b/ports/cub/portfile.cmake @@ -1,11 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVlabs/cub - REF 7cdf6dfc7ed60e4f44d025b84ea8260755f298e6 #v1.12.0 - SHA512 aff3ba375a33844efdc57f8ba190e8880db6247bc1245340b2fe87f8933d3abfcbc7dcdffffd45cf00db4981cd2e37029061fca7161554a4c7c779a7d414aada + REF ed040d585c3237d706973d7ad290bfee40958270 #v1.16.0 + SHA512 81e0bacb0aa4ee7a1c86f3c12e3135a133579678d3530e0e0b8310f716d0355e5096925ac6de5865140a7aac08d974ea5169d47e34951b932a23965f74fe4ee6 HEAD_REF master + PATCHES fix-usage.patch ) -file(COPY ${SOURCE_PATH}/cub/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/cub) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCUB_ENABLE_INSTALL_RULES=ON + -DCUB_ENABLE_HEADER_TESTING=OFF + -DCUB_ENABLE_TESTING=OFF + -DCUB_ENABLE_EXAMPLES=OFF + -DCUB_ENABLE_CPP_DIALECT_IN_NAMES=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cub) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cub/cmake" + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -configure_file(${SOURCE_PATH}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cub/usage b/ports/cub/usage new file mode 100644 index 00000000000000..bea0cf58524b43 --- /dev/null +++ b/ports/cub/usage @@ -0,0 +1,4 @@ +The package cub is header only and can be used from CMake via: + + find_package(cub CONFIG REQUIRED) + target_include_directories(main PRIVATE CUB::CUB) diff --git a/ports/cub/vcpkg.json b/ports/cub/vcpkg.json index 85f29e6fb1fa9c..f6988759ffe79b 100644 --- a/ports/cub/vcpkg.json +++ b/ports/cub/vcpkg.json @@ -1,9 +1,18 @@ { "name": "cub", - "version": "1.12.0", + "version": "1.16.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", "dependencies": [ - "cuda" + "cuda", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index b8611988fc0cee..db7f30d8e782eb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1713,7 +1713,7 @@ "port-version": 0 }, "cub": { - "baseline": "1.12.0", + "baseline": "1.16.0", "port-version": 0 }, "cuda": { diff --git a/versions/c-/cub.json b/versions/c-/cub.json index 5478b52920ac1e..4dc47df0860c4d 100644 --- a/versions/c-/cub.json +++ b/versions/c-/cub.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6fe5c753cf67eeb18b536ea933864d15a88331d", + "version": "1.16.0", + "port-version": 0 + }, { "git-tree": "ec58db0c42a8978215a38d7e9ac938dd1b936c1f", "version": "1.12.0", From e794a09b8871d45f106e192682c9aad627e02e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Thu, 7 Apr 2022 18:58:33 +0200 Subject: [PATCH 167/217] [spdlog] Update to 1.10.0 (#24002) * [spdlog] Update to 1.10.0 * [spdlog] Update version files * [spdlog] Remove deprecated mingw patch * [spdlog] Update version files --- ports/spdlog/fix-mingw-build.patch | 13 ------------- ports/spdlog/portfile.cmake | 25 +++++++------------------ ports/spdlog/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/spdlog.json | 5 +++++ 5 files changed, 14 insertions(+), 33 deletions(-) delete mode 100644 ports/spdlog/fix-mingw-build.patch diff --git a/ports/spdlog/fix-mingw-build.patch b/ports/spdlog/fix-mingw-build.patch deleted file mode 100644 index 1abfdd350b2def..00000000000000 --- a/ports/spdlog/fix-mingw-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b969465..31e23cd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -142,7 +142,7 @@ if(SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS) - endif() - add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS}) - target_compile_definitions(spdlog PUBLIC SPDLOG_SHARED_LIB) -- if(MSVC) -+ if(MSVC AND NOT MINGW) - target_compile_options(spdlog PUBLIC $<$,$>>:/wd4251 - /wd4275>) - endif() diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 77909960b2052a..264772c85e1a2d 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -1,16 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.9.2 - SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c + REF v1.10.0 + SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666 HEAD_REF v1.x - PATCHES fix-mingw-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - benchmark SPDLOG_BUILD_BENCH - wchar SPDLOG_WCHAR_SUPPORT + benchmark SPDLOG_BUILD_BENCH + wchar SPDLOG_WCHAR_SUPPORT ) # configured in triplet file @@ -46,19 +45,9 @@ vcpkg_copy_pdbs() # use vcpkg-provided fmt library (see also option SPDLOG_FMT_EXTERNAL above) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/bundled) -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/fmt.h - "#if !defined(SPDLOG_FMT_EXTERNAL)" - "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" -) - -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/ostr.h - "#if !defined(SPDLOG_FMT_EXTERNAL)" - "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" -) - -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/fmt/chrono.h - "#if !defined(SPDLOG_FMT_EXTERNAL)" - "#if 0 // !defined(SPDLOG_FMT_EXTERNAL)" +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/spdlog/tweakme.h + "// #define SPDLOG_FMT_EXTERNAL" + "#define SPDLOG_FMT_EXTERNAL" ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index 46c4202b74dbba..b643f8bf15090e 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spdlog", - "version-semver": "1.9.2", + "version-semver": "1.10.0", "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index db7f30d8e782eb..a2def75be3960a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6645,7 +6645,7 @@ "port-version": 2 }, "spdlog": { - "baseline": "1.9.2", + "baseline": "1.10.0", "port-version": 0 }, "spectra": { diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index 3dac5575c42a07..7f9464fa02d354 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ac795913d88241171b45d796d3fe5dd38519d5a", + "version-semver": "1.10.0", + "port-version": 0 + }, { "git-tree": "1f4916f57dae6db50491857c063970d811beb33a", "version-semver": "1.9.2", From ef43498bac314a7917d74309e12f54a4a0123084 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Thu, 7 Apr 2022 09:59:18 -0700 Subject: [PATCH 168/217] [sail] Update to 0.9.0-pre21 (#24005) * [sail] Update to 0.9.0-pre21 * [sail] vcpkg x-add-version --all --overwrite-version --- ports/sail/portfile.cmake | 4 ++-- ports/sail/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sail.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index 721dfdebed7ea3..8d7c5868947c07 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HappySeaFox/sail - REF v0.9.0-pre20 - SHA512 e11e05a452b62d6ad3d4c464994f410aa4829660003299b2d75910f0e089bde52bac73cf46b1be00524b157e059607867765f90615a6f5090c6106f12589dbb8 + REF v0.9.0-pre21 + SHA512 51c23792d18b28520d04d7a097a6d46521d12107919ff76a7ff270a518beb862e4a1df89f3effb945ff908c39336bd60c5f118d6db80baf50005c05f55d2d96f HEAD_REF master ) diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index 1032649b9ba55f..fade1e92431195 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sail", - "version-semver": "0.9.0-pre20", + "version-semver": "0.9.0-pre21", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a2def75be3960a..d4647a761d8ee3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6289,7 +6289,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre20", + "baseline": "0.9.0-pre21", "port-version": 0 }, "sais": { diff --git a/versions/s-/sail.json b/versions/s-/sail.json index 2d73e0aa87f3c9..7ee6592bacb6e8 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5604acc45bd6e7fc2123a52f3742ffa674a0c2f7", + "version-semver": "0.9.0-pre21", + "port-version": 0 + }, { "git-tree": "a5a0265e855d48cc304d1e811a62e8b6f9603134", "version-semver": "0.9.0-pre20", From 8eacf9727a6454d4efd5e1222de773c69d5d8785 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 8 Apr 2022 00:59:52 +0800 Subject: [PATCH 169/217] [iir1] Fix find_package failed (#24015) * [iir1] Fix find_package failed * update version --- ports/iir1/portfile.cmake | 2 +- ports/iir1/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/iir1.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/iir1/portfile.cmake b/ports/iir1/portfile.cmake index 0cd648c67ca8f8..41dbf465fafeaf 100644 --- a/ports/iir1/portfile.cmake +++ b/ports/iir1/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(PACKAGE_NAME iir CONFIG_PATH lib/cmake/iir) vcpkg_copy_pdbs() diff --git a/ports/iir1/vcpkg.json b/ports/iir1/vcpkg.json index db60d1efbf5294..92b672b1ead642 100644 --- a/ports/iir1/vcpkg.json +++ b/ports/iir1/vcpkg.json @@ -1,6 +1,7 @@ { "name": "iir1", "version": "1.9.0", + "port-version": 1, "description": "Realtime C++ filter library", "homepage": "https://github.com/berndporr/iir1", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d4647a761d8ee3..065d929022eee9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2886,7 +2886,7 @@ }, "iir1": { "baseline": "1.9.0", - "port-version": 0 + "port-version": 1 }, "ijg-libjpeg": { "baseline": "9d", diff --git a/versions/i-/iir1.json b/versions/i-/iir1.json index 0cb293f69f330f..9bd18e4ea184e8 100644 --- a/versions/i-/iir1.json +++ b/versions/i-/iir1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "393a498a50400c062dafdefbbbdbd3d1c3daef4a", + "version": "1.9.0", + "port-version": 1 + }, { "git-tree": "45098a249e45e71b1efa228efae07950b4499be4", "version": "1.9.0", From 70fafdf69b4c8029d19e8e6dace7e5695fa180e2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Apr 2022 20:55:26 +0200 Subject: [PATCH 170/217] [vcpkg-ci-llvm] Reduce llvm artifact to cacheable size (#23896) * Reduce llvm artifact to cacheable size * Limit flang CI to osx * Trim features for CI --- scripts/test_ports/vcpkg-ci-llvm/vcpkg.json | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json index d04286b65641d6..a956452255c458 100644 --- a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json @@ -2,6 +2,7 @@ "name": "vcpkg-ci-llvm", "version-string": "0", "description": "LLVM features testing within CI.", + "license": null, "supports": "!uwp & !(arm & windows)", "dependencies": [ { @@ -9,9 +10,9 @@ "default-features": false, "features": [ "clang", - "enable-abi-breaking-checks", "disable-assertions", "disable-clang-static-analyzer", + "enable-abi-breaking-checks", "enable-bindings", "enable-eh", "enable-rtti", @@ -21,18 +22,24 @@ "lld", "lldb", "polly", - "target-all", - "tools", - "utils" + "target-aarch64", + "target-amdgpu", + "target-arm", + "target-webassembly", + "target-x86", + "tools" ] }, { + "$comment": "Only for osx artifact upload in CI succeeds when these features are enabled", "name": "llvm", "default-features": false, "features": [ - "flang" + "flang", + "target-all", + "utils" ], - "platform": "!(x86 & windows)" + "platform": "osx" } ] } From d72783cb3aeddfd667861caef1060e54ca6fa7a9 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 7 Apr 2022 13:14:47 -0700 Subject: [PATCH 171/217] [google-cloud-cpp] add new features (#24020) --- ports/google-cloud-cpp/vcpkg.json | 109 ++++++++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 ++ 3 files changed, 115 insertions(+), 1 deletion(-) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 83c3f122f81660..5036979e710ca1 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "google-cloud-cpp", "version": "1.39.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", @@ -61,6 +62,18 @@ } ] }, + "apigeeconnect": { + "description": "Apigee Connect API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "appengine": { "description": "App Engine Admin API C++ Client Library", "dependencies": [ @@ -205,6 +218,18 @@ } ] }, + "contactcenterinsights": { + "description": "Contact Center AI Insights API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "container": { "description": "Kubernetes Engine API C++ Client Library", "dependencies": [ @@ -229,6 +254,18 @@ } ] }, + "datacatalog": { + "description": "Google Cloud Data Catalog API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "datamigration": { "description": "Database Migration API C++ Client Library", "dependencies": [ @@ -241,6 +278,18 @@ } ] }, + "dataproc": { + "description": "Cloud Dataproc API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "debugger": { "description": "Stackdriver Debugger API C++ Client Library", "dependencies": [ @@ -265,6 +314,18 @@ } ] }, + "documentai": { + "description": "Cloud Document AI API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "eventarc": { "description": "Eventarc API C++ Client Library", "dependencies": [ @@ -413,6 +474,30 @@ } ] }, + "language": { + "description": "Cloud Natural Language API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "managedidentities": { + "description": "Managed Service for Microsoft Active Directory API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "memcache": { "description": "Cloud Memorystore for Memcached API C++ Client Library", "dependencies": [ @@ -509,6 +594,18 @@ } ] }, + "profiler": { + "description": "Cloud Profiler API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "pubsub": { "description": "The Google Cloud Bigtable C++ client library", "dependencies": [ @@ -557,6 +654,18 @@ } ] }, + "resourcesettings": { + "description": "Resource Settings API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "retail": { "description": "Retail API C++ Client Library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 065d929022eee9..4dc8f8d36ca744 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2574,7 +2574,7 @@ }, "google-cloud-cpp": { "baseline": "1.39.0", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 1245664a09560d..62f2f8638f101f 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f6839d85455e137c21bf5bf894e00e0327c3423", + "version": "1.39.0", + "port-version": 1 + }, { "git-tree": "ca8e8015d59f4f5e03b0a257d46506c2b0219a71", "version": "1.39.0", From 621e15608eace6b121743a4f448ce7b26968e39d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Apr 2022 21:58:32 +0200 Subject: [PATCH 172/217] [zziplib] Update to v0.13.72 (#24011) * Update zziplib to 0.13.72 * Modernize portfile * Fix formatting check Separately collect and display result from version scheme check. Ignore error from version scheme check when checking version values. Pass output also to console. * Update version scheme and license info * Update versions --- .github/workflows/untrustedPR.yml | 8 ++- .../always-find-unixcommands-on-unix.patch | 13 ---- ports/zziplib/cmake-project-include.cmake | 3 + ports/zziplib/fix-export-define.patch | 13 ---- .../install-dll-to-proper-folder.patch | 27 -------- ports/zziplib/portfile.cmake | 62 +++++++++---------- ports/zziplib/vcpkg.json | 12 +++- versions/baseline.json | 4 +- versions/z-/zziplib.json | 5 ++ 9 files changed, 56 insertions(+), 91 deletions(-) delete mode 100644 ports/zziplib/always-find-unixcommands-on-unix.patch create mode 100644 ports/zziplib/cmake-project-include.cmake delete mode 100644 ports/zziplib/fix-export-define.patch delete mode 100644 ports/zziplib/install-dll-to-proper-folder.patch diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index de91b7953aae8d..dc47a1964c8c2f 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -47,7 +47,9 @@ jobs: # HEAD^^ refers to the "main" commit that was merged into git checkout HEAD^^ -- versions git restore --staged versions - ./vcpkg x-add-version --all --skip-formatting-check > .github-pr.x-add-version.out + ./vcpkg x-add-version --all --skip-formatting-check | grep 'instead of "version-string"' | tee .github-pr.version-string.out || true + git checkout -- versions + ./vcpkg x-add-version --all --skip-formatting-check --skip-version-format-check | tee .github-pr.x-add-version.out || true git diff > .github-pr.x-add-version.diff git reset HEAD~ --mixed @@ -57,6 +59,7 @@ jobs: const { promises: fs } = require('fs') const add_version = (await fs.readFile('.github-pr.x-add-version.diff', 'utf8')).trim() const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim() + const version_string_out = (await fs.readFile('.github-pr.version-string.out', 'utf8')).trim() const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim() const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).trim() const missing_license = (await fs.readFile('.github-pr.missing-license', 'utf8')).trim() @@ -77,6 +80,9 @@ jobs: output += "```\n" + add_version_out + "\n```\n\n\n" approve = false; } + if (version_string_out !== "") { + output += version_string_out + "\n\n" + } if (add_version !== "") { output += "
After committing all other changes, the version database must be updated\n\n" output += "```sh\n" diff --git a/ports/zziplib/always-find-unixcommands-on-unix.patch b/ports/zziplib/always-find-unixcommands-on-unix.patch deleted file mode 100644 index 9d3a39ade7b975..00000000000000 --- a/ports/zziplib/always-find-unixcommands-on-unix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index 52555d4..de06eae 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -27,7 +27,7 @@ set(ZZIP_VERSION "${PROJECT_VERSION}") - set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib") - set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}") - --if(ZZIPCOMPAT) -+if(UNIX) - find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar - endif() - diff --git a/ports/zziplib/cmake-project-include.cmake b/ports/zziplib/cmake-project-include.cmake new file mode 100644 index 00000000000000..a8abb0e3bca917 --- /dev/null +++ b/ports/zziplib/cmake-project-include.cmake @@ -0,0 +1,3 @@ +if(WIN32) + add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) +endif() diff --git a/ports/zziplib/fix-export-define.patch b/ports/zziplib/fix-export-define.patch deleted file mode 100644 index b57a9a6988fcdc..00000000000000 --- a/ports/zziplib/fix-export-define.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/zzip/conf.h b/zzip/conf.h -index 27b834a..7f01456 100644 ---- a/zzip/conf.h -+++ b/zzip/conf.h -@@ -203,7 +203,7 @@ - # endif - - --#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS -+#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS || defined libzzip_EXPORTS // CMake export defines - # undef ZZIP_DLL - #define ZZIP_DLL 1 - #endif diff --git a/ports/zziplib/install-dll-to-proper-folder.patch b/ports/zziplib/install-dll-to-proper-folder.patch deleted file mode 100644 index 4361fb983aa00a..00000000000000 --- a/ports/zziplib/install-dll-to-proper-folder.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index a9f6e3a..f3a758b 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -247,12 +247,14 @@ endif() - - install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) - install(TARGETS libzzip -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(ZZIPFSEEKO) - install(FILES ${libzzipfseeko_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) - install(TARGETS libzzipfseeko -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -@@ -260,6 +262,7 @@ endif() - if(ZZIPMMAPPED) - install(FILES ${libzzipmmapped_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) - install(TARGETS libzzipmmapped -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake index 9ee3ee64d6b4f4..c771e9aa3900f1 100644 --- a/ports/zziplib/portfile.cmake +++ b/ports/zziplib/portfile.cmake @@ -1,38 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gdraheim/zziplib - REF 24a6c6de1956189bffcd8dffd2ef3197c6f3df29 # v0.13.71 - SHA512 246ee1d93f3f8a6889e9ab362e04e6814813844f2cdea0a782910bf07ca55ecd6d8b1c456b4180935464cebf291e7849af27ac0ed5cc080de5fb158f9f3aeffb + REF v0.13.72 + SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 PATCHES - install-dll-to-proper-folder.patch no-release-postfix.patch - fix-export-define.patch - always-find-unixcommands-on-unix.patch ) -if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(MSVC_STATIC_RUNTIME ON) -else() - set(MSVC_STATIC_RUNTIME OFF) -endif() +string(COMPARE EQUAL VCPKG_CRT_LINKAGE "static" MSVC_STATIC_RUNTIME) +string(COMPARE EQUAL VCPKG_LIBRARY_LINKAGE "static" BUILD_STATIC_LIBS) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(BUILD_STATIC_LIBS ON) -else() - set(BUILD_STATIC_LIBS OFF) -endif() - -if(VCPKG_TARGET_IS_WINDOWS) - set(ZZIPLIBTOOL OFF) -endif() - -set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME} -DZZIPMMAPPED=OFF @@ -42,15 +23,30 @@ vcpkg_configure_cmake( -DZZIPBINS=OFF -DZZIPTEST=OFF -DZZIPDOCS=OFF - -DZZIPCOMPAT=OFF - -DZZIPLIBTOOL=${ZZIPLIBTOOL} +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipfseeko.pc" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipmmapped.pc" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipfseeko.pc" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipmmapped.pc" ) -vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(READ "${SOURCE_PATH}/docs/COPYING.LIB" lgpl) +file(READ "${SOURCE_PATH}/docs/COPYING.MPL" mpl) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" +"${PORT} is shipping under a dual MPL / LGPL license where each of them +is separate and restrictions apply alternatively. -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +--- -vcpkg_fixup_pkgconfig() +${lgpl} + +--- + +${mpl} +") diff --git a/ports/zziplib/vcpkg.json b/ports/zziplib/vcpkg.json index cdbca56158e3ae..e0ede655b71b6e 100644 --- a/ports/zziplib/vcpkg.json +++ b/ports/zziplib/vcpkg.json @@ -1,10 +1,18 @@ { "name": "zziplib", - "version-string": "0.13.71", - "port-version": 3, + "version": "0.13.72", "description": "library providing read access on ZIP-archives", "homepage": "https://github.com/gdraheim/zziplib", + "license": "LGPL-2.0-or-later OR MPL-1.1", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4dc8f8d36ca744..b92593d8a91884 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7705,8 +7705,8 @@ "port-version": 3 }, "zziplib": { - "baseline": "0.13.71", - "port-version": 3 + "baseline": "0.13.72", + "port-version": 0 } } } diff --git a/versions/z-/zziplib.json b/versions/z-/zziplib.json index 708656c376de95..3aec32b519e71e 100644 --- a/versions/z-/zziplib.json +++ b/versions/z-/zziplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e09e8bf85eff5c115f9dcf5372f8bdbab590ab6b", + "version": "0.13.72", + "port-version": 0 + }, { "git-tree": "af9957469a45f5b512845c4f180af1a7e4e2e886", "version-string": "0.13.71", From 6f706ab6117cd08849746b6a4300453727dad905 Mon Sep 17 00:00:00 2001 From: "yuehua.jia" <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 9 Apr 2022 06:19:47 +0800 Subject: [PATCH 173/217] [glog] update to v0.5 (#22135) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [abseil] Upgrade to 2021.1102 * revert portfile.cmake * update version * update portfile.cmake * update version * [s2geometry] google s2 for for manipulating geometric shapes * [libevent] no absolute paths (#21179) * [Pcre2] Check if files exists before call vcpkg_replace_string. (#22003) * Check if files exists before call vcpkg_replace_string. * Update per comments. Only guard debug. * Update ports/pcre2/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Bump port-version. Co-authored-by: GLUD Lars Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III * [lodepng] Fix cannot open include file "lodepng.h" (#22007) * [lodepng] Fix cannot open include file "lodepng.h" * update version Co-authored-by: Lily Wang * [MyGUI] update to 3.4.1 (#22015) * [MyGUI] update to 3.4.1 * update version * [s2n] Update, add openssl dependency (#21484) * Update to 1.3.0, add openssl dependency * Add 'tests' feature * Update versions Co-authored-by: Billy Robert O'Neal III * Libpq update and VCPKG_OSX_SYSROOT fix (#21583) * [libpq] Update to 12.9 * [libpq] Use VCPKG_OSX_SYSROOT if set otherwise configure set the default sysroot in addition, ignoring the sysroot set by vcpkg_configure_cmake. * [libpq] remove comment only chunks from patches * [libpq] update version registry * [qhttpengine] New port (#22009) * [qhttpengine] New port * Update version database * Fix the format of portfile.cmake * Fix the format of portfile.cmake * update version * Remove duplicate build_shared_libs setting. Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Lily Wang Co-authored-by: Billy Robert O'Neal III * [ xtensor-io ] Fix wrong hash (#22018) * [xtensor-io] Fix wrong hash * update version * [vcpkg] Update VMs for December 2021 Patch Tuesday (#22013) * Add Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools to VS as requested by https://github.com/microsoft/vcpkg/issues/19554 * Cherry pick python changes from https://github.com/microsoft/vcpkg/pull/21912 * Update linux pool. * Update windows pool. * [starlink] Veggiesaurus/starlink ast cminpack fix (#20559) * add CMINPACK_NO_DLL flag back * bump port version * updated versions JSON * quotation mark adjustment * git-tree update * adjusted c flags configuration * hash update * whitespace fix * git-tree hash update * updated to ast 9.2.5, added external-cminpack flag * updated version hash * removed old version entry * removed $schema element from json * updated port git-tree hash * [libunifex] Update to 2021-12-07 (#21995) * updated libunifex version * remove comment * run x-add-versions --all * Update ports/libunifex/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * rerun x-add-version libunifex * Update versions/l-/libunifex.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update libunifex to 12-07 * x-add-version * libunifex port update force cpp20 as cpp17 build doesn't work with msvc. added a compile fix for externConstexpr and removed warnings with /EHsc * Update libunifex.json version update * Update fix-compile-error.patch relax clang warnings * Update libunifex.json git x-add-version libunifex * remove unused * x-add-versions * remove old version log Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III * [tensorflow] update to 2.7, including bazel latest 4.x update (#22022) * Revert "incorporate changes from microsoft:master" * Revert "Revert "incorporate changes from microsoft:master"" * update tensorflow to 2.7 and bazel to latest 4.x * Update version database. Co-authored-by: jgehw Co-authored-by: Billy Robert O'Neal III * [hiredis] Fix static build (#22038) * [hiredis] Fix static build * Update version database * [vcpkg baseline] Fix mpg123 build failed on Linux (#22028) * [baseline] Fix mpg123 build failed on Linux * update version * Fix misspelled "module". * Actually fix the misspelling this time Bill. Co-authored-by: Lily Wang Co-authored-by: Billy Robert O'Neal III * [qt5-base] no _debug lib suffixes on macOS (#14225) (#21695) * [qt5-base] no _debug lib suffixes on macOS (#14225) * [qt5-base] patch qt5-base to remove _debug postfix on osx * Apply suggestions from code review Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * [qt5-base] create link to _debug.pc file from .pc file without _debug * update version * [qt5-base] create forward pkgconfig file Co-authored-by: Billy Robert O'Neal III Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * [python3] Support arm (#21528) * [python3] Support arm on non Windows * Support arm on all platform, add host dependency * version * [pybind11] Add supports * version Co-authored-by: NancyLi1013 Co-authored-by: JackBoosY * [openmvg] update to 2.0 (#22020) * [openmvg] update to 2.0 * update version * update patch * update version * [brynet] Update to 1.11.1 (#22021) * brynet: upgrade to 1.11.1 * Update portfile.cmake * Update brynet.json * [graphicsmagick] update to version 1.3.37 (#22024) * [graphicsmagick] update to version 1.3.37 * [graphicsmagick] manifest format * [graphicsmagick] version database update * [graphicsmagick] version-string -> version * [graphicsmagick] version database update * [meson] fix windows linker detection (#22032) * fix meson linker detection ..... * bit of code cleanup in vcpkg_configure_meson * forgot the version stuff * put cmake back on path because meson is buggy as hell * [libgpg-error] Release-only build support (#22036) * [libgpg-error] Release-only build support * Update version database * Fix protfile spaces * Update version database * [elfutils] provide static or shared libraries correctly (#22055) The logic for keeping the static or shared libraries according to VCPKG_LIBRARY_LINKAGE was backwards, and it was providing shared libraries when they should have been static, and vice versa. * [gl3w] Use khrplatform.h from the egl-registry port (#22056) * [gl3w] use khrplatform.h from the egl-registry port The file was changed yesterday, invalidating the hash: KhronosGroup/EGL-Registry@57b4876de0f33677ece92dd9de0ef105ce69139d. * [gl3w] migrate to new functions from vcpkg-cmake{,-config} * [gl3w] bump port version * [caf] Update to 0.18.5 (#22046) * [caf] Update to 0.18.5 * Remove setting of BUILD_SHARED_LIBS already handled by vcpkg_cmake_configure. Co-authored-by: Billy Robert O'Neal III * [gmsh] Add new port (#21896) * add: gmsh * add: versioning for gmsh. * [gmsh] Re-factory code * Fix install, remove some features due to lack required dependencies. * version * Do not support uwp officially * version * Update ports/gmsh/portfile.cmake * Update versions/g-/gmsh.json * Group the options * version * version Co-authored-by: JackBoosY Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [kf5] upgrade to 5.89 (#21890) * [kf5*] Update to 5.89 * [kf5*] Update versions * [kf5kio] update tag to rc2 * [kf5kio] update versions * [kf5*] final 5.89 released * [kf5*] update versions * Clean up trailing whitespace and add quotes when naming .clang-format. Co-authored-by: Billy Robert O'Neal III * [ompl] Add vcpkg_check_linkage (#21659) * [ompl] Add vcpkg_check_linkage * version * version * [pcl] Add feature apps, visualization, simulation, examples and add usage (#21788) * [pcl] Add feature apps, visualization and examples * version * Add simulation * Enable more apps, install examples, add usage * format manifest file * version * set feature vtk as a alias for feature visualization * version * [activemq-cpp] Added missing libuuid dependency (#22059) This is a mandatory dependency according to https://github.com/apache/activemq-cpp/blob/master/README.txt * [optimus-cpp] New port: ID hashing and Obfuscation using Knuth's Algorithm for C++ (#22025) * [optimus-cpp] New port: ID hashing and Obfuscation using Knuth's Algorithm for C++ * Changed reference * Update version database * Fix hash * Update version database * Review changes and update lib version * fixver * Update version database * Update version database 2 * Fix vcpkg deps * Update version database * [tensorflow-common] remove single quotes from vcpkg flags (#21869) * [vcpkg_acquire_msys] Update bzip2 to 1.0.8-2 * [tensorflow-common] remove single quotes from vcpkg flags They are escaped like '\'-mtune=native\'' which leads to a compiler error: cc: error: unrecognized command line option '-mtune=native' Set via: set(VCPKG_CXX_FLAGS "-mtune=native") * [sdl2-mixer] Fix link mpg123 error (#22049) * [sdl2-mixer] Fix link mpg123 error * update version Co-authored-by: Lily Wang * [glog]: update to v0.5 * [glog]: update to v0.5 * [glog]: update to v0.5.0 * [glog] update to version 0.5 * [glog]: update to v0.5.0 * [glog]: update to v0.5.0 * [glog] : update to v0.5.0 * [glog] update to v0.5.0 * [glog] fix log_every_n * [rsocket]:fix ERROR macro * add license * update version * Revert "[rsocket]:fix ERROR macro" This reverts commit eb5f21325a7a14e0f9a9f8ba5764df4566ce1a98. * [glog]: v0.5 nogdi macro * [glog]: remove IN OUT macro * [glog] v0.5 * --amend * [caffe2] undefinde IN OUT macro * [glog]: v0.5 * Format portfile.cmake and add license * update version Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> Co-authored-by: Lars Glud Co-authored-by: GLUD Lars Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Lily Wang Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Kai Pastor Co-authored-by: Daniel Schürmann Co-authored-by: Vitaly Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Angus Comrie Co-authored-by: Li Zeyang Co-authored-by: Joachim Gehweiler <44170764+jgehw@users.noreply.github.com> Co-authored-by: jgehw Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 Co-authored-by: JackBoosY Co-authored-by: IronsDu Co-authored-by: Josue Andrade Gomes Co-authored-by: Clayton Wheeler Co-authored-by: Christian Fillion Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: X.ZhaoMa Co-authored-by: Dawid Wróbel --- ports/caffe2/no-inout-macros.patch | 18 + ports/caffe2/portfile.cmake | 53 +- ports/caffe2/vcpkg.json | 11 +- ports/glog/fix_glog_CMAKE_MODULE_PATH.patch | 77 ++ ports/glog/fix_log_every_n.patch | 848 ++++++++++++++++++++ ports/glog/glog_disable_debug_postfix.patch | 8 +- ports/glog/nogdi-nominmax.patch | 59 ++ ports/glog/portfile.cmake | 23 +- ports/glog/vcpkg.json | 14 +- versions/baseline.json | 6 +- versions/c-/caffe2.json | 5 + versions/g-/glog.json | 5 + 12 files changed, 1075 insertions(+), 52 deletions(-) create mode 100644 ports/caffe2/no-inout-macros.patch create mode 100644 ports/glog/fix_glog_CMAKE_MODULE_PATH.patch create mode 100644 ports/glog/fix_log_every_n.patch create mode 100644 ports/glog/nogdi-nominmax.patch diff --git a/ports/caffe2/no-inout-macros.patch b/ports/caffe2/no-inout-macros.patch new file mode 100644 index 00000000000000..65f32e79139f1d --- /dev/null +++ b/ports/caffe2/no-inout-macros.patch @@ -0,0 +1,18 @@ +diff --git a/caffe2/core/logging_is_google_glog.h b/caffe2/core/logging_is_google_glog.h +index 2df4435..408bb4a 100644 +--- a/caffe2/core/logging_is_google_glog.h ++++ b/caffe2/core/logging_is_google_glog.h +@@ -30,5 +30,13 @@ INSTANTIATE_FOR_CONTAINER(std::set) + + #include + ++#ifdef IN ++#undef IN ++#endif ++ ++#ifdef OUT ++#undef OUT ++#endif ++ + + #endif // CAFFE2_CORE_LOGGING_IS_GOOGLE_GLOG_H_ diff --git a/ports/caffe2/portfile.cmake b/ports/caffe2/portfile.cmake index d7ec68e6a55912..b430b09c4675bd 100644 --- a/ports/caffe2/portfile.cmake +++ b/ports/caffe2/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - message(FATAL_ERROR "Caffe2 cannot be built for the x86 architecture") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO caffe2/caffe2 @@ -14,6 +10,7 @@ vcpkg_from_github( msvc-fixes.patch fix-space.patch fix-protobuf-deprecated.patch + no-inout-macros.patch ) if(VCPKG_CRT_LINKAGE STREQUAL static) @@ -28,9 +25,8 @@ else() set(EXECUTABLE_SUFFIX "") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS # Set to ON to use python -DBUILD_PYTHON=OFF @@ -63,44 +59,43 @@ vcpkg_configure_cmake( -DPROTOBUF_PROTOC_EXECUTABLE:FILEPATH=${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc${EXECUTABLE_SUFFIX} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Remove folders from install -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/caffe) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/caffe2) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/caffe) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/caffe2) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/caffe2") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/caffe2") # Remove empty directories from include (should probably fix or # patch caffe2 install script) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/test) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/python) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/opengl) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/nnpack) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/libopencl-stub) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/docker-ubuntu-14.04) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/caffe2/binaries) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/test") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/python") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/experiments/python") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/opengl") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/nnpack") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/libopencl-stub") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/contrib/docker-ubuntu-14.04") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/caffe2/binaries") # Move bin to tools -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) -file(GLOB BINARIES ${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX}) -foreach(binary ${BINARIES}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") +file(GLOB BINARIES "${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX}") +foreach(binary IN LISTS BINARIES) get_filename_component(binary_name ${binary} NAME) - file(RENAME ${binary} ${CURRENT_PACKAGES_DIR}/tools/${binary_name}) + file(RENAME ${binary} "${CURRENT_PACKAGES_DIR}/tools/${binary_name}") endforeach() # Remove bin directory if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # Remove headers and tools from debug build -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # install license -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/caffe2) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/caffe2 RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/caffe2/vcpkg.json b/ports/caffe2/vcpkg.json index eeecad53132972..8f4f656321a6eb 100644 --- a/ports/caffe2/vcpkg.json +++ b/ports/caffe2/vcpkg.json @@ -1,15 +1,20 @@ { "name": "caffe2", - "version-string": "0.8.1", - "port-version": 5, + "version": "0.8.1", + "port-version": 6, "description": "Caffe2 is a lightweight, modular, and scalable deep learning framework.", "homepage": "https://github.com/caffe2/caffe2", + "license": "Apache-2.0", "supports": "!x86", "dependencies": [ "eigen3", "gflags", "glog", "lmdb", - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch b/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch new file mode 100644 index 00000000000000..31219437b96f5e --- /dev/null +++ b/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28e2688..cf87798 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -843,36 +843,6 @@ write_basic_package_version_file ( + export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) + export (PACKAGE glog) + +-get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE) +- +-# Directory containing the find modules relative to the config install +-# directory. +-file (RELATIVE_PATH glog_REL_CMake_MODULES +- ${_PREFIX}/${_glog_CMake_INSTALLDIR} +- ${_PREFIX}/${_glog_CMake_DATADIR}/glog-modules.cmake) +- +-get_filename_component (glog_REL_CMake_DATADIR ${glog_REL_CMake_MODULES} +- DIRECTORY) +- +-set (glog_FULL_CMake_DATADIR +- ${CMAKE_CURRENT_BINARY_DIR}/${_glog_CMake_DATADIR}) +- +-configure_file (glog-modules.cmake.in +- ${CMAKE_CURRENT_BINARY_DIR}/glog-modules.cmake @ONLY) +- +-install (CODE +-" +-set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\") +-configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\" +- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY) +-file (INSTALL +- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" +- DESTINATION +- \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\") +-" +- COMPONENT Development +-) +- + install (FILES + ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake +diff --git a/glog-config.cmake.in b/glog-config.cmake.in +index 5c5c9c0..31fac52 100644 +--- a/glog-config.cmake.in ++++ b/glog-config.cmake.in +@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@) + @PACKAGE_INIT@ + + include (CMakeFindDependencyMacro) +-include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) + + @gflags_DEPENDENCY@ + @Unwind_DEPENDENCY@ +diff --git a/glog-modules.cmake.in b/glog-modules.cmake.in +deleted file mode 100644 +index 71c5160..0000000 +--- a/glog-modules.cmake.in ++++ /dev/null +@@ -1,18 +0,0 @@ +-cmake_policy (PUSH) +-cmake_policy (SET CMP0057 NEW) +- +-if (CMAKE_VERSION VERSION_LESS 3.3) +- message (FATAL_ERROR "glog-modules.cmake requires the consumer " +- "to use CMake 3.3 (or newer)") +-endif (CMAKE_VERSION VERSION_LESS 3.3) +- +-set (glog_MODULE_PATH "@glog_FULL_CMake_DATADIR@") +-list (APPEND CMAKE_MODULE_PATH ${glog_MODULE_PATH}) +- +-if (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) +- message (FATAL_ERROR "Cannot add '${glog_MODULE_PATH}' to " +- "CMAKE_MODULE_PATH. This will cause glog-config.cmake to fail at " +- "locating required find modules. Make sure CMAKE_MODULE_PATH is not a cache variable.") +-endif (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) +- +-cmake_policy (POP) diff --git a/ports/glog/fix_log_every_n.patch b/ports/glog/fix_log_every_n.patch new file mode 100644 index 00000000000000..529715ff0bc44b --- /dev/null +++ b/ports/glog/fix_log_every_n.patch @@ -0,0 +1,848 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 61e5f6c..889df87 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ include (GenerateExportHeader) + include (GetCacheVariables) + include (GNUInstallDirs) + +-#set (CMAKE_DEBUG_POSTFIX d) ++#set (CMAKE_DEBUG_POSTFIX d) + set (CMAKE_THREAD_PREFER_PTHREAD 1) + + find_package (GTest) +@@ -501,6 +501,7 @@ set (GLOG_PUBLIC_H + ${CMAKE_CURRENT_BINARY_DIR}/glog/stl_logging.h + ${CMAKE_CURRENT_BINARY_DIR}/glog/vlog_is_on.h + src/glog/log_severity.h ++ src/glog/platform.h + ) + + set (GLOG_SRCS +diff --git a/src/demangle.cc b/src/demangle.cc +index f3e6ad7..8c0bdc7 100644 +--- a/src/demangle.cc ++++ b/src/demangle.cc +@@ -38,14 +38,14 @@ + #include "utilities.h" + #include "demangle.h" + +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + #include + #pragma comment(lib, "dbghelp") + #endif + + _START_GOOGLE_NAMESPACE_ + +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + typedef struct { + const char *abbrev; + const char *real_name; +@@ -1324,7 +1324,7 @@ static bool ParseTopLevelMangledName(State *state) { + + // The demangler entry point. + bool Demangle(const char *mangled, char *out, int out_size) { +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + // When built with incremental linking, the Windows debugger + // library provides a more complicated `Symbol->Name` with the + // Incremental Linking Table offset, which looks like +diff --git a/src/demangle_unittest.cc b/src/demangle_unittest.cc +index be48341..c65adc4 100644 +--- a/src/demangle_unittest.cc ++++ b/src/demangle_unittest.cc +@@ -62,7 +62,7 @@ static const char *DemangleIt(const char * const mangled) { + } + } + +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + + TEST(Demangle, Windows) { + EXPECT_STREQ( +diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in +index 421f1e0..3ecacfb 100644 +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in +@@ -35,7 +35,6 @@ + // + #ifndef _LOGGING_H_ + #define _LOGGING_H_ +- + #include + #include + #include +@@ -58,6 +57,8 @@ + #define GLOG_MSVC_POP_WARNING() + #endif + ++#include ++ + #if @ac_cv_have_glog_export@ + #include "glog/export.h" + #endif +@@ -101,7 +102,7 @@ + + #ifdef HAVE_CXX11_ATOMIC + #include +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + #include + #endif + +@@ -1057,7 +1058,7 @@ namespace google { + __FILE__, __LINE__, @ac_google_namespace@::GLOG_ ## severity, LOG_OCCURRENCES, \ + &what_to_do).stream() + +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + + #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ + static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ +diff --git a/src/glog/platform.h b/src/glog/platform.h +new file mode 100644 +index 0000000..e614411 +--- /dev/null ++++ b/src/glog/platform.h +@@ -0,0 +1,58 @@ ++// Copyright (c) 2008, Google Inc. ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are ++// met: ++// ++// * Redistributions of source code must retain the above copyright ++// notice, this list of conditions and the following disclaimer. ++// * Redistributions in binary form must reproduce the above ++// copyright notice, this list of conditions and the following disclaimer ++// in the documentation and/or other materials provided with the ++// distribution. ++// * Neither the name of Google Inc. nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++// ++// Author: Shinichiro Hamaji ++// ++// Detect supported platforms. ++ ++#ifndef GLOG_PLATFORM_H ++#define GLOG_PLATFORM_H ++ ++#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ++#define GLOG_OS_WINDOWS ++#elif defined(__CYGWIN__) || defined(__CYGWIN32__) ++#define GLOG_OS_CYGWIN ++#elif defined(linux) || defined(__linux) || defined(__linux__) ++#ifndef GLOG_OS_LINUX ++#define GLOG_OS_LINUX ++#endif ++#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) ++#define GLOG_OS_MACOSX ++#elif defined(__FreeBSD__) ++#define GLOG_OS_FREEBSD ++#elif defined(__NetBSD__) ++#define GLOG_OS_NETBSD ++#elif defined(__OpenBSD__) ++#define GLOG_OS_OPENBSD ++#else ++// TODO(hamaji): Add other platforms. ++#error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. ++#endif ++ ++#endif // GLOG_PLATFORM_H +diff --git a/src/googletest.h b/src/googletest.h +index 7230606..a7ce3c2 100644 +--- a/src/googletest.h ++++ b/src/googletest.h +@@ -72,7 +72,7 @@ _END_GOOGLE_NAMESPACE_ + #define GOOGLE_GLOG_DLL_DECL + + static inline string GetTempDir() { +-#ifndef OS_WINDOWS ++#ifndef GLOG_OS_WINDOWS + return "/tmp"; + #else + char tmp[MAX_PATH]; +@@ -81,7 +81,7 @@ static inline string GetTempDir() { + #endif + } + +-#if defined(OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) ++#if defined(GLOG_OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) + // The test will run in glog/vsproject/ + // (e.g., glog/vsproject/logging_unittest). + static const char TEST_SRC_DIR[] = "../.."; +@@ -207,7 +207,7 @@ static inline void CalledAbort() { + longjmp(g_jmp_buf, 1); + } + +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // TODO(hamaji): Death test somehow doesn't work in Windows. + #define ASSERT_DEATH(fn, msg) + #else +@@ -490,7 +490,7 @@ static inline bool MungeAndDiffTestStderr(const string& golden_filename) { + WriteToFile(golden, munged_golden); + string munged_captured = cap->filename() + ".munged"; + WriteToFile(captured, munged_captured); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + string diffcmd("fc " + munged_golden + " " + munged_captured); + #else + string diffcmd("diff -u " + munged_golden + " " + munged_captured); +@@ -532,7 +532,7 @@ class Thread { + virtual ~Thread() {} + + void SetJoinable(bool) {} +-#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) ++#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) + void Start() { + handle_ = CreateThread(NULL, + 0, +@@ -565,7 +565,7 @@ class Thread { + return NULL; + } + +-#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) ++#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) + HANDLE handle_; + DWORD th_; + #else +@@ -574,7 +574,7 @@ class Thread { + }; + + static inline void SleepForMilliseconds(int t) { +-#ifndef OS_WINDOWS ++#ifndef GLOG_OS_WINDOWS + # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L + const struct timespec req = {0, t * 1000 * 1000}; + nanosleep(&req, NULL); +diff --git a/src/logging.cc b/src/logging.cc +index 71de91d..f251d67 100644 +--- a/src/logging.cc ++++ b/src/logging.cc +@@ -59,7 +59,7 @@ + #include + #include // for errno + #include +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + #include "windows/dirent.h" + #else + #include // for automatic removal of old logs +@@ -122,7 +122,7 @@ GLOG_DEFINE_bool(alsologtostderr, BoolFromEnv("GOOGLE_ALSOLOGTOSTDERR", false), + "log messages go to stderr in addition to logfiles"); + GLOG_DEFINE_bool(colorlogtostderr, false, + "color messages logged to stderr (if supported by terminal)"); +-#ifdef OS_LINUX ++#ifdef GLOG_OS_LINUX + GLOG_DEFINE_bool(drop_log_memory, true, "Drop in-memory buffers of log contents. " + "Logs can grow very quickly and they are rarely read before they " + "need to be evicted from memory. Instead, drop them from memory " +@@ -198,7 +198,7 @@ GLOG_DEFINE_bool(log_utc_time, false, + #define PATH_SEPARATOR '/' + + #ifndef HAVE_PREAD +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + #include + #define ssize_t SSIZE_T + #endif +@@ -241,7 +241,7 @@ static void GetHostName(string* hostname) { + *buf.nodename = '\0'; + } + *hostname = buf.nodename; +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + char buf[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; + if (GetComputerNameA(buf, &len)) { +@@ -258,7 +258,7 @@ static void GetHostName(string* hostname) { + // Returns true iff terminal supports using colors in output. + static bool TerminalSupportsColor() { + bool term_supports_color = false; +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // on Windows TERM variable is usually not set, but the console does + // support colors. + term_supports_color = true; +@@ -312,7 +312,7 @@ static GLogColor SeverityToColor(LogSeverity severity) { + return color; + } + +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + + // Returns the character attribute for the given color. + static WORD GetColorAttribute(GLogColor color) { +@@ -337,7 +337,7 @@ static const char* GetAnsiColorCode(GLogColor color) { + return NULL; // stop warning about return type. + } + +-#endif // OS_WINDOWS ++#endif // GLOG_OS_WINDOWS + + // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0 + static int32 MaxLogSize() { +@@ -753,7 +753,7 @@ static void ColoredWriteToStderr(LogSeverity severity, + fwrite(message, len, 1, stderr); + return; + } +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + const HANDLE stderr_handle = GetStdHandle(STD_ERROR_HANDLE); + + // Gets the current text color. +@@ -775,7 +775,7 @@ static void ColoredWriteToStderr(LogSeverity severity, + fprintf(stderr, "\033[0;3%sm", GetAnsiColorCode(color)); + fwrite(message, len, 1, stderr); + fprintf(stderr, "\033[m"); // Resets the terminal to default. +-#endif // OS_WINDOWS ++#endif // GLOG_OS_WINDOWS + } + + static void WriteToStderr(const char* message, size_t len) { +@@ -788,7 +788,7 @@ inline void LogDestination::MaybeLogToStderr(LogSeverity severity, + const char* message, size_t message_len, size_t prefix_len) { + if ((severity >= FLAGS_stderrthreshold) || FLAGS_alsologtostderr) { + ColoredWriteToStderr(severity, message, message_len); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // On Windows, also output to the debugger + ::OutputDebugStringA(message); + #elif defined(__ANDROID__) +@@ -1056,7 +1056,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { + } + return false; + } +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // https://github.com/golang/go/issues/27638 - make sure we seek to the end to append + // empirically replicated with wine over mingw build + if (!FLAGS_timestamp_in_logfile_name) { +@@ -1080,7 +1080,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { + linkpath += linkname; + unlink(linkpath.c_str()); // delete old one if it exists + +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + // TODO(hamaji): Create lnk file on Windows? + #elif defined(HAVE_UNISTD_H) + // We must have unistd.h. +@@ -1270,7 +1270,7 @@ void LogFileObject::Write(bool force_flush, + (bytes_since_flush_ >= 1000000) || + (CycleClock_Now() >= next_flush_time_) ) { + FlushUnlocked(); +-#ifdef OS_LINUX ++#ifdef GLOG_OS_LINUX + // Only consider files >= 3MiB + if (FLAGS_drop_log_memory && file_length_ >= (3 << 20)) { + // Don't evict the most recent 1-2MiB so as not to impact a tailer +@@ -1305,7 +1305,7 @@ void LogFileObject::Write(bool force_flush, + + + LogCleaner::LogCleaner() : enabled_(false), overdue_days_(7), dir_delim_('/') { +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + dir_delim_ = '\\'; + #endif + } +@@ -1898,7 +1898,7 @@ void LogMessage::RecordCrashReason( + # define ATTRIBUTE_NORETURN + #endif + +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + __declspec(noreturn) + #endif + static void logging_fail() ATTRIBUTE_NORETURN; +@@ -2223,7 +2223,7 @@ bool SendEmail(const char*dest, const char *subject, const char*body){ + + static void GetTempDirectories(vector* list) { + list->clear(); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + // On windows we'll try to find a directory in this order: + // C:/Documents & Settings/whomever/TEMP (or whatever GetTempPath() is) + // C:/TMP/ +@@ -2282,7 +2282,7 @@ const vector& GetLoggingDirectories() { + logging_directories_list->push_back(FLAGS_log_dir.c_str()); + } else { + GetTempDirectories(logging_directories_list); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + char tmp[MAX_PATH]; + if (GetWindowsDirectoryA(tmp, MAX_PATH)) + logging_directories_list->push_back(tmp); +@@ -2325,7 +2325,7 @@ void TruncateLogFile(const char *path, int64 limit, int64 keep) { + // Don't follow symlinks unless they're our own fd symlinks in /proc + int flags = O_RDWR; + // TODO(hamaji): Support other environments. +-#ifdef OS_LINUX ++#ifdef GLOG_OS_LINUX + const char *procfd_prefix = "/proc/self/fd/"; + if (strncmp(procfd_prefix, path, strlen(procfd_prefix))) flags |= O_NOFOLLOW; + #endif +@@ -2464,7 +2464,7 @@ int posix_strerror_r(int err, char *buf, size_t len) { + return 0; + } else { + buf[0] = '\000'; +-#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) + if (reinterpret_cast(rc) < sys_nerr) { + // This means an error on MacOSX or FreeBSD. + return -1; +diff --git a/src/logging_custom_prefix_unittest.cc b/src/logging_custom_prefix_unittest.cc +index c9fb5b8..8740fad 100644 +--- a/src/logging_custom_prefix_unittest.cc ++++ b/src/logging_custom_prefix_unittest.cc +@@ -588,7 +588,7 @@ void TestCHECK() { + + // Tests using CHECK*() on anonymous enums. + // Apple's GCC doesn't like this. +-#if !defined(OS_MACOSX) ++#if !defined(GLOG_OS_MACOSX) + CHECK_EQ(CASE_A, CASE_A); + CHECK_NE(CASE_A, CASE_B); + CHECK_GE(CASE_A, CASE_A); +@@ -670,7 +670,7 @@ static void GetFiles(const string& pattern, vector* files) { + files->push_back(string(g.gl_pathv[i])); + } + globfree(&g); +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + WIN32_FIND_DATAA data; + HANDLE handle = FindFirstFileA(pattern.c_str(), &data); + size_t index = pattern.rfind('\\'); +@@ -799,7 +799,7 @@ static void TestTwoProcessesWrite() { + } + + static void TestSymlink() { +-#ifndef OS_WINDOWS ++#ifndef GLOG_OS_WINDOWS + fprintf(stderr, "==== Test setting log file symlink\n"); + string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; + string sym = FLAGS_test_tmpdir + "/symlinkbase"; +@@ -942,7 +942,7 @@ static void TestTruncate() { + // MacOSX 10.4 doesn't fail in this case. + // Windows doesn't have symlink. + // Let's just ignore this test for these cases. +-#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) + // Through a symlink should fail to truncate + string linkname = path + ".link"; + unlink(linkname.c_str()); +@@ -951,7 +951,7 @@ static void TestTruncate() { + #endif + + // The /proc/self path makes sense only for linux. +-#if defined(OS_LINUX) ++#if defined(GLOG_OS_LINUX) + // Through an open fd symlink should work + int fd; + CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); +@@ -1205,7 +1205,7 @@ TEST(Strerror, logging) { + CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); + CHECK_EQ(buf[0], 'A'); + CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); +-#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) + // MacOSX or FreeBSD considers this case is an error since there is + // no enough space. + CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); +diff --git a/src/logging_unittest.cc b/src/logging_unittest.cc +index edc7d35..ce3c483 100644 +--- a/src/logging_unittest.cc ++++ b/src/logging_unittest.cc +@@ -561,7 +561,7 @@ void TestCHECK() { + + // Tests using CHECK*() on anonymous enums. + // Apple's GCC doesn't like this. +-#if !defined(OS_MACOSX) ++#if !defined(GLOG_OS_MACOSX) + CHECK_EQ(CASE_A, CASE_A); + CHECK_NE(CASE_A, CASE_B); + CHECK_GE(CASE_A, CASE_A); +@@ -643,7 +643,7 @@ static void GetFiles(const string& pattern, vector* files) { + files->push_back(string(g.gl_pathv[i])); + } + globfree(&g); +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + WIN32_FIND_DATAA data; + HANDLE handle = FindFirstFileA(pattern.c_str(), &data); + size_t index = pattern.rfind('\\'); +@@ -772,7 +772,7 @@ static void TestTwoProcessesWrite() { + } + + static void TestSymlink() { +-#ifndef OS_WINDOWS ++#ifndef GLOG_OS_WINDOWS + fprintf(stderr, "==== Test setting log file symlink\n"); + string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; + string sym = FLAGS_test_tmpdir + "/symlinkbase"; +@@ -915,7 +915,7 @@ static void TestTruncate() { + // MacOSX 10.4 doesn't fail in this case. + // Windows doesn't have symlink. + // Let's just ignore this test for these cases. +-#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) + // Through a symlink should fail to truncate + string linkname = path + ".link"; + unlink(linkname.c_str()); +@@ -924,7 +924,7 @@ static void TestTruncate() { + #endif + + // The /proc/self path makes sense only for linux. +-#if defined(OS_LINUX) ++#if defined(GLOG_OS_LINUX) + // Through an open fd symlink should work + int fd; + CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); +@@ -1178,7 +1178,7 @@ TEST(Strerror, logging) { + CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); + CHECK_EQ(buf[0], 'A'); + CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); +-#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) ++#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) + // MacOSX or FreeBSD considers this case is an error since there is + // no enough space. + CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); +diff --git a/src/signalhandler.cc b/src/signalhandler.cc +index b6d6e25..ababf86 100644 +--- a/src/signalhandler.cc ++++ b/src/signalhandler.cc +@@ -63,7 +63,7 @@ const struct { + { SIGILL, "SIGILL" }, + { SIGFPE, "SIGFPE" }, + { SIGABRT, "SIGABRT" }, +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + { SIGBUS, "SIGBUS" }, + #endif + { SIGTERM, "SIGTERM" }, +@@ -208,7 +208,7 @@ void DumpSignalInfo(int signal_number, siginfo_t *siginfo) { + formatter.AppendUint64((uintptr_t)pthread_self(), 16); + formatter.AppendString(") "); + // Only linux has the PID of the signal sender in si_pid. +-#ifdef OS_LINUX ++#ifdef GLOG_OS_LINUX + formatter.AppendString("from PID "); + formatter.AppendUint64(siginfo->si_pid, 10); + formatter.AppendString("; "); +@@ -253,7 +253,7 @@ void InvokeDefaultSignalHandler(int signal_number) { + sig_action.sa_handler = SIG_DFL; + sigaction(signal_number, &sig_action, NULL); + kill(getpid(), signal_number); +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + signal(signal_number, SIG_DFL); + raise(signal_number); + #endif +@@ -267,7 +267,7 @@ static pthread_t* g_entered_thread_id_pointer = NULL; + + // Dumps signal and stack frame information, and invokes the default + // signal handler once our job is done. +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + void FailureSignalHandler(int signal_number) + #else + void FailureSignalHandler(int signal_number, +@@ -314,7 +314,7 @@ void FailureSignalHandler(int signal_number, + // First dump time info. + DumpTimeInfo(); + +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + // Get the program counter from ucontext. + void *pc = GetPC(ucontext); + DumpStackFrameInfo("PC: ", pc); +@@ -364,7 +364,7 @@ bool IsFailureSignalHandlerInstalled() { + sigaction(SIGABRT, NULL, &sig_action); + if (sig_action.sa_sigaction == &FailureSignalHandler) + return true; +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + return kFailureSignalHandlerInstalled; + #endif // HAVE_SIGACTION + return false; +@@ -385,7 +385,7 @@ void InstallFailureSignalHandler() { + CHECK_ERR(sigaction(kFailureSignals[i].number, &sig_action, NULL)); + } + kFailureSignalHandlerInstalled = true; +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + for (size_t i = 0; i < ARRAYSIZE(kFailureSignals); ++i) { + CHECK_NE(signal(kFailureSignals[i].number, &FailureSignalHandler), + SIG_ERR); +@@ -395,7 +395,7 @@ void InstallFailureSignalHandler() { + } + + void InstallFailureWriter(void (*writer)(const char* data, int size)) { +-#if defined(HAVE_SIGACTION) || defined(OS_WINDOWS) ++#if defined(HAVE_SIGACTION) || defined(GLOG_OS_WINDOWS) + g_failure_writer = writer; + #endif // HAVE_SIGACTION + } +diff --git a/src/stacktrace_x86-inl.h b/src/stacktrace_x86-inl.h +index af2783d..99c5de7 100644 +--- a/src/stacktrace_x86-inl.h ++++ b/src/stacktrace_x86-inl.h +@@ -31,9 +31,9 @@ + + #include // for uintptr_t + +-#include "utilities.h" // for OS_* macros ++#include "utilities.h" // for GLOG_OS_* macros + +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + #include + #include + #endif +@@ -74,7 +74,7 @@ static void **NextStackFrame(void **old_sp) { + // last two pages in the address space + if ((uintptr_t)new_sp >= 0xffffe000) return NULL; + #endif +-#if !defined(OS_WINDOWS) ++#if !defined(GLOG_OS_WINDOWS) + if (!STRICT_UNWINDING) { + // Lax sanity checks cause a crash in 32-bit tcmalloc/crash_reason_test + // on AMD-based machines with VDSO-enabled kernels. +diff --git a/src/symbolize.cc b/src/symbolize.cc +index f7fbc53..8688ca2 100644 +--- a/src/symbolize.cc ++++ b/src/symbolize.cc +@@ -46,7 +46,7 @@ + // and memmove(). We assume they are async-signal-safe. + // + // Additional header can be specified by the GLOG_BUILD_CONFIG_INCLUDE +-// macro to add platform specific defines (e.g. OS_OPENBSD). ++// macro to add platform specific defines (e.g. GLOG_OS_OPENBSD). + + #ifdef GLOG_BUILD_CONFIG_INCLUDE + #include GLOG_BUILD_CONFIG_INCLUDE +@@ -113,7 +113,7 @@ _END_GOOGLE_NAMESPACE_ + #if defined(HAVE_DLFCN_H) + #include + #endif +-#if defined(OS_OPENBSD) ++#if defined(GLOG_OS_OPENBSD) + #include + #else + #include +@@ -846,7 +846,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, + + _END_GOOGLE_NAMESPACE_ + +-#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) ++#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) + + #include + #include +@@ -871,7 +871,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, + + _END_GOOGLE_NAMESPACE_ + +-#elif defined(OS_WINDOWS) || defined(OS_CYGWIN) ++#elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) + + #include + #include +diff --git a/src/symbolize_unittest.cc b/src/symbolize_unittest.cc +index 0b53230..7e8f6d4 100644 +--- a/src/symbolize_unittest.cc ++++ b/src/symbolize_unittest.cc +@@ -359,7 +359,7 @@ static void ATTRIBUTE_NOINLINE TestWithReturnAddress() { + #endif + } + +-# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) ++# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) + + #ifdef _MSC_VER + #include +@@ -411,10 +411,10 @@ int main(int argc, char **argv) { + TestWithPCInsideNonInlineFunction(); + TestWithReturnAddress(); + return RUN_ALL_TESTS(); +-# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) ++# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) + TestWithReturnAddress(); + return RUN_ALL_TESTS(); +-# else // OS_WINDOWS ++# else // GLOG_OS_WINDOWS + printf("PASS (no symbolize_unittest support)\n"); + return 0; + # endif // __ELF__ +diff --git a/src/utilities.cc b/src/utilities.cc +index 6b9a69e..ecda730 100644 +--- a/src/utilities.cc ++++ b/src/utilities.cc +@@ -151,7 +151,7 @@ static void DumpStackTraceAndExit() { + sigemptyset(&sig_action.sa_mask); + sig_action.sa_handler = SIG_DFL; + sigaction(SIGABRT, &sig_action, NULL); +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + signal(SIGABRT, SIG_DFL); + #endif // HAVE_SIGACTION + } +@@ -180,7 +180,7 @@ bool IsGoogleLoggingInitialized() { + return g_program_invocation_short_name != NULL; + } + +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + struct timeval { + long tv_sec, tv_usec; + }; +@@ -236,9 +236,9 @@ bool PidHasChanged() { + + pid_t GetTID() { + // On Linux and MacOSX, we try to use gettid(). +-#if defined OS_LINUX || defined OS_MACOSX ++#if defined GLOG_OS_LINUX || defined GLOG_OS_MACOSX + #ifndef __NR_gettid +-#ifdef OS_MACOSX ++#ifdef GLOG_OS_MACOSX + #define __NR_gettid SYS_gettid + #elif ! defined __i386__ + #error "Must define __NR_gettid for non-x86 platforms" +@@ -258,12 +258,12 @@ pid_t GetTID() { + // the value change to "true". + lacks_gettid = true; + } +-#endif // OS_LINUX || OS_MACOSX ++#endif // GLOG_OS_LINUX || GLOG_OS_MACOSX + + // If gettid() could not be used, we use one of the following. +-#if defined OS_LINUX ++#if defined GLOG_OS_LINUX + return getpid(); // Linux: getpid returns thread ID when gettid is absent +-#elif defined OS_WINDOWS && !defined OS_CYGWIN ++#elif defined GLOG_OS_WINDOWS && !defined GLOG_OS_CYGWIN + return GetCurrentThreadId(); + #elif defined(HAVE_PTHREAD) + // If none of the techniques above worked, we use pthread_self(). +@@ -275,7 +275,7 @@ pid_t GetTID() { + + const char* const_basename(const char* filepath) { + const char* base = strrchr(filepath, '/'); +-#ifdef OS_WINDOWS // Look for either path separator in Windows ++#ifdef GLOG_OS_WINDOWS // Look for either path separator in Windows + if (!base) + base = strrchr(filepath, '\\'); + #endif +@@ -288,7 +288,7 @@ const string& MyUserName() { + } + static void MyUserNameInitializer() { + // TODO(hamaji): Probably this is not portable. +-#if defined(OS_WINDOWS) ++#if defined(GLOG_OS_WINDOWS) + const char* user = getenv("USERNAME"); + #else + const char* user = getenv("USER"); +@@ -337,7 +337,7 @@ void InitGoogleLoggingUtilities(const char* argv0) { + CHECK(!IsGoogleLoggingInitialized()) + << "You called InitGoogleLogging() twice!"; + const char* slash = strrchr(argv0, '/'); +-#ifdef OS_WINDOWS ++#ifdef GLOG_OS_WINDOWS + if (!slash) slash = strrchr(argv0, '\\'); + #endif + g_program_invocation_short_name = slash ? slash + 1 : argv0; +diff --git a/src/utilities.h b/src/utilities.h +index e4115ad..86bc296 100644 +--- a/src/utilities.h ++++ b/src/utilities.h +@@ -34,25 +34,6 @@ + #ifndef UTILITIES_H__ + #define UTILITIES_H__ + +-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) +-# define OS_WINDOWS +-#elif defined(__CYGWIN__) || defined(__CYGWIN32__) +-# define OS_CYGWIN +-#elif defined(linux) || defined(__linux) || defined(__linux__) +-# ifndef OS_LINUX +-# define OS_LINUX +-# endif +-#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) +-# define OS_MACOSX +-#elif defined(__FreeBSD__) +-# define OS_FREEBSD +-#elif defined(__NetBSD__) +-# define OS_NETBSD +-#elif defined(__OpenBSD__) +-# define OS_OPENBSD +-#else +-// TODO(hamaji): Add other platforms. +-#endif + + // printf macros for size_t, in the style of inttypes.h + #ifdef _LP64 +@@ -76,12 +57,12 @@ + + #include + +-#if defined(OS_WINDOWS) ++#include "glog/logging.h" ++#if defined(GLOG_OS_WINDOWS) + # include "port.h" + #endif + + #include "config.h" +-#include "glog/logging.h" + + // There are three different ways we can try to get the stack trace: + // +@@ -114,7 +95,7 @@ + # define STACKTRACE_H "stacktrace_x86_64-inl.h" + # elif (defined(__ppc__) || defined(__PPC__)) && __GNUC__ >= 2 + # define STACKTRACE_H "stacktrace_powerpc-inl.h" +-# elif defined(OS_WINDOWS) ++# elif defined(GLOG_OS_WINDOWS) + # define STACKTRACE_H "stacktrace_windows-inl.h" + # endif + #endif +@@ -130,12 +111,12 @@ + #ifndef GLOG_NO_SYMBOLIZE_DETECTION + #ifndef HAVE_SYMBOLIZE + // defined by gcc +-#if defined(__ELF__) && defined(OS_LINUX) ++#if defined(__ELF__) && defined(GLOG_OS_LINUX) + # define HAVE_SYMBOLIZE +-#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) ++#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) + // Use dladdr to symbolize. + # define HAVE_SYMBOLIZE +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + // Use DbgHelp to symbolize + # define HAVE_SYMBOLIZE + #endif +@@ -154,7 +135,7 @@ namespace glog_internal_namespace_ { + #ifdef HAVE___ATTRIBUTE__ + # define ATTRIBUTE_NOINLINE __attribute__ ((noinline)) + # define HAVE_ATTRIBUTE_NOINLINE +-#elif defined(OS_WINDOWS) ++#elif defined(GLOG_OS_WINDOWS) + # define ATTRIBUTE_NOINLINE __declspec(noinline) + # define HAVE_ATTRIBUTE_NOINLINE + #else diff --git a/ports/glog/glog_disable_debug_postfix.patch b/ports/glog/glog_disable_debug_postfix.patch index 7b882e1faf6917..9f62ec3799e117 100644 --- a/ports/glog/glog_disable_debug_postfix.patch +++ b/ports/glog/glog_disable_debug_postfix.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 808330e..de0e477 100644 +index 62ebbcc..28e2688 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -44,7 +44,7 @@ include (CTest) - include (DetermineGflagsNamespace) +@@ -65,7 +65,7 @@ include (GenerateExportHeader) + include (GetCacheVariables) include (GNUInstallDirs) -set (CMAKE_DEBUG_POSTFIX d) +#set (CMAKE_DEBUG_POSTFIX d) set (CMAKE_THREAD_PREFER_PTHREAD 1) - if (WITH_GFLAGS) + find_package (GTest) diff --git a/ports/glog/nogdi-nominmax.patch b/ports/glog/nogdi-nominmax.patch new file mode 100644 index 00000000000000..83ee58cb500e0e --- /dev/null +++ b/ports/glog/nogdi-nominmax.patch @@ -0,0 +1,59 @@ +diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in +index 3ecacfb..42cc9b1 100644 +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in +@@ -103,6 +103,18 @@ + #ifdef HAVE_CXX11_ATOMIC + #include + #elif defined(GLOG_OS_WINDOWS) ++# ifndef WIN32_LEAN_AND_MEAN ++# define WIN32_LEAN_AND_MEAN // We only need minimal includes ++# endif ++// To avoid macro definition of ERROR. ++# ifndef NOGDI ++# define NOGDI ++# endif ++// To avoid macro definition of min/max. ++# ifndef NOMINMAX ++# define NOMINMAX ++# endif ++ + #include + #endif + +@@ -1061,7 +1073,7 @@ namespace google { + #elif defined(GLOG_OS_WINDOWS) + + #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ + InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ +@@ -1071,7 +1083,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (condition && \ + (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) || true) && \ +@@ -1082,7 +1094,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ + InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ +@@ -1092,7 +1104,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0; \ + if (LOG_OCCURRENCES <= n) \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (LOG_OCCURRENCES <= n) \ diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 8487cc19219055..5738ba092c3929 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -1,26 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/glog - REF v0.4.0 - SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176 + REF v0.5.0 + SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a HEAD_REF master PATCHES glog_disable_debug_postfix.patch + fix_glog_CMAKE_MODULE_PATH.patch + fix_log_every_n.patch + nogdi-nominmax.patch + ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glog) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glog) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index 6a0da077d82841..3c0296ec8c68a4 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,10 +1,18 @@ { "name": "glog", - "version-string": "0.4.0", - "port-version": 4, + "version": "0.5.0", "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", + "license": null, "dependencies": [ - "gflags" + "gflags", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index b92593d8a91884..153150c8ba6744 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1218,7 +1218,7 @@ }, "caffe2": { "baseline": "0.8.1", - "port-version": 5 + "port-version": 6 }, "cairo": { "baseline": "1.17.6", @@ -2537,8 +2537,8 @@ "port-version": 4 }, "glog": { - "baseline": "0.4.0", - "port-version": 4 + "baseline": "0.5.0", + "port-version": 0 }, "gloo": { "baseline": "20201203", diff --git a/versions/c-/caffe2.json b/versions/c-/caffe2.json index 53fb0108464a2f..67fc8fea461886 100644 --- a/versions/c-/caffe2.json +++ b/versions/c-/caffe2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca32eb4601a1c35daa69e526f0af30efeb599c8c", + "version": "0.8.1", + "port-version": 6 + }, { "git-tree": "e4ebcedb57e572959c4f8e30c2885cda2367e0a7", "version-string": "0.8.1", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 8a105b070e2cda..b34d37318e4f8d 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55b03c1cae45ba6b081c9072e6431d720467c82b", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "27503732c21f2d6652d12d62b1e9c180c1d33c47", "version-string": "0.4.0", From 91dd9ae821a0a2af1d625609ae846a0ed2362bac Mon Sep 17 00:00:00 2001 From: mrlegohead0x45 Date: Fri, 8 Apr 2022 23:23:48 +0100 Subject: [PATCH 174/217] [loguru] Add feature to build with fmt (#23242) * [loguru] Add loguru[fmt] feature Add fmt feature, with if checks to require and link fmt if it is specified * [loguru] Replace deprecated functions Remove deprecated functions vcpkg_install_cmake, vcpkg_fixup_cmake_targets, vcpkg_configure_cmake and replace them with vcpkg_cmake_install, vcpkg_cmake_config_fixup and vcpkg_cmake_configure respectively. Also add vcpkg-cmake and vcpkg-cmake-config to vcpkg.json to provide the replacements * [loguru] Update versioning files * [loguru] Add CONFIG flag to find_package(fmt) * Make suggested changes * Update version database * Make requested changes * [loguru] Update version database --- ports/loguru/CMakeLists.txt | 7 +++++++ ports/loguru/portfile.cmake | 17 ++++++++++++----- ports/loguru/vcpkg.json | 24 +++++++++++++++++++++--- versions/baseline.json | 2 +- versions/l-/loguru.json | 5 +++++ 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/ports/loguru/CMakeLists.txt b/ports/loguru/CMakeLists.txt index 3688e11210c56c..473392aa83a9ed 100644 --- a/ports/loguru/CMakeLists.txt +++ b/ports/loguru/CMakeLists.txt @@ -4,6 +4,7 @@ project(loguru CXX) set(CMAKE_CXX_STANDARD 11) option(INSTALL_HEADERS "Install header files" ON) +option(BUILD_WITH_FMT "Build with fmt support" OFF) set(loguru_headers loguru.hpp @@ -17,6 +18,12 @@ target_include_directories(loguru PUBLIC $ $) +if(BUILD_WITH_FMT) + target_compile_definitions(loguru PRIVATE LOGURU_USE_FMTLIB=1) + find_package(fmt CONFIG REQUIRED) + target_link_libraries(loguru PUBLIC fmt::fmt) +endif() + if(UNIX) set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) diff --git a/ports/loguru/portfile.cmake b/ports/loguru/portfile.cmake index 236c4deb2acaee..a581eab88be6df 100644 --- a/ports/loguru/portfile.cmake +++ b/ports/loguru/portfile.cmake @@ -15,15 +15,22 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) configure_file(${CMAKE_CURRENT_LIST_DIR}/loguruConfig.cmake.in ${SOURCE_PATH}/loguruConfig.cmake.in COPYONLY) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + fmt BUILD_WITH_FMT + ) + + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS=OFF + OPTIONS + ${FEATURE_OPTIONS} ) - vcpkg_install_cmake() - vcpkg_fixup_cmake_targets() + vcpkg_cmake_install() + vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() endif() diff --git a/ports/loguru/vcpkg.json b/ports/loguru/vcpkg.json index b29fb65c8bf2c8..d6705d6faf0e6a 100644 --- a/ports/loguru/vcpkg.json +++ b/ports/loguru/vcpkg.json @@ -1,7 +1,25 @@ { "name": "loguru", - "version-string": "2.1.0", - "port-version": 2, + "version": "2.1.0", + "port-version": 3, "description": "A lightweight and flexible C++ logging library", - "homepage": "https://github.com/emilk/loguru" + "homepage": "https://github.com/emilk/loguru", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "fmt": { + "description": "Build with fmt support in non-header-only mode", + "dependencies": [ + "fmt" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 153150c8ba6744..6a85b2bbd409ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4270,7 +4270,7 @@ }, "loguru": { "baseline": "2.1.0", - "port-version": 2 + "port-version": 3 }, "lpeg": { "baseline": "1.0.2", diff --git a/versions/l-/loguru.json b/versions/l-/loguru.json index 9eef71fbae71a9..f6ecdd322fd9b5 100644 --- a/versions/l-/loguru.json +++ b/versions/l-/loguru.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "827f85e170a1d4548088fa36cf46817e146184d0", + "version": "2.1.0", + "port-version": 3 + }, { "git-tree": "c429f674d828c20881f410892d633b483e9d30dd", "version-string": "2.1.0", From 8fc4b4b95095f8fcfe46d55d6af92b1b48781c05 Mon Sep 17 00:00:00 2001 From: Gabriel Jorge Menezes Date: Fri, 8 Apr 2022 19:26:51 -0300 Subject: [PATCH 175/217] [braft] New port (#23830) * creating braft port * format manifest * version * Refix * version * Add dependency brpc * version * Add license * version * Fix dependency gflags, fix export include path * version * Re-fix dependency * version * Re-fix gflags * version * Add find_dependency * version Co-authored-by: JackBoosY --- ports/braft/export-target.patch | 48 +++++++++++++++++++++++++++ ports/braft/fix-build.patch | 56 ++++++++++++++++++++++++++++++++ ports/braft/fix-dependency.patch | 16 +++++++++ ports/braft/portfile.cmake | 26 +++++++++++++++ ports/braft/vcpkg.json | 24 ++++++++++++++ versions/b-/braft.json | 9 +++++ versions/baseline.json | 4 +++ 7 files changed, 183 insertions(+) create mode 100644 ports/braft/export-target.patch create mode 100644 ports/braft/fix-build.patch create mode 100644 ports/braft/fix-dependency.patch create mode 100644 ports/braft/portfile.cmake create mode 100644 ports/braft/vcpkg.json create mode 100644 versions/b-/braft.json diff --git a/ports/braft/export-target.patch b/ports/braft/export-target.patch new file mode 100644 index 00000000000000..097a0570ca48f7 --- /dev/null +++ b/ports/braft/export-target.patch @@ -0,0 +1,48 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 78adc56..ff435a2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -19,8 +19,10 @@ add_library(braft-static STATIC $) + endif() + + if (BUILD_SHARED_LIBS) ++target_include_directories(braft-shared PUBLIC $) + target_link_libraries(braft-shared PUBLIC ${DYNAMIC_LIB}) + else() ++target_include_directories(braft-static PUBLIC $) + target_link_libraries(braft-static PUBLIC ${DYNAMIC_LIB}) + endif() + +@@ -31,15 +33,30 @@ SET_TARGET_PROPERTIES(braft-shared PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUT + endif() + + if (NOT BUILD_SHARED_LIBS) +-install(TARGETS braft-static ++install(TARGETS braft-static EXPORT unofficial-braftTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) + else() +-install(TARGETS braft-shared ++install(TARGETS braft-shared EXPORT unofficial-braftTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) + endif() ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-braft-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(gflags CONFIG) ++file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/unofficial-braftTargets.cmake") ++foreach (TARGET_FILE ${TARGET_FILES}) ++ include("${TARGET_FILE}") ++endforeach() ++]]) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-braft-config.cmake" DESTINATION share/unofficial-braft) ++ ++install(EXPORT unofficial-braftTargets ++ NAMESPACE unofficial::braft:: ++ DESTINATION share/unofficial-braft ++) diff --git a/ports/braft/fix-build.patch b/ports/braft/fix-build.patch new file mode 100644 index 00000000000000..1be7d3c9788a88 --- /dev/null +++ b/ports/braft/fix-build.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a735c53..53ddaed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -229,7 +229,9 @@ add_subdirectory(src) + if(BUILD_UNIT_TESTS) + add_subdirectory(test) + endif() ++if(BUILD_TOOLS) + add_subdirectory(tools) ++endif() + + file(COPY ${CMAKE_CURRENT_BINARY_DIR}/braft/ + DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/output/include/braft/ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index f587464..78adc56 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -12,22 +12,34 @@ include_directories(${CMAKE_SOURCE_DIR}/src) + add_library(OBJ_LIB OBJECT ${SOURCES}) + + set_property(TARGET ${OBJ_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) ++if (BUILD_SHARED_LIBS) + add_library(braft-shared SHARED $) ++else() + add_library(braft-static STATIC $) +-target_link_libraries(braft-shared ${DYNAMIC_LIB}) +-target_link_libraries(braft-static ${DYNAMIC_LIB}) ++endif() ++ ++if (BUILD_SHARED_LIBS) ++target_link_libraries(braft-shared PUBLIC ${DYNAMIC_LIB}) ++else() ++target_link_libraries(braft-static PUBLIC ${DYNAMIC_LIB}) ++endif() + ++if (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES(braft-static PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUTPUT 1) ++else() + SET_TARGET_PROPERTIES(braft-shared PROPERTIES OUTPUT_NAME braft CLEAN_DIRECT_OUTPUT 1) ++endif() + ++if (NOT BUILD_SHARED_LIBS) + install(TARGETS braft-static + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) +- ++else() + install(TARGETS braft-shared + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIBSUFFIX} + ARCHIVE DESTINATION lib${LIBSUFFIX} + ) ++endif() diff --git a/ports/braft/fix-dependency.patch b/ports/braft/fix-dependency.patch new file mode 100644 index 00000000000000..b39ba03fa619f0 --- /dev/null +++ b/ports/braft/fix-dependency.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 53ddaed..a851c00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,8 +47,9 @@ if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB)) + message(FATAL_ERROR "Fail to find leveldb") + endif() + +-find_path(GFLAGS_INCLUDE_PATH NAMES gflags/gflags.h) +-find_library(GFLAGS_LIB NAMES gflags) ++find_package(gflags CONFIG REQUIRED) ++get_target_property(GFLAGS_INCLUDE_PATH gflags::gflags INTERFACE_INCLUDE_DIRECTORIES) ++set(GFLAGS_LIB gflags::gflags) + if ((NOT GFLAGS_INCLUDE_PATH) OR (NOT GFLAGS_LIB)) + message(FATAL_ERROR "Fail to find gflags") + endif() diff --git a/ports/braft/portfile.cmake b/ports/braft/portfile.cmake new file mode 100644 index 00000000000000..c35fae993fef41 --- /dev/null +++ b/ports/braft/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO baidu/braft + REF 8d0128e02a2959f9cc427d5f97ed730ee6a6b410 + SHA512 f28afbf5fe8a354872c252580e2d679f7a66944a554f0c8e9331b8a68b6a87659d59fbbc41c3ada55e09a265032290bcef567c99a7428604d08f7885f97cf6d7 + HEAD_REF master + PATCHES + fix-build.patch + fix-dependency.patch + export-target.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBRPC_WITH_GLOG=ON + -DBUILD_TOOLS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-braft CONFIG_PATH share/unofficial-braft) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/braft/vcpkg.json b/ports/braft/vcpkg.json new file mode 100644 index 00000000000000..fc1294cab09445 --- /dev/null +++ b/ports/braft/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "braft", + "version-date": "2021-26-04", + "description": "Consesus algorithm library", + "homepage": "https://github.com/baidu/braft", + "license": "Apache-2.0", + "supports": "!windows", + "dependencies": [ + "brpc", + "gflags", + "glog", + "leveldb", + "protobuf", + "thrift", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/b-/braft.json b/versions/b-/braft.json new file mode 100644 index 00000000000000..9744235f2fa060 --- /dev/null +++ b/versions/b-/braft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d9afe1afea46ce35f64aaed5c2702c34113fe683", + "version-date": "2021-26-04", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 6a85b2bbd409ca..2785b2f99f2e0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1136,6 +1136,10 @@ "baseline": "2.4.1", "port-version": 2 }, + "braft": { + "baseline": "2021-26-04", + "port-version": 0 + }, "breakpad": { "baseline": "2020-09-14", "port-version": 5 From 6266585fcdc2d2d44689d9808ef6c6608f6788e2 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Sat, 9 Apr 2022 00:31:27 +0200 Subject: [PATCH 176/217] [clockutils] Fix x64-windows-static-md (#23965) * [clockutils] Fix x64-windows-static-md * version * fix version * version * use version * version --- ports/clockutils/portfile.cmake | 30 +++++++++++++++--------------- ports/clockutils/vcpkg.json | 13 ++++++++++--- scripts/ci.baseline.txt | 1 - versions/baseline.json | 4 ++-- versions/c-/clockutils.json | 5 +++++ 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake index 3c49b79be6608f..d3c42fef1cc77b 100644 --- a/ports/clockutils/portfile.cmake +++ b/ports/clockutils/portfile.cmake @@ -5,17 +5,19 @@ vcpkg_from_github( SHA512 ddb70cae9ced25de77a2df1854dac15e58a77347042ba3ee9c691f85f49edbc6539c84929a7477d429fb9161ba24c57d24d767793b8b1180216d5ddfc5d3ed6a HEAD_REF dev-1.2 PATCHES - "${CURRENT_PORT_DIR}/fix-warningC4643.patch" + fix-warningC4643.patch ) -if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - SET(SHARED_FLAG ON) -else() - SET(SHARED_FLAG OFF) +set(SHARED_FLAG OFF) +set(USE_MSBUILD "") +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic") + set(SHARED_FLAG ON) + set(USE_MSBUILD WINDOWS_USE_MSBUILD) # MS Build only required for dynamic builds endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${USE_MSBUILD} OPTIONS -DWITH_LIBRARY_ARGPARSER=ON -DWITH_LIBRARY_COMPRESSION=ON @@ -26,13 +28,11 @@ vcpkg_configure_cmake( -DCLOCKUTILS_BUILD_SHARED=${SHARED_FLAG} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/clockUtils) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/clockUtils/LICENSE ${CURRENT_PACKAGES_DIR}/share/clockUtils/copyright) -file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) - -vcpkg_copy_pdbs() \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clockutils/vcpkg.json b/ports/clockutils/vcpkg.json index 066a9ccac7549c..1939b6aa89f457 100644 --- a/ports/clockutils/vcpkg.json +++ b/ports/clockutils/vcpkg.json @@ -1,7 +1,14 @@ { "name": "clockutils", - "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", - "port-version": 4, + "version": "1.1.1", + "port-version": 1, "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.", - "homepage": "https://github.com/ClockworkOrigins/clockUtils" + "homepage": "https://github.com/ClockworkOrigins/clockUtils", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7c50ecc6f9e203..33f8b05e5df938 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1399,7 +1399,6 @@ lapack-reference:x64-uwp=skip # failures for x64-windows-static-md ace:x64-windows-static-md=fail akali:x64-windows-static-md=fail -clockutils:x64-windows-static-md=fail fastcgi:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2785b2f99f2e0f..59253dbb3d8504 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1425,8 +1425,8 @@ "port-version": 1 }, "clockutils": { - "baseline": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", - "port-version": 4 + "baseline": "1.1.1", + "port-version": 1 }, "clp": { "baseline": "1.17.6", diff --git a/versions/c-/clockutils.json b/versions/c-/clockutils.json index 0e658fecbe85aa..98504ce751af51 100644 --- a/versions/c-/clockutils.json +++ b/versions/c-/clockutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08f337ddf39f1cda9dd6431374cdb0ee748745da", + "version": "1.1.1", + "port-version": 1 + }, { "git-tree": "1fb64c4ec3d5aced719df16f96e79be4bb64cee7", "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", From 65c66cd748d48cfa8f02df8c434adbd862ef1dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Sat, 9 Apr 2022 00:32:16 +0200 Subject: [PATCH 177/217] [capstone] update to 5.0.0-rc2 (#23979) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [capstone] update to 5.0.0 alpha * [triton] upgrade to support capstone 5 * [triton] fix incorrect library linkage * [triton] bump port version * [capstone] Silence CRT Secure Function warning * [capstone] update to 5.0.0-rc2 Co-authored-by: MACHIZAUD Andréa --- ...-silence-windows-crt-secure-warnings.patch | 15 +++++ ports/capstone/portfile.cmake | 24 +++---- ports/capstone/vcpkg.json | 9 ++- ...cies.patch => 001-fix-dependency-z3.patch} | 34 +++++----- .../triton/002-fix-dependency-capstone.patch | 60 ++++++++++++++++++ ports/triton/003-fix-capstone-5.patch | 62 +++++++++++++++++++ ...{fix-python.patch => 004-fix-python.patch} | 0 ports/triton/fix-usage.patch | 14 ----- ports/triton/portfile.cmake | 21 +++---- ports/triton/vcpkg.json | 2 +- versions/baseline.json | 6 +- versions/c-/capstone.json | 5 ++ versions/t-/triton.json | 5 ++ 13 files changed, 184 insertions(+), 73 deletions(-) create mode 100644 ports/capstone/001-silence-windows-crt-secure-warnings.patch rename ports/triton/{fix-dependencies.patch => 001-fix-dependency-z3.patch} (57%) create mode 100644 ports/triton/002-fix-dependency-capstone.patch create mode 100644 ports/triton/003-fix-capstone-5.patch rename ports/triton/{fix-python.patch => 004-fix-python.patch} (100%) delete mode 100644 ports/triton/fix-usage.patch diff --git a/ports/capstone/001-silence-windows-crt-secure-warnings.patch b/ports/capstone/001-silence-windows-crt-secure-warnings.patch new file mode 100644 index 00000000000000..a2e99e919798e9 --- /dev/null +++ b/ports/capstone/001-silence-windows-crt-secure-warnings.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5f4448..5e5cc7e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,6 +87,10 @@ if(CAPSTONE_BUILD_STATIC_RUNTIME) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + endif() + ++if(WIN32) ++ add_compile_definitions(_CRT_SECURE_NO_WARNINGS) ++endif() ++ + ## sources + set(SOURCES_ENGINE + cs.c diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake index c1d2551f109d83..544e59c2d1bbc2 100644 --- a/ports/capstone/portfile.cmake +++ b/ports/capstone/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REF 4.0.2 - REPO "aquynh/capstone" - SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e - HEAD_REF v4 + REF d5141c04785678535c7792eddc21f146186e639f # 5.0.0-rc2 + REPO "capstone-engine/capstone" + SHA512 de9cf7da9fc3e502165b28b998b472791c8d5366e1a1a1fabd6bb8856a6fae80bf7d1fc4d268572d69c3526161bb0509a598ad4d94207e25a62aff6a5f9e9404 + HEAD_REF next + PATCHES + 001-silence-windows-crt-secure-warnings.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CS_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CS_BUILD_SHARED) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -36,25 +36,17 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCAPSTONE_BUILD_STATIC=${CS_BUILD_STATIC} - -DCAPSTONE_BUILD_SHARED=${CS_BUILD_SHARED} -DCAPSTONE_BUILD_TESTS=OFF -DCAPSTONE_BUILD_CSTOOL=OFF - -DCAPSTONE_X86_ONLY=OFF -DCAPSTONE_BUILD_STATIC_RUNTIME=${STATIC_CRT} ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") -if(EXES) - file(REMOVE ${EXES}) -endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/capstone/vcpkg.json b/ports/capstone/vcpkg.json index 85a10568039437..3b0362641e34dc 100644 --- a/ports/capstone/vcpkg.json +++ b/ports/capstone/vcpkg.json @@ -1,16 +1,15 @@ { "name": "capstone", - "version": "4.0.2", - "port-version": 3, + "version": "5.0.0-rc2", "description": "Multi-architecture disassembly framework", - "homepage": "https://github.com/aquynh/capstone", + "homepage": "https://github.com/capstone-engine/capstone", "dependencies": [ { "name": "vcpkg-cmake", "host": true }, { - "name": "vcpkg-cmake", + "name": "vcpkg-cmake-config", "host": true } ], @@ -37,7 +36,7 @@ "description": "Capstone disassembly support for MIPS" }, "osxkernel": { - "description": "Support for emedding Capstone into OSX Kernel extensions" + "description": "Support for embedding Capstone into OSX Kernel extensions" }, "ppc": { "description": "Capstone disassembly support for PowerPC" diff --git a/ports/triton/fix-dependencies.patch b/ports/triton/001-fix-dependency-z3.patch similarity index 57% rename from ports/triton/fix-dependencies.patch rename to ports/triton/001-fix-dependency-z3.patch index b7466a5944f76c..fd3ee5f3035b6c 100644 --- a/ports/triton/fix-dependencies.patch +++ b/ports/triton/001-fix-dependency-z3.patch @@ -14,28 +14,21 @@ index a8bbe47..966ded8 100644 endif() # Find bitwuzla -diff --git a/CMakeModules/FindCAPSTONE.cmake b/CMakeModules/FindCAPSTONE.cmake -index ff2c63f..4dcf9af 100644 ---- a/CMakeModules/FindCAPSTONE.cmake -+++ b/CMakeModules/FindCAPSTONE.cmake -@@ -26,9 +26,11 @@ if(NOT CAPSTONE_INCLUDE_DIRS AND NOT CAPSTONE_LIBRARIES) - NAMES capstone/capstone.h - PATHS ${CAPSTONE_PKGCONF_INCLUDE_DIRS} - ) -+ -+ string(APPEND CAPSTONE_INCLUDE_DIR "/capstone") - - find_library(CAPSTONE_LIBRARY -- NAMES capstone -+ NAMES capstone capstone_dll - PATHS ${CAPSTONE_PKGCONF_LIBRARY_DIRS} - ) - diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in -index 94c58bc..115d697 100644 +index 683b5f2..5df941e 100644 --- a/src/libtriton/Config.cmake.in +++ b/src/libtriton/Config.cmake.in -@@ -40,10 +40,6 @@ if (TRITON_LLVM_INTERFACE) +@@ -19,6 +19,9 @@ message(STATUS "Found Triton: ${CMAKE_CURRENT_LIST_DIR}/tritonConfig.cmake (foun + + include(CMakeFindDependencyMacro) + find_dependency(Boost) ++if (@Z3_INTERFACE@) ++ find_dependency(Z3 CONFIG) ++endif() + + # Triton include + include_directories("@CMAKE_INSTALL_PREFIX@/include") +@@ -37,11 +40,6 @@ if (TRITON_LLVM_INTERFACE) include_directories("@LLVM_INCLUDE_DIRS@") endif() @@ -43,6 +36,7 @@ index 94c58bc..115d697 100644 -if (TRITON_Z3_INTERFACE) - include_directories("@Z3_INCLUDE_DIRS@") -endif() - +- # Bitwuzla include directories if (TRITON_BITWUZLA_INTERFACE) + include_directories("@BITWUZLA_INCLUDE_DIRS@") diff --git a/ports/triton/002-fix-dependency-capstone.patch b/ports/triton/002-fix-dependency-capstone.patch new file mode 100644 index 00000000000000..d4814709ea0f40 --- /dev/null +++ b/ports/triton/002-fix-dependency-capstone.patch @@ -0,0 +1,60 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 966ded8..199a3ba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -129,8 +129,8 @@ endif() + + # Find Capstone + message(STATUS "Compiling with Capstone") +-find_package(CAPSTONE REQUIRED) +-include_directories(${CAPSTONE_INCLUDE_DIRS}) ++find_package(CAPSTONE CONFIG REQUIRED) ++set(CAPSTONE_LIBRARIES capstone::capstone) + + # Find boost + message(STATUS "Compiling with Boost headers") +diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in +index 5df941e..23c5a27 100644 +--- a/src/libtriton/Config.cmake.in ++++ b/src/libtriton/Config.cmake.in +@@ -19,6 +19,7 @@ message(STATUS "Found Triton: ${CMAKE_CURRENT_LIST_DIR}/tritonConfig.cmake (foun + + include(CMakeFindDependencyMacro) + find_dependency(Boost) ++find_dependency(capstone CONFIG) + if (@Z3_INTERFACE@) + find_dependency(Z3 CONFIG) + endif() +@@ -26,9 +27,6 @@ endif() + # Triton include + include_directories("@CMAKE_INSTALL_PREFIX@/include") + +-# Capstone include +-include_directories("@CAPSTONE_INCLUDE_DIRS@") +- + # Python include directories + if (TRITON_PYTHON_BINDINGS) + include_directories("@PYTHON_INCLUDE_DIRS@") +diff --git a/src/libtriton/includes/triton/externalLibs.hpp b/src/libtriton/includes/triton/externalLibs.hpp +index 65678a0..d055f88 100644 +--- a/src/libtriton/includes/triton/externalLibs.hpp ++++ b/src/libtriton/includes/triton/externalLibs.hpp +@@ -29,14 +29,10 @@ namespace triton { + * \addtogroup extlibs + * @{ + */ +- #if defined(__unix__) || defined(__APPLE__) +- #include +- #include +- #include +- #include +- #elif _WIN32 +- #include +- #endif ++ #include ++ #include ++ #include ++ #include + /*! @} End of capstone namespace */ + }; + diff --git a/ports/triton/003-fix-capstone-5.patch b/ports/triton/003-fix-capstone-5.patch new file mode 100644 index 00000000000000..4d2f08c56b2c1e --- /dev/null +++ b/ports/triton/003-fix-capstone-5.patch @@ -0,0 +1,62 @@ +diff --git a/src/libtriton/arch/x86/x86Specifications.cpp b/src/libtriton/arch/x86/x86Specifications.cpp +index 0806ac3..6295c95 100644 +--- a/src/libtriton/arch/x86/x86Specifications.cpp ++++ b/src/libtriton/arch/x86/x86Specifications.cpp +@@ -153,9 +153,11 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_FIADD; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_FADDP: + tritonId = triton::arch::x86::ID_INS_FADDP; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_ADOX: + tritonId = triton::arch::x86::ID_INS_ADOX; +@@ -2877,9 +2879,11 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_FUCOM; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_UD2B: + tritonId = triton::arch::x86::ID_INS_UD2B; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_UNPCKHPD: + tritonId = triton::arch::x86::ID_INS_UNPCKHPD; +@@ -3037,17 +3041,21 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_VCVTDQ2PS; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_VCVTPD2DQX: + tritonId = triton::arch::x86::ID_INS_VCVTPD2DQX; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_VCVTPD2DQ: + tritonId = triton::arch::x86::ID_INS_VCVTPD2DQ; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_VCVTPD2PSX: + tritonId = triton::arch::x86::ID_INS_VCVTPD2PSX; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_VCVTPD2PS: + tritonId = triton::arch::x86::ID_INS_VCVTPD2PS; +@@ -3093,9 +3101,11 @@ namespace triton { + tritonId = triton::arch::x86::ID_INS_VCVTSS2USI; + break; + ++#if CS_API_MAJOR < 5 + case triton::extlibs::capstone::X86_INS_VCVTTPD2DQX: + tritonId = triton::arch::x86::ID_INS_VCVTTPD2DQX; + break; ++#endif + + case triton::extlibs::capstone::X86_INS_VCVTTPD2DQ: + tritonId = triton::arch::x86::ID_INS_VCVTTPD2DQ; diff --git a/ports/triton/fix-python.patch b/ports/triton/004-fix-python.patch similarity index 100% rename from ports/triton/fix-python.patch rename to ports/triton/004-fix-python.patch diff --git a/ports/triton/fix-usage.patch b/ports/triton/fix-usage.patch deleted file mode 100644 index 931ce2239797c6..00000000000000 --- a/ports/triton/fix-usage.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/libtriton/Config.cmake.in b/src/libtriton/Config.cmake.in -index 683b5f2..94c58bc 100644 ---- a/src/libtriton/Config.cmake.in -+++ b/src/libtriton/Config.cmake.in -@@ -19,6 +19,9 @@ message(STATUS "Found Triton: ${CMAKE_CURRENT_LIST_DIR}/tritonConfig.cmake (foun - - include(CMakeFindDependencyMacro) - find_dependency(Boost) -+if (@Z3_INTERFACE@) -+ find_dependency(Z3 CONFIG) -+endif() - - # Triton include - include_directories("@CMAKE_INSTALL_PREFIX@/include") diff --git a/ports/triton/portfile.cmake b/ports/triton/portfile.cmake index 90e25594fd71a5..991631203f61dc 100644 --- a/ports/triton/portfile.cmake +++ b/ports/triton/portfile.cmake @@ -4,19 +4,18 @@ vcpkg_from_github( REF 64a2b9b0490c82e41b37e623b1d0da14e2382e7a SHA512 ff99a270813043df2bc0da765e04aae4b9d5a911d20c6e5ffca1472eae8d6e1fcfff3cd56da023d6a77a647644839430bf72902acd84ec521a0e098f185d275c PATCHES - fix-dependencies.patch - fix-usage.patch - fix-python.patch + 001-fix-dependency-z3.patch + 002-fix-dependency-capstone.patch + 003-fix-capstone-5.patch + 004-fix-python.patch ) -file(REMOVE "${SOURCE_PATH}/CMakeModules/FindZ3.cmake") - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATICLIB) +string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DYNAMICLIB) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATICCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "python" PYTHON_BINDINGS + "python" PYTHON_BINDINGS ) set(ADDITIONAL_OPTIONS ) @@ -32,17 +31,11 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DZ3_INTERFACE=ON - -DBUILD_SHARED_LIBS=${STATICLIB} + -DBUILD_SHARED_LIBS=${DYNAMICLIB} -DMSVC_STATIC=${STATICCRT} -DBUILD_EXAMPLES=OFF -DENABLE_TEST=OFF - -DCAPSTONE_PKGCONF_INCLUDE_DIRS="${CURRENT_INSTALLED_DIR}/include" ${ADDITIONAL_OPTIONS} - OPTIONS_DEBUG - -DCAPSTONE_PKGCONF_LIBRARY_DIRS="${CURRENT_INSTALLED_DIR}/debug/lib" - OPTIONS_RELEASE - -DCAPSTONE_PKGCONF_LIBRARY_DIRS="${CURRENT_INSTALLED_DIR}/lib" - ) vcpkg_cmake_install() diff --git a/ports/triton/vcpkg.json b/ports/triton/vcpkg.json index dc81d068d185f9..e97ea3d5113773 100644 --- a/ports/triton/vcpkg.json +++ b/ports/triton/vcpkg.json @@ -1,7 +1,7 @@ { "name": "triton", "version": "0.9", - "port-version": 1, + "port-version": 2, "description": "Triton is a Dynamic Binary Analysis (DBA) framework. It provides internal components like a Dynamic Symbolic Execution (DSE) engine, a dynamic taint engine, AST representations of the x86, x86-64, ARM32 and AArch64 Instructions Set Architecture (ISA), SMT simplification passes, an SMT solver interface and, the last but not least, Python bindings.", "homepage": "https://github.com/JonathanSalwan/Triton", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 59253dbb3d8504..e7117dce2149b6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1245,8 +1245,8 @@ "port-version": 2 }, "capstone": { - "baseline": "4.0.2", - "port-version": 3 + "baseline": "5.0.0-rc2", + "port-version": 0 }, "cargs": { "baseline": "1.0.3", @@ -7106,7 +7106,7 @@ }, "triton": { "baseline": "0.9", - "port-version": 1 + "port-version": 2 }, "trompeloeil": { "baseline": "41", diff --git a/versions/c-/capstone.json b/versions/c-/capstone.json index 6c1661c28de3d0..008cc376f89476 100644 --- a/versions/c-/capstone.json +++ b/versions/c-/capstone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7b26d8f672f30156cad79a647525b8dd8c9781b", + "version": "5.0.0-rc2", + "port-version": 0 + }, { "git-tree": "5250715402bf0c970792dafe6947aa810adde0f1", "version": "4.0.2", diff --git a/versions/t-/triton.json b/versions/t-/triton.json index aae56d2cb2a91f..2bc40636221edd 100644 --- a/versions/t-/triton.json +++ b/versions/t-/triton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "220ce7aa574609f64206fc02906b1bd2eafbc8aa", + "version": "0.9", + "port-version": 2 + }, { "git-tree": "1463df6dd74dfea7d12a8610b23009259b5c1e57", "version": "0.9", From c2978f8baaf61092427a358eb30a9d790dc911c6 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Sat, 9 Apr 2022 00:32:50 +0200 Subject: [PATCH 178/217] [bdwgc] Don't build docs (#24025) * [bdwgc] Don't build docs * version --- ports/bdwgc/portfile.cmake | 13 ++++++------- ports/bdwgc/vcpkg.json | 13 +++++++++++-- versions/b-/bdwgc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake index 5e6f34dca0d640..9fe8ed0f873589 100644 --- a/ports/bdwgc/portfile.cmake +++ b/ports/bdwgc/portfile.cmake @@ -6,23 +6,22 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -Denable_cplusplus=ON + -Denable_docs=OFF -DCFLAGS_EXTRA=-I${CURRENT_INSTALLED_DIR}/include # for libatomic_ops OPTIONS_DEBUG -Dinstall_headers=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/bdwgc) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bdwgc) vcpkg_copy_pdbs() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/README.QUICK" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/README.QUICK" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json index 35e3cd85b097c5..f9958115349fd9 100644 --- a/ports/bdwgc/vcpkg.json +++ b/ports/bdwgc/vcpkg.json @@ -1,9 +1,18 @@ { "name": "bdwgc", "version": "8.2.0", - "port-version": 2, + "port-version": 3, "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)", + "homepage": "http://www.hboehm.info/gc/", "dependencies": [ - "libatomic-ops" + "libatomic-ops", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json index e12434284ab2a5..92dbb78c1e8e17 100644 --- a/versions/b-/bdwgc.json +++ b/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1cf3b7a458af2eba78e5af9674e8f6d28b53e254", + "version": "8.2.0", + "port-version": 3 + }, { "git-tree": "b7ec5e3585f7f7b71988cb7379c181a1fa9461cd", "version": "8.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e7117dce2149b6..1785b767b7f599 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -410,7 +410,7 @@ }, "bdwgc": { "baseline": "8.2.0", - "port-version": 2 + "port-version": 3 }, "beast": { "baseline": "0", From bd1ef2df46303989eeb048eb7aa9b816aa46365e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 9 Apr 2022 00:34:42 +0200 Subject: [PATCH 179/217] [graphviz,libslirp] Limit msys to windows (#24032) * Limit vcpkg_acquire_msys to windows * Add missing quotes * Update versions --- ports/graphviz/portfile.cmake | 18 ++++++++++-------- ports/graphviz/vcpkg.json | 2 +- ports/libslirp/portfile.cmake | 6 ++++-- ports/libslirp/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/g-/graphviz.json | 5 +++++ versions/l-/libslirp.json | 5 +++++ 7 files changed, 28 insertions(+), 13 deletions(-) diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake index 14f0b00db5c63e..3310b5be75839f 100644 --- a/ports/graphviz/portfile.cmake +++ b/ports/graphviz/portfile.cmake @@ -30,8 +30,10 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) set(EXTRA_CMAKE_OPTION "-DCMAKE_INSTALL_RPATH=${CURRENT_INSTALLED_DIR}/lib") endif() -vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk) -vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +if(VCPKG_HOST_IS_WINDOWS) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +endif() vcpkg_find_acquire_program(BISON) vcpkg_find_acquire_program(FLEX) @@ -42,11 +44,11 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS - -DBISON_EXECUTABLE=${BISON} - -DFLEX_EXECUTABLE=${FLEX} - -DGIT_EXECUTABLE=${GIT} - -DPython3_EXECUTABLE=${PYTHON3} - -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf + "-DBISON_EXECUTABLE=${BISON}" + "-DFLEX_EXECUTABLE=${FLEX}" + "-DGIT_EXECUTABLE=${GIT}" + "-DPython3_EXECUTABLE=${PYTHON3}" + "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf" ${EXTRA_CMAKE_OPTION} ) @@ -65,7 +67,7 @@ if(VCPKG_TARGET_IS_WINDOWS) file(COPY ${PLUGINS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") vcpkg_execute_required_process( COMMAND dot -c - WORKING_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT} + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}" LOGNAME configure-plugins ) file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config6" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json index d9e8eca967d8e0..2419d09af0d8d8 100644 --- a/ports/graphviz/vcpkg.json +++ b/ports/graphviz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphviz", "version-semver": "2.49.1", - "port-version": 2, + "port-version": 3, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", "license": "EPL-1.0", diff --git a/ports/libslirp/portfile.cmake b/ports/libslirp/portfile.cmake index bf6b248d8e5c5c..8862f1b3024efe 100644 --- a/ports/libslirp/portfile.cmake +++ b/ports/libslirp/portfile.cmake @@ -7,8 +7,10 @@ vcpkg_from_gitlab( HEAD_REF master ) -vcpkg_acquire_msys(MSYS_ROOT) -vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +if(VCPKG_HOST_IS_WINDOWS) + vcpkg_acquire_msys(MSYS_ROOT) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") +endif() vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/libslirp/vcpkg.json b/ports/libslirp/vcpkg.json index bd6e8915e58f7e..470194d07f14dd 100644 --- a/ports/libslirp/vcpkg.json +++ b/ports/libslirp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libslirp", "version-semver": "4.6.1", + "port-version": 1, "description": "libslirp is a user-mode networking library used by virtual machines, containers or various tools.", "homepage": "https://gitlab.freedesktop.org/slirp/libslirp", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 1785b767b7f599..c7016f8bad5366 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2626,7 +2626,7 @@ }, "graphviz": { "baseline": "2.49.1", - "port-version": 2 + "port-version": 3 }, "greatest": { "baseline": "1.5.0", @@ -3982,7 +3982,7 @@ }, "libslirp": { "baseline": "4.6.1", - "port-version": 0 + "port-version": 1 }, "libsmb2": { "baseline": "2021-04-29", diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json index 1c479d139c7a0b..725c9854642a37 100644 --- a/versions/g-/graphviz.json +++ b/versions/g-/graphviz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1f20d0e1aaccb1035e3fe3eb95d005b4161a56e", + "version-semver": "2.49.1", + "port-version": 3 + }, { "git-tree": "912ac6a1578bd9cf23c20ed7f3bc85c25058c872", "version-semver": "2.49.1", diff --git a/versions/l-/libslirp.json b/versions/l-/libslirp.json index 7f45afb036c4c5..a46de194d5047e 100644 --- a/versions/l-/libslirp.json +++ b/versions/l-/libslirp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3230fcf2c1b8018c5eac033b618f2cb35217772f", + "version-semver": "4.6.1", + "port-version": 1 + }, { "git-tree": "5a7b734c0850f035d3eb2abc2d3dbf6389124be5", "version-semver": "4.6.1", From 7fb979c4c1b9a4b09b16fc26b601b478765f6b2e Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 11 Apr 2022 01:13:06 +0200 Subject: [PATCH 180/217] [tinycbor] Fix file conflicts with libcbor (#24056) * [tinycbor] Fix file conflicts with libcbor * version * license * version --- ports/tinycbor/CMakeLists.txt | 2 +- ports/tinycbor/portfile.cmake | 10 +++++----- ports/tinycbor/vcpkg.json | 6 ++---- versions/baseline.json | 2 +- versions/t-/tinycbor.json | 23 ++++++++++++++--------- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/ports/tinycbor/CMakeLists.txt b/ports/tinycbor/CMakeLists.txt index 12fda83ed8fb16..b902a7df3a842a 100644 --- a/ports/tinycbor/CMakeLists.txt +++ b/ports/tinycbor/CMakeLists.txt @@ -6,4 +6,4 @@ list(FILTER sources EXCLUDE REGEX "cbortojson.c$") add_library(tinycbor ${sources}) install(TARGETS tinycbor) -install(FILES src/cbor.h src/cborjson.h src/tinycbor-version.h DESTINATION include) \ No newline at end of file +install(FILES src/cbor.h src/cborjson.h src/tinycbor-version.h DESTINATION include/tinycbor) diff --git a/ports/tinycbor/portfile.cmake b/ports/tinycbor/portfile.cmake index e068692d57222b..325b4eb0863599 100644 --- a/ports/tinycbor/portfile.cmake +++ b/ports/tinycbor/portfile.cmake @@ -8,13 +8,13 @@ vcpkg_from_github( HEAD_REF master ) -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}) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - # Remove duplicated include headers -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tinycbor/vcpkg.json b/ports/tinycbor/vcpkg.json index 42d54acd4a4f5c..23016c5f71923c 100644 --- a/ports/tinycbor/vcpkg.json +++ b/ports/tinycbor/vcpkg.json @@ -1,16 +1,14 @@ { "name": "tinycbor", "version-semver": "0.6.0", + "port-version": 1, "description": "Concise Binary Object Representation (CBOR) Library", "homepage": "https://github.com/intel/tinycbor", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index c7016f8bad5366..630a0f7ab7981b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6958,7 +6958,7 @@ }, "tinycbor": { "baseline": "0.6.0", - "port-version": 0 + "port-version": 1 }, "tinycthread": { "baseline": "2019-08-06", diff --git a/versions/t-/tinycbor.json b/versions/t-/tinycbor.json index 11e624ee4f94b5..999afd64cba3a3 100644 --- a/versions/t-/tinycbor.json +++ b/versions/t-/tinycbor.json @@ -1,9 +1,14 @@ -{ - "versions": [ - { - "git-tree": "ecf65457801ba4aa8d8ae75886f87e740fb04783", - "version-semver": "0.6.0", - "port-version": 0 - } - ] -} +{ + "versions": [ + { + "git-tree": "0579e95478ca32302fe6680fb0f953441d043a27", + "version-semver": "0.6.0", + "port-version": 1 + }, + { + "git-tree": "ecf65457801ba4aa8d8ae75886f87e740fb04783", + "version-semver": "0.6.0", + "port-version": 0 + } + ] +} From f6af75acc923c833a5620943e3fc7d5e4930f0df Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Sun, 10 Apr 2022 16:25:19 -0700 Subject: [PATCH 181/217] [openxr-loader] fix ci.baseline.txt (#24073) Co-authored-by: nicole mazzuca --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 33f8b05e5df938..1fe69e276d4c45 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -952,10 +952,7 @@ openvr:arm-uwp=fail openvr:x64-osx=fail openvr:x64-uwp=fail openvr:x64-windows-static=fail -openxr-loader:arm64-windows=fail -openxr-loader:arm-uwp=fail openxr-loader:x64-osx=fail -openxr-loader:x64-uwp=fail optional-bare:arm64-windows = skip optional-bare:arm-uwp = skip optional-bare:x64-linux = skip From 6da8836c98abfa6d57007c0246aa74099c306c00 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 11 Apr 2022 17:33:06 +0200 Subject: [PATCH 182/217] [cmake-user] Fix library check (#24070) --- scripts/test_ports/cmake-user/project/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/test_ports/cmake-user/project/CMakeLists.txt b/scripts/test_ports/cmake-user/project/CMakeLists.txt index 921559a7ceac36..9e74608cee734e 100644 --- a/scripts/test_ports/cmake-user/project/CMakeLists.txt +++ b/scripts/test_ports/cmake-user/project/CMakeLists.txt @@ -57,13 +57,13 @@ foreach(package ${FIND_PACKAGES}) set(libraries_var "") if(DEFINED ${package}_LIBRARIES) - set(libraries_var "${package_upper}_LIBRARIES") - elseif(DEFINED ${package_upper}_LIBRARIES) set(libraries_var "${package}_LIBRARIES") + elseif(DEFINED ${package_upper}_LIBRARIES) + set(libraries_var "${package_upper}_LIBRARIES") elseif(DEFINED ${package}_LIBRARY) - set(libraries_var "${package_upper}_LIBRARY") - elseif(DEFINED ${package_upper}_LIBRARY) set(libraries_var "${package}_LIBRARY") + elseif(DEFINED ${package_upper}_LIBRARY) + set(libraries_var "${package_upper}_LIBRARY") else() message(STATUS "${package}_LIBRARY/IES: undefined") continue() From 22f2736a3863b913f738157e205ea8aff1ce6210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horv=C3=A1t?= Date: Mon, 11 Apr 2022 17:34:49 +0200 Subject: [PATCH 183/217] [igraph] update to 0.9.8 (#24065) * [igraph] update to 0.9.8 * [igraph] x-add-version * [igraph] add license field * [igraph] x-add-version --- ports/igraph/portfile.cmake | 6 +++--- ports/igraph/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/i-/igraph.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index a0ed9e4fa01587..4061978e1d7822 100644 --- a/ports/igraph/portfile.cmake +++ b/ports/igraph/portfile.cmake @@ -4,9 +4,9 @@ # - The release tarball contains pre-generated parser sources, which eliminates the dependency on bison/flex. vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/igraph/igraph/releases/download/0.9.7/igraph-0.9.7.tar.gz" - FILENAME "igraph-0.9.7.tar.gz" - SHA512 8c1841bef3e27b2c0cf895d40afa4f2ff055d65a86263c3f55697b56c0100b6fd897c805294c842f65988236850bbdb9074bcbd3297b0cb27c8851e5af9ba317 + URLS "https://github.com/igraph/igraph/releases/download/0.9.8/igraph-0.9.8.tar.gz" + FILENAME "igraph-0.9.8.tar.gz" + SHA512 4f0af3e2b4e2ed782064afc8a7aa0f104c683c35de3f71240d41a1b5097dd41101a483d4e5f9ce4dca1a5ca0bb616e1c125d58ccf50066b1405e8188fe4d796f ) vcpkg_extract_source_archive_ex( diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index 8b9c46bbf5038b..f5a73ff0edcc2d 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,8 +1,9 @@ { "name": "igraph", - "version": "0.9.7", + "version": "0.9.8", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", + "license": "GPL-2.0-or-later", "dependencies": [ "suitesparse", { diff --git a/versions/baseline.json b/versions/baseline.json index 630a0f7ab7981b..6d9bba345d47e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2885,7 +2885,7 @@ "port-version": 3 }, "igraph": { - "baseline": "0.9.7", + "baseline": "0.9.8", "port-version": 0 }, "iir1": { diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index c133b0da6c54de..a37f62b31ecbba 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5af04d279a55817e0ca26a113a67cf48884f9aaf", + "version": "0.9.8", + "port-version": 0 + }, { "git-tree": "3ebbe45814d64c35e654ecb39cf5acf9401c793a", "version": "0.9.7", From 3c8c9eef1f6058251f048beb94807ffd91224c63 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:39:59 +0200 Subject: [PATCH 184/217] [c-ares] update to 1.18.1 (#24062) * [c-ares] update to 1.18.1 * patch * What's going on here? * I see... * version * unsupported on UWP * version --- ports/c-ares/avoid-docs.patch | 13 +++++++++++++ ports/c-ares/portfile.cmake | 10 ++++++---- ports/c-ares/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 4 ++-- versions/c-/c-ares.json | 5 +++++ 6 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 ports/c-ares/avoid-docs.patch diff --git a/ports/c-ares/avoid-docs.patch b/ports/c-ares/avoid-docs.patch new file mode 100644 index 00000000000000..cd505ecceb4922 --- /dev/null +++ b/ports/c-ares/avoid-docs.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 194485a..e903e50 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -618,7 +618,7 @@ ADD_SUBDIRECTORY (include) + ADD_SUBDIRECTORY (src) + + # Docs +-ADD_SUBDIRECTORY (docs) ++#ADD_SUBDIRECTORY (docs) + + # Tests + IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS) diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index 29451a9a7c7cac..f21cd6c586d59e 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -1,16 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-ares/c-ares - REF cares-1_17_2 - SHA512 1111f1e7eeb0e5d9e70d1a7c8566145d0a5e6e71b020f3fcaa02ecdf1931553ddeff83fdc152a1f9c5a780078e8afe3670164b631df56eecd2b638210cc59bb3 - HEAD_REF master + REF cares-1_18_1 + SHA512 9f5f9d5a22a4643aef8701c4abfd4b28e0bded2479bab462d2dfc63a8f84348f02d3cfbd7c85cc1e06a154a3e4206721cb6669c7c61538ecdcd44268e4ce073e + HEAD_REF main + PATCHES + avoid-docs.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCARES_STATIC=${BUILD_STATIC} -DCARES_SHARED=${BUILD_SHARED} diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json index dea85af0bfb55c..b8f9a87468bb17 100644 --- a/ports/c-ares/vcpkg.json +++ b/ports/c-ares/vcpkg.json @@ -1,9 +1,9 @@ { "name": "c-ares", - "version-semver": "1.17.2", - "port-version": 2, + "version-semver": "1.18.1", "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", + "license": "MIT", "supports": "!uwp", "dependencies": [ { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1fe69e276d4c45..bff5328322d97b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -72,8 +72,6 @@ caf:arm-uwp=fail caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail -c-ares:arm-uwp=fail -c-ares:x64-uwp=fail # file conflict with dbg-macro c-dbg-macro:x86-windows=skip diff --git a/versions/baseline.json b/versions/baseline.json index 6d9bba345d47e5..ff71a88cf1b2dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1201,8 +1201,8 @@ "port-version": 2 }, "c-ares": { - "baseline": "1.17.2", - "port-version": 2 + "baseline": "1.18.1", + "port-version": 0 }, "c-dbg-macro": { "baseline": "2020-02-29", diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json index 31f663728e978b..85b6c17c075de9 100644 --- a/versions/c-/c-ares.json +++ b/versions/c-/c-ares.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60b32d4ff262f2603153b8496e39f7b0aba39f99", + "version-semver": "1.18.1", + "port-version": 0 + }, { "git-tree": "8c97dd38d470b96784d2aa4484d04afca77e2c60", "version-semver": "1.17.2", From e3e75833800d0c5394b8e99b7cb74791f311245b Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:45:24 +0200 Subject: [PATCH 185/217] [openssl] Fix dynamic builds on UNIX (#24061) * [openssl] Fix dynamic builds on UNIX * version * Use version.dat * version --- ports/openssl/unix/CMakeLists.txt | 7 ++++--- ports/openssl/vcpkg.json | 2 +- ports/openssl/windows/portfile.cmake | 2 -- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 52bfcfff3c5e0b..c375f0f3518e25 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -108,10 +108,11 @@ get_filename_component(MSYS_BIN_DIR "${MAKE}" DIRECTORY) if(BUILD_SHARED_LIBS) set(SHARED shared) - file(STRINGS "${BUILDDIR}/include/openssl/opensslv.h" SHLIB_VERSION - REGEX "^#[\t ]*define[\t ]+SHLIB_VERSION_NUMBER[\t ]+\".*\".*") - string(REGEX REPLACE "^.*SHLIB_VERSION_NUMBER[\t ]+\"([^\"]*)\".*$" "\\1" + file(STRINGS "${BUILDDIR}/VERSION.dat" SHLIB_VERSION + REGEX "^SHLIB_VERSION=.*") + string(REGEX REPLACE "^(SHLIB_VERSION=)(.*)$" "\\2" SHLIB_VERSION "${SHLIB_VERSION}") + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") set(LIB_EXT dylib) set(LIB_EXTS ${SHLIB_VERSION}.${LIB_EXT}) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index dd48bdec525cf8..dfde151f1768fd 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.2", - "port-version": 1, + "port-version": 2, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 2e85ec5f00d432..5cd487300253ee 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -183,5 +183,3 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - - diff --git a/versions/baseline.json b/versions/baseline.json index ff71a88cf1b2dc..4204a4a8cb12e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5150,7 +5150,7 @@ }, "openssl": { "baseline": "3.0.2", - "port-version": 1 + "port-version": 2 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 113320c810cd84..207c8962730205 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3", + "version": "3.0.2", + "port-version": 2 + }, { "git-tree": "3505d3717ae864160fdb273eb2ec9d614eb6711e", "version": "3.0.2", From 26680008b2b8b5d49a78b72afdf8dedaf3598855 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:45:48 +0200 Subject: [PATCH 186/217] [imath] Update to 3.1.5 (#24059) * Update imath to 3.1.5 * Update CI baseline Co-authored-by: chausner --- ports/imath/portfile.cmake | 4 ++-- ports/imath/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/i-/imath.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/imath/portfile.cmake b/ports/imath/portfile.cmake index ca245a1cbaa0e1..e8e38f8be58c20 100644 --- a/ports/imath/portfile.cmake +++ b/ports/imath/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/Imath - REF v3.1.3 - SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75 + REF v3.1.5 + SHA512 8344e42c75d8e4bb21facb837535f0c9e4a9489d9edebcc25d5d3c6063535f2bf54e4517d8fca3fedada248457aa07c9bd77d6e843a9d115278fc154de2cdc9d HEAD_REF master ) diff --git a/ports/imath/vcpkg.json b/ports/imath/vcpkg.json index c8bc20ac6c9258..01ef7a9d6adee1 100644 --- a/ports/imath/vcpkg.json +++ b/ports/imath/vcpkg.json @@ -1,9 +1,9 @@ { "name": "imath", - "version": "3.1.3", - "port-version": 1, + "version": "3.1.5", "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.", "homepage": "https://github.com/AcademySoftwareFoundation/Imath", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 4204a4a8cb12e3..529007c57158cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2901,8 +2901,8 @@ "port-version": 1 }, "imath": { - "baseline": "3.1.3", - "port-version": 1 + "baseline": "3.1.5", + "port-version": 0 }, "imgui": { "baseline": "1.87", diff --git a/versions/i-/imath.json b/versions/i-/imath.json index 0053f4defc1202..f1385c4d11764e 100644 --- a/versions/i-/imath.json +++ b/versions/i-/imath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e72149f2fce9434300bbdd84562ad7a58aa4ac90", + "version": "3.1.5", + "port-version": 0 + }, { "git-tree": "f8d9cbaa52114f1030e4bc9ee0e075da76d7be5c", "version": "3.1.3", From 5d1860a18977051a272f1c3c88450d0558c604b4 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:47:23 +0200 Subject: [PATCH 187/217] [openxr-loader] remove from CI baseline (#24057) * [openxr-loader] remove from CI baseline * OSX is not supported * version * Fix supports * version --- ports/openxr-loader/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/o-/openxr-loader.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/openxr-loader/vcpkg.json b/ports/openxr-loader/vcpkg.json index 03edc64d838937..c2e6b9a404490c 100644 --- a/ports/openxr-loader/vcpkg.json +++ b/ports/openxr-loader/vcpkg.json @@ -1,11 +1,11 @@ { "name": "openxr-loader", "version": "1.0.22", - "port-version": 2, + "port-version": 3, "description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices", "homepage": "https://github.com/KhronosGroup/OpenXR-SDK", "license": "Apache-2.0", - "supports": "!uwp", + "supports": "!uwp & !osx", "dependencies": [ "jsoncpp", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bff5328322d97b..c0c581ebf44874 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -950,7 +950,6 @@ openvr:arm-uwp=fail openvr:x64-osx=fail openvr:x64-uwp=fail openvr:x64-windows-static=fail -openxr-loader:x64-osx=fail optional-bare:arm64-windows = skip optional-bare:arm-uwp = skip optional-bare:x64-linux = skip diff --git a/versions/baseline.json b/versions/baseline.json index 529007c57158cf..dd4d924f4d96ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5190,7 +5190,7 @@ }, "openxr-loader": { "baseline": "1.0.22", - "port-version": 2 + "port-version": 3 }, "optimus-cpp": { "baseline": "0.3.0", diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json index 48a62f3377f9f2..6385ac6a9d6b63 100644 --- a/versions/o-/openxr-loader.json +++ b/versions/o-/openxr-loader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e26b91f539cbbba23cc6ccd2eb9106322ba1c81c", + "version": "1.0.22", + "port-version": 3 + }, { "git-tree": "27baef30397d0db0e6cc01d6f60a86e2ff4df238", "version": "1.0.22", From 3d93caa1b0999fc36ff8796795af628013703bfc Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:49:10 +0200 Subject: [PATCH 188/217] [harfbuff] fix arm64 osx build (#24055) --- ports/harfbuzz/fix-macos-build.diff | 43 +++++++++++++++++++++++++++++ ports/harfbuzz/portfile.cmake | 1 + ports/harfbuzz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 ++++ 5 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 ports/harfbuzz/fix-macos-build.diff diff --git a/ports/harfbuzz/fix-macos-build.diff b/ports/harfbuzz/fix-macos-build.diff new file mode 100644 index 00000000000000..3d0f8b5ceb0768 --- /dev/null +++ b/ports/harfbuzz/fix-macos-build.diff @@ -0,0 +1,43 @@ +diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc +index 5f383064c4..6ccc1b0a2b 100644 +--- a/src/hb-coretext.cc ++++ b/src/hb-coretext.cc +@@ -897,7 +897,7 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, + DEBUG_MSG (CORETEXT, nullptr, "Num runs: %d", num_runs); + + buffer->len = 0; +- uint32_t status_and = ~0, status_or = 0; ++ uint32_t status_or = 0; + CGFloat advances_so_far = 0; + /* For right-to-left runs, CoreText returns the glyphs positioned such that + * any trailing whitespace is to the left of (0,0). Adjust coordinate system +@@ -918,7 +918,6 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, + CTRunRef run = static_cast(CFArrayGetValueAtIndex (glyph_runs, i)); + CTRunStatus run_status = CTRunGetStatus (run); + status_or |= run_status; +- status_and &= run_status; + DEBUG_MSG (CORETEXT, run, "CTRunStatus: %x", run_status); + CGFloat run_advance = CTRunGetTypographicBounds (run, range_all, nullptr, nullptr, nullptr); + if (HB_DIRECTION_IS_VERTICAL (buffer->props.direction)) +@@ -1140,21 +1139,6 @@ _hb_coretext_shape (hb_shape_plan_t *shape_plan, + buffer->len += num_glyphs; + } + +- /* Mac OS 10.6 doesn't have kCTTypesetterOptionForcedEmbeddingLevel, +- * or if it does, it doesn't respect it. So we get runs with wrong +- * directions. As such, disable the assert... It wouldn't crash, but +- * cursoring will be off... +- * +- * https://crbug.com/419769 +- */ +- if (false) +- { +- /* Make sure all runs had the expected direction. */ +- HB_UNUSED bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); +- assert (bool (status_and & kCTRunStatusRightToLeft) == backward); +- assert (bool (status_or & kCTRunStatusRightToLeft) == backward); +- } +- + buffer->clear_positions (); + + unsigned int count = buffer->len; diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 01b201be0e065e..d122034164e693 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( # Details: https://github.com/microsoft/vcpkg/issues/16262 0001-circumvent-samefile-error.patch 0002-fix-uwp-build.patch + fix-macos-build.diff # fixes https://github.com/harfbuzz/harfbuzz/issues/3484 ) if("icu" IN_LIST FEATURES) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 110a24c2913991..7b444a36041d88 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", "version-semver": "3.2.0", - "port-version": 1, + "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index dd4d924f4d96ed..3b2b2debca0460 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2714,7 +2714,7 @@ }, "harfbuzz": { "baseline": "3.2.0", - "port-version": 1 + "port-version": 2 }, "hayai": { "baseline": "2019-08-10", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index e8b32f499d3398..0f296ad129e287 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb0fcb23cc704f5a2bca6fc631622309876ab271", + "version-semver": "3.2.0", + "port-version": 2 + }, { "git-tree": "b2c918c04e1ecf5b6a591911cea03f7093ab6933", "version-semver": "3.2.0", From 6f9687b7ec12068f01ad547d0230eabcdf24f1fd Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:49:47 +0200 Subject: [PATCH 189/217] [catch2] Don't install docs (#24046) * [catch2] Don't build docs * version --- ports/catch2/portfile.cmake | 1 + ports/catch2/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 11bc847a4c109c..231b18160305fb 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_TESTING=OFF -DCATCH_BUILD_EXAMPLES=OFF + -DCATCH_INSTALL_DOCS=OFF -DCATCH_BUILD_STATIC_LIBRARY=${BUILD_STATIC} ) diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index ad094b7e9d1964..a2ea784f672d62 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,8 +1,10 @@ { "name": "catch2", "version-semver": "2.13.8", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 3b2b2debca0460..342dda289b7398 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1270,7 +1270,7 @@ }, "catch2": { "baseline": "2.13.8", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index d08a8d2f18159c..27944f37d7e211 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c243585b5ba220e6aebcdb59dc59867afff7af6e", + "version-semver": "2.13.8", + "port-version": 1 + }, { "git-tree": "b58473cdc953ae1d09f30f0ba1e641c6cc34719f", "version-semver": "2.13.8", From 9c5dcd6afec0a1e0f7d5191aafd0e46ac10a1ee5 Mon Sep 17 00:00:00 2001 From: jmanjon <67091862+juandemanjon@users.noreply.github.com> Date: Mon, 11 Apr 2022 08:50:10 -0700 Subject: [PATCH 190/217] [LMDB] update to 0.9.29 (#24045) * #24044 LMDB update to 0.9.29 * #24044 LMDB update to 0.9.29 * #24044 LMDB update to 0.9.29 * Modernize port file.cmake * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/lmdb/portfile.cmake | 18 +++++++++--------- ports/lmdb/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/l-/lmdb.json | 5 +++++ 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ports/lmdb/portfile.cmake b/ports/lmdb/portfile.cmake index 632d7a59e7e80b..263966bbd32ac6 100644 --- a/ports/lmdb/portfile.cmake +++ b/ports/lmdb/portfile.cmake @@ -1,23 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LMDB/lmdb - REF 0c357cc88a00bda03aa4a982fc227a5872707df2 # LMDB_0.9.24 - SHA512 a4d4ff96078eaf608eff08014d56561903f113a32617d3c9327dcdedfb7b261e03a80bf705f9d7159bb065eb1ab3c95af49d42525b75de0c2953223377042dec + REF 8ad7be2510414b9506ec9f9e24f24d04d9b04a1a # LMDB_0.9.29 + SHA512 a18b6217761bdfcc5964d9817addd2d0c6c735d02a823717eb7ae1561a48110da0708a3290e21297d481e4d8eeb5d92a4a6860ff44888bf2da665cd9f167513c HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake/ DESTINATION ${SOURCE_PATH}/libraries/liblmdb) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/cmake/" DESTINATION "${SOURCE_PATH}/libraries/liblmdb") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/libraries/liblmdb - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libraries/liblmdb" OPTIONS_DEBUG -DLMDB_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lmdb RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/libraries/liblmdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/lmdb" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json index 2c2b59092bb1c5..1a15ee7a4fec48 100644 --- a/ports/lmdb/vcpkg.json +++ b/ports/lmdb/vcpkg.json @@ -1,8 +1,17 @@ { "name": "lmdb", - "version": "0.9.24", - "port-version": 2, + "version": "0.9.29", "description": "LMDB is an extraordinarily fast, memory-efficient database", "homepage": "https://github.com/LMDB/lmdb", - "license": null + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 342dda289b7398..b6cccc17723a14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4249,8 +4249,8 @@ "port-version": 3 }, "lmdb": { - "baseline": "0.9.24", - "port-version": 2 + "baseline": "0.9.29", + "port-version": 0 }, "lodepng": { "baseline": "2021-12-04", diff --git a/versions/l-/lmdb.json b/versions/l-/lmdb.json index 5166dd8f1e370f..027244f68e7ae2 100644 --- a/versions/l-/lmdb.json +++ b/versions/l-/lmdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "980e2c4a26c75996e3940a9b46032356643e592b", + "version": "0.9.29", + "port-version": 0 + }, { "git-tree": "022fa44ff8c5ef9ea4b308468259c0775d4a72c1", "version": "0.9.24", From 97298f2ede2dcc799d2f771ef2861ccd0ed098b9 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 12 Apr 2022 00:05:48 +0800 Subject: [PATCH 191/217] [vcpkg] Update android usage documentation (#23690) * [doc] triplet creation is not needed any more for android. The metioned triplets are already commited on master branch. There is no need to create triplet files for android. This doc is kind of outdated. I tried without the triplet creation stelp and jsoncpp installation is successful. * [doc] keep android triplet to ABI mapping table Co-authored-by: Jonliu1993 <13720414433@163.com> --- docs/users/android.md | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/docs/users/android.md b/docs/users/android.md index 45b0cf6162ea72..3f5b03ec0740b8 100644 --- a/docs/users/android.md +++ b/docs/users/android.md @@ -30,10 +30,7 @@ export ANDROID_NDK_HOME=/home/your-account/Android/android-ndk-r21b export VCPKG_ROOT=/path/to/vcpkg ```` -## Create the android triplets - - -### Android ABI and corresponding vcpkg triplets +## vcpkg triplets and their corresponding android ABI There are four different Android ABI, each of which maps to a vcpkg triplet. The following table outlines the mapping from vcpkg architectures to android architectures @@ -45,41 +42,6 @@ a vcpkg triplet. The following table outlines the mapping from vcpkg architectur |x64-android | x86_64 | |x86-android | x86 | -### Create the android triplets -You can copy-paste the script below to populate them, and adjust them to your needs if required. - -````bash -cd $VCPKG_ROOT - -echo " -set(VCPKG_TARGET_ARCHITECTURE arm) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -" > triplets/community/arm-android.cmake - -echo " -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -" > triplets/community/arm64-android.cmake - -echo " -set(VCPKG_TARGET_ARCHITECTURE x86) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -" > triplets/community/x86-android.cmake - -echo " -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_CMAKE_SYSTEM_NAME Android) -" > triplets/community/x64-android.cmake -```` - ## Install libraries for Android using vcpkg Example for jsoncpp: From e9fcbfe8e1c66f68ec822480f77bd3427b7dde8f Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 12 Apr 2022 00:06:15 +0800 Subject: [PATCH 192/217] [icu] update to 70.1 (#23445) * [icu] update to 70.1 * update version * reset patch * overwrite version * reset version * overwrite version * Fix configure * version * update version Co-authored-by: JackBoosY --- ports/icu/disable-escapestr-tool.patch | 4 ++-- ports/icu/portfile.cmake | 6 ++++-- ports/icu/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/i-/icu.json | 5 +++++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ports/icu/disable-escapestr-tool.patch b/ports/icu/disable-escapestr-tool.patch index 620fcde2a8e588..5c42e56e7da7f0 100644 --- a/ports/icu/disable-escapestr-tool.patch +++ b/ports/icu/disable-escapestr-tool.patch @@ -1,10 +1,10 @@ diff --git a/source/tools/Makefile.in b/source/tools/Makefile.in -index c3f81d6..dc41af3 100644 +index e0896f1..5ead980 100644 --- a/source/tools/Makefile.in +++ b/source/tools/Makefile.in @@ -19,9 +19,9 @@ SUBDIRS = toolutil ctestfw makeconv genrb genbrk \ gencnval gensprep icuinfo genccode gencmn icupkg pkgdata \ - gentest gennorm2 gencfu gendict + gentest gennorm2 gencfu gendict icuexportdata -ifneq (@platform_make_fragment_name@,mh-cygwin-msvc) -SUBDIRS += escapesrc diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 1724086d4430d2..1383c2bba5df6d 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -1,4 +1,4 @@ -set(ICU_VERSION_MAJOR 69) +set(ICU_VERSION_MAJOR 70) set(ICU_VERSION_MINOR 1) set(VERSION "${ICU_VERSION_MAJOR}.${ICU_VERSION_MINOR}") set(VERSION2 "${ICU_VERSION_MAJOR}_${ICU_VERSION_MINOR}") @@ -8,8 +8,9 @@ vcpkg_download_distfile( ARCHIVE URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz" FILENAME "icu4c-${VERSION2}-src.tgz" - SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 + SHA512 0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9 ) + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} @@ -52,6 +53,7 @@ vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG PROJECT_SUBPATH source + ADDITIONAL_MSYS_PACKAGES autoconf-archive OPTIONS ${CONFIGURE_OPTIONS} OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index d1e99c9c38984d..e3fec7996d7bd1 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,6 @@ { "name": "icu", - "version": "69.1", - "port-version": 19, + "version": "70.1", "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index b6cccc17723a14..bfb3a8d68e5414 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2801,8 +2801,8 @@ "port-version": 0 }, "icu": { - "baseline": "69.1", - "port-version": 19 + "baseline": "70.1", + "port-version": 0 }, "ideviceinstaller": { "baseline": "1.1.2.23", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index eaebc031ef45ae..fe4be9d2f93607 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d082108b0899697c9b6253c260188728374e56b", + "version": "70.1", + "port-version": 0 + }, { "git-tree": "5d1bac4d5b2a05af577b0aa5bb8f600e5cf15427", "version": "69.1", From c556911a79f8ab23b12648ddfe8a5444a6c05080 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 12 Apr 2022 00:57:36 +0200 Subject: [PATCH 193/217] [vcpkg] Refactor toolchain & generator selection (#23846) * put default generator and toolchain selection into a function * update version-date of script * version stuff * restore PREFER_NINJA behavior on windows use elseif instead of else * cr ws change * missing , * version stuff * CR scripts/cmake/vcpkg_configure_cmake.cmake Co-authored-by: nicole mazzuca * CR changes * revert baseline * update version * bump version * version stuff * ci retrigger Co-authored-by: Alexander Neumann Co-authored-by: nicole mazzuca --- ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 83 ++----------- scripts/cmake/vcpkg_configure_cmake.cmake | 117 +++++++++++------- scripts/cmake/vcpkg_configure_meson.cmake | 18 +-- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 + 6 files changed, 86 insertions(+), 141 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index cc7dd6bd0b36ac..dbfc761c446ec4 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2022-04-05", + "version-date": "2022-04-07", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 95ee7e23ea1d80..ed312a05d53a73 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -159,71 +159,18 @@ function(vcpkg_cmake_configure) set(ninja_can_be_used OFF) endif() - set(generator) + set(generator "Ninja") if(DEFINED arg_GENERATOR) set(generator "${arg_GENERATOR}") elseif(arg_WINDOWS_USE_MSBUILD OR NOT ninja_can_be_used) - if(VCPKG_PLATFORM_TOOLSET STREQUAL "v120") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 12 2013") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 12 2013 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 12 2013 ARM") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 14 2015") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 14 2015 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 14 2015 ARM") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(generator "Visual Studio 15 2017") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(generator "Visual Studio 15 2017 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(generator "Visual Studio 15 2017 ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(generator "Visual Studio 15 2017") - set(arch "ARM64") - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(generator "Visual Studio 16 2019") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(arch "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(arch "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(arch "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(arch "ARM64") - else() - set(generator) - endif() - elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v143") - set(generator "Visual Studio 17 2022") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(arch "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(arch "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(arch "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(arch "ARM64") - else() - set(generator) - endif() - endif() - else() - set(generator "Ninja") + set(generator "") + set(arch "") + z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH arch) endif() - if(NOT DEFINED generator) + if(NOT generator) if(NOT VCPKG_CMAKE_SYSTEM_NAME) - set(VCPKG_CMAKE_SYSTEM_NAME Windows) + set(VCPKG_CMAKE_SYSTEM_NAME "Windows") endif() message(FATAL_ERROR "Unable to determine appropriate generator for: " "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") @@ -280,23 +227,7 @@ function(vcpkg_cmake_configure) endif() if(NOT DEFINED VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") - elseif(VCPKG_TARGET_IS_WINDOWS) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - elseif(VCPKG_TARGET_IS_LINUX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_TARGET_IS_ANDROID) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_TARGET_IS_OSX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_TARGET_IS_IOS) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_TARGET_IS_FREEBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_TARGET_IS_OPENBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - endif() + z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 84a8d1e2786867..7f139a4b989719 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -98,6 +98,68 @@ function(z_vcpkg_configure_cmake_build_cmakecache out_var whereat build_type) set("${out_var}" "${${out_var}}${line}\"\n\n" PARENT_SCOPE) endfunction() +function(z_vcpkg_get_visual_studio_generator) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "OUT_GENERATOR;OUT_ARCH" "") + + if (NOT DEFINED arg_OUT_GENERATOR) + message(FATAL_ERROR "OUT_GENERATOR must be defined.") + endif() + if(NOT DEFINED arg_OUT_ARCH) + message(FATAL_ERROR "OUT_ARCH must be defined.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 12 2013") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 14 2015") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141") + set(generator "Visual Studio 15 2017") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142") + set(generator "Visual Studio 16 2019") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143") + set(generator "Visual Studio 17 2022") + endif() + + if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") + set(generator_arch "Win32") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") + set(generator_arch "x64") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm") + set(generator_arch "ARM") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator_arch "ARM64") + endif() + set(${arg_OUT_GENERATOR} "${generator}" PARENT_SCOPE) + set(${arg_OUT_ARCH} "${generator_arch}" PARENT_SCOPE) +endfunction() + +function(z_vcpkg_select_default_vcpkg_chainload_toolchain) + # Try avoiding adding more defaults here. + # Set VCPKG_CHAINLOAD_TOOLCHAIN_FILE explicitly in the triplet. + if(DEFINED Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + elseif(VCPKG_TARGET_IS_MINGW) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") + elseif(VCPKG_TARGET_IS_WINDOWS) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") + elseif(VCPKG_TARGET_IS_LINUX) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") + elseif(VCPKG_TARGET_IS_ANDROID) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") + elseif(VCPKG_TARGET_IS_OSX) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") + elseif(VCPKG_TARGET_IS_IOS) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") + elseif(VCPKG_TARGET_IS_FREEBSD) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") + elseif(VCPKG_TARGET_IS_OPENBSD) + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") + endif() + set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE ${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} PARENT_SCOPE) +endfunction() + function(vcpkg_configure_cmake) cmake_parse_arguments(PARSE_ARGV 0 arg @@ -142,6 +204,10 @@ function(vcpkg_configure_cmake) set(ninja_can_be_used ON) # Ninja as generator set(ninja_host ON) # Ninja as parallel configurator + if(NOT arg_PREFER_NINJA AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(ninja_can_be_used OFF) + endif() + if(VCPKG_HOST_IS_WINDOWS) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") @@ -159,38 +225,13 @@ function(vcpkg_configure_cmake) endif() endif() - set(generator "") + set(generator "Ninja") # the default generator is always ninja! set(generator_arch "") if(DEFINED arg_GENERATOR) set(generator "${arg_GENERATOR}") - elseif(arg_PREFER_NINJA AND ninja_can_be_used) - set(generator "Ninja") - elseif(VCPKG_CHAINLOAD_TOOLCHAIN_FILE OR NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - set(generator "Ninja") - - else() - if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator "Visual Studio 12 2013") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator "Visual Studio 14 2015") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141") - set(generator "Visual Studio 15 2017") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142") - set(generator "Visual Studio 16 2019") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143") - set(generator "Visual Studio 17 2022") - endif() - - if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") - set(generator_arch "Win32") - elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") - set(generator_arch "x64") - elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm") - set(generator_arch "ARM") - elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator_arch "ARM64") - endif() - + elseif(NOT ninja_can_be_used) + set(generator "") + z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH generator_arch) if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "") message(FATAL_ERROR "Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}: @@ -244,23 +285,7 @@ function(vcpkg_configure_cmake) endif() if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") - endif() + z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() vcpkg_list(APPEND arg_OPTIONS diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index e68ff652654392..2dc8bd206790c8 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -204,23 +204,7 @@ function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbu string(APPEND native_file "[cmake]\n") if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - elseif(VCPKG_TARGET_IS_LINUX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") - elseif(VCPKG_TARGET_IS_ANDROID) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/android.cmake") - elseif(VCPKG_TARGET_IS_OSX) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/osx.cmake") - elseif(VCPKG_TARGET_IS_IOS) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/ios.cmake") - elseif(VCPKG_TARGET_IS_FREEBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/freebsd.cmake") - elseif(VCPKG_TARGET_IS_OPENBSD) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/openbsd.cmake") - elseif(VCPKG_TARGET_IS_MINGW) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake") - endif() + z_vcpkg_select_default_vcpkg_chainload_toolchain() endif() string(APPEND native_file "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") diff --git a/versions/baseline.json b/versions/baseline.json index bfb3a8d68e5414..be5555c2427895 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7289,7 +7289,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2022-04-05", + "baseline": "2022-04-07", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index a5fd961e588c33..fb83ccdf337642 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dcb01563c0de941013579456d19ce5b0bd08a6e", + "version-date": "2022-04-07", + "port-version": 0 + }, { "git-tree": "34d8604d164edd2903bdb833adf30fe1516c9982", "version-date": "2022-04-05", From 4415a0f31b5a012ca2efba13cc18e16adefd89c0 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 11 Apr 2022 17:28:18 -0700 Subject: [PATCH 194/217] [dstorage] Add port for Microsoft.Direct3D.DirectStorage NuGet (#24063) * [dstorage] new port for Microsoft.Direct3D.DirectStorage NuGet * Format fix * Update baseline * Moved headers up a folder per code review * Update baselnie * More code review feedback * Refresh baseline --- ports/dstorage/dstorage-config.cmake.in | 25 ++++++++++++++++++++++ ports/dstorage/portfile.cmake | 28 +++++++++++++++++++++++++ ports/dstorage/vcpkg.json | 8 +++++++ versions/baseline.json | 4 ++++ versions/d-/dstorage.json | 9 ++++++++ 5 files changed, 74 insertions(+) create mode 100644 ports/dstorage/dstorage-config.cmake.in create mode 100644 ports/dstorage/portfile.cmake create mode 100644 ports/dstorage/vcpkg.json create mode 100644 versions/d-/dstorage.json diff --git a/ports/dstorage/dstorage-config.cmake.in b/ports/dstorage/dstorage-config.cmake.in new file mode 100644 index 00000000000000..c295619517ddfc --- /dev/null +++ b/ports/dstorage/dstorage-config.cmake.in @@ -0,0 +1,25 @@ + +get_filename_component(_dstorage_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_dstorage_root "${_dstorage_root}" PATH) +get_filename_component(_dstorage_root "${_dstorage_root}" PATH) + +set(_dstorage_root_lib "${_dstorage_root}/lib/dstorage.lib") +if (EXISTS "${_dstorage_root_lib}") + + add_library(Microsoft::DirectStorage SHARED IMPORTED) + set_target_properties(Microsoft::DirectStorage PROPERTIES + IMPORTED_LOCATION "${_dstorage_root}/bin/dstorage.dll" + IMPORTED_IMPLIB "${_dstorage_root_lib}" + INTERFACE_INCLUDE_DIRECTORIES "${_dstorage_root}/include" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + set(dstorage_FOUND TRUE) + +else() + + set(dstorage_FOUND FALSE) + +endif() + +unset(_dstorage_root_lib) +unset(_dstorage_root) diff --git a/ports/dstorage/portfile.cmake b/ports/dstorage/portfile.cmake new file mode 100644 index 00000000000000..45c04b469a75c5 --- /dev/null +++ b/ports/dstorage/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/1.0.0" + FILENAME "directstorage.1.0.0.zip" + SHA512 34f24842d509ccddf2c8a06e94a2f67c0746ed8acb6d90ab89453ed4ec9b123970cf1e802375af27e6d5be3c82211813009f8f4b83f233ce419a1467b8c10846 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH PACKAGE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +file(INSTALL "${PACKAGE_PATH}/Include/DirectStorage/dstorage.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${PACKAGE_PATH}/Include/DirectStorage/dstorageerr.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${PACKAGE_PATH}/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + +file(COPY "${PACKAGE_PATH}/bin/${VCPKG_TARGET_ARCHITECTURE}/dstorage.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") +file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/dstorage-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json new file mode 100644 index 00000000000000..66ada05dfe7e28 --- /dev/null +++ b/ports/dstorage/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "dstorage", + "version": "1.0.0", + "description": "DirectStorage for Windows", + "homepage": "https://aka.ms/directstorage/", + "license": null, + "supports": "windows & !uwp & !static" +} diff --git a/versions/baseline.json b/versions/baseline.json index be5555c2427895..e76999ffe9b9c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1944,6 +1944,10 @@ "baseline": "1.7.5", "port-version": 0 }, + "dstorage": { + "baseline": "1.0.0", + "port-version": 0 + }, "dtl": { "baseline": "1.19", "port-version": 1 diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json new file mode 100644 index 00000000000000..cc27ca92254889 --- /dev/null +++ b/versions/d-/dstorage.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b2494bc112c6d12ffbb8a8bc687a1ae2ad583221", + "version": "1.0.0", + "port-version": 0 + } + ] +} From e3d79356af3e224222af88558b3201a46c4e5598 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 12 Apr 2022 17:23:55 +0200 Subject: [PATCH 195/217] [ffmpeg] Fix flag replacement (#24077) * [ffmpeg] fix flag handling * version stuff * make sure it is the correct flag * version stuff Co-authored-by: Alexander Neumann --- ports/ffmpeg/portfile.cmake | 6 +++--- ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1d32c992ed24d7..76cc00805ecc71 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -112,9 +112,9 @@ if(VCPKG_DETECTED_MSVC) set(OPTIONS "--toolchain=msvc ${OPTIONS}") # This is required because ffmpeg depends upon optimizations to link correctly string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -O2") - string(REPLACE " -RTC1 " "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") - string(REPLACE " -Od " "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") - string(REPLACE " -Ob0 " "" VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REGEX REPLACE "(^| )-RTC1( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REGEX REPLACE "(^| )-Od( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") + string(REGEX REPLACE "(^| )-Ob0( |$)" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") endif() string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " -I \"${CURRENT_INSTALLED_DIR}/include\"") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index d29f83270fd81b..be2c4993a759a0 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 11, + "port-version": 12, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/versions/baseline.json b/versions/baseline.json index e76999ffe9b9c8..bd5ffa44de73b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2194,7 +2194,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 11 + "port-version": 12 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 8698734d413796..cf2dda6d97f01c 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84064f1dfced06504fd3d76b60f8e21b37c22c2b", + "version": "4.4.1", + "port-version": 12 + }, { "git-tree": "4be11b342853200f575143c5bb5353b044621293", "version": "4.4.1", From 4381858a246d93a3132408af128aa2745031e6b4 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 12 Apr 2022 18:53:13 +0200 Subject: [PATCH 196/217] [opencv2] no absolute paths (#24087) --- ports/opencv2/portfile.cmake | 2 ++ ports/opencv2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencv2.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index d3eff702b11677..9ef2ccc97cc6dd 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -198,4 +198,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") +vcpkg_fixup_pkgconfig() + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index c5964346e0a8fa..77040ac4f49274 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 10, + "port-version": 11, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index bd5ffa44de73b7..51096a1d287de0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5082,7 +5082,7 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 10 + "port-version": 11 }, "opencv3": { "baseline": "3.4.16", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index 4d9c219728cd68..601e9b465e299c 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d90ae2125e2fa18011bd9defe7a651d110113b76", + "version": "2.4.13.7", + "port-version": 11 + }, { "git-tree": "04d0949582f825d8a93c13fe0be0acbe8183073b", "version": "2.4.13.7", From bf43f7d00f09b225f866a5227b8464a27c86a8c0 Mon Sep 17 00:00:00 2001 From: sean <43609023+spnda@users.noreply.github.com> Date: Tue, 12 Apr 2022 19:14:24 +0200 Subject: [PATCH 197/217] [glfw] Update to 3.3.7 (#24082) * [glfw] Update to 3.3.7 * [glfw] Add license field * [glfw] Fix git-tree version --- ports/glfw3/portfile.cmake | 4 ++-- ports/glfw3/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/g-/glfw3.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 2f1195eef4513a..c95a6d6b326c88 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glfw/glfw - REF 7d5a16ce714f0b5f4efa3262de22e4d948851525 #v3.3.5 - SHA512 46f21d34eb4f7c3721fb42d5e817e208d7c70c2fbf1f1d61200ec22c052c9e93989ee3c693ec6b6c3498e5f61388286cfa97b97e10326548e94b6586b87184f7 + REF 45ce5ddd197d5c58f50fdd3296a5131c894e5527 #v3.3.7 + SHA512 0802b499cb56f5c4f575304279aafe7d812443fcf3dbfa75178cfba7a3693fb88731ae5dd29c6937598ba977de156d92af1ea99929b70ff72ed8429693f301c7 HEAD_REF master ) diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index 6edaff10a6d596..ef22ea54594236 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -1,8 +1,9 @@ { "name": "glfw3", - "version-semver": "3.3.6", + "version-semver": "3.3.7", "description": "GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.", "homepage": "https://github.com/glfw/glfw", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 51096a1d287de0..56a5b3e7e57921 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2521,7 +2521,7 @@ "port-version": 0 }, "glfw3": { - "baseline": "3.3.6", + "baseline": "3.3.7", "port-version": 0 }, "gli": { diff --git a/versions/g-/glfw3.json b/versions/g-/glfw3.json index a199bb4ee5650b..bf6222fba6bf18 100644 --- a/versions/g-/glfw3.json +++ b/versions/g-/glfw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1da77592851c5a530a1c96c6d7d554c625b7f509", + "version-semver": "3.3.7", + "port-version": 0 + }, { "git-tree": "8a41aae4fb04023a3a94bf3aa66196b0aee2cc8e", "version-semver": "3.3.6", From ac4636dd9224d503543d56b2c1efba342fca43da Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 12 Apr 2022 10:35:25 -0700 Subject: [PATCH 198/217] [dxsdk-d3dx, xaudio2redist] ports updated to use config find (#24054) * [dxsdk-d3dx, xaudio2redist] ports updated to use config find * Update baseline * Update license to indicate proprietary * Refresh baseline * Code review feedback based on the dstorage port * Refresh baseline --- ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in | 48 +++++++++++++++++ ports/dxsdk-d3dx/portfile.cmake | 2 + ports/dxsdk-d3dx/vcpkg.json | 3 +- ports/xaudio2redist/Findxaudio2redist.cmake | 54 ------------------- ports/xaudio2redist/portfile.cmake | 3 +- ports/xaudio2redist/vcpkg-cmake-wrapper.cmake | 11 ---- ports/xaudio2redist/vcpkg.json | 3 +- .../xaudio2redist-config.cmake.in | 35 ++++++++++++ versions/baseline.json | 4 +- versions/d-/dxsdk-d3dx.json | 5 ++ versions/x-/xaudio2redist.json | 5 ++ 11 files changed, 102 insertions(+), 71 deletions(-) create mode 100644 ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in delete mode 100644 ports/xaudio2redist/Findxaudio2redist.cmake delete mode 100644 ports/xaudio2redist/vcpkg-cmake-wrapper.cmake create mode 100644 ports/xaudio2redist/xaudio2redist-config.cmake.in diff --git a/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in b/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in new file mode 100644 index 00000000000000..039d0a3b0a2454 --- /dev/null +++ b/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in @@ -0,0 +1,48 @@ + +get_filename_component(_d3dx_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_d3dx_root "${_d3dx_root}" PATH) +get_filename_component(_d3dx_root "${_d3dx_root}" PATH) + +set(_d3dx_root_lib "${_d3dx_root}/lib/d3dx9.lib") +if (EXISTS "${_d3dx_root_lib}") + + add_library(Microsoft::D3DX9 SHARED IMPORTED) + set_target_properties(Microsoft::D3DX9 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_d3dx_root}/bin/D3DX9_43.dll" + IMPORTED_IMPLIB_RELEASE "${_d3dx_root_lib}" + IMPORTED_LOCATION_DEBUG "${_d3dx_root}/debug/bin/D3DX9d_43.dll" + IMPORTED_IMPLIB_DEBUG "${_d3dx_root}/debug/lib/d3dx9d.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_d3dx_root}/include/dxsdk-d3dx" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::D3DX10 SHARED IMPORTED) + set_target_properties(Microsoft::D3DX10 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_d3dx_root}/bin/d3dx10_43.dll" + IMPORTED_IMPLIB_RELEASE "${_d3dx_root}/lib/d3dx10.lib" + IMPORTED_LOCATION_DEBUG "${_d3dx_root}/debug/bin/D3DX10d_43.dll" + IMPORTED_IMPLIB_DEBUG "${_d3dx_root}/debug/lib/d3dx10d.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_d3dx_root}/include/dxsdk-d3dx" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::D3DX11 SHARED IMPORTED) + set_target_properties(Microsoft::D3DX11 PROPERTIES + IMPORTED_LOCATION_RELEASE "${_d3dx_root}/bin/d3dx11_43.dll" + IMPORTED_IMPLIB_RELEASE "${_d3dx_root}/lib/d3dx11.lib" + IMPORTED_LOCATION_DEBUG "${_d3dx_root}/debug/bin/D3DX11d_43.dll" + IMPORTED_IMPLIB_DEBUG "${_d3dx_root}/debug/lib/d3dx11d.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_d3dx_root}/include/dxsdk-d3dx" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + set(dxsdk-d3dx_FOUND TRUE) + +else() + + set(dxsdk-d3dx_FOUND FALSE) + +endif() + +unset(_d3dx_root_lib) +unset(_d3dx_root) diff --git a/ports/dxsdk-d3dx/portfile.cmake b/ports/dxsdk-d3dx/portfile.cmake index cc2fc254852e43..30bd0351fc3475 100644 --- a/ports/dxsdk-d3dx/portfile.cmake +++ b/ports/dxsdk-d3dx/portfile.cmake @@ -36,3 +36,5 @@ file(GLOB DEBUG_DLL_FILES "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET file(INSTALL ${DEBUG_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/") file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/dxsdk-d3dx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/ports/dxsdk-d3dx/vcpkg.json b/ports/dxsdk-d3dx/vcpkg.json index 6e7e0e6fb62492..7b0cf6d69e353d 100644 --- a/ports/dxsdk-d3dx/vcpkg.json +++ b/ports/dxsdk-d3dx/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", - "port-version": 2, + "port-version": 3, "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", + "license": null, "supports": "windows & !arm & !uwp & !static" } diff --git a/ports/xaudio2redist/Findxaudio2redist.cmake b/ports/xaudio2redist/Findxaudio2redist.cmake deleted file mode 100644 index 18de7bfa40803e..00000000000000 --- a/ports/xaudio2redist/Findxaudio2redist.cmake +++ /dev/null @@ -1,54 +0,0 @@ -include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) - -set(XAUDIO2REDIST_VERSION "1.2.8") - -if(NOT xaudio2redist_INCLUDE_DIR) - find_path(xaudio2redist_INCLUDE_DIR - NAMES xaudio2redist.h - PATH_SUFFIXES xaudio2redist) -endif() - -find_package_handle_standard_args(xaudio2redist - REQUIRED_VARS xaudio2redist_INCLUDE_DIR - VERSION_VAR XAUDIO2REDIST_VERSION) -mark_as_advanced(xaudio2redist_INCLUDE_DIR) - -string(REPLACE "/include/xaudio2redist" "/lib" xaudio2redist_LIB_DIR ${xaudio2redist_INCLUDE_DIR}) -string(REPLACE "/include/xaudio2redist" "/bin" xaudio2redist_BIN_DIR ${xaudio2redist_INCLUDE_DIR}) -string(REPLACE "/include/xaudio2redist" "/debug/lib" xaudio2redist_DEBUG_LIB_DIR ${xaudio2redist_INCLUDE_DIR}) -string(REPLACE "/include/xaudio2redist" "/debug/bin" xaudio2redist_DEBUG_BIN_DIR ${xaudio2redist_INCLUDE_DIR}) - -if(XAUDIO2REDIST_FOUND AND NOT TARGET Microsoft::XAudio2Redist) - set(XAUDIO2_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xaudio2_9redist.lib") - set(XAUDIO2_RELEASE_DLL "${xaudio2redist_BIN_DIR}/xaudio2_9redist.dll") - - set(XAUDIO2_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xaudio2_9redist.lib") - set(XAUDIO2_DEBUG_DLL "${xaudio2redist_DEBUG_BIN_DIR}/xaudio2_9redist.dll") - - add_library(Microsoft::XAudio2Redist SHARED IMPORTED) - set_target_properties(Microsoft::XAudio2Redist PROPERTIES - IMPORTED_LOCATION_RELEASE "${XAUDIO2_RELEASE_DLL}" - IMPORTED_IMPLIB_RELEASE "${XAUDIO2_RELEASE_LIB}" - IMPORTED_LOCATION_DEBUG "${XAUDIO2_DEBUG_DLL}" - IMPORTED_IMPLIB_DEBUG "${XAUDIO2_DEBUG_LIB}" - INTERFACE_INCLUDE_DIRECTORIES "${xaudio2redist_INCLUDE_DIR}" - IMPORTED_CONFIGURATIONS "Debug;Release" - IMPORTED_LINK_INTERFACE_LANGUAGES "C") -endif() - -if(XAUDIO2REDIST_FOUND AND NOT TARGET Microsoft::XApoBase) - set(XAPOBASE_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xapobaseredist_md.lib") - set(XAPOBASE_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xapobaseredist_md.lib") - - if(NOT EXISTS ${XAPOBASE_RELEASE_LIB}) - set(XAPOBASE_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xapobaseredist.lib") - set(XAPOBASE_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xapobaseredist.lib") - endif() - - add_library(Microsoft::XApoBase STATIC IMPORTED) - set_target_properties(Microsoft::XApoBase PROPERTIES - IMPORTED_LOCATION_RELEASE "${XAPOBASE_RELEASE_LIB}" - IMPORTED_LOCATION_DEBUG "${XAPOBASE_DEBUG_LIB}" - INTERFACE_INCLUDE_DIRECTORIES "${xaudio2redist_INCLUDE_DIR}" - IMPORTED_CONFIGURATIONS "Debug;Release") -endif() diff --git a/ports/xaudio2redist/portfile.cmake b/ports/xaudio2redist/portfile.cmake index 9d4c4d5d911a65..f6d7535d45f976 100644 --- a/ports/xaudio2redist/portfile.cmake +++ b/ports/xaudio2redist/portfile.cmake @@ -31,5 +31,4 @@ file(COPY "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/x file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findxaudio2redist.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/xaudio2redist-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake b/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 32610b66f9fee4..00000000000000 --- a/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,11 +0,0 @@ -message(STATUS "Using VCPKG Findxaudio2redist") -set(XAUDIO2_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) - -list(REMOVE_ITEM ARGS "NO_MODULE") -list(REMOVE_ITEM ARGS "CONFIG") -list(REMOVE_ITEM ARGS "MODULE") - -_find_package(${ARGS}) - -set(CMAKE_MODULE_PATH ${XAUDIO2_PREV_MODULE_PATH}) diff --git a/ports/xaudio2redist/vcpkg.json b/ports/xaudio2redist/vcpkg.json index ba5655191c595d..3c610f1f99f2c1 100644 --- a/ports/xaudio2redist/vcpkg.json +++ b/ports/xaudio2redist/vcpkg.json @@ -1,8 +1,9 @@ { "name": "xaudio2redist", "version": "1.2.8", - "port-version": 1, + "port-version": 2, "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", + "license": null, "supports": "windows & !arm & !uwp & !static" } diff --git a/ports/xaudio2redist/xaudio2redist-config.cmake.in b/ports/xaudio2redist/xaudio2redist-config.cmake.in new file mode 100644 index 00000000000000..023827fc5cf1b9 --- /dev/null +++ b/ports/xaudio2redist/xaudio2redist-config.cmake.in @@ -0,0 +1,35 @@ + +get_filename_component(_xaudio2_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_xaudio2_root "${_xaudio2_root}" PATH) +get_filename_component(_xaudio2_root "${_xaudio2_root}" PATH) + +set(_xaudio2_root_lib "${_xaudio2_root}/lib/xaudio2_9redist.lib") +if (EXISTS "${_xaudio2_root_lib}") + + add_library(Microsoft::XAudio2Redist SHARED IMPORTED) + set_target_properties(Microsoft::XAudio2Redist PROPERTIES + IMPORTED_LOCATION_RELEASE "${_xaudio2_root}/bin/xaudio2_9redist.dll" + IMPORTED_IMPLIB_RELEASE "${_xaudio2_root_lib}" + IMPORTED_LOCATION_DEBUG "${_xaudio2_root}/debug/bin/xaudio2_9redist.dll" + IMPORTED_IMPLIB_DEBUG "${_xaudio2_root}/debug/lib/xaudio2_9redist.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_xaudio2_root}/include/xaudio2redist" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::XApoBase STATIC IMPORTED) + set_target_properties(Microsoft::XApoBase PROPERTIES + IMPORTED_LOCATION_RELEASE "${_xaudio2_root}/lib/xapobaseredist_md.lib" + IMPORTED_LOCATION_DEBUG "${_xaudio2_root}/debug/lib/xapobaseredist_md.lib" + INTERFACE_INCLUDE_DIRECTORIES "${_xaudio2_root}/include/xaudio2redist" + IMPORTED_CONFIGURATIONS "Debug;Release") + + set(xaudio2redist_FOUND TRUE) + +else() + + set(xaudio2redist_FOUND FALSE) + +endif() + +unset(_xaudio2_root_lib) +unset(_xaudio2_root) diff --git a/versions/baseline.json b/versions/baseline.json index 56a5b3e7e57921..a84dbf370a809e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1970,7 +1970,7 @@ }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 2 + "port-version": 3 }, "dxut": { "baseline": "11.26", @@ -7526,7 +7526,7 @@ }, "xaudio2redist": { "baseline": "1.2.8", - "port-version": 1 + "port-version": 2 }, "xbyak": { "baseline": "6.00", diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index 564fde24f417de..81208748aaa73e 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f9cac012452363e92e36d5978972cee3b9154e5", + "version": "9.29.952.8", + "port-version": 3 + }, { "git-tree": "3f16a0560a2beb7205ed033b5ac2e5d5d2223161", "version": "9.29.952.8", diff --git a/versions/x-/xaudio2redist.json b/versions/x-/xaudio2redist.json index d5b291aaa2a44a..2f86ccea7786ac 100644 --- a/versions/x-/xaudio2redist.json +++ b/versions/x-/xaudio2redist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ae7aaec9ebb9859356736f91710e8d9727d7a81", + "version": "1.2.8", + "port-version": 2 + }, { "git-tree": "4fe6eda4ff7a68db79013f5c5632e6e1a87b98e9", "version": "1.2.8", From fb8bff9336860acbb6744ee40116a538e614132d Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 12 Apr 2022 19:36:15 +0200 Subject: [PATCH 199/217] [getdns] Disable building docs (#24088) * [getdns] Disable building docs * version --- ports/getdns/disable-docs.patch | 42 +++++++++++++++++++ ...sable-install-COPYING-in-config-step.patch | 13 ------ ports/getdns/portfile.cmake | 6 +-- ports/getdns/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/g-/getdns.json | 5 +++ 6 files changed, 53 insertions(+), 18 deletions(-) create mode 100644 ports/getdns/disable-docs.patch delete mode 100644 ports/getdns/disable-install-COPYING-in-config-step.patch diff --git a/ports/getdns/disable-docs.patch b/ports/getdns/disable-docs.patch new file mode 100644 index 00000000000000..ffa7afa5623f9d --- /dev/null +++ b/ports/getdns/disable-docs.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 413709da..d3dd03f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1039,9 +1039,9 @@ configure_file(src/version.c.in version.c) + + set(version ${PACKAGE_VERSION}) + set(date ${API_VERSION}) +-file(GLOB mans doc/*.3.in) +-file(MAKE_DIRECTORY man3) +-foreach (man ${mans}) ++#file(GLOB mans doc/*.3.in) ++#file(MAKE_DIRECTORY man3) ++if (FALSE) + get_filename_component(out ${man} NAME_WE) + configure_file(${man} man3/${out}.3 @ONLY) + +@@ -1061,7 +1061,7 @@ foreach (man ${mans}) + configure_file(${man} man3/${alt}.3 @ONLY) + endif () + endforeach() +-endforeach() ++endif() + + set(prefix ${CMAKE_INSTALL_PREFIX}) + configure_file(getdns.pc.in getdns.pc @ONLY) +@@ -1099,11 +1099,11 @@ if (BUILD_GETDNS_SERVER_MON) + endif () + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) ++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) + +-set(docdir share/doc/getdns) +-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) +-install(FILES spec/index.html DESTINATION ${docdir}/spec) ++#set(docdir share/doc/getdns) ++#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) ++#install(FILES spec/index.html DESTINATION ${docdir}/spec) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + install(CODE "message(\"\ diff --git a/ports/getdns/disable-install-COPYING-in-config-step.patch b/ports/getdns/disable-install-COPYING-in-config-step.patch deleted file mode 100644 index ada7313da289c0..00000000000000 --- a/ports/getdns/disable-install-COPYING-in-config-step.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 413709d..cbe330b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1102,7 +1102,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) - - set(docdir share/doc/getdns) --install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) -+#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) - install(FILES spec/index.html DESTINATION ${docdir}/spec) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake index 3e5cc3cbf00b95..07a11fe8040366 100644 --- a/ports/getdns/portfile.cmake +++ b/ports/getdns/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES disable-install-COPYING-in-config-step.patch + PATCHES disable-docs.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -47,6 +47,6 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() -vcpkg_fixup_pkgconfig() \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/getdns/vcpkg.json b/ports/getdns/vcpkg.json index b891510d3ce496..98b9d330476ce0 100644 --- a/ports/getdns/vcpkg.json +++ b/ports/getdns/vcpkg.json @@ -1,9 +1,10 @@ { "name": "getdns", "version": "1.7.0", - "port-version": 2, + "port-version": 3, "description": "GetDNS is a modern asynchronous DNS API", "homepage": "https://getdnsapi.net/", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ "libidn2", diff --git a/versions/baseline.json b/versions/baseline.json index a84dbf370a809e..9a934564a4d6e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2462,7 +2462,7 @@ }, "getdns": { "baseline": "1.7.0", - "port-version": 2 + "port-version": 3 }, "getopt": { "baseline": "0", diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index ce816523669d26..33ed8e70d415cc 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b604fb24c9b81bf4bc5c30e7ca86e52750a86935", + "version": "1.7.0", + "port-version": 3 + }, { "git-tree": "877301bc39a398579f0f3f13725afcd4bcd797c4", "version": "1.7.0", From 3286c679bff750d85629b5705e00a1634d50e20a Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 12 Apr 2022 19:38:05 +0200 Subject: [PATCH 200/217] [expat] Delete docs (#24024) * [expat] Delete docs * version --- ports/expat/portfile.cmake | 16 ++++++---------- ports/expat/vcpkg-cmake-wrapper.cmake | 2 +- ports/expat/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/e-/expat.json | 5 +++++ 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake index 402a33f8d3fd0c..64cedf590d6684 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -1,4 +1,4 @@ -set (EX_VERSION 2.4.8) +set(EX_VERSION 2.4.8) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -8,11 +8,7 @@ vcpkg_from_github( HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(EXPAT_LINKAGE ON) -else() - set(EXPAT_LINKAGE OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/expat" @@ -20,6 +16,7 @@ vcpkg_cmake_configure( -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF + -DEXPAT_BUILD_DOCS=OFF -DEXPAT_SHARED_LIBS=${EXPAT_LINKAGE} -DEXPAT_BUILD_PKGCONFIG=ON ) @@ -31,9 +28,10 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/expat_external.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/expat_external.h" "! defined(XML_STATIC)" "/* vcpkg static build ! defined(XML_STATIC) */ 0" ) @@ -41,7 +39,5 @@ endif() vcpkg_copy_pdbs() -#Handle copyright -file(INSTALL "${SOURCE_PATH}/expat/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/expat/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/expat/vcpkg-cmake-wrapper.cmake b/ports/expat/vcpkg-cmake-wrapper.cmake index 4d3e9e05d9c84d..2bdace20c71ee7 100644 --- a/ports/expat/vcpkg-cmake-wrapper.cmake +++ b/ports/expat/vcpkg-cmake-wrapper.cmake @@ -24,4 +24,4 @@ if(EXPAT_FOUND AND TARGET EXPAT::EXPAT) endif() unset(EXPATNAMES) -unset(DEBUGNAMES) \ No newline at end of file +unset(DEBUGNAMES) diff --git a/ports/expat/vcpkg.json b/ports/expat/vcpkg.json index 909693ed00058a..c56815d504418e 100644 --- a/ports/expat/vcpkg.json +++ b/ports/expat/vcpkg.json @@ -1,8 +1,10 @@ { "name": "expat", "version": "2.4.8", + "port-version": 1, "description": "XML parser library written in C", "homepage": "https://github.com/libexpat/libexpat", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 9a934564a4d6e5..0bf2ca3bcdf34f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2102,7 +2102,7 @@ }, "expat": { "baseline": "2.4.8", - "port-version": 0 + "port-version": 1 }, "expected-lite": { "baseline": "0.5.0", diff --git a/versions/e-/expat.json b/versions/e-/expat.json index 6e98367de2ce43..812a56a83248af 100644 --- a/versions/e-/expat.json +++ b/versions/e-/expat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18754c99766e364a887a08bbf85c7fae06185f36", + "version": "2.4.8", + "port-version": 1 + }, { "git-tree": "35013cd612175defc1832114f6a841888a6f6aad", "version": "2.4.8", From e809a42f87565e803b2178a0c11263f462d1800a Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Wed, 13 Apr 2022 04:47:40 +0900 Subject: [PATCH 201/217] [cpuinfo,fbgemm,xnnpack] update cpuinfo to latest (#23944) * [cpuinfo] update to latest * use official support of CMake find_package * [cpuinfo] update triplet support * [nnpack] fix cpuinfo usage * [qnnpack] fix cpuinfo usage * [fbgemm] fix cpuinfo usage * [xnnpack] fix cpuinfo usage * [cpuinfo] add license * [nnpack] port license/dependencies * [qnnpack] port license * [xnnpack] port license * [fbgemm] port license * fix supports * I think this should work? * alright, arm&windows is unsupported... for now Co-authored-by: nicole mazzuca --- ports/cpuinfo/fix-install.patch | 81 ------------------------------- ports/cpuinfo/portfile.cmake | 65 ++++++++++++++++++------- ports/cpuinfo/vcpkg.json | 14 +++++- ports/fbgemm/fix-cmakelists.patch | 10 ++-- ports/fbgemm/vcpkg.json | 3 +- ports/nnpack/fix-cmakelists.patch | 4 +- ports/nnpack/portfile.cmake | 5 +- ports/nnpack/vcpkg.json | 11 +++-- ports/qnnpack/use-packages.patch | 4 +- ports/qnnpack/vcpkg.json | 3 +- ports/xnnpack/use-packages.patch | 4 +- ports/xnnpack/vcpkg.json | 3 +- scripts/ci.baseline.txt | 1 - versions/baseline.json | 10 ++-- versions/c-/cpuinfo.json | 5 ++ versions/f-/fbgemm.json | 5 ++ versions/n-/nnpack.json | 5 ++ versions/q-/qnnpack.json | 5 ++ versions/x-/xnnpack.json | 5 ++ 19 files changed, 117 insertions(+), 126 deletions(-) delete mode 100644 ports/cpuinfo/fix-install.patch diff --git a/ports/cpuinfo/fix-install.patch b/ports/cpuinfo/fix-install.patch deleted file mode 100644 index 86080f52290151..00000000000000 --- a/ports/cpuinfo/fix-install.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2d7d53..6d380e9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,6 +15,28 @@ OPTION(CPUINFO_BUILD_UNIT_TESTS "Build cpuinfo unit tests" ON) - OPTION(CPUINFO_BUILD_MOCK_TESTS "Build cpuinfo mock tests" ON) - OPTION(CPUINFO_BUILD_BENCHMARKS "Build cpuinfo micro-benchmarks" ON) - -+# Configuration -+set(config_install_dir "lib/cmake/unofficial-${PROJECT_NAME}") -+set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") -+set(project_config "${generated_dir}/unofficial-${PROJECT_NAME}Config.cmake") -+set(targets_export_name "unofficial-${PROJECT_NAME}Targets") -+set(namespace "unofficial::${PROJECT_NAME}::") -+ -+# Include module with fuction 'write_basic_package_version_file' -+include(CMakePackageConfigHelpers) -+configure_package_config_file( -+ "cmake/Config.cmake.in" -+ "${project_config}" -+ INSTALL_DESTINATION "${config_install_dir}" -+) -+install(FILES "${project_config}" -+ DESTINATION "${config_install_dir}" -+) -+install(EXPORT "${targets_export_name}" -+ NAMESPACE "${namespace}" -+ DESTINATION "${config_install_dir}" -+) -+ - # ---[ CMake options - INCLUDE(GNUInstallDirs) - -@@ -210,7 +232,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS)$") - TARGET_COMPILE_DEFINITIONS(cpuinfo_internals PRIVATE _WIN32_WINNT=0x0601) - ENDIF() - SET_TARGET_PROPERTIES(cpuinfo PROPERTIES PUBLIC_HEADER include/cpuinfo.h) --TARGET_INCLUDE_DIRECTORIES(cpuinfo BEFORE PUBLIC include) -+TARGET_INCLUDE_DIRECTORIES(cpuinfo BEFORE PUBLIC $ $) - TARGET_INCLUDE_DIRECTORIES(cpuinfo BEFORE PRIVATE src) - TARGET_INCLUDE_DIRECTORIES(cpuinfo_internals BEFORE PUBLIC include src) - IF(CPUINFO_LOG_LEVEL STREQUAL "default") -@@ -261,6 +283,7 @@ TARGET_LINK_LIBRARIES(cpuinfo PRIVATE clog) - TARGET_LINK_LIBRARIES(cpuinfo_internals PRIVATE clog) - - INSTALL(TARGETS cpuinfo -+ EXPORT "${targets_export_name}" - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -new file mode 100644 -index 0000000..9b4c9ee ---- /dev/null -+++ b/cmake/Config.cmake.in -@@ -0,0 +1,4 @@ -+@PACKAGE_INIT@ -+ -+include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") -+check_required_components("@PROJECT_NAME@") -diff --git a/deps/clog/CMakeLists.txt b/deps/clog/CMakeLists.txt -index 083f519..43b5c78 100644 ---- a/deps/clog/CMakeLists.txt -+++ b/deps/clog/CMakeLists.txt -@@ -57,7 +57,7 @@ SET_TARGET_PROPERTIES(clog PROPERTIES - C_EXTENSIONS NO) - CLOG_TARGET_RUNTIME_LIBRARY(clog) - SET_TARGET_PROPERTIES(clog PROPERTIES PUBLIC_HEADER include/clog.h) --TARGET_INCLUDE_DIRECTORIES(clog BEFORE PUBLIC include) -+TARGET_INCLUDE_DIRECTORIES(clog PUBLIC $ $) - IF(CLOG_LOG_TO_STDIO) - TARGET_COMPILE_DEFINITIONS(clog PRIVATE CLOG_LOG_TO_STDIO=1) - ELSE() -@@ -68,6 +68,7 @@ IF(ANDROID AND NOT CLOG_LOG_TO_STDIO) - ENDIF() - - INSTALL(TARGETS clog -+ EXPORT ${targets_export_name} - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") diff --git a/ports/cpuinfo/portfile.cmake b/ports/cpuinfo/portfile.cmake index c670c0459b0d54..aa964e6e17d08b 100644 --- a/ports/cpuinfo/portfile.cmake +++ b/ports/cpuinfo/portfile.cmake @@ -1,14 +1,14 @@ # On Windows, we can get a cpuinfo.dll, but it exports no symbols. -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/cpuinfo - REF 5916273f79a21551890fd3d56fc5375a78d1598d - SHA512 50e537b61d991e8579577fb1ecf8d9ceb2171dbad96dfe159a062eadfdc0b2372b94988fc6f223c20e327453c7f55042ee06779f5b5fe0922f4470f746c9686b + REF b40bae27785787b6dd70788986fd96434cf90ae2 + SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c HEAD_REF master - PATCHES - fix-install.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -16,23 +16,53 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tools CPUINFO_BUILD_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG - -DCPUINFO_BUILD_TOOLS=OFF - -DCPUINFO_LOG_LEVEL=debug - OPTIONS_RELEASE - ${FEATURE_OPTIONS} - -DCPUINFO_LOG_LEVEL=default +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=shared) +else() + list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=static) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + list(APPEND LINK_OPTIONS -DCPUINFO_RUNTIME_TYPE=shared) +else() + list(APPEND LINK_OPTIONS -DCPUINFO_RUNTIME_TYPE=static) +endif() + +# hack to get around that toolchains/windows.cmake doesn't set CMAKE_SYSTEM_ARCHITECTURE +set(CPUINFO_TARGET_PROCESSOR_param "") +if(VCPKG_TARGET_IS_WINDOWS) + # NOTE: arm64-windows is unsupported for now; + # see https://github.com/pytorch/cpuinfo/pull/82 for updates + # NOTE: arm-windows is unsupported + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=x86") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=AMD64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM64") + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} + ${LINK_OPTIONS} + ${CPUINFO_TARGET_PROCESSOR_param} -DCPUINFO_BUILD_UNIT_TESTS=OFF -DCPUINFO_BUILD_MOCK_TESTS=OFF -DCPUINFO_BUILD_BENCHMARKS=OFF + OPTIONS_DEBUG + -DCPUINFO_LOG_LEVEL=debug + OPTIONS_RELEASE + -DCPUINFO_LOG_LEVEL=default ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_fixup_pkgconfig() # pkg_check_modules(libcpuinfo) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -43,5 +73,4 @@ if("tools" IN_LIST FEATURES) ) endif() -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpuinfo/vcpkg.json b/ports/cpuinfo/vcpkg.json index a67a77bae077b1..d718f9393058a2 100644 --- a/ports/cpuinfo/vcpkg.json +++ b/ports/cpuinfo/vcpkg.json @@ -1,8 +1,20 @@ { "name": "cpuinfo", - "version-date": "2021-04-04", + "version-date": "2022-04-02", "description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)", "homepage": "https://github.com/pytorch/cpuinfo", + "license": "BSD-2-Clause", + "supports": "!(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "Build cpuinfo command-line tools" diff --git a/ports/fbgemm/fix-cmakelists.patch b/ports/fbgemm/fix-cmakelists.patch index 1d26e80a9628ec..3f0b9015c71850 100644 --- a/ports/fbgemm/fix-cmakelists.patch +++ b/ports/fbgemm/fix-cmakelists.patch @@ -56,7 +56,7 @@ index 6f19a16..3c758d2 100644 endif() -if(NOT TARGET cpuinfo) -+find_package(unofficial-cpuinfo CONFIG REQUIRED) # target 'unofficial::cpuinfo::cpuinfo' ++find_package(cpuinfo CONFIG REQUIRED) # target 'cpuinfo::cpuinfo' +if(FALSE) #Download cpuinfo from github if CPUINFO_SOURCE_DIR is not specified. if(NOT DEFINED CPUINFO_SOURCE_DIR) @@ -68,7 +68,7 @@ index 6f19a16..3c758d2 100644 - PRIVATE "${ASMJIT_SRC_DIR}/src" - PRIVATE "${CPUINFO_SOURCE_DIR}/include") +) -+target_link_libraries(fbgemm_generic PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo) ++target_link_libraries(fbgemm_generic PUBLIC asmjit::asmjit cpuinfo::cpuinfo) target_include_directories(fbgemm_avx2 BEFORE PUBLIC $ @@ -76,7 +76,7 @@ index 6f19a16..3c758d2 100644 - PRIVATE "${ASMJIT_SRC_DIR}/src" - PRIVATE "${CPUINFO_SOURCE_DIR}/include") +) -+target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo) ++target_link_libraries(fbgemm_avx2 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) target_include_directories(fbgemm_avx512 BEFORE PUBLIC $ @@ -95,7 +95,7 @@ index 6f19a16..3c758d2 100644 - $ - $) +) -+target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo) ++target_link_libraries(fbgemm_avx512 PUBLIC asmjit::asmjit cpuinfo::cpuinfo) + +add_library(fbgemm + $ @@ -131,7 +131,7 @@ index 6f19a16..3c758d2 100644 -target_link_libraries(fbgemm $ - $) -add_dependencies(fbgemm asmjit cpuinfo) -+target_link_libraries(fbgemm PUBLIC asmjit::asmjit unofficial::cpuinfo::cpuinfo) ++target_link_libraries(fbgemm PUBLIC asmjit::asmjit cpuinfo::cpuinfo) install(TARGETS fbgemm EXPORT fbgemmLibraryConfig ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/ports/fbgemm/vcpkg.json b/ports/fbgemm/vcpkg.json index 42d1375eaee085..40cef65267b7e1 100644 --- a/ports/fbgemm/vcpkg.json +++ b/ports/fbgemm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fbgemm", "version-date": "2021-03-18", - "port-version": 3, + "port-version": 4, "description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)", "homepage": "https://code.fb.com/ml-applications/fbgemm/", + "license": "BSD-3-Clause", "supports": "!(x86 | uwp)", "dependencies": [ "asmjit", diff --git a/ports/nnpack/fix-cmakelists.patch b/ports/nnpack/fix-cmakelists.patch index 046443d80279ab..bd80f1000db0c5 100644 --- a/ports/nnpack/fix-cmakelists.patch +++ b/ports/nnpack/fix-cmakelists.patch @@ -42,8 +42,8 @@ index 5ecd2df..8565044 100644 "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo") ENDIF() -TARGET_LINK_LIBRARIES(nnpack PRIVATE cpuinfo) -+find_package(unofficial-cpuinfo CONFIG REQUIRED) -+target_link_libraries(nnpack PUBLIC unofficial::cpuinfo::cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++target_link_libraries(nnpack PUBLIC cpuinfo::cpuinfo) # ---[ Configure pthreadpool -IF(NOT TARGET pthreadpool) diff --git a/ports/nnpack/portfile.cmake b/ports/nnpack/portfile.cmake index 9cde055f9337ce..7e3203223b1674 100644 --- a/ports/nnpack/portfile.cmake +++ b/ports/nnpack/portfile.cmake @@ -7,16 +7,15 @@ vcpkg_from_github( fix-cmakelists.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DNNPACK_BACKEND=psimd -DNNPACK_BUILD_TESTS=OFF -DNNPACK_BUILD_BENCHMARKS=OFF -DNNPACK_CUSTOM_THREADPOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/nnpack/vcpkg.json b/ports/nnpack/vcpkg.json index e039985aea5282..fe1878175e1b74 100644 --- a/ports/nnpack/vcpkg.json +++ b/ports/nnpack/vcpkg.json @@ -1,15 +1,20 @@ { "name": "nnpack", "version-date": "2021-02-21", - "port-version": 2, + "port-version": 3, "description": "Acceleration package for neural networks on multi-core CPUs", "homepage": "https://github.com/Maratyszcza/NNPACK", - "supports": "linux & osx", + "license": "BSD-2-Clause", + "supports": "linux | osx", "dependencies": [ "cpuinfo", "fp16", "fxdiv", "psimd", - "pthreadpool" + "pthreadpool", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/qnnpack/use-packages.patch b/ports/qnnpack/use-packages.patch index 33456516261ef0..2591e1331573df 100644 --- a/ports/qnnpack/use-packages.patch +++ b/ports/qnnpack/use-packages.patch @@ -123,8 +123,8 @@ index a5ddc49..05e1279 100644 ENDIF() -TARGET_LINK_LIBRARIES(qnnpack PRIVATE cpuinfo) + -+find_package(unofficial-cpuinfo CONFIG REQUIRED) -+target_link_libraries(qnnpack PUBLIC unofficial::cpuinfo::clog unofficial::cpuinfo::cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++target_link_libraries(qnnpack PUBLIC cpuinfo::clog cpuinfo::cpuinfo) # ---[ Configure pthreadpool -IF(NOT TARGET pthreadpool) diff --git a/ports/qnnpack/vcpkg.json b/ports/qnnpack/vcpkg.json index 75ec67e2ac5a64..ea8b98f7aeb921 100644 --- a/ports/qnnpack/vcpkg.json +++ b/ports/qnnpack/vcpkg.json @@ -1,9 +1,10 @@ { "name": "qnnpack", "version-date": "2021-02-26", - "port-version": 1, + "port-version": 2, "description": "Quantized Neural Network PACKage - mobile-optimized implementation of quantized neural network operators", "homepage": "https://github.com/pytorch/QNNPACK", + "license": "BSD-3-Clause", "supports": "linux | osx", "dependencies": [ "cpuinfo", diff --git a/ports/xnnpack/use-packages.patch b/ports/xnnpack/use-packages.patch index 17d274c994ca82..e31fbc74566da8 100644 --- a/ports/xnnpack/use-packages.patch +++ b/ports/xnnpack/use-packages.patch @@ -37,8 +37,8 @@ index b69ce50c..1e8938b7 100755 ENDIF() ENDIF() -TARGET_LINK_LIBRARIES(XNNPACK PRIVATE cpuinfo) -+find_package(unofficial-cpuinfo CONFIG REQUIRED) -+target_link_libraries(XNNPACK PUBLIC unofficial::cpuinfo::clog unofficial::cpuinfo::cpuinfo) ++find_package(cpuinfo CONFIG REQUIRED) ++target_link_libraries(XNNPACK PUBLIC cpuinfo::clog cpuinfo::cpuinfo) # ---[ Configure pthreadpool -IF(NOT TARGET pthreadpool) diff --git a/ports/xnnpack/vcpkg.json b/ports/xnnpack/vcpkg.json index cb0339e2829053..6c692a05b2ee39 100644 --- a/ports/xnnpack/vcpkg.json +++ b/ports/xnnpack/vcpkg.json @@ -1,9 +1,10 @@ { "name": "xnnpack", "version-date": "2021-05-17", - "port-version": 1, + "port-version": 2, "description": "High-efficiency floating-point neural network inference operators for mobile, server, and Web", "homepage": "https://github.com/google/XNNPACK", + "license": "BSD-3-Clause", "supports": "!(arm & windows) & !uwp", "dependencies": [ "cpuinfo", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c0c581ebf44874..2bbf62cdbabc81 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -188,7 +188,6 @@ cppcoro:x64-uwp=fail # The x64-linux pipeline uses gcc 9.3.0, which lacks C++20 coroutine support. # This is known to work on x64-linux as of gcc 10.3.0. cppgraphqlgen:x64-linux=fail -cpuinfo:arm64-windows=fail crashpad:arm64-windows=fail crashpad:arm-uwp=fail crashpad:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index 0bf2ca3bcdf34f..d09df1e2f48a41 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1657,7 +1657,7 @@ "port-version": 3 }, "cpuinfo": { - "baseline": "2021-04-04", + "baseline": "2022-04-02", "port-version": 0 }, "cr": { @@ -2174,7 +2174,7 @@ }, "fbgemm": { "baseline": "2021-03-18", - "port-version": 3 + "port-version": 4 }, "fbthrift": { "baseline": "2022.03.21.00", @@ -4862,7 +4862,7 @@ }, "nnpack": { "baseline": "2021-02-21", - "port-version": 2 + "port-version": 3 }, "nonius": { "baseline": "2019-04-20", @@ -5642,7 +5642,7 @@ }, "qnnpack": { "baseline": "2021-02-26", - "port-version": 1 + "port-version": 2 }, "qpid-proton": { "baseline": "0.32.0", @@ -7558,7 +7558,7 @@ }, "xnnpack": { "baseline": "2021-05-17", - "port-version": 1 + "port-version": 2 }, "xorstr": { "baseline": "2021-10-23", diff --git a/versions/c-/cpuinfo.json b/versions/c-/cpuinfo.json index 7c3abd38ecb5c2..fef8a68d0b663f 100644 --- a/versions/c-/cpuinfo.json +++ b/versions/c-/cpuinfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69febccb10ae5b789dd6c5af2b85740617fc34f4", + "version-date": "2022-04-02", + "port-version": 0 + }, { "git-tree": "28dbefcc9131ff8ce6fa939f7fcdb5cf0d4ee7fd", "version-date": "2021-04-04", diff --git a/versions/f-/fbgemm.json b/versions/f-/fbgemm.json index 1fcf80162d2f7c..5f34b896ff21e9 100644 --- a/versions/f-/fbgemm.json +++ b/versions/f-/fbgemm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3afaf099d4759d2d2a57caccb7d54ca2d5b2359", + "version-date": "2021-03-18", + "port-version": 4 + }, { "git-tree": "89489c3afc56789dd2a8344dc89455723ec0eec3", "version-date": "2021-03-18", diff --git a/versions/n-/nnpack.json b/versions/n-/nnpack.json index 28a12083ae0fa0..853644ff305263 100644 --- a/versions/n-/nnpack.json +++ b/versions/n-/nnpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d9e236a8f7e71e46c901da4f8a250c47221bd91", + "version-date": "2021-02-21", + "port-version": 3 + }, { "git-tree": "2479c1088fd75df5e9f06e85086c748aefae9e11", "version-date": "2021-02-21", diff --git a/versions/q-/qnnpack.json b/versions/q-/qnnpack.json index ee1cf4c89ef5a1..802a45951b563a 100644 --- a/versions/q-/qnnpack.json +++ b/versions/q-/qnnpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "907c113d0c35b674976b5c3b7dc96b2c71084061", + "version-date": "2021-02-26", + "port-version": 2 + }, { "git-tree": "8dbc0dd7bdcf36b48124351fbc2ecc44d0b2e961", "version-date": "2021-02-26", diff --git a/versions/x-/xnnpack.json b/versions/x-/xnnpack.json index b5261f4f60f613..aab502fa727f97 100644 --- a/versions/x-/xnnpack.json +++ b/versions/x-/xnnpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dba10dfefac481caee9f94c49fc60878c5bb57a1", + "version-date": "2021-05-17", + "port-version": 2 + }, { "git-tree": "d998602ed266e9cf140fb6740fea8625276a48f5", "version-date": "2021-05-17", From 8f443619b224313634d65bfc07ff055d7fa68e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 14 Apr 2022 01:47:44 +0800 Subject: [PATCH 202/217] [discordcoreapi] install certs in correct location (#24031) --- .../fix-cert-installation.patch | 30 +++++++++++++++++++ ports/discordcoreapi/portfile.cmake | 3 +- ports/discordcoreapi/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/d-/discordcoreapi.json | 5 ++++ 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 ports/discordcoreapi/fix-cert-installation.patch diff --git a/ports/discordcoreapi/fix-cert-installation.patch b/ports/discordcoreapi/fix-cert-installation.patch new file mode 100644 index 00000000000000..06f0cbe85d96e8 --- /dev/null +++ b/ports/discordcoreapi/fix-cert-installation.patch @@ -0,0 +1,30 @@ +diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt +index 10cd8d1..1439aa0 100644 +--- a/Library/CMakeLists.txt ++++ b/Library/CMakeLists.txt +@@ -27,19 +27,19 @@ file(GLOB HEADERS "${CMAKE_SOURCE_DIR}/Include/discordcoreapi/*.hpp") + if (UNIX) + add_library(DiscordCoreAPI STATIC "${SOURCES}" "${VersionFilesOutputVariable}") + message(STATUS "Copying a file...") +- configure_file("${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" "/home/$ENV{USER}/SSL/Certs/SoundCloudCert.pem" COPYONLY) ++ install(FILES "${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" DESTINATION share/discordcoreapi/data) + message(STATUS "Copying a file...") +- configure_file("${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" "/home/$ENV{USER}/SSL/Certs/GoogleCert.pem" COPYONLY) ++ install(FILES "${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" DESTINATION share/discordcoreapi/data) + message(STATUS "Copying a file...") +- configure_file("${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" "/home/$ENV{USER}/SSL/Certs/DiscordCert.pem" COPYONLY) ++ install(FILES "${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" DESTINATION share/discordcoreapi/data) + elseif (WIN32) + add_library(DiscordCoreAPI SHARED "${SOURCES}" "${VersionFilesOutputVariable}") + message(STATUS "Copying a file...") +- configure_file("${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" "C:/SSL/Certs/SoundCloudCert.pem" COPYONLY) ++ install(FILES "${CMAKE_SOURCE_DIR}/Certs/SoundCloudCert.pem" DESTINATION share/discordcoreapi/data) + message(STATUS "Copying a file...") +- configure_file("${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" "C:/SSL/Certs/GoogleCert.pem" COPYONLY) ++ install(FILES "${CMAKE_SOURCE_DIR}/Certs/GoogleCert.pem" DESTINATION share/discordcoreapi/data) + message(STATUS "Copying a file...") +- configure_file("${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" "C:/SSL/Certs/DiscordCert.pem" COPYONLY) ++ install(FILES "${CMAKE_SOURCE_DIR}/Certs/DiscordCert.pem" DESTINATION share/discordcoreapi/data) + endif() + + if (EXISTS ${VCPKG_INSTALLED_DIR}) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index d61b1814374336..3bb8671edee2b6 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( REF 6d7c899f0690513855119aa225259dccf17b10f0 SHA512 ff42ed8ae799b8f875158842c47fcb5612a5b8861dbfb442c97ab131d952ed59140b2d2431a0d389aefbecb122263f340ff9c8fb863466d0aa91875f8080616e HEAD_REF main + PATCHES fix-cert-installation.patch ) vcpkg_cmake_configure( @@ -22,7 +23,7 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index e9b175b3ea88f1..767de8aa87b318 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,7 @@ { "name": "discordcoreapi", "version-date": "2022-03-30", + "port-version": 1, "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "AGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index d09df1e2f48a41..d94f3584987988 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1890,7 +1890,7 @@ }, "discordcoreapi": { "baseline": "2022-03-30", - "port-version": 0 + "port-version": 1 }, "discount": { "baseline": "2.2.6", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index b895d0164b2d86..f3d04577bd52f6 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70c609a4d2bc6319e046e08e25842c4559bfc556", + "version-date": "2022-03-30", + "port-version": 1 + }, { "git-tree": "d7e58144cce6a1eeda7ae8cac47726a9edddfbec", "version-date": "2022-03-30", From 1c9b23ba2ba3913e7154b35d56211bcb30968e11 Mon Sep 17 00:00:00 2001 From: Benjamin Oldenburg Date: Thu, 14 Apr 2022 00:48:49 +0700 Subject: [PATCH 203/217] [zeroc-ice] New port (#23764) * Initial commit * clean up * updated manifest and version * Removed C++11 mapping option (feature) and made C++11 the default mapping. * updated version * added main target added entries to ci.baseline.txt * corrected ci.baseline.txt entries * updated version * fixed generated header path * Updated version * fixed include paths * updated version * expect x64-windows-static to fail * added patches for clang 13 * update version * Update ports/zeroc-ice/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * 2->4 spaces * Removed v144/5 stuff * check for .DS_Store file before deletion * several changes * format vcpkg.json * update version * remove typo * updated version * reformatting * resolve review issues * regex * updated version * windows-static * allow static builds on windows and added maintainer * updated version * added openssl as a dependency for Ice core library * updated version * minor updates Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca --- ports/zeroc-ice/md5i_fix.patch | 21 ++ ports/zeroc-ice/portfile.cmake | 288 ++++++++++++++++++++++++ ports/zeroc-ice/prepare_for_build.cmake | 60 +++++ ports/zeroc-ice/slice2swift.patch | 25 ++ ports/zeroc-ice/vcpkg.json | 125 ++++++++++ scripts/ci.baseline.txt | 5 + versions/baseline.json | 4 + versions/z-/zeroc-ice.json | 9 + 8 files changed, 537 insertions(+) create mode 100644 ports/zeroc-ice/md5i_fix.patch create mode 100644 ports/zeroc-ice/portfile.cmake create mode 100644 ports/zeroc-ice/prepare_for_build.cmake create mode 100644 ports/zeroc-ice/slice2swift.patch create mode 100644 ports/zeroc-ice/vcpkg.json create mode 100644 versions/z-/zeroc-ice.json diff --git a/ports/zeroc-ice/md5i_fix.patch b/ports/zeroc-ice/md5i_fix.patch new file mode 100644 index 00000000000000..0e45588d07f5fb --- /dev/null +++ b/ports/zeroc-ice/md5i_fix.patch @@ -0,0 +1,21 @@ +diff --git a/cpp/src/Slice/MD5I.cpp b/cpp/src/Slice/MD5I.cpp +index 66f4de545b..271352d1ea 100644 +--- a/cpp/src/Slice/MD5I.cpp ++++ b/cpp/src/Slice/MD5I.cpp +@@ -52,6 +52,7 @@ + */ + + #include ++#include + #include + + #ifdef __GNUC__ +@@ -172,7 +173,7 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/) + * On little-endian machines, we can process properly aligned + * data without copying it. + */ +- if (!((data - (const md5_byte_t *)0) & 3)) { ++ if (!((reinterpret_cast(data)) & 3)) { + /* data are properly aligned */ + X = (const md5_word_t *)data; + } else { diff --git a/ports/zeroc-ice/portfile.cmake b/ports/zeroc-ice/portfile.cmake new file mode 100644 index 00000000000000..79cfb5a00fd545 --- /dev/null +++ b/ports/zeroc-ice/portfile.cmake @@ -0,0 +1,288 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zeroc-ice/ice + REF v3.7.7 + SHA512 73c3a2bb14c9e145383e4026206edd3e03b29c60a33af628611bfdab71d69a3aed108ce4e6cbfd67eb852560110e3495b4bd238c8cdf0de9d1f8e2f1088513ee + PATCHES md5i_fix.patch slice2swift.patch +) + +set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) +set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) + +get_filename_component(SOURCE_PATH_SUFFIX ${SOURCE_PATH} NAME) +set(WIN_DEBUG_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${DEBUG_TRIPLET}/${SOURCE_PATH_SUFFIX}) +set(WIN_RELEASE_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/${SOURCE_PATH_SUFFIX}) +set(UNIX_BUILD_DIR ${CURRENT_BUILDTREES_DIR}/src/${SOURCE_PATH_SUFFIX}) + +# install_includes +function(install_includes ORIGINAL_PATH RELATIVE_PATHS) + foreach(RELATIVE_PATH ${RELATIVE_PATHS}) + file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h) + if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH}) + file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${RELATIVE_PATH}) + endif() + endforeach() +endfunction() + +# install_slices +function(install_slices ORIGINAL_PATH RELATIVE_PATHS) + foreach(RELATIVE_PATH ${RELATIVE_PATHS}) + file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.ice) + if(EXISTS ${ORIGINAL_PATH}/${RELATIVE_PATH}) + file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/ice/slice/${RELATIVE_PATH}) + endif() + endforeach() +endfunction() + +vcpkg_list(SET ICE_INCLUDE_SUB_DIRECTORIES + "Glacier2" + "Ice" + "IceBT" + "IceBox" + "IceBT" + "IceDiscovery" + "IceGrid" + "IceIAP" + "IceLocatorDiscovery" + "IcePatch2" + "IceSSL" + "IceStorm" +) + +set(ICE_OPTIONAL_COMPONENTS_MSBUILD "") +set(ICE_OPTIONAL_COMPONENTS_MAKE "Ice") # Intentional! + +# IceSSL +if("icessl" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icessl++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceSSL") +endif() + +# Glacier2 +if("glacier2lib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\glacier2++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "Glacier2") +endif() + +# Glacier2Router +if("glacier2router" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\glacier2router") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\glacier2cryptpermissionsverifier") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "glacier2router") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "Glacier2CryptPermissionsVerifier") +endif() + +# IceBox +if("iceboxlib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\iceboxlib++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceBox") +endif() + +# IceBox +if("iceboxtools" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icebox++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\iceboxadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icebox") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "iceboxadmin") +endif() + +# IceGrid +if("icegridlib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icegrid++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceGrid") +endif() + +# IceGrid tools +if("icegridtools" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridregistry") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icegridnode") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridregistry") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icegridnode") +endif() + +# IceStorm +if("icestormlib" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icestorm++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceStorm") +endif() + +# IceStormAdmin +if("icestormtools" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormservice") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icestormdb") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icestormadmin") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceStormService") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icestormdb") +endif() + +# IceBridge executable +if("icebridge" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++98\\icebridge") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "icebridge") +endif() + +# IceDiscovery +if("icediscovery" IN_LIST FEATURES) + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MSBUILD "/t:C++11\\icediscovery++11") + vcpkg_list(APPEND ICE_OPTIONAL_COMPONENTS_MAKE "IceDiscovery") +endif() + +if(NOT VCPKG_TARGET_IS_WINDOWS) + + # Setting these as environment variables, as .d files aren't generated + # the first time passing them as arguments to make. + set(ENV{MCPP_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{EXPAT_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{BZ2_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{LMDB_HOME} ${CURRENT_INSTALLED_DIR}) + set(ENV{CPPFLAGS} "-I${CURRENT_INSTALLED_DIR}/include") + set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/debug/lib") + + set(ICE_BUILD_CONFIG "shared cpp11-shared") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ICE_BUILD_CONFIG "static cpp11-static") + endif() + + message(STATUS "Building ${TARGET_TRIPLET}-dbg") + vcpkg_execute_build_process( + COMMAND make + V=1 + "prefix=${CURRENT_PACKAGES_DIR}/debug" + linux_id=vcpkg + "CONFIGS=${ICE_BUILD_CONFIG}" + USR_DIR_INSTALL=yes + OPTIMIZE=no + ${ICE_OPTIONAL_COMPONENTS_MAKE} + "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-${TARGET_TRIPLET}-dbg + ) + + # Install debug libraries to packages directory + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*") + else() + file(GLOB ICE_DEBUG_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*") + endif() + file(COPY ${ICE_DEBUG_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + # Clean up for the next round + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-${TARGET_TRIPLET} + ) + + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + + # Release build + set(ENV{LDFLAGS} "-L${CURRENT_INSTALLED_DIR}/lib") + message(STATUS "Building ${TARGET_TRIPLET}-rel") + vcpkg_execute_build_process( + COMMAND make + V=1 + "prefix=${CURRENT_PACKAGES_DIR}" + linux_id=vcpkg + "CONFIGS=${ICE_BUILD_CONFIG}" + USR_DIR_INSTALL=yes + OPTIMIZE=yes + ${ICE_OPTIONAL_COMPONENTS_MAKE} + "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-${TARGET_TRIPLET}-rel + ) + + # Install release libraries and other files to packages directory + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/ice/slice") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + install_includes("${UNIX_BUILD_DIR}/cpp/include" "${ICE_INCLUDE_SUB_DIRECTORIES}") + install_includes("${UNIX_BUILD_DIR}/cpp/include/generated" "${ICE_INCLUDE_SUB_DIRECTORIES}") + install_slices("${SOURCE_PATH}/slice" "${ICE_INCLUDE_SUB_DIRECTORIES}") + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(GLOB ICE_RELEASE_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib64/*") + else() + file(GLOB ICE_RELEASE_LIBRARIES "${UNIX_BUILD_DIR}/cpp/lib/*") + endif() + file(COPY ${ICE_RELEASE_LIBRARIES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(GLOB ICE_RELEASE_EXECUTABLES "${UNIX_BUILD_DIR}/cpp/bin/*") + file(COPY ${ICE_RELEASE_EXECUTABLES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + # Clean up + vcpkg_execute_build_process( + COMMAND make distclean + WORKING_DIRECTORY ${SOURCE_PATH}/cpp + LOGNAME make-clean-after-build-${TARGET_TRIPLET} + ) + + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib") + endif() + if(EXISTS "${UNIX_BUILD_DIR}/cpp/lib64") + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/lib64") + endif() + file(REMOVE_RECURSE "${UNIX_BUILD_DIR}/cpp/bin") + +else() # VCPKG_TARGET_IS_WINDOWS + + # Fix project files to prevent nuget restore of dependencies and + # remove hard coded runtime linkage + include("${CURRENT_PORT_DIR}/prepare_for_build.cmake") + prepare_for_build("${SOURCE_PATH}") + + # Build Ice + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH "cpp/msbuild/ice.${VCPKG_PLATFORM_TOOLSET}.sln" + SKIP_CLEAN + TARGET "C++11\\ice++11" + USE_VCPKG_INTEGRATION + OPTIONS + /p:UseVcpkg=yes + /p:IceBuildingSrc=yes + ${ICE_OPTIONAL_COMPONENTS_MSBUILD} + ) + + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/zeroc.icebuilder.msbuild.dll") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/zeroc.icebuilder.msbuild.dll") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/zeroc.icebuilder.msbuild.dll") + endif() + + install_includes("${WIN_RELEASE_BUILD_DIR}/cpp/include" "${ICE_INCLUDE_SUB_DIRECTORIES}") + install_includes("${WIN_RELEASE_BUILD_DIR}/cpp/include/generated/cpp11/${TRIPLET_SYSTEM_ARCH}/Release" "${ICE_INCLUDE_SUB_DIRECTORIES}") + + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/ice/slice") + install_slices("${SOURCE_PATH}/slice" "${ICE_INCLUDE_SUB_DIRECTORIES}") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + + vcpkg_clean_msbuild() + +endif() + +# Remove unnecessary static libraries. +file(GLOB PDLIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*") +file(GLOB PRLIBS "${CURRENT_PACKAGES_DIR}/lib/*") +list(FILTER PDLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$") +list(FILTER PRLIBS INCLUDE REGEX ".*(([Ii]ce[Uu]til|[Ss]lice)d?\.([a-z]+))$") +file(REMOVE ${PDLIBS} ${PRLIBS}) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zeroc-ice RENAME copyright) diff --git a/ports/zeroc-ice/prepare_for_build.cmake b/ports/zeroc-ice/prepare_for_build.cmake new file mode 100644 index 00000000000000..4287fbdc820e9e --- /dev/null +++ b/ports/zeroc-ice/prepare_for_build.cmake @@ -0,0 +1,60 @@ + +# This function removes hardcoded RuntimeLibrary directives from Ice's vcxproh files and downloads +# Ice Builder for MSBuild, which is required to generate C++ files based on the interface definition +# files (.ice). + +function(prepare_for_build ICE_SOURCE_DIR) + + message("-- Removing hardcoded 'RuntimeLibrary' directives from .vcxproj files") + set(CPP_SOURCE_DIR "${ICE_SOURCE_DIR}/cpp/src") + file(GLOB_RECURSE PROJ_FILES "${CPP_SOURCE_DIR}/*.vcxproj") + foreach(PROJ_FILE ${PROJ_FILES}) + file(READ ${PROJ_FILE} PROJ_FILE_CONTENT) + STRING(REGEX + REPLACE + "" + "" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + STRING(REGEX + REPLACE + "MultiThreadedDebug" + "" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + STRING(REGEX + REPLACE + "MultiThreaded" + "" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + file(WRITE ${PROJ_FILE} "${PROJ_FILE_CONTENT}") + endforeach() + + set(ICE_CPP_MSBUILD_PACKAGES_DIR "${ICE_SOURCE_DIR}/cpp/msbuild/packages") + set(ICE_BUILDER_DEST_DIRECTORY "${ICE_CPP_MSBUILD_PACKAGES_DIR}/zeroc.icebuilder.msbuild.5.0.7") + if(NOT EXISTS "${ICE_BUILDER_DEST_DIRECTORY}") + message("-- Making Ice Builder for MSBuild available") + vcpkg_download_distfile( + ICE_BUILDER_MSBUILD_ARCHIVE + URLS https://globalcdn.nuget.org/packages/zeroc.icebuilder.msbuild.5.0.7.nupkg + FILENAME zeroc.icebuilder.msbuild.5.0.7.zip + SHA512 d4afed8a3c67daf2e1cde09e7747ec9f088fa1354069bb7c7782c1089ea0f4e50b669f45a88502ad341dbccafbc1394d74fe764479f25bf4be1d3f70e66cb174 + ) + + vcpkg_extract_source_archive( + ICE_BUILDER_MSBUILD_DIRECTORY + ARCHIVE + "${ICE_BUILDER_MSBUILD_ARCHIVE}" + NO_REMOVE_ONE_LEVEL + SOURCE_BASE icebuilder + ) + + file(MAKE_DIRECTORY "${ICE_SOURCE_DIR}/cpp/msbuild/packages") + file(RENAME "${ICE_BUILDER_MSBUILD_DIRECTORY}" "${ICE_BUILDER_DEST_DIRECTORY}") + endif() + +endfunction() diff --git a/ports/zeroc-ice/slice2swift.patch b/ports/zeroc-ice/slice2swift.patch new file mode 100644 index 00000000000000..6c45cb82db7240 --- /dev/null +++ b/ports/zeroc-ice/slice2swift.patch @@ -0,0 +1,25 @@ +diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp +index 404dee7670..01e144de90 100644 +--- a/cpp/src/slice2swift/SwiftUtil.cpp ++++ b/cpp/src/slice2swift/SwiftUtil.cpp +@@ -1523,7 +1523,7 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, + const DataMemberList& baseMembers, + const DataMemberList& allMembers, + const ContainedPtr& p, +- bool local, ++ bool /*local*/, + bool rootClass, + const StringPairList& extraParams) + { +@@ -1531,11 +1531,6 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, + { + out << sp; + out << nl; +- int typeCtx = TypeContextInParam; +- if(local) +- { +- typeCtx |= TypeContextLocal; +- } + out << "public init" << spar; + for(DataMemberList::const_iterator i = allMembers.begin(); i != allMembers.end(); ++i) + { diff --git a/ports/zeroc-ice/vcpkg.json b/ports/zeroc-ice/vcpkg.json new file mode 100644 index 00000000000000..bd2f3013c623c3 --- /dev/null +++ b/ports/zeroc-ice/vcpkg.json @@ -0,0 +1,125 @@ +{ + "name": "zeroc-ice", + "version": "3.7.7", + "maintainers": "Benjamin Oldenburg ", + "description": "Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.", + "homepage": "https://github.com/zeroc-ice/ice", + "license": null, + "supports": "!uwp & !(windows & arm) & !wasm32", + "dependencies": [ + "bzip2", + "expat", + "lmdb", + "mcpp", + { + "name": "openssl", + "platform": "!windows" + }, + "zlib" + ], + "features": { + "glacier2lib": { + "description": "Glacier2 libraries" + }, + "glacier2router": { + "description": "Glacier2Router", + "supports": "!static", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "icessl" + ] + } + ] + }, + "iceboxlib": { + "description": "IceBox libraries and runtime" + }, + "iceboxtools": { + "description": "IceBox tools", + "supports": "!static" + }, + "icebridge": { + "description": "IceBridge", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "iceboxlib" + ] + } + ] + }, + "icediscovery": { + "description": "IceDiscovery", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icessl", + "icestormlib" + ] + } + ] + }, + "icegridlib": { + "description": "IceGrid library", + "dependencies": [ + { + "name": "zeroc-ice", + "features": [ + "glacier2lib" + ] + } + ] + }, + "icegridtools": { + "description": "IceGrid tools", + "supports": "!static", + "dependencies": [ + "expat", + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icegridlib", + "icessl" + ] + } + ] + }, + "icessl": { + "description": "IceSSL", + "dependencies": [ + { + "name": "openssl", + "platform": "!windows" + } + ] + }, + "icestormlib": { + "description": "IceStorm library" + }, + "icestormtools": { + "description": "IceStorm tools", + "supports": "!static", + "dependencies": [ + "lmdb", + { + "name": "zeroc-ice", + "features": [ + "glacier2lib", + "iceboxlib", + "icegridlib", + "icestormlib" + ] + } + ] + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2bbf62cdbabc81..d9d0e40b38a866 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1421,3 +1421,8 @@ workflow:arm-uwp=fail # See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639 dimcli:x64-windows-static-md=fail dimcli:x64-windows-static=fail + +# ZeroC doesn't provide ARM tagets in project files. +zeroc-ice:arm64-windows=fail +zeroc-ice:arm-uwp=fail +zeroc-ice:x64-uwp=fail \ No newline at end of file diff --git a/versions/baseline.json b/versions/baseline.json index d94f3584987988..a74e365d0702f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7652,6 +7652,10 @@ "baseline": "1.0", "port-version": 1 }, + "zeroc-ice": { + "baseline": "3.7.7", + "port-version": 0 + }, "zeromq": { "baseline": "4.3.4", "port-version": 5 diff --git a/versions/z-/zeroc-ice.json b/versions/z-/zeroc-ice.json new file mode 100644 index 00000000000000..f0e580ba7cc94a --- /dev/null +++ b/versions/z-/zeroc-ice.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bdb180069d461c04c1eee1a7937afa63d0ea752b", + "version": "3.7.7", + "port-version": 0 + } + ] +} From bdd4b345eea97ea9bcdd3f847ee1f958bbcae774 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 13 Apr 2022 19:51:30 +0200 Subject: [PATCH 204/217] [libatomic-ops] Disable docs (#24105) * [libatomic-ops] Disable docs * version * Fix license * uppercase * version * confusing license terms * version --- ports/libatomic-ops/portfile.cmake | 7 ++++--- ports/libatomic-ops/vcpkg.json | 3 +++ versions/baseline.json | 2 +- versions/l-/libatomic-ops.json | 5 +++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ports/libatomic-ops/portfile.cmake b/ports/libatomic-ops/portfile.cmake index 357a590f2ae7e2..239de3c26ec3d6 100644 --- a/ports/libatomic-ops/portfile.cmake +++ b/ports/libatomic-ops/portfile.cmake @@ -8,7 +8,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA + OPTIONS + -Denable_docs=OFF OPTIONS_DEBUG -Dinstall_headers=OFF ) @@ -17,8 +18,8 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME atomic_ops CONFIG_PATH lib/cmake/atomic_ops) vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libatomic-ops/vcpkg.json b/ports/libatomic-ops/vcpkg.json index 7bbf9dcd6b9cf2..46fcf653ce3830 100644 --- a/ports/libatomic-ops/vcpkg.json +++ b/ports/libatomic-ops/vcpkg.json @@ -1,7 +1,10 @@ { "name": "libatomic-ops", "version": "7.7.0", + "port-version": 1, "description": "The atomic_ops project (Atomic memory update operations portable implementation)", + "homepage": "https://github.com/ivmai/libatomic_ops", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index a74e365d0702f7..6b7d2b4dd99f42 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3402,7 +3402,7 @@ }, "libatomic-ops": { "baseline": "7.7.0", - "port-version": 0 + "port-version": 1 }, "libavif": { "baseline": "0.9.2", diff --git a/versions/l-/libatomic-ops.json b/versions/l-/libatomic-ops.json index 9103181269c3f7..df1982c850963a 100644 --- a/versions/l-/libatomic-ops.json +++ b/versions/l-/libatomic-ops.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0165283f0349283e2d14bd752fc428fb9fffd6b", + "version": "7.7.0", + "port-version": 1 + }, { "git-tree": "6d7b45bb0c10342d8e43900fab12f2baab4eb6a1", "version": "7.7.0", From aaeba6b1bf4b8aada6ffcdaa15855bb35963968d Mon Sep 17 00:00:00 2001 From: vetegrodd Date: Wed, 13 Apr 2022 20:09:50 +0200 Subject: [PATCH 205/217] [sfgui] Create patch to add missing header (#24103) * Create patch to add missing header * Updated package version * Updated checksum Co-authored-by: vetegrodd --- ports/sfgui/002-add-limits-header.patch | 13 +++++++++++++ ports/sfgui/portfile.cmake | 1 + ports/sfgui/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/s-/sfgui.json | 5 +++++ 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 ports/sfgui/002-add-limits-header.patch diff --git a/ports/sfgui/002-add-limits-header.patch b/ports/sfgui/002-add-limits-header.patch new file mode 100644 index 00000000000000..e16e57663c8332 --- /dev/null +++ b/ports/sfgui/002-add-limits-header.patch @@ -0,0 +1,13 @@ +diff --git a/src/SFGUI/ComboBox.cpp b/src/SFGUI/ComboBox.cpp +index a01937b..454ec3e 100644 +--- a/src/SFGUI/ComboBox.cpp ++++ b/src/SFGUI/ComboBox.cpp +@@ -9,6 +9,8 @@ + #include + #include + ++#include ++ + namespace sfg { + + // Signals. diff --git a/ports/sfgui/portfile.cmake b/ports/sfgui/portfile.cmake index b2c6787651e548..ee3974c10a52c7 100644 --- a/ports/sfgui/portfile.cmake +++ b/ports/sfgui/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES "001-fix-corefoundation-link.patch" + "002-add-limits-header.patch" ) file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindSFML.cmake) diff --git a/ports/sfgui/vcpkg.json b/ports/sfgui/vcpkg.json index aa4ea2c85d27bc..e0cbe393a5f30e 100644 --- a/ports/sfgui/vcpkg.json +++ b/ports/sfgui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sfgui", - "version-string": "0.4.0", - "port-version": 4, + "version": "0.4.0", + "port-version": 5, "description": "simple and fast graphical user interface library", "homepage": "https://github.com/TankOs/SFGUI", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6b7d2b4dd99f42..77da570c22cef4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6434,7 +6434,7 @@ }, "sfgui": { "baseline": "0.4.0", - "port-version": 4 + "port-version": 5 }, "sfml": { "baseline": "2.5.1", diff --git a/versions/s-/sfgui.json b/versions/s-/sfgui.json index 979801a7229328..639b8bc9418976 100644 --- a/versions/s-/sfgui.json +++ b/versions/s-/sfgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50f11f13413cb93d73d44bd0c00787363a00c98c", + "version": "0.4.0", + "port-version": 5 + }, { "git-tree": "64f6f7ee9963a096a2b4260c55be6228a22846e5", "version-string": "0.4.0", From 4a41edd67f9bb4a54b0c2cd73b92d5768ddce42c Mon Sep 17 00:00:00 2001 From: vincent-nv <59442586+vincent-nv@users.noreply.github.com> Date: Wed, 13 Apr 2022 20:12:02 +0200 Subject: [PATCH 206/217] [qt-advanced-docking-system] update to version 3.8.2 (#24096) --- .../hardcode_version.patch | 17 ----------------- ports/qt-advanced-docking-system/portfile.cmake | 7 +++---- ports/qt-advanced-docking-system/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/q-/qt-advanced-docking-system.json | 5 +++++ 5 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 ports/qt-advanced-docking-system/hardcode_version.patch diff --git a/ports/qt-advanced-docking-system/hardcode_version.patch b/ports/qt-advanced-docking-system/hardcode_version.patch deleted file mode 100644 index f5fc9caf8329b7..00000000000000 --- a/ports/qt-advanced-docking-system/hardcode_version.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94fdb8d..6febea2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,11 +1,6 @@ - cmake_minimum_required(VERSION 3.5) - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) --include(GetGitRevisionDescription) --git_describe(GitTagVersion --tags) --string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GitTagVersion}") --string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GitTagVersion}") --string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GitTagVersion}") --set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") -+ - project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT}) - option(BUILD_STATIC "Build the static library" OFF) - option(BUILD_EXAMPLES "Build the examples" ON) diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index 668661cdb40cdb..03551d572070fa 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System - REF ab4869a0e1c97fec1dfca29eeb84be67af182864 #v3.8.0 - SHA512 220ec4604eda8a39cd7ba8839cee2ab420e8c5a0b247749afb85a7b4ec3286f6debd53c910637e84023af79319f0600eb48a6c037c3e4877708677fee3c62ce7 + REF d5fefaa35fb53e299b7f39b0d8f541954c710d94 #v3.8.2 + SHA512 fcafee34d4d5365b3677c648e0d9a1ea8afd5463ca682ae19b10661490aca44d4f010ba768ed9c639b8ada10106be7aff336c2b7b42f10dc12db6b51988b4e22 HEAD_REF master PATCHES - hardcode_version.patch config_changes.patch ) @@ -13,7 +12,7 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_EXAMPLES=OFF - -DVERSION_SHORT=3.8.0 + -DADS_VERSION=3.8.2 ) vcpkg_cmake_install() diff --git a/ports/qt-advanced-docking-system/vcpkg.json b/ports/qt-advanced-docking-system/vcpkg.json index 75500cea707f46..f814878094775a 100644 --- a/ports/qt-advanced-docking-system/vcpkg.json +++ b/ports/qt-advanced-docking-system/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qt-advanced-docking-system", - "version": "3.8.0", + "version": "3.8.2", "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio", "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System", + "license": "LGPL-2.1-only", "dependencies": [ "bzip2", { diff --git a/versions/baseline.json b/versions/baseline.json index 77da570c22cef4..ef6b7931dd1c61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5657,7 +5657,7 @@ "port-version": 0 }, "qt-advanced-docking-system": { - "baseline": "3.8.0", + "baseline": "3.8.2", "port-version": 0 }, "qt5": { diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json index 9d7d702fc758f2..f219e69524d82f 100644 --- a/versions/q-/qt-advanced-docking-system.json +++ b/versions/q-/qt-advanced-docking-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6340fe5a7da92b20bff09455503e08510d1124f6", + "version": "3.8.2", + "port-version": 0 + }, { "git-tree": "427efb4851b6f81f6301f6418d0e8d04bebbf557", "version": "3.8.0", From 9dfc2f05b8254aed21cfdd6b232d7705d23794dc Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Wed, 13 Apr 2022 21:12:31 +0300 Subject: [PATCH 207/217] Use EMSCRIPTEN_ROOT variable in addition to EMSDK (#24072) * Use EMSCRIPTEN variable instead of EMSDK Because it's directly point to appropriate version * Use EMSCRIPTEN_ROOT variable in addition to EMSDK --- triplets/community/wasm32-emscripten.cmake | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/triplets/community/wasm32-emscripten.cmake b/triplets/community/wasm32-emscripten.cmake index 2394e12270cc0f..ece5d8a22f1489 100644 --- a/triplets/community/wasm32-emscripten.cmake +++ b/triplets/community/wasm32-emscripten.cmake @@ -1,10 +1,19 @@ -set(VCPKG_ENV_PASSTHROUGH EMSDK PATH) +set(VCPKG_ENV_PASSTHROUGH_UNTRACKED EMSCRIPTEN_ROOT EMSDK PATH) -if(NOT DEFINED ENV{EMSDK}) - message(FATAL_ERROR "The EMSDK environment variable must be defined") +if(NOT DEFINED ENV{EMSCRIPTEN_ROOT}) + find_path(EMSCRIPTEN_ROOT "emcc") +else() + set(EMSCRIPTEN_ROOT "$ENV{EMSCRIPTEN_ROOT}") endif() -if(NOT EXISTS $ENV{EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake) +if(NOT EMSCRIPTEN_ROOT) + if(NOT DEFINED ENV{EMSDK}) + message(FATAL_ERROR "The emcc compiler not found in PATH") + endif() + set(EMSCRIPTEN_ROOT "$ENV{EMSDK}/upstream/emscripten") +endif() + +if(NOT EXISTS "${EMSCRIPTEN_ROOT}/cmake/Modules/Platform/Emscripten.cmake") message(FATAL_ERROR "Emscripten.cmake toolchain file not found") endif() @@ -12,4 +21,4 @@ set(VCPKG_TARGET_ARCHITECTURE wasm32) set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Emscripten) -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE $ENV{EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake) +set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${EMSCRIPTEN_ROOT}/cmake/Modules/Platform/Emscripten.cmake") From 6960e3f0767c59b27e5442101e0620a841ea259c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 13 Apr 2022 20:13:15 +0200 Subject: [PATCH 208/217] [qtkeychain] Update to 0.13.2+2 to fix the exported CMake target (#24013) This allows to link the target application using CMake < 3.18 and fixing a regression since v0.13.0 --- ports/qtkeychain/portfile.cmake | 5 +++-- ports/qtkeychain/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qtkeychain.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/qtkeychain/portfile.cmake b/ports/qtkeychain/portfile.cmake index f631232282adda..612ad8151b67ae 100644 --- a/ports/qtkeychain/portfile.cmake +++ b/ports/qtkeychain/portfile.cmake @@ -3,8 +3,9 @@ message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliat vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankosterfeld/qtkeychain - REF v0.13.2 - SHA512 10f8b1c959a126ba14614b797ea5640404a0b95c71e452225c74856eae90e966aac581ca393508a2106033c3d5ad70427ea6f7ef3f2997eddf6d09a7b4fa26eb + # 0.13.2 plus two commits, for a CMake export target fix + REF e5eeb1763e295f6b05a3f008ee7ae192fd74ed0c + SHA512 c6f216c8acdd89607d16582305bff962a0049512565f8ead7bebf06bce1540cdf41cc8b6dc31b45396befd90a3bd65a2f8a969242f302cbb61438ff7a48aab1c HEAD_REF master ) diff --git a/ports/qtkeychain/vcpkg.json b/ports/qtkeychain/vcpkg.json index af15c267924974..ad96e2c068d429 100644 --- a/ports/qtkeychain/vcpkg.json +++ b/ports/qtkeychain/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtkeychain", "version": "0.13.2", - "port-version": 1, + "port-version": 2, "description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index ef6b7931dd1c61..d13f96e9c44ac6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5890,7 +5890,7 @@ }, "qtkeychain": { "baseline": "0.13.2", - "port-version": 1 + "port-version": 2 }, "qtkeychain-qt6": { "baseline": "0.13.2", diff --git a/versions/q-/qtkeychain.json b/versions/q-/qtkeychain.json index 3016ce87b99b35..8d761565e1c059 100644 --- a/versions/q-/qtkeychain.json +++ b/versions/q-/qtkeychain.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6311d9dd13b97c8a01a980d7b42ea6cfecc4f765", + "version": "0.13.2", + "port-version": 2 + }, { "git-tree": "ef01f1d6401814e50c0438d3a8a7770568ac93ca", "version": "0.13.2", From 859cdf1dbf0f662461a5d8c3f8214bc8aeccd6e8 Mon Sep 17 00:00:00 2001 From: day253 <9634619+day253@users.noreply.github.com> Date: Thu, 14 Apr 2022 02:15:00 +0800 Subject: [PATCH 209/217] [tools] add coscli (#23538) --- scripts/vcpkgTools.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index c3b5459104fb06..51de1f1df7cb97 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -105,6 +105,24 @@ https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + + 0.11.0 + coscli-windows.exe + https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-windows.exe + 41cb397e0633df58663761ff2afa25324d8cf603fb798fc08f7dc933aeb6f6048c1c0d6d0356aaebcfc901c57cc1b4996f10d6d83cd68f8dd66b50944b1ee2a3 + + + 0.11.0 + coscli-linux + https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-linux + c990c0d1cc77e220ed449b603753a9e4ae91ade9db6d443c31f4e4dfdddcd86fba6543e2354a0834c1776da210ae092dc712bcf1802871146645e8d838820efa + + + 0.11.0 + coscli-mac + https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-mac + 9556335bfc8bc14bace6dfced45fa77fb07c80f08aa975e047a54efda1d19852aae0ea68a5bc7f04fbd88e3edce5a73512a61216b1c5ff4cade224de4a9ab8db + 3.1.81 QtInstallerFramework-win-x86\bin\installerbase.exe From feef13ccf3ef463b1208a6091d82153c32b245e5 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 13 Apr 2022 11:23:12 -0700 Subject: [PATCH 210/217] [dstorage, dxsdk-d3dx, xaudio2redist] ports updated to support static-md triplets (#24104) * Update ports to support static-md triplets * Update baseline * !(static & staticcrt) -> !staticcrt Co-authored-by: nicole mazzuca --- ports/dstorage/vcpkg.json | 3 ++- ports/dxsdk-d3dx/vcpkg.json | 4 ++-- ports/xaudio2redist/vcpkg.json | 4 ++-- versions/baseline.json | 6 +++--- versions/d-/dstorage.json | 5 +++++ versions/d-/dxsdk-d3dx.json | 5 +++++ versions/x-/xaudio2redist.json | 5 +++++ 7 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json index 66ada05dfe7e28..a0f7f24f6f2a34 100644 --- a/ports/dstorage/vcpkg.json +++ b/ports/dstorage/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dstorage", "version": "1.0.0", + "port-version": 1, "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", "license": null, - "supports": "windows & !uwp & !static" + "supports": "windows & !uwp & !staticcrt" } diff --git a/ports/dxsdk-d3dx/vcpkg.json b/ports/dxsdk-d3dx/vcpkg.json index 7b0cf6d69e353d..d4a9518152f49a 100644 --- a/ports/dxsdk-d3dx/vcpkg.json +++ b/ports/dxsdk-d3dx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", - "port-version": 3, + "port-version": 4, "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", "license": null, - "supports": "windows & !arm & !uwp & !static" + "supports": "windows & !arm & !uwp & !staticcrt" } diff --git a/ports/xaudio2redist/vcpkg.json b/ports/xaudio2redist/vcpkg.json index 3c610f1f99f2c1..0840cb7fc51b92 100644 --- a/ports/xaudio2redist/vcpkg.json +++ b/ports/xaudio2redist/vcpkg.json @@ -1,9 +1,9 @@ { "name": "xaudio2redist", "version": "1.2.8", - "port-version": 2, + "port-version": 3, "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", "license": null, - "supports": "windows & !arm & !uwp & !static" + "supports": "windows & !arm & !uwp & !staticcrt" } diff --git a/versions/baseline.json b/versions/baseline.json index d13f96e9c44ac6..276409497a487b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1946,7 +1946,7 @@ }, "dstorage": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "dtl": { "baseline": "1.19", @@ -1970,7 +1970,7 @@ }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 3 + "port-version": 4 }, "dxut": { "baseline": "11.26", @@ -7526,7 +7526,7 @@ }, "xaudio2redist": { "baseline": "1.2.8", - "port-version": 2 + "port-version": 3 }, "xbyak": { "baseline": "6.00", diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json index cc27ca92254889..5d72f09e7b8992 100644 --- a/versions/d-/dstorage.json +++ b/versions/d-/dstorage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b3e0c3eaf98dec92b8e97f19e10efac69c6a187", + "version": "1.0.0", + "port-version": 1 + }, { "git-tree": "b2494bc112c6d12ffbb8a8bc687a1ae2ad583221", "version": "1.0.0", diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index 81208748aaa73e..8da67907f9aa71 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14db52bb5daba8ba8e0a93b0e41ffa676935923a", + "version": "9.29.952.8", + "port-version": 4 + }, { "git-tree": "4f9cac012452363e92e36d5978972cee3b9154e5", "version": "9.29.952.8", diff --git a/versions/x-/xaudio2redist.json b/versions/x-/xaudio2redist.json index 2f86ccea7786ac..2b305feb0181b6 100644 --- a/versions/x-/xaudio2redist.json +++ b/versions/x-/xaudio2redist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe3229572bacd0c7076a7a4d710f96e6b3a66a3f", + "version": "1.2.8", + "port-version": 3 + }, { "git-tree": "8ae7aaec9ebb9859356736f91710e8d9727d7a81", "version": "1.2.8", From 99346bb6926e85d93e4aad330bf28cce4a18051b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 13 Apr 2022 20:26:56 +0200 Subject: [PATCH 211/217] [libwebp] Update, cleanup (#23864) * Update to v1.2.2 * Fix libwebpmux Windows name breakage The pc file relies on the original output name: No 'lib' prefix for MSVC. No 'liblib' prefix for mingw. * Minor portfile updates * Don't self-depend on default features * Fix the libwebpmux feature * Fix internal tool dependencies * Drop Xrandr patch (fixed in freeglut) * Drop X11 patch (fixed in freeglut) * Cleanup CMake config patch, no extra case hacks * Adjust webp lib names in skia, qt5-imageformats * Adjust downstream WEBP cmake usage * Debug qtimageformats [skip actions] * [tiff] Drive-by fix for CMake warning * Drop non-standard debug postfix * Update indentation * Update port versions * Update versions * Revert qtimageformat debug change * Fixup qt5-imageformats change * Update versions --- ports/libwebp/0001-build.patch | 9 -- ...e-config-add-backwards-compatibility.patch | 69 ------------- ports/libwebp/0002-cmake-config.patch | 24 +++++ ports/libwebp/0003-always-mux.patch | 13 --- .../libwebp/0003-fix-tool-dependencies.patch | 13 +++ .../0004-add-missing-linked-library.patch | 15 --- .../0006-fix-dependecies-platform.patch | 2 +- ports/libwebp/0009-glut.patch | 10 -- ports/libwebp/portfile.cmake | 96 ++++++++----------- ports/libwebp/vcpkg.json | 47 ++++++++- .../0003-force-package-requirements.patch | 2 +- ports/opencv3/vcpkg.json | 2 +- .../0003-force-package-requirements.patch | 2 +- ports/opencv4/vcpkg.json | 2 +- .../make-all-find-packages-required.patch | 5 +- ports/osgearth/vcpkg.json | 2 +- ports/qt5-imageformats/portfile.cmake | 12 +-- ports/qt5-imageformats/vcpkg.json | 1 + ports/skia/portfile.cmake | 4 +- ports/skia/vcpkg.json | 2 +- ports/tiff/portfile.cmake | 3 +- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 2 +- ports/tiff/vcpkg.json | 2 +- versions/baseline.json | 14 +-- versions/l-/libwebp.json | 5 + versions/o-/opencv3.json | 5 + versions/o-/opencv4.json | 5 + versions/o-/osgearth.json | 5 + versions/q-/qt5-imageformats.json | 5 + versions/s-/skia.json | 5 + versions/t-/tiff.json | 5 + 31 files changed, 185 insertions(+), 203 deletions(-) delete mode 100644 ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch create mode 100644 ports/libwebp/0002-cmake-config.patch delete mode 100644 ports/libwebp/0003-always-mux.patch create mode 100644 ports/libwebp/0003-fix-tool-dependencies.patch delete mode 100644 ports/libwebp/0004-add-missing-linked-library.patch diff --git a/ports/libwebp/0001-build.patch b/ports/libwebp/0001-build.patch index 3c6a63988122df..8a7cd7f37d7c5c 100644 --- a/ports/libwebp/0001-build.patch +++ b/ports/libwebp/0001-build.patch @@ -12,15 +12,6 @@ index bd1bebb..4ce801d 100644 else() add_definitions(-Wall) endif() -@@ -482,7 +485,7 @@ if(WEBP_BUILD_LIBWEBPMUX) - "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\ - ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\ - ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;") -- set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux) -+ set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME $<$:lib>webpmux) - list(APPEND INSTALLED_LIBRARIES libwebpmux) - configure_pkg_config("src/mux/libwebpmux.pc") - endif() @@ -586,8 +589,12 @@ if(WEBP_BUILD_EXTRAS) # webp_quality add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS}) diff --git a/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch deleted file mode 100644 index 5e039a6811b280..00000000000000 --- a/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in -index 822fc59..cef75fe 100644 ---- a/cmake/WebPConfig.cmake.in -+++ b/cmake/WebPConfig.cmake.in -@@ -4,8 +4,60 @@ set(WEBP_VERSION ${WebP_VERSION}) - @PACKAGE_INIT@ - - include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -+include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) - --set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") --set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) --set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") --set(WEBP_LIBRARIES "${WebP_LIBRARIES}") -+find_path(WEBP_INCLUDE_DIR NAMES webp/types.h) -+set(WebP_INCLUDE_DIR ${WEBP_INCLUDE_DIR}) -+set(WebP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) -+set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR}) -+ -+if(NOT WEBP_BASE_LIBRARY AND NOT WebP_BASE_LIBRARY) -+ find_library(WEBP_BASE_LIBRARY_RELEASE NAMES webp) -+ find_library(WEBP_BASE_LIBRARY_DEBUG NAMES webpd) -+ select_library_configurations(WEBP_BASE) -+ set(WebP_BASE_LIBRARY ${WEBP_BASE_LIBRARY}) -+ if(WEBP_BASE_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_BASE_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_BASE_LIBRARY}") -+ endif() -+endif() -+ -+if(NOT WEBP_DECODER_LIBRARY AND NOT WebP_DECODER_LIBRARY) -+ find_library(WEBP_DECODER_LIBRARY_RELEASE NAMES webpdecoder) -+ find_library(WEBP_DECODER_LIBRARY_DEBUG NAMES webpdecoderd) -+ select_library_configurations(WEBP_DECODER) -+ set(WebP_DECODER_LIBRARY ${WEBP_DECODER_LIBRARY}) -+ if(WEBP_DECODER_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_DECODER_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_DECODER_LIBRARY}") -+ endif() -+endif() -+ -+if(NOT WEBP_DEMUX_LIBRARY AND NOT WebP_DEMUX_LIBRARY) -+ find_library(WEBP_DEMUX_LIBRARY_RELEASE NAMES webpdemux) -+ find_library(WEBP_DEMUX_LIBRARY_DEBUG NAMES webpdemuxd) -+ select_library_configurations(WEBP_DEMUX) -+ set(WebP_DEMUX_LIBRARY ${WEBP_DEMUX_LIBRARY}) -+ if(WEBP_DEMUX_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_DEMUX_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_DEMUX_LIBRARY}") -+ endif() -+endif() -+ -+if(NOT WEBP_MUX_LIBRARY AND NOT WebP_MUX_LIBRARY) -+ find_library(WEBP_MUX_LIBRARY_RELEASE NAMES libwebpmux) -+ find_library(WEBP_MUX_LIBRARY_DEBUG NAMES libwebpmuxd) -+ select_library_configurations(WEBP_MUX) -+ set(WebP_MUX_LIBRARY ${WEBP_MUX_LIBRARY}) -+ if(WEBP_MUX_LIBRARY) -+ list(APPEND WEBP_LIBRARIES "${WEBP_MUX_LIBRARY}") -+ list(APPEND WebP_LIBRARIES "${WebP_MUX_LIBRARY}") -+ endif() -+endif() -+ -+set(WEBP_LIBRARY ${WEBP_BASE_LIBRARY}) -+set(WebP_LIBRARY ${WebP_BASE_LIBRARY}) -+if(WEBP_BASE_LIBRARY AND WEBP_INCLUDE_DIR) -+ set(WEBP_FOUND 1) -+ set(WebP_FOUND 1) -+endif() diff --git a/ports/libwebp/0002-cmake-config.patch b/ports/libwebp/0002-cmake-config.patch new file mode 100644 index 00000000000000..ae36fb6815eceb --- /dev/null +++ b/ports/libwebp/0002-cmake-config.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in +index 822fc59..fb31829 100644 +--- a/cmake/WebPConfig.cmake.in ++++ b/cmake/WebPConfig.cmake.in +@@ -5,7 +5,17 @@ set(WEBP_VERSION ${WebP_VERSION}) + + include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + +-set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") ++get_filename_component(_vcpkg_libwebp_root "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) ++set(WebP_INCLUDE_DIRS "${_vcpkg_libwebp_root}/include") + set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) +-set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") ++set(WebP_LIBRARIES "") ++include(SelectLibraryConfigurations) ++foreach(_vcpkg_libwebp_lib IN ITEMS @INSTALLED_LIBRARIES@) ++ string(REPLACE "libwebpmux" "webpmux" _vcpkg_libwebp_lib "${_vcpkg_libwebp_lib}") # offical OUTPUT_NAME ++ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_RELEASE NAMES ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/lib" NO_DEFAULT_PATH) ++ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_DEBUG NAMES ${_vcpkg_libwebp_lib}d ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/debug/lib" NO_DEFAULT_PATH) ++ select_library_configurations(_vcpkg_${_vcpkg_libwebp_lib}) ++ list(APPEND WebP_LIBRARIES ${_vcpkg_${_vcpkg_libwebp_lib}_LIBRARIES}) ++endforeach() + set(WEBP_LIBRARIES "${WebP_LIBRARIES}") ++unset(_vcpkg_libwebp_root) diff --git a/ports/libwebp/0003-always-mux.patch b/ports/libwebp/0003-always-mux.patch deleted file mode 100644 index c120c95d0ed1e6..00000000000000 --- a/ports/libwebp/0003-always-mux.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b0ae7d5..5813c06 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -472,7 +472,7 @@ if(WEBP_BUILD_CWEBP) - install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - --if(WEBP_BUILD_LIBWEBPMUX) -+if(WEBP_BUILD_LIBWEBPMUX OR WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP OR TRUE) - parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "") - add_library(libwebpmux ${WEBP_MUX_SRCS}) - target_link_libraries(libwebpmux webp) diff --git a/ports/libwebp/0003-fix-tool-dependencies.patch b/ports/libwebp/0003-fix-tool-dependencies.patch new file mode 100644 index 00000000000000..63fb5afde1aa2e --- /dev/null +++ b/ports/libwebp/0003-fix-tool-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 77a0f85..4a84ed1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -410,6 +410,8 @@ endif() + + # Build the executables if asked for. + if(WEBP_BUILD_ANIM_UTILS ++ OR WEBP_BUILD_WEBPINFO ++ OR WEBP_BUILD_WEBPMUX + OR WEBP_BUILD_CWEBP + OR WEBP_BUILD_DWEBP + OR WEBP_BUILD_GIF2WEBP diff --git a/ports/libwebp/0004-add-missing-linked-library.patch b/ports/libwebp/0004-add-missing-linked-library.patch deleted file mode 100644 index 6cfbe7ce8261e6..00000000000000 --- a/ports/libwebp/0004-add-missing-linked-library.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8386687..5ab9ed2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -540,6 +540,10 @@ if(WEBP_BUILD_VWEBP) - PRIVATE ${GLUT_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/src - ${OPENGL_INCLUDE_DIR}) -+ if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE)) -+ find_package(X11 REQUIRED) -+ target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB}) -+ endif() - install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - check_c_compiler_flag("-Wno-deprecated-declarations" HAS_NO_DEPRECATED) diff --git a/ports/libwebp/0006-fix-dependecies-platform.patch b/ports/libwebp/0006-fix-dependecies-platform.patch index 819c1f90b25a2b..a5849a7ac5011e 100644 --- a/ports/libwebp/0006-fix-dependecies-platform.patch +++ b/ports/libwebp/0006-fix-dependecies-platform.patch @@ -14,4 +14,4 @@ index 83edb3a..f634094 100644 + target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H) target_include_directories(vwebp_sdl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR} diff --git a/ports/libwebp/0009-glut.patch b/ports/libwebp/0009-glut.patch index 01d011e5f73ac0..914a935e1835e4 100644 --- a/ports/libwebp/0009-glut.patch +++ b/ports/libwebp/0009-glut.patch @@ -11,13 +11,3 @@ index 0799269..45b3306 100644 imageioutil webp webpdemux) -@@ -543,6 +543,9 @@ if(WEBP_BUILD_VWEBP) - if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE)) - find_package(X11 REQUIRED) - target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB}) -+ if(X11_Xrandr_FOUND) # due to glut linking xrandr if found -+ target_link_libraries(vwebp ${X11_Xrandr_LIB}) -+ endif() - endif() - install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 985a6d518c6db3..ae0881b1fedf42 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -1,44 +1,38 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO webmproject/libwebp - REF 9ce5843dbabcfd3f7c39ec7ceba9cbeb213cbfdf # v1.2.1 - SHA512 43224caedb0d591ad1dd3872cd882c0fe255e24425f6da82fca212783ddb231326797a82ead0a1b8b15dc98db1cb05741e3a5e5131babbcc49a529a9f3253865 - HEAD_REF master - PATCHES - 0001-build.patch - 0002-cmake-config-add-backwards-compatibility.patch - 0003-always-mux.patch #always build libwebpmux - 0004-add-missing-linked-library.patch - 0006-fix-dependecies-platform.patch - 0007-fix-arm-build.patch - 0008-sdl.patch - 0009-glut.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/libwebp + REF v1.2.2 + SHA512 04a036b705316ea04add50c9ec2d6d7a8316c710556b97413015d7b8548fe31a8f7f5bf0632e76262ada504dcc35ead20189ee7fcb3cebbe568eb15736ad9a94 + HEAD_REF master + PATCHES + 0001-build.patch + 0002-cmake-config.patch + 0003-fix-tool-dependencies.patch + 0006-fix-dependecies-platform.patch + 0007-fix-arm-build.patch + 0008-sdl.patch + 0009-glut.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - anim WEBP_BUILD_ANIM_UTILS - gif2webp WEBP_BUILD_GIF2WEBP - img2webp WEBP_BUILD_IMG2WEBP - vwebp WEBP_BUILD_VWEBP - vwebp-sdl WEBP_HAVE_SDL - info WEBP_BUILD_WEBPINFO - mux WEBP_BUILD_WEBPMUX - extras WEBP_BUILD_EXTRAS - nearlossless WEBP_NEAR_LOSSLESS - simd WEBP_ENABLE_SIMD - cwebp WEBP_BUILD_CWEBP - dwebp WEBP_BUILD_DWEBP - swap16bitcsp WEBP_ENABLE_SWAP_16BIT_CSP - unicode WEBP_UNICODE - libbwebpmux WEBP_BUILD_LIBWEBPMUX + FEATURES + anim WEBP_BUILD_ANIM_UTILS + gif2webp WEBP_BUILD_GIF2WEBP + img2webp WEBP_BUILD_IMG2WEBP + vwebp WEBP_BUILD_VWEBP + vwebp-sdl WEBP_HAVE_SDL + info WEBP_BUILD_WEBPINFO + mux WEBP_BUILD_WEBPMUX + extras WEBP_BUILD_EXTRAS + nearlossless WEBP_NEAR_LOSSLESS + simd WEBP_ENABLE_SIMD + cwebp WEBP_BUILD_CWEBP + dwebp WEBP_BUILD_DWEBP + swap16bitcsp WEBP_ENABLE_SWAP_16BIT_CSP + unicode WEBP_UNICODE + libwebpmux WEBP_BUILD_LIBWEBPMUX ) - -if(VCPKG_TARGET_IS_LINUX) - message("WebP currently requires the following library from the system package manager:\n Xxf86vm\n\nThis can be installed on Ubuntu systems via apt-get install libxxf86vm-dev") -endif() - if(VCPKG_TARGET_IS_OSX) if("vwebp" IN_LIST FEATURES OR "extras" IN_LIST FEATURES) message(FATAL_ERROR "Due to GLUT Framework problems with CMake, at the moment it's not possible to build VWebP or extras on Mac!") @@ -46,11 +40,9 @@ if(VCPKG_TARGET_IS_OSX) endif() vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -58,27 +50,21 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(PACKAGE_NAME WebP CONFIG_PATH share/WebP/cmake) # find_package is called with WebP not libwebp +vcpkg_cmake_config_fixup(PACKAGE_NAME WebP CONFIG_PATH share/WebP/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebp.pc" "-lwebp" "-lwebpd") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdecoder.pc" "-lwebpdecoder" "-lwebpdecoderd") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpdemux.pc" "-lwebpdemux" "-lwebpdemuxd") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebpmux.pc" "-lwebpmux" "-lwebpmuxd") -endif() vcpkg_fixup_pkgconfig() set(BIN_NAMES get_disto gif2webp img2webp vwebp vwebp_sdl webpinfo webpmux webp_quality cwebp dwebp) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/webp/") foreach(tool ${BIN_NAMES}) - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/webp/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/webp/${tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + endif() endforeach() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/webp") @@ -89,8 +75,8 @@ if(RES_LEN EQUAL 0) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/") endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index 179f1cc1b30f9a..0b7b25c9e00517 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,11 +1,12 @@ { "name": "libwebp", - "version": "1.2.1", + "version": "1.2.2", "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "unicode" ], @@ -21,6 +22,7 @@ } ], "default-features": [ + "libwebpmux", "nearlossless", "simd" ], @@ -37,6 +39,7 @@ "gif2webp", "img2webp", "info", + "libwebpmux", "mux", "nearlossless", "simd" @@ -63,6 +66,7 @@ "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "img2webp", "mux" @@ -81,6 +85,7 @@ "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "vwebp" ] @@ -94,7 +99,14 @@ "gif2webp": { "description": "Build the gif2webp conversion tool.", "dependencies": [ - "giflib" + "giflib", + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } ] }, "img2webp": { @@ -102,6 +114,13 @@ "dependencies": [ "libjpeg-turbo", "libpng", + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + }, "tiff" ] }, @@ -109,10 +128,31 @@ "description": "Build the webpinfo command line tool." }, "libbwebpmux": { + "description": "Obsolete, use feature libwebpmux instead.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } + ] + }, + "libwebpmux": { "description": "Build the libwebpmux library" }, "mux": { - "description": "Build the webpmux command line tool." + "description": "Build the webpmux command line tool.", + "dependencies": [ + { + "name": "libwebp", + "default-features": false, + "features": [ + "libwebpmux" + ] + } + ] }, "nearlossless": { "description": "Enable near-lossless encoding" @@ -141,6 +181,7 @@ "dependencies": [ { "name": "libwebp", + "default-features": false, "features": [ "vwebp" ] diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch index dd12caad531ab1..372811aa8845d9 100644 --- a/ports/opencv3/0003-force-package-requirements.patch +++ b/ports/opencv3/0003-force-package-requirements.patch @@ -32,7 +32,7 @@ else() ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) -+ find_package(WebP REQUIRED) ++ find_package(WEBP NAMES WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 06404f6590d9f0..3acd535726dbdb 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.16", - "port-version": 5, + "port-version": 6, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch index 15ce3756be50ee..6990dd96388aec 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -32,7 +32,7 @@ else() ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) -+ find_package(WebP REQUIRED) ++ find_package(WEBP NAMES WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index bf3293b2734784..e485574e7e44ef 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.5", - "port-version": 1, + "port-version": 2, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/osgearth/make-all-find-packages-required.patch b/ports/osgearth/make-all-find-packages-required.patch index 51bd86f408bdb6..b685f7dba43799 100644 --- a/ports/osgearth/make-all-find-packages-required.patch +++ b/ports/osgearth/make-all-find-packages-required.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 7541c8d07..cc14d2160 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -122,40 +122,54 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit +@@ -122,40 +122,53 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit # Mobile/GLES: IF (OSGEARTH_USE_GLES) @@ -45,9 +45,8 @@ index 7541c8d07..cc14d2160 100755 +find_package(protobuf CONFIG REQUIRED) +set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf) +set(Protobuf_FOUND 1) -+find_package(WebP CONFIG REQUIRED) ++find_package(WEBP NAMES WebP CONFIG REQUIRED) +set(WEBP_LIBRARY WebP::webp) -+set(WEBP_FOUND 1) +find_package(Blend2D CONFIG REQUIRED) if(OSGEARTH_ENABLE_PROFILING) diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index f9dcae84cef2af..558f4e6e447aa4 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osgearth", "version": "3.2", - "port-version": 4, + "port-version": 5, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "supports": "!(x86 | wasm32)", diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index a3cd9f92ac5ebd..04c41716eb940d 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -24,13 +24,13 @@ if(NOT VCPKG_TARGET_IS_OSX) endif() find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBP_DEBUG NAMES webpd webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBP_DEBUG NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(WEBPDEMUX_RELEASE NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPDEMUX_DEBUG NAMES webpdemuxd webpdemux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(WEBPMUX_RELEASE NAMES webpmux libwebpmux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPMUX_DEBUG NAMES webpmuxd webpmux libwebpmuxd libwebpmux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(WEBPDECODER_RELEASE NAMES webpdecoder libwebpdecoder PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(WEBPDECODER_DEBUG NAMES webpdecoder libwebpdecoder webpdecoderd libwebpdecoderd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBPDEMUX_DEBUG NAMES webpdemux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBPMUX_RELEASE NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(WEBPMUX_DEBUG NAMES webpmux PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(WEBPDECODER_RELEASE NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(WEBPDECODER_DEBUG NAMES webpdecoder PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) # Depends on opengl in default build but might depend on giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows) # which would require extra libraries to be linked e.g. giflib freeglut sdl1 other ones are already linked diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index da6422d1e77b50..208f381440cff2 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-imageformats", "version": "5.15.3", + "port-version": 1, "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index dc6881eecf5350..e7cf8d1557b8f1 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -98,9 +98,7 @@ replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz-icu" "harfbuzz-icu" "") replace_skia_dep(icu "/include" "icuuc,icuucd" "icuuc" "U_USING_ICU_NAMESPACE=0") replace_skia_dep(libjpeg-turbo "/include" "jpeg,jpegd;turbojpeg,turbojpegd" "jpeg;turbojpeg" "") replace_skia_dep(libpng "/include" "libpng16,libpng16d" "libpng16" "") -replace_skia_dep(libwebp "/include" - "webp,webpd;webpdemux,webpdemuxd;webpdecoder,webpdecoderd;libwebpmux,libwebpmuxd" - "webp;webpdemux;webpdecoder;libwebpmux" "") +replace_skia_dep(libwebp "/include" "webp;webpdemux;webpdecoder;webpmux" "webp;webpdemux;webpdecoder;webpmux" "") replace_skia_dep(zlib "/include" "z,zlib,zlibd" "z,zlib" "") set(OPTIONS "\ diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index d8991a23706f55..756ab79e83b255 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "skia", "version-date": "2020-05-18", - "port-version": 8, + "port-version": 9, "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index c8d53313f3ba21..dc8594f6efef2c 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -36,13 +36,14 @@ vcpkg_cmake_configure( -DBUILD_DOCS=OFF -DBUILD_CONTRIB=OFF -DBUILD_TESTS=OFF - -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only. -Dlibdeflate=OFF -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing. -Djpeg12=OFF -Dlerc=OFF -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only. ) vcpkg_cmake_install() diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 40b159093c6eb3..1acf30fad26f02 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -17,7 +17,7 @@ if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(@webp@) find_package(WebP CONFIG ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries WebP::WebP) - list(APPEND z_vcpkg_tiff_libraries ${WEBP_LIBRARIES}) + list(APPEND z_vcpkg_tiff_libraries ${WebP_LIBRARIES}) endif() if(@lzma@) find_package(LibLZMA ${z_vcpkg_tiff_find_options}) diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 59f4c26e80e629..dad2b88d5a967d 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiff", "version": "4.3.0", - "port-version": 6, + "port-version": 7, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 276409497a487b..cb140f1378b07a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4161,7 +4161,7 @@ "port-version": 1 }, "libwebp": { - "baseline": "1.2.1", + "baseline": "1.2.2", "port-version": 0 }, "libwebsockets": { @@ -5086,11 +5086,11 @@ }, "opencv3": { "baseline": "3.4.16", - "port-version": 5 + "port-version": 6 }, "opencv4": { "baseline": "4.5.5", - "port-version": 1 + "port-version": 2 }, "opendnp3": { "baseline": "3.1.1", @@ -5234,7 +5234,7 @@ }, "osgearth": { "baseline": "3.2", - "port-version": 4 + "port-version": 5 }, "osi": { "baseline": "0.108.6", @@ -5714,7 +5714,7 @@ }, "qt5-imageformats": { "baseline": "5.15.3", - "port-version": 0 + "port-version": 1 }, "qt5-location": { "baseline": "5.15.3", @@ -6514,7 +6514,7 @@ }, "skia": { "baseline": "2020-05-18", - "port-version": 8 + "port-version": 9 }, "skyr-url": { "baseline": "1.13.0", @@ -6934,7 +6934,7 @@ }, "tiff": { "baseline": "4.3.0", - "port-version": 6 + "port-version": 7 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 935958cc6a3e70..c41c58cbf92627 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf8ec989a234ddde96494e4e07d0ffd93df82151", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "ca5a8b2ed264617e8a35d22e1e6ac18ebe99900f", "version": "1.2.1", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index c767104acaea1e..0313cede660295 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65bade77414d264741d23ce93401c1bc08718e86", + "version": "3.4.16", + "port-version": 6 + }, { "git-tree": "55064c574fa80aef66dd85a330f669ba7ad402e9", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 63730e2feb0520..12e428e573fecb 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90f4418431aa3ddcdbd34c33d5e654cda5cda26a", + "version": "4.5.5", + "port-version": 2 + }, { "git-tree": "dcdd746ffc69d5f3234b67ee17fdd54966c8f5cb", "version": "4.5.5", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 80893cbe434fbe..ef767931f59e48 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80311fbaa014b84f8cdb3faa8abbdc16e01837d5", + "version": "3.2", + "port-version": 5 + }, { "git-tree": "99b20c5ff2821870694fdc973b7f44d4b54db2ba", "version": "3.2", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index d0446553918624..30012615502661 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6035880bd5e6bd0954d738de1bb2e2b79f66953c", + "version": "5.15.3", + "port-version": 1 + }, { "git-tree": "bdb4dae2e952e636c45967063bcb7c5dbb9cea65", "version": "5.15.3", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 168d625e74968f..7499ae3b7cd593 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf8cda1612a4770f3a01e35ae5da93654abc17d", + "version-date": "2020-05-18", + "port-version": 9 + }, { "git-tree": "104ba7c5e5e46398000e92e0f9cc3c9f0999e142", "version-date": "2020-05-18", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 8882dafc3c1329..f8d9cc569e70fd 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f05b5c8b426ce84fbc8930c8f935b792feeb1f4", + "version": "4.3.0", + "port-version": 7 + }, { "git-tree": "7d1677b9568234f05c4be9f04f321b9506884376", "version": "4.3.0", From 047278159cf23acc65fa39a3d1c94f299428d43a Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 14 Apr 2022 23:20:44 +0800 Subject: [PATCH 212/217] [ceres] update to v2.1.0 (#23838) * Update ceres to v2.1.0 * update * fix build issue * fix findpackage issue * update * update patch * Add feature 'CUDA' * update --- ports/ceres/0002_use_glog_target.patch | 8 +- .../0003_fix_exported_ceres_config.patch | 14 +-- ports/ceres/0004_fix_lib_path_linux.patch | 13 --- ports/ceres/find-package-required.patch | 102 +++++++++++++----- ports/ceres/portfile.cmake | 13 +-- ports/ceres/vcpkg.json | 11 +- versions/baseline.json | 4 +- versions/c-/ceres.json | 5 + 8 files changed, 110 insertions(+), 60 deletions(-) delete mode 100644 ports/ceres/0004_fix_lib_path_linux.patch diff --git a/ports/ceres/0002_use_glog_target.patch b/ports/ceres/0002_use_glog_target.patch index 5405ea53df2fb5..01ac27d4aa1575 100644 --- a/ports/ceres/0002_use_glog_target.patch +++ b/ports/ceres/0002_use_glog_target.patch @@ -1,11 +1,11 @@ diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt -index 3711222..8646bd0 100644 +index 0e33263..299b373 100644 --- a/internal/ceres/CMakeLists.txt +++ b/internal/ceres/CMakeLists.txt -@@ -174,17 +174,9 @@ endif (SCHUR_SPECIALIZATIONS) +@@ -101,17 +101,9 @@ endif() find_package(Threads QUIET) list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES Threads::Threads) - + -if (NOT MINIGLOG AND GLOG_FOUND) - list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GLOG_LIBRARIES}) - if (gflags_FOUND) @@ -21,5 +21,5 @@ index 3711222..8646bd0 100644 + list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES glog::glog) +endif (NOT MINIGLOG) - if (SUITESPARSE AND SUITESPARSE_FOUND) + if (SUITESPARSE AND SuiteSparse_FOUND) # Define version information for use in Solver::FullReport. diff --git a/ports/ceres/0003_fix_exported_ceres_config.patch b/ports/ceres/0003_fix_exported_ceres_config.patch index 332ef595284066..9505707da17908 100644 --- a/ports/ceres/0003_fix_exported_ceres_config.patch +++ b/ports/ceres/0003_fix_exported_ceres_config.patch @@ -1,9 +1,9 @@ diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in -index e5e2976..be1083a 100644 +index 4745483..b55462d 100644 --- a/cmake/CeresConfig.cmake.in +++ b/cmake/CeresConfig.cmake.in -@@ -213,55 +213,13 @@ else (EIGEN3_FOUND) - endif (EIGEN3_FOUND) +@@ -217,55 +217,14 @@ else (Eigen3_FOUND) + endif (Eigen3_FOUND) # glog (and maybe gflags). -# @@ -35,15 +35,15 @@ index e5e2976..be1083a 100644 - # Search quietly s/t we control the timing of the error message if not found. - find_package(Glog QUIET) - endif() -+include (CMakeFindDependencyMacro) -+find_dependency (glog NO_MODULE) - if (GLOG_FOUND) - ceres_message(STATUS "Found required Ceres dependency: glog") - else() - ceres_report_not_found("Missing required Ceres dependency: glog.") - endif() -- ++include (CMakeFindDependencyMacro) ++find_dependency (glog NO_MODULE) + - # gflags is only a public dependency of Ceres via glog, thus is not required - # if Ceres was built with MINIGLOG. - if (CERES_USES_GFLAGS) @@ -59,7 +59,7 @@ index e5e2976..be1083a 100644 -endif(CERES_USES_MINIGLOG) +# SuiteSparse +if (@SUITESPARSE@) -+ find_dependency(suitesparse CONFIG) ++ find_dependency(SuiteSparse CONFIG) +endif() # Import exported Ceres targets, if they have not already been imported. diff --git a/ports/ceres/0004_fix_lib_path_linux.patch b/ports/ceres/0004_fix_lib_path_linux.patch deleted file mode 100644 index e2c9c56b4ffba1..00000000000000 --- a/ports/ceres/0004_fix_lib_path_linux.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f24ce30..8e5759b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -192,7 +192,7 @@ endif() - # install native libraries to lib64 rather than lib. Most distros seem to - # follow this convention with a couple notable exceptions (Debian-based and - # Arch-based distros) which we try to detect here. --if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND -+if (0 AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND - NOT DEFINED LIB_SUFFIX AND - NOT CMAKE_CROSSCOMPILING AND - CMAKE_SIZEOF_VOID_P EQUAL "8" AND diff --git a/ports/ceres/find-package-required.patch b/ports/ceres/find-package-required.patch index aae9cccdd47aa3..07785dd137e521 100644 --- a/ports/ceres/find-package-required.patch +++ b/ports/ceres/find-package-required.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6a3d05..a78c027 100644 +index 2d241fe..b79454d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -245,7 +245,7 @@ if (EIGEN3_FOUND) - endif (EIGEN3_FOUND) +@@ -244,7 +244,7 @@ else (CUDA) + endif (CUDA) if (LAPACK) - find_package(LAPACK QUIET) @@ -11,48 +11,102 @@ index b6a3d05..a78c027 100644 if (LAPACK_FOUND) message("-- Found LAPACK library: ${LAPACK_LIBRARIES}") else (LAPACK_FOUND) -@@ -263,7 +263,7 @@ if (SUITESPARSE) +@@ -266,7 +266,8 @@ if (SUITESPARSE) # built with SuiteSparse support. # Check for SuiteSparse and dependencies. -- find_package(SuiteSparse) -+ find_package(SuiteSparse REQUIRED) - if (SUITESPARSE_FOUND) - # On Ubuntu the system install of SuiteSparse (v3.4.0) up to at least - # Ubuntu 13.10 cannot be used to link shared libraries. -@@ -300,7 +300,7 @@ endif (SUITESPARSE) +- find_package(SuiteSparse 4.0 COMPONENTS CHOLMOD SPQR) ++ find_package(suitesparse CONFIG REQUIRED) ++ set(SuiteSparse_FOUND 1) + if (SuiteSparse_FOUND) + set(SuiteSparse_DEPENDENCY "find_dependency(SuiteSparse ${SuiteSparse_VERSION})") + # By default, if all of SuiteSparse's dependencies are found, Ceres is +@@ -274,11 +275,11 @@ if (SUITESPARSE) + message("-- Found SuiteSparse ${SuiteSparse_VERSION}, " + "building with SuiteSparse.") + +- if (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR) ++ if (0) + install(FILES ${Ceres_SOURCE_DIR}/cmake/FindSuiteSparse.cmake + ${Ceres_SOURCE_DIR}/cmake/FindMETIS.cmake + DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) +- endif (SuiteSparse_NO_CMAKE OR NOT SuiteSparse_DIR) ++ endif () + else (SuiteSparse_FOUND) + # Disable use of SuiteSparse if it cannot be found and continue. + message("-- Did not find all SuiteSparse dependencies, disabling " +@@ -294,7 +295,7 @@ endif (SUITESPARSE) # CXSparse. if (CXSPARSE) # Don't search with REQUIRED as we can continue without CXSparse. - find_package(CXSparse) + find_package(CXSparse REQUIRED) - if (CXSPARSE_FOUND) + if (CXSparse_FOUND) + set(CXSparse_DEPENDENCY "find_dependency(CXSparse ${CXSparse_VERSION})") # By default, if CXSparse and all dependencies are found, Ceres is - # built with CXSparse support. -@@ -336,7 +336,7 @@ endif(NOT SUITESPARSE AND NOT CXSPARSE AND NOT EIGENSPARSE) +@@ -302,10 +303,10 @@ if (CXSPARSE) + message("-- Found CXSparse version: ${CXSparse_VERSION}, " + "building with CXSparse.") + +- if (CXSparse_NO_CMAKE OR NOT CXSparse_DIR) ++ if (0) + install(FILES ${Ceres_SOURCE_DIR}/cmake/FindCXSparse.cmake + DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) +- endif (CXSparse_NO_CMAKE OR NOT CXSparse_DIR) ++ endif () + else (CXSparse_FOUND) + # Disable use of CXSparse if it cannot be found and continue. + message("-- Did not find CXSparse, Building without CXSparse.") +@@ -367,9 +368,10 @@ endif() # GFlags. if (GFLAGS) # Don't search with REQUIRED as we can continue without gflags. - find_package(gflags 2.2.0) -+ find_package(gflags REQUIRED) ++ find_package(gflags CONFIG REQUIRED) if (gflags_FOUND) - if (TARGET gflags) +- if (TARGET gflags) ++ if (TARGET gflags::gflags) ++ add_library(gflags ALIAS gflags::gflags) message("-- Found Google Flags (gflags) version ${gflags_VERSION}: ${gflags_DIR}") -@@ -537,7 +537,7 @@ else (NOT OPENMP AND NOT TBB AND NOT CXX11_THREADS) - set_ceres_threading_model("${CERES_THREADING_MODEL}") + else() + message("-- Detected version of gflags: ${gflags_VERSION} does not define " +@@ -420,7 +422,7 @@ set_ceres_threading_model("${CERES_THREADING_MODEL}") if (BUILD_BENCHMARKS) -- find_package(benchmark QUIET) -+ find_package(benchmark REQUIRED) + # Version 1.3 was first to provide import targets +- find_package(benchmark 1.3 QUIET) ++ find_package(benchmark CONFIG REQUIRED) if (benchmark_FOUND) message("-- Found Google benchmark library. Building Ceres benchmarks.") else() -@@ -782,7 +782,7 @@ if (BUILD_DOCUMENTATION) - set(CERES_DOCS_INSTALL_DIR "share/doc/ceres" CACHE STRING - "Ceres docs install path relative to CMAKE_INSTALL_PREFIX") +@@ -611,7 +613,7 @@ create_ceres_config("${CERES_COMPILE_OPTIONS}" + add_subdirectory(internal/ceres) -- find_package(Sphinx QUIET) + if (BUILD_DOCUMENTATION) +- find_package(Sphinx) + find_package(Sphinx REQUIRED) if (NOT SPHINX_FOUND) - message("-- Failed to find Sphinx, disabling build of documentation.") + message("-- Failed to find Sphinx and/or its dependencies, disabling build of documentation.") update_cache_variable(BUILD_DOCUMENTATION OFF) +diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt +index 299b373..33d41d8 100644 +--- a/internal/ceres/CMakeLists.txt ++++ b/internal/ceres/CMakeLists.txt +@@ -108,14 +108,14 @@ endif (NOT MINIGLOG) + if (SUITESPARSE AND SuiteSparse_FOUND) + # Define version information for use in Solver::FullReport. + add_definitions(-DCERES_SUITESPARSE_VERSION="${SuiteSparse_VERSION}") +- list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::CHOLMOD +- SuiteSparse::SPQR) ++ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES SuiteSparse::cholmod ++ SuiteSparse::spqr) + endif (SUITESPARSE AND SuiteSparse_FOUND) + + if (CXSPARSE AND CXSparse_FOUND) + # Define version information for use in Solver::FullReport. + add_definitions(-DCERES_CXSPARSE_VERSION="${CXSparse_VERSION}") +- list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES CXSparse::CXSparse) ++ list(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES ${CXSparse_LIBRARIES}) + endif (CXSPARSE AND CXSparse_FOUND) + + if (ACCELERATESPARSE AND AccelerateSparse_FOUND) diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 498774cd5b7b08..a2bf71c932f79c 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -9,14 +9,13 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ceres-solver/ceres-solver - REF 2.0.0 - SHA512 6379666ef57af4ea85026644fa21365ce18fbaa12d50bd452bcdae0743a7b013effdd42c961e90c31815991bf315bd6904553dcc1a382ff5ed8c7abe9edf9a6c + REF f68321e7de8929fbcdb95dd42877531e64f72f66 #2.1.0 + SHA512 b482988d837187e348250122b1acacbb4fd6354709efa6335c0322a68234a38292c072499a886b69a30614f85c818d3d2e9eeb3d3d0ca17d8f013a38d9151207 HEAD_REF master PATCHES 0001_cmakelists_fixes.patch 0002_use_glog_target.patch 0003_fix_exported_ceres_config.patch - 0004_fix_lib_path_linux.patch find-package-required.patch ) @@ -25,6 +24,7 @@ file(REMOVE "${SOURCE_PATH}/cmake/FindGflags.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindGlog.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindEigen.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindSuiteSparse.cmake") +file(REMOVE "${SOURCE_PATH}/cmake/FindMETIS.cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -33,6 +33,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "lapack" LAPACK "eigensparse" EIGENSPARSE "tools" GFLAGS + "cuda" CUDA ) vcpkg_cmake_configure( @@ -51,11 +52,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_cmake_config_fixup(CONFIG_PATH CMake) -else() - vcpkg_cmake_config_fixup(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres") -endif() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib${LIB_SUFFIX}/cmake/Ceres") vcpkg_copy_pdbs() diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index 4194d3ecdfb09f..fec4414e7dffce 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ceres", - "version-semver": "2.0.0", - "port-version": 6, + "version": "2.1.0", "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", + "license": "Apache-2.0", "dependencies": [ "eigen3", "glog", @@ -17,6 +17,13 @@ } ], "features": { + "cuda": { + "description": "Build darknet with support for CUDA", + "supports": "linux | (!osx & !uwp & !(arm64 & windows))", + "dependencies": [ + "cuda" + ] + }, "cxsparse": { "description": "CXSparse support for Ceres", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index cb140f1378b07a..b60624c3f64852 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1305,8 +1305,8 @@ "port-version": 0 }, "ceres": { - "baseline": "2.0.0", - "port-version": 6 + "baseline": "2.1.0", + "port-version": 0 }, "cfitsio": { "baseline": "3.49", diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index 30107ef846e4c0..a2d10ae11a13b2 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3ebf81bee31323b13ad3353b6dbf9944b03abe3", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "af54888fc010404793ba51c862147575c09a988b", "version-semver": "2.0.0", From bb584d35bba70ca9f1ecaf09ad96ce5d1ff946f8 Mon Sep 17 00:00:00 2001 From: Jason Beverage Date: Thu, 14 Apr 2022 11:24:41 -0400 Subject: [PATCH 213/217] [osg] Added OPENGL_PROFILE option to osg port as a triplet variable. (#24108) * Updated osg port to be able to set the OPENGL_PROFILE setting via a triplet variable. * Format osg/ports/vcpkg.json * Added osg port version 12 --- ports/osg/portfile.cmake | 10 ++++++++++ ports/osg/usage | 4 ++++ ports/osg/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/o-/osg.json | 5 +++++ 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 ports/osg/usage diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 40744eee910cbe..d4cd4aaa5ac97c 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -74,6 +74,12 @@ if(VCPKG_TARGET_IS_WINDOWS) set(BUILD_OSG_PLUGIN_RESTHTTPDEVICE OFF) endif() +# The package osg can be configured to use different OpenGL profiles via a custom triplet file: +# Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3, and GLES2+GLES3 +if(NOT DEFINED osg_OPENGL_PROFILE) + set(osg_OPENGL_PROFILE "GL3") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} @@ -89,6 +95,7 @@ vcpkg_configure_cmake( -DBUILD_OSG_PLUGIN_SVG=OFF -DBUILD_OSG_PLUGIN_VNC=OFF -DBUILD_OSG_PLUGIN_LUA=OFF + -DOPENGL_PROFILE=${osg_OPENGL_PROFILE} -DBUILD_OSG_PLUGIN_RESTHTTPDEVICE=${BUILD_OSG_PLUGIN_RESTHTTPDEVICE} -DBUILD_OSG_PLUGIN_ZEROCONFDEVICE=OFF -DBUILD_DASHBOARD_REPORTS=OFF @@ -161,3 +168,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_fixup_pkgconfig() + +# Handle usage +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/osg/usage b/ports/osg/usage new file mode 100644 index 00000000000000..51e9c25a58b14c --- /dev/null +++ b/ports/osg/usage @@ -0,0 +1,4 @@ +The package osg can be configured to use different OpenGL profiles via a custom triplet file. +Possible values are GLCORE, GL2, GL3, GLES1, GLES2, GLES3 and GLES2+GLES3. +The default value is GL3. +set(osg_OPENGL_PROFILE GL2) diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 2d2d7f50a3ea57..1a939cdd3ac450 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", - "version-string": "3.6.5", - "port-version": 11, + "version": "3.6.5", + "port-version": 12, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://github.com/openscenegraph/OpenSceneGraph", "dependencies": [ @@ -13,6 +13,7 @@ "name": "fontconfig", "platform": "!windows" }, + "opengl-registry", { "name": "openimageio", "platform": "osx" diff --git a/versions/baseline.json b/versions/baseline.json index b60624c3f64852..6c4355e81da0de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5226,7 +5226,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 11 + "port-version": 12 }, "osg-qt": { "baseline": "Qt5", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 7f2fadfdebda8f..a90a66ae2681bb 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f438ec006b58ffd222b0f3bdce8d05b21611204e", + "version": "3.6.5", + "port-version": 12 + }, { "git-tree": "456c4454eee9f4a24916992b0870067f703ef374", "version-string": "3.6.5", From f95b78e0043eb80840670d0cfc7912263193654e Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Thu, 14 Apr 2022 11:25:29 -0400 Subject: [PATCH 214/217] [qpid-proton] Stop using linker optimization (#24129) * Stop using linker optimization These optimizations require the gold linker on Linux, and this linker is not typically available. * Add license * Fix formatting --- ports/qpid-proton/portfile.cmake | 7 ++++--- ports/qpid-proton/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/q-/qpid-proton.json | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 4df813a93a5e5a..7737f51118e3b9 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -15,11 +15,12 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPYTHON_EXECUTABLE=${PYTHON3} - -DLIB_SUFFIX= -DBUILD_GO=no - -DENABLE_JSONCPP=ON -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON + -DENABLE_JSONCPP=ON + -DENABLE_LINKTIME_OPTIMIZATION=OFF + -DLIB_SUFFIX= + -DPYTHON_EXECUTABLE=${PYTHON3} ) vcpkg_cmake_install() diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index 3dd0dcff0496f9..5ff4eabf32a598 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,9 +1,10 @@ { "name": "qpid-proton", "version": "0.32.0", - "port-version": 4, + "port-version": 5, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", + "license": "Apache-2.0", "dependencies": [ "jsoncpp", { diff --git a/versions/baseline.json b/versions/baseline.json index 6c4355e81da0de..8d3a9a8efd4285 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5646,7 +5646,7 @@ }, "qpid-proton": { "baseline": "0.32.0", - "port-version": 4 + "port-version": 5 }, "qscintilla": { "baseline": "2.12.0", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index f96fe6984196f7..d4e5f16a975451 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc437ca04548b4ca544af845a2e2327010aa3281", + "version": "0.32.0", + "port-version": 5 + }, { "git-tree": "be327f08d64834a36d80a140832abbbc66e67207", "version": "0.32.0", From 1200c2237ddacd228a1f0f4ae65436bca66c6f73 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Thu, 14 Apr 2022 21:06:18 +0300 Subject: [PATCH 215/217] [clipboardxx] Add new port (#24023) * [clipboardcxx] Add new port * Run x-add-version * license * Update clipboardcxx.json * Add homepage * update version * Update ports/clipboardcxx/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update and rename ports/clipboardcxx/portfile.cmake to ports/clipboardxx/portfile.cmake * Rename ports/clipboardcxx/vcpkg.json to ports/clipboardxx/vcpkg.json * Rename clipboardcxx.json to clipboardxx.json * Update baseline.json * Update portfile.cmake * Update vcpkg.json * Update clipboardxx.json * . * Update clipboardxx.json * Nicole CRs - add `supports: !osx` - add `unofficial-clipboardxx-config.cmake` Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: nicole mazzuca --- ports/clipboardxx/portfile.cmake | 24 +++++++++++++++++++ .../unofficial-clipboardxx-config.cmake.in | 19 +++++++++++++++ ports/clipboardxx/vcpkg.json | 18 ++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/clipboardxx.json | 9 +++++++ 5 files changed, 74 insertions(+) create mode 100644 ports/clipboardxx/portfile.cmake create mode 100644 ports/clipboardxx/unofficial-clipboardxx-config.cmake.in create mode 100644 ports/clipboardxx/vcpkg.json create mode 100644 versions/c-/clipboardxx.json diff --git a/ports/clipboardxx/portfile.cmake b/ports/clipboardxx/portfile.cmake new file mode 100644 index 00000000000000..fa06e40cf4c0ec --- /dev/null +++ b/ports/clipboardxx/portfile.cmake @@ -0,0 +1,24 @@ +# Download the code from GitHub +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Arian8j2/ClipboardXX + REF d404c39ba384f8e16555610b3633cd7b58d84c59 + SHA512 503bc78cd9fd6096fa92524973d19cbc9169fca91450837a2af7f1518eb928dce10c01e446de1ab76ae0dc366b26831df403f021118fe5c3c2eaeb4d752f638f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/unofficial-clipboardxx-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/unofficial-clipboardxx/unofficial-clipboardxx-config.cmake" + @ONLY +) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in b/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in new file mode 100644 index 00000000000000..80e258e85dfdf8 --- /dev/null +++ b/ports/clipboardxx/unofficial-clipboardxx-config.cmake.in @@ -0,0 +1,19 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +add_library(unofficial::ClipboardXX INTERFACE IMPORTED) +set_target_properties(unofficial::ClipboardXX PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${PACKAGE_PREFIX_DIR}/include" +) + +if("@VCPKG_TARGET_IS_LINUX@") + set_target_properties(unofficial::ClipboardXX PROPERTIES + INTERFACE_LINK_LIBRARIES "xcb;pthread" + ) +endif() + +unset(_IMPORT_PREFIX) diff --git a/ports/clipboardxx/vcpkg.json b/ports/clipboardxx/vcpkg.json new file mode 100644 index 00000000000000..d274c9070a70be --- /dev/null +++ b/ports/clipboardxx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "clipboardxx", + "version-date": "2022-02-04", + "description": "Header only, lightweight and cross platform C++ library for copy and paste text from clipboard.", + "homepage": "https://github.com/Arian8j2/ClipboardXX", + "license": "MIT", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8d3a9a8efd4285..71fe5e64ccfdfc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1420,6 +1420,10 @@ "baseline": "1.5.0", "port-version": 0 }, + "clipboardxx": { + "baseline": "2022-02-04", + "port-version": 0 + }, "clipp": { "baseline": "2019-04-30", "port-version": 1 diff --git a/versions/c-/clipboardxx.json b/versions/c-/clipboardxx.json new file mode 100644 index 00000000000000..56ebcd2ea89129 --- /dev/null +++ b/versions/c-/clipboardxx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "081dccf5f7ac08990ef5814f6e2b99d1c2d9a385", + "version-date": "2022-02-04", + "port-version": 0 + } + ] +} From 5afd32266c257e8cdd8e1c272bdf8964e37dd501 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 14 Apr 2022 20:08:23 +0200 Subject: [PATCH 216/217] [qtinterfaceframework|opencv] fix python stuff (#24041) * add upstream patch * [skip actions] add the patch file * fine tune * [opencv] update portfiles to use vcpkg-get-python-packages * fix references * try another fix * add all deps * add code from tensorflow about venv * retry * fix file path * new approach * unset pythonhome * next unset * try this instead. * retry without the PYTHON_LIB_PATH stuff * try and error * next try * retry * typo fix * try updating * retry * more try and error * reorder * drop qface version * use qface 2.0.5 * bump watchdog * fix call on !windows * fine tuning * refactor function signature * update version * fix formating * version stuff * create dir before usage * fine tuning * version stuff * update and patch libilbc * formating stuff * fix version-string * version stuff * add license * version update * bump version * version stuff * version stuff Co-authored-by: Alexander Neumann Co-authored-by: Stefano Sinigardi --- ports/libilbc/absl.patch | 39 +++++ ports/libilbc/portfile.cmake | 30 ++-- ports/libilbc/vcpkg.json | 13 +- ports/mesa/portfile.cmake | 8 +- ports/mesa/vcpkg.json | 2 +- ports/opencv2/portfile.cmake | 48 +----- ports/opencv2/vcpkg.json | 8 +- ports/opencv3/portfile.cmake | 48 +----- ports/opencv3/vcpkg.json | 8 +- ports/opencv4/portfile.cmake | 46 +----- ports/opencv4/vcpkg.json | 6 +- ports/qtinterfaceframework/49b44d4.diff | 148 ++++++++++++++++++ ports/qtinterfaceframework/portfile.cmake | 66 +------- .../requirements_minimal.txt | 14 ++ ports/qtinterfaceframework/vcpkg.json | 8 +- .../vcpkg-get-python-packages/portfile.cmake | 3 + .../vcpkg-get-python-packages/python310._pth | 7 + ports/vcpkg-get-python-packages/vcpkg.json | 2 +- .../x_vcpkg_get_python_packages.cmake | 114 +++++++++++--- scripts/ci.baseline.txt | 3 - versions/baseline.json | 16 +- versions/l-/libilbc.json | 5 + versions/m-/mesa.json | 5 + versions/o-/opencv2.json | 5 + versions/o-/opencv3.json | 5 + versions/o-/opencv4.json | 5 + versions/q-/qtinterfaceframework.json | 5 + versions/v-/vcpkg-get-python-packages.json | 5 + 28 files changed, 407 insertions(+), 265 deletions(-) create mode 100644 ports/libilbc/absl.patch create mode 100644 ports/qtinterfaceframework/49b44d4.diff create mode 100644 ports/qtinterfaceframework/requirements_minimal.txt create mode 100644 ports/vcpkg-get-python-packages/python310._pth diff --git a/ports/libilbc/absl.patch b/ports/libilbc/absl.patch new file mode 100644 index 00000000000000..3a41c222b93ad7 --- /dev/null +++ b/ports/libilbc/absl.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 016b46d37..4caa88fce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,14 +50,12 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + + set(CMAKE_CXX_STANDARD 14) + +-if((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR +- (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")) ++if(0) + set(CMAKE_C_FLAGS "-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -fno-strict-aliasing") + set(CMAKE_C_FLAGS_DEBUG "-g") + set(CMAKE_C_FLAGS_RELEASE "-O2") + endif() +-if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR +- (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")) ++if(0) + set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2") +@@ -146,7 +144,8 @@ endif() + ## Configure input files + ############################################################################# + +-include_directories(. abseil-cpp ${CMAKE_CURRENT_BINARY_DIR}) ++find_package(absl REQUIRED) ++include_directories(. ${CMAKE_CURRENT_BINARY_DIR}) + + set(ilbc_source_files + modules/audio_coding/codecs/ilbc/abs_quant.c +@@ -310,6 +310,7 @@ add_library(ilbc ${ilbc_source_files}) + generate_export_header(ilbc) + set_target_properties(ilbc PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 3) + set_target_properties(ilbc PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++target_link_libraries(ilbc PRIVATE absl::core_headers) + + add_executable(ilbc_test modules/audio_coding/codecs/ilbc/test/iLBC_test.c) + target_link_libraries(ilbc_test ilbc) diff --git a/ports/libilbc/portfile.cmake b/ports/libilbc/portfile.cmake index c833ebd6ff5e89..d72ff632eb11ad 100644 --- a/ports/libilbc/portfile.cmake +++ b/ports/libilbc/portfile.cmake @@ -1,33 +1,29 @@ -set(ILBC_VERSION 3.0.3) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/TimothyGu/libilbc/releases/download/v${ILBC_VERSION}/libilbc-${ILBC_VERSION}.zip" - FILENAME "libilbc-${ILBC_VERSION}.zip" - SHA512 a5755db093529f6a3fd8fd47da63b57cffff1d3babef443d92f7c5a250ce8d1585adfba525c4037b142d9f00f1675a5054c172bf936be280dfcc22ed553c94c6 -) - -vcpkg_extract_source_archive_ex( +set(ILBC_VERSION 3.0.4) +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${ILBC_VERSION} - PATCHES do-not-build-ilbc_test.patch + REPO TimothyGu/libilbc + REF cd064edf2c6c104a4e1fd87b34fd24cfa6dbe401 + SHA512 323d32dbd54d5ef624940432bf19c29f5ead6f40bc84aba4261f067dfdc40cf4000e383f4dca65cd3b745a354a119a9e515949a1466af89c300cd7bf95991675 + PATCHES + do-not-build-ilbc_test.patch + absl.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_INSTALL_DOCDIR=share/${PORT} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ilbc_export.h "#ifdef ILBC_STATIC_DEFINE" "#if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ilbc_export.h" "#ifdef ILBC_STATIC_DEFINE" "#if 1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libilbc/vcpkg.json b/ports/libilbc/vcpkg.json index 96daeb881fb1ca..b3e0347b891342 100644 --- a/ports/libilbc/vcpkg.json +++ b/ports/libilbc/vcpkg.json @@ -1,8 +1,15 @@ { "name": "libilbc", - "version-string": "3.0.3", - "port-version": 1, + "version": "3.0.4", "description": "Open source implementation of the Internet Low Bit Rate Codec (iLBC) / RFC 3951 codec from the WebRTC project.", "homepage": "https://github.com/TimothyGu/libilbc", - "supports": "!(arm & uwp)" + "license": "BSD-3-Clause", + "supports": "!(arm & uwp)", + "dependencies": [ + "abseil", + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 5fa919888dacef..e11491af8046d9 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -30,13 +30,9 @@ vcpkg_from_gitlab( HEAD_REF master PATCHES ${PATCHES} ) -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -vcpkg_add_to_path("${PYTHON3_DIR}") -vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") -set(ENV{PYTHON} "${PYTHON3}") -x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${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 ) diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 8643b1e8823539..a3456cdc9fa77b 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mesa", "version": "21.2.5", - "port-version": 3, + "port-version": 4, "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/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index 9ef2ccc97cc6dd..7558f1268a8363 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -64,53 +64,9 @@ endif() set(WITH_PYTHON OFF) if("python" IN_LIST FEATURES) - set(WITH_PYTHON ON) - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) - vcpkg_add_to_path("${PYTHON2_DIR}") - vcpkg_add_to_path("${PYTHON2_DIR}/Scripts") + x_vcpkg_get_python_packages(PYTHON_VERSION "2" PACKAGES numpy OUT_PYTHON_VAR "PYTHON2") set(ENV{PYTHON} "${PYTHON2}") - - function(vcpkg_get_python_package PYTHON_DIR ) - cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") - - if(NOT _vgpp_PYTHON_EXECUTABLE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") - endif() - if(NOT _vgpp_PACKAGES) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") - endif() - if(NOT _vgpp_PYTHON_DIR) - get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) - endif() - - if (WIN32) - set(PYTHON_OPTION "") - else() - set(PYTHON_OPTION "--user") - endif() - - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() - else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() - endif() - endfunction() - vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON2}" PACKAGES numpy) + set(WITH_PYTHON ON) endif() vcpkg_cmake_configure( diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index 77040ac4f49274..92e7087f7ea3ca 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,8 +1,8 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 11, - "description": "computer vision library", + "port-version": 12, + "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", "supports": "!uwp", @@ -15,6 +15,10 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, "zlib" ], "default-features": [ diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index cae0675f60d770..e3e2a37a209192 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -113,53 +113,9 @@ endif() set(WITH_PYTHON OFF) if("python" IN_LIST FEATURES) - set(WITH_PYTHON ON) - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") + x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES numpy OUT_PYTHON_VAR "PYTHON3") set(ENV{PYTHON} "${PYTHON3}") - - function(vcpkg_get_python_package PYTHON_DIR ) - cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") - - if(NOT _vgpp_PYTHON_EXECUTABLE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") - endif() - if(NOT _vgpp_PACKAGES) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") - endif() - if(NOT _vgpp_PYTHON_DIR) - get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) - endif() - - if (WIN32) - set(PYTHON_OPTION "") - else() - set(PYTHON_OPTION "--user") - endif() - - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() - else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() - endif() - endfunction() - vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) + set(WITH_PYTHON ON) endif() if("dnn" IN_LIST FEATURES) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 3acd535726dbdb..da0b06c0498e98 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,8 +1,8 @@ { "name": "opencv3", "version": "3.4.16", - "port-version": 6, - "description": "computer vision library", + "port-version": 7, + "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", "dependencies": [ @@ -14,6 +14,10 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, "zlib" ], "default-features": [ diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 6681d667698d2f..c3ef67463da5bf 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -138,52 +138,8 @@ if("python" IN_LIST FEATURES) if (VCPKG_LIBRARY_LINKAGE STREQUAL static AND VCPKG_TARGET_IS_WINDOWS) message(WARNING "The python module is currently unsupported on Windows when building static OpenCV libraries") else() - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - vcpkg_add_to_path("${PYTHON3_DIR}/Scripts") + x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES numpy OUT_PYTHON_VAR "PYTHON3") set(ENV{PYTHON} "${PYTHON3}") - - function(vcpkg_get_python_package PYTHON_DIR ) - cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") - - if(NOT _vgpp_PYTHON_EXECUTABLE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") - endif() - if(NOT _vgpp_PACKAGES) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") - endif() - if(NOT _vgpp_PYTHON_DIR) - get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) - endif() - - if (WIN32) - set(PYTHON_OPTION "") - else() - set(PYTHON_OPTION "--user") - endif() - - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() - else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() - endif() - endfunction() - vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES numpy) set(BUILD_opencv_python3 ON) set(WITH_PYTHON ON) endif() diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index e485574e7e44ef..fef9910c84c81a 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.5", - "port-version": 2, + "port-version": 3, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -14,6 +14,10 @@ "name": "vcpkg-cmake-config", "host": true }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, "zlib" ], "default-features": [ diff --git a/ports/qtinterfaceframework/49b44d4.diff b/ports/qtinterfaceframework/49b44d4.diff new file mode 100644 index 00000000000000..6bff7b7ae8779d --- /dev/null +++ b/ports/qtinterfaceframework/49b44d4.diff @@ -0,0 +1,148 @@ +From 49b44d45c9eb5b5b98697f9ebb74204d45f0db38 Mon Sep 17 00:00:00 2001 +From: Dominik Holland +Date: Wed, 06 Apr 2022 15:43:23 +0200 +Subject: [PATCH] ifcodegen: Add a fallback mechanism for too recent python packages + +After the virtualenv is created the generator is now verified to be +working correctly. In case the generator doesn't work, an error +message is shown, which suggests to reconfigure with + +-DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE + +The new option will install the minimum required dependencies for +qface. + +Fixes: QTBUG-102348 +Pick-to: 6.2 6.3 +Change-Id: I59aca5848da8928e94c0d33a108735847d9260a2 +--- + +diff --git a/src/tools/ifcodegen/CMakeLists.txt b/src/tools/ifcodegen/CMakeLists.txt +index 2d9e3a4..317d77f 100644 +--- a/src/tools/ifcodegen/CMakeLists.txt ++++ b/src/tools/ifcodegen/CMakeLists.txt +@@ -22,11 +22,13 @@ + if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") + set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/Scripts/activate.bat) + set(VIRTUALENV_ACTIVATE_COMMAND ${VIRTUALENV_ACTIVATE}) ++ set(VIRTUALENV_PYTHON ${VIRTUALENV_PATH}/Scripts/python.exe) + set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/Scripts/qface.exe) + set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.bat) + else() + set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/bin/activate) + set(VIRTUALENV_ACTIVATE_COMMAND . ${VIRTUALENV_ACTIVATE}) ++ set(VIRTUALENV_PYTHON ${VIRTUALENV_PATH}/bin/python) + set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/bin/qface) + set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.sh) + endif() +@@ -63,6 +65,15 @@ + # someone is working on the qface sources + file(GLOB_RECURSE IFCODEGEN_SOURCE_FILES ${IFCODEGEN_SOURCE_DIR}/*.py) + ++ # If the upstream python packages introduce a regression this option can be used to install ++ # the minimum version for all required python package and produce a working setup ++ # Those packages might be outdated and may contain security holes, but they are known to be ++ # working. ++ set(INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND) ++ if (QT_USE_MINIMAL_QFACE_PACKAGES) ++ set(INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND COMMAND pip3 install -r ${IFCODEGEN_SOURCE_DIR}/requirements_minimal.txt) ++ endif() ++ + # On the CI we use the special wheel folder when available to not download all packages again on each build + set(PYTHON3_WHEEL_CACHE "$ENV{PYTHON3_WHEEL_CACHE}" CACHE PATH "Python3 wheel cache") + if (EXISTS "${PYTHON3_WHEEL_CACHE}") +@@ -74,6 +85,7 @@ + + add_custom_command(OUTPUT ${IFCODEGEN_BIN} + COMMAND ${VIRTUALENV_ACTIVATE_COMMAND} ++ ${INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND} + COMMAND ${PIP3_INSTALL_COMMAND} + DEPENDS ${VIRTUALENV_ACTIVATE} + ${IFCODEGEN_SOURCE_DIR}/requirements.txt +@@ -82,16 +94,23 @@ + ) + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv +- ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun + COMMAND ${DEPLOY_VIRTUALENV} qtif_qface_virtualenv + COMMAND ${CMAKE_COMMAND} -E touch .stamp-deploy_virtualenv +- COMMAND ${CMAKE_COMMAND} -E touch .stamp-cmake-rerun + DEPENDS ${IFCODEGEN_BIN} + ) + ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified ++ ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun ++ COMMAND ${VIRTUALENV_PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/verify_generator.py ++ COMMAND ${CMAKE_COMMAND} -E touch .stamp-generator-verified ++ COMMAND ${CMAKE_COMMAND} -E touch .stamp-cmake-rerun ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv ++ COMMENT "Verifying generator" ++ ) ++ + # main target which just relies on the stamp file to be uptodate + add_custom_target(ifcodegen ALL +- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun + ) + # Create the rerun cmake stamp file here to be able to add cmake configure dependency +@@ -109,6 +128,7 @@ + ##################################################################### + + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified + ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv + ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun + ${VIRTUALENV_PATH} +diff --git a/src/tools/ifcodegen/verify_generator.py b/src/tools/ifcodegen/verify_generator.py +new file mode 100755 +index 0000000..c3f85d6 +--- /dev/null ++++ b/src/tools/ifcodegen/verify_generator.py +@@ -0,0 +1,46 @@ ++#!/usr/bin/env python3 ++############################################################################# ++## ++## Copyright (C) 2022 The Qt Company Ltd. ++## Contact: https://www.qt.io/licensing/ ++## ++## This file is part of the QtInterfaceFramework module of the Qt Toolkit. ++## ++## $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++## Commercial License Usage ++## Licensees holding valid commercial Qt licenses may use this file in ++## accordance with the commercial license agreement provided with the ++## Software or, alternatively, in accordance with the terms contained in ++## a written agreement between you and The Qt Company. For licensing terms ++## and conditions see https://www.qt.io/terms-conditions. For further ++## information use the contact form at https://www.qt.io/contact-us. ++## ++## GNU General Public License Usage ++## Alternatively, this file may be used under the terms of the GNU ++## General Public License version 3 as published by the Free Software ++## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++## included in the packaging of this file. Please review the following ++## information to ensure the GNU General Public License requirements will ++## be met: https://www.gnu.org/licenses/gpl-3.0.html. ++## ++## $QT_END_LICENSE$ ++## ++############################################################################# ++ ++try: ++ import generate ++except Exception as e: ++ raise SystemExit(""" ++ Verifying the generator failed! ++ ++ This might be caused by a too recent python version or ++ too recent python packages. You can try installing older ++ python packages by running configure again with the the ++ following option: ++ ++ -DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE ++ ++ The python error was: ++ ++ {} ++ """.format(e)) diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index ff9ca6ccbbf032..f788ab7254ef67 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -1,59 +1,8 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -function(vcpkg_get_python_package PYTHON_DIR ) # From mesa - cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES") - - if(NOT _vgpp_PYTHON_EXECUTABLE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!") - endif() - if(NOT _vgpp_PACKAGES) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!") - endif() - if(NOT _vgpp_PYTHON_DIR) - get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY) - endif() - - if (WIN32) - set(PYTHON_OPTION "") - else() - set(PYTHON_OPTION "--user") - endif() - - if("${_vgpp_PYTHON_DIR}" MATCHES "${DOWNLOADS}") # inside vcpkg - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") - if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a - HEAD_REF master - ) - execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION}) - endif() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION}) - endforeach() - else() - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}) - endforeach() - endif() - if(NOT VCPKG_TARGET_IS_WINDOWS) - execute_process(COMMAND pip3 install ${_vgpp_PACKAGES}) - endif() - else() # outside vcpkg - foreach(_package IN LISTS _vgpp_PACKAGES) - execute_process(COMMAND ${_vgpp_PYTHON_EXECUTABLE} -c "import ${_package}" RESULT_VARIABLE HAS_ERROR) - if(HAS_ERROR) - message(FATAL_ERROR "Python package '${_package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${_vgpp_PACKAGES}") - endif() - endforeach() - endif() -endfunction() - -set(${PORT}_PATCHES fix-taglib-search.patch) # Strictly this is only required if qt does not use pkg-config since it forces it to off. +set(${PORT}_PATCHES fix-taglib-search.patch # Strictly this is only required if qt does not use pkg-config since it forces it to off. + 49b44d4.diff) set(TOOL_NAMES ifmedia-simulation-server ifvehiclefunctions-simulation-server @@ -69,11 +18,11 @@ if(_qis_DISABLE_NINJA) endif() vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY ) -vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}") -vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}/Scripts") -vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES virtualenv qface) + +x_vcpkg_get_python_packages(PYTHON_VERSION "3" + REQUIREMENTS_FILE "${CURRENT_PORT_DIR}/requirements_minimal.txt" + PACKAGES qface==2.0.5 + OUT_PYTHON_VAR "PYTHON3") if(VCPKG_CROSSCOMPILING) list(APPEND FEATURE_OPTIONS "-DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET}") @@ -84,6 +33,7 @@ set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) qt_cmake_configure(${_opt} OPTIONS ${FEATURE_OPTIONS} "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. + "-DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE" OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) diff --git a/ports/qtinterfaceframework/requirements_minimal.txt b/ports/qtinterfaceframework/requirements_minimal.txt new file mode 100644 index 00000000000000..ee569fbdd8ef99 --- /dev/null +++ b/ports/qtinterfaceframework/requirements_minimal.txt @@ -0,0 +1,14 @@ +antlr4-python3-runtime==4.7.1 +argh==0.26.2 +click==6.7 +coloredlogs==10.0 +humanfriendly==4.15.1 +Jinja2==2.10.3 +MarkupSafe==1.1 +path.py==11.0.1 +pathtools==0.1.2 +PyYAML==5.1 +six==1.11.0 +watchdog==2.1.7 +pytest==5.3.5 +pytest-cov==2.8.1 \ No newline at end of file diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index 302b085e3fe795..f37d90bc5b54fa 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtinterfaceframework", "version": "6.2.4", + "port-version": 1, "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, @@ -30,6 +31,11 @@ "name": "qttools", "default-features": false }, - "taglib" + "taglib", + { + "name": "vcpkg-get-python-packages", + "host": true, + "default-features": false + } ] } diff --git a/ports/vcpkg-get-python-packages/portfile.cmake b/ports/vcpkg-get-python-packages/portfile.cmake index 7df06a5bc67337..7935b09b423c2a 100644 --- a/ports/vcpkg-get-python-packages/portfile.cmake +++ b/ports/vcpkg-get-python-packages/portfile.cmake @@ -2,6 +2,9 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/copyright" "${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake" + "${CMAKE_CURRENT_LIST_DIR}/python310._pth" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +include("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/vcpkg-get-python-packages/python310._pth b/ports/vcpkg-get-python-packages/python310._pth new file mode 100644 index 00000000000000..f53ed18de1a0a4 --- /dev/null +++ b/ports/vcpkg-get-python-packages/python310._pth @@ -0,0 +1,7 @@ +python310.zip +Lib +Lib/site-packages +. + +# Uncomment to run site.main() automatically +#import site diff --git a/ports/vcpkg-get-python-packages/vcpkg.json b/ports/vcpkg-get-python-packages/vcpkg.json index 36e86bb1b330b2..3ef203b06fe660 100644 --- a/ports/vcpkg-get-python-packages/vcpkg.json +++ b/ports/vcpkg-get-python-packages/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-get-python-packages", - "version-date": "2022-02-12", + "version-date": "2022-04-11", "license": "MIT", "supports": "native" } diff --git a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake index c13019651e6a41..4df1ebd8008bb2 100644 --- a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake +++ b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake @@ -7,64 +7,128 @@ Retrieve needed python packages ## Usage ```cmake x_vcpkg_get_python_packages( + [PYTHON_VERSION (2|3)] PYTHON_EXECUTABLE + REQUIREMENTS_FILE PACKAGES ... + [OUT_PYTHON_VAR somevar] ) ``` ## Parameters +### PYTHON_VERSION +Python version to be used. Either 2 or 3 + ### PYTHON_EXECUTABLE Full path to the python executable +### REQUIREMENTS_FILE +Requirement file with the list of python packages + ### PACKAGES List of python packages to acquire +### OUT_PYTHON_VAR +Variable to store the path to the python binary inside the virtual environment + + #]===] include_guard(GLOBAL) function(x_vcpkg_get_python_packages) - cmake_parse_arguments(PARSE_ARGV 0 arg "" "PYTHON_EXECUTABLE" "PACKAGES") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "PYTHON_VERSION;PYTHON_EXECUTABLE;REQUIREMENTS_FILE;OUT_PYTHON_VAR" "PACKAGES") - if(NOT DEFINED arg_PYTHON_EXECUTABLE) - message(FATAL_ERROR "PYTHON_EXECUTABLE must be specified.") + if(DEFINED arg_PYTHON_VERSION AND NOT DEFINED arg_PYTHON_EXECUTABLE) + vcpkg_find_acquire_program(PYTHON${arg_PYTHON_VERSION}) + set(arg_PYTHON_EXECUTABLE "${PYTHON${arg_PYTHON_VERSION}}") endif() - if(NOT DEFINED arg_PACKAGES) - message(FATAL_ERROR "PACKAGES must be specified.") + + if(NOT DEFINED arg_PYTHON_EXECUTABLE AND NOT DEFINED arg_PYTHON_VERSION) + message(FATAL_ERROR "PYTHON_EXECUTABLE or PYTHON_VERSION must be specified.") + elseif(NOT DEFINED arg_PYTHON_VERSION) + if(arg_PYTHON_EXECUTABLE MATCHES "(python3|python-3)") + set(arg_PYTHON_VERSION 3) + else() + set(arg_PYTHON_VERSION 2) + endif() + endif() + + if(NOT DEFINED arg_OUT_PYTHON_VAR) + set(arg_OUT_PYTHON_VAR "PYTHON${arg_PYTHON_VERSION}") + endif() + + if(NOT DEFINED arg_PACKAGES AND NOT DEFINED arg_REQUIREMENTS_FILE) + message(FATAL_ERROR "PACKAGES or REQUIREMENTS_FILE must be specified.") endif() if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() get_filename_component(python_dir "${arg_PYTHON_EXECUTABLE}" DIRECTORY) - + set(ENV{PYTHONNOUSERSITE} "1") if("${python_dir}" MATCHES "(${DOWNLOADS}|${CURRENT_HOST_INSTALLED_DIR})" AND CMAKE_HOST_WIN32) # inside vcpkg and windows host. + #if(NOT EXISTS "${python_dir}/python310._pth" AND PYTHON_EXECUTABLE MATCHES "python3") + # file(COPY "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-get-python-packages/python310._pth" DESTINATION "${python_dir}") + #endif() if(NOT EXISTS "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") if(NOT EXISTS "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") vcpkg_from_github( OUT_SOURCE_PATH PYFILE_PATH REPO pypa/get-pip - REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25 - SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a + REF 38e54e5de07c66e875c11a1ebbdb938854625dd8 #2022-03-07 + SHA512 431a9f66618a2f251db3a8c3311e7fc3af3ff7364ec1d14a99f1b9c237646b6146cef8b9471d83e1086dba2ed448bccc48d99b2bb375e4235d78e76d9970d3e5 ) - vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}") + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/public/get-pip.py" --no-warn-script-location + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "get-pip-${TARGET_TRIPLET}") endif() - foreach(_package IN LISTS arg_PACKAGES) - vcpkg_execute_required_process(COMMAND "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}") - endforeach() + vcpkg_execute_required_process(COMMAND "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install virtualenv --no-warn-script-location + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "pip-install-virtualenv-${TARGET_TRIPLET}") else() - foreach(_package IN LISTS arg_PACKAGES) - vcpkg_execute_required_process(COMMAND "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}") - endforeach() + vcpkg_execute_required_process(COMMAND "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" virtualenv --no-warn-script-location #${_package} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "easy-install-virtualenv-${TARGET_TRIPLET}") endif() - else() # outside vcpkg - foreach(package IN LISTS arg_PACKAGES) - vcpkg_execute_in_download_mode(COMMAND ${arg_PYTHON_EXECUTABLE} -c "import ${package}" RESULT_VARIABLE HAS_ERROR) - if(HAS_ERROR) - message(FATAL_ERROR "Python package '${package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${arg_PACKAGES}") - endif() - endforeach() endif() + set(venv_path "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv") + file(REMOVE_RECURSE "${venv_path}") # Remove old venv + file(MAKE_DIRECTORY "${venv_path}") + if(CMAKE_HOST_WIN32) + file(MAKE_DIRECTORY "${python_dir}/DLLs") + set(python_sub_path /Scripts) + set(python_venv virtualenv) + file(COPY "${python_dir}/python310.zip" DESTINATION "${venv_path}/Scripts") + set(python_venv_options "--app-data" "${venv_path}/data") + else() + set(python_sub_path /bin) + set(python_venv venv) + set(python_venv_options --symlinks) + endif() + + set(ENV{PYTHONNOUSERSITE} "1") + message(STATUS "Setting up python virtual environmnent...") + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -m "${python_venv}" ${python_venv_options} "${venv_path}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "venv-setup-${TARGET_TRIPLET}") + vcpkg_add_to_path(PREPEND "${venv_path}${python_sub_path}") + set(${arg_OUT_PYTHON_VAR} "${venv_path}${python_sub_path}/python${VCPKG_HOST_EXECUTABLE_SUFFIX}") + set(ENV{VIRTUAL_ENV} "${venv_path}") + unset(ENV{PYTHONHOME}) + unset(ENV{PYTHONPATH}) + if(DEFINED arg_REQUIREMENTS_FILE) + message(STATUS "Installing requirements from: ${arg_REQUIREMENTS_FILE}") + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install -r ${arg_REQUIREMENTS_FILE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "pip-install-requirements-file-${TARGET_TRIPLET}") + endif() + if(DEFINED arg_PACKAGES) + message(STATUS "Installing python packages: ${arg_PACKAGES}") + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install ${arg_PACKAGES} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "pip-install-packages-${TARGET_TRIPLET}") + endif() + message(STATUS "Setting up python virtual environmnent...finished.") + set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" PARENT_SCOPE) + set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" CACHE PATH "" FORCE) endfunction() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d9d0e40b38a866..164b254ab53e1c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1011,9 +1011,6 @@ qt5-base:arm64-windows=fail # qtwebengine:x64-windows has an ICE in VS2022 qtwebengine:x64-windows=fail -# upstream bug, see https://github.com/microsoft/vcpkg/issues/23766 -qtinterfaceframework:x64-windows=skip - # Skip deprecated Qt module # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) qt5-canvas3d:x64-linux=skip diff --git a/versions/baseline.json b/versions/baseline.json index 71fe5e64ccfdfc..1790fdd1a8f382 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3669,8 +3669,8 @@ "port-version": 1 }, "libilbc": { - "baseline": "3.0.3", - "port-version": 1 + "baseline": "3.0.4", + "port-version": 0 }, "libimobiledevice": { "baseline": "1.3.17", @@ -4454,7 +4454,7 @@ }, "mesa": { "baseline": "21.2.5", - "port-version": 3 + "port-version": 4 }, "meschach": { "baseline": "1.2b", @@ -5086,15 +5086,15 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 11 + "port-version": 12 }, "opencv3": { "baseline": "3.4.16", - "port-version": 6 + "port-version": 7 }, "opencv4": { "baseline": "4.5.5", - "port-version": 2 + "port-version": 3 }, "opendnp3": { "baseline": "3.1.1", @@ -5890,7 +5890,7 @@ }, "qtinterfaceframework": { "baseline": "6.2.4", - "port-version": 0 + "port-version": 1 }, "qtkeychain": { "baseline": "0.13.2", @@ -7305,7 +7305,7 @@ "port-version": 0 }, "vcpkg-get-python-packages": { - "baseline": "2022-02-12", + "baseline": "2022-04-11", "port-version": 0 }, "vcpkg-gfortran": { diff --git a/versions/l-/libilbc.json b/versions/l-/libilbc.json index 03cd54d4b4242b..986350f449b9ab 100644 --- a/versions/l-/libilbc.json +++ b/versions/l-/libilbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f12ae842a06b6f2d77a889d6279dc997bbd61d0b", + "version": "3.0.4", + "port-version": 0 + }, { "git-tree": "2c86ad893279ccf359e6ee1b22ff5e2e3a935a42", "version-string": "3.0.3", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index 37187a0e383f88..418d136588c168 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32925250dd7d2e060ca2cfe9fbda1d3f4312f29a", + "version": "21.2.5", + "port-version": 4 + }, { "git-tree": "aa75375f1cc9c3c4697c8fa8df4e647fb60f0125", "version": "21.2.5", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index 601e9b465e299c..eca3f369840406 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65f3aff976c42b2759e70867fa006287ff1be835", + "version": "2.4.13.7", + "port-version": 12 + }, { "git-tree": "d90ae2125e2fa18011bd9defe7a651d110113b76", "version": "2.4.13.7", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 0313cede660295..a780c1554bc279 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3c28cb4da2e7da9d31cc72415aff26f0b4d8442", + "version": "3.4.16", + "port-version": 7 + }, { "git-tree": "65bade77414d264741d23ce93401c1bc08718e86", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 12e428e573fecb..67e87467ffbbde 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0771f6243ddde63a9b212efeb5ad51a74b640a62", + "version": "4.5.5", + "port-version": 3 + }, { "git-tree": "90f4418431aa3ddcdbd34c33d5e654cda5cda26a", "version": "4.5.5", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 33909a951c90ff..85cffb73d9b536 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4969db9a78db8b04d4d803e4494a9f98007396a", + "version": "6.2.4", + "port-version": 1 + }, { "git-tree": "e36f5d74c2e94aa38c74b0fdfec8778fb7851523", "version": "6.2.4", diff --git a/versions/v-/vcpkg-get-python-packages.json b/versions/v-/vcpkg-get-python-packages.json index 6101d3fc2eccad..a95148d645a625 100644 --- a/versions/v-/vcpkg-get-python-packages.json +++ b/versions/v-/vcpkg-get-python-packages.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f03d459d365b604decb720f7da79b3f7d7127670", + "version-date": "2022-04-11", + "port-version": 0 + }, { "git-tree": "e429a4c957711115ea1b795327843acb05fc8b29", "version-date": "2022-02-12", From 5d66a98f64188bbd806b8e62e66c097d90eb3224 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:28:56 -0700 Subject: [PATCH 217/217] [qtinterfaceframework] update python requirements versions (#24150) This will make dependabot happy, and maybe fix issues for our users Co-authored-by: nicole mazzuca --- ports/qtinterfaceframework/requirements_minimal.txt | 6 +++--- ports/qtinterfaceframework/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qtinterfaceframework.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/qtinterfaceframework/requirements_minimal.txt b/ports/qtinterfaceframework/requirements_minimal.txt index ee569fbdd8ef99..3c62c19eed833d 100644 --- a/ports/qtinterfaceframework/requirements_minimal.txt +++ b/ports/qtinterfaceframework/requirements_minimal.txt @@ -3,12 +3,12 @@ argh==0.26.2 click==6.7 coloredlogs==10.0 humanfriendly==4.15.1 -Jinja2==2.10.3 +Jinja2==2.11.3 MarkupSafe==1.1 path.py==11.0.1 pathtools==0.1.2 -PyYAML==5.1 +PyYAML==5.4 six==1.11.0 watchdog==2.1.7 pytest==5.3.5 -pytest-cov==2.8.1 \ No newline at end of file +pytest-cov==2.8.1 diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index f37d90bc5b54fa..4d084f33e1c472 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtinterfaceframework", "version": "6.2.4", - "port-version": 1, + "port-version": 2, "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 1790fdd1a8f382..dc7d7dda60fe02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5890,7 +5890,7 @@ }, "qtinterfaceframework": { "baseline": "6.2.4", - "port-version": 1 + "port-version": 2 }, "qtkeychain": { "baseline": "0.13.2", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 85cffb73d9b536..06e2dea89a9d67 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b54a54283fd7e3a5929b1d67721675ee1c8d5234", + "version": "6.2.4", + "port-version": 2 + }, { "git-tree": "e4969db9a78db8b04d4d803e4494a9f98007396a", "version": "6.2.4",