From 5259261be1bc771035f55f4bb98a60bc9112d6b2 Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Sat, 12 Jun 2021 10:43:10 -0400 Subject: [PATCH 001/141] [json-link] package exists --- ports/json-link/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/json-link/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/j-/json-link.json | 9 +++++++++ 4 files changed, 58 insertions(+) create mode 100644 ports/json-link/portfile.cmake create mode 100644 ports/json-link/vcpkg.json create mode 100644 versions/j-/json-link.json diff --git a/ports/json-link/portfile.cmake b/ports/json-link/portfile.cmake new file mode 100644 index 00000000000000..2a21c12fcc9a4f --- /dev/null +++ b/ports/json-link/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/daw_json_link + REF v2.9.5 + SHA512 cc4581fe93455e5ecf72cabbcc54a580f5fae733aa1cacbf6feb83cf75a8cf0b1d6565aa386fbb537207fc87eabe5a4b4e3b535cdecbbef2d49329eda7866fad + HEAD_REF release +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DDAW_ENABLE_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/daw_header_libraries DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/daw_utf_range) +vcpkg_cmake_config_fixup(CONFIG_PATH share/json_link/cmake$) +vcpkg_cmake_config_fixup(CONFIG_PATH share/json_link/cmake) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug + ${CURRENT_PACKAGES_DIR}/lib + ${CURRENT_PACKAGES_DIR}/share/json_link +) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/json-link/vcpkg.json b/ports/json-link/vcpkg.json new file mode 100644 index 00000000000000..cfab3cdf9ffadf --- /dev/null +++ b/ports/json-link/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "json-link", + "version-semver": "2.9.5", + "description": "JSON serialize-deserialize fast, modern, low CPU, with compile-time data contracts.", + "homepage": "https://github.com/beached/daw_json_link", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8c59d3e7dd1741..b4e95df769a177 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2772,6 +2772,10 @@ "baseline": "0.2.12", "port-version": 0 }, + "json-link": { + "baseline": "2.9.5", + "port-version": 0 + }, "json-schema-validator": { "baseline": "2.1.0", "port-version": 0 diff --git a/versions/j-/json-link.json b/versions/j-/json-link.json new file mode 100644 index 00000000000000..046b6e2f9ad62d --- /dev/null +++ b/versions/j-/json-link.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "92e0e77fb68cbf1915b2f9b696a612241f92731a", + "version-semver": "2.9.5", + "port-version": 0 + } + ] +} From 9b386546deeaac67a2fcfb6ec9201fd6fbd9fe32 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 15 Jun 2021 01:03:02 +0200 Subject: [PATCH 002/141] [vcpkg-tools] update nuget to 5.9.1 (#18447) --- scripts/vcpkgTools.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 746ae92f95e7f3..16f6f27fb0dc36 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -88,22 +88,22 @@ f477842d0cebefcd6bf9c6d536ab8ea20ec5b0aa967ee963ab6a101aeff9df8742ca600d35f39e2e7158d76d8231f1ed2bef6104dce84d2bf8d6b07d17d706a1 - 5.5.1 + 5.9.1 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.5.1/nuget.exe - 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619 + https://dist.nuget.org/win-x86-commandline/v5.9.1/nuget.exe + d7acca2b1271bfd3d6f7c7088bceee7a5a5e860d38c05a159f59b1f4bf935e963fde183a769db944df8f6dd44177bb91942578c86eef204cffa119d3d68e97fc - 5.5.1 + 5.9.1 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.5.1/nuget.exe - 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619 + https://dist.nuget.org/win-x86-commandline/v5.9.1/nuget.exe + d7acca2b1271bfd3d6f7c7088bceee7a5a5e860d38c05a159f59b1f4bf935e963fde183a769db944df8f6dd44177bb91942578c86eef204cffa119d3d68e97fc - 5.5.1 + 5.9.1 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.5.1/nuget.exe - 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619 + https://dist.nuget.org/win-x86-commandline/v5.9.1/nuget.exe + d7acca2b1271bfd3d6f7c7088bceee7a5a5e860d38c05a159f59b1f4bf935e963fde183a769db944df8f6dd44177bb91942578c86eef204cffa119d3d68e97fc 3.1.81 From a6067ec0532dfdfcec1f82dc20e5ecd4980b7270 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 16 Jun 2021 01:14:40 +0800 Subject: [PATCH 003/141] [vcpkg_download_distfile] Add condition for padding the SHA (#18459) --- docs/examples/packaging-github-repos.md | 2 +- scripts/cmake/vcpkg_download_distfile.cmake | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/examples/packaging-github-repos.md b/docs/examples/packaging-github-repos.md index 4d9f7e11a67b49..3a0e81c2f93a46 100644 --- a/docs/examples/packaging-github-repos.md +++ b/docs/examples/packaging-github-repos.md @@ -27,7 +27,7 @@ vcpkg_from_github( ) ``` -The important parts to update are `REPO` for the GitHub repository path, `REF` for a stable tag/commit to use, and `SHA512` with the checksum of the downloaded zipfile (you can get this easily by setting it to `1`, trying to install the package, and copying the checksum). +The important parts to update are `REPO` for the GitHub repository path, `REF` for a stable tag/commit to use, and `SHA512` with the checksum of the downloaded zipfile (you can get this easily by setting it to `0`, trying to install the package, and copying the checksum). Finally, we configure the project with CMake, install the package, and copy over the license file: diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 1b06d7b5ba1824..c859c98a017dcd 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -80,12 +80,14 @@ function(vcpkg_download_distfile VAR) message(FATAL_ERROR "vcpkg_download_distfile must not be passed both SHA512 and SKIP_SHA512.") endif() endif() - if(vcpkg_download_distfile_SHA512 STREQUAL "0") - string(REPEAT "0" 128 vcpkg_download_distfile_SHA512) - endif() - string(LENGTH "${vcpkg_download_distfile_SHA512}" vcpkg_download_distfile_SHA512_length) - if(NOT vcpkg_download_distfile_SHA512_length EQUAL "128") - message(FATAL_ERROR "Invalid SHA512: ${vcpkg_download_distfile_SHA512}. If you do not know the file's SHA512, set this to \"0\".") + if(NOT vcpkg_download_distfile_SKIP_SHA512) + if(vcpkg_download_distfile_SHA512 STREQUAL "0") + string(REPEAT "0" 128 vcpkg_download_distfile_SHA512) + endif() + string(LENGTH "${vcpkg_download_distfile_SHA512}" vcpkg_download_distfile_SHA512_length) + if(NOT vcpkg_download_distfile_SHA512_length EQUAL "128") + message(FATAL_ERROR "Invalid SHA512: ${vcpkg_download_distfile_SHA512}. If you do not know the file's SHA512, set this to \"0\".") + endif() endif() set(downloaded_file_path ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME}) From 1723d9011ff76b80fedff2aa649b6c9bfb52421e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 15 Jun 2021 19:25:49 +0200 Subject: [PATCH 004/141] [open6254] Enable uwp support (#18390) * open62541: Enable uwp support * Update versions for open62541 --- ports/open62541/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/o-/open62541.json | 5 +++++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index 5e0841e7c72ead..0dcbcb81b3c6de 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,10 +1,9 @@ { "name": "open62541", "version": "1.1.2", - "port-version": 1, + "port-version": 2, "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", - "supports": "!uwp", "default-features": [ "openssl" ], diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 04ecc3cbe37221..0e9115309a4272 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1106,8 +1106,6 @@ ois:x64-uwp=fail # /usr/bin/ld: cannot find -lode ompl:x64-osx=fail ompl:x64-linux=fail -open62541:arm-uwp=fail -open62541:x64-uwp=fail openal-soft:arm-uwp=fail openal-soft:x64-uwp=fail openblas:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index b4e95df769a177..5e6c1b056870ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4486,7 +4486,7 @@ }, "open62541": { "baseline": "1.1.2", - "port-version": 1 + "port-version": 2 }, "openal-soft": { "baseline": "1.21.1", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index a24c7cee80d693..f91b9f9b34cfd8 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98a37e8146a1e56f67a180b3c239f903ed59c401", + "version": "1.1.2", + "port-version": 2 + }, { "git-tree": "43c958ba9799820838fdf2332020ef83cacc4595", "version": "1.1.2", From 1af0e45724876eac02cb7164d12065b66c3bb3be Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 16 Jun 2021 01:27:52 +0800 Subject: [PATCH 005/141] [aubio] Add ws2_32 to linkage (#18385) * [aubio] Add ws2_32 to linkage * Update version files --- ports/aubio/CMakeLists.txt | 5 +++++ ports/aubio/portfile.cmake | 8 ++++---- ports/aubio/vcpkg.json | 2 +- versions/a-/aubio.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt index 1b59d4d8a86a45..e352acb34ba278 100644 --- a/ports/aubio/CMakeLists.txt +++ b/ports/aubio/CMakeLists.txt @@ -55,6 +55,10 @@ if(WITH_DEPENDENCIES) ) endif() +if(WIN32) + target_link_libraries(aubio PUBLIC ws2_32) +endif() + if(BUILD_TOOLS AND WITH_DEPENDENCIES) set(EXAMPLE_EXECS aubiomfcc aubionotes aubioonset aubiopitch aubioquiet aubiotrack) foreach(EXAMPLE_EXEC ${EXAMPLE_EXECS}) @@ -62,6 +66,7 @@ if(BUILD_TOOLS AND WITH_DEPENDENCIES) target_link_libraries(${EXAMPLE_EXEC} PRIVATE aubio) if(WIN32) target_compile_definitions(${EXAMPLE_EXEC} PRIVATE -DHAVE_WIN_HACKS=1) + target_link_libraries(${EXAMPLE_EXEC} PUBLIC ws2_32) else() target_compile_definitions(${EXAMPLE_EXEC} PRIVATE -DHAVE_UNISTD_H=1) endif() diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index c1cab537949f84..4cb7f7f6c9b423 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -12,7 +12,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tools WITH_DEPENDENCIES + tools WITH_DEPENDENCIES ) vcpkg_configure_cmake( @@ -35,8 +35,8 @@ file(COPY ${SOURCE_PATH}/ChangeLog ${SOURCE_PATH}/README.md DESTINATION - ${CURRENT_PACKAGES_DIR}/share/aubio) + ${CURRENT_PACKAGES_DIR}/share/${PORT}) vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/aubio) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/aubio/COPYING ${CURRENT_PACKAGES_DIR}/share/aubio/copyright) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index ac34c872d6f30a..bb9e7eda597023 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "aubio", "version-semver": "0.4.9", - "port-version": 5, + "port-version": 6, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", "default-features": [ diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index 7e9810d14fec59..488d8b81fe795e 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0abf18908332cd2ccfe8e298f8fd90c0db42dcd9", + "version-semver": "0.4.9", + "port-version": 6 + }, { "git-tree": "229c53eddabe48fa718f95c3dd3094a694770a19", "version-semver": "0.4.9", diff --git a/versions/baseline.json b/versions/baseline.json index 5e6c1b056870ac..9070a5f955d39e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -206,7 +206,7 @@ }, "aubio": { "baseline": "0.4.9", - "port-version": 5 + "port-version": 6 }, "audiofile": { "baseline": "1.0.7", From f1679ebe4e1027b75d87ca134dc6a205d55df10e Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 16 Jun 2021 01:31:05 +0800 Subject: [PATCH 006/141] [devil] Fix ilut header (#18384) * [devil Fix ilut header * Update baseline --- ports/devil/0006-fix-ilut-header.patch | 12 ++++++ ports/devil/CONTROL | 31 --------------- ports/devil/portfile.cmake | 1 + ports/devil/vcpkg.json | 53 ++++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/d-/devil.json | 5 +++ 6 files changed, 72 insertions(+), 32 deletions(-) create mode 100644 ports/devil/0006-fix-ilut-header.patch delete mode 100644 ports/devil/CONTROL create mode 100644 ports/devil/vcpkg.json diff --git a/ports/devil/0006-fix-ilut-header.patch b/ports/devil/0006-fix-ilut-header.patch new file mode 100644 index 00000000000000..5af04e897def2e --- /dev/null +++ b/ports/devil/0006-fix-ilut-header.patch @@ -0,0 +1,12 @@ +diff --git a/DevIL/src-ILUT/CMakeLists.txt b/DevIL/src-ILUT/CMakeLists.txt +index 398d3c1..617c8d8 100644 +--- a/DevIL/src-ILUT/CMakeLists.txt ++++ b/DevIL/src-ILUT/CMakeLists.txt +@@ -77,6 +77,7 @@ install (TARGETS ILUT + RUNTIME DESTINATION bin + ) + install (FILES ../include/IL/ilut.h DESTINATION include/IL) ++install (FILES ../include/IL/ilut_config.h DESTINATION include/IL) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/ILUT.pc diff --git a/ports/devil/CONTROL b/ports/devil/CONTROL deleted file mode 100644 index 980c91e1b0e7a7..00000000000000 --- a/ports/devil/CONTROL +++ /dev/null @@ -1,31 +0,0 @@ -Source: devil -Version: 1.8.0 -Port-Version: 7 -Build-Depends: -Homepage: https://github.com/DentonW/DevIL -Description: A full featured cross-platform image library -Default-Features: libpng, tiff, libjpeg, openexr, jasper, lcms - -Feature: libpng -Build-Depends: libpng -Description: Use Libpng for .png (and some .ico) - -Feature: tiff -Build-Depends: tiff -Description: Use Libtiff for .tif support - -Feature: libjpeg -Build-Depends: libjpeg-turbo -Description: Use Libjpeg for .jpg (and some .blp) support - -Feature: openexr -Build-Depends: openexr -Description: Use openexr - -Feature: jasper -Build-Depends: jasper -Description: Use JasPer for .jp2 (and some .icns) support - -Feature: lcms -Build-Depends: lcms -Description: Use Little CMS for color profiles diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index 36a5dfccd0fe44..bb5d4357bb015d 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( enable-static.patch 0004_compatible-jasper-2-0-20.patch 0005-fix-pkgconfig.patch + 0006-fix-ilut-header.patch ) file(REMOVE ${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake) diff --git a/ports/devil/vcpkg.json b/ports/devil/vcpkg.json new file mode 100644 index 00000000000000..2d716cbe65147b --- /dev/null +++ b/ports/devil/vcpkg.json @@ -0,0 +1,53 @@ +{ + "name": "devil", + "version": "1.8.0", + "port-version": 8, + "description": "A full featured cross-platform image library", + "homepage": "https://github.com/DentonW/DevIL", + "default-features": [ + "jasper", + "lcms", + "libjpeg", + "libpng", + "openexr", + "tiff" + ], + "features": { + "jasper": { + "description": "Use JasPer for .jp2 (and some .icns) support", + "dependencies": [ + "jasper" + ] + }, + "lcms": { + "description": "Use Little CMS for color profiles", + "dependencies": [ + "lcms" + ] + }, + "libjpeg": { + "description": "Use Libjpeg for .jpg (and some .blp) support", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "libpng": { + "description": "Use Libpng for .png (and some .ico)", + "dependencies": [ + "libpng" + ] + }, + "openexr": { + "description": " Use openexr", + "dependencies": [ + "openexr" + ] + }, + "tiff": { + "description": "Use Libtiff for .tif support", + "dependencies": [ + "tiff" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 9070a5f955d39e..5583e242c1ff1b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1654,7 +1654,7 @@ }, "devil": { "baseline": "1.8.0", - "port-version": 7 + "port-version": 8 }, "dimcli": { "baseline": "5.0.2", diff --git a/versions/d-/devil.json b/versions/d-/devil.json index 9a2d82abe679d1..49de7f317c4a3b 100644 --- a/versions/d-/devil.json +++ b/versions/d-/devil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28588e0e08e57404b35e35ce1d2a69322a2ee6b8", + "version": "1.8.0", + "port-version": 8 + }, { "git-tree": "d3e52a6334ec5ccb93fba69e531ab4979b827522", "version-string": "1.8.0", From 0fd86ab4f1fc00671a8998b3b08ebb951b093e16 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 15 Jun 2021 19:33:31 +0200 Subject: [PATCH 007/141] [libpq] Add Secur32.lib and openssl to libpq cmake wrapper (#18377) * [libpq] add secur32.lib to wrapper * version stuff * add openssl fix. * fix version stuff --- ports/libpq/vcpkg-cmake-wrapper.cmake | 18 ++++++++++++++++++ ports/libpq/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ports/libpq/vcpkg-cmake-wrapper.cmake b/ports/libpq/vcpkg-cmake-wrapper.cmake index 4226cf674afeef..200b10d48957a1 100644 --- a/ports/libpq/vcpkg-cmake-wrapper.cmake +++ b/ports/libpq/vcpkg-cmake-wrapper.cmake @@ -45,4 +45,22 @@ if(PostgreSQL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") list(APPEND PostgreSQL_LIBRARIES ${PostgreSQL_${LIB_ITEM}_LIBRARY}) endif() endforeach() + if(WIN32) + if(TARGET PostgreSQL::PostgreSQL) + set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Secur32.lib") + endif() + list(APPEND PostgreSQL_LIBRARIES Secur32.lib) + endif() + cmake_policy(PUSH) + cmake_policy(SET CMP0057 NEW) + set(Z_VCPKG_PORT_FEATURES "@FEATURES@") + if("openssl" IN_LIST Z_VCPKG_PORT_FEATURES) + find_package(OpenSSL REQUIRED) + if(TARGET PostgreSQL::PostgreSQL) + set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "OpenSSL::SSL") + endif() + list(APPEND PostgreSQL_LIBRARIES OpenSSL::SSL) + endif() + unset(Z_VCPKG_PORT_FEATURES) + cmake_policy(POP) endif() diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 0b1e5f772aa3cf..a96a1f8b5eb523 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "12.2", - "port-version": 16, + "port-version": 17, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 5583e242c1ff1b..7696146343fb4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3458,7 +3458,7 @@ }, "libpq": { "baseline": "12.2", - "port-version": 16 + "port-version": 17 }, "libpqxx": { "baseline": "7.3.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index 76ef61a9e18646..cc0946d6362ce8 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01e2ad37b9df46e45826e52a6cddfb95ca137abd", + "version": "12.2", + "port-version": 17 + }, { "git-tree": "7c75f4ea669ee37e510cb5d7ea0e39b0a7d3f6cb", "version": "12.2", From 53f90f0993ab3dbe421c000642d3d5d2b3d24bc2 Mon Sep 17 00:00:00 2001 From: Michael Goulding Date: Tue, 15 Jun 2021 11:46:16 -0700 Subject: [PATCH 008/141] [ryml] [c4core] Update RapidYaml (ryml) to newer version (#18230) * remove old port version * fix versions yet again Co-authored-by: Michael Goulding --- ports/c4core/CONTROL | 5 ----- ports/c4core/portfile.cmake | 41 ++++++++++++++++++++++++++----------- ports/c4core/vcpkg.json | 7 +++++++ ports/ryml/CONTROL | 6 ------ ports/ryml/cmake-fix.patch | 6 ------ ports/ryml/portfile.cmake | 10 ++++----- ports/ryml/vcpkg.json | 13 ++++++++++++ versions/baseline.json | 4 ++-- versions/c-/c4core.json | 5 +++++ versions/r-/ryml.json | 5 +++++ 10 files changed, 66 insertions(+), 36 deletions(-) delete mode 100644 ports/c4core/CONTROL create mode 100644 ports/c4core/vcpkg.json delete mode 100644 ports/ryml/CONTROL create mode 100644 ports/ryml/vcpkg.json diff --git a/ports/c4core/CONTROL b/ports/c4core/CONTROL deleted file mode 100644 index 62eed51ddd71df..00000000000000 --- a/ports/c4core/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: c4core -Version: 2020-04-12 -Homepage: https://github.com/biojppm/c4core -Description: Library of low-level C++ utilities -Supports: !(arm|arm64|osx) \ No newline at end of file diff --git a/ports/c4core/portfile.cmake b/ports/c4core/portfile.cmake index 2b764af9d5c6c6..3f5d7ad8fe85f4 100644 --- a/ports/c4core/portfile.cmake +++ b/ports/c4core/portfile.cmake @@ -9,18 +9,18 @@ vcpkg_fail_port_install( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO biojppm/c4core - REF bc4de0291bb96ae509ee99a54f139563cf14638e - SHA512 2c0c4511cb43f34492b6d0d8dfef90623dfacb6ae43f6a6173fbf9efa63f7a018235ec9dcd9a211a3cd393c2114adb39a4276df94e2d23f9c354d644a36e51a0 + REF 2413e420fca270c20dfb7a962979d44e0d4c0337 + SHA512 2b5877941a5a4bdac625d7c54fc2f0e54eea3ab0d7487d314fde29abf441fcd70ed60598b9c8614c2993a7152a508b9ab9b7b234a777d138d5142e1a9df4c023 HEAD_REF master ) -set(COMMIT_HASH a0f0c17bfc9a9a91cc72891539b513c129c6d122) +set(CM_COMMIT_HASH 71c211187b8c52a13d5c59a7979f2ccf8429e350) # Get cmake scripts for c4core vcpkg_download_distfile(CMAKE_ARCHIVE - URLS "https://github.com/biojppm/cmake/archive/${COMMIT_HASH}.zip" - FILENAME "cmake-${COMMIT_HASH}.zip" - SHA512 4fbc711f3120501fa40733c3b66e34cd6a7e1b598b1378fbb59d1a87c88290a03d021f5176634089da41682fd918d7e27c6c146052dec54d7e956be15f12744f + URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip" + FILENAME "cmake-${CM_COMMIT_HASH}.zip" + SHA512 d15884d985a477df47ead9c5c486cfdeb1df8b6de4f308c36bd7a8c0e901fb876980a2a4f239abd8ecb1fb0baf75ad559ca0780b50c84070762f8cbfe55cb9d2 ) vcpkg_extract_source_archive_ex( @@ -32,11 +32,11 @@ vcpkg_extract_source_archive_ex( file(REMOVE_RECURSE "${SOURCE_PATH}/cmake") file(RENAME ${SOURCE_PATH_CMAKE} "${SOURCE_PATH}/cmake") -set(COMMIT_HASH 78e525c6e74df6d62d782864a52c0d279dcee24f) +set(DB_COMMIT_HASH 78e525c6e74df6d62d782864a52c0d279dcee24f) vcpkg_download_distfile(DEBUGBREAK_ARCHIVE - URLS "https://github.com/biojppm/debugbreak/archive/${COMMIT_HASH}.zip" - FILENAME "debugbreak-${COMMIT_HASH}.zip" + URLS "https://github.com/biojppm/debugbreak/archive/${DB_COMMIT_HASH}.zip" + FILENAME "debugbreak-${DB_COMMIT_HASH}.zip" SHA512 25f3d45b09ce362f736fac0f6d6a6c7f2053fec4975b32b0565288893e4658fd0648a7988c3a5fe0e373e92705d7a3970eaa7cfc053f375ffb75e80772d0df64 ) @@ -46,8 +46,25 @@ vcpkg_extract_source_archive_ex( WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" ) -file(REMOVE_RECURSE "${SOURCE_PATH}/ext/debugbreak") -file(RENAME ${SOURCE_PATH_DEBUGBREAK} "${SOURCE_PATH}/ext/debugbreak") +file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/debugbreak") +file(RENAME ${SOURCE_PATH_DEBUGBREAK} "${SOURCE_PATH}/src/c4/ext/debugbreak") + +set(FF_COMMIT_HASH 3377facde283d36fa3bd29080f46fb0589b74bd3) + +vcpkg_download_distfile(FAST_FLOAT_ARCHIVE + URLS "https://github.com/biojppm/fast_float/archive/${FF_COMMIT_HASH}.zip" + FILENAME "fast_float-${FF_COMMIT_HASH}.zip" + SHA512 e2a7b869e422113b099f2ab95e42de8aed3b13f961fdc84583a908159936fdad00990ce664bc0c2491b7ca49e3323e17fb08f2208b2ceb577015c7d89cc4d785 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH_FAST_FLOAT + ARCHIVE ${FAST_FLOAT_ARCHIVE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps" +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/fast_float") +file(RENAME ${SOURCE_PATH_FAST_FLOAT} "${SOURCE_PATH}/src/c4/ext/fast_float") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -76,4 +93,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/c4core" RENAME copyright) + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/c4core/vcpkg.json b/ports/c4core/vcpkg.json new file mode 100644 index 00000000000000..90b36aa170fc9a --- /dev/null +++ b/ports/c4core/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "c4core", + "version-date": "2021-01-14", + "description": "Library of low-level C++ utilities", + "homepage": "https://github.com/biojppm/c4core", + "supports": "!(arm | arm64 | osx)" +} diff --git a/ports/ryml/CONTROL b/ports/ryml/CONTROL deleted file mode 100644 index b6efa45ff353d3..00000000000000 --- a/ports/ryml/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: ryml -Version: 2020-04-12 -Homepage: https://github.com/biojppm/rapidyaml -Description: Rapid YAML library -Build-Depends: c4core[core] -Supports: !(arm|arm64|osx) \ No newline at end of file diff --git a/ports/ryml/cmake-fix.patch b/ports/ryml/cmake-fix.patch index f2ee817036e6b2..e8a01c5a641a73 100644 --- a/ports/ryml/cmake-fix.patch +++ b/ports/ryml/cmake-fix.patch @@ -2,12 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e4eb23..115b8aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,4 +1,5 @@ - cmake_minimum_required(VERSION 3.9) -+ - project(ryml) - - include(./ext/c4core/cmake/c4Project.cmake) @@ -19,8 +20,7 @@ option(RYML_BUILD_API "Enable API generation (python, etc)" OFF) #------------------------------------------------------- diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake index ed7953f2e50943..e5af447b1e8867 100644 --- a/ports/ryml/portfile.cmake +++ b/ports/ryml/portfile.cmake @@ -9,19 +9,19 @@ vcpkg_fail_port_install( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO biojppm/rapidyaml - REF ec23e87007ccc39c6132345c154b267de9381706 - SHA512 7d349c0dd58da814dad02de88a5c54394ef8d77e7db3014fb5fb684d519e35604d45f5d16db5ed6ed8ccb52b1ed4a4dbc91e717a091b54b04dc18901800e12c1 + REF db387345abf9cd6710e0c4a487a476bfd176fea3 + SHA512 4dda145b561e3b8420f89ad01e42eb5056b51a8a28a47f3b8c91bb0a2a6420d1842016a23cbb17d9f119ebce0e2e404b4f4fb67d71bf0d3c87aa81f346c6cfe2 HEAD_REF master PATCHES cmake-fix.patch ) -set(COMMIT_HASH a0f0c17bfc9a9a91cc72891539b513c129c6d122) +set(COMMIT_HASH 71c211187b8c52a13d5c59a7979f2ccf8429e350) # Get cmake scripts for rapidyaml vcpkg_download_distfile(CMAKE_ARCHIVE URLS "https://github.com/biojppm/cmake/archive/${COMMIT_HASH}.zip" FILENAME "cmake-${COMMIT_HASH}.zip" - SHA512 4fbc711f3120501fa40733c3b66e34cd6a7e1b598b1378fbb59d1a87c88290a03d021f5176634089da41682fd918d7e27c6c146052dec54d7e956be15f12744f + SHA512 d15884d985a477df47ead9c5c486cfdeb1df8b6de4f308c36bd7a8c0e901fb876980a2a4f239abd8ecb1fb0baf75ad559ca0780b50c84070762f8cbfe55cb9d2 ) vcpkg_extract_source_archive_ex( @@ -67,4 +67,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/ryml" RENAME copyright) + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json new file mode 100644 index 00000000000000..dba2751fa99310 --- /dev/null +++ b/ports/ryml/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "ryml", + "version-date": "2021-05-27", + "description": "Rapid YAML library", + "homepage": "https://github.com/biojppm/rapidyaml", + "supports": "!(arm | arm64 | osx)", + "dependencies": [ + { + "name": "c4core", + "default-features": false + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7696146343fb4f..67a1d9a9cd7508 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1097,7 +1097,7 @@ "port-version": 1 }, "c4core": { - "baseline": "2020-04-12", + "baseline": "2021-01-14", "port-version": 0 }, "caf": { @@ -5589,7 +5589,7 @@ "port-version": 0 }, "ryml": { - "baseline": "2020-04-12", + "baseline": "2021-05-27", "port-version": 0 }, "ryu": { diff --git a/versions/c-/c4core.json b/versions/c-/c4core.json index 71fe2c8c7dfe7b..62e83925f3bc35 100644 --- a/versions/c-/c4core.json +++ b/versions/c-/c4core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12b84a31469a78dd4b42dcf58a27d4600f6b2d48", + "version-date": "2021-01-14", + "port-version": 0 + }, { "git-tree": "bd4565e8ab55bc5e098a1750fa5ff0bc4406ca9b", "version-string": "2020-04-12", diff --git a/versions/r-/ryml.json b/versions/r-/ryml.json index 31e44d49502f18..d02795d6541baf 100644 --- a/versions/r-/ryml.json +++ b/versions/r-/ryml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "783be628f42faca427a8bc1394ccd20580ef56c8", + "version-date": "2021-05-27", + "port-version": 0 + }, { "git-tree": "ff07e4add8c6becd2fc4d57c2707cc141af1e341", "version-string": "2020-04-12", From 862d38b8ae98902c2158227d070018536bd6597c Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 16 Jun 2021 02:53:18 +0800 Subject: [PATCH 009/141] [yyjson] Update to v0.3.0 (#18359) * [yyjson] Update to 0.3.0 * [yyjson] vcpkg x-add-version yyjson --- ports/yyjson/portfile.cmake | 4 ++-- ports/yyjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/y-/yyjson.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/yyjson/portfile.cmake b/ports/yyjson/portfile.cmake index 6a5e75e02422b7..a4c8ffa07fe3e2 100644 --- a/ports/yyjson/portfile.cmake +++ b/ports/yyjson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ibireme/yyjson - REF 31313e8c15e3c221c7452fd99bf7fdf89b6d92c1 - SHA512 05e9cf3e5db5e79188f0207f865744ef411ffef50824783e1d9f4be7ad49fc67aa7490723c44f38c5de336840bbeb948c160bdef9312b97119a6733ff3c1ae04 + REF 1f7dc19c7664dc1aed74045e3b6f316ccd271442 # 0.3.0 + SHA512 fa44dc86d2e7d4a1a178d01085d707b266c2bc32a5bf372a68b74d149b099d346f72dea5865fc1ba37a0c1525d3ac90a38df404d9008bca4577825a603524a91 HEAD_REF master ) diff --git a/ports/yyjson/vcpkg.json b/ports/yyjson/vcpkg.json index cf0a5b97a3c673..cd5cc93f100bb6 100644 --- a/ports/yyjson/vcpkg.json +++ b/ports/yyjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yyjson", - "version-date": "2021-04-12", + "version": "0.3.0", "description": "A high performance JSON library written in ANSI C", "homepage": "https://github.com/ibireme/yyjson", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 67a1d9a9cd7508..232c28da193c88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6793,7 +6793,7 @@ "port-version": 0 }, "yyjson": { - "baseline": "2021-04-12", + "baseline": "0.3.0", "port-version": 0 }, "z3": { diff --git a/versions/y-/yyjson.json b/versions/y-/yyjson.json index 671f4c066ca8a2..cba93435dddc65 100644 --- a/versions/y-/yyjson.json +++ b/versions/y-/yyjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ced4d99c46f8c50e8c8df046af0fe54cce4a0dbb", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "17bac25e372c49899aae3a59d5725cc614f65165", "version-date": "2021-04-12", From 999761ef0f3d4baf0f14b0a74d33b3da8e7947ff Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Tue, 15 Jun 2021 21:53:40 +0300 Subject: [PATCH 010/141] [raylib] Fix MinGW build (#18362) . --- ports/raylib/portfile.cmake | 10 ++++++++-- ports/raylib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/raylib.json | 5 +++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index 25b91262b7d9aa..7af3d4c36090de 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -30,6 +30,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS use-audio USE_AUDIO ) +if(VCPKG_TARGET_IS_MINGW) + set(DEBUG_ENABLE_SANITIZERS OFF) +else() + set(DEBUG_ENABLE_SANITIZERS ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -41,8 +47,8 @@ vcpkg_configure_cmake( -DUSE_EXTERNAL_GLFW=OFF # externl glfw3 causes build errors on Windows ${FEATURE_OPTIONS} OPTIONS_DEBUG - -DENABLE_ASAN=ON - -DENABLE_UBSAN=ON + -DENABLE_ASAN=${DEBUG_ENABLE_SANITIZERS} + -DENABLE_UBSAN=${DEBUG_ENABLE_SANITIZERS} -DENABLE_MSAN=OFF OPTIONS_RELEASE -DENABLE_ASAN=OFF diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index a1f602fa1f05a4..f63f9a7ea9cdf3 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "raylib", "version-semver": "3.7.0", + "port-version": 1, "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 232c28da193c88..ba9a640bfb46d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5434,7 +5434,7 @@ }, "raylib": { "baseline": "3.7.0", - "port-version": 0 + "port-version": 1 }, "rbdl": { "baseline": "2.6.0", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index b564c131c33f70..493c25123d1f61 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e27352fbab2a4e815a478265032a4faa60d34060", + "version-semver": "3.7.0", + "port-version": 1 + }, { "git-tree": "197576ef49480a84f0d5a4d153a1d9416b8230fc", "version-semver": "3.7.0", From 356c9fb81be54b33a2e3090b316d6214a396f5f9 Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Tue, 15 Jun 2021 19:59:52 -0400 Subject: [PATCH 011/141] [arrow] Update to 4.0.0 (#17975) * Update arrow to 4.0.0 * Format * Try fix thrift * Update versions/ files * Do not set ZSTD_ROOT * Remove double quotes causing Windows problems * Apply patches * Remove LIB_DIR_OPTIONS * Tweak zstd flags * Update version hash * Format * Fail early on x86 * Update hash * Fail early on arm, arm64 * Update hash * Add expected failures to to scripts/ci.baseline.txt * Exclude mallocs from default features * Update hash * Set default-features to false for aws-sdk-cpp Co-authored-by: Robert Schumacher * Specify only x64 support in manifest Co-authored-by: Robert Schumacher * Remove unneeded ci.baseline.txt entries Co-authored-by: Robert Schumacher * Remove dataset from default-features Co-authored-by: Robert Schumacher * Update hash * Remove zstd path args * Update hash Co-authored-by: Tanguy Fautre Co-authored-by: Robert Schumacher --- ports/arrow/CONTROL | 20 --------- ports/arrow/all.patch | 76 ++++++++++++-------------------- ports/arrow/portfile.cmake | 75 +++++++++++++++++++------------- ports/arrow/vcpkg.json | 88 ++++++++++++++++++++++++++++++++++++++ versions/a-/arrow.json | 5 +++ versions/baseline.json | 2 +- 6 files changed, 168 insertions(+), 98 deletions(-) delete mode 100644 ports/arrow/CONTROL create mode 100644 ports/arrow/vcpkg.json diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL deleted file mode 100644 index 8aace675f92463..00000000000000 --- a/ports/arrow/CONTROL +++ /dev/null @@ -1,20 +0,0 @@ -Source: arrow -Version: 3.0.0 -Port-Version: 0 -Build-Depends: boost-algorithm, boost-filesystem, boost-multiprecision, boost-system, brotli, bzip2, double-conversion, flatbuffers, gflags, glog, lz4, openssl, rapidjson, re2, snappy, thrift, uriparser, utf8proc, zlib, zstd -Homepage: https://github.com/apache/arrow -Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations. -Supports: x64&!x86&!arm -Default-Features: csv, json, parquet, filesystem - -Feature: csv -Description: CSV file support - -Feature: json -Description: JSON file support - -Feature: parquet -Description: Parquet file support - -Feature: filesystem -Description: Local filesystem support diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch index 838a9dcb45b1dd..8ff755ac5c75c1 100644 --- a/ports/arrow/all.patch +++ b/ports/arrow/all.patch @@ -1,11 +1,11 @@ diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake -index e59b4a38a..9bd895608 100644 +index 2fd897b5d..b6118ad4f 100644 --- a/cpp/cmake_modules/BuildUtils.cmake +++ b/cpp/cmake_modules/BuildUtils.cmake @@ -440,7 +440,7 @@ function(ADD_ARROW_LIB LIB_NAME) target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES}) endif() - + - if(MSVC_TOOLCHAIN) + if(MSVC_TOOLCHAIN AND 0) set(LIB_NAME_STATIC ${LIB_NAME}_static) @@ -26,26 +26,26 @@ index b46a0f1a0..3d87f5204 100644 + #pkg_check_modules(BROTLI_PC libbrotlicommon libbrotlienc libbrotlidec) + if(BROTLI_PC_FOUND AND 0) # Find via pkg_check_modules disabled as incompatible with vcpkg set(BROTLI_INCLUDE_DIR "${BROTLI_PC_libbrotlicommon_INCLUDEDIR}") - + # Some systems (e.g. Fedora) don't fill Brotli_LIBRARY_DIRS, so add the other dirs here. diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake -index 14b6d93b9..d8d80c408 100644 +index 14b6d93b9..1905079ee 100644 --- a/cpp/cmake_modules/FindLz4.cmake +++ b/cpp/cmake_modules/FindLz4.cmake @@ -15,10 +15,12 @@ # specific language governing permissions and limitations # under the License. - + -if(MSVC_TOOLCHAIN AND NOT DEFINED LZ4_MSVC_LIB_PREFIX) - set(LZ4_MSVC_LIB_PREFIX "lib") +# Avoid the debug build linking to the release library by mistake. +# In theory harmless if static linking at this point, but disastrous if done for a shared library. +if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(LZ4_LIB_NAME_DEBUG_SUFFIX d) ++ set(LZ4_LIB_NAME_DEBUG_SUFFIX "d") endif() -set(LZ4_LIB_NAME_BASE "${LZ4_MSVC_LIB_PREFIX}lz4") +set(LZ4_LIB_NAME_BASE "lz4${LZ4_LIB_NAME_DEBUG_SUFFIX}") - + if(ARROW_LZ4_USE_SHARED) set(LZ4_LIB_NAMES) @@ -34,12 +36,8 @@ if(ARROW_LZ4_USE_SHARED) @@ -60,10 +60,10 @@ index 14b6d93b9..d8d80c408 100644 - "${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME_BASE}${LZ4_STATIC_LIB_SUFFIX}") + "${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}") endif() - + if(LZ4_ROOT) @@ -56,8 +54,8 @@ if(LZ4_ROOT) - + else() find_package(PkgConfig QUIET) - pkg_check_modules(LZ4_PC liblz4) @@ -71,20 +71,20 @@ index 14b6d93b9..d8d80c408 100644 + #pkg_check_modules(LZ4_PC liblz4) + if(0) # Do not use pkg_check_modules, doesn't seem to work correctly on some macOS versions (10.x in GitHub Actions) set(LZ4_INCLUDE_DIR "${LZ4_PC_INCLUDEDIR}") - + list(APPEND LZ4_PC_LIBRARY_DIRS "${LZ4_PC_LIBDIR}") diff --git a/cpp/cmake_modules/FindSnappy.cmake b/cpp/cmake_modules/FindSnappy.cmake -index 5784cf592..817cf0c47 100644 +index 26cccb786..8bee097af 100644 --- a/cpp/cmake_modules/FindSnappy.cmake +++ b/cpp/cmake_modules/FindSnappy.cmake -@@ -15,20 +15,27 @@ +@@ -15,23 +15,30 @@ # specific language governing permissions and limitations # under the License. - + +# Avoid the debug build linking to the release library by mistake. +# In theory harmless if static linking at this point, but disastrous if done for a shared library. +if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(SNAPPY_LIB_NAME_DEBUG_SUFFIX d) ++ set(SNAPPY_LIB_NAME_DEBUG_SUFFIX "d") +endif() + +set(SNAPPY_LIB_NAME_BASE "snappy${SNAPPY_LIB_NAME_DEBUG_SUFFIX}") @@ -102,26 +102,29 @@ index 5784cf592..817cf0c47 100644 else() - set(SNAPPY_STATIC_LIB_NAME_BASE "snappy") if(MSVC) -- set(SNAPPY_STATIC_LIB_NAME_BASE "${SNAPPY_STATIC_LIB_NAME_BASE}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}") -+ set(SNAPPY_STATIC_LIB_NAME_BASE "${SNAPPY_LIB_NAME_BASE}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}") + set(SNAPPY_STATIC_LIB_NAME_BASE +- "${SNAPPY_STATIC_LIB_NAME_BASE}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}") ++ "${SNAPPY_LIB_NAME_BASE}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}") endif() -- set(SNAPPY_LIB_NAMES "${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_STATIC_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}") -+ set(SNAPPY_LIB_NAMES "${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}") + set( + SNAPPY_LIB_NAMES +- "${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_STATIC_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}" ++ "${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}" + ) endif() - - if(Snappy_ROOT) + diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake -index 273d907ed..65f477f54 100644 +index 273d907ed..02a1e7fe1 100644 --- a/cpp/cmake_modules/FindThrift.cmake +++ b/cpp/cmake_modules/FindThrift.cmake @@ -39,6 +39,12 @@ function(EXTRACT_THRIFT_VERSION) endif() endfunction(EXTRACT_THRIFT_VERSION) - + +# Avoid the debug build linking to the release library by mistake. +# In theory harmless if static linking at this point, but disastrous if done for a shared library. +if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(THRIFT_LIB_NAME_DEBUG_SUFFIX d) ++ set(THRIFT_LIB_NAME_DEBUG_SUFFIX "d") +endif() + if(MSVC_TOOLCHAIN AND NOT DEFINED THRIFT_MSVC_LIB_SUFFIX) @@ -133,7 +136,7 @@ index 273d907ed..65f477f54 100644 endif() -set(THRIFT_LIB_NAME_BASE "thrift${THRIFT_MSVC_LIB_SUFFIX}") +set(THRIFT_LIB_NAME_BASE "thrift${THRIFT_MSVC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}") - + if(ARROW_THRIFT_USE_SHARED) set(THRIFT_LIB_NAMES thrift) @@ -84,8 +90,8 @@ else() @@ -145,7 +148,7 @@ index 273d907ed..65f477f54 100644 + #pkg_check_modules(THRIFT_PC thrift) + if(0) # Do not use pkg_check_modules, as it finds the wrong location (an intermediate build dir). set(THRIFT_INCLUDE_DIR "${THRIFT_PC_INCLUDEDIR}") - + list(APPEND THRIFT_PC_LIBRARY_DIRS "${THRIFT_PC_LIBDIR}") @@ -101,8 +107,7 @@ else() set(THRIFT_VERSION ${THRIFT_PC_VERSION}) @@ -157,26 +160,3 @@ index 273d907ed..65f477f54 100644 find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h PATH_SUFFIXES "include") find_program(THRIFT_COMPILER thrift PATH_SUFFIXES "bin") extract_thrift_version() -diff --git a/cpp/cmake_modules/Findzstd.cmake b/cpp/cmake_modules/Findzstd.cmake -index 6659a682d..d8cc4f72d 100644 ---- a/cpp/cmake_modules/Findzstd.cmake -+++ b/cpp/cmake_modules/Findzstd.cmake -@@ -34,13 +34,14 @@ if(ARROW_ZSTD_USE_SHARED) - ZSTD_LIB_NAMES - "${CMAKE_SHARED_LIBRARY_PREFIX}${ZSTD_LIB_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX}") - else() -- if(MSVC AND NOT DEFINED ZSTD_MSVC_STATIC_LIB_SUFFIX) -- set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static") -+ if(MSVC AND CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(ZSTD_MSVC_DEBUG_LIB_SUFFIX d) - endif() - set(ZSTD_STATIC_LIB_SUFFIX -- "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") -+ "${ZSTD_MSVC_DEBUG_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") - set(ZSTD_LIB_NAMES -- "${CMAKE_STATIC_LIBRARY_PREFIX}${ZSTD_LIB_NAME_BASE}${ZSTD_STATIC_LIB_SUFFIX}") -+ "zstd${ZSTD_STATIC_LIB_SUFFIX}" -+ "libzstd${ZSTD_STATIC_LIB_SUFFIX}") - endif() - - # First, find via if specified ZTD_ROOT diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index a36dad1c1d6fe8..fb9e05bc6963bb 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -3,53 +3,70 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-3.0.0 - SHA512 02645be0eaaaa69880ab911fc0b74665ebf52a35f9ad05210b23e7b42bcfbe3c3a4d44fa6c4c35af74764efbe528c2e0ebf0549ce5890c796be695ceb94e5606 + REF apache-arrow-4.0.0 + SHA512 4697a32004d02a519b8a8e899ed3cd981ae3485e6d34071436051080d6c84e25ad0bc568b3e52effe0a9204756da3d6e560a2037df06d2730dccd19c6b4c8027 HEAD_REF master PATCHES all.patch ) -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED) -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC) - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "csv" ARROW_CSV - "json" ARROW_JSON - "parquet" ARROW_PARQUET - "filesystem" ARROW_FILESYSTEM + FEATURES + csv ARROW_CSV + dataset ARROW_DATASET + filesystem ARROW_FILESYSTEM + flight ARROW_FLIGHT + json ARROW_JSON + orc ARROW_ORC + parquet ARROW_PARQUET + parquet PARQUET_REQUIRE_ENCRYPTION + s3 ARROW_S3 ) -file(REMOVE "${SOURCE_PATH}/cpp/cmake_modules/FindZSTD.cmake") +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) +elseif("jemalloc" IN_LIST FEATURES) + set(MALLOC_OPTIONS -DARROW_JEMALLOC=ON) +else() + set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND ("mimalloc" IN_LIST FEATURES)) + set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=ON) +else() + set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=OFF) +endif() + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_DEPENDENCY_USE_SHARED) + +if(VCPKG_TARGET_IS_WINDOWS) + set(THRIFT_USE_SHARED OFF) +else() + set(THRIFT_USE_SHARED ${ARROW_DEPENDENCY_USE_SHARED}) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/cpp PREFER_NINJA OPTIONS - -DARROW_DEPENDENCY_SOURCE=SYSTEM - -Duriparser_SOURCE=SYSTEM - -DARROW_BUILD_TESTS=OFF ${FEATURE_OPTIONS} - -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} + ${MALLOC_OPTIONS} -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} - -DARROW_BROTLI_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets - -DARROW_GFLAGS_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets - -DARROW_LZ4_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets - -DARROW_SNAPPY_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets - -DARROW_THRIFT_USE_SHARED=OFF # vcpkg doesn't build Thrift as a shared library for the moment (2020/01/22). - -DARROW_UTF8PROC_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets - -DARROW_ZSTD_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets - -DARROW_JEMALLOC=OFF - -DARROW_BUILD_UTILITIES=OFF + -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} + -DARROW_BUILD_TESTS=OFF + -DARROW_DEPENDENCY_SOURCE=SYSTEM + -DARROW_DEPENDENCY_USE_SHARED=${ARROW_DEPENDENCY_USE_SHARED} + -DARROW_THRIFT_USE_SHARED=${THRIFT_USE_SHARED} + -DBUILD_WARNING_LEVEL=PRODUCTION + -DARROW_WITH_BROTLI=ON -DARROW_WITH_BZ2=ON - -DARROW_WITH_ZLIB=ON - -DARROW_WITH_ZSTD=ON -DARROW_WITH_LZ4=ON -DARROW_WITH_SNAPPY=ON - -DARROW_WITH_BROTLI=ON - -DARROW_WITH_UTF8PROC=ON - -DPARQUET_REQUIRE_ENCRYPTION=ON - -DBUILD_WARNING_LEVEL=PRODUCTION + -DARROW_WITH_ZLIB=ON + -DARROW_WITH_ZSTD=ON + -DZSTD_MSVC_LIB_PREFIX= ) vcpkg_install_cmake() diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json new file mode 100644 index 00000000000000..51755afd710b8e --- /dev/null +++ b/ports/arrow/vcpkg.json @@ -0,0 +1,88 @@ +{ + "name": "arrow", + "version": "4.0.0", + "description": "Cross-language development platform for in-memory analytics", + "homepage": "https://arrow.apache.org", + "supports": "x64", + "dependencies": [ + "boost-filesystem", + "boost-multiprecision", + "boost-system", + "brotli", + "bzip2", + "gflags", + "glog", + "lz4", + "openssl", + "re2", + "snappy", + "thrift", + "utf8proc", + "zlib", + "zstd" + ], + "default-features": [ + "csv", + "filesystem", + "json", + "parquet" + ], + "features": { + "csv": { + "description": "CSV support" + }, + "dataset": { + "description": "Dataset support" + }, + "filesystem": { + "description": "Filesystem support" + }, + "flight": { + "description": "Arrow Flight RPC support", + "dependencies": [ + "abseil", + "c-ares", + "grpc", + "protobuf" + ] + }, + "jemalloc": { + "description": "jemalloc allocator" + }, + "json": { + "description": "JSON support", + "dependencies": [ + "rapidjson" + ] + }, + "mimalloc": { + "description": "mimalloc allocator" + }, + "orc": { + "description": "ORC support", + "dependencies": [ + "orc" + ] + }, + "parquet": { + "description": "Parquet support" + }, + "s3": { + "description": "S3 support", + "dependencies": [ + { + "name": "aws-sdk-cpp", + "default-features": false, + "features": [ + "cognito-identity", + "config", + "identity-management", + "s3", + "sts", + "transfer" + ] + } + ] + } + } +} diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index d795d327ada3a2..503dbef98543d1 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2066704ab2b0b5977bcd5677ea1378fac0b0555c", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "bc9cb096ffa223f2af620db18ed244d17e47ffe7", "version-string": "3.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index ba9a640bfb46d9..88423cb801af26 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -157,7 +157,7 @@ "port-version": 3 }, "arrow": { - "baseline": "3.0.0", + "baseline": "4.0.0", "port-version": 0 }, "ashes": { From 3723946726c4cfc5c0c8c2697118256b550012c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 17 Jun 2021 05:39:53 +0800 Subject: [PATCH 012/141] [minizip] Fix usage, fix minizipConfig.cmake (#18472) * [minizip] Fix usage, fix minizipConfig.cmake * update version record --- ports/minizip/CMakeLists.txt | 2 +- ports/minizip/CONTROL | 11 ----------- ports/minizip/minizipConfig.cmake.in | 8 ++++++++ ports/minizip/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 2 +- versions/m-/minizip.json | 5 +++++ 6 files changed, 34 insertions(+), 13 deletions(-) delete mode 100644 ports/minizip/CONTROL create mode 100644 ports/minizip/vcpkg.json diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index a5e8e053c18b0a..c17ab8974230b6 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -53,7 +53,7 @@ target_link_libraries(minizip PRIVATE ZLIB::ZLIB) target_compile_definitions(minizip PRIVATE -D_ZLIB_H) if(ENABLE_BZIP2) - target_link_libraries(minizip PRIVATE ${BZIP2_LIBRARIES}) + target_link_libraries(minizip PUBLIC ${BZIP2_LIBRARIES}) target_compile_definitions(minizip PRIVATE -DHAVE_BZIP2=1) endif() if(ANDROID) diff --git a/ports/minizip/CONTROL b/ports/minizip/CONTROL deleted file mode 100644 index d761f1a88b46d2..00000000000000 --- a/ports/minizip/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -Source: minizip -Version: 1.2.11 -Port-Version: 8 -Build-Depends: zlib -Homepage: https://github.com/madler/zlib -Description: Zip compression library -Supports: !uwp - -Feature: bzip2 -Build-Depends: bzip2 -Description: Support compression using bzip2 library diff --git a/ports/minizip/minizipConfig.cmake.in b/ports/minizip/minizipConfig.cmake.in index 9f27956c0c60da..17fc694e774080 100644 --- a/ports/minizip/minizipConfig.cmake.in +++ b/ports/minizip/minizipConfig.cmake.in @@ -1,4 +1,12 @@ #@PACKAGE_INIT@ +include(CMakeFindDependencyMacro) + +find_dependency(ZLIB) + +if (@ENABLE_BZIP2@) + find_dependency(BZip2) +endif() + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") check_required_components("@PROJECT_NAME@") \ No newline at end of file diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json new file mode 100644 index 00000000000000..9e8c24b8135fb1 --- /dev/null +++ b/ports/minizip/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "minizip", + "version-semver": "1.2.11", + "port-version": 9, + "description": "Zip compression library", + "homepage": "https://github.com/madler/zlib", + "supports": "!uwp", + "dependencies": [ + "zlib" + ], + "features": { + "bzip2": { + "description": "Support compression using bzip2 library", + "dependencies": [ + "bzip2" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 88423cb801af26..b1038ec14454e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4038,7 +4038,7 @@ }, "minizip": { "baseline": "1.2.11", - "port-version": 8 + "port-version": 9 }, "minizip-ng": { "baseline": "3.0.2", diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json index 4c3ca9470eec81..acbf121370f2ab 100644 --- a/versions/m-/minizip.json +++ b/versions/m-/minizip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc89de0b8a1105f6bee9625bba4031b138862a39", + "version-semver": "1.2.11", + "port-version": 9 + }, { "git-tree": "4bf6a0d8bac1c47fa80e0c51188aa3d2ecb86414", "version-string": "1.2.11", From 305cd6ace22e35c1d55b933904b7c07132b6d911 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 17 Jun 2021 22:08:01 +0200 Subject: [PATCH 013/141] [windres-rc] Fix wrapper output (#17045) --- scripts/buildsystems/make_wrapper/windres-rc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/buildsystems/make_wrapper/windres-rc b/scripts/buildsystems/make_wrapper/windres-rc index 88cc8425f72b7a..bb2aac0d8790f0 100644 --- a/scripts/buildsystems/make_wrapper/windres-rc +++ b/scripts/buildsystems/make_wrapper/windres-rc @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for windres to rc which do not understand '-i -o --output-format'. # cvtres is invoked by the linker -scriptversion=2020-08-17.03; # UTC +scriptversion=2021-04-02.18; # UTC nl=' @@ -58,8 +58,6 @@ func_file_conv () # Adjust compile command to suit rc instead of windres func_windres_wrapper () { - echo "FROM WINDRESWRAPPER FUNCTION:$@" - echo "RCFLAGS:$(RCFLAGS)" # Assume a capable shell in= out= From 17e4a24f946fc20da8d5eb5f18e350a4a6ce9ac7 Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Fri, 18 Jun 2021 06:12:58 +1000 Subject: [PATCH 014/141] [ffmpeg] Warn/fail when selecting unsupported features. (#17153) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [ffmpeg] Warn/fail when selecting unsupported features. * Update ffmpeg.json * Bump port-version * Update ffmpeg.json * [ffmpeg] Check for gpl/nonfree aswell as all option. * avisynth now support static linking * fixup typo * Update ffmpeg.json * Revert to fatal error on even when all is selected * Update ffmpeg.json * [ffmpeg] Disable openh264 on uwp * update * Update versions/f-/ffmpeg.json * update * Update ffmpeg.json * update * update * Update Co-authored-by: Billy Robert ONeal III Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/ffmpeg/portfile.cmake | 153 +++++++++++++++++++++++++++++++++--- ports/ffmpeg/vcpkg.json | 4 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 ++ 4 files changed, 149 insertions(+), 15 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index c905401c16892d..0f3121bf4a9628 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,3 +1,132 @@ +#Check for unsupported features + +if("ffmpeg" IN_LIST FEATURES) + vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffmpeg' does not support 'uwp'") +endif() + +if("ffplay" IN_LIST FEATURES) + vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffplay' does not support 'uwp'") +endif() + +if("ffprobe" IN_LIST FEATURES) + vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'ffprobe' does not support 'uwp'") +endif() + + +if("ass" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'ass' does not support 'uwp | arm'") + endif() +endif() + +if("avisynthplus" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS)) + message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp'") + endif() +endif() + +if("dav1d" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "Feature 'dav1d' does not support 'uwp | arm | x86 | osx'") + endif() +endif() + +if("fdk-aac" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'fdk-aac' does not support 'uwp | arm'") + endif() +endif() + +if("fontconfig" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) + message(FATAL_ERROR "Feature 'fontconfig' does not support 'uwp | arm | (windows & static)'") + endif() +endif() + +if("fribidi" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'fribidi' does not support 'uwp | arm'") + endif() +endif() + +if("ilbc" IN_LIST FEATURES) + if ((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'ilbc' does not support 'uwp & arm'") + endif() +endif() + +if("modplug" IN_LIST FEATURES) + if (VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) + message(FATAL_ERROR "Feature 'modplug' does not support 'uwp | (windows & static)'") + endif() +endif() + +if("nvcodec" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR ((NOT VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_LINUX))) + message(FATAL_ERROR "Feature 'nvcodec' does not support '!(windows | linux) | uwp | arm'") + endif() +endif() + +if("opencl" IN_LIST FEATURES) + vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'opencl' does not support 'uwp'") +endif() + +if("opengl" IN_LIST FEATURES) + if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) + message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm) | osx'") + endif() +endif() + +if("openh264" IN_LIST FEATURES) + vcpkg_fail_port_install(ON_TARGET "UWP" MESSAGE "Feature 'openh264' does not support 'uwp'") +endif() + +if("sdl2" IN_LIST FEATURES) + vcpkg_fail_port_install(ON_TARGET "OSX" MESSAGE "Feature 'sdl2' does not support 'osx'") +endif() + +if("ssh" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(FATAL_ERROR "Feature 'ssh' does not support 'uwp | arm | static'") + endif() +endif() + +if("tensorflow" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + message(FATAL_ERROR "Feature 'tensorflow' does not support 'x86 | arm | uwp | static'") + endif() +endif() + +if("tesseract" IN_LIST FEATURES) + if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(FATAL_ERROR "Feature 'tesseract' does not support 'uwp | (windows & arm) | static'") + endif() +endif() + +if("wavpack" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + message(FATAL_ERROR "Feature 'wavpack' does not support 'arm'") + endif() +endif() + +if("x264" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + message(FATAL_ERROR "Feature 'x264' does not support 'arm'") + endif() +endif() + +if("x265" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'x265' does not support 'uwp | arm'") + endif() +endif() + +if("xml2" IN_LIST FEATURES) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(FATAL_ERROR "Feature 'xml2' does not support 'static'") + endif() +endif() + if(VCPKG_TARGET_IS_WINDOWS) set(PATCHES 0017-Patch-for-ticket-9019-CUDA-Compile-Broken-Using-MSVC.patch) # https://trac.ffmpeg.org/ticket/9019 endif() @@ -234,18 +363,6 @@ else() set(OPTIONS "${OPTIONS} --disable-libdav1d") endif() -if("iconv" IN_LIST FEATURES) - set(OPTIONS "${OPTIONS} --enable-iconv") -else() - set(OPTIONS "${OPTIONS} --disable-iconv") -endif() - -if("ilbc" IN_LIST FEATURES) - set(OPTIONS "${OPTIONS} --enable-libilbc") -else() - set(OPTIONS "${OPTIONS} --disable-libilbc") -endif() - if("fdk-aac" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-libfdk-aac") else() @@ -270,6 +387,18 @@ else() set(OPTIONS "${OPTIONS} --disable-libfribidi") endif() +if("iconv" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-iconv") +else() + set(OPTIONS "${OPTIONS} --disable-iconv") +endif() + +if("ilbc" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libilbc") +else() + set(OPTIONS "${OPTIONS} --disable-libilbc") +endif() + if("lzma" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-lzma") else() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index d64ac5bb1fd51f..fe16cfed194c3f 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 4, + "port-version": 5, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -183,7 +183,7 @@ "features": [ "avisynthplus" ], - "platform": "windows & !arm & !uwp & !static" + "platform": "windows & !arm & !uwp" } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index b1038ec14454e3..ed47342ccaf50e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 4 + "port-version": 5 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 3691438cc31abd..a39b1d79a8f05f 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "234eb0e352d2a7be0a3b34fb9eb8a9f0417ffe94", + "version": "4.4", + "port-version": 5 + }, { "git-tree": "dfea2c203835c55baec68138cc7e8c65ebcce33a", "version": "4.4", From 38d9bae753e4fa9953dcf2b0f335848f6068d46a Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 19 Jun 2021 01:55:51 +0800 Subject: [PATCH 015/141] [uwebsockets] update to 19.2.0 (#18525) * [uwebsockets] update to * update version --- ports/uwebsockets/portfile.cmake | 4 ++-- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 4a1396e597957e..9c415012602a13 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets - REF 0b97cc72d38c59798c2b69dc6486305a38819694 # v19.0.0a5 - SHA512 3f3dc8aa3a1cce19d9f2734f022dbe6c137920c8506fa8c0c18b303ee50f759428076ac00351d8bd8496b003642ca6d565dceea9e0da922dab936974bc0a1b16 + REF b7c82d791010bd4c9b45528846f95b9886e9f984 # v19.2.0 + SHA512 54bd50d3e16e6d78081c1d780ddcb67668ab6d54d90fd99531522833b1a49796c94cc4dbe4e3685a3b1b2372fe6c08e4f84b3c0da061587da198e4076da4c3c1 HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index 3d6560ec5f4e62..642458b0b6f948 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version": "19.0.0.5", + "version": "19.2.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index ed47342ccaf50e..98aa0843ee5bc8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6461,7 +6461,7 @@ "port-version": 0 }, "uwebsockets": { - "baseline": "19.0.0.5", + "baseline": "19.2.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 5a80cd39bc8c99..a31b28fc344153 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b01131e5a07feb1613415677213d377995bfdc40", + "version": "19.2.0", + "port-version": 0 + }, { "git-tree": "14d375b4fa04de7a59640094779695634e19569a", "version": "19.0.0.5", From 0962c2e28806f079ac2a6ece637e95c0b1b8408d Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 18 Jun 2021 18:56:56 +0100 Subject: [PATCH 016/141] [libass] fix fontconfig dependency in .pc file (#18516) * [libass] fix fontconfig dependency in .pc file on x64-linux * [libass] bump port version * [libass] x-add-version --- ports/libass/CMakeLists.txt | 10 +++++++--- ports/libass/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libass.json | 5 +++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index 64e7f93030664b..eaaa80b1343078 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -20,7 +20,7 @@ add_compile_definitions(CONFIG_FRIBIDI) add_compile_definitions(CONFIG_HARFBUZZ) file (GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/libass/*.c) -set(FONTCONFIG_LIBRARAY) +set(FONTCONFIG_LIBRARY) if(WIN32) list(FILTER SOURCES EXCLUDE REGEX ".*ass_coretext.c$") list(FILTER SOURCES EXCLUDE REGEX ".*ass_fontconfig.c$") @@ -32,7 +32,7 @@ else() list(FILTER SOURCES EXCLUDE REGEX ".*ass_directwrite.c$") find_package(Fontconfig REQUIRED) - set(FONTCONFIG_LIBRARAY Fontconfig::Fontconfig) + set(FONTCONFIG_LIBRARY Fontconfig::Fontconfig) endif() find_package(Freetype REQUIRED) @@ -77,7 +77,11 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) set(PACKAGE_VERSION ${LIBASS_VERSION}) -set(PKG_REQUIRES_PRIVATE "harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3") +if(WIN32 OR APPLE) + set(PKG_REQUIRES_PRIVATE "harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3") +else() + set(PKG_REQUIRES_PRIVATE "fontconfig >= 2.10.92, harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3") +endif() set(PKG_LIBS_PRIVATE -lm) configure_file(libass.pc.in libass.pc @ONLY) install(FILES diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json index f22b91fdb4c5df..9abf0a1f1891bc 100644 --- a/ports/libass/vcpkg.json +++ b/ports/libass/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libass", "version": "0.15.1", + "port-version": 1, "description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format", "homepage": "https://github.com/libass/libass", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 98aa0843ee5bc8..39bf6d3c83ed91 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3014,7 +3014,7 @@ }, "libass": { "baseline": "0.15.1", - "port-version": 0 + "port-version": 1 }, "libassuan": { "baseline": "2.5.3", diff --git a/versions/l-/libass.json b/versions/l-/libass.json index aa614c506a9dfd..389e1aa4407d71 100644 --- a/versions/l-/libass.json +++ b/versions/l-/libass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c9d2203cb8e0f912847cdd70a9ba1142b1ab32f", + "version": "0.15.1", + "port-version": 1 + }, { "git-tree": "2512ee72e51fb02185743218ae2cd52f56ca232f", "version": "0.15.1", From dc318e4edfa039e87b11e91c2d0d256c6f3bc57c Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 19 Jun 2021 01:57:11 +0800 Subject: [PATCH 017/141] [libgpg-error] Remove COPYING.LIB from lib folder (#18492) * [libgpg-error] Remove COPYING.LIB from lib folder * Update version files --- ports/libgpg-error/portfile.cmake | 11 ++++++----- ports/libgpg-error/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libgpg-error.json | 5 +++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index 19e6e3c2fde271..711f7e76e62442 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -67,6 +67,7 @@ if(VCPKG_TARGET_IS_WINDOWS) configure_file("${SOURCE_PATH}/src/gpg-error.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gpg-error.pc" @ONLY) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/COPYING.LIB" "${CURRENT_PACKAGES_DIR}/debug/lib/COPYING.LIB") else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -74,8 +75,8 @@ else() REF libgpg-error-${PACKAGE_VERSION} SHA512 f5a1c1874ac1dee36ee01504f1ab0146506aa7af810879e192eac17a31ec81945fe850953ea1c57188590c023ce3ff195c7cab62af486b731fa1534546d66ba3 HEAD_REF master - PATCHES - add_cflags_to_tools.patch + PATCHES + add_cflags_to_tools.patch ) vcpkg_configure_make( @@ -91,6 +92,6 @@ else() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/locale ${CURRENT_PACKAGES_DIR}/debug/share) - file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale" "${CURRENT_PACKAGES_DIR}/debug/share") + file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() \ No newline at end of file diff --git a/ports/libgpg-error/vcpkg.json b/ports/libgpg-error/vcpkg.json index 73c17ba9e5c812..81024b701a43a3 100644 --- a/ports/libgpg-error/vcpkg.json +++ b/ports/libgpg-error/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgpg-error", "version": "1.42", + "port-version": 1, "description": "A common dependency of all GnuPG components", "homepage": "https://gnupg.org/software/libgpg-error/index.html", "supports": "!(windows & (arm | arm64))" diff --git a/versions/baseline.json b/versions/baseline.json index 39bf6d3c83ed91..dd91be753cc0ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3182,7 +3182,7 @@ }, "libgpg-error": { "baseline": "1.42", - "port-version": 0 + "port-version": 1 }, "libgpod": { "baseline": "2019-08-29", diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index aecf1ec8a04554..395eb94f08f5fc 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5abbf9cf832337e202ff5d8d4296025b47be1a0", + "version": "1.42", + "port-version": 1 + }, { "git-tree": "80b315c6991fd5092637d010433ebfcbcbfda92d", "version": "1.42", From 13e202e17605b7797863f3c6c3baaac916aefcc7 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 19 Jun 2021 01:57:21 +0800 Subject: [PATCH 018/141] [flashlight-cuda] Fix installation (#18489) * [flashlight-cuda] Fix installation * Update version files --- ports/flashlight-cuda/portfile.cmake | 21 ++++++++++++--------- ports/flashlight-cuda/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flashlight-cuda.json | 5 +++++ 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ports/flashlight-cuda/portfile.cmake b/ports/flashlight-cuda/portfile.cmake index 982269b8f320b1..9935ea94eb1914 100644 --- a/ports/flashlight-cuda/portfile.cmake +++ b/ports/flashlight-cuda/portfile.cmake @@ -19,19 +19,18 @@ set(FL_DEFAULT_VCPKG_CMAKE_FLAGS -DFL_BUILD_EXAMPLES=OFF -DFL_BACKEND=CUDA # this port is CUDA-backend only -DFL_BUILD_STANDALONE=OFF - -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets ) # Determine which components to build via specified feature vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - lib FL_BUILD_LIBRARIES - fl FL_BUILD_CORE - asr FL_BUILD_APP_ASR - imgclass FL_BUILD_APP_IMGCLASS - lm FL_BUILD_APP_LM - objdet FL_BUILD_APP_OBJDET + lib FL_BUILD_LIBRARIES + fl FL_BUILD_CORE + asr FL_BUILD_APP_ASR + imgclass FL_BUILD_APP_IMGCLASS + lm FL_BUILD_APP_LM + objdet FL_BUILD_APP_OBJDET ) # Build and install @@ -41,10 +40,14 @@ vcpkg_configure_cmake( OPTIONS ${FL_DEFAULT_VCPKG_CMAKE_FLAGS} ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share/flashlight + OPTIONS_RELEASE + -DFL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/flashlight ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight-cuda TARGET_PATH share/flashlight) +vcpkg_fixup_cmake_targets(CONFIG_PATH share/flashlight TARGET_PATH share/flashlight) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -81,4 +84,4 @@ if (NUM_TOOLS GREATER 0) endif() # Copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json index efb4159cb5d482..c0e0a026f4cd22 100644 --- a/ports/flashlight-cuda/vcpkg.json +++ b/ports/flashlight-cuda/vcpkg.json @@ -1,7 +1,7 @@ { "name": "flashlight-cuda", "version": "0.3", - "port-version": 1, + "port-version": 2, "description": "A C++ standalone library for machine learning. CUDA backend.", "homepage": "https://github.com/facebookresearch/flashlight", "supports": "!(windows | osx)", diff --git a/versions/baseline.json b/versions/baseline.json index dd91be753cc0ed..caeb2112d48c32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2018,7 +2018,7 @@ }, "flashlight-cuda": { "baseline": "0.3", - "port-version": 1 + "port-version": 2 }, "flatbuffers": { "baseline": "1.12.0", diff --git a/versions/f-/flashlight-cuda.json b/versions/f-/flashlight-cuda.json index f69285781366d3..0844f0264d8377 100644 --- a/versions/f-/flashlight-cuda.json +++ b/versions/f-/flashlight-cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afbc9bcce8e115033ecd9d1c64c2b4375c556e67", + "version": "0.3", + "port-version": 2 + }, { "git-tree": "9147d15ccbb61b2de168a8cc78527341edf1540d", "version": "0.3", From 420c0e749ec715d1d2fffe5f19bf94f11dc088c1 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Fri, 18 Jun 2021 19:57:36 +0200 Subject: [PATCH 019/141] [function2] Update to version 4.2.0 (#18487) --- ports/function2/CONTROL | 2 +- ports/function2/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/f-/function2.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/function2/CONTROL b/ports/function2/CONTROL index e230af308232bf..7fe0554318e190 100644 --- a/ports/function2/CONTROL +++ b/ports/function2/CONTROL @@ -1,4 +1,4 @@ Source: function2 -Version: 4.1.0 +Version: 4.2.0 Homepage: https://github.com/Naios/function2 Description: Improved drop-in replacement to std::function diff --git a/ports/function2/portfile.cmake b/ports/function2/portfile.cmake index 54d313ad1e29da..f3b06e923e255b 100644 --- a/ports/function2/portfile.cmake +++ b/ports/function2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Naios/function2 - REF 3a0746bf5f601dfed05330aefcb6854354fce07d # 4.1.0 - SHA512 48dd8fb1ce47df0835c03edf78ae427beebfeeaaabf6b993eb02843f72cce796ba5d1042f505990f29debd42bc834e531335484d45ca33e841657e9ff9e5034f + REF 02ca99831de59c7c3a4b834789260253cace0ced # 4.2.0 + SHA512 5b14d95584586c7365119f5171c86c7556ce402ae3c5db09e4e54e1225fc71e40f88ab77188986ecf9dac5eecbfd6330c5a7ecfe0375cb37773d007ebef1ba93 HEAD_REF master PATCHES disable-testing.patch diff --git a/versions/baseline.json b/versions/baseline.json index caeb2112d48c32..264adabfcadd6c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2145,7 +2145,7 @@ "port-version": 0 }, "function2": { - "baseline": "4.1.0", + "baseline": "4.2.0", "port-version": 0 }, "functions-framework-cpp": { diff --git a/versions/f-/function2.json b/versions/f-/function2.json index 5ff59f200adba5..edf1113f0bddf5 100644 --- a/versions/f-/function2.json +++ b/versions/f-/function2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "844aa89a1d4dabf3d084f060c7b8036b1ba69f06", + "version-string": "4.2.0", + "port-version": 0 + }, { "git-tree": "1e02d8c31f298e37fe21781f8114c31ae29a1e73", "version-string": "4.1.0", From 03e7cddaad2f9448fb21ac2eced8cb89d856925e Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 18 Jun 2021 11:06:31 -0700 Subject: [PATCH 020/141] [infoware] update to latest commit (#18486) * update infoware to latest commit * update deprecated functions * remove redundant file cleanup * add versioning --- ports/infoware/portfile.cmake | 21 ++++++++++----------- ports/infoware/vcpkg.json | 12 +++++++++++- versions/baseline.json | 2 +- versions/i-/infoware.json | 5 +++++ 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/ports/infoware/portfile.cmake b/ports/infoware/portfile.cmake index 670259003e4b54..e8b0703a8af8a7 100644 --- a/ports/infoware/portfile.cmake +++ b/ports/infoware/portfile.cmake @@ -3,26 +3,26 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ThePhD/infoware - REF v0.6.0 - SHA512 38be9e375508c7fdee4be3540d80c95bf14dbef68c7880d3dc98de3128b43680c18ceb09fb0da33b6d31064d8cdbf0672671d6b4be4f0a4208a0b99d0224bd2e + REF 50cb0982aceb32c8eb57aa6bc5011aced2c379df + SHA512 fe8182998a9e9dbed3dc3985a1161da11b340562628a71da8840aa4d4c56382ddc3ddef3d094e5d9c7c06481a2076dcff7fdb561bd169dd9d1849da4b4c6a064 HEAD_REF master ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - x11 INFOWARE_USE_X11 - d3d INFOWARE_USE_D3D - opencl INFOWARE_USE_OPENCL - opengl INFOWARE_USE_OPENGL + FEATURES + x11 INFOWARE_USE_X11 + d3d INFOWARE_USE_D3D + opencl INFOWARE_USE_OPENCL + opengl INFOWARE_USE_OPENGL ) # git must be injected, because vcpkg isolates the build # from the environment entirely to have reproducible builds vcpkg_find_acquire_program(GIT) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DINFOWARE_EXAMPLES=OFF @@ -31,9 +31,8 @@ vcpkg_configure_cmake( -DGIT_FOUND=true ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/infoware/vcpkg.json b/ports/infoware/vcpkg.json index 14c93e7f6ed768..7b395639532f39 100644 --- a/ports/infoware/vcpkg.json +++ b/ports/infoware/vcpkg.json @@ -1,10 +1,20 @@ { "$reason": "Note that independent usage and testing may work, but it seems to fail in CI environments for potential cross-compilation, and is thusly noted here to note break how vcpkg builds things!", "name": "infoware", - "version-string": "0.6.0", + "version-date": "2021-06-16", "description": "C++ Library for pulling system and hardware information, without hitting the command line.", "homepage": "https://github.com/ThePhD/infoware", "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "d3d": { "description": "Prefer usage of Direct3D to find graphical capabilities (typically only works on Windows systems)." diff --git a/versions/baseline.json b/versions/baseline.json index 264adabfcadd6c..ced1c29139e0ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2665,7 +2665,7 @@ "port-version": 0 }, "infoware": { - "baseline": "0.6.0", + "baseline": "2021-06-16", "port-version": 0 }, "inih": { diff --git a/versions/i-/infoware.json b/versions/i-/infoware.json index 73c24c5dfa714f..1f9a2257ea0dff 100644 --- a/versions/i-/infoware.json +++ b/versions/i-/infoware.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c278f55bb9b202c251c0414d877a4a238b57214", + "version-date": "2021-06-16", + "port-version": 0 + }, { "git-tree": "ea6cdef830ceb71bfa0d850127931972603d5695", "version-string": "0.6.0", From 2dc8f71cded8f21e55aa91fe3ba06bd13b4df5a3 Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Mon, 21 Jun 2021 23:17:52 +0300 Subject: [PATCH 021/141] [nameof] Update to 0.10.1 (#18574) --- ports/nameof/CONTROL | 2 +- ports/nameof/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/n-/nameof.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nameof/CONTROL b/ports/nameof/CONTROL index aaf8ed7a8025d8..b9b51e0487ba8d 100644 --- a/ports/nameof/CONTROL +++ b/ports/nameof/CONTROL @@ -1,4 +1,4 @@ Source: nameof -Version: 0.10.0 +Version: 0.10.1 Description: Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum. Homepage: https://github.com/Neargye/nameof diff --git a/ports/nameof/portfile.cmake b/ports/nameof/portfile.cmake index 3d0473a873cf64..52230b40783804 100644 --- a/ports/nameof/portfile.cmake +++ b/ports/nameof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/nameof - REF v0.10.0 - SHA512 39ad64e7b3bd45120b8d47559b5068fbc000cc4c0b9e86bad15f2a440991fcbfb6162e3acce56e98857c4b6b4734f87253415d6001dea0335d0bc5e60045db61 + REF v0.10.1 + SHA512 9b3ed7a3f5dcf1ad309341102d2aaa07fc8e9d6db7e08e42c2d9b5453c822ec16d6c6910adf7c4af8879c4084cac362f4fb4c07559cc49594b72b4917816ef5d HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index ced1c29139e0ae..120c9655e445f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4213,7 +4213,7 @@ "port-version": 0 }, "nameof": { - "baseline": "0.10.0", + "baseline": "0.10.1", "port-version": 0 }, "nana": { diff --git a/versions/n-/nameof.json b/versions/n-/nameof.json index 9449981790eafe..adb621c0f8647e 100644 --- a/versions/n-/nameof.json +++ b/versions/n-/nameof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a556c1feb836e7e35ec66c2c9879235827d45f7", + "version-string": "0.10.1", + "port-version": 0 + }, { "git-tree": "0862786acc338358d7e97a79e4a3c9e68cced4c7", "version-string": "0.10.0", From f2caf0ac16fd8b879d88dfcbbb0da89a582e7d27 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 21 Jun 2021 22:21:02 +0200 Subject: [PATCH 022/141] [OpenCV] update to 4.5.2 (#18572) * [OpenCV] update to 4.5.2 * update version refs * [OpenCV4] fix qt integration * fix refs --- ports/opencv/vcpkg.json | 2 +- ports/opencv3/0002-install-options.patch | 6 +-- .../0003-force-package-requirements.patch | 32 ++++++++-------- ports/opencv3/0006-fix-uwp.patch | 4 +- ports/opencv3/0008-devendor-quirc.patch | 4 +- ports/opencv3/portfile.cmake | 7 ++-- ports/opencv3/vcpkg.json | 2 +- ports/opencv4/0002-install-options.patch | 8 ++-- .../0003-force-package-requirements.patch | 34 ++++++++--------- ports/opencv4/0004-fix-policy-CMP0057.patch | 4 +- ports/opencv4/0006-fix-uwp.patch | 4 +- ports/opencv4/0008-devendor-quirc.patch | 4 +- ports/opencv4/0009-fix-qt-integration.patch | 37 +++++++++++++++++++ ports/opencv4/portfile.cmake | 28 ++++++++++++-- ports/opencv4/vcpkg.json | 3 +- versions/baseline.json | 8 ++-- versions/o-/opencv.json | 5 +++ versions/o-/opencv3.json | 5 +++ versions/o-/opencv4.json | 5 +++ 19 files changed, 138 insertions(+), 64 deletions(-) create mode 100644 ports/opencv4/0009-fix-qt-integration.patch diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 9268e4e2c0ef0d..5327c1ce6ac962 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencv", - "version": "4.5.1", + "version": "4.5.2", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch index 431e02bf6124d2..665ec01e62364b 100644 --- a/ports/opencv3/0002-install-options.patch +++ b/ports/opencv3/0002-install-options.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index fcb4a1d..5810b0c 100644 +index f6a2da5..10aa531 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -607,7 +607,7 @@ endif() @@ -12,10 +12,10 @@ index fcb4a1d..5810b0c 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 8a3dcdb..b8b3bae 100644 +index 3cb10a1..fc81377 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -262,7 +262,6 @@ if(MSVC) +@@ -276,7 +276,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch index e45ced441beaff..097e8abf8f8034 100644 --- a/ports/opencv3/0003-force-package-requirements.patch +++ b/ports/opencv3/0003-force-package-requirements.patch @@ -1,17 +1,17 @@ diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index f99bb33..5407f70 100644 +index 2d28dff..6dbeca9 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -7,7 +7,7 @@ if(BUILD_ZLIB) - ocv_clear_vars(ZLIB_FOUND) - else() - ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) +@@ -11,7 +11,7 @@ else() + set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + set(CMAKE_FIND_LIBRARY_SUFFIXES .so) + endif() - find_package(ZLIB "${MIN_VER_ZLIB}") + find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) - if(ZLIB_FOUND AND ANDROID) - if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$") - set(ZLIB_LIBRARIES z) -@@ -33,7 +33,7 @@ if(WITH_JPEG) + if(ANDROID) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) + unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) +@@ -41,7 +41,7 @@ if(WITH_JPEG) ocv_clear_vars(JPEG_FOUND) else() ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR) @@ -20,7 +20,7 @@ index f99bb33..5407f70 100644 endif() if(NOT JPEG_FOUND) -@@ -79,7 +79,7 @@ if(WITH_TIFF) +@@ -87,7 +87,7 @@ if(WITH_TIFF) ocv_clear_vars(TIFF_FOUND) else() ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR) @@ -29,7 +29,7 @@ index f99bb33..5407f70 100644 if(TIFF_FOUND) ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION) endif() -@@ -123,7 +123,7 @@ if(WITH_WEBP) +@@ -131,7 +131,7 @@ if(WITH_WEBP) ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR) else() ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) @@ -38,7 +38,7 @@ index f99bb33..5407f70 100644 if(WEBP_FOUND) set(HAVE_WEBP 1) endif() -@@ -164,7 +164,7 @@ if(WITH_JASPER) +@@ -172,7 +172,7 @@ if(WITH_JASPER) if(BUILD_JASPER) ocv_clear_vars(JASPER_FOUND) else() @@ -47,7 +47,7 @@ index f99bb33..5407f70 100644 endif() if(NOT JASPER_FOUND) -@@ -189,7 +189,7 @@ if(WITH_PNG) +@@ -197,7 +197,7 @@ if(WITH_PNG) ocv_clear_vars(PNG_FOUND) else() ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR) @@ -56,7 +56,7 @@ index f99bb33..5407f70 100644 if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -221,7 +221,7 @@ if(WITH_OPENEXR) +@@ -229,7 +229,7 @@ if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) if(NOT BUILD_OPENEXR) ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) @@ -65,7 +65,7 @@ index f99bb33..5407f70 100644 endif() if(OPENEXR_FOUND) -@@ -239,7 +239,7 @@ endif() +@@ -247,7 +247,7 @@ endif() # --- GDAL (optional) --- if(WITH_GDAL) @@ -74,7 +74,7 @@ index f99bb33..5407f70 100644 if(NOT GDAL_FOUND) set(HAVE_GDAL NO) -@@ -251,7 +251,7 @@ if(WITH_GDAL) +@@ -259,7 +259,7 @@ if(WITH_GDAL) endif() if(WITH_GDCM) diff --git a/ports/opencv3/0006-fix-uwp.patch b/ports/opencv3/0006-fix-uwp.patch index 551372950bd6ab..013c8adebb2799 100644 --- a/ports/opencv3/0006-fix-uwp.patch +++ b/ports/opencv3/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index efb6ca8..8ca8609 100644 +index bcbca83..872f05f 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1184,7 +1184,7 @@ function(ocv_add_perf_tests) +@@ -1186,7 +1186,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv3/0008-devendor-quirc.patch b/ports/opencv3/0008-devendor-quirc.patch index b77b1780e8d979..1dc11ffd787aeb 100644 --- a/ports/opencv3/0008-devendor-quirc.patch +++ b/ports/opencv3/0008-devendor-quirc.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5810b0c..04315e3 100644 +index 10aa531..74e5ca4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -771,7 +771,7 @@ if(WITH_OPENVX) +@@ -778,7 +778,7 @@ if(WITH_OPENVX) endif() if(WITH_QUIRC) diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 8b62f7ddc47f1c..4d93c4f1a14f9e 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -6,13 +6,13 @@ 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.13") +set(OPENCV_VERSION "3.4.14") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 ec87b10534b9187c5ac2eea498c05c73bceab08afaed93b5a117ed34d1eeeb0ffc45901642bebf8f55126fd49ec78d731fc61debe6b40d8642f1323b5dbbeacf + SHA512 b8373ead40549e3d487227947c6bd00f6eba368e48bb9356d41cb0f3bfabfb0b10b6e64712febc11ab1e5a1901b1db8b83b63ba492f4e3816c15fa7ddaaf7e69 HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -39,6 +39,7 @@ file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake") string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES "contrib" WITH_CONTRIB "cuda" WITH_CUBLAS "cuda" WITH_CUDA @@ -114,7 +115,7 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 49f0aed8e07a443f354859a16c8de5ceae26560f141721ae4beb0d5fcc5b24b755ee313519e159b1a5b6ba125dcca8584f2a515e0ac96a8c9c36bb11ac6b3375 + SHA512 30f4f25e40908a9d823304197c475dc0f1ae2b24ec5b1ce0484b39959b88897d1291b5b0e12530db24af96d664e90137582e4b03e4dca7fde1319044bdec9b77 HEAD_REF master PATCHES 0007-fix-hdf5.patch diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 42041c4c12ca73..cf7bb123405c99 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencv3", - "version": "3.4.13", + "version": "3.4.14", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch index 055719ca452230..ed32c5d31e6c9c 100644 --- a/ports/opencv4/0002-install-options.patch +++ b/ports/opencv4/0002-install-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45fc6de..9cd2b4e 100644 +index 5a0c62e..118b318 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -607,7 +607,7 @@ endif() +@@ -610,7 +610,7 @@ endif() ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) # --- Python Support --- @@ -12,10 +12,10 @@ index 45fc6de..9cd2b4e 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 5e3c056..19f5795 100644 +index 40a058d..04f50fb 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -264,7 +264,6 @@ if(MSVC) +@@ -278,7 +278,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch index cfbd8feb61400f..80101a51df4cbb 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -1,17 +1,17 @@ diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 2e4e4af..8cd9c75 100644 +index 23a6ca6..8ea5497 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -7,7 +7,7 @@ if(BUILD_ZLIB) - ocv_clear_vars(ZLIB_FOUND) - else() - ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) +@@ -11,7 +11,7 @@ else() + set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + set(CMAKE_FIND_LIBRARY_SUFFIXES .so) + endif() - find_package(ZLIB "${MIN_VER_ZLIB}") + find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) - if(ZLIB_FOUND AND ANDROID) - if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$") - set(ZLIB_LIBRARIES z) -@@ -33,7 +33,7 @@ if(WITH_JPEG) + if(ANDROID) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) + unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) +@@ -41,7 +41,7 @@ if(WITH_JPEG) ocv_clear_vars(JPEG_FOUND) else() ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR) @@ -20,7 +20,7 @@ index 2e4e4af..8cd9c75 100644 endif() if(NOT JPEG_FOUND) -@@ -79,7 +79,7 @@ if(WITH_TIFF) +@@ -87,7 +87,7 @@ if(WITH_TIFF) ocv_clear_vars(TIFF_FOUND) else() ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR) @@ -29,7 +29,7 @@ index 2e4e4af..8cd9c75 100644 if(TIFF_FOUND) ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION) endif() -@@ -123,7 +123,7 @@ if(WITH_WEBP) +@@ -131,7 +131,7 @@ if(WITH_WEBP) ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR) else() ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) @@ -38,7 +38,7 @@ index 2e4e4af..8cd9c75 100644 if(WEBP_FOUND) set(HAVE_WEBP 1) endif() -@@ -164,7 +164,7 @@ if(WITH_OPENJPEG) +@@ -172,7 +172,7 @@ if(WITH_OPENJPEG) if(BUILD_OPENJPEG) ocv_clear_vars(OpenJPEG_FOUND) else() @@ -47,7 +47,7 @@ index 2e4e4af..8cd9c75 100644 endif() if(NOT OpenJPEG_FOUND OR OPENJPEG_MAJOR_VERSION LESS 2) -@@ -192,7 +192,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) +@@ -200,7 +200,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) if(BUILD_JASPER) ocv_clear_vars(JASPER_FOUND) else() @@ -56,7 +56,7 @@ index 2e4e4af..8cd9c75 100644 endif() if(NOT JASPER_FOUND) -@@ -217,7 +217,7 @@ if(WITH_PNG) +@@ -225,7 +225,7 @@ if(WITH_PNG) ocv_clear_vars(PNG_FOUND) else() ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR) @@ -65,7 +65,7 @@ index 2e4e4af..8cd9c75 100644 if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -249,7 +249,7 @@ if(WITH_OPENEXR) +@@ -257,7 +257,7 @@ if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) if(NOT BUILD_OPENEXR) ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) @@ -74,7 +74,7 @@ index 2e4e4af..8cd9c75 100644 endif() if(OPENEXR_FOUND) -@@ -267,7 +267,7 @@ endif() +@@ -275,7 +275,7 @@ endif() # --- GDAL (optional) --- if(WITH_GDAL) @@ -83,7 +83,7 @@ index 2e4e4af..8cd9c75 100644 if(NOT GDAL_FOUND) set(HAVE_GDAL NO) -@@ -279,7 +279,7 @@ if(WITH_GDAL) +@@ -287,7 +287,7 @@ if(WITH_GDAL) endif() if(WITH_GDCM) diff --git a/ports/opencv4/0004-fix-policy-CMP0057.patch b/ports/opencv4/0004-fix-policy-CMP0057.patch index b0d8307fc29627..5ec18320fd3760 100644 --- a/ports/opencv4/0004-fix-policy-CMP0057.patch +++ b/ports/opencv4/0004-fix-policy-CMP0057.patch @@ -1,9 +1,9 @@ diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt -index a31d969..fa779e4 100644 +index 3a79631..b8ac4d5 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.3) set(VIDEOIO_PLUGIN_LIST "" CACHE STRING "List of videoio backends to be compiled as plugins (ffmpeg, gstreamer, mfx, msmf or special value 'all')") set(VIDEOIO_ENABLE_PLUGINS "ON" CACHE BOOL "Allow building videoio plugin support") - set(VIDEOIO_ENABLE_STRICT_PLUGIN_CHECK "ON" CACHE BOOL "Make sure OpenCV version is the same in plugin and host code") + mark_as_advanced(VIDEOIO_PLUGIN_LIST VIDEOIO_ENABLE_PLUGINS) diff --git a/ports/opencv4/0006-fix-uwp.patch b/ports/opencv4/0006-fix-uwp.patch index 19c6f8d92b28cd..983170e60abcc9 100644 --- a/ports/opencv4/0006-fix-uwp.patch +++ b/ports/opencv4/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index a548df3..1799e44 100644 +index 224953a..3b3a3b2 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1198,7 +1198,7 @@ function(ocv_add_perf_tests) +@@ -1200,7 +1200,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv4/0008-devendor-quirc.patch b/ports/opencv4/0008-devendor-quirc.patch index fc03838b28c7c6..ead184c4077906 100644 --- a/ports/opencv4/0008-devendor-quirc.patch +++ b/ports/opencv4/0008-devendor-quirc.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9cd2b4e..b34f20e 100644 +index 118b318..b6e661d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -776,7 +776,7 @@ if(WITH_OPENVX) +@@ -795,7 +795,7 @@ if(WITH_OPENVX) endif() if(WITH_QUIRC) diff --git a/ports/opencv4/0009-fix-qt-integration.patch b/ports/opencv4/0009-fix-qt-integration.patch new file mode 100644 index 00000000000000..4496c5f275a9f2 --- /dev/null +++ b/ports/opencv4/0009-fix-qt-integration.patch @@ -0,0 +1,37 @@ +From f479935cda5eb38a4a4a9e909b6f4f82a0c7533d Mon Sep 17 00:00:00 2001 +From: Christoph Rackwitz +Date: Thu, 8 Apr 2021 12:59:06 +0200 +Subject: [PATCH] fix for #19870 + +HAVE_QT and HAVE_WIN32UI can both be true at the same time +if HAVE_QT, window_w32.cpp is not included in the build, see CMakeLists.txt +--- + modules/highgui/src/window.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp +index 406871b7e8f8..d2cf1e1e4826 100644 +--- a/modules/highgui/src/window.cpp ++++ b/modules/highgui/src/window.cpp +@@ -93,7 +93,9 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu + break; + + case cv::WND_PROP_VSYNC: +- #if defined (HAVE_WIN32UI) ++ #if defined (HAVE_QT) ++ // nothing ++ #elif defined (HAVE_WIN32UI) + cvSetPropVsync_W32(name, (prop_value != 0)); + #else + // not implemented yet for other toolkits +@@ -191,7 +193,9 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id) + break; + + case cv::WND_PROP_VSYNC: +- #if defined (HAVE_WIN32UI) ++ #if defined (HAVE_QT) ++ return -1; ++ #elif defined (HAVE_WIN32UI) + return cvGetPropVsync_W32(name); + #else + return -1; diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 57fdeb32ea081e..e21711d1d916fd 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,13 +6,13 @@ 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.1") +set(OPENCV_VERSION "4.5.2") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0 + SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -22,6 +22,7 @@ vcpkg_from_github( 0005-fix-eigen.patch 0006-fix-uwp.patch 0008-devendor-quirc.patch + 0009-fix-qt-integration.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -41,6 +42,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) set(ADE_DIR ${CURRENT_INSTALLED_DIR}/share/ade CACHE PATH "Path to existing ADE CMake Config file") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES "ade" WITH_ADE "contrib" WITH_CONTRIB "cuda" WITH_CUBLAS @@ -138,13 +140,33 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7 + SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b HEAD_REF master PATCHES 0007-fix-hdf5.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/detect.caffemodel" + FILENAME "opencv-cache/wechat_qrcode/238e2b2d6f3c18d6c3a30de0c31e23cf-detect.caffemodel" + SHA512 58d62faf8679d3f568a26a1d9f7c2e88060426a440315ca8bce7b3b5a8efa34be670afd0abfd0dd5d89f89a042a2408ea602f937080abc6910c2e497b7f5a4b8 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/sr.caffemodel" + FILENAME "opencv-cache/wechat_qrcode/cbfcd60361a73beb8c583eea7e8e6664-sr.caffemodel" + SHA512 917c6f6b84a898b8c8c85c79359e48a779c8a600de563dac2e1c5d013401e9ac9dbcd435013a4ed7a69fc936839fb189aaa3038c127d04ceb6fd3b8fd9dd67bd + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/detect.prototxt" + FILENAME "opencv-cache/wechat_qrcode/6fb4976b32695f9f5c6305c19f12537d-detect.prototxt" + SHA512 2239d31a597049f358f09dbb4c0a7af0b384d9b67cfa3224f8c7e44329647cf19ee7929ac06199cca23bbbf431de0481b74ab51eace6aa20bb2e2fd19b536e49 + ) + vcpkg_download_distfile(OCV_DOWNLOAD + URLS "https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/a8b69ccc738421293254aec5ddb38bd523503252/sr.prototxt" + FILENAME "opencv-cache/wechat_qrcode/69db99927a70df953b471daaba03fbef-sr.prototxt" + SHA512 6b715ec45c3fd081e7e113e351edcef0f3d32a75f8b5a9ca2273cb5da9a1116a1b78cba45582a9acf67a7ab76dc4fcdf123f7b3a0d3de2f5c39b26ef450058b7 + ) vcpkg_download_distfile(OCV_DOWNLOAD URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/34e4206aef44d50e6bbcd0ab06354b52e7466d26/boostdesc_bgm.i" FILENAME "opencv-cache/xfeatures2d/boostdesc/0ea90e7a8f3f7876d450e4149c97c74f-boostdesc_bgm.i" diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 7515471ca60418..7d01aec4e93bce 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv4", - "version": "4.5.1", - "port-version": 1, + "version": "4.5.2", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 120c9655e445f4..8c11c5ac10a73a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4525,7 +4525,7 @@ "port-version": 0 }, "opencv": { - "baseline": "4.5.1", + "baseline": "4.5.2", "port-version": 0 }, "opencv2": { @@ -4533,12 +4533,12 @@ "port-version": 5 }, "opencv3": { - "baseline": "3.4.13", + "baseline": "3.4.14", "port-version": 0 }, "opencv4": { - "baseline": "4.5.1", - "port-version": 1 + "baseline": "4.5.2", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 94d54725048ec0..d12fa045f16ccf 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3815d0156fdd054436e6abc00d13129cb1bc347", + "version": "4.5.2", + "port-version": 0 + }, { "git-tree": "5095d4c281b1fa2afc8398bfc61a88dc1e96e7e6", "version": "4.5.1", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 9667226d7e312c..3237895a29d590 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "766b570f861ad21af950db7c02e5dc48d4fd1a1e", + "version": "3.4.14", + "port-version": 0 + }, { "git-tree": "4b65e217d97307583039d4324cd32488347cc344", "version": "3.4.13", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 25e9fa973433af..fa8a26c8599343 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac5c96fd5709b302c81b76814a3ccfd99dcdecdc", + "version": "4.5.2", + "port-version": 0 + }, { "git-tree": "c719098632c388044e4cd242a1f5276e81727466", "version": "4.5.1", From 842fc04ae675108cd50dc4df36d79a2df6b0cbeb Mon Sep 17 00:00:00 2001 From: "Lucius Q. User" <31438459+Lucius-Q-User@users.noreply.github.com> Date: Mon, 21 Jun 2021 23:29:58 +0300 Subject: [PATCH 023/141] [qt5-*] Make QT and dependents build on arm macos (#18567) * [qt5-*] Make it build on ARM64 macos * [qt5-base] update port version --- ports/qt5-base/portfile.cmake | 5 +++++ ports/qt5-base/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 551f328dd65327..25eeb2e5c819e5 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -306,6 +306,11 @@ elseif(VCPKG_TARGET_IS_LINUX) endif() elseif(VCPKG_TARGET_IS_OSX) list(APPEND CORE_OPTIONS -fontconfig) + if("${VCPKG_TARGET_ARCHITECTURE}" MATCHES "arm64") + FILE(READ "${SOURCE_PATH}/mkspecs/common/macx.conf" _tmp_contents) + string(REPLACE "QMAKE_APPLE_DEVICE_ARCHS = x86_64" "QMAKE_APPLE_DEVICE_ARCHS = arm64" _tmp_contents ${_tmp_contents}) + FILE(WRITE "${SOURCE_PATH}/mkspecs/common/macx.conf" ${_tmp_contents}) + endif() if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) else() diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 39e0c5586bd6a9..0d0c32119661e8 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 8, + "port-version": 9, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8c11c5ac10a73a..9bb4677150daa1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5094,7 +5094,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 8 + "port-version": 9 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index d206973941465b..6fda6b893c7437 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2362119eaacd46f6d1b0d27bac82b8851d84448f", + "version-semver": "5.15.2", + "port-version": 9 + }, { "git-tree": "78428fb3d23edf667e96afe8ea0292efc12e44a0", "version-semver": "5.15.2", From 0abccf6aa1e0852a8a3ea580acb609af1489bc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Mon, 21 Jun 2021 22:30:31 +0200 Subject: [PATCH 024/141] [pcre2] Update to 10.37 (#18547) - New upstream version 10.37 - Drop patches (fixed upstream): pcre2-10.35_add_check_for_Intel_CET.patch pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch pcre2-10.35_fix-space.patch - Switch from CONTROL to vcpkg.json .\vcpkg format-manifest .\ports\pcre2\CONTROL --- ports/pcre2/CONTROL | 5 - .../pcre2-10.35_add_check_for_Intel_CET.patch | 26 ---- ports/pcre2/pcre2-10.35_fix-space.patch | 11 -- ...fix_postfix_for_debug_Windows_builds.patch | 141 ------------------ ports/pcre2/portfile.cmake | 7 +- ports/pcre2/vcpkg.json | 6 + versions/baseline.json | 4 +- versions/p-/pcre2.json | 5 + 8 files changed, 15 insertions(+), 190 deletions(-) delete mode 100644 ports/pcre2/CONTROL delete mode 100644 ports/pcre2/pcre2-10.35_add_check_for_Intel_CET.patch delete mode 100644 ports/pcre2/pcre2-10.35_fix-space.patch delete mode 100644 ports/pcre2/pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch create mode 100644 ports/pcre2/vcpkg.json diff --git a/ports/pcre2/CONTROL b/ports/pcre2/CONTROL deleted file mode 100644 index ca6c845749ba90..00000000000000 --- a/ports/pcre2/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: pcre2 -Version: 10.35 -Port-Version: 2 -Homepage: https://pcre.org/ -Description: PCRE2 is a re-working of the original Perl Compatible Regular Expressions library diff --git a/ports/pcre2/pcre2-10.35_add_check_for_Intel_CET.patch b/ports/pcre2/pcre2-10.35_add_check_for_Intel_CET.patch deleted file mode 100644 index 81b91d028fcf89..00000000000000 --- a/ports/pcre2/pcre2-10.35_add_check_for_Intel_CET.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/CMakeLists.txt 2020-05-09 16:43:10.000000000 +0200 -+++ b/CMakeLists.txt 2020-07-09 19:33:12.725648600 +0200 -@@ -146,6 +146,23 @@ - ) - set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS}) - -+# Check whether Intel CET is enabled, and if so, adjust compiler flags. This -+# code was written by PH, trying to imitate the logic from the autotools -+# configuration. -+ -+CHECK_C_SOURCE_COMPILES( -+ "#ifndef __CET__ -+ #error CET is not enabled -+ #endif -+ int main() { return 0; }" -+ INTEL_CET_ENABLED -+) -+ -+IF (INTEL_CET_ENABLED) -+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mshstk") -+ENDIF(INTEL_CET_ENABLED) -+ -+ - # User-configurable options - # - # Note: CMakeSetup displays these in alphabetical order, regardless of diff --git a/ports/pcre2/pcre2-10.35_fix-space.patch b/ports/pcre2/pcre2-10.35_fix-space.patch deleted file mode 100644 index abcd75d2ca74ab..00000000000000 --- a/ports/pcre2/pcre2-10.35_fix-space.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2020-05-09 16:43:10.000000000 +0200 -+++ b/CMakeLists.txt 2020-06-03 20:50:46.532419900 +0200 -@@ -108,7 +108,7 @@ - - LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) - --SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${PROJECT_SOURCE_DIR}/src") -+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I\"${PROJECT_SOURCE_DIR}/src\"") - - # external packages - FIND_PACKAGE( BZip2 ) diff --git a/ports/pcre2/pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch b/ports/pcre2/pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch deleted file mode 100644 index 3cb78ae806012a..00000000000000 --- a/ports/pcre2/pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch +++ /dev/null @@ -1,141 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 1255) -+++ CMakeLists.txt (working copy) -@@ -475,6 +475,12 @@ - ${PROJECT_BINARY_DIR}/pcre2.h - @ONLY) - -+# Make sure to not link debug libs -+# against release libs and vice versa -+IF(WIN32) -+ SET(CMAKE_DEBUG_POSTFIX "d") -+ENDIF(WIN32) -+ - # Generate pkg-config files - - SET(PACKAGE_VERSION "${PCRE2_MAJOR}.${PCRE2_MINOR}") -@@ -483,6 +489,9 @@ - SET(exec_prefix "\${prefix}") - SET(libdir "\${exec_prefix}/lib") - SET(includedir "\${prefix}/include") -+IF(WIN32 AND (CMAKE_BUILD_TYPE MATCHES Debug)) -+ SET(LIB_POSTFIX ${CMAKE_DEBUG_POSTFIX}) -+ENDIF() - CONFIGURE_FILE(libpcre2-posix.pc.in libpcre2-posix.pc @ONLY) - SET(pkg_config_files ${pkg_config_files} "${CMAKE_CURRENT_BINARY_DIR}/libpcre2-posix.pc") - -@@ -622,11 +631,6 @@ - ENDIF(MSVC) - - SET(CMAKE_INCLUDE_CURRENT_DIR 1) --# needed to make sure to not link debug libs --# against release libs and vice versa --IF(WIN32) -- SET(CMAKE_DEBUG_POSTFIX "d") --ENDIF(WIN32) - - SET(targets) - -Index: configure.ac -=================================================================== ---- configure.ac (revision 1255) -+++ configure.ac (working copy) -@@ -1007,6 +1007,9 @@ - AM_CONDITIONAL([WITH_GCOV],[test "x$enable_coverage" = "xyes"]) - - # Produce these files, in addition to config.h. -+# LIB_POSTFIX is used by CMakeLists.txt for Windows debug builds. -+# Pass empty LIB_POSTFIX to *.pc files and pcre2-config here. -+AC_SUBST(LIB_POSTFIX) - AC_CONFIG_FILES( - Makefile - libpcre2-8.pc -Index: libpcre2-16.pc.in -=================================================================== ---- libpcre2-16.pc.in (revision 1255) -+++ libpcre2-16.pc.in (working copy) -@@ -8,6 +8,6 @@ - Name: libpcre2-16 - Description: PCRE2 - Perl compatible regular expressions C library (2nd API) with 16 bit character support - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lpcre2-16 -+Libs: -L${libdir} -lpcre2-16@LIB_POSTFIX@ - Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ - Cflags: -I${includedir} @PCRE2_STATIC_CFLAG@ -Index: libpcre2-32.pc.in -=================================================================== ---- libpcre2-32.pc.in (revision 1255) -+++ libpcre2-32.pc.in (working copy) -@@ -8,6 +8,6 @@ - Name: libpcre2-32 - Description: PCRE2 - Perl compatible regular expressions C library (2nd API) with 32 bit character support - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lpcre2-32 -+Libs: -L${libdir} -lpcre2-32@LIB_POSTFIX@ - Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ - Cflags: -I${includedir} @PCRE2_STATIC_CFLAG@ -Index: libpcre2-8.pc.in -=================================================================== ---- libpcre2-8.pc.in (revision 1255) -+++ libpcre2-8.pc.in (working copy) -@@ -8,6 +8,6 @@ - Name: libpcre2-8 - Description: PCRE2 - Perl compatible regular expressions C library (2nd API) with 8 bit character support - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lpcre2-8 -+Libs: -L${libdir} -lpcre2-8@LIB_POSTFIX@ - Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ - Cflags: -I${includedir} @PCRE2_STATIC_CFLAG@ -Index: libpcre2-posix.pc.in -=================================================================== ---- libpcre2-posix.pc.in (revision 1255) -+++ libpcre2-posix.pc.in (working copy) -@@ -8,6 +8,6 @@ - Name: libpcre2-posix - Description: Posix compatible interface to libpcre2-8 - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lpcre2-posix -+Libs: -L${libdir} -lpcre2-posix@LIB_POSTFIX@ - Cflags: -I${includedir} @PCRE2_STATIC_CFLAG@ - Requires.private: libpcre2-8 -Index: pcre2-config.in -=================================================================== ---- pcre2-config.in (revision 1255) -+++ pcre2-config.in (working copy) -@@ -86,7 +86,7 @@ - ;; - --libs-posix) - if test @enable_pcre2_8@ = yes ; then -- echo $libS$libR -lpcre2-posix -lpcre2-8 -+ echo $libS$libR -lpcre2-posix@LIB_POSTFIX@ -lpcre2-8@LIB_POSTFIX@ - else - echo "${usage}" 1>&2 - fi -@@ -93,7 +93,7 @@ - ;; - --libs8) - if test @enable_pcre2_8@ = yes ; then -- echo $libS$libR -lpcre2-8 -+ echo $libS$libR -lpcre2-8@LIB_POSTFIX@ - else - echo "${usage}" 1>&2 - fi -@@ -100,7 +100,7 @@ - ;; - --libs16) - if test @enable_pcre2_16@ = yes ; then -- echo $libS$libR -lpcre2-16 -+ echo $libS$libR -lpcre2-16@LIB_POSTFIX@ - else - echo "${usage}" 1>&2 - fi -@@ -107,7 +107,7 @@ - ;; - --libs32) - if test @enable_pcre2_32@ = yes ; then -- echo $libS$libR -lpcre2-32 -+ echo $libS$libR -lpcre2-32@LIB_POSTFIX@ - else - echo "${usage}" 1>&2 - fi diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index e8ddb6a23a77ae..060fd67b00750c 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -1,10 +1,7 @@ -set(PCRE2_VERSION 10.35) -set(EXPECTED_SHA bf1cb6ab8b1103f9503609783945b02cdc4294bb266643d0ba03656c941f07b6e183793f3bf513da950460e78cb9b429bff8ade27d8930339a63caed3a3236e3) +set(PCRE2_VERSION 10.37) +set(EXPECTED_SHA f91760a8e0747f52211612fb0e134d685e224d16bd884eb574718d077a586b1fd7b6435d4e3b75c879b12e02b252467ecc28cdc4bc2903c783dacab089f99c99) set(PATCHES - pcre2-10.35_fix-space.patch # Upstream: https://bugs.exim.org/show_bug.cgi?id=2588 pcre2-10.35_fix-uwp.patch - pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch # Upstream: https://bugs.exim.org/show_bug.cgi?id=2600 - pcre2-10.35_add_check_for_Intel_CET.patch # Upstream: https://bugs.exim.org/show_bug.cgi?id=2578 ) vcpkg_download_distfile(ARCHIVE diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json new file mode 100644 index 00000000000000..80d87e8feeaa58 --- /dev/null +++ b/ports/pcre2/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "pcre2", + "version-string": "10.37", + "description": "PCRE2 is a re-working of the original Perl Compatible Regular Expressions library", + "homepage": "https://pcre.org/" +} diff --git a/versions/baseline.json b/versions/baseline.json index 9bb4677150daa1..b3ba9db1370488 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4765,8 +4765,8 @@ "port-version": 8 }, "pcre2": { - "baseline": "10.35", - "port-version": 2 + "baseline": "10.37", + "port-version": 0 }, "pdal": { "baseline": "1.7.1", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index 8f30cf71f58383..318f0838ee1288 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f61b1640aff6d4d306d30338bbd360c223301b0", + "version-string": "10.37", + "port-version": 0 + }, { "git-tree": "c0357d3b67540bd7e46f4301e5e1507ecddfaa1e", "version-string": "10.35", From fed59c0cc84b3dfda5592e2804ce9f427b1afafb Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 22 Jun 2021 04:32:55 +0800 Subject: [PATCH 025/141] [openblas] Fix the macro collision with Windows 10 SDK (#18530) * [openblas] Fix the macro collision with Windows 10 SDK * Update version files * Update feature thread as threads in vcpkg.json * Update versions/o-/openblas.json --- ports/openblas/fix-marco-conflict.patch | 244 ++++++++++++++++++++++++ ports/openblas/portfile.cmake | 1 + ports/openblas/vcpkg.json | 4 +- versions/baseline.json | 2 +- versions/o-/openblas.json | 5 + 5 files changed, 253 insertions(+), 3 deletions(-) create mode 100644 ports/openblas/fix-marco-conflict.patch diff --git a/ports/openblas/fix-marco-conflict.patch b/ports/openblas/fix-marco-conflict.patch new file mode 100644 index 00000000000000..939461875ea6c9 --- /dev/null +++ b/ports/openblas/fix-marco-conflict.patch @@ -0,0 +1,244 @@ +diff --git a/cmake/utils.cmake b/cmake/utils.cmake +index 1c21e77..3894011 100644 +--- a/cmake/utils.cmake ++++ b/cmake/utils.cmake +@@ -251,6 +251,19 @@ function(GenerateNamedObjects sources_in) + # now add the object and set the defines + set(obj_defines ${defines_in}) + ++ list(FIND obj_defines "RC" def_idx) ++ if (${def_idx} GREATER -1) ++ # list(REMOVE_AT ${obj_defines} ${def_idx}) ++ list (REMOVE_ITEM obj_defines "RC") ++ list(APPEND obj_defines "RC=RC") ++ endif () ++ list(FIND obj_defines "CR" def_idx) ++ if (${def_idx} GREATER -1) ++ # list(REMOVE_AT ${obj_defines} ${def_idx}) ++ list (REMOVE_ITEM obj_defines "CR") ++ list(APPEND obj_defines "CR=CR") ++ endif () ++ + if (use_cblas) + set(obj_name "cblas_${obj_name}") + list(APPEND obj_defines "CBLAS") +diff --git a/driver/level3/Makefile b/driver/level3/Makefile +index 09a62d9..970bc58 100644 +--- a/driver/level3/Makefile ++++ b/driver/level3/Makefile +@@ -371,7 +371,7 @@ cgemm_rr.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + cgemm_rc.$(SUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + cgemm_cn.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -419,7 +419,7 @@ zgemm_rr.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + zgemm_rc.$(SUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + zgemm_cn.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -467,7 +467,7 @@ xgemm_rr.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + xgemm_rc.$(SUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + xgemm_cn.$(SUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -578,7 +578,7 @@ cgemm_thread_rr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + cgemm_thread_rc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + cgemm_thread_cn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -626,7 +626,7 @@ zgemm_thread_rr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + zgemm_thread_rc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + zgemm_thread_cn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -674,7 +674,7 @@ xgemm_thread_rr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + xgemm_thread_rc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + xgemm_thread_cn.$(SUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -1841,7 +1841,7 @@ cgemm3m_rr.$(SUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + cgemm3m_rc.$(SUFFIX) : gemm3m.c gemm3m_level3.c +- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + cgemm3m_cn.$(SUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -1889,7 +1889,7 @@ zgemm3m_rr.$(SUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + zgemm3m_rc.$(SUFFIX) : gemm3m.c gemm3m_level3.c +- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + zgemm3m_cn.$(SUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -1937,7 +1937,7 @@ xgemm3m_rr.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + xgemm3m_rc.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + xgemm3m_cn.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -1994,7 +1994,7 @@ cgemm3m_thread_rr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + cgemm3m_thread_rc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + cgemm3m_thread_cn.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -2042,7 +2042,7 @@ zgemm3m_thread_rr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + zgemm3m_thread_rc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + zgemm3m_thread_cn.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -2090,7 +2090,7 @@ xgemm3m_thread_rr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + xgemm3m_thread_rc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + xgemm3m_thread_cn.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -2763,7 +2763,7 @@ cgemm_rr.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + cgemm_rc.$(PSUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + cgemm_cn.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -2811,7 +2811,7 @@ zgemm_rr.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + zgemm_rc.$(PSUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + zgemm_cn.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -2859,7 +2859,7 @@ xgemm_rr.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + xgemm_rc.$(PSUFFIX) : gemm.c level3.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + xgemm_cn.$(PSUFFIX) : gemm.c level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -2971,7 +2971,7 @@ cgemm_thread_rr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + cgemm_thread_rc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + cgemm_thread_cn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -3019,7 +3019,7 @@ zgemm_thread_rr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + zgemm_thread_rc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + zgemm_thread_cn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -3067,7 +3067,7 @@ xgemm_thread_rr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + xgemm_thread_rc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + xgemm_thread_cn.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -4234,7 +4234,7 @@ cgemm3m_rr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + cgemm3m_rc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c +- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + cgemm3m_cn.$(PSUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -4282,7 +4282,7 @@ zgemm3m_rr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + zgemm3m_rc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c +- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + zgemm3m_cn.$(PSUFFIX) : gemm3m.c gemm3m_level3.c + $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -4330,7 +4330,7 @@ xgemm3m_rr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + xgemm3m_rc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + xgemm3m_cn.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -4387,7 +4387,7 @@ cgemm3m_thread_rr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + cgemm3m_thread_rc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + cgemm3m_thread_cn.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -4435,7 +4435,7 @@ zgemm3m_thread_rr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + zgemm3m_thread_rc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + zgemm3m_thread_cn.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCN $< -o $(@F) +@@ -4483,7 +4483,7 @@ xgemm3m_thread_rr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRR $< -o $(@F) + + xgemm3m_thread_rc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h +- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC $< -o $(@F) ++ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DRC=RC $< -o $(@F) + + xgemm3m_thread_cn.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h + $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCN $< -o $(@F) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 05e68a1755f4ff..df74c3e68219de 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( fix-redefinition-function.patch fix-pkg-config.patch fix-uwp-build.patch + fix-marco-conflict.patch ) find_program(GIT NAMES git git.cmd) diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index f29249cadc419f..657558ade14e30 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openblas", "version": "0.3.10", - "port-version": 1, + "port-version": 2, "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "default-features": [ @@ -14,7 +14,7 @@ { "name": "openblas", "features": [ - "thread" + "threads" ] } ] diff --git a/versions/baseline.json b/versions/baseline.json index b3ba9db1370488..b98b5efa7736dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4494,7 +4494,7 @@ }, "openblas": { "baseline": "0.3.10", - "port-version": 1 + "port-version": 2 }, "opencascade": { "baseline": "7.5.0", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 3f9a0ca498c702..fcc607ec4f243d 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "510adc011214327468768aa22c1f08a2d2d632ab", + "version": "0.3.10", + "port-version": 2 + }, { "git-tree": "b2beefd63c302b41dc5699ea88b825659c86ac2d", "version": "0.3.10", From faa643fedfdd9f8a48fb151c084a6e2e856bd7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 21 Jun 2021 22:33:46 +0200 Subject: [PATCH 026/141] [pthreads] Fix debug dll look-up path (#18528) --- ports/pthreads/vcpkg-cmake-wrapper.cmake | 9 ++++++--- ports/pthreads/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pthreads.json | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/pthreads/vcpkg-cmake-wrapper.cmake b/ports/pthreads/vcpkg-cmake-wrapper.cmake index 12d390a7ae2182..f9818d38456d1b 100644 --- a/ports/pthreads/vcpkg-cmake-wrapper.cmake +++ b/ports/pthreads/vcpkg-cmake-wrapper.cmake @@ -77,13 +77,16 @@ mark_as_advanced(PThreads4W_INCLUDE_DIR PThreads4W_LIBRARY PThreads4W_CXXEXC_LIB set(PThreads4W_DLL_DIR ${PThreads4W_INCLUDE_DIR}) list(TRANSFORM PThreads4W_DLL_DIR APPEND "/../bin") message(STATUS "PThreads4W_DLL_DIR: ${PThreads4W_DLL_DIR}") +set(PThreads4W_DEBUG_DLL_DIR ${PThreads4W_INCLUDE_DIR}) +list(TRANSFORM PThreads4W_DEBUG_DLL_DIR APPEND "/../debug/bin") +message(STATUS "PThreads4W_DEBUG_DLL_DIR: ${PThreads4W_DEBUG_DLL_DIR}") find_file(PThreads4W_LIBRARY_RELEASE_DLL NAMES pthreadVC${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR}) -find_file(PThreads4W_LIBRARY_DEBUG_DLL NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DLL_DIR}) +find_file(PThreads4W_LIBRARY_DEBUG_DLL NAMES pthreadVC${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR}) find_file(PThreads4W_CXXEXC_LIBRARY_RELEASE_DLL NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR}) -find_file(PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DLL_DIR}) +find_file(PThreads4W_CXXEXC_LIBRARY_DEBUG_DLL NAMES pthreadVCE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR}) find_file(PThreads4W_STRUCTEXC_LIBRARY_RELEASE_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}.dll PATHS ${PThreads4W_DLL_DIR}) -find_file(PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DLL_DIR}) +find_file(PThreads4W_STRUCTEXC_LIBRARY_DEBUG_DLL NAMES pthreadVSE${PThreads4W_MAJOR_VERSION}d.dll PATHS ${PThreads4W_DEBUG_DLL_DIR}) #Compatibility definitions, deprecated set(PTHREAD_INCLUDE_DIR ${PThreads4W_INCLUDE_DIR} CACHE PATH "") diff --git a/ports/pthreads/vcpkg.json b/ports/pthreads/vcpkg.json index 77b950b1422229..db809649bf64b0 100644 --- a/ports/pthreads/vcpkg.json +++ b/ports/pthreads/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pthreads", "version": "3.0.0", - "port-version": 9, + "port-version": 10, "description": "pthreads for windows", "homepage": "https://sourceware.org/pub/pthreads-win32/" } diff --git a/versions/baseline.json b/versions/baseline.json index b98b5efa7736dd..b90d9ed8ac9482 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5022,7 +5022,7 @@ }, "pthreads": { "baseline": "3.0.0", - "port-version": 9 + "port-version": 10 }, "pugixml": { "baseline": "1.11.4", diff --git a/versions/p-/pthreads.json b/versions/p-/pthreads.json index d80291862bc950..78edfdfedfaacc 100644 --- a/versions/p-/pthreads.json +++ b/versions/p-/pthreads.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab9d25f08115355ea2d4e4c6eae94626fa86fded", + "version": "3.0.0", + "port-version": 10 + }, { "git-tree": "f5b91f46526fb5abd97b07febd2563f3a3688769", "version": "3.0.0", From aaffe5fc4caecfc25cf3a3d90bcb89af84002eee Mon Sep 17 00:00:00 2001 From: SvenPStarFinanz Date: Mon, 21 Jun 2021 22:44:04 +0200 Subject: [PATCH 027/141] [gtest] Update to 1.11.0 (#18509) * [gtest] Update to release version 1.11.0 * x-add-version * Update ports/gtest/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * renewal of x-add-version. Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/gtest/portfile.cmake | 4 ++-- ports/gtest/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gtest.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 69f7ddacf11850..0053f5d5b4544b 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/googletest - REF f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4 #commite on 2021-04-29 - SHA512 8168cc2b2c2f18ae7411db8a74369c98bb2d19b5be94a5a5f96a1d4e8e22b70c219c1cdfaef934b674d9c078dd97d0481c62e382aab432e3b89aa79ea5051673 + REF release-1.11.0 + SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28 HEAD_REF master PATCHES fix-main-lib-path.patch diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index 0c718dc522d93d..1d2a266ccdb79d 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtest", - "version-date": "2021-05-07", + "version-semver": "1.11.0", "description": "GoogleTest and GoogleMock testing frameworks", "homepage": "https://github.com/google/googletest" } diff --git a/versions/baseline.json b/versions/baseline.json index b90d9ed8ac9482..82c91a73adbef6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2417,7 +2417,7 @@ "port-version": 0 }, "gtest": { - "baseline": "2021-05-07", + "baseline": "1.11.0", "port-version": 0 }, "gtk": { diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 090e95999850e5..9afd832b7293a5 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dd6b8fb34e78fd1646f5d98720dd563d4a38a33", + "version-semver": "1.11.0", + "port-version": 0 + }, { "git-tree": "c37414d7a3b02afc05799bf525acb49c5ee060d1", "version-date": "2021-05-07", From e7d4cab9a63acc9116dadf0d04a9aaa9f2d191b3 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 21 Jun 2021 22:45:05 +0200 Subject: [PATCH 028/141] [librttopo] Allow building for Android (#18451) * [librttopo] Allow building for android * x-add-version * Update versions/l-/librttopo.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/librttopo/CONTROL | 2 +- ports/librttopo/portfile.cmake | 2 +- versions/baseline.json | 2 +- versions/l-/librttopo.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/librttopo/CONTROL b/ports/librttopo/CONTROL index fd8e85fbbcd96d..c54f902b1dc073 100644 --- a/ports/librttopo/CONTROL +++ b/ports/librttopo/CONTROL @@ -1,5 +1,5 @@ Source: librttopo -Version: 1.1.0-2 +Version: 1.1.0-3 Homepage: https://git.osgeo.org/gitea/rttopo/librttopo Description: The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided [data stores] (doc/DATASTORES.md) and released under the GNU GPL license (version 2 or later). Build-Depends: geos diff --git a/ports/librttopo/portfile.cmake b/ports/librttopo/portfile.cmake index 77d7b5932b3377..a689b00431b784 100644 --- a/ports/librttopo/portfile.cmake +++ b/ports/librttopo/portfile.cmake @@ -34,7 +34,7 @@ if (VCPKG_TARGET_IS_WINDOWS) file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/librttopo.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/librttopo.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX +else () # Build in UNIX vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG diff --git a/versions/baseline.json b/versions/baseline.json index 82c91a73adbef6..9be41fbabb9cff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3517,7 +3517,7 @@ "port-version": 2 }, "librttopo": { - "baseline": "1.1.0-2", + "baseline": "1.1.0-3", "port-version": 0 }, "libsamplerate": { diff --git a/versions/l-/librttopo.json b/versions/l-/librttopo.json index 3c7a9332962764..48dc1400e6e2bf 100644 --- a/versions/l-/librttopo.json +++ b/versions/l-/librttopo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b248b7c998e21a3feaf8581d8418306d54d5edc9", + "version-string": "1.1.0-3", + "port-version": 0 + }, { "git-tree": "dfaa13a1e256dae5bf673ee6c803b30d73ce25d8", "version-string": "1.1.0-2", From 7a535febf138faed9faf7bd4ca1a2ee40c9a0155 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 21 Jun 2021 22:45:33 +0200 Subject: [PATCH 029/141] [Qt6] Update to 6.1.1 (#18320) * [qt6] Update to 6.1.1 * version stuff * fix empty dir * update version * fix casing in qtbase * [libpq] add secure32.lib on windows * add clang-cl fix * version stuff * fix flag removal by adding a space * version stuff * make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q * fix libpq wrapper opensll linkage on linux * use policy to fix dependent ports * version stuff * use upstream patch * version stuff * fix source location for clang-cl * version stuff * remove ws change * version stuff --- ports/qt/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtbase/20b3eb0.diff | 130 ++++++++++++++++++ ports/qtbase/clang-cl_source_location.patch | 13 ++ ports/qtbase/cmake/qt_install_submodule.cmake | 30 ++-- ports/qtbase/cmake/qt_port_details.cmake | 51 +++---- ports/qtbase/dc5e7b6.diff | 22 +++ ports/qtbase/portfile.cmake | 30 ++-- ports/qtbase/qt.conf.in | 16 +-- ports/qtbase/vcpkg.json | 2 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtimageformats/portfile.cmake | 12 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtimageformats/webp.patch | 17 --- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 2 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquickcontrols2/vcpkg.json | 2 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/portfile.cmake | 6 +- ports/qttools/vcpkg.json | 2 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- versions/baseline.json | 48 +++---- versions/q-/qt.json | 5 + versions/q-/qt5compat.json | 5 + versions/q-/qtactiveqt.json | 5 + versions/q-/qtbase.json | 5 + versions/q-/qtcharts.json | 5 + versions/q-/qtcoap.json | 5 + versions/q-/qtdatavis3d.json | 5 + versions/q-/qtdeclarative.json | 5 + versions/q-/qtdoc.json | 5 + versions/q-/qtimageformats.json | 5 + versions/q-/qtlottie.json | 5 + versions/q-/qtmqtt.json | 5 + versions/q-/qtnetworkauth.json | 5 + versions/q-/qtopcua.json | 5 + versions/q-/qtquick3d.json | 5 + versions/q-/qtquickcontrols2.json | 5 + versions/q-/qtquicktimeline.json | 5 + versions/q-/qtscxml.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 + 59 files changed, 404 insertions(+), 139 deletions(-) create mode 100644 ports/qtbase/20b3eb0.diff create mode 100644 ports/qtbase/clang-cl_source_location.patch create mode 100644 ports/qtbase/dc5e7b6.diff delete mode 100644 ports/qtimageformats/webp.patch diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 90927a82b0f0c7..2c4c3da6322638 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 375f8b2f68a463..85c1e355ac06e7 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index 74082ea18277f5..99dbf9e75899d0 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "ActiveQt", "homepage": "https://www.qt.io/", "supports": "windows", diff --git a/ports/qtbase/20b3eb0.diff b/ports/qtbase/20b3eb0.diff new file mode 100644 index 00000000000000..978b30ffa5bc8a --- /dev/null +++ b/ports/qtbase/20b3eb0.diff @@ -0,0 +1,130 @@ +From 20b3eb0fd8b5f82cf432f2c06e7c5d3f533df0a5 Mon Sep 17 00:00:00 2001 +From: Cristian Adam +Date: Thu, 03 Jun 2021 12:42:07 +0200 +Subject: [PATCH] CMake: Add support for building with clang-cl + +qmake had support for building with clang-cl as the win32-clang-msvc mkspec. + +Task-number: QTBUG-89642 +Task-number: QTBUG-88081 +Change-Id: I0709c289f90fedb121620d1e67ef841602219816 +Reviewed-by: Alexandru Croitor +--- + +diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake +index bb8b146..792276e 100644 +--- a/cmake/QtBuild.cmake ++++ b/cmake/QtBuild.cmake +@@ -285,7 +285,9 @@ + list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS WIN64 _WIN64) + endif() + if(MSVC) +- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") ++ if (CLANG) ++ set(QT_DEFAULT_MKSPEC win32-clang-msvc) ++ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") + set(QT_DEFAULT_MKSPEC win32-arm64-msvc) + else() + set(QT_DEFAULT_MKSPEC win32-msvc) +diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake +index 0c57d9e..0eeccce 100644 +--- a/cmake/QtFlagHandlingHelpers.cmake ++++ b/cmake/QtFlagHandlingHelpers.cmake +@@ -235,7 +235,7 @@ + function(qt_set_msvc_cplusplus_options target visibility) + # For MSVC we need to explicitly pass -Zc:__cplusplus to get correct __cplusplus. + # Check qt_config_compile_test for more info. +- if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1913) ++ if(MSVC AND MSVC_VERSION GREATER_EQUAL 1913) + target_compile_options("${target}" ${visibility} "-Zc:__cplusplus" "-permissive-") + endif() + endfunction() +diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt +index 2c991f7..9f0c95e 100644 +--- a/src/corelib/CMakeLists.txt ++++ b/src/corelib/CMakeLists.txt +@@ -263,4 +263,24 @@ + # special case end + ) + ++if (MSVC AND CLANG) ++ foreach(subarch sse4_1 rdrnd rdseed) ++ if (TEST_subarch_${subarch}) ++ qt_internal_add_simd_part(Core SIMD ${subarch} ++ SOURCES ++ global/qsimd.cpp ++ ) ++ endif() ++ endforeach() ++ ++ foreach(subarch sse4_1 aesni) ++ if (TEST_subarch_${subarch}) ++ qt_internal_add_simd_part(Core SIMD ${subarch} ++ SOURCES ++ tools/qhash.cpp ++ ) ++ endif() ++ endforeach() ++endif() ++ + # special case begin +diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h +index 5869751..6108b07 100644 +--- a/src/corelib/global/qt_pch.h ++++ b/src/corelib/global/qt_pch.h +@@ -62,17 +62,22 @@ + # define _POSIX_ + # include + # undef _POSIX_ +-#endif +-#include +-#include +-#include +-#include +-#include /* All moc genereated code has this include */ +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++# if defined(Q_CC_CLANG) && defined(Q_CC_MSVC) ++// See https://bugs.llvm.org/show_bug.cgi?id=41226 ++# include ++__declspec(selectany) auto *__wmemchr_symbol_loader_value = wmemchr(L"", L'0', 0); ++# endif ++# endif ++# include ++# include ++# include ++# include ++# include /* All moc genereated code has this include */ ++# include ++# include ++# include ++# include ++# include ++# include ++# include + #endif +diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt +index 5fe4d59..04f58dd 100644 +--- a/src/gui/CMakeLists.txt ++++ b/src/gui/CMakeLists.txt +@@ -577,6 +577,15 @@ + ) + endif() + ++ if (MSVC AND CLANG AND TEST_subarch_sse4_1) ++ qt_internal_add_simd_part(Gui SIMD sse4_1 ++ SOURCES ++ painting/qdrawhelper.cpp ++ painting/qdrawhelper_sse2.cpp ++ painting/qdrawhelper_ssse3.cpp ++ ) ++ endif() ++ + qt_internal_add_simd_part(Gui SIMD ssse3 + SOURCES + image/qimage_ssse3.cpp diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch new file mode 100644 index 00000000000000..6432202454e209 --- /dev/null +++ b/ports/qtbase/clang-cl_source_location.patch @@ -0,0 +1,13 @@ +diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h +index 823b2057b..4a8cd4fa8 100644 +--- a/src/corelib/kernel/qproperty.h ++++ b/src/corelib/kernel/qproperty.h +@@ -49,7 +49,7 @@ + + #include + +-#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) ++#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval) + #include + #define QT_SOURCE_LOCATION_NAMESPACE std + #define QT_PROPERTY_COLLECT_BINDING_LOCATION diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index 169e86cffaae03..13ec84b847f770 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -8,7 +8,7 @@ endif() #set(PORT_DEBUG ON) if(NOT DEFINED QT6_DIRECTORY_PREFIX) - set(QT6_DIRECTORY_PREFIX "qt6/") + set(QT6_DIRECTORY_PREFIX "Qt6/") endif() macro(qt_stop_on_update) @@ -52,12 +52,12 @@ function(qt_install_submodule) if(VCPKG_TARGET_IS_WINDOWS) if(NOT ${PORT} MATCHES "qtbase") - list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/qt6/bin/syncqt.pl") + list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl") endif() set(PERL_OPTION -DHOST_PERL:PATH="${PERL}") else() if(NOT ${PORT} MATCHES "qtbase") - list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/qt6/bin/syncqt.pl) + list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl) endif() set(PERL_OPTION -DHOST_PERL:PATH=${PERL}) endif() @@ -97,16 +97,16 @@ function(qt_install_submodule) ${_qis_CONFIGURE_OPTIONS_RELEASE} -DINSTALL_DOCDIR:STRING=doc/${QT6_DIRECTORY_PREFIX} -DINSTALL_INCLUDEDIR:STRING=include/${QT6_DIRECTORY_PREFIX} - -DINSTALL_DESCRIPTIONSDIR:STRING=share/qt6/modules - -DINSTALL_MKSPECSDIR:STRING=share/qt6/mkspecs + -DINSTALL_DESCRIPTIONSDIR:STRING=share/Qt6/modules + -DINSTALL_MKSPECSDIR:STRING=share/Qt6/mkspecs -DINSTALL_TRANSLATIONSDIR:STRING=translations/${QT6_DIRECTORY_PREFIX} OPTIONS_DEBUG -DINPUT_debug:BOOL=ON -DINSTALL_DOCDIR:STRING=../doc/${QT6_DIRECTORY_PREFIX} -DINSTALL_INCLUDEDIR:STRING=../include/${QT6_DIRECTORY_PREFIX} -DINSTALL_TRANSLATIONSDIR:STRING=../translations/${QT6_DIRECTORY_PREFIX} - -DINSTALL_DESCRIPTIONSDIR:STRING=../share/qt6/modules - -DINSTALL_MKSPECSDIR:STRING=../share/qt6/mkspecs + -DINSTALL_DESCRIPTIONSDIR:STRING=../share/Qt6/modules + -DINSTALL_MKSPECSDIR:STRING=../share/Qt6/mkspecs ${_qis_CONFIGURE_OPTIONS_DEBUG} ) vcpkg_install_cmake(ADD_BIN_TO_PATH) @@ -115,7 +115,7 @@ function(qt_install_submodule) ## Handle CMake files. set(COMPONENTS) file(GLOB COMPONENTS_OR_FILES LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/share/Qt6*") - list(REMOVE_ITEM COMPONENTS_OR_FILES "${CURRENT_PACKAGES_DIR}/share/qt6") + list(REMOVE_ITEM COMPONENTS_OR_FILES "${CURRENT_PACKAGES_DIR}/share/Qt6") foreach(_glob IN LISTS COMPONENTS_OR_FILES) if(IS_DIRECTORY "${_glob}") string(REPLACE "${CURRENT_PACKAGES_DIR}/share/Qt6" "" _component "${_glob}") @@ -126,7 +126,7 @@ function(qt_install_submodule) foreach(_comp IN LISTS COMPONENTS) if(EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6${_comp}") - vcpkg_fixup_cmake_targets(CONFIG_PATH share/Qt6${_comp} TARGET_PATH share/Qt6${_comp} TOOLS_PATH "tools/qt6/bin") + vcpkg_fixup_cmake_targets(CONFIG_PATH share/Qt6${_comp} TARGET_PATH share/Qt6${_comp} TOOLS_PATH "tools/Qt6/bin") # Would rather put it into share/cmake as before but the import_prefix correction in vcpkg_fixup_cmake_targets is working against that. else() message(STATUS "WARNING: Qt component ${_comp} not found/built!") @@ -150,7 +150,7 @@ function(qt_install_submodule) endforeach() endif() - set(qt_tooldest "${CURRENT_PACKAGES_DIR}/tools/qt6/bin") + set(qt_tooldest "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") set(qt_searchdir "${CURRENT_PACKAGES_DIR}/bin") ## Handle Tools foreach(_tool IN LISTS _qis_TOOL_NAMES) @@ -169,17 +169,17 @@ function(qt_install_submodule) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/") - file(COPY "${CURRENT_PACKAGES_DIR}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt6/bin") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") endif() - file(GLOB_RECURSE _installed_dll_files RELATIVE "${CURRENT_INSTALLED_DIR}/tools/qt6/bin" "${CURRENT_INSTALLED_DIR}/tools/qt6/bin/*.dll") + file(GLOB_RECURSE _installed_dll_files RELATIVE "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin" "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/*.dll") foreach(_dll_to_remove IN LISTS _installed_dll_files) - file(GLOB_RECURSE _packaged_dll_file "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/${_dll_to_remove}") + file(GLOB_RECURSE _packaged_dll_file "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${_dll_to_remove}") if(EXISTS "${_packaged_dll_file}") file(REMOVE "${_packaged_dll_file}") endif() endforeach() - file(GLOB_RECURSE _folders LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/**/") - file(GLOB_RECURSE _files "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/**/") + file(GLOB_RECURSE _folders LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/**/") + file(GLOB_RECURSE _files "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/**/") if(_files) list(REMOVE_ITEM _folders ${_files}) endif() diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index eb3f464b02580b..e86a38c650e6b3 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.1.0) +set(QT_VERSION 6.1.1) set(QT_GIT_TAG v${QT_VERSION}) #set(QT_UPDATE_VERSION TRUE) @@ -30,36 +30,37 @@ set(QT_PORTS qtbase qtscxml qtvirtualkeyboard qtcharts + qt ) foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF 80a246a982e1c332f074f35a365d453c932ccd4e) -set(qttools_REF 59ba188f13fa01e8590899ecbda47d2680929856) -set(qtdeclarative_REF cb6675c5d314c05fb16fe2b9c555cc6a2c488bed) -set(qtsvg_REF 5bf7d6f7b91a2cb79910cb42afcffddff1ed838b) -set(qt5compat_REF 752f10fa6f84b8b2b738e46efacbce32125efbb6) -set(qtshadertools_REF bcf88361f7a96f02f6c8f77a7fdf8abefae21df4) -set(qtquicktimeline_REF d13e054604a24cd88edb92d3e85529f8c8ea631f) -set(qtquick3d_REF b3fd7feee9a6350580203935dea7b221de67e4b2) -set(qttranslations_REF e69b51751a9ec8c5d45661b83981297c432d0d57) -set(qtwayland_REF e22789176e48314be1cbea5d12366eb77a220425) -set(qtdoc_REF a8448c0b87376598a64333266f5acccd05e7a1e9) -set(qtimageformats_REF 2a6985b6e73be2b9f371938ca826430be13f55fd) -set(qtmqtt_REF 40502be35ca30025b45570574d4ee0f0b6bada2d) -set(qtquickcontrols2_REF 104555a8682d4095841feb9b02c9fd223c707b8e) -set(qtnetworkauth_REF 0e055a0ace5705d7a162236bf375b057e9ca124e) -set(qtcoap_REF f09ed2ed8078dee75b5e7682b5832b2cee80c3b0) -set(qtopcua_REF 592ef6d24e8ebee0a35b0e46653f3e5b4f4f2d13) -set(qtactiveqt_REF 64e781f88e6758826be73751fe547b7e03c82edd) -set(qtdatavis3d_REF 6c79c3c0cd01ec29ce410e557aef293295349a22) +set(qtbase_REF 9461362fb0aa5ec91bcfafe1169bd32cf9cfc828) +set(qttools_REF 3fa59b12c7e23e0eb3fbb0f3a9d3f7fee2669f72) +set(qtdeclarative_REF 34d723b38ef9b2ef851f589dfd0523420f4c5acc) +set(qtsvg_REF 242d6a797b6051baccd101978f3e138293701159) +set(qt5compat_REF 57202ccee96b7297202ba11c867178cff32b6eef) +set(qtshadertools_REF 954b90fa332b37ba1b60a2fcd92c06a0de6a6322) +set(qtquicktimeline_REF 2cb89aa7b120ec0ac84426d9f50bf8c613bbcd1e) +set(qtquick3d_REF 6c5ec5b14829f4181d035ad357f594e32e0e4119) +set(qttranslations_REF 47deef3a86795ef97708ec1da403a06cf696ec1c) +set(qtwayland_REF f2c5c1304fc1a5123243a3a83ac8d8f3f67138ca) +set(qtdoc_REF 097bdcbf52a3cd798b66318f2b453cd01640e06b) +set(qtimageformats_REF 6cd036f63ff4b939f2ceb02fda98303a89a1b4b1) +set(qtmqtt_REF d5c00c7245916a919b408578a6dd17bfac0e064d) +set(qtquickcontrols2_REF 1d84dc70059a6e324faab3535cb3958c6fa52fab) +set(qtnetworkauth_REF a903abe7e43123ecd727ca2e29d552c5ed639552) +set(qtcoap_REF 160c3fb6850be44c09142150aef165a09946a608) +set(qtopcua_REF c025fe5182a369723a67be06d64cbfbf2760ba0e) +set(qtactiveqt_REF b9cf1840e44d5283f2212a73ba7b74ec18564d5a) +set(qtdatavis3d_REF 1629d860192ffc644a5c0c7d63e18a6ee6d5e295) #set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF a8c5919df0c6fb9904920d20c4bb0ea18bcaba94) -set(qtscxml_REF fb5dedff2f1ddbeeba680c4cf297525c0fd85652) -set(qtvirtualkeyboard_REF 66a0ecd2db90097fe961437e539182ee5ef17b33) -set(qtcharts_REF 0e713697ab2454b1c870cb750510b280f8059b0e) +set(qtlottie_REF f6a4557b1484b9ad7db4bae8c5b6b264618876e5) +set(qtscxml_REF 666adc604fec06fa5b38be4d4f1b0e9b56f16c2b) +set(qtvirtualkeyboard_REF 5c7df0c55a96e9855bd27c23a18d6f2d91305d31) +set(qtcharts_REF 251d18d960a6f6ee04f07ba338beb317c425e0a2) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") @@ -68,7 +69,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\": [^\n]+\n" "\"version-string\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") file(WRITE "${_current_control}" "${_control_contents}") #need to run a vcpkg format-manifest --all after update once endforeach() diff --git a/ports/qtbase/dc5e7b6.diff b/ports/qtbase/dc5e7b6.diff new file mode 100644 index 00000000000000..e420267b2a80aa --- /dev/null +++ b/ports/qtbase/dc5e7b6.diff @@ -0,0 +1,22 @@ +diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake +index 0eeccce..2ee41c2 100644 +--- a/cmake/QtFlagHandlingHelpers.cmake ++++ b/cmake/QtFlagHandlingHelpers.cmake +@@ -421,7 +421,7 @@ + # cache variable with FORCE will overwrite the non-cache variable in this + # function scope, but we need to use the original value before that change. + foreach(flag_value IN LISTS flag_values) +- string(${replace_type} "${flag_value}" "" ${flag_var_name} "${${flag_var_name}}") ++ string(${replace_type} "${flag_value}" " " ${flag_var_name} "${${flag_var_name}}") + endforeach() + string(STRIP "${${flag_var_name}}" ${flag_var_name}) + set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE) +@@ -433,7 +433,7 @@ + # Work exclusively on cache variable value only. + set(mod_flags $CACHE{${flag_var_name}}) + foreach(flag_value IN LISTS flag_values) +- string(${replace_type} "${flag_value}" "" mod_flags "${mod_flags}") ++ string(${replace_type} "${flag_value}" " " mod_flags "${mod_flags}") + endforeach() + string(STRIP "${mod_flags}" mod_flags) + get_property(help_text CACHE ${flag_var_name} PROPERTY HELPSTRING) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 40f58858ceb5f4..0ae81659b9e1f3 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -11,6 +11,9 @@ set(${PORT}_PATCHES buildcmake.patch dont_force_cmakecache.patch fix_find_dep.patch + 20b3eb0.diff # Upstream fix to build with clang-cl; didn't make 6.1.1 so I backported the patch. + dc5e7b6.diff + clang-cl_source_location.patch ) if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) @@ -274,10 +277,10 @@ foreach(_config debug release) if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin") continue() endif() - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/${path_suffix}") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}") foreach(script IN LISTS script_files) if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}") - set(target_script "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/${path_suffix}${script}${script_suffix}") + set(target_script "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${script}${script_suffix}") file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}" "${target_script}") file(READ "${target_script}" _contents) if(_config MATCHES "debug") @@ -290,7 +293,7 @@ foreach(_config debug release) endforeach() foreach(other IN LISTS other_files) if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}") - file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}" "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/${path_suffix}${other}") + file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${other}") endif() endforeach() endforeach() @@ -308,20 +311,23 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/QtBuildInternals") if(NOT VCPKG_TARGET_IS_OSX) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/macos") endif() +if(NOT VCPKG_TARGET_IS_IOS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Qt6/ios") +endif() set(_file "${CMAKE_CURRENT_LIST_DIR}/qt.conf.in") set(REL_PATH) -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/qt6/qt_release.conf" @ONLY) +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_release.conf" @ONLY) set(BACKUP_CURRENT_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") set(BACKUP_CURRENT_HOST_INSTALLED_DIR "${CURRENT_HOST_INSTALLED_DIR}") set(CURRENT_INSTALLED_DIR "./../../../") set(CURRENT_HOST_INSTALLED_DIR "./../../../") -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/qt.conf") +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.conf") set(REL_PATH debug/) -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/qt.debug.conf") +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qt.debug.conf") set(CURRENT_INSTALLED_DIR "${BACKUP_CURRENT_INSTALLED_DIR}") set(CURRENT_HOST_INSTALLED_DIR "${BACKUP_CURRENT_HOST_INSTALLED_DIR}") -configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/qt6/qt_debug.conf" @ONLY) +configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONLY) if(VCPKG_TARGET_IS_WINDOWS) set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16) @@ -331,19 +337,19 @@ if(VCPKG_TARGET_IS_WINDOWS) list(APPEND DLLS_TO_COPY "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll") endif() endforeach() - file(COPY ${DLLS_TO_COPY} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt6/bin") + file(COPY ${DLLS_TO_COPY} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt6/bin") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") set(hostinfofile "${CURRENT_PACKAGES_DIR}/share/Qt6HostInfo/Qt6HostInfoConfig.cmake") file(READ "${hostinfofile}" _contents) -string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEXECDIR "tools/qt6/bin")]] _contents "${_contents}") -string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/qt6/bin")]] _contents "${_contents}") +string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEXECDIR "tools/Qt6/bin")]] _contents "${_contents}") +string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}") file(WRITE "${hostinfofile}" "${_contents}") set(coretools "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreTools.cmake") if(EXISTS "${coretools}") file(READ "${coretools}" _contents) - string(REPLACE [[ "${_IMPORT_PREFIX}/tools/qt6/bin/qmake.exe"]] [["${_IMPORT_PREFIX}/tools/qt6/bin/qmake.debug.bat"]] _contents "${_contents}") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [["${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") file(WRITE "${coretools}" "${_contents}") endif() diff --git a/ports/qtbase/qt.conf.in b/ports/qtbase/qt.conf.in index c78fc7cb636494..ba5c0ee2d47240 100644 --- a/ports/qtbase/qt.conf.in +++ b/ports/qtbase/qt.conf.in @@ -6,9 +6,9 @@ Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml Documentation=doc/@QT6_DIRECTORY_PREFIX@ Binaries=@REL_PATH@bin -LibraryExecutables=tools/qt6/bin -ArchData=share/qt6 -Data=share/qt6 +LibraryExecutables=tools/Qt6/bin +ArchData=share/Qt6 +Data=share/Qt6 Translations=translations/@QT6_DIRECTORY_PREFIX@ Examples=share/examples/@QT6_DIRECTORY_PREFIX@ [Paths] @@ -19,13 +19,13 @@ Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml Documentation=doc/@QT6_DIRECTORY_PREFIX@ Binaries=@REL_PATH@bin -LibraryExecutables=tools/qt6/bin -ArchData=share/qt6 -Data=share/qt6 +LibraryExecutables=tools/Qt6/bin +ArchData=share/Qt6 +Data=share/Qt6 Translations=translations/@QT6_DIRECTORY_PREFIX@ Examples=share/examples/@QT6_DIRECTORY_PREFIX@ HostPrefix=${CURRENT_HOST_INSTALLED_DIR} -HostData=share/qt6 +HostData=share/Qt6 HostBinaries=@REL_PATH@bin HostLibraries=@REL_PATH@lib -HostLibraryExecutables=tools/qt6/bin +HostLibraryExecutables=tools/Qt6/bin diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 4d02b8e05d045d..3ca8dc78838632 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtbase", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 9fa9d47db9fd28..4129cdfcaaea92 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "QtCharts module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index a187dcf88d92e2..0b1deb3cd25174 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 2de4a9262fb731..35bdd4a67c5e72 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 99866447bba147..9e70f72cf797ee 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 1246682385918d..59bf0aaf249a09 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtimageformats/portfile.cmake b/ports/qtimageformats/portfile.cmake index 54e5974121f963..db31bc4d32c90f 100644 --- a/ports/qtimageformats/portfile.cmake +++ b/ports/qtimageformats/portfile.cmake @@ -2,8 +2,7 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES #webp.patch - ) +set(${PORT}_PATCHES) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES @@ -30,17 +29,8 @@ endif() list(APPEND FEATURE_OPTIONS -DINPUT_mng=no) # marked as FIXME qt_install_submodule(PATCHES ${${PORT}_PATCHES} - #TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS - #--trace ${FEATURE_OPTIONS} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) - -if("jasper" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT QT_UPDATE_VERSION) - file(INSTALL "${SOURCE_PATH}/cmake/FindWrapJasper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/Qt6") -endif() -if("webp" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT QT_UPDATE_VERSION) - file(INSTALL "${SOURCE_PATH}/cmake/FindWrapWebP.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/Qt6") -endif() diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index f1fb09d5a83972..22353d2a81ec31 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtimageformats/webp.patch b/ports/qtimageformats/webp.patch deleted file mode 100644 index 23eda0ac85a62e..00000000000000 --- a/ports/qtimageformats/webp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cmake/FindWrapWebP.cmake b/cmake/FindWrapWebP.cmake -index 6cdb76b5e..5264044de 100644 ---- a/cmake/FindWrapWebP.cmake -+++ b/cmake/FindWrapWebP.cmake -@@ -6,10 +6,10 @@ - # paths as hints. - - find_package(WebP QUIET) --if(TARGET WebP::webp AND TARGET WebP::webpdemux AND TARGET WebP::webpmux) -+if(TARGET WebP::webp AND TARGET WebP::webpdemux AND TARGET WebP::libwebpmux) - set(WrapWebP_FOUND ON) - add_library(WrapWebP::WrapWebP INTERFACE IMPORTED) -- target_link_libraries(WrapWebP::WrapWebP INTERFACE WebP::webp WebP::webpdemux Webp::webpmux) -+ target_link_libraries(WrapWebP::WrapWebP INTERFACE WebP::webp WebP::webpdemux WebP::libwebpmux) - return() - endif() - diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 418c7dd759e5de..c235aa64043eea 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "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/", "dependencies": [ diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index ddc465a1603b8f..fb1be27af8e9da 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 3ac2baf0ce243d..ddc43cbb29b328 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 164f96e8e4867b..22226b88535c46 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index d4fcd192d754be..6ec42763f386e5 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquickcontrols2/vcpkg.json b/ports/qtquickcontrols2/vcpkg.json index 8e37ea1968ea8b..699d9f53d21701 100644 --- a/ports/qtquickcontrols2/vcpkg.json +++ b/ports/qtquickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickcontrols2", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt Quick Controls 2", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 6c65198f00ee40..5ed5f43bd456af 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 878af0d4d141ec..4cc3c4d0ca1e8b 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 7a4e7b93af0542..4821d9e198895f 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "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/", "dependencies": [ diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index fdab8c53ad6f4d..817abf5e7b0678 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt SVG", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index f65cf8ce1c5a80..c621e0c9363967 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -86,9 +86,9 @@ if(VCPKG_TARGET_IS_OSX) endif() set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6ToolsTools/Qt6ToolsToolsTargets-debug.cmake") -if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/qt6/bin/windeployqt.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/qt6/bin") +if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") file(READ "${configfile}" _contents) - string(REPLACE [[${_IMPORT_PREFIX}/tools/qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") + string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") file(WRITE "${configfile}" "${_contents}") endif() diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 86d9efa486ab71..7567f22208a8c4 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 82f8d001b399c7..c6b80e9434b825 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "Qt Translations", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 62328e2fb4cf13..e73d5f3e9bfc15 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index e4d80030658eef..a8f732f6a617dd 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version-semver": "6.1.0", + "version-semver": "6.1.1", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "supports": "!windows", diff --git a/versions/baseline.json b/versions/baseline.json index 9be41fbabb9cff..8fd6f14ff35dfe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5069,7 +5069,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5249,7 +5249,7 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qt6betablock": { @@ -5257,35 +5257,35 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtbase": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtcharts": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtcoap": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtdoc": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtimageformats": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtkeychain": { @@ -5293,59 +5293,59 @@ "port-version": 0 }, "qtlottie": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtmqtt": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtopcua": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtquick3d": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtquickcontrols2": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtscxml": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtshadertools": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtsvg": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qttools": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qttranslations": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "qtwayland": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 6fd408260856ef..cc389853f57517 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21fd23ba62f5f9c76024d715eb025a6d7458266b", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "3049962a022e42ab77ecda0b58e6480de6f6a38f", "version-semver": "6.1.0", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 5e7f04c28ca104..927a76006c580f 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b47025d88998f99cdfe58e3df9498c3a08d72883", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "33d9b2ff872cbc458a0ce0145a30f6f702d1fb58", "version-semver": "6.1.0", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 3dddf58b056038..590f24102bdd95 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e20968097c4a9d81833f16c2f6637b67e72258f", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "0341fe2cf4a7eafcb0b73f0adbdb37a151bc3000", "version-semver": "6.1.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 0f91c0a006ab16..b351db070bcc47 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f4c208e4c4606ae0f7663901399720437358e76", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "c13214dac08887f541c416d36de97a86560d13f5", "version-semver": "6.1.0", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index fb8c3b78422cd3..1a1d8b8bdead07 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c3e47558bcd193afac22d72771d726b4e4721a1", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "1890f3d4b87f50fd6d16ffbc03d5d023762fc58b", "version-semver": "6.1.0", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 0e5a7e069c954e..198ee4ec557d5d 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2dec36ef658a413500ce4486e1d82fe377b3a99c", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "435511150f075d71b1f947e89b1f0d306ffe251e", "version-semver": "6.1.0", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index a02ef71971d4f8..855b909e927066 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0940f08a99ce3d6f46e2ad01242645ee4b4d61d5", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "1d69299b89bc39acbf73afb5353a40f6540a04d2", "version-semver": "6.1.0", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 8a000e41bbc26d..ba440fd7b8b206 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54b33929f07b96d7284b3b79923cafd06bdcb207", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "30dd12410732756cf29ae1317de8f029010c9f22", "version-semver": "6.1.0", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index a105be68e8df60..67e0524dc0aaf6 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bf8d66cd624cdbc6158070163895171a76feb3e", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "e77ae101a8432595ff4f428ebbae194f720c2792", "version-semver": "6.1.0", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 7f3311091ecccd..31046ef5b33607 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5b06628ae9af1093a1b5a858cec9ca49d0488a6", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "a663532b7f1e64a346f94c27270c2ae7142780ad", "version-semver": "6.1.0", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 75bb5e49c72cae..9188cc93328108 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58c76699b4615a2d73f708a7216bee9f1e04e265", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "9a823fe108a9efbcd6cc83f5b7ff283a7500a9fb", "version-semver": "6.1.0", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 4df16f480fdbc7..0761cb41b659a2 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1503fed7d188e3ec61c12c590c34dd5bd80c88c", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "a13ec187af88d84a53445c1bcb99aa9c60a9966d", "version-semver": "6.1.0", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index d2830f3e13a2be..e30eed15f990de 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1176858af90b88c983584218ed702abdb184b942", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "e72fbfa1b11b2eb4673afbad3198462602ff7123", "version-semver": "6.1.0", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 9e813ae9d57be0..0356ac85e53e96 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12ea0d30494f580a959c288490e0443e06ecc5b8", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "22f34050bedeeaf97c6bb7cc6a556f6190ebf7c3", "version-semver": "6.1.0", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index d082884bbf35df..58346078dfbdda 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9df9d17c45c39e2a6bf24cff0458bc690f16f1c", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "8bbeae91ec304b0695da0e53b436e05a3ac03050", "version-semver": "6.1.0", diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json index 72c024d6fbd83e..d6728198442b30 100644 --- a/versions/q-/qtquickcontrols2.json +++ b/versions/q-/qtquickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab667ec0d159c9e2b729dd42c7a0225c9cca6000", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "601cfca0a0ae61f4737064a5003f5c83736eda30", "version-semver": "6.1.0", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 560499dbd76923..f00a9a40b1db04 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ae8944b42dacf2e13322dd2946e008056b27dea", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "5fc074f13b064d388ee11fa172ea1bccfa3a448c", "version-semver": "6.1.0", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index a23051770e2f57..2934589e7f48bf 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fab8ae306010c0bc21189d746169b8f52d728c40", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "015b07e4fe4a948c5c4d00d18c34eeb64c6752f4", "version-semver": "6.1.0", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 1bf79fd9db9cd9..5c3be9ac5f793d 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68ddad00b0176a27f54fa87b04c55e612f9ee87f", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "40bcf168e248310e309ff201f6e96fa44b13c4e9", "version-semver": "6.1.0", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index acced055249bc2..54177ac31eac17 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12588c47b6c0faa970cdfc550f5f1526e8811c79", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "c30f32af2bdc755e3c2fcf0a0cc64f23632983bd", "version-semver": "6.1.0", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 72450bade9b055..5054857f584f87 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93ebe354c38cc124370c24d066d2a631444347e8", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "ce742ed3dcd05d27552874077744ce955375390c", "version-semver": "6.1.0", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index 015c50ae3bfb64..ffb86daf3ae02f 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a70306f29690e0d5bb1a8fa99ed1c4108b5a247", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "c452d28bfe0ffaf87dc622761dbd5aa217e938ca", "version-semver": "6.1.0", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index b4b488258242c4..354106b8b0a52b 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d8d0ee73c77d2b796669b3e874f91d0c7270aa7", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "e267466518c4622bcd79052d2fcd8066da4202e8", "version-semver": "6.1.0", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 52174de2b9b7cc..8391bd3793be12 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b9d48c269a94eb37c62a7e81358855065cdd6cf", + "version-semver": "6.1.1", + "port-version": 0 + }, { "git-tree": "712d72065cb213eaaf1ce574c6d3fde99a8ff02e", "version-semver": "6.1.0", From bd3b6ebe30edc67e61f3fd9c0df53d3cbf7907f9 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 21 Jun 2021 22:45:47 +0200 Subject: [PATCH 030/141] [libspatialite] Fix building for android (#18452) * [libspatialite] Fix building for android * x-add-version * Update versions/l-/libspatialite.json * Update libspatialite.json --- ports/libspatialite/CONTROL | 2 +- ports/libspatialite/portfile.cmake | 8 +++++--- versions/baseline.json | 2 +- versions/l-/libspatialite.json | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL index 6ab4b3f4fd97b4..a44f701dc38116 100644 --- a/ports/libspatialite/CONTROL +++ b/ports/libspatialite/CONTROL @@ -1,6 +1,6 @@ Source: libspatialite Version: 5.0.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities. Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv, librttopo diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 84c49da3a72f0a..5d73679bedc8ce 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -85,13 +85,15 @@ if (VCPKG_TARGET_IS_WINDOWS) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib) endif() -elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX +else () # Build in UNIX if(VCPKG_TARGET_IS_LINUX) set(STDLIB stdc++) else() set(STDLIB c++) endif() - + if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + SET(EXTRALIBS "-lpthread") + endif() list(APPEND OPTIONS_RELEASE "LIBXML2_LIBS=-lxml2 -llzma" "GEOS_LDFLAGS=-lgeos_c -lgeos -l${STDLIB}" @@ -105,7 +107,7 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG OPTIONS - "LIBS=-lpthread -ldl -lm -l${STDLIB}" + "LIBS=${EXTRALIBS} -ldl -lm -l${STDLIB}" "LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\"" "--enable-rttopo" "--enable-gcp" diff --git a/versions/baseline.json b/versions/baseline.json index 8fd6f14ff35dfe..d94d5fab348b11 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3558,7 +3558,7 @@ }, "libspatialite": { "baseline": "5.0.0", - "port-version": 1 + "port-version": 2 }, "libspnav": { "baseline": "0.2.3", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index a37bee775877a7..1b0c0d5dfab782 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac8547f60ac2cc08c65a907a84112e1256011a47", + "version-string": "5.0.0", + "port-version": 2 + }, { "git-tree": "b713a9368a0d53629cd8497cc82107ea6a33e980", "version-string": "5.0.0", From a2b71b6b1997d678cb7f14d951b8daf69e54dacc Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Mon, 21 Jun 2021 14:07:53 -0700 Subject: [PATCH 031/141] [seal]Updated to version 3.6.6. Replaced CONTROL with manifest file. (#18457) * Updated seal to version 3.6.6. Replaced CONTROL with manifest file. * Changed version-string to version-semver. * Updated versions/s-/seal.json. * Added a missing CMake arguement. * Updated versioning. * Fixed hexl config file. * Updated versioning. * Fixed hexl not finding dependency. * Updated versioning. --- ports/hexl/find_dependency_cpu_features.patch | 31 +++++++++++ ports/hexl/portfile.cmake | 4 +- ports/seal/CONTROL | 22 -------- ports/seal/portfile.cmake | 45 ++++++++-------- ports/seal/vcpkg.json | 51 +++++++++++++++++++ versions/baseline.json | 2 +- versions/h-/hexl.json | 2 +- versions/s-/seal.json | 5 ++ 8 files changed, 112 insertions(+), 50 deletions(-) create mode 100644 ports/hexl/find_dependency_cpu_features.patch delete mode 100644 ports/seal/CONTROL create mode 100644 ports/seal/vcpkg.json diff --git a/ports/hexl/find_dependency_cpu_features.patch b/ports/hexl/find_dependency_cpu_features.patch new file mode 100644 index 00000000000000..fbc79ec8783307 --- /dev/null +++ b/ports/hexl/find_dependency_cpu_features.patch @@ -0,0 +1,31 @@ +From b399342016573d6f45bd5bb1aa8d4df358e0761c Mon Sep 17 00:00:00 2001 +From: Wei Dai +Date: Wed, 16 Jun 2021 18:21:51 -0700 +Subject: [PATCH] Fixed config. + +--- + cmake/HEXLConfig.cmake.in | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/cmake/HEXLConfig.cmake.in b/cmake/HEXLConfig.cmake.in +index 57089bd..f112380 100644 +--- a/cmake/HEXLConfig.cmake.in ++++ b/cmake/HEXLConfig.cmake.in +@@ -11,6 +11,14 @@ + + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++find_dependency(CpuFeatures) ++if(NOT CpuFeatures_FOUND) ++ message(WARNING "Could not find dependency `CpuFeatures` required by this configuration") ++ set(HEXL_FOUND FALSE) ++ return() ++endif() ++ + include(${CMAKE_CURRENT_LIST_DIR}/HEXLTargets.cmake) + + # Defines HEXL_FOUND: If Intel HEXL library was found +-- +2.25.1 + diff --git a/ports/hexl/portfile.cmake b/ports/hexl/portfile.cmake index e6f3857fbb5d9e..fa3362c6693f96 100644 --- a/ports/hexl/portfile.cmake +++ b/ports/hexl/portfile.cmake @@ -7,7 +7,9 @@ vcpkg_from_github( REF 2dc1db6824be3fc89d13740efd0270ec9afec77e SHA512 aaa80dc53a21586d763a2b84b40d60062020470988422601bc5e9c2b31c6263847a97ea8f956d002a95e2d5e843cafa96fabdfd8b8ee892c7a7b9747133adebb HEAD_REF main - PATCHES disable_downloading_cpu_features.patch + PATCHES + disable_downloading_cpu_features.patch + find_dependency_cpu_features.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/seal/CONTROL b/ports/seal/CONTROL deleted file mode 100644 index 7eb437be15f197..00000000000000 --- a/ports/seal/CONTROL +++ /dev/null @@ -1,22 +0,0 @@ -Source: seal -Version: 3.6.4 -Homepage: https://github.com/microsoft/SEAL -Description: Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library. -Supports: !windows | (windows & static) -Default-Features: ms-gsl, zlib, zstd - -Feature: ms-gsl -Build-Depends: ms-gsl -Description: Use ms-gsl for span view - -Feature: zlib -Build-Depends: zlib -Description: Use zlib for compressed serialization - -Feature: zstd -Build-Depends: zstd -Description: Use zstd for compressed serialization - -Feature: no-throw-tran -Build-Depends: -Description: Do not throw when operating on transparent ciphertexts diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index e5081986f09c13..f24241a3f9475d 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -3,49 +3,44 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/SEAL - REF 0b058d99b7f18a00e5ebb2b80caee593804b0500 - SHA512 eed4e4360e32c8506a8f84b9bcfd2c8debf0013ee181f37fb34c6b94e62bbde1993ee400a3f589fe2378b598dd4fdb2e8532b706691a9348e464cd1a202ef23c + REF d045f1beff96dff0fccc7fa0c5acb1493a65338c + SHA512 9b5d3c4342608d8e3d9826d3b52cbefc1c21eb0094d0cae4add8bb0960f931e9080f248eb8ad8385fc0a08e2a1da10020185148ffd2ef02e7a4fac879e27aa69 HEAD_REF main ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - ms-gsl SEAL_USE_MSGSL - zlib SEAL_USE_ZLIB - zstd SEAL_USE_ZSTD - + ms-gsl SEAL_USE_MSGSL + zlib SEAL_USE_ZLIB + zstd SEAL_USE_ZSTD + hexl SEAL_USE_INTEL_HEXL INVERTED_FEATURES - no-throw-tran SEAL_THROW_ON_TRANSPARENT_CIPHERTEXT + no-throw-tran SEAL_THROW_ON_TRANSPARENT_CIPHERTEXT ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS - -DSEAL_BUILD_DEPS=OFF - -DSEAL_BUILD_EXAMPLES=OFF - -DSEAL_BUILD_TESTS=OFF - -DSEAL_BUILD_SEAL_C=OFF + "-DSEAL_BUILD_DEPS=OFF" + "-DSEAL_BUILD_EXAMPLES=OFF" + "-DSEAL_BUILD_TESTS=OFF" + "-DSEAL_BUILD_SEAL_C=OFF" ${FEATURE_OPTIONS} ) -vcpkg_build_cmake(TARGET seal LOGFILE_ROOT build) +vcpkg_cmake_install() -vcpkg_install_cmake() +vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/") -file(GLOB CONFIG_PATH RELATIVE "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/lib/cmake/SEAL-*") -if(NOT CONFIG_PATH) - message(FATAL_ERROR "Could not find installed cmake config files.") +if("hexl" IN_LIST FEATURES) + vcpkg_fixup_pkgconfig(SKIP_CHECK) +else() + vcpkg_fixup_pkgconfig() endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH "${CONFIG_PATH}") - -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -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") vcpkg_copy_pdbs() diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json new file mode 100644 index 00000000000000..ef5b166a57de3f --- /dev/null +++ b/ports/seal/vcpkg.json @@ -0,0 +1,51 @@ +{ + "name": "seal", + "version-semver": "3.6.6", + "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", + "homepage": "https://github.com/microsoft/SEAL", + "supports": "!windows | (windows & static)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "ms-gsl", + "zlib", + "zstd" + ], + "features": { + "hexl": { + "description": "Use Intel® HEXL for acceleration of low-level kernels.", + "dependencies": [ + "hexl" + ] + }, + "ms-gsl": { + "description": "Use ms-gsl for span view", + "dependencies": [ + "ms-gsl" + ] + }, + "no-throw-tran": { + "description": "Do not throw when operating on transparent ciphertexts" + }, + "zlib": { + "description": "Use zlib for compressed serialization", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Use zstd for compressed serialization", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index d94d5fab348b11..39b42b967cf660 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5685,7 +5685,7 @@ "port-version": 0 }, "seal": { - "baseline": "3.6.4", + "baseline": "3.6.6", "port-version": 0 }, "secp256k1": { diff --git a/versions/h-/hexl.json b/versions/h-/hexl.json index 4a58571b079393..dbee52a465c282 100644 --- a/versions/h-/hexl.json +++ b/versions/h-/hexl.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7f5bcef6355a0cb88d04f4a3664568c74e2fd6bb", + "git-tree": "abbac3846835a67c818b2fd51c32a1e859aca7b3", "version": "1.1.0", "port-version": 0 } diff --git a/versions/s-/seal.json b/versions/s-/seal.json index 4224e78328e6c0..53e227f6dae866 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e487b9120a78480800a1fd914477acf03f677919", + "version-semver": "3.6.6", + "port-version": 0 + }, { "git-tree": "aa3ad12b6022d47b57c3482ed9f413bc374b9396", "version-string": "3.6.4", From 81f3ae69cfaaea97fe96929c6447692eb0a260c4 Mon Sep 17 00:00:00 2001 From: WenTao Ou Date: Tue, 22 Jun 2021 05:18:40 +0800 Subject: [PATCH 032/141] [libcopp] Update to 1.4.1 (#18425) --- ports/libcopp/CONTROL | 5 ----- ports/libcopp/portfile.cmake | 18 ++++++++++++++---- ports/libcopp/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/l-/libcopp.json | 5 +++++ 5 files changed, 29 insertions(+), 10 deletions(-) delete mode 100644 ports/libcopp/CONTROL create mode 100644 ports/libcopp/vcpkg.json diff --git a/ports/libcopp/CONTROL b/ports/libcopp/CONTROL deleted file mode 100644 index dcb8a8db935851..00000000000000 --- a/ports/libcopp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libcopp -Version: 1.3.4 -Description: A cross-platfrom coroutine library for C++ -Maintainer: owent -Homepage: https://libcopp.atframe.work/ diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake index 0b74e7b923d57b..46adc578b38210 100644 --- a/ports/libcopp/portfile.cmake +++ b/ports/libcopp/portfile.cmake @@ -1,14 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO owt5008137/libcopp - REF d7ee2550fdcaf3961e4284bb5218e3ed05be437c # 1.3.4 - SHA512 0fa7a83c17046e187183d0244828e82adeb5e39e75b27757d1b540fd8948c48b02de40edea706d588ba553a276c4f2f8e9e3dad78065e515a1652abe4fbea8b0 + REPO owent/libcopp + REF 1.4.1 + SHA512 eba06bd2de7c9ee557cdd0bf79e0c53e37722b671347436322c14c99e94d955477bfc0980a4f59a5c31051e108f952ec96791024c45fa8eeaa5f7a49099dd8ae HEAD_REF v2 ) +# atframework/cmake-toolset needed as a submodule for configure cmake +vcpkg_from_github( + OUT_SOURCE_PATH ATFRAMEWORK_CMAKE_TOOLSET + REPO atframework/cmake-toolset + REF v1.3.5 + SHA512 5048c204eb6358547d99712a06866836e1a6dc20dee44cc33fae77181bdf9ece5686f30062eff6a231e1ec898d5a37ebaddb243e7e3484c002bb96240aa496a5 + HEAD_REF main + ) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE + OPTIONS "-DATFRAMEWORK_CMAKE_TOOLSET_DIR=${ATFRAMEWORK_CMAKE_TOOLSET}" ) vcpkg_install_cmake() @@ -19,7 +29,7 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${ vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libcopp) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libcopp/vcpkg.json b/ports/libcopp/vcpkg.json new file mode 100644 index 00000000000000..a832fe24d92380 --- /dev/null +++ b/ports/libcopp/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libcopp", + "version-semver": "1.4.1", + "maintainers": "owent ", + "description": "A cross-platfrom coroutine library for C++", + "homepage": "https://github.com/owent/libcopp", + "documentation": "https://libcopp.atframe.work/", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 39b42b967cf660..d9bdb0a8b23395 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3061,7 +3061,7 @@ "port-version": 0 }, "libcopp": { - "baseline": "1.3.4", + "baseline": "1.4.1", "port-version": 0 }, "libcrafter": { diff --git a/versions/l-/libcopp.json b/versions/l-/libcopp.json index fb2994a7dc202b..cbdc1024a2b137 100644 --- a/versions/l-/libcopp.json +++ b/versions/l-/libcopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88846bda722ae7f10ec578f41c08a9cacf2ba7ba", + "version-semver": "1.4.1", + "port-version": 0 + }, { "git-tree": "22af9650936b7555dd45a5e211277095a37637dd", "version-string": "1.3.4", From 3650bb6ce42375eaeac0d16cd04ddcf315931d6e Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 21 Jun 2021 14:19:46 -0700 Subject: [PATCH 033/141] [dxut, fx11, directxmath] ports updated (#18431) * [dxut] port updated for latest servicing * update baseline * Update to use latest DirectXMath * Fix baseline * fx11 metadata update * Updated baseline * Converted directxmath CONTROL to vcpkg.json * Update baseline * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Code review feedback * Update baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/directxmath/CONTROL | 4 ---- ports/directxmath/vcpkg.json | 9 +++++++++ ports/dxut/portfile.cmake | 4 ++-- ports/dxut/vcpkg.json | 9 +++++++-- ports/effects11/vcpkg.json | 7 +++++-- versions/baseline.json | 6 +++--- versions/d-/directxmath.json | 5 +++++ versions/d-/dxut.json | 5 +++++ versions/e-/effects11.json | 5 +++++ 9 files changed, 41 insertions(+), 13 deletions(-) delete mode 100644 ports/directxmath/CONTROL create mode 100644 ports/directxmath/vcpkg.json diff --git a/ports/directxmath/CONTROL b/ports/directxmath/CONTROL deleted file mode 100644 index bbd86fa2e9da8f..00000000000000 --- a/ports/directxmath/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: directxmath -Version: jan2021 -Homepage: https://walbourn.github.io/introducing-directxmath/ -Description: DirectXMath SIMD C++ math library diff --git a/ports/directxmath/vcpkg.json b/ports/directxmath/vcpkg.json new file mode 100644 index 00000000000000..e0ffe0e44029fe --- /dev/null +++ b/ports/directxmath/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "directxmath", + "version-string": "jan2021", + "port-version": 1, + "description": "DirectXMath SIMD C++ math library", + "homepage": "https://github.com/Microsoft/DirectXMath", + "documentation": "https://docs.microsoft.com/en-us/windows/win32/dxmath/directxmath-portal", + "license": "MIT" +} diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index ab1dd0ad24d9ea..118bedd7b35238 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/DXUT - REF feb2021 - SHA512 576692b79e67a9fd0b39b6e20c519fe61ad18525db663071f446f3c2e0ae3f009f67f00be45baf52749810af1ddc995ad0e5e4608d7f42d08116ff6e91bccb22 + REF jun2021 + SHA512 4c95cefcf685e95b26677d0aba3d118df7860e3bf1b99b567013d326f890a3f67657be2c60677d3d996cccacce30f70d0c2fc60a692372053cce50318fa79a70 HEAD_REF master ) diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json index 3cbd3990c2be52..ede994b81c61cd 100644 --- a/ports/dxut/vcpkg.json +++ b/ports/dxut/vcpkg.json @@ -1,7 +1,12 @@ { "name": "dxut", - "version-string": "11.25", + "version": "11.26", "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications", "homepage": "https://github.com/Microsoft/DXUT", - "supports": "windows & !uwp" + "documentation": "https://github.com/microsoft/DXUT/wiki", + "license": "MIT", + "supports": "windows & !uwp", + "dependencies": [ + "directxmath" + ] } diff --git a/ports/effects11/vcpkg.json b/ports/effects11/vcpkg.json index 7cdf47eb150f78..4edddcd8d3cae0 100644 --- a/ports/effects11/vcpkg.json +++ b/ports/effects11/vcpkg.json @@ -1,7 +1,10 @@ { "name": "effects11", - "version-string": "11.26", + "version": "11.26", + "port-version": 1, "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.", - "homepage": "https://github.com/microsoft/FX11", + "homepage": "https://github.com/Microsoft/FX11", + "documentation": "https://github.com/microsoft/FX11/wiki", + "license": "MIT", "supports": "windows" } diff --git a/versions/baseline.json b/versions/baseline.json index d9bdb0a8b23395..c7a56943bfe96e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1666,7 +1666,7 @@ }, "directxmath": { "baseline": "jan2021", - "port-version": 0 + "port-version": 1 }, "directxmesh": { "baseline": "jun2021", @@ -1777,7 +1777,7 @@ "port-version": 0 }, "dxut": { - "baseline": "11.25", + "baseline": "11.26", "port-version": 0 }, "eabase": { @@ -1826,7 +1826,7 @@ }, "effects11": { "baseline": "11.26", - "port-version": 0 + "port-version": 1 }, "effolkronium-random": { "baseline": "1.3.1", diff --git a/versions/d-/directxmath.json b/versions/d-/directxmath.json index 5f0c61ee6fe86f..44477eae718b15 100644 --- a/versions/d-/directxmath.json +++ b/versions/d-/directxmath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d02145b6ed0cbe882bfb75291f832a11ab0582ce", + "version-string": "jan2021", + "port-version": 1 + }, { "git-tree": "381e0fc938992c45b9c2000e25bb4265f408ee27", "version-string": "jan2021", diff --git a/versions/d-/dxut.json b/versions/d-/dxut.json index 7dcbb464cc6013..ef3b7c69c04849 100644 --- a/versions/d-/dxut.json +++ b/versions/d-/dxut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "098b30a228f1d71cfa5b0e21a4c9bf9ade3774e6", + "version": "11.26", + "port-version": 0 + }, { "git-tree": "b037faaa0c10a455e68dc219788dcbf2f83aace2", "version-string": "11.25", diff --git a/versions/e-/effects11.json b/versions/e-/effects11.json index f1a390ba103710..4850d41d5c1966 100644 --- a/versions/e-/effects11.json +++ b/versions/e-/effects11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed264ec7ce47f6c0ad48933d3ced950b4841726f", + "version": "11.26", + "port-version": 1 + }, { "git-tree": "428f5c35c75c0886d83e163b5158c941cb15fb22", "version-string": "11.26", From 43355e528c9216ab83e4e7c07318e4fd8b572fdc Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 21 Jun 2021 14:20:45 -0700 Subject: [PATCH 034/141] [uvatlas, spectra] ports updated (#18404) * [uvatlas, spectra] ports updated * Update versions * Minor code review * Update version * Code review feedback * Update baseline --- ports/spectra/CONTROL | 5 ----- ports/spectra/portfile.cmake | 13 +++++++++++-- ports/spectra/vcpkg.json | 12 ++++++++++++ ports/uvatlas/portfile.cmake | 12 +++++++++--- ports/uvatlas/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/s-/spectra.json | 5 +++++ versions/u-/uvatlas.json | 5 +++++ 8 files changed, 56 insertions(+), 15 deletions(-) delete mode 100644 ports/spectra/CONTROL create mode 100644 ports/spectra/vcpkg.json diff --git a/ports/spectra/CONTROL b/ports/spectra/CONTROL deleted file mode 100644 index c1e872b83d3c82..00000000000000 --- a/ports/spectra/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: spectra -Version: 0.9.0 -Description: A header-only C++ library for large scale eigenvalue problems -Homepage: https://spectralib.org -Build-Depends: eigen3 diff --git a/ports/spectra/portfile.cmake b/ports/spectra/portfile.cmake index bad7e4dbb76f5e..6fefd4abb156f8 100644 --- a/ports/spectra/portfile.cmake +++ b/ports/spectra/portfile.cmake @@ -6,5 +6,14 @@ vcpkg_from_github( HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/spectra RENAME copyright) +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/spectra/vcpkg.json b/ports/spectra/vcpkg.json new file mode 100644 index 00000000000000..96bdfd299d85d9 --- /dev/null +++ b/ports/spectra/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "spectra", + "version": "0.9.0", + "port-version": 1, + "description": "A header-only C++ library for large scale eigenvalue problems", + "homepage": "https://spectralib.org", + "documentation": "https://spectralib.org/quick-start.html", + "license": "MPL-2.0", + "dependencies": [ + "eigen3" + ] +} diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index d35e5977947b1b..a8888d05cdb235 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF jun2021 - SHA512 f0ecba24c63214876f69eec2de7e5dd15e63aee20641e0989211f7dcab7182c7f6cb73960dbbc1504cd0fab18af8b024c8ee3bde087694d4acd3d1254b90f608 + REF jun2021b + SHA512 d08bacacba324ddf60b003c5cbd5ad715bdbc1cf352a0dc9de58c40fd8f4bcbb562b8285ff1a443453399167a96e5b1af51d32ffc5e1e8f65391ef124c0706d4 HEAD_REF master ) @@ -14,6 +14,12 @@ if (VCPKG_HOST_IS_LINUX) message(WARNING "Build ${PORT} requires GCC version 9 or later") endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + eigen ENABLE_USE_EIGEN +) + if(VCPKG_TARGET_IS_UWP) set(EXTRA_OPTIONS -DBUILD_TOOLS=OFF) else() @@ -29,7 +35,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) +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/jun2021/uvatlastool.exe" diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 2394f43e6b6ae0..4f5a81fee004c9 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,8 +1,8 @@ { "name": "uvatlas", - "version-string": "jun2021", + "version-string": "jun2021b", "description": "UVAtlas isochart texture atlas", - "homepage": "http://go.microsoft.com/fwlink/?LinkID=512686", + "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", "license": "MIT", "supports": "windows | linux", @@ -17,5 +17,14 @@ "name": "directxtex", "platform": "!(uwp | linux)" } - ] + ], + "features": { + "eigen": { + "description": "Use Eigen & Spectra for eigen-value computations", + "dependencies": [ + "eigen3", + "spectra" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index c7a56943bfe96e..2f9585103e59df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5922,7 +5922,7 @@ }, "spectra": { "baseline": "0.9.0", - "port-version": 0 + "port-version": 1 }, "speex": { "baseline": "1.2.0", @@ -6453,7 +6453,7 @@ "port-version": 0 }, "uvatlas": { - "baseline": "jun2021", + "baseline": "jun2021b", "port-version": 0 }, "uvw": { diff --git a/versions/s-/spectra.json b/versions/s-/spectra.json index edabb0c5341484..0cfb2cd7d86e01 100644 --- a/versions/s-/spectra.json +++ b/versions/s-/spectra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79e61cb55ecfe0e16944d963259bf758b5405a74", + "version": "0.9.0", + "port-version": 1 + }, { "git-tree": "b33cdb035b8b412b662a052b66437743330fccde", "version-string": "0.9.0", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index 21d07dec22f1d7..f4dd97775d7d75 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60f3026412b95786a91eadb5e97483cb9539b8c1", + "version-string": "jun2021b", + "port-version": 0 + }, { "git-tree": "24f38b36247b90b011cb96c5b06728fa6b2f1011", "version-string": "jun2021", From 404675a9144cb36abfbd4793da39e5b6df7249ab Mon Sep 17 00:00:00 2001 From: Daniel Parker Date: Mon, 21 Jun 2021 17:21:22 -0400 Subject: [PATCH 035/141] [jsoncons] Update to 0.165.0 (#18284) * [jsoncons] Update to 0.165.0 * [jsoncons] Update to 0.165.0, update baseline * [jsoncons] Added vcpkg_fixup_pkgconfig() to portfolio.cmake * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/jsoncons/CONTROL | 2 +- ports/jsoncons/portfile.cmake | 5 +++-- versions/baseline.json | 2 +- versions/j-/jsoncons.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/jsoncons/CONTROL b/ports/jsoncons/CONTROL index 8bb2807cb27844..c3b550b10d6a5e 100644 --- a/ports/jsoncons/CONTROL +++ b/ports/jsoncons/CONTROL @@ -1,4 +1,4 @@ Source: jsoncons -Version: 0.163.3 +Version: 0.165.0 Description: A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON Homepage: https://github.com/danielaparker/jsoncons diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index 6c82041f0dcbdf..44bf9fb3806d7d 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons - REF 06d10fbca36b049fc7592cce0e80e91c0db4bce9 # v0.163.3 - SHA512 195ff127a7ce30de794c56646986c85513fda611e69c0e4031492d670de2b4c0cf3f7928a7e1452f9fb959ec7692c98dffda68a529f84daa46a994e8c22c2883 + REF 2626df4ccfdaab814b789abdd5936ffe00f5f6dc # v0.165.0 + SHA512 da72515d91c443e6c9a89527d9aea7ca8805865b4a8a8f3f067d4a065cd27eea3a5de83f6b55e6e8c95cf79292e06cb7d56ea83499bd9e80afb80d81007a316d HEAD_REF master ) @@ -15,6 +15,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) diff --git a/versions/baseline.json b/versions/baseline.json index 2f9585103e59df..abf7cd9a83cf11 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2793,7 +2793,7 @@ "port-version": 2 }, "jsoncons": { - "baseline": "0.163.3", + "baseline": "0.165.0", "port-version": 0 }, "jsoncpp": { diff --git a/versions/j-/jsoncons.json b/versions/j-/jsoncons.json index 1e713d42f0befd..b77f7525e766d7 100644 --- a/versions/j-/jsoncons.json +++ b/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd6b74f34a309e8750a04b5da6a3bf5800503434", + "version-string": "0.165.0", + "port-version": 0 + }, { "git-tree": "efd8810eeea9736e6a7b25bb914d959449e75b34", "version-string": "0.163.3", From fb98506276171ce3d7b44d76232bc0479baa31b2 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 22 Jun 2021 05:23:26 +0800 Subject: [PATCH 036/141] [cpr] Update to 1.6.2 (#18386) * [cpr] Update to 1.6.2 * Update version files * Update patch * Update verison files * Update ports/cpr/portfile.cmake * Update versions/c-/cpr.json * Fix build error on uwp * Update versions/c-/cpr.json * Add condition for uwp patch * Update versions/c-/cpr.json * Update ports/cpr/portfile.cmake * Update versions/c-/cpr.json --- ports/cpr/001-cpr-config.patch | 7 +++---- ports/cpr/CONTROL | 5 ----- ports/cpr/enable-install.patch | 17 ----------------- ports/cpr/fix-uwp.patch | 13 +++++++++++++ ports/cpr/portfile.cmake | 13 +++++++++---- ports/cpr/vcpkg.json | 12 ++++++++++++ versions/baseline.json | 2 +- versions/c-/cpr.json | 5 +++++ 8 files changed, 43 insertions(+), 31 deletions(-) delete mode 100644 ports/cpr/CONTROL delete mode 100644 ports/cpr/enable-install.patch create mode 100644 ports/cpr/fix-uwp.patch create mode 100644 ports/cpr/vcpkg.json diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch index 8da44597504877..0b972c9b046b2f 100644 --- a/ports/cpr/001-cpr-config.patch +++ b/ports/cpr/001-cpr-config.patch @@ -1,8 +1,8 @@ diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index 563b785..20f8a54 100644 +index 8061a14..e8daf19 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt -@@ -20,6 +20,7 @@ add_library(cpr +@@ -21,6 +21,7 @@ add_library(cpr add_library(cpr::cpr ALIAS cpr) @@ -10,7 +10,7 @@ index 563b785..20f8a54 100644 target_link_libraries(cpr PUBLIC CURL::libcurl) # todo should be private, but first dependencys in ssl_options need to be removed # Set version for shared libraries. -@@ -28,4 +29,18 @@ set_target_properties(cpr +@@ -29,4 +30,18 @@ set_target_properties(cpr VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) @@ -30,4 +30,3 @@ index 563b785..20f8a54 100644 +if (NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) +endif() -\ No newline at end of file diff --git a/ports/cpr/CONTROL b/ports/cpr/CONTROL deleted file mode 100644 index 3a2984ce21d786..00000000000000 --- a/ports/cpr/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cpr -Version: 1.5.2 -Homepage: https://github.com/whoshuu/cpr -Description: C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project. -Build-Depends: curl[core] diff --git a/ports/cpr/enable-install.patch b/ports/cpr/enable-install.patch deleted file mode 100644 index 250199e5a24fe4..00000000000000 --- a/ports/cpr/enable-install.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index a6db5bd..b4982d1 100644 ---- a/cpr/CMakeLists.txt -+++ b/cpr/CMakeLists.txt -@@ -45,3 +45,12 @@ add_library(${CPR_LIBRARIES} - message(STATUS "Using CURL_LIBRARIES: ${CURL_LIBRARIES}.") - target_link_libraries(${CPR_LIBRARIES} - ${CURL_LIBRARIES}) -+ -+install(TARGETS ${CPR_LIBRARIES} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) -+if(NOT DISABLE_INSTALL_HEADERS) -+ install(DIRECTORY ${CPR_INCLUDE_DIRS}/cpr DESTINATION include) -+endif() diff --git a/ports/cpr/fix-uwp.patch b/ports/cpr/fix-uwp.patch new file mode 100644 index 00000000000000..e91eb62b5f8f45 --- /dev/null +++ b/ports/cpr/fix-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8575b2f..87de55c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,7 +46,7 @@ message(STATUS "=======================================================") + include(GNUInstallDirs) + include(FetchContent) + include(cmake/code_coverage.cmake) +-include(cmake/sanitizer.cmake) ++#include(cmake/sanitizer.cmake) + include(cmake/gcc_analyze.cmake) + + # SSL diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 91a2af7a82e09f..9d99ebe045ee04 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -1,21 +1,26 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_UWP) + set(UWP_PATCH fix-uwp.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO whoshuu/cpr - REF 41fbaca90160950f1397e0ffc6b58bd81063f131 # v1.5.2 - SHA512 0c493eef3069c1067f2492e6bc91e20b415a03a9392cbe70d4fb40f64a71b601ec62a9bcf5ca7e5b5a6e74449904f3121503421f4653f5b55df6702121806977 + REF f4622efcb59d84071ae11404ae61bd821c1c344b # v1.6.2 + SHA512 7835b7613529798b5edaefc99c907bbc7144133a1fac62a2c9af09c8c7a09b2ea1864544c4c0385969ad3dc64806b8d258abbcd39add2004ed8428741286ff20 HEAD_REF master PATCHES 001-cpr-config.patch + ${UWP_PATCH} ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_CPR_TESTS=OFF - -DUSE_SYSTEM_CURL=ON + -DCPR_BUILD_TESTS=OFF + -DCPR_FORCE_USE_SYSTEM_CURL=ON OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json new file mode 100644 index 00000000000000..5a648e2908cf04 --- /dev/null +++ b/ports/cpr/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "cpr", + "version-semver": "1.6.2", + "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", + "homepage": "https://github.com/whoshuu/cpr", + "dependencies": [ + { + "name": "curl", + "default-features": false + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index abf7cd9a83cf11..f08bba99dccf0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1473,7 +1473,7 @@ "port-version": 1 }, "cpr": { - "baseline": "1.5.2", + "baseline": "1.6.2", "port-version": 0 }, "cpu-features": { diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index edda87dadcdb67..0bbf0b63feafb9 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96762dddaeb7d520833ddc1d47a30f26c35c9f67", + "version-semver": "1.6.2", + "port-version": 0 + }, { "git-tree": "0a3303682963a35032b7203c69051cf2edfaf41a", "version-string": "1.5.2", From 2414ebd7d5eee54e1e0b1fa380fc7795cbd514d7 Mon Sep 17 00:00:00 2001 From: Maxime GIMENO Date: Mon, 21 Jun 2021 23:23:58 +0200 Subject: [PATCH 037/141] [ CGAL] Update version to 5.2.2 (#18387) * Update to CGAL 5.2.2 * x-add-version * Reset port version to 0 * x-add-version * Update versions/c-/cgal.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/cgal/CONTROL | 4 ++-- ports/cgal/portfile.cmake | 4 ++-- versions/baseline.json | 4 ++-- versions/c-/cgal.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL index 0bfaebf5d411ec..ee817113a30732 100644 --- a/ports/cgal/CONTROL +++ b/ports/cgal/CONTROL @@ -1,6 +1,6 @@ Source: cgal -Version: 5.2 -Port-Version: 3 +Version: 5.2.2 +Port-Version: 0 Build-Depends: mpfr, gmp, zlib, boost-accumulators, boost-algorithm, boost-bimap, boost-callable-traits, boost-concept-check, boost-container, boost-core, boost-detail, boost-filesystem, boost-functional, boost-fusion, boost-geometry, boost-graph, boost-heap, boost-intrusive, boost-iostreams, boost-iterator, boost-lambda, boost-logic, boost-math, boost-mpl, boost-multi-index, boost-multiprecision, boost-numeric-conversion, boost-optional, boost-parameter, boost-pool, boost-preprocessor, boost-property-map, boost-property-tree, boost-ptr-container, boost-random, boost-range, boost-serialization, boost-spirit, boost-thread, boost-tuple, boost-type-traits, boost-units, boost-utility, boost-variant Homepage: https://github.com/CGAL/cgal Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry. diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 562343cc3b3efa..87be4144f43d7c 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.2 - SHA512 09f46c531365697968a9d9521eb9f3b5af5da9971be7fa86db990199f046c5a16dec821ca8a8ce1a2619b3ec44634e7426e39e997e8df783aa13552bc3d86064 + REF v5.2.2 + SHA512 48c6f44f41d6cf4fead878d9e5d62325ec90fc1f744d547b2f5683e41e48b25d19db2606804ac302c24520600d1f5b37a1649c19891cd9e87e227480ef410dbc HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index f08bba99dccf0c..717152ab9e4401 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1185,8 +1185,8 @@ "port-version": 1 }, "cgal": { - "baseline": "5.2", - "port-version": 3 + "baseline": "5.2.2", + "port-version": 0 }, "cgicc": { "baseline": "3.2.19-4", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index 108360e4ccee9c..6f27b3aeccc590 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ecf63852d98760d2b2bd0c75b70ab95a5e73aca", + "version-string": "5.2.2", + "port-version": 0 + }, { "git-tree": "14e2dc513d60c6c31b5fd94c6e891ac33fcb328f", "version-string": "5.2", From 10811c1e670deb6f1c6c6f847c6a281c6e498ccf Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 23 Jun 2021 03:24:13 +0200 Subject: [PATCH 038/141] [nanopb] update to 0.4.5 and add generator (#18241) * [nanopb] update to 0.4.5 and add generator * add versions * fix python install? * update version * fix python? again * version * test python * add version * fix portfile * version * Update ports/nanopb/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update ports/nanopb/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * update version Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/nanopb/CONTROL | 3 --- ports/nanopb/fix-python.patch | 25 ++++++++++++++++++++ ports/nanopb/portfile.cmake | 44 +++++++++++++++++++++++++---------- ports/nanopb/vcpkg.json | 17 ++++++++++++++ versions/baseline.json | 2 +- versions/n-/nanopb.json | 5 ++++ 6 files changed, 80 insertions(+), 16 deletions(-) delete mode 100644 ports/nanopb/CONTROL create mode 100644 ports/nanopb/fix-python.patch create mode 100644 ports/nanopb/vcpkg.json diff --git a/ports/nanopb/CONTROL b/ports/nanopb/CONTROL deleted file mode 100644 index 40d18ea9edca33..00000000000000 --- a/ports/nanopb/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: nanopb -Version: 2019-02-12-2 -Description: A small code-size Protocol Buffers implementation in ANSI C. diff --git a/ports/nanopb/fix-python.patch b/ports/nanopb/fix-python.patch new file mode 100644 index 00000000000000..f82293099958b1 --- /dev/null +++ b/ports/nanopb/fix-python.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d9c5e5e..4e94bb7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,6 @@ endif() + if(nanopb_BUILD_GENERATOR) + set(generator_protos nanopb) + +- find_package(Python REQUIRED) + execute_process( + COMMAND ${Python_EXECUTABLE} -c + "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix=''))" +@@ -64,10 +63,10 @@ if(nanopb_BUILD_GENERATOR) + DESTINATION ${PYTHON_INSTDIR}/proto/ + ) + endforeach() ++ install( FILES generator/proto/_utils.py ++ DESTINATION ${PYTHON_INSTDIR}/proto/ ) + endif() + +-install( FILES generator/proto/_utils.py +- DESTINATION ${PYTHON_INSTDIR}/proto/ ) + + if( WIN32 ) + install( diff --git a/ports/nanopb/portfile.cmake b/ports/nanopb/portfile.cmake index 5a536e619b2e94..cd79b8775f5980 100644 --- a/ports/nanopb/portfile.cmake +++ b/ports/nanopb/portfile.cmake @@ -1,30 +1,37 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -message(WARNING "\ -The nanopb's code generator is not installed as part of the installation \ -currently. So you have to run the code generator manually." -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanopb/nanopb - REF d1305ddef1c18b4cb33992254494ccd255701aaa - SHA512 70e588b0ff13846005658a9fafe57551dc2c126a32f351fe0b6c166c142c42b3bcc44567288f609f2f3a5adc1fe1bf1c585fec8c5fe90817b5b3ab47955aa1fc + REF 0.4.5 + SHA512 2f24308440bd961a94449e253627fbe38f6c5217cd70c57e9b3ab702da3c2df03b087ccdd62518940acf6b480a1dbb440ca5681f1766a17b199010d3df7b17a1 HEAD_REF master + PATCHES + fix-python.patch ) -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" BUILD_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" nanopb_BUILD_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" nanopb_STATIC_LINKING) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + generator nanopb_BUILD_GENERATOR +) + +vcpkg_find_acquire_program(PYTHON3) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DPython_EXECUTABLE=${PYTHON3} -Dnanopb_BUILD_RUNTIME=ON - -Dnanopb_BUILD_GENERATOR=OFF - -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} - -Dnanopb_MSVC_STATIC_RUNTIME=OFF + -DBUILD_STATIC_LIBS=${nanopb_BUILD_STATIC_LIBS} + -Dnanopb_MSVC_STATIC_RUNTIME=${nanopb_STATIC_LINKING} + -Dnanopb_PROTOC_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX} + ${FEATURE_OPTIONS} ) - vcpkg_install_cmake() vcpkg_copy_pdbs() @@ -33,5 +40,18 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(nanopb_BUILD_GENERATOR) + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/nanopb_generator.py" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + if(WIN32) + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(INSTALL "${CURRENT_PACKAGES_DIR}/Lib/site-packages/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/site-packages") + else() + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + endif() +endif() + +if(nanopb_BUILD_STATIC_LIBS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() # Handle copyright configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/nanopb/vcpkg.json b/ports/nanopb/vcpkg.json new file mode 100644 index 00000000000000..dad0eff55b36e4 --- /dev/null +++ b/ports/nanopb/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "nanopb", + "version-semver": "0.4.5", + "description": "A small code-size Protocol Buffers implementation in ANSI C.", + "homepage": "https://jpa.kapsi.fi/nanopb/", + "features": { + "generator": { + "description": "build the generator", + "dependencies": [ + { + "name": "protobuf", + "host": true + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 717152ab9e4401..8bf5854a71e977 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4245,7 +4245,7 @@ "port-version": 0 }, "nanopb": { - "baseline": "2019-02-12-2", + "baseline": "0.4.5", "port-version": 0 }, "nanoprintf": { diff --git a/versions/n-/nanopb.json b/versions/n-/nanopb.json index 6989b9cc562ec3..ecc09b1a387fe5 100644 --- a/versions/n-/nanopb.json +++ b/versions/n-/nanopb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "855b599338a79c3a7d61c1171110e4dd49c3f164", + "version-semver": "0.4.5", + "port-version": 0 + }, { "git-tree": "47f954644a0f5f22381ae3655f84b3f790e4e1e8", "version-string": "2019-02-12-2", From db83bdf7539e64812240cf1fbf2d1b3047592df7 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 22 Jun 2021 19:16:04 -0700 Subject: [PATCH 039/141] Update VMs and pick up VS2019 16.10 (#18233) * Cherry-pick https://github.com/microsoft/vcpkg/pull/15598 * Hook deploy-inteloneapi into create-vmss.ps1. * Add script to resolve https://github.com/microsoft/vcpkg/issues/17521 * Move tls settings deployment to the front and respond to script triggering a reboot. * Go back to provisioning an extra disk to workaround https://github.com/microsoft/vcpkg/issues/18379 * Disallow public access to blob storage and require TLS 1.2. * Update Pools. * Update tool to 2021-06-19 * [simage] Skip simage on uwp platforms as it appears broken by 16.10. * [tensorflow-cc] Skip because changes in our MacOS hardware broke the port. --- scripts/azure-pipelines/azure-pipelines.yml | 4 +- scripts/azure-pipelines/linux/create-vmss.ps1 | 16 +- .../azure-pipelines/linux/provision-image.sh | 12 + .../windows/azure-pipelines.yml | 2 +- .../azure-pipelines/windows/create-vmss.ps1 | 43 +- .../windows/deploy-install-disk.ps1 | 60 ++ .../windows/deploy-inteloneapi.ps1 | 74 ++ .../windows/deploy-settings.txt | 1 + .../windows/deploy-tlssettings.ps1 | 738 ++++++++++++++++++ .../windows/provision-entire-image.ps1 | 2 + scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 4 +- scripts/ci.baseline.txt | 9 +- 13 files changed, 954 insertions(+), 13 deletions(-) create mode 100644 scripts/azure-pipelines/windows/deploy-install-disk.ps1 create mode 100644 scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 create mode 100644 scripts/azure-pipelines/windows/deploy-tlssettings.ps1 diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 5e667b27208b69..9d00684dc4ae37 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-04-23' - linux-pool: 'PrLin-2021-04-25' + windows-pool: 'PrWin-2021-06-11' + linux-pool: 'PrLin-2021-06-11' osx-pool: 'PrOsx-2021-04-16' stages: diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index 55484f29b6c13e..2bfaae2f0af5ee 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -20,7 +20,7 @@ This script assumes you have installed the OpenSSH Client optional Windows compo $Location = 'westus2' $Prefix = 'PrLin-' + (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D16a_v4' +$VMSize = 'Standard_D32_v4' $ProtoVMName = 'PROTOTYPE' $LiveVMPrefix = 'BUILD' $ErrorActionPreference = 'Stop' @@ -161,7 +161,8 @@ New-AzStorageAccount ` -Location $Location ` -Name $StorageAccountName ` -SkuName 'Standard_LRS' ` - -Kind StorageV2 + -Kind StorageV2 ` + -MinimumTlsVersion TLS1_2 $StorageAccountKeys = Get-AzStorageAccountKey ` -ResourceGroupName $ResourceGroupName ` @@ -338,7 +339,8 @@ $Vmss = Set-AzVmssOsProfile ` -AdminUsername AdminUser ` -AdminPassword $AdminPW ` -LinuxConfigurationDisablePasswordAuthentication $true ` - -PublicKey @($VmssPublicKey) + -PublicKey @($VmssPublicKey) ` + -CustomData ([Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("#!/bin/bash`n/etc/provision-disks.sh`n"))) $Vmss = Set-AzVmssStorageProfile ` -VirtualMachineScaleSet $Vmss ` @@ -346,6 +348,14 @@ $Vmss = Set-AzVmssStorageProfile ` -OsDiskCaching ReadWrite ` -ImageReferenceId $Image.Id +$Vmss = Add-AzVmssDataDisk ` + -VirtualMachineScaleSet $Vmss ` + -Lun 0 ` + -Caching 'ReadWrite' ` + -CreateOption Empty ` + -DiskSizeGB 1024 ` + -StorageAccountType 'StandardSSD_LRS' + New-AzVmss ` -ResourceGroupName $ResourceGroupName ` -Name $VmssName ` diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 6663baed838808..5336e86f6eb50b 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -73,4 +73,16 @@ sudo apt update sudo add-apt-repository universe sudo apt install -y powershell +# Write script to provision disks used by cloud-init +echo "if [ ! -d \"/mnt/vcpkg-ci\" ]; then" > /etc/provision-disks.sh +echo "sudo parted /dev/sdb mklabel gpt" >> /etc/provision-disks.sh +echo "sudo parted /dev/sdb mkpart cidisk ext4 0% 100%" >> /etc/provision-disks.sh +echo "sudo mkfs -t ext4 /dev/sdb1" >> /etc/provision-disks.sh +echo "sudo mkdir /mnt/vcpkg-ci -m=777" >> /etc/provision-disks.sh +echo "echo \"/dev/sdb1 /mnt/vcpkg-ci ext4 barrier=0 0 0\" | sudo tee -a /etc/fstab" >> /etc/provision-disks.sh +echo "sudo mount -a" >> /etc/provision-disks.sh +echo "sudo chmod 777 /mnt/vcpkg-ci" >> /etc/provision-disks.sh +echo "fi" >> /etc/provision-disks.sh +sudo chmod 700 /etc/provision-disks.sh + # provision-image.ps1 will append installation of the SAS token here diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index c6aefcd2b72208..a822888ab7afee 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -25,7 +25,7 @@ jobs: inputs: filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' pwsh: true - # Note: D: is the Azure machines' temporary disk. + # Note: E: is the Azure machines' temporary disk. - script: .\bootstrap-vcpkg.bat displayName: 'Bootstrap vcpkg' - script: | diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1 index fddba0eec73af4..c3ea470d74e487 100644 --- a/scripts/azure-pipelines/windows/create-vmss.ps1 +++ b/scripts/azure-pipelines/windows/create-vmss.ps1 @@ -43,14 +43,15 @@ if ($Unstable) { } $Prefix += (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D16a_v4' +$VMSize = 'Standard_D32_v4' $ProtoVMName = 'PROTOTYPE' $LiveVMPrefix = 'BUILD' $WindowsServerSku = '2019-Datacenter' +$InstalledDiskSizeInGB = 1024 $ErrorActionPreference = 'Stop' $ProgressActivity = 'Creating Scale Set' -$TotalProgress = 18 +$TotalProgress = 21 $CurrentProgress = 1 Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking @@ -176,7 +177,8 @@ New-AzStorageAccount ` -Location $Location ` -Name $StorageAccountName ` -SkuName 'Standard_LRS' ` - -Kind StorageV2 + -Kind StorageV2 ` + -MinimumTlsVersion TLS1_2 $StorageAccountKeys = Get-AzStorageAccountKey ` -ResourceGroupName $ResourceGroupName ` @@ -271,12 +273,38 @@ $VM = Set-AzVMSourceImage ` -Skus $WindowsServerSku ` -Version latest +$InstallDiskName = $ProtoVMName + "InstallDisk" +$VM = Add-AzVMDataDisk ` + -Vm $VM ` + -Name $InstallDiskName ` + -Lun 0 ` + -Caching ReadWrite ` + -CreateOption Empty ` + -DiskSizeInGB $InstalledDiskSizeInGB ` + -StorageAccountType 'StandardSSD_LRS' + $VM = Set-AzVMBootDiagnostic -VM $VM -Disable New-AzVm ` -ResourceGroupName $ResourceGroupName ` -Location $Location ` -VM $VM +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script deploy-tlssettings.ps1 in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ProvisionImageResult = Invoke-AzVMRunCommand ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath "$PSScriptRoot\deploy-tlssettings.ps1" + +Write-Host "deploy-tlssettings.ps1 output: $($ProvisionImageResult.value.Message)" +Write-Host 'Waiting 1 minute for VM to reboot...' +Start-Sleep -Seconds 60 + #################################################################################################### Write-Progress ` -Activity $ProgressActivity ` @@ -354,6 +382,10 @@ Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName Invoke-ScriptWithPrefix -ScriptName 'deploy-cuda.ps1' -AddAdminPw -AddCudnnUrl Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-inteloneapi.ps1' -AddAdminPw +Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + #################################################################################################### Invoke-ScriptWithPrefix -ScriptName 'deploy-pwsh.ps1' -AddAdminPw Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName @@ -404,6 +436,10 @@ try { Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-install-disk.ps1' +Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + #################################################################################################### Write-Progress ` -Activity $ProgressActivity ` @@ -455,6 +491,7 @@ Write-Progress ` Remove-AzVM -Id $VM.ID -Force Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $PrototypeOSDiskName -Force +Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $InstallDiskName -Force #################################################################################################### Write-Progress ` diff --git a/scripts/azure-pipelines/windows/deploy-install-disk.ps1 b/scripts/azure-pipelines/windows/deploy-install-disk.ps1 new file mode 100644 index 00000000000000..6bbc175872eec8 --- /dev/null +++ b/scripts/azure-pipelines/windows/deploy-install-disk.ps1 @@ -0,0 +1,60 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +# REPLACE WITH UTILITY-PREFIX.ps1 + +<# +.SYNOPSIS +Partitions a new physical disk. +.DESCRIPTION +Takes the disk $DiskNumber, turns it on, then partitions it for use with label +$Label and drive letter $Letter. +.PARAMETER DiskNumber +The number of the disk to set up. +.PARAMETER Letter +The drive letter at which to mount the disk. +.PARAMETER Label +The label to give the disk. +#> +Function New-PhysicalDisk { +Param( + [int]$DiskNumber, + [string]$Letter, + [string]$Label +) + if ($Letter.Length -ne 1) { + throw "Bad drive letter $Letter, expected only one letter. (Did you accidentially add a : ?)" + } + + try { + Write-Host "Attempting to online physical disk $DiskNumber" + [string]$diskpartScriptPath = Get-TempFilePath -Extension 'txt' + [string]$diskpartScriptContent = + "SELECT DISK $DiskNumber`r`n" + + "ONLINE DISK`r`n" + + Write-Host "Writing diskpart script to $diskpartScriptPath with content:" + Write-Host $diskpartScriptContent + Set-Content -Path $diskpartScriptPath -Value $diskpartScriptContent + Write-Host 'Invoking DISKPART...' + & diskpart.exe /s $diskpartScriptPath + + Write-Host "Provisioning physical disk $DiskNumber as drive $Letter" + [string]$diskpartScriptContent = + "SELECT DISK $DiskNumber`r`n" + + "ATTRIBUTES DISK CLEAR READONLY`r`n" + + "CREATE PARTITION PRIMARY`r`n" + + "FORMAT FS=NTFS LABEL=`"$Label`" QUICK`r`n" + + "ASSIGN LETTER=$Letter`r`n" + Write-Host "Writing diskpart script to $diskpartScriptPath with content:" + Write-Host $diskpartScriptContent + Set-Content -Path $diskpartScriptPath -Value $diskpartScriptContent + Write-Host 'Invoking DISKPART...' + & diskpart.exe /s $diskpartScriptPath + } + catch { + Write-Error "Failed to provision physical disk $DiskNumber as drive $Letter! $($_.Exception.Message)" + } +} + +New-PhysicalDisk -DiskNumber 1 -Letter 'E' -Label 'install disk' diff --git a/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 b/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 new file mode 100644 index 00000000000000..45d8db3c10dd45 --- /dev/null +++ b/scripts/azure-pipelines/windows/deploy-inteloneapi.ps1 @@ -0,0 +1,74 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT + +# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1 + +# REPLACE WITH UTILITY-PREFIX.ps1 + +# Seems like only the HPC kit is really needed? +#$oneAPIBaseUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/17768/w_BaseKit_p_2021.2.0.2871_offline.exe' +$oneAPIHPCUrl = 'https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901_offline.exe' + +# Possible oneAPI Base components: +#intel.oneapi.win.vtune 2021.1.1-68 true Intel® VTune(TM) Profiler +#intel.oneapi.win.tbb.devel 2021.1.1-133 true Intel® oneAPI Threading Building Blocks +#intel.oneapi.win.dnnl 2021.1.1-44 true Intel® oneAPI Deep Neural Network Library +#intel.oneapi.win.mkl.devel 2021.1.1-52 true Intel® oneAPI Math Kernel Library +#intel.oneapi.win.vpl 2021.1.1-76 true Intel® oneAPI Video Processing Library +#intel.oneapi.win.dpcpp_debugger 10.0.0-2213 true Intel® Distribution for GDB* +#intel.oneapi.win.ipp.devel 2021.1.1-47 true Intel® Integrated Performance Primitives +#intel.oneapi.win.ippcp 2021.1.1-53 true Intel® Integrated Performance Primitives Cryptography +#intel.oneapi.win.dpcpp-compiler 2021.1.1-191 true Intel® oneAPI DPC++/C++ Compiler +#intel.oneapi.win.dpcpp-library 2021.1.1-191 true Intel® oneAPI DPC++ Library +#intel.oneapi.win.dpcpp_ct.common 2021.1.1-54 true Intel® DPC++ Compatibility Tool +#intel.oneapi.win.dal.devel 2021.1.1-71 true Intel® oneAPI Data Analytics Library +#intel.oneapi.win.python3 2021.1.1-46 true Intel® Distribution for Python* +#intel.oneapi.win.advisor 2021.1.1-53 true Intel® Advisor +#$oneAPIBaseComponents = 'intel.oneapi.win.dpcpp-compiler:intel.oneapi.win.dpcpp-library:intel.oneapi.win.mkl.devel:intel.oneapi.win.ipp.devel:intel.oneapi.win.ippcp:intel.oneapi.win.dal.devel:intel.oneapi.win.dnnl:intel.oneapi.win.vpl:intel.oneapi.win.tbb.devel' +$oneAPIHPCComponents = 'intel.oneapi.win.cpp-compiler:intel.oneapi.win.ifort-compiler' + +<# +.SYNOPSIS +Installs Intel oneAPI compilers and toolsets. Examples for CI can be found here: https://github.com/oneapi-src/oneapi-ci + +.DESCRIPTION +InstallInteloneAPI installs the Intel oneAPI Compiler & Toolkit with the components specified as a +:-separated list of strings in $Components. + +.PARAMETER Url +The URL of the Intel Toolkit installer. + +.PARAMETER Components +A :-separated list of components to install. +#> +Function InstallInteloneAPI { + Param( + [String]$Url, + [String]$Components + ) + + try { + [string]$installerPath = Get-TempFilePath -Extension 'exe' + [string]$extractionPath = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() + Write-Host 'Downloading Intel oneAPI...to: ' $installerPath + curl.exe -L -o $installerPath -s -S $Url + Write-Host 'Extracting Intel oneAPI...to folder: ' $extractionPath + $proc = Start-Process -FilePath $installerPath -ArgumentList @('-s ', '-x ', '-f ' + $extractionPath , '--log extract.log') -Wait -PassThru + Write-Host 'Install Intel oneAPI...from folder: ' $extractionPath + $proc = Start-Process -FilePath $extractionPath/bootstrapper.exe -ArgumentList @('-s ', '--action install', "--components=$Components" , '--eula=accept', '--continue-with-optional-error=yes', '-p=NEED_VS2017_INTEGRATION=0', '-p=NEED_VS2019_INTEGRATION=0', '--log-dir=.') -Wait -PassThru + $exitCode = $proc.ExitCode + if ($exitCode -eq 0) { + Write-Host 'Installation successful!' + } + else { + Write-Error "Installation failed! Exited with $exitCode." + throw + } + } + catch { + Write-Error "Failed to install Intel oneAPI! $($_.Exception.Message)" + throw + } +} + +InstallInteloneAPI -Url $oneAPIHPCUrl -Components $oneAPIHPCComponents diff --git a/scripts/azure-pipelines/windows/deploy-settings.txt b/scripts/azure-pipelines/windows/deploy-settings.txt index a80ddce399a281..c340453c69e366 100644 --- a/scripts/azure-pipelines/windows/deploy-settings.txt +++ b/scripts/azure-pipelines/windows/deploy-settings.txt @@ -12,6 +12,7 @@ if ($null -eq $av) { Write-Host 'Configuring AntiVirus exclusions...' Add-MpPreference -ExclusionPath C:\agent Add-MPPreference -ExclusionPath D:\ + Add-MPPreference -ExclusionPath E:\ Add-MPPreference -ExclusionProcess ninja.exe Add-MPPreference -ExclusionProcess clang-cl.exe Add-MPPreference -ExclusionProcess cl.exe diff --git a/scripts/azure-pipelines/windows/deploy-tlssettings.ps1 b/scripts/azure-pipelines/windows/deploy-tlssettings.ps1 new file mode 100644 index 00000000000000..4b00a6deacee3f --- /dev/null +++ b/scripts/azure-pipelines/windows/deploy-tlssettings.ps1 @@ -0,0 +1,738 @@ +#*************************************************************************************************************** +# This script supports the TLS 1.2 everywhere project +# It does the following: +# * By default it disables TLS 1.O, TLS 1.1, SSLv2, SSLv3 and Enables TLS1.2 +# * The CipherSuite order is set to the SDL approved version. +# * The FIPS MinEncryptionLevel is set to 3. +# * RC4 is disabled +# * A log with a transcript of all actions taken is generated +#*************************************************************************************************************** + +#************************************************ SCRIPT USAGE ************************************************ +# .\TLSSettings.ps1 +# -SetCipherOrder : Excellence/Min-Bar, default(Excellence), use B to set Min-Bar. (Min-Bar ordering prefers ciphers with smaller key sizes to improve performance over security) +# -RebootIfRequired : $true/$false, default($true), use $false to disable auto-reboot (Settings won't take effect until a reboot is completed) +# -EnableOlderTlsVersions : $true/$false, default($false), use $true to explicitly Enable TLS1.0, TLS1.1 +#*************************************************************************************************************** + +#***************************TEAM CAN DETERMINE WHAT CIPHER SUITE ORDER IS CHOSEN ****************************** +# Option B provides the min-bar configuration (small trade-off: performance over security) +# Syntax: .\TLSSettings.ps1 -SetCipherOrder B +# if no option is supplied, you will get the opportunity for excellence cipher order (small trade-off: security over performance) +# Syntax: .\TLSSettings.ps1 +#*************************************************************************************************************** + +param ( + [string]$SetCipherOrder = " ", + [bool]$RebootIfRequired = $true, + [bool]$EnableOlderTlsVersions = $false +) + +#******************* FUNCTION THAT ACTUALLY UPDATES KEYS; WILL RETURN REBOOT FLAG IF CHANGES *********************** +Function Set-CryptoSetting { + param ( + $regKeyName, + $value, + $valuedata, + $valuetype + ) + + $restart = $false + + # Check for existence of registry key, and create if it does not exist + If (!(Test-Path -Path $regKeyName)) { + New-Item $regKeyName | Out-Null + } + + + # Get data of registry value, or null if it does not exist + $val = (Get-ItemProperty -Path $regKeyName -Name $value -ErrorAction SilentlyContinue).$value + + + If ($val -eq $null) { + # Value does not exist - create and set to desired value + New-ItemProperty -Path $regKeyName -Name $value -Value $valuedata -PropertyType $valuetype | Out-Null + $restart = $true + } + Else { + # Value does exist - if not equal to desired value, change it + If ($val -ne $valuedata) { + Set-ItemProperty -Path $regKeyName -Name $value -Value $valuedata + $restart = $true + } + } + + + $restart +} +#*************************************************************************************************************** + + +#******************* FUNCTION THAT DISABLES RC4 *********************** +Function DisableRC4 { + + $restart = $false + $subkeys = Get-Item -Path "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL" + $ciphers = $subkeys.OpenSubKey("Ciphers", $true) + + Write-Log -Message "----- Checking the status of RC4 -----" -Logfile $logLocation -Severity Information + + $RC4 = $false + if ($ciphers.SubKeyCount -eq 0) { + $k1 = $ciphers.CreateSubKey("RC4 128/128") + $k1.SetValue("Enabled", 0, [Microsoft.Win32.RegistryValueKind]::DWord) + $restart = $true + $k2 = $ciphers.CreateSubKey("RC4 64/128") + $k2.SetValue("Enabled", 0, [Microsoft.Win32.RegistryValueKind]::DWord) + $k3 = $ciphers.CreateSubKey("RC4 56/128") + $k3.SetValue("Enabled", 0, [Microsoft.Win32.RegistryValueKind]::DWord) + $k4 = $ciphers.CreateSubKey("RC4 40/128") + $k4.SetValue("Enabled", 0, [Microsoft.Win32.RegistryValueKind]::DWord) + + Write-Log -Message "RC4 was disabled " -Logfile $logLocation -Severity Information + $RC4 = $true + } + + If ($RC4 -ne $true) { + Write-Log -Message "There was no change for RC4 " -Logfile $logLocation -Severity Information + } + + $restart +} +#*************************************************************************************************************** + +#******************* FUNCTION CHECKS FOR PROBLEMATIC FIPS SETTING AND FIXES IT *********************** +Function Test-RegistryValueForFipsSettings { + + $restart = $false + + $fipsPath = @( + "HKLM:\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp", + "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services", + "HKLM:\System\CurrentControlSet\Control\Terminal Server\DefaultUserConfiguration" + ) + + $fipsValue = "MinEncryptionLevel" + + + foreach ($path in $fipsPath) { + + Write-Log -Message "Checking to see if $($path)\$fipsValue exists" -Logfile $logLocation -Severity Information + + $ErrorActionPreference = "stop" + Try { + + $result = Get-ItemProperty -Path $path | Select-Object -ExpandProperty $fipsValue + if ($result -eq 4) { + set-itemproperty -Path $path -Name $fipsValue -value 3 + Write-Log -Message "Regkey $($path)\$fipsValue was changed from value $result to a value of 3" -Logfile $logLocation -Severity Information + $restart = $true + } + else { + Write-Log -Message "Regkey $($path)\$fipsValue left at value $result" -Logfile $logLocation -Severity Information + } + + } + Catch [System.Management.Automation.ItemNotFoundException] { + + Write-Log -Message "Reg path $path was not found" -Logfile $logLocation -Severity Information + } + Catch [System.Management.Automation.PSArgumentException] { + + Write-Log -Message "Regkey $($path)\$fipsValue was not found" -Logfile $logLocation -Severity Information + } + Catch { + Write-Log -Message "Error of type $($Error[0].Exception.GetType().FullName) trying to get $($path)\$fipsValue" -Logfile $logLocation -Severity Information + } + Finally {$ErrorActionPreference = "Continue" + } + } + $restart +} +#*************************************************************************************************************** + +#********************************** FUNCTION THAT CREATE LOG DIRECTORY IF IT DOES NOT EXIST ******************************* +function CreateLogDirectory { + + $TARGETDIR = "$env:HOMEDRIVE\Logs" + if ( -Not (Test-Path -Path $TARGETDIR ) ) { + New-Item -ItemType directory -Path $TARGETDIR | Out-Null + } + + $TARGETDIR = $TARGETDIR + "\" + "TLSSettingsLogFile.csv" + + return $TARGETDIR +} +#*************************************************************************************************************** + + +#********************************** FUNCTION THAT LOGS WHAT THE SCRIPT IS DOING ******************************* +function Write-Log { + [CmdletBinding()] + param( + [Parameter()] + [ValidateNotNullOrEmpty()] + [string]$Message, + + [Parameter()] + [ValidateNotNullOrEmpty()] + [string]$LogFile, + + [Parameter()] + [ValidateNotNullOrEmpty()] + [ValidateSet('Information', 'Warning', 'Error')] + [string]$Severity = 'Information' + ) + + + [pscustomobject]@{ + Time = (Get-Date -f g) + Message = $Message + Severity = $Severity + } | ConvertTo-Csv -NoTypeInformation | Select-Object -Skip 1 | Out-File -Append -FilePath $LogFile +} + +#********************************TLS CipherSuite Settings ******************************************* + +# CipherSuites for windows OS < 10 +function Get-BaseCipherSuitesOlderWindows() +{ + param + ( + [Parameter(Mandatory=$true, Position=0)][bool] $isExcellenceOrder + ) + $cipherorder = @() + + if ($isExcellenceOrder -eq $true) + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384_P384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384_P384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256" + } + else + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384_P384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384_P384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384" + } + + # Add additional ciphers when EnableOlderTlsVersions flag is set to true + if ($EnableOlderTlsVersions) + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256" + $cipherorder += "TLS_RSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_RSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_256_CBC_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_256_CBC_SHA" + $cipherorder += "TLS_RSA_WITH_AES_128_CBC_SHA" + } + return $cipherorder +} + +# Ciphersuites needed for backwards compatibility with Firefox, Chrome +# Server 2012 R2 doesn't support TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 +# Both firefox and chrome negotiate ECDHE_RSA_AES_256_CBC_SHA1, Edge negotiates ECDHE_RSA_AES_256_CBC_SHA384 +function Get-BrowserCompatCipherSuitesOlderWindows() +{ + param + ( + [Parameter(Mandatory=$true, Position=0)][bool] $isExcellenceOrder + ) + $cipherorder = @() + + if ($isExcellenceOrder -eq $true) + { + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384" # (uses SHA-1) + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256" # (uses SHA-1) + } + else + { + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256" # (uses SHA-1) + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384" # (uses SHA-1) + } + return $cipherorder +} + +# Ciphersuites for OS versions windows 10 and above +function Get-BaseCipherSuitesWin10Above() +{ + param + ( + [Parameter(Mandatory=$true, Position=0)][bool] $isExcellenceOrder + ) + + $cipherorder = @() + + if ($isExcellenceOrder -eq $true) + { + + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" + } + else + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384" + } + # Add additional ciphers when EnableOlderTlsVersions flag is set to true + if ($EnableOlderTlsVersions) + { + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P256" + $cipherorder += "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA_P256" + $cipherorder += "TLS_RSA_WITH_AES_256_GCM_SHA384" + $cipherorder += "TLS_RSA_WITH_AES_128_GCM_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_256_CBC_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_128_CBC_SHA256" + $cipherorder += "TLS_RSA_WITH_AES_256_CBC_SHA" + $cipherorder += "TLS_RSA_WITH_AES_128_CBC_SHA" + } + + return $cipherorder +} + + +#******************************* TLS Version Settings **************************************************** + +function Get-RegKeyPathForTls12() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Server" + ) + return $regKeyPath +} + +function Get-RegKeyPathForTls11() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Server" + ) + return $regKeyPath +} + +function Get-RegKeypathForTls10() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.0", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.0\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.0\Server" + ) + return $regKeyPath +} + +function Get-RegKeyPathForSsl30() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 3.0", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 3.0\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 3.0\Server" + ) + return $regKeyPath +} + +function Get-RegKeyPathForSsl20() +{ + $regKeyPath = @( + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 2.0", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 2.0\Client", + "HKLM:\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\SSL 2.0\Server" + ) + return $regKeyPath +} + +#Initialize reboot value to false +$reboot = $false + +#*****************************Create the logfile if not does not exist*************************************** +$logLocation = CreateLogDirectory + + +#Start writing to the logs +Write-Log -Message "========== Start of logging for a script execution ==========" -Logfile $logLocation -Severity Information + +$registryPathGoodGuys = @() +$registryPathBadGuys = @() + +# we enable TLS 1.2 and disable SSL 2.0, 3.0 in any case +$registryPathGoodGuys += Get-RegKeyPathForTls12 + +$registryPathBadGuys += Get-RegKeyPathForSsl20 +$registryPathBadGuys += Get-RegKeyPathForSsl30 + +# add TLS 1.0/1.1 to good/bad depending on user's preference +# default is adding TLS 1.0/1.1 to bad +if ($EnableOlderTlsVersions) +{ + $registryPathGoodGuys += Get-RegKeypathForTls10 + $registryPathGoodGuys += Get-RegKeyPathForTls11 + Write-Log -Message "Enabling TLS1.2, TLS1.1, TLS1.0. Disabling SSL3.0, SSL2.0" -Logfile $logLocation -Severity Information +} +else +{ + $registryPathBadGuys += Get-RegKeypathForTls10 + $registryPathBadGuys += Get-RegKeyPathForTls11 + Write-Log -Message "Enabling TLS1.2. Disabling TLS1.1, TLS1.0, SSL3.0, SSL2.0" -Logfile $logLocation -Severity Information +} + + +Write-Log -Message "Check which registry keys exist already and which registry keys need to be created." -Logfile $logLocation -Severity Information + +#******************* CREATE THE REGISTRY KEYS IF THEY DON'T EXIST******************************** +# Check for existence of GoodGuy registry keys, and create if they do not exist +For ($i = 0; $i -lt $registryPathGoodGuys.Length; $i = $i + 1) { + + Write-Log -Message "Checking for existing of key: $($registryPathGoodGuys[$i]) " -Logfile $logLocation -Severity Information + If (!(Test-Path -Path $registryPathGoodGuys[$i])) { + New-Item $registryPathGoodGuys[$i] | Out-Null + Write-Log -Message "Creating key: $($registryPathGoodGuys[$i]) " -Logfile $logLocation -Severity Information + } +} + +# Check for existence of BadGuy registry keys, and create if they do not exist +For ($i = 0; $i -lt $registryPathBadGuys.Length; $i = $i + 1) { + + Write-Log -Message "Checking for existing of key: $($registryPathBadGuys[$i]) " -Logfile $logLocation -Severity Information + If (!(Test-Path -Path $registryPathBadGuys[$i])) { + Write-Log -Message "Creating key: $($registryPathBadGuys[$i]) " -Logfile $logLocation -Severity Information + New-Item $registryPathBadGuys[$i] | Out-Null + } +} + +#******************* EXPLICITLY DISABLE SSLV2, SSLV3, TLS10 AND TLS11 ******************************** +For ($i = 0; $i -lt $registryPathBadGuys.Length; $i = $i + 1) { + + if ($registryPathBadGuys[$i].Contains("Client") -Or $registryPathBadGuys[$i].Contains("Server")) { + + Write-Log -Message "Disabling this key: $($registryPathBadGuys[$i]) " -Logfile $logLocation -Severity Information + $result = Set-CryptoSetting $registryPathBadGuys[$i].ToString() Enabled 0 DWord + $result = Set-CryptoSetting $registryPathBadGuys[$i].ToString() DisabledByDefault 1 DWord + $reboot = $reboot -or $result + } +} + +#********************************* EXPLICITLY Enable TLS12 **************************************** +For ($i = 0; $i -lt $registryPathGoodGuys.Length; $i = $i + 1) { + + if ($registryPathGoodGuys[$i].Contains("Client") -Or $registryPathGoodGuys[$i].Contains("Server")) { + + Write-Log -Message "Enabling this key: $($registryPathGoodGuys[$i]) " -Logfile $logLocation -Severity Information + $result = Set-CryptoSetting $registryPathGoodGuys[$i].ToString() Enabled 1 DWord + $result = Set-CryptoSetting $registryPathGoodGuys[$i].ToString() DisabledByDefault 0 DWord + $reboot = $reboot -or $result + } +} + +#************************************** Disable RC4 ************************************************ +$result = DisableRC4 +$reboot = $reboot -or $result + + +#************************************** Set Cipher Suite Order ************************************** +Write-Log -Message "----- starting ciphersuite order calculation -----" -Logfile $logLocation -Severity Information +$configureExcellenceOrder = $true +if ($SetCipherOrder.ToUpper() -eq "B") +{ + $configureExcellenceOrder = $false + Write-Host "The min bar cipher suite order was chosen." + Write-Log -Message "The min bar cipher suite order was chosen." -Logfile $logLocation -Severity Information +} +else +{ + Write-Host "The opportunity for excellence cipher suite order was chosen." + Write-Log -Message "The opportunity for excellence cipher suite order was chosen." -Logfile $logLocation -Severity Information +} +$cipherlist = @() + +if ([Environment]::OSVersion.Version.Major -lt 10) +{ + $cipherlist += Get-BaseCipherSuitesOlderWindows -isExcellenceOrder $configureExcellenceOrder + $cipherlist += Get-BrowserCompatCipherSuitesOlderWindows -isExcellenceOrder $configureExcellenceOrder +} +else +{ + $cipherlist += Get-BaseCipherSuitesWin10Above -isExcellenceOrder $configureExcellenceOrder +} +$cipherorder = [System.String]::Join(",", $cipherlist) + Write-Host "Appropriate ciphersuite order : $cipherorder" + Write-Log -Message "Appropriate ciphersuite order : $cipherorder" -Logfile $logLocation -Severity Information + +$CipherSuiteRegKey = "HKLM:\SOFTWARE\Policies\Microsoft\Cryptography\Configuration\SSL\00010002" + +if (!(Test-Path -Path $CipherSuiteRegKey)) +{ + New-Item $CipherSuiteRegKey | Out-Null + $reboot = $True + Write-Log -Message "Creating key: $($CipherSuiteRegKey) " -Logfile $logLocation -Severity Information +} + +$val = (Get-Item -Path $CipherSuiteRegKey -ErrorAction SilentlyContinue).GetValue("Functions", $null) +Write-Log -Message "Previous cipher suite value: $val " -Logfile $logLocation -Severity Information +Write-Log -Message "New cipher suite value : $cipherorder " -Logfile $logLocation -Severity Information + +if ($val -ne $cipherorder) +{ + Write-Log -Message "Cipher suite order needs to be updated. " -Logfile $logLocation -Severity Information + Write-Host "The original cipher suite order needs to be updated", `n, $val + Set-ItemProperty -Path $CipherSuiteRegKey -Name Functions -Value $cipherorder + Write-Log -Message "Cipher suite value was updated. " -Logfile $logLocation -Severity Information + $reboot = $True +} +else +{ + Write-Log -Message "Cipher suite order does not need to be updated. " -Logfile $logLocation -Severity Information + Write-Log -Message "Cipher suite value was not updated as there was no change. " -Logfile $logLocation -Severity Information +} + +#****************************** CHECK THE FIPS SETTING WHICH IMPACTS RDP'S ALLOWED CIPHERS ************************** +#Check for FipsSettings +Write-Log -Message "Checking to see if reg keys exist and if MinEncryptionLevel is set to 4" -Logfile $logLocation -Severity Information +$result = Test-RegistryValueForFipsSettings +$reboot = $reboot -or $result + + +#************************************** REBOOT ************************************** + +if ($RebootIfRequired) +{ + Write-Log -Message "You set the RebootIfRequired flag to true. If changes are made, the system will reboot " -Logfile $logLocation -Severity Information + # If any settings were changed, reboot + If ($reboot) + { + Write-Log -Message "Rebooting now... " -Logfile $logLocation -Severity Information + Write-Log -Message "Using this command: shutdown.exe /r /t 5 /c ""Crypto settings changed"" /f /d p:2:4 " -Logfile $logLocation -Severity Information + Write-Host "Rebooting now..." + shutdown.exe /r /t 5 /c "Crypto settings changed" /f /d p:2:4 + } + Else + { + Write-Host "Nothing get updated." + Write-Log -Message "Nothing get updated. " -Logfile $logLocation -Severity Information + } +} +else +{ + + Write-Log -Message "You set the RebootIfRequired flag to false. If changes are made, the system will NOT reboot " -Logfile $logLocation -Severity Information + Write-Log -Message "No changes will take effect until a reboot has been completed. " -Logfile $logLocation -Severity Information + Write-Log -Message "Script does not include a reboot by design" -Logfile $logLocation -Severity Information +} +Write-Log -Message "========== End of logging for a script execution ==========" -Logfile $logLocation -Severity Information +# SIG # Begin signature block +# MIIjhgYJKoZIhvcNAQcCoIIjdzCCI3MCAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAHtlEJwNffjnOP +# Sr2t1yq5EfE0ll4GozyZt3UXO9BXKKCCDYEwggX/MIID56ADAgECAhMzAAABh3IX +# chVZQMcJAAAAAAGHMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjAwMzA0MTgzOTQ3WhcNMjEwMzAzMTgzOTQ3WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQDOt8kLc7P3T7MKIhouYHewMFmnq8Ayu7FOhZCQabVwBp2VS4WyB2Qe4TQBT8aB +# znANDEPjHKNdPT8Xz5cNali6XHefS8i/WXtF0vSsP8NEv6mBHuA2p1fw2wB/F0dH +# sJ3GfZ5c0sPJjklsiYqPw59xJ54kM91IOgiO2OUzjNAljPibjCWfH7UzQ1TPHc4d +# weils8GEIrbBRb7IWwiObL12jWT4Yh71NQgvJ9Fn6+UhD9x2uk3dLj84vwt1NuFQ +# itKJxIV0fVsRNR3abQVOLqpDugbr0SzNL6o8xzOHL5OXiGGwg6ekiXA1/2XXY7yV +# Fc39tledDtZjSjNbex1zzwSXAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUhov4ZyO96axkJdMjpzu2zVXOJcsw +# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 +# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDU4Mzg1MB8GA1UdIwQYMBaAFEhu +# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu +# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w +# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 +# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx +# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAixmy +# S6E6vprWD9KFNIB9G5zyMuIjZAOuUJ1EK/Vlg6Fb3ZHXjjUwATKIcXbFuFC6Wr4K +# NrU4DY/sBVqmab5AC/je3bpUpjtxpEyqUqtPc30wEg/rO9vmKmqKoLPT37svc2NV +# BmGNl+85qO4fV/w7Cx7J0Bbqk19KcRNdjt6eKoTnTPHBHlVHQIHZpMxacbFOAkJr +# qAVkYZdz7ikNXTxV+GRb36tC4ByMNxE2DF7vFdvaiZP0CVZ5ByJ2gAhXMdK9+usx +# zVk913qKde1OAuWdv+rndqkAIm8fUlRnr4saSCg7cIbUwCCf116wUJ7EuJDg0vHe +# yhnCeHnBbyH3RZkHEi2ofmfgnFISJZDdMAeVZGVOh20Jp50XBzqokpPzeZ6zc1/g +# yILNyiVgE+RPkjnUQshd1f1PMgn3tns2Cz7bJiVUaqEO3n9qRFgy5JuLae6UweGf +# AeOo3dgLZxikKzYs3hDMaEtJq8IP71cX7QXe6lnMmXU/Hdfz2p897Zd+kU+vZvKI +# 3cwLfuVQgK2RZ2z+Kc3K3dRPz2rXycK5XCuRZmvGab/WbrZiC7wJQapgBodltMI5 +# GMdFrBg9IeF7/rP4EqVQXeKtevTlZXjpuNhhjuR+2DMt/dWufjXpiW91bo3aH6Ea +# jOALXmoxgltCp1K7hrS6gmsvj94cLRf50QQ4U8Qwggd6MIIFYqADAgECAgphDpDS +# 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/BvW1taslScxMNelDNMYIVWzCCFVcCAQEwgZUwfjELMAkG +# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx +# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z +# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAYdyF3IVWUDHCQAAAAABhzAN +# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor +# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgOQvu7NUq +# wmve+qCoalj/s9HX5Hz9/zYISdJyOFTC4FIwQgYKKwYBBAGCNwIBDDE0MDKgFIAS +# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN +# BgkqhkiG9w0BAQEFAASCAQAHbtGz0AChe0qMPM3c7iU8BQCfJklePUlAlhwFSuCx +# careoloxao+ZtS+dQRlrxLu/ZSqtmJHNsyRoWzsHdOs65pwUYhV3svzaXd7pJwkc +# nbDXedLBbNuQrQrrL2xbGtzT3U+EwgpJ1TTEYwHgqkTFogIelGa2sjD5N+4Vvalq +# t+vxaYrWwkTtsm0qczLKGRUjJqCjARjviE1xsOvs4zwbpXx/bEs/6M7U9tR+w/DS +# nDY/5KAKYET0DCVDhmsMmzJi3xXdBr4sAz0484AAB0CIRVgPCgdgr8E0NQUESJzm +# xm3K4bMAgTMWRiGTL4MRYSuMIn09sbfYXP9hjXLvTV4YoYIS5TCCEuEGCisGAQQB +# gjcDAwExghLRMIISzQYJKoZIhvcNAQcCoIISvjCCEroCAQMxDzANBglghkgBZQME +# AgEFADCCAVEGCyqGSIb3DQEJEAEEoIIBQASCATwwggE4AgEBBgorBgEEAYRZCgMB +# MDEwDQYJYIZIAWUDBAIBBQAEIJBynrmlQmGS0UNGTk53HVKEc4aHvNdYrs5eCcHM +# puc5AgZfEgElnvMYEzIwMjAwNzI0MTgwNDM3Ljg3NlowBIACAfSggdCkgc0wgcox +# CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJXQTEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg +# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg +# RVNOOkUwNDEtNEJFRS1GQTdFMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt +# cCBzZXJ2aWNloIIOPDCCBPEwggPZoAMCAQICEzMAAAEHfjdomIdaN9YAAAAAAQcw +# DQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0 +# b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3Jh +# dGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwHhcN +# MTkxMDA4MTczODM1WhcNMjEwMTAzMTczODM1WjCByjELMAkGA1UEBhMCVVMxCzAJ +# BgNVBAgTAldBMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQg +# Q29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlv +# bnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RTA0MS00QkVFLUZB +# N0UxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIHNlcnZpY2UwggEiMA0G +# CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUuqOUlbaeWirgwbCwhhNIOqTshpo+ +# QdSYxAt9JnkeulQFeKrQ6rOSECXxwgOjL/TNMIXtkig1MaifFON6si/Ri+AsV8Gu +# rQp4fylJzLDMFdJcGSpV3CGRdpDb0au8kNQLmnZuxLxAL91R7//3mH2QDQI20w3G +# 06s+Xv8+js9wQksXAfclXX1TJoBIx1Pi1FGqCnY3KlW81+Plhz0T4yStm1MgnqH4 +# RKYyPdcempCYC/BI04Ph2EJL+uQQfAfYdbf9vGqpKYjsuktnWr5uowD3H5At+x3l +# YH5rz4JCleKjeLpB/j74H7VZ0I5eTEbls9e2lEKaUzb9o0wjnjDc+t4BAgMBAAGj +# ggEbMIIBFzAdBgNVHQ4EFgQUNOHjlxlIJXMcP9n/0ogYdX8p6HcwHwYDVR0jBBgw +# FoAU1WM6XIoxkPNDe3xGG8UzaFqFbVUwVgYDVR0fBE8wTTBLoEmgR4ZFaHR0cDov +# L2NybC5taWNyb3NvZnQuY29tL3BraS9jcmwvcHJvZHVjdHMvTWljVGltU3RhUENB +# XzIwMTAtMDctMDEuY3JsMFoGCCsGAQUFBwEBBE4wTDBKBggrBgEFBQcwAoY+aHR0 +# cDovL3d3dy5taWNyb3NvZnQuY29tL3BraS9jZXJ0cy9NaWNUaW1TdGFQQ0FfMjAx +# MC0wNy0wMS5jcnQwDAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDCDAN +# BgkqhkiG9w0BAQsFAAOCAQEAGN3/7XWSzHGKjk444w+2q1D3k7Bh/ZahUvWHFJ6E +# UKU5vLzEGsdsgJSvWXHZDRrpf5rcUGQyjnlo1hAY1mDteNKFushS6bedxcxPHJje +# lVZ9N2/e5+/7zLu18YjnKw5bFu7dWqYBMI3J0FOr56XJOJ1KTtMiJhpxuib+FWy+ +# pyhVVgHGTUHuUdbE09dY9WxuRsbpb4DdWAWNrPDB6VAOO50QfEj+0tW+zF6h3RhB +# TI0ilj0+AzgXE+6DyJ7/br6aVvCEvNRJzE6akJnMyn/kzmC32LxvRZWKEwWDR0Fn +# zeXj5ynSStZ6iifTBP7gqiDsidguxh+BFX7HxhN1eHf7jTCCBnEwggRZoAMCAQIC +# CmEJgSoAAAAAAAIwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRp +# ZmljYXRlIEF1dGhvcml0eSAyMDEwMB4XDTEwMDcwMTIxMzY1NVoXDTI1MDcwMTIx +# NDY1NVowfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNV +# BAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQG +# A1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggEiMA0GCSqGSIb3 +# DQEBAQUAA4IBDwAwggEKAoIBAQCpHQ28dxGKOiDs/BOX9fp/aZRrdFQQ1aUKAIKF +# ++18aEssX8XD5WHCdrc+Zitb8BVTJwQxH0EbGpUdzgkTjnxhMFmxMEQP8WCIhFRD +# DNdNuDgIs0Ldk6zWczBXJoKjRQ3Q6vVHgc2/JGAyWGBG8lhHhjKEHnRhZ5FfgVSx +# z5NMksHEpl3RYRNuKMYa+YaAu99h/EbBJx0kZxJyGiGKr0tkiVBisV39dx898Fd1 +# rL2KQk1AUdEPnAY+Z3/1ZsADlkR+79BL/W7lmsqxqPJ6Kgox8NpOBpG2iAg16Hgc +# sOmZzTznL0S6p/TcZL2kAcEgCZN4zfy8wMlEXV4WnAEFTyJNAgMBAAGjggHmMIIB +# 4jAQBgkrBgEEAYI3FQEEAwIBADAdBgNVHQ4EFgQU1WM6XIoxkPNDe3xGG8UzaFqF +# bVUwGQYJKwYBBAGCNxQCBAweCgBTAHUAYgBDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud +# EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU1fZWy4/oolxiaNE9lJBb186aGMQwVgYD +# VR0fBE8wTTBLoEmgR4ZFaHR0cDovL2NybC5taWNyb3NvZnQuY29tL3BraS9jcmwv +# cHJvZHVjdHMvTWljUm9vQ2VyQXV0XzIwMTAtMDYtMjMuY3JsMFoGCCsGAQUFBwEB +# BE4wTDBKBggrBgEFBQcwAoY+aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraS9j +# ZXJ0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5jcnQwgaAGA1UdIAEB/wSBlTCB +# kjCBjwYJKwYBBAGCNy4DMIGBMD0GCCsGAQUFBwIBFjFodHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vUEtJL2RvY3MvQ1BTL2RlZmF1bHQuaHRtMEAGCCsGAQUFBwICMDQe +# MiAdAEwAZQBnAGEAbABfAFAAbwBsAGkAYwB5AF8AUwB0AGEAdABlAG0AZQBuAHQA +# LiAdMA0GCSqGSIb3DQEBCwUAA4ICAQAH5ohRDeLG4Jg/gXEDPZ2joSFvs+umzPUx +# vs8F4qn++ldtGTCzwsVmyWrf9efweL3HqJ4l4/m87WtUVwgrUYJEEvu5U4zM9GAS +# inbMQEBBm9xcF/9c+V4XNZgkVkt070IQyK+/f8Z/8jd9Wj8c8pl5SpFSAK84Dxf1 +# L3mBZdmptWvkx872ynoAb0swRCQiPM/tA6WWj1kpvLb9BOFwnzJKJ/1Vry/+tuWO +# M7tiX5rbV0Dp8c6ZZpCM/2pif93FSguRJuI57BlKcWOdeyFtw5yjojz6f32WapB4 +# pm3S4Zz5Hfw42JT0xqUKloakvZ4argRCg7i1gJsiOCC1JeVk7Pf0v35jWSUPei45 +# V3aicaoGig+JFrphpxHLmtgOR5qAxdDNp9DvfYPw4TtxCd9ddJgiCGHasFAeb73x +# 4QDf5zEHpJM692VHeOj4qEir995yfmFrb3epgcunCaw5u+zGy9iCtHLNHfS4hQEe +# gPsbiSpUObJb2sgNVZl6h3M7COaYLeqN4DMuEin1wC9UJyH3yKxO2ii4sanblrKn +# QqLJzxlBTeCG+SqaoxFmMNO7dDJL32N79ZmKLxvHIa9Zta7cRDyXUHHXodLFVeNp +# 3lfB0d4wwP3M5k37Db9dT+mdHhk4L7zPWAUu7w2gUDXa7wknHNWzfjUeCLraNtvT +# X4/edIhJEqGCAs4wggI3AgEBMIH4oYHQpIHNMIHKMQswCQYDVQQGEwJVUzELMAkG +# A1UECBMCV0ExEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBD +# b3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9zb2Z0IElyZWxhbmQgT3BlcmF0aW9u +# cyBMaW1pdGVkMSYwJAYDVQQLEx1UaGFsZXMgVFNTIEVTTjpFMDQxLTRCRUUtRkE3 +# RTElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgc2VydmljZaIjCgEBMAcG +# BSsOAwIaAxUAwwu+tfgG3rC7RZrxuFO2CmZSfPiggYMwgYCkfjB8MQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQg +# VGltZS1TdGFtcCBQQ0EgMjAxMDANBgkqhkiG9w0BAQUFAAIFAOLFEVUwIhgPMjAy +# MDA3MjQxNTUwNDVaGA8yMDIwMDcyNTE1NTA0NVowdzA9BgorBgEEAYRZCgQBMS8w +# LTAKAgUA4sURVQIBADAKAgEAAgIa9QIB/zAHAgEAAgIR9DAKAgUA4sZi1QIBADA2 +# BgorBgEEAYRZCgQCMSgwJjAMBgorBgEEAYRZCgMCoAowCAIBAAIDB6EgoQowCAIB +# AAIDAYagMA0GCSqGSIb3DQEBBQUAA4GBADwvhE9bln801RR+oEXjtPJXTqtYMakR +# ymItUlO2HRorDqEv2SJR/V/kQjcsqS6ig54bOiKs0Il2fW/s/pi+x1ydJMpOyhM7 +# zzqm3acQ9kbYHIDoPWVT/Rq2Oo33Dq380zXENcc0hpLAKF3Cu06SbbNbqu+A/wbI +# z5IClz6kU8kiMYIDDTCCAwkCAQEwgZMwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgT +# Cldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29m +# dCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENB +# IDIwMTACEzMAAAEHfjdomIdaN9YAAAAAAQcwDQYJYIZIAWUDBAIBBQCgggFKMBoG +# CSqGSIb3DQEJAzENBgsqhkiG9w0BCRABBDAvBgkqhkiG9w0BCQQxIgQg6+NCew+c +# OhYIOzhUKofOF7MxtgOvSMWQCMCIWlTFNMgwgfoGCyqGSIb3DQEJEAIvMYHqMIHn +# MIHkMIG9BCBBYvCj4pFkwhumagATn0gLh9fdDNzImQkKNeOtRj/LHjCBmDCBgKR+ +# MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS +# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMT +# HU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwAhMzAAABB343aJiHWjfWAAAA +# AAEHMCIEIGIH6vLdbEFNnxTxBhtIN7CtmhcKy/9m6/xoAA3LHzXUMA0GCSqGSIb3 +# DQEBCwUABIIBAKGg3zNulscnGBDlD6Q/U6yLQ5dN3gF9UrprgACiQ1gs/DexU7oC +# hjNZxBnH5RTA/7q9TFf2a1rBydHWVnqXuuQQJ0HuskdpXahxR4y1jboDdGwr7F08 +# v/gmPeeUik28Je72QZp5m/R0O61/kMQaDpLO9iPH0Z9iMGfqJonFPDeY4VX8Da2n +# cPY7mrv6YAI+ydZ+mUdBp2yjas7+/N8MntcNtAO0HpWFXQTAmb77RrSssfeZphRA +# mBD+gLx5C3q4uSmuOqaQxUaF0y8FeuetHp0bw2sfce6GlMXJwzTpC6HvXnaVtMy0 +# pgzd/KPHW7EgSvmRVKmvwiQGiZBoRG/Gcg8= +# SIG # End signature block diff --git a/scripts/azure-pipelines/windows/provision-entire-image.ps1 b/scripts/azure-pipelines/windows/provision-entire-image.ps1 index 3bfb5dbd9e2a69..9e1c1b268c065d 100644 --- a/scripts/azure-pipelines/windows/provision-entire-image.ps1 +++ b/scripts/azure-pipelines/windows/provision-entire-image.ps1 @@ -3,10 +3,12 @@ . "$PSScriptRoot\utility-prefix.ps1" +. "$PSScriptRoot\deploy-tlssettings.ps1" -RebootIfRequired 0 . "$PSScriptRoot\deploy-visual-studio.ps1" . "$PSScriptRoot\deploy-windows-wdk.ps1" . "$PSScriptRoot\deploy-mpi.ps1" . "$PSScriptRoot\deploy-cuda.ps1" +. "$PSScriptRoot\deploy-inteloneapi.ps1" . "$PSScriptRoot\deploy-pwsh.ps1" try { Copy-Item "$PSScriptRoot\deploy-settings.txt" "$PSScriptRoot\deploy-settings.ps1" diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 1b0da1d33d2e05..37cab340fbeb02 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" -& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-05-05-9f849c4c43e50d1b16186ae76681c27b0c1be9d9/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-19/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Write-Host "" if ($LASTEXITCODE -ne 0) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 9a97751d679dda..4ee1c11eb6194a 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -278,8 +278,8 @@ else fi # Do the build -vcpkgToolReleaseTag="2021-05-05-9f849c4c43e50d1b16186ae76681c27b0c1be9d9" -vcpkgToolReleaseSha="2b85eb0da65221d207a5023eda0d4da74258d7fb5db9e211718efb2573673daa3fa98a75af4a570595f12467a8f7e7759a3be01b33598a4fb6d4203bf83949ef" +vcpkgToolReleaseTag="2021-06-19" +vcpkgToolReleaseSha="e9626023b5b545ac88985a0b1bec2d1784f2c5724cc23c6dacf7bf5851c1c7b34649d11192bcd20e41a6340dc6a8d557cace20016a0e121cc8975613f11343ef" vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0e9115309a4272..d05d8f46d227b2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1279,7 +1279,7 @@ protobuf-c:arm-uwp=fail python2:arm64-windows=fail python2:arm-uwp=fail python2:x64-uwp=fail -# Not yet ready for these platforms. +# Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail qhull:x64-uwp=fail @@ -1810,3 +1810,10 @@ dimcli:x64-windows-static=fail # cppgraphqlgen triggers an ICE on Apple Clang that comes with MacOS 11. cppgraphqlgen:x64-osx=fail + +# Visual Studio 2019 version 16.10's XAML compiler seems to be crashing processing this port +simage:x64-uwp=fail +simage:arm-uwp=fail + +# Changes in Python have broken tensorflow on our osx hardware +tensorflow-cc:x64-osx=fail From d085739620e3237b467bb288d073a7b4fff57eed Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 24 Jun 2021 00:30:46 +0200 Subject: [PATCH 040/141] [vcpkg.cmake] PREPEND CMAKE_FIND_ROOT_PATH (#17336) * [vcpkg.cmake] PREPEND CMAKE_FIND_ROOT_PATH * [vcpkg.cmake] make PREPEND optional (default off, option VCPKG_PREFER_VCPKG_LIBS) * Apply suggestions from code review Co-authored-by: nicole mazzuca * Update scripts/buildsystems/vcpkg.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca --- docs/users/manifests.md | 6 ++++++ scripts/buildsystems/vcpkg.cmake | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/docs/users/manifests.md b/docs/users/manifests.md index 6d94cd40ce50c9..ae0ee7eedca613 100644 --- a/docs/users/manifests.md +++ b/docs/users/manifests.md @@ -425,6 +425,12 @@ Defaults to `OFF`. This variable can be set to a list of additional command line parameters to pass to the vcpkg tool during automatic installation. +#### `VCPKG_PREFER_SYSTEM_LIBS` + +This variable controls whether vcpkg will appends instead of prepends its paths to `CMAKE_PREFIX_PATH`, `CMAKE_LIBRARY_PATH` and `CMAKE_FIND_ROOT_PATH` so that vcpkg libraries/packages are found after toolchain/system libraries/packages. + +Defaults to `OFF`. + #### `VCPKG_FEATURE_FLAGS` This variable can be set to a list of feature flags to pass to the vcpkg tool during automatic installation to opt-in to diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 446e64f23c0e8d..58d3da956a0a10 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -47,6 +47,7 @@ mark_as_advanced(VCPKG_VERBOSE) option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON) option(X_VCPKG_APPLOCAL_DEPS_SERIALIZED "(experimental) Add USES_TERMINAL to VCPKG_APPLOCAL_DEPS to force serialization." OFF) option(X_VCPKG_APPLOCAL_DEPS_INSTALL "(experimental) Automatically copy dependencies into the install target directory for executables." OFF) +option(VCPKG_PREFER_SYSTEM_LIBS "Appends the vcpkg paths to CMAKE_PREFIX_PATH, CMAKE_LIBRARY_PATH and CMAKE_FIND_ROOT_PATH so that vcpkg libraries/packages are found after toolchain/system libraries/packages." OFF) # Manifest options and settings if(NOT DEFINED VCPKG_MANIFEST_DIR) @@ -379,29 +380,35 @@ set(_VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}" CACHE PATH "The directory which contains the installed libraries for each triplet" FORCE) +if(VCPKG_PREFER_SYSTEM_LIBS) + set(Z_VCPKG_PATH_LIST_OP APPEND) +else() + set(Z_VCPKG_PATH_LIST_OP PREPEND) +endif() + if(CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. - list(APPEND CMAKE_PREFIX_PATH + list(${Z_VCPKG_PATH_LIST_OP} CMAKE_PREFIX_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" ) - list(APPEND CMAKE_LIBRARY_PATH + list(${Z_VCPKG_PATH_LIST_OP} CMAKE_LIBRARY_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link" ) - list(APPEND CMAKE_FIND_ROOT_PATH + list(${Z_VCPKG_PATH_LIST_OP} CMAKE_FIND_ROOT_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" ) else() #Release build: Put Release paths before Debug paths. Debug Paths are required so that CMake generates correct info in autogenerated target files. - list(APPEND CMAKE_PREFIX_PATH + list(${Z_VCPKG_PATH_LIST_OP} CMAKE_PREFIX_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" ) - list(APPEND CMAKE_LIBRARY_PATH + list(${Z_VCPKG_PATH_LIST_OP} CMAKE_LIBRARY_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link" ) - list(APPEND CMAKE_FIND_ROOT_PATH + list(${Z_VCPKG_PATH_LIST_OP} CMAKE_FIND_ROOT_PATH "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" ) From 55efc16603689e30d0055835babe81bd7549b3f9 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 24 Jun 2021 09:53:27 -0700 Subject: [PATCH 041/141] [vcpkg-unstable] Update agent pool name --- scripts/azure-pipelines/windows-unstable/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml index 189ab31acdd9c6..65ee8decfcc7ec 100644 --- a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT # variables: - unstable-pool: 'VcpkgUnstable-2020-09-01' + unstable-pool: 'VcpkgUnstable1ES' jobs: - template: job.yml From b282afe74b1fd1aaad890cd8f6d178ec7b0feb0f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 25 Jun 2021 04:04:17 +0800 Subject: [PATCH 042/141] [boringssl] update to newer commit (#18604) * [boringssl] update to newer commit * update version --- ports/boringssl/0001-vcpkg.patch | 64 ++++++++++++++++---------------- ports/boringssl/CONTROL | 9 ----- ports/boringssl/portfile.cmake | 7 ++-- ports/boringssl/vcpkg.json | 12 ++++++ versions/b-/boringssl.json | 5 +++ versions/baseline.json | 4 +- 6 files changed, 55 insertions(+), 46 deletions(-) delete mode 100644 ports/boringssl/CONTROL create mode 100644 ports/boringssl/vcpkg.json diff --git a/ports/boringssl/0001-vcpkg.patch b/ports/boringssl/0001-vcpkg.patch index 88547d8c3ce459..f871dd92be529f 100644 --- a/ports/boringssl/0001-vcpkg.patch +++ b/ports/boringssl/0001-vcpkg.patch @@ -1,32 +1,32 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index 75bf9981b..15589a760 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -564,7 +564,7 @@ endif() - - # Add minimal googletest targets. The provided one has many side-effects, and - # googletest has a very straightforward build. --add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc) -+add_library(boringssl_gtest STATIC third_party/googletest/src/gtest-all.cc) - target_include_directories(boringssl_gtest PRIVATE third_party/googletest) - - include_directories(third_party/googletest/include) -@@ -621,3 +621,18 @@ add_custom_target( - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - DEPENDS all_tests bssl_shim handshaker - ${MAYBE_USES_TERMINAL}) -+ -+install(TARGETS crypto ssl -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+ -+option(INSTALL_HEADERS "Install headers" ON) -+if(INSTALL_HEADERS) -+ install(DIRECTORY include/ DESTINATION include) -+endif() -+ -+option(INSTALL_TOOLS "Install bssl executable" OFF) -+if(INSTALL_TOOLS) -+ install(TARGETS bssl DESTINATION tools/boringssl) -+endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 893bca7..83ff477 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -562,7 +562,7 @@ endif() + + # Add minimal googletest targets. The provided one has many side-effects, and + # googletest has a very straightforward build. +-add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc) ++add_library(boringssl_gtest STATIC third_party/googletest/src/gtest-all.cc) + target_include_directories(boringssl_gtest PRIVATE third_party/googletest) + + include_directories(third_party/googletest/include) +@@ -649,3 +649,18 @@ add_custom_target( + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any + USES_TERMINAL) ++ ++install(TARGETS crypto ssl ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ ++option(INSTALL_HEADERS "Install headers" ON) ++if(INSTALL_HEADERS) ++ install(DIRECTORY include/ DESTINATION include) ++endif() ++ ++option(INSTALL_TOOLS "Install bssl executable" OFF) ++if(INSTALL_TOOLS) ++ install(TARGETS bssl DESTINATION tools/boringssl) ++endif() diff --git a/ports/boringssl/CONTROL b/ports/boringssl/CONTROL deleted file mode 100644 index 1c8c4dcbf6b9c2..00000000000000 --- a/ports/boringssl/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: boringssl -Version: 2020-04-07 -Port-Version: 2 -Homepage: https://boringssl.googlesource.com/boringssl -Description: BoringSSl is a fork of OpenSSL developed by Google -Supports: !uwp - -Feature: tools -Description: Build bssl executable diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index 80068da8d05b96..71cef4ed35058f 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -17,14 +17,15 @@ get_filename_component(GO_EXE_PATH ${GO} DIRECTORY) vcpkg_add_to_path(${GO_EXE_PATH}) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools INSTALL_TOOLS + FEATURES + tools INSTALL_TOOLS ) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/boringssl - REF 5902657734e2a796a514731e0fd0e80081ae43dc - SHA512 89458748ccf7e00e2e12a1026e7c41099298dfb6d0daaf885f52b98c84e833a4407e997dd3a5b92d56ede495ef431325a4b228c2d81598bde082141339b16684 + REF 479adf98d54a21c1d154aac59b2ce120e1d1a6d6 + SHA512 74b5d001c0f5c1846b8818e9e668fa35de5171fc21a8f713d241f57b3e8abe42426fdc66b085cca1853b904def6f4bea573dfed40b8b1422894cca85b0b1a44a HEAD_REF master PATCHES 0001-vcpkg.patch diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json new file mode 100644 index 00000000000000..e3aaec032fd75d --- /dev/null +++ b/ports/boringssl/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "boringssl", + "version-date": "2021-06-23", + "description": "BoringSSl is a fork of OpenSSL developed by Google", + "homepage": "https://boringssl.googlesource.com/boringssl", + "supports": "!uwp", + "features": { + "tools": { + "description": "Build bssl executable" + } + } +} diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json index 1be3ecf03d5535..2d3b5ad08ce5a4 100644 --- a/versions/b-/boringssl.json +++ b/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa2649d9a0296ed873aa8fb17c28f38baac51a26", + "version-date": "2021-06-23", + "port-version": 0 + }, { "git-tree": "efaff27f5d50195917c54e210f4904b80d73399a", "version-string": "2020-04-07", diff --git a/versions/baseline.json b/versions/baseline.json index 8bf5854a71e977..5f0120980032de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1033,8 +1033,8 @@ "port-version": 0 }, "boringssl": { - "baseline": "2020-04-07", - "port-version": 2 + "baseline": "2021-06-23", + "port-version": 0 }, "botan": { "baseline": "2.16.0", From 1c46d80e4cc59b10154e18df879d543f111676c6 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 25 Jun 2021 04:04:57 +0800 Subject: [PATCH 043/141] [vcpkg baseline][kf5* librsvg] Add DISABLE_PARALLEL_CONFIGURE (#18600) * [kf5*] Add DISABLE_PARALLEL_CONFIGURE * Update version files * [librsvg] Add DISABLE_PARALLEL_CONFIGURE * Update version files --- ports/kf5completion/portfile.cmake | 1 + ports/kf5completion/vcpkg.json | 1 + ports/kf5coreaddons/portfile.cmake | 1 + ports/kf5coreaddons/vcpkg.json | 1 + ports/kf5crash/portfile.cmake | 1 + ports/kf5crash/vcpkg.json | 1 + ports/kf5i18n/portfile.cmake | 1 + ports/kf5i18n/vcpkg.json | 1 + ports/kf5itemmodels/portfile.cmake | 1 + ports/kf5itemmodels/vcpkg.json | 1 + ports/kf5itemviews/portfile.cmake | 1 + ports/kf5itemviews/vcpkg.json | 1 + ports/kf5plotting/portfile.cmake | 1 + ports/kf5plotting/vcpkg.json | 1 + ports/kf5widgetsaddons/portfile.cmake | 1 + ports/kf5widgetsaddons/vcpkg.json | 1 + ports/librsvg/portfile.cmake | 3 ++- ports/librsvg/vcpkg.json | 2 +- versions/baseline.json | 18 +++++++++--------- versions/k-/kf5completion.json | 5 +++++ versions/k-/kf5coreaddons.json | 5 +++++ versions/k-/kf5crash.json | 5 +++++ versions/k-/kf5i18n.json | 5 +++++ versions/k-/kf5itemmodels.json | 5 +++++ versions/k-/kf5itemviews.json | 5 +++++ versions/k-/kf5plotting.json | 5 +++++ versions/k-/kf5widgetsaddons.json | 5 +++++ versions/l-/librsvg.json | 5 +++++ 28 files changed, 73 insertions(+), 11 deletions(-) diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index 0e78c1a5106727..e00132253416db 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index 272bab35269115..34f601960c474b 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5completion", "version": "5.81.0", + "port-version": 1, "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 24fcf1274295e4..9e52b86be3669e 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index 1ac0a149a59b9c..ed61f11e1aeee3 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5coreaddons", "version": "5.81.0", + "port-version": 1, "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index 0fa8caf06b356f..4f2588c4d07010 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json index 8c58963ad75170..88afb5166c9e06 100644 --- a/ports/kf5crash/vcpkg.json +++ b/ports/kf5crash/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5crash", "version": "5.81.0", + "port-version": 1, "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", "supports": "linux", diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index df6d9131f6d32d..a5809fd64a52f6 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -35,6 +35,7 @@ vcpkg_find_acquire_program(PYTHON3) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index a48e19276b1ed9..9ee9b1a0156f14 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5i18n", "version": "5.81.0", + "port-version": 1, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index 573ad7f003218b..07ed36537b86f5 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json index 37820a66a7f74c..cb3aff674786be 100644 --- a/ports/kf5itemmodels/vcpkg.json +++ b/ports/kf5itemmodels/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemmodels", "version": "5.81.0", + "port-version": 1, "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index 425689319a8ea7..fd5a675d92dafc 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json index be3e6611a833d7..7c6d0a6d1be9a7 100644 --- a/ports/kf5itemviews/vcpkg.json +++ b/ports/kf5itemviews/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemviews", "version": "5.81.0", + "port-version": 1, "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index ac302023983435..35d8525b406256 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index b99ba7cd218f04..c55853b024f2d5 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5plotting", "version": "5.81.0", + "port-version": 1, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index 322ded1fbd488b..83738ffad4f7a1 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json index ee0c9e6d188ab3..a8ef7a3274a5d2 100644 --- a/ports/kf5widgetsaddons/vcpkg.json +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5widgetsaddons", "version": "5.81.0", + "port-version": 1, "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake index 19b86ff4740df8..f87ed15b9e6908 100644 --- a/ports/librsvg/portfile.cmake +++ b/ports/librsvg/portfile.cmake @@ -17,6 +17,7 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.linux ${SOURCE_PATH}/config.h. vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} @@ -31,4 +32,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-librsvg TARGET_PATH share 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 ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/librsvg/vcpkg.json b/ports/librsvg/vcpkg.json index 13d22016379200..49114f48249196 100644 --- a/ports/librsvg/vcpkg.json +++ b/ports/librsvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librsvg", "version": "2.40.20", - "port-version": 3, + "port-version": 4, "description": "A small library to render Scalable Vector Graphics (SVG)", "homepage": "https://gitlab.gnome.org/GNOME/librsvg", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5f0120980032de..2104fd55d29aaf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2850,7 +2850,7 @@ }, "kf5completion": { "baseline": "5.81.0", - "port-version": 0 + "port-version": 1 }, "kf5config": { "baseline": "5.81.0", @@ -2858,11 +2858,11 @@ }, "kf5coreaddons": { "baseline": "5.81.0", - "port-version": 0 + "port-version": 1 }, "kf5crash": { "baseline": "5.81.0", - "port-version": 0 + "port-version": 1 }, "kf5dbusaddons": { "baseline": "5.81.0", @@ -2878,19 +2878,19 @@ }, "kf5i18n": { "baseline": "5.81.0", - "port-version": 0 + "port-version": 1 }, "kf5itemmodels": { "baseline": "5.81.0", - "port-version": 0 + "port-version": 1 }, "kf5itemviews": { "baseline": "5.81.0", - "port-version": 0 + "port-version": 1 }, "kf5plotting": { "baseline": "5.81.0", - "port-version": 0 + "port-version": 1 }, "kf5syntaxhighlighting": { "baseline": "5.81.0", @@ -2898,7 +2898,7 @@ }, "kf5widgetsaddons": { "baseline": "5.81.0", - "port-version": 0 + "port-version": 1 }, "kf5windowsystem": { "baseline": "5.81.0", @@ -3506,7 +3506,7 @@ }, "librsvg": { "baseline": "2.40.20", - "port-version": 3 + "port-version": 4 }, "librsync": { "baseline": "2020-09-16", diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index 0aab32fc18ea41..7def2e191dd632 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82b63d20234241b66dc8f7242619d713d43340de", + "version": "5.81.0", + "port-version": 1 + }, { "git-tree": "8e4e693e3597dcada6e28243e1d536a44063fc18", "version": "5.81.0", diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index ff7c42ad04c806..5b4c8a28b32b6f 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8467a9d9763b072c6fd898b1d5be2227205216bd", + "version": "5.81.0", + "port-version": 1 + }, { "git-tree": "47f0a0b5ec4ebb494396fbc3118ef864e1c66689", "version": "5.81.0", diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json index c34b53c61547f7..550c1a895733e2 100644 --- a/versions/k-/kf5crash.json +++ b/versions/k-/kf5crash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18cf44844a7becb7d932cd96709fb40f800236ad", + "version": "5.81.0", + "port-version": 1 + }, { "git-tree": "cc944375b9c277d67a8c7174c24e5ed4221e413a", "version": "5.81.0", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 303a141620146c..a95b23d7800148 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a749b5eb069f5e7a8c84a65746ca7579d2e85af5", + "version": "5.81.0", + "port-version": 1 + }, { "git-tree": "85675e319c19cb4303a56719af9ad49feb733983", "version": "5.81.0", diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index 8e857f8ddac85d..b27692c2d659ba 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc5ec5bc67cce9eed6f93724083656ffd691365b", + "version": "5.81.0", + "port-version": 1 + }, { "git-tree": "8253bf274c45235c1fa763255fbc9c765de8d245", "version": "5.81.0", diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index 1a67807a6f13a8..1cd722cfd39885 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2b8ea2e118cf093ca85c444bd16dee60a1a1777", + "version": "5.81.0", + "port-version": 1 + }, { "git-tree": "c299c11853b1ca953bbc5801a596f4db51bc5782", "version": "5.81.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 1a0bfd910e7afa..b6ab5c41e80a33 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e45f62745247b51d6583a1bc9a45e4a4bc26701b", + "version": "5.81.0", + "port-version": 1 + }, { "git-tree": "d0991bf27a381493f05e2c2c724a4e523cf893be", "version": "5.81.0", diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index 6959786985145b..f21e935cce9976 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eaf1fa333a58906c39eaafc1f5e9aa0ca52aca92", + "version": "5.81.0", + "port-version": 1 + }, { "git-tree": "3f982e6ab4ef615b0978a477c0943d3b490e6823", "version": "5.81.0", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index dd7bd19b72388f..82d5bb16c71aa3 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a02c4941810ea725b6686e203ae81deb257e24c", + "version": "2.40.20", + "port-version": 4 + }, { "git-tree": "0de6b9c0d9dc0ada7b9223669bb08e9ef146aa7a", "version": "2.40.20", From f9796848c17538bcf623fb594a3ccf2df5680dcb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 24 Jun 2021 22:05:24 +0200 Subject: [PATCH 044/141] [benchmark] Update to 1.5.5 (#18595) * update benchmark * version stuff --- ports/benchmark/CONTROL | 5 ----- ports/benchmark/portfile.cmake | 12 ++++++------ ports/benchmark/vcpkg.json | 7 +++++++ versions/b-/benchmark.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 ports/benchmark/CONTROL create mode 100644 ports/benchmark/vcpkg.json diff --git a/ports/benchmark/CONTROL b/ports/benchmark/CONTROL deleted file mode 100644 index 9a7618385495b8..00000000000000 --- a/ports/benchmark/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: benchmark -Version: 1.5.2 -Homepage: https://github.com/google/benchmark -Description: A library to support the benchmarking of functions, similar to unit-tests. -Supports: !(arm|uwp) diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index 7f4add94ce7d3f..096641a5785a9e 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF 73d4d5e8d6d449fc8663765a42aa8aeeee844489 # v1.5.2 - SHA512 b87a7c207eb85187165df8ff99ab1bbf5d38fc2a6d839e267a71987951c94e33b55fd7fbee6f2b59202b0379a7e9705b73b193edaea0b9c742eddf3fcbe5f48e + REF e991355c02b93fe17713efe04cbc2e278e00fdbd # v1.5.5 + SHA512 aa4455fa0f8546ec5762f14065e0be6667b5874e6991ca6dd21dc7b29e38c7c74cfddb2c99c7a1ed2f7636aa7bdec8fc0fc1523967b179f5642c2dc2e968089c HEAD_REF master ) @@ -24,10 +24,10 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark) -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) +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") # Handle copyright -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) \ No newline at end of file diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json new file mode 100644 index 00000000000000..bc666955193d94 --- /dev/null +++ b/ports/benchmark/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "benchmark", + "version-semver": "1.5.5", + "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 b50f650ab65720..0edc1ab45cf6a3 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e47bb1810fa9570b6b87eba79bb95c749763e1e0", + "version-semver": "1.5.5", + "port-version": 0 + }, { "git-tree": "9edadb1ffe2869bf6c1b2271e89576e05234e9a5", "version-string": "1.5.2", diff --git a/versions/baseline.json b/versions/baseline.json index 2104fd55d29aaf..11d5be19e7e8f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -353,7 +353,7 @@ "port-version": 0 }, "benchmark": { - "baseline": "1.5.2", + "baseline": "1.5.5", "port-version": 0 }, "bento4": { From b7af2efe7afd5e8281d0e4f16a37425cd559fc55 Mon Sep 17 00:00:00 2001 From: Dimitrij Mijoski Date: Thu, 24 Jun 2021 22:07:09 +0200 Subject: [PATCH 045/141] [nuspell] Update to version 5.0.0 (#18590) * [nuspell] Update to version 5.0.0 * x-add-version nuspell --- ports/nuspell/CONTROL | 7 --- .../nuspell/cmake-disable-cli-and-docs.patch | 46 ------------------- ports/nuspell/portfile.cmake | 11 ++--- ports/nuspell/vcpkg.json | 13 ++++++ versions/baseline.json | 2 +- versions/n-/nuspell.json | 5 ++ 6 files changed, 22 insertions(+), 62 deletions(-) delete mode 100644 ports/nuspell/CONTROL delete mode 100644 ports/nuspell/cmake-disable-cli-and-docs.patch create mode 100644 ports/nuspell/vcpkg.json diff --git a/ports/nuspell/CONTROL b/ports/nuspell/CONTROL deleted file mode 100644 index cb81a16bf2e9a6..00000000000000 --- a/ports/nuspell/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: nuspell -Version: 4.2.0 -Description: Nuspell is a fast and safe spelling checker software program. - It is designed for languages with rich morphology and complex word compounding. - Nuspell is written in modern C++ and it supports Hunspell dictionaries. -Homepage: https://nuspell.github.io/ -Build-Depends: icu diff --git a/ports/nuspell/cmake-disable-cli-and-docs.patch b/ports/nuspell/cmake-disable-cli-and-docs.patch deleted file mode 100644 index 4495ae040cd346..00000000000000 --- a/ports/nuspell/cmake-disable-cli-and-docs.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a98ed58..3756bae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,8 +19,6 @@ if (subproject) - return() - endif() - --add_subdirectory(docs) -- - function(find_catch2_from_source) - set(Catch2_FOUND Catch2-NOTFOUND PARENT_SCOPE) - set(catch_cmake_lists ${PROJECT_SOURCE_DIR}/external/Catch2/CMakeLists.txt) -diff --git a/src/nuspell/CMakeLists.txt b/src/nuspell/CMakeLists.txt -index 9535686..78553c5 100644 ---- a/src/nuspell/CMakeLists.txt -+++ b/src/nuspell/CMakeLists.txt -@@ -27,22 +27,6 @@ target_include_directories(nuspell - - target_link_libraries(nuspell PUBLIC ICU::uc ICU::data) - --add_executable(nuspell-bin main.cxx) --set_target_properties(nuspell-bin PROPERTIES -- RUNTIME_OUTPUT_DIRECTORY ../tools -- RUNTIME_OUTPUT_NAME nuspell) --target_compile_definitions(nuspell-bin PRIVATE -- PROJECT_VERSION=\"${PROJECT_VERSION}\") --target_link_libraries(nuspell-bin nuspell) --if (BUILD_SHARED_LIBS AND WIN32) -- # This should be PRE_LINK (or PRE_BUILD), so Vcpkg's POST_BUILD -- # step (see VCPKG_APPLOCAL_DEPS) that copies dll can pick up nuspell.dll -- # inside the folder ../tools. -- add_custom_command(TARGET nuspell-bin PRE_LINK -- COMMAND ${CMAKE_COMMAND} -E copy_if_different -- $ $) --endif() -- - if (NOT subproject) - install(TARGETS nuspell - EXPORT NuspellTargets -@@ -53,5 +37,4 @@ if (NOT subproject) - install(EXPORT NuspellTargets - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/nuspell - NAMESPACE Nuspell::) -- install(TARGETS nuspell-bin DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() diff --git a/ports/nuspell/portfile.cmake b/ports/nuspell/portfile.cmake index 6b2da7cadd2eb4..3128018e3e72bf 100644 --- a/ports/nuspell/portfile.cmake +++ b/ports/nuspell/portfile.cmake @@ -1,15 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nuspell/nuspell - REF v4.2.0 - SHA512 ae9157e9753868c002ed69a765fb705d29d993f3940e11efbc2699778a8b1abee2eb7daa0ff51187b899d6935a215a24662e5b52ec1ef5c644e90a0245f7583d + REF v5.0.0 + SHA512 92605c5f0d413b86711fea3b993d656552d5e72440303d3e71907a503d060ead032dfeb0dd8dbb790f35599b8cca8854bdd8650f0560793d9c62a11aebccc2e5 HEAD_REF master - PATCHES cmake-disable-cli-and-docs.patch - # This patch disables building the CLI tool and leaves only the library. - # That is because Vcpkg complains when it finds .exe files in the folder - # "bin". Instead it expects them under "tools", which is different - # convention than on Unixes. This patch is quick fix, the CLI is not - # that important. ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -24,6 +18,7 @@ vcpkg_fixup_pkgconfig( # because it can't find this. -lm is part of glibc on Linux. SYSTEM_LIBRARIES m ) +vcpkg_copy_tools(TOOL_NAMES nuspell AUTO_CLEAN) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json new file mode 100644 index 00000000000000..5840ce1c50b459 --- /dev/null +++ b/ports/nuspell/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "nuspell", + "version-semver": "5.0.0", + "description": [ + "Nuspell is a fast and safe spelling checker software program.", + "It is designed for languages with rich morphology and complex word compounding.", + "Nuspell is written in modern C++ and it supports Hunspell dictionaries." + ], + "homepage": "https://nuspell.github.io/", + "dependencies": [ + "icu" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 11d5be19e7e8f7..991188a0923333 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4381,7 +4381,7 @@ "port-version": 0 }, "nuspell": { - "baseline": "4.2.0", + "baseline": "5.0.0", "port-version": 0 }, "nvtt": { diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index ae0281260dae66..a6bb2cf2931856 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80e078d3797fd83a92fd3a6d0f59a373e43beadb", + "version-semver": "5.0.0", + "port-version": 0 + }, { "git-tree": "97027ba299650a7ef96081bf3a466ac76108593f", "version-string": "4.2.0", From 73457c3803a786614f14b6e665cfc0cd9b9c3a66 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 Jun 2021 04:08:29 +0800 Subject: [PATCH 046/141] [matplotplusplus] Fix usage (#18583) * [matplotplusplus] Fix usage * update version record * Remove rename code * update version --- ports/matplotplusplus/portfile.cmake | 7 +------ ports/matplotplusplus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/matplotplusplus.json | 5 +++++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/matplotplusplus/portfile.cmake b/ports/matplotplusplus/portfile.cmake index 21d805e5dff802..8755fc8f2a66c1 100644 --- a/ports/matplotplusplus/portfile.cmake +++ b/ports/matplotplusplus/portfile.cmake @@ -48,12 +48,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -file(RENAME - "${CURRENT_PACKAGES_DIR}/lib/cmake/Matplot++/matplot++-config.cmake" - "${CURRENT_PACKAGES_DIR}/lib/cmake/Matplot++/Matplot++-config.cmake" -) - -vcpkg_cmake_config_fixup(PACKAGE_NAME Matplot++ CONFIG_PATH lib/cmake/Matplot++) +vcpkg_cmake_config_fixup(PACKAGE_NAME matplot++ CONFIG_PATH lib/cmake/Matplot++) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/matplotplusplus/vcpkg.json b/ports/matplotplusplus/vcpkg.json index 378a314931fee2..5650ae9f5e2b5e 100644 --- a/ports/matplotplusplus/vcpkg.json +++ b/ports/matplotplusplus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "matplotplusplus", "version-date": "2021-04-11", - "port-version": 3, + "port-version": 4, "description": "A C++ graphics library for data visualization", "homepage": "https://alandefreitas.github.io/matplotplusplus/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 991188a0923333..7c5de55fdfd3ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3926,7 +3926,7 @@ }, "matplotplusplus": { "baseline": "2021-04-11", - "port-version": 3 + "port-version": 4 }, "matroska": { "baseline": "1.6.2", diff --git a/versions/m-/matplotplusplus.json b/versions/m-/matplotplusplus.json index d409eab6857f8f..a1a7f045919ca2 100644 --- a/versions/m-/matplotplusplus.json +++ b/versions/m-/matplotplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee89d0f23b11e362fb9e65670377c47b35ffea6c", + "version-date": "2021-04-11", + "port-version": 4 + }, { "git-tree": "e60b72bfb17b3263a7ee1e056af221991f5c7d69", "version-date": "2021-04-11", From 7cb260d4db39a84499ae2c44a32c1ba6f8168580 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 Jun 2021 04:09:12 +0800 Subject: [PATCH 047/141] [vcpkg baseline][ncurses] Fix gnu download link (#18579) * [ncurses] Fix gnu download link * update version record --- ports/ncurses/portfile.cmake | 2 +- ports/ncurses/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/ncurses.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/ncurses/portfile.cmake b/ports/ncurses/portfile.cmake index 1a282c1b361b02..71ccfda8b11826 100644 --- a/ports/ncurses/portfile.cmake +++ b/ports/ncurses/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_download_distfile( URLS "https://invisible-mirror.net/archives/ncurses/ncurses-6.2.tar.gz" "ftp://ftp.invisible-island.net/ncurses/ncurses-6.2.tar.gz" - "ftp://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz" + "https://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz" FILENAME "ncurses-6.2.tgz" SHA512 4c1333dcc30e858e8a9525d4b9aefb60000cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d ) diff --git a/ports/ncurses/vcpkg.json b/ports/ncurses/vcpkg.json index b1e5d519262180..a0aa9df575e10d 100644 --- a/ports/ncurses/vcpkg.json +++ b/ports/ncurses/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ncurses", "version-string": "6.2", + "port-version": 1, "description": "free software emulation of curses in System V Release 4.0", "supports": "!(windows | uwp)" } diff --git a/versions/baseline.json b/versions/baseline.json index 7c5de55fdfd3ee..42490523c54069 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4274,7 +4274,7 @@ }, "ncurses": { "baseline": "6.2", - "port-version": 0 + "port-version": 1 }, "neargye-semver": { "baseline": "0.2.2", diff --git a/versions/n-/ncurses.json b/versions/n-/ncurses.json index 45c3e24b3f9f2c..135f3c3b5ec239 100644 --- a/versions/n-/ncurses.json +++ b/versions/n-/ncurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f196044f9f7779e0bdb54015dbd3be84aaa00820", + "version-string": "6.2", + "port-version": 1 + }, { "git-tree": "ab8de39c1659867da459ac0bec7e09bee5762819", "version-string": "6.2", From 8df698b081d5a402af1cbad90cbe5c707b323c8c Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Thu, 24 Jun 2021 23:09:29 +0300 Subject: [PATCH 048/141] [magic-enum] Update to v0.7.3 (#18575) * [magic-enum] Update to v0.7.3 * fix --- ports/magic-enum/CONTROL | 2 +- ports/magic-enum/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/m-/magic-enum.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/magic-enum/CONTROL b/ports/magic-enum/CONTROL index 36179c825f4f12..ae6aa68b876680 100644 --- a/ports/magic-enum/CONTROL +++ b/ports/magic-enum/CONTROL @@ -1,4 +1,4 @@ Source: magic-enum -Version: 0.7.2 +Version: 0.7.3 Description: Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code. Homepage: https://github.com/Neargye/magic_enum diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 4787ed5a71e464..b612ccabe84e4d 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.7.2 - SHA512 53991ccc890548a81a410e274ec2deaf0f153ec15d154ac802452235dc5b913b56da64fddc6aeed9882206fd2abe7250423d36f5e72bdba54b622b8dfdfa9dad + REF v0.7.3 + SHA512 7645ef56bbe262ba801c6f5ffb7baf997869de6422a239ef2000d7ff6f4f6d00c34360543c60aa91a02433311b4b996bba410e4f04f96f185a6276ad9e6bb0a8 HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index 42490523c54069..29cb1b8c7e9f22 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3853,7 +3853,7 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.7.2", + "baseline": "0.7.3", "port-version": 0 }, "magic-get": { diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index eef040c16d9810..7dc3625bf62d27 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ddbd41c3a32fa08982b2cf8eb7f3c13c77354d4", + "version-string": "0.7.3", + "port-version": 0 + }, { "git-tree": "237d596c8e4341629912912346075a1d9f65096b", "version-string": "0.7.2", From 15e53034e5279fabfc1dc94745ccf123965713e5 Mon Sep 17 00:00:00 2001 From: timmeh87 <31858838+timmeh87@users.noreply.github.com> Date: Thu, 24 Jun 2021 16:11:50 -0400 Subject: [PATCH 049/141] [libsmb2] New port (#18471) * added libsmb2 port * added version file * updated baseline * Ran command ./vcpkg x-add-version --all and then ./vcpkg format-manifest ports/libsmb2/vcpkg.json * updated SHA based on result of "./vcpkg x-add-version libsmb2" and also added osx=fail to CI file in order to pass CI * suggested changes made * sha * Update scripts/ci.baseline.txt Co-authored-by: Robert Schumacher * Update ports/libsmb2/vcpkg.json Co-authored-by: Robert Schumacher * Update ports/libsmb2/portfile.cmake Co-authored-by: Robert Schumacher * sha * added missing "vcpkg_check_linkage(ONLY_STATIC_LIBRARY)" * sha * vcpkg_fixup_pkgconfig() * sha Co-authored-by: Tim Co-authored-by: Robert Schumacher --- ports/libsmb2/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/libsmb2/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libsmb2.json | 9 +++++++++ 4 files changed, 54 insertions(+) create mode 100644 ports/libsmb2/portfile.cmake create mode 100644 ports/libsmb2/vcpkg.json create mode 100644 versions/l-/libsmb2.json diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake new file mode 100644 index 00000000000000..4558f3e0143523 --- /dev/null +++ b/ports/libsmb2/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_fail_port_install(ON_TARGET "osx") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sahlberg/libsmb2 + REF d8c85a3119a0bd769590e448216130b368cd1099 + SHA512 d15a040ed6314ad6f7984cfa7b52d9ede9934b2a7ec9827e833f574c25c9f694b5372b3e0950e258a6244b7aaf32b9e59987a75a88681d8031d9837ba94629d5 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +#the debug/share folder is generated empty by the provided cmake system +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json new file mode 100644 index 00000000000000..4b5b2b9a984f1f --- /dev/null +++ b/ports/libsmb2/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libsmb2", + "version-date": "2021-04-29", + "description": "SMB2/3 Userspace Client", + "homepage": "https://github.com/sahlberg/libsmb2", + "supports": "!osx", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 29cb1b8c7e9f22..7aba92e72fa4d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3539,6 +3539,10 @@ "libsigcpp-3": { "baseline": "3.0.3", "port-version": 1 + }, + "libsmb2": { + "baseline": "2021-04-29", + "port-version": 0 }, "libsndfile": { "baseline": "1.0.31", diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json new file mode 100644 index 00000000000000..3e27f55b66a2ee --- /dev/null +++ b/versions/l-/libsmb2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "033110ed64eb6d73a85ab8439c13b84b5ee02891", + "version-date": "2021-04-29", + "port-version": 0 + } + ] +} From de57f90f151cf96a9b3cae6fd0ea91880058f575 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 25 Jun 2021 04:12:22 +0800 Subject: [PATCH 050/141] [fluidsynth] update to 2.2.1 (#18524) * [fluidsynth] update to 2.2.1 * update version * delete vcpkg_fixup_pkgconfig * update version --- ports/fluidsynth/portfile.cmake | 4 ++-- ports/fluidsynth/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/fluidsynth.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index 6bb27bb9c37549..d5f4030fa7de29 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 2393aef3bd0b4e78084cfe16735d402bc1497edd #v2.1.4 - SHA512 181914f883982d931dfa4d8c0d0391fb91fbf3448e1eb1ea1541c938d874d7611066e7e289859d83b610a85ba089463e0a93f77db5a6253349f6b328a7373dc6 + REF 90a6c52e1c347d1c4283b0de9f860ed2fbc413bc #v2.2.1 + SHA512 311a078e95204baf9b348fb8c83370003982fad59553de945437fec7647c9237dd4382f9f8f70080ed472745c66fe528764cd898581d628ab4422427c3d58b3a HEAD_REF master PATCHES force-x86-gentables.patch diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index d00705ad49b73c..cdb9226e7c5827 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fluidsynth", - "version": "2.1.4", - "port-version": 1, + "version": "2.2.1", "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", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7aba92e72fa4d3..554795971d111e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2037,8 +2037,8 @@ "port-version": 0 }, "fluidsynth": { - "baseline": "2.1.4", - "port-version": 1 + "baseline": "2.2.1", + "port-version": 0 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 4df819b93189ba..3321f5977e6b4c 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "226d8e9bba548bfb4592dfe5979797e3ffde0f69", + "version": "2.2.1", + "port-version": 0 + }, { "git-tree": "e0fa8719cb1348a12b177ffdba4943891bede664", "version": "2.1.4", From ea42abcffa9a6f27150fc4b8b3ce06a987e30585 Mon Sep 17 00:00:00 2001 From: An Tao Date: Fri, 25 Jun 2021 04:13:33 +0800 Subject: [PATCH 051/141] [trantor] Update to 1.5.0 (#18534) * [trantor] Update to 1.5.0 * Add vcpkg_fixup_pkgconfig() --- ports/trantor/CONTROL | 2 +- ports/trantor/portfile.cmake | 7 ++++--- ports/trantor/ssize_t.patch | 26 -------------------------- versions/baseline.json | 2 +- versions/t-/trantor.json | 5 +++++ 5 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 ports/trantor/ssize_t.patch diff --git a/ports/trantor/CONTROL b/ports/trantor/CONTROL index f6fa547afc32d2..447e609fc9cbb8 100644 --- a/ports/trantor/CONTROL +++ b/ports/trantor/CONTROL @@ -1,5 +1,5 @@ Source: trantor -Version: 1.4.1 +Version: 1.5.0 Homepage: https://github.com/an-tao/trantor Description: A non-blocking I/O cross-platform TCP network library, using C++14. Build-Depends: openssl, c-ares diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index 8a85c262d338be..0017cb46a3548f 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.4.1 - SHA512 a3d23ea2f9d97a9248d05ecdac5f10bc9b7fffaf9a225e8b1dbd14ace4f7acb33758cca3321774a52d21625a21cb98bb51672f018e8a458f9fff1fb194bec0e6 + REF v1.5.0 + SHA512 3e9e0f15aa7e039b70141b1ede16fcfe854af961cc787a0a51d4b020581e2b4ae1b51497e3ca31cfc4b5ed11dd9028a1438339cb726d83588f656c99d9938493 HEAD_REF master PATCHES vcpkg.patch - ssize_t.patch ) vcpkg_configure_cmake( @@ -19,6 +18,8 @@ vcpkg_install_cmake() # Fix CMake files vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Trantor) +vcpkg_fixup_pkgconfig() + # # Remove includes in debug file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/trantor/ssize_t.patch b/ports/trantor/ssize_t.patch deleted file mode 100644 index 23021aea87525a..00000000000000 --- a/ports/trantor/ssize_t.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/trantor/net/EventLoop.cc b/trantor/net/EventLoop.cc -index b4523ad..8009db4 100644 ---- a/trantor/net/EventLoop.cc -+++ b/trantor/net/EventLoop.cc -@@ -26,7 +26,7 @@ - #include - #ifdef _WIN32 - #include --using ssize_t = std::intptr_t; -+using ssize_t = long long; - #else - #include - #endif -diff --git a/trantor/utils/MsgBuffer.h b/trantor/utils/MsgBuffer.h -index bdd5c23..33c8633 100644 ---- a/trantor/utils/MsgBuffer.h -+++ b/trantor/utils/MsgBuffer.h -@@ -22,7 +22,7 @@ - #include - #include - #ifdef _WIN32 --using ssize_t = std::intptr_t; -+using ssize_t = long long; - #endif - - namespace trantor diff --git a/versions/baseline.json b/versions/baseline.json index 554795971d111e..c3c2d66b652789 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6313,7 +6313,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.4.1", + "baseline": "1.5.0", "port-version": 0 }, "tre": { diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index e1baaffecb461a..afcabcd9caf78e 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82647f91d6290a85e1b03801e75e17698b3da691", + "version-string": "1.5.0", + "port-version": 0 + }, { "git-tree": "f53004074d57fe4748b87a81dcc59f35a20715ce", "version-string": "1.4.1", From 14b916319630dd9aed7d5e926aecfc288d3d8d66 Mon Sep 17 00:00:00 2001 From: evpobr Date: Fri, 25 Jun 2021 01:14:37 +0500 Subject: [PATCH 052/141] [libogg] Upgrade to 1.3.5 (#18546) * [libogg] Upgrade to 1.3.5 * Upgrade to 1.3.5. * Convert CONTROL to vcpkg.json * Change homepage to https://www.xiph.org/ogg (as in README.md) * Download from the main repo https://gitlab.xiph.org/xiph/ogg * [libogg] Use version instead of version-string in manifest * [libogg] Update libogg.json --- ports/libogg/CONTROL | 5 ----- ports/libogg/portfile.cmake | 7 ++++--- ports/libogg/vcpkg.json | 6 ++++++ versions/baseline.json | 4 ++-- versions/l-/libogg.json | 5 +++++ 5 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 ports/libogg/CONTROL create mode 100644 ports/libogg/vcpkg.json diff --git a/ports/libogg/CONTROL b/ports/libogg/CONTROL deleted file mode 100644 index 57d1748eee8fa7..00000000000000 --- a/ports/libogg/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libogg -Version: 1.3.4 -Port-Version: 3 -Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs. -Homepage: https://github.com/xiph/ogg diff --git a/ports/libogg/portfile.cmake b/ports/libogg/portfile.cmake index 2316a2a8a180c3..cd0cfc092201eb 100644 --- a/ports/libogg/portfile.cmake +++ b/ports/libogg/portfile.cmake @@ -1,8 +1,9 @@ -vcpkg_from_github( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.xiph.org OUT_SOURCE_PATH SOURCE_PATH REPO xiph/ogg - REF c8fca6b4a02d695b1ceea39b330d4406001c03ed - SHA512 52980fcca3c1dbb5fbfa4032f179679a5c4000f1fea88e7ed8b2522d80d27513be96d94933daeb9e36f4ac8556e7e4e8ec7e91101e2ba456e0fce51c484eee9e + REF v1.3.5 + SHA512 72bfad534a459bfca534eae9b209fa630ac20364a82e82f2707b210a40deaf9a7dc9031532a8b27120a9dd66f804655ddce79875758ef14b109bf869e57fb747 HEAD_REF master ) diff --git a/ports/libogg/vcpkg.json b/ports/libogg/vcpkg.json new file mode 100644 index 00000000000000..0c0979eb1f9393 --- /dev/null +++ b/ports/libogg/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libogg", + "version": "1.3.5", + "description": "Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.", + "homepage": "https://www.xiph.org/ogg" +} diff --git a/versions/baseline.json b/versions/baseline.json index c3c2d66b652789..d023b8631186b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3401,8 +3401,8 @@ "port-version": 7 }, "libogg": { - "baseline": "1.3.4", - "port-version": 3 + "baseline": "1.3.5", + "port-version": 0 }, "libopenmpt": { "baseline": "2017-01-28-cf2390140", diff --git a/versions/l-/libogg.json b/versions/l-/libogg.json index d7987e5c8e8831..0eab3563d53674 100644 --- a/versions/l-/libogg.json +++ b/versions/l-/libogg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70cb700f89c98b87d678a3aa7a14461eff4b99e4", + "version": "1.3.5", + "port-version": 0 + }, { "git-tree": "156d376fca62197dd916c454d1299dcee84c72dc", "version-string": "1.3.4", From f632ccd0d963470ef34872c2ad54fd78959b34a3 Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Fri, 25 Jun 2021 06:16:59 +1000 Subject: [PATCH 053/141] [fdk-aac] Update to version 2.0.2. (#18549) * [fdkaac] Update to version 2.0.2. * [fdk-aac] Remove unused files. * Update fdk-aac.json * Update ports/fdk-aac/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * test uwp|arm compilation. * Update fdk-aac.json * Convert to json. * Update vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/fdk-aac/CMakeLists.txt | 203 ----------------------------------- ports/fdk-aac/CONTROL | 6 -- ports/fdk-aac/fdk-aac.def | 19 ---- ports/fdk-aac/portfile.cmake | 16 +-- ports/fdk-aac/vcpkg.json | 6 ++ versions/baseline.json | 4 +- versions/f-/fdk-aac.json | 5 + 7 files changed, 21 insertions(+), 238 deletions(-) delete mode 100644 ports/fdk-aac/CMakeLists.txt delete mode 100644 ports/fdk-aac/CONTROL delete mode 100644 ports/fdk-aac/fdk-aac.def create mode 100644 ports/fdk-aac/vcpkg.json diff --git a/ports/fdk-aac/CMakeLists.txt b/ports/fdk-aac/CMakeLists.txt deleted file mode 100644 index 67db1b323093fc..00000000000000 --- a/ports/fdk-aac/CMakeLists.txt +++ /dev/null @@ -1,203 +0,0 @@ -cmake_minimum_required(VERSION 3.8.0) - -project(fdk-aac) - -set(AACDEC_SRC - libAACdec/src/aacdec_drc.cpp - libAACdec/src/aacdec_hcr.cpp - libAACdec/src/aacdecoder.cpp - libAACdec/src/aacdec_pns.cpp - libAACdec/src/aac_ram.cpp - libAACdec/src/block.cpp - libAACdec/src/channelinfo.cpp - libAACdec/src/ldfiltbank.cpp - libAACdec/src/rvlcbit.cpp - libAACdec/src/rvlc.cpp - libAACdec/src/aacdec_hcr_bit.cpp - libAACdec/src/aacdec_hcrs.cpp - libAACdec/src/aacdecoder_lib.cpp - libAACdec/src/aacdec_tns.cpp - libAACdec/src/aac_rom.cpp - libAACdec/src/channel.cpp - libAACdec/src/conceal.cpp - libAACdec/src/pulsedata.cpp - libAACdec/src/rvlcconceal.cpp - libAACdec/src/stereo.cpp -) - -set(AACENC_SRC - libAACenc/src/aacenc.cpp - libAACenc/src/aacEnc_ram.cpp - libAACenc/src/band_nrg.cpp - libAACenc/src/block_switch.cpp - libAACenc/src/grp_data.cpp - libAACenc/src/metadata_main.cpp - libAACenc/src/pre_echo_control.cpp - libAACenc/src/quantize.cpp - libAACenc/src/tonality.cpp - libAACenc/src/aacEnc_rom.cpp - libAACenc/src/bandwidth.cpp - libAACenc/src/channel_map.cpp - libAACenc/src/intensity.cpp - libAACenc/src/ms_stereo.cpp - libAACenc/src/psy_configuration.cpp - libAACenc/src/sf_estim.cpp - libAACenc/src/transform.cpp - libAACenc/src/aacenc_lib.cpp - libAACenc/src/aacenc_tns.cpp - libAACenc/src/bit_cnt.cpp - libAACenc/src/chaosmeasure.cpp - libAACenc/src/line_pe.cpp - libAACenc/src/noisedet.cpp - libAACenc/src/psy_main.cpp - libAACenc/src/spreading.cpp - libAACenc/src/aacenc_pns.cpp - libAACenc/src/adj_thr.cpp - libAACenc/src/bitenc.cpp - libAACenc/src/dyn_bits.cpp - libAACenc/src/metadata_compressor.cpp - libAACenc/src/pnsparam.cpp - libAACenc/src/qc_main.cpp -) - -set(FDK_SRC - libFDK/src/autocorr2nd.cpp - libFDK/src/dct.cpp - libFDK/src/FDK_bitbuffer.cpp - libFDK/src/FDK_core.cpp - libFDK/src/FDK_crc.cpp - libFDK/src/FDK_hybrid.cpp - libFDK/src/FDK_tools_rom.cpp - libFDK/src/FDK_trigFcts.cpp - libFDK/src/fft.cpp - libFDK/src/fft_rad2.cpp - libFDK/src/fixpoint_math.cpp - libFDK/src/mdct.cpp - libFDK/src/qmf.cpp - libFDK/src/scale.cpp -) - -set(MPEGTPDEC_SRC - libMpegTPDec/src/tpdec_adif.cpp - libMpegTPDec/src/tpdec_adts.cpp - libMpegTPDec/src/tpdec_asc.cpp - libMpegTPDec/src/tpdec_drm.cpp - libMpegTPDec/src/tpdec_latm.cpp - libMpegTPDec/src/tpdec_lib.cpp -) - -set( MPEGTPENC_SRC - libMpegTPEnc/src/tpenc_adif.cpp - libMpegTPEnc/src/tpenc_adts.cpp - libMpegTPEnc/src/tpenc_asc.cpp - libMpegTPEnc/src/tpenc_latm.cpp - libMpegTPEnc/src/tpenc_lib.cpp -) - -set( PCMUTILS_SRC - libPCMutils/src/limiter.cpp - libPCMutils/src/pcmutils_lib.cpp -) - -set(SBRDEC_SRC - libSBRdec/src/env_calc.cpp - libSBRdec/src/env_dec.cpp - libSBRdec/src/env_extr.cpp - libSBRdec/src/huff_dec.cpp - libSBRdec/src/lpp_tran.cpp - libSBRdec/src/psbitdec.cpp - libSBRdec/src/psdec.cpp - libSBRdec/src/psdec_hybrid.cpp - libSBRdec/src/sbr_crc.cpp - libSBRdec/src/sbr_deb.cpp - libSBRdec/src/sbr_dec.cpp - libSBRdec/src/sbrdec_drc.cpp - libSBRdec/src/sbrdec_freq_sca.cpp - libSBRdec/src/sbrdecoder.cpp - libSBRdec/src/sbr_ram.cpp - libSBRdec/src/sbr_rom.cpp -) - -set(SBRENC_SRC - libSBRenc/src/bit_sbr.cpp - libSBRenc/src/env_bit.cpp - libSBRenc/src/fram_gen.cpp - libSBRenc/src/mh_det.cpp - libSBRenc/src/ps_bitenc.cpp - libSBRenc/src/ps_encode.cpp - libSBRenc/src/resampler.cpp - libSBRenc/src/sbr_encoder.cpp - libSBRenc/src/sbr_ram.cpp - libSBRenc/src/ton_corr.cpp - libSBRenc/src/code_env.cpp - libSBRenc/src/env_est.cpp - libSBRenc/src/invf_est.cpp - libSBRenc/src/nf_est.cpp - libSBRenc/src/ps_main.cpp - libSBRenc/src/sbrenc_freq_sca.cpp - libSBRenc/src/sbr_misc.cpp - libSBRenc/src/sbr_rom.cpp - libSBRenc/src/tran_det.cpp -) - -set(SYS_SRC - libSYS/src/cmdl_parser.cpp - libSYS/src/conv_string.cpp - libSYS/src/genericStds.cpp - libSYS/src/wav_file.cpp -) - -set( - libfdk_aac_SOURCES - ${AACDEC_SRC} ${AACENC_SRC} - ${MPEGTPDEC_SRC} ${MPEGTPENC_SRC} - ${SBRDEC_SRC} ${SBRENC_SRC} - ${PCMUTILS_SRC} ${FDK_SRC} ${SYS_SRC} - fdk-aac.def -) - -include_directories( - . - win32 - libAACdec/include - libAACenc/include - libSBRdec/include - libSBRenc/include - libMpegTPDec/include - libMpegTPEnc/include - libSYS/include - libFDK/include - libPCMutils/include -) - -add_library(fdk-aac ${libfdk_aac_SOURCES}) - -add_executable(aac-enc aac-enc.c wavreader.c) - -target_link_libraries(aac-enc fdk-aac) - -install( - TARGETS fdk-aac - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(NOT DISABLE_INSTALL_TOOLS) - install ( - TARGETS aac-enc - RUNTIME DESTINATION tools/fdk-aac - ) -endif() - -if(NOT DISABLE_INSTALL_HEADERS) - install( - FILES - libAACdec/include/aacdecoder_lib.h - libAACenc/include/aacenc_lib.h - libSYS/include/FDK_audio.h - libSYS/include/genericStds.h - libSYS/include/machine_type.h - DESTINATION include/fdk-aac - ) -endif() diff --git a/ports/fdk-aac/CONTROL b/ports/fdk-aac/CONTROL deleted file mode 100644 index 3afcf5ff0f1b7a..00000000000000 --- a/ports/fdk-aac/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: fdk-aac -Version: 2018-07-08 -Port-Version: 3 -Homepage: https://github.com/mstorsjo/fdk-aac -Description: A standalone library of the Fraunhofer FDK AAC code -Supports: !(uwp | arm) diff --git a/ports/fdk-aac/fdk-aac.def b/ports/fdk-aac/fdk-aac.def deleted file mode 100644 index 8690b69b6fe38c..00000000000000 --- a/ports/fdk-aac/fdk-aac.def +++ /dev/null @@ -1,19 +0,0 @@ -EXPORTS -aacDecoder_AncDataGet -aacDecoder_AncDataInit -aacDecoder_Close -aacDecoder_ConfigRaw -aacDecoder_DecodeFrame -aacDecoder_Fill -aacDecoder_GetFreeBytes -aacDecoder_GetLibInfo -aacDecoder_GetStreamInfo -aacDecoder_Open -aacDecoder_SetParam -aacEncClose -aacEncEncode -aacEncGetLibInfo -aacEncInfo -aacEncOpen -aacEncoder_GetParam -aacEncoder_SetParam diff --git a/ports/fdk-aac/portfile.cmake b/ports/fdk-aac/portfile.cmake index 90c4ba546303c0..5a6119724e390b 100644 --- a/ports/fdk-aac/portfile.cmake +++ b/ports/fdk-aac/portfile.cmake @@ -3,21 +3,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mstorsjo/fdk-aac - REF e45ae429b9ca8f234eb861338a75b2d89cde206a - SHA512 e4d0ec632a67642312bd0c812849601452d4ba45b31bc2f2a9392bba5fe2320b2099c5c7077c9571ea270804979039182060dc1acacdc397ca2a9b8ca43301a3 + REF v2.0.2 + SHA512 616207e85035d1659a2b7808ca6ec02ef53c1c4b39eb280fe861f82a4cf548e5db2ac381c496bad37dfc2b8c6677fe704d9fd8449e43d1f93d3e636239e0191b HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/fdk-aac.def DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON + OPTIONS_RELEASE -DBUILD_PROGRAMS=OFF ) vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/fdk-aac) -file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fdk-aac RENAME copyright) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/fdk-aac/vcpkg.json b/ports/fdk-aac/vcpkg.json new file mode 100644 index 00000000000000..4f3cbf7233637e --- /dev/null +++ b/ports/fdk-aac/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "fdk-aac", + "version-semver": "2.0.2", + "description": "A standalone library of the Fraunhofer FDK AAC code", + "homepage": "https://github.com/mstorsjo/fdk-aac" +} diff --git a/versions/baseline.json b/versions/baseline.json index d023b8631186b8..92a5d0ec7e69f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1973,8 +1973,8 @@ "port-version": 0 }, "fdk-aac": { - "baseline": "2018-07-08", - "port-version": 3 + "baseline": "2.0.2", + "port-version": 0 }, "fdlibm": { "baseline": "5.3-4", diff --git a/versions/f-/fdk-aac.json b/versions/f-/fdk-aac.json index d6a76e6b941820..7af5ccc08feced 100644 --- a/versions/f-/fdk-aac.json +++ b/versions/f-/fdk-aac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01ec3a3ac30a2128fb45b82c526e9fcf4d87de9a", + "version-semver": "2.0.2", + "port-version": 0 + }, { "git-tree": "671b0954f5fe51fd11991f77f710901c26a8bd8b", "version-string": "2018-07-08", From 15e41ed666bb6ed7b257b9a41030adc1180e08d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Thu, 24 Jun 2021 22:20:52 +0200 Subject: [PATCH 054/141] [pcre] Update to 8.45 (#18550) - New upstream version 8.45 This is the final release of PCRE1 - Update patches: export-cmake-targets.patch pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch - Add patch: pcre-8.45_fix_postfix_for_debug_Windows_builds.patch - Remove deprecated SYSTEM_LIBRARIES from vcpkg_fixup_pkgconfig() - Switch from CONTROL to vcpkg.json .\vcpkg format-manifest .\ports\pcre\CONTROL --- ports/pcre/CONTROL | 5 - ports/pcre/export-cmake-targets.patch | 12 +- ...s_cmake_and_compiler_warnings-errors.patch | 18 -- ...fix_postfix_for_debug_Windows_builds.patch | 161 ++++++++++++++++++ ...s_cmake_and_compiler_warnings-errors.patch | 18 ++ ports/pcre/portfile.cmake | 89 +++------- ports/pcre/vcpkg.json | 6 + versions/baseline.json | 4 +- versions/p-/pcre.json | 5 + 9 files changed, 220 insertions(+), 98 deletions(-) delete mode 100644 ports/pcre/CONTROL delete mode 100644 ports/pcre/pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch create mode 100644 ports/pcre/pcre-8.45_fix_postfix_for_debug_Windows_builds.patch create mode 100644 ports/pcre/pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch create mode 100644 ports/pcre/vcpkg.json diff --git a/ports/pcre/CONTROL b/ports/pcre/CONTROL deleted file mode 100644 index 5f42aa89dc6df5..00000000000000 --- a/ports/pcre/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: pcre -Version: 8.44 -Port-Version: 8 -Homepage: https://www.pcre.org/ -Description: Perl Compatible Regular Expressions diff --git a/ports/pcre/export-cmake-targets.patch b/ports/pcre/export-cmake-targets.patch index ef89070ddf1483..bdbd807d36fa61 100644 --- a/ports/pcre/export-cmake-targets.patch +++ b/ports/pcre/export-cmake-targets.patch @@ -1,8 +1,6 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 252de6e..bcef3ae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -885,10 +885,19 @@ ENDIF(PCRE_BUILD_TESTS) +--- a/CMakeLists.txt 2021-06-14 10:33:38.000000000 +0200 ++++ b/CMakeLists.txt 2021-06-18 18:08:24.162881000 +0200 +@@ -934,10 +934,19 @@ # Installation SET(CMAKE_INSTALL_ALWAYS 1) @@ -11,8 +9,8 @@ index 252de6e..bcef3ae 100644 + INSTALL(TARGETS ${target} + EXPORT pcre-targets RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + target_include_directories(${target} PUBLIC $) +endforeach() + diff --git a/ports/pcre/pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch b/ports/pcre/pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch deleted file mode 100644 index 12792689ff3cbb..00000000000000 --- a/ports/pcre/pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt 2017-01-23 16:33:46.000000000 +0100 -+++ b/CMakeLists.txt 2020-03-08 21:12:00.225068400 +0100 -@@ -74,7 +74,6 @@ - # CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY. - - CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0) --CMAKE_POLICY(SET CMP0026 OLD) - - SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # for FindReadline.cmake - -@@ -191,6 +190,7 @@ - ENDIF(MINGW) - - IF(MSVC) -+ add_definitions(/wd4703 /wd4146 /wd4308) - OPTION(PCRE_STATIC_RUNTIME - "ON=Compile against the static runtime (/MT)." - OFF) diff --git a/ports/pcre/pcre-8.45_fix_postfix_for_debug_Windows_builds.patch b/ports/pcre/pcre-8.45_fix_postfix_for_debug_Windows_builds.patch new file mode 100644 index 00000000000000..bd9c9b4390abcc --- /dev/null +++ b/ports/pcre/pcre-8.45_fix_postfix_for_debug_Windows_builds.patch @@ -0,0 +1,161 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1767) ++++ CMakeLists.txt (working copy) +@@ -436,6 +436,12 @@ + @ONLY) + ENDIF(PCRE_BUILD_PCRECPP) + ++# Make sure to not link debug libs ++# against release libs and vice versa ++IF(WIN32) ++ SET(CMAKE_DEBUG_POSTFIX "d") ++ENDIF(WIN32) ++ + # Generate pkg-config files + SET(PACKAGE_VERSION "${PCRE_MAJOR}.${PCRE_MINOR}") + SET(prefix "${CMAKE_INSTALL_PREFIX}") +@@ -442,6 +448,9 @@ + SET(exec_prefix "\${prefix}") + SET(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") + SET(includedir "\${prefix}/include") ++IF(WIN32 AND (CMAKE_BUILD_TYPE MATCHES Debug)) ++ SET(LIB_POSTFIX ${CMAKE_DEBUG_POSTFIX}) ++ENDIF() + IF(NOT BUILD_SHARED_LIBS) + SET(PCRE_STATIC_CFLAG "-DPCRE_STATIC") + ENDIF(NOT BUILD_SHARED_LIBS) +@@ -659,11 +668,6 @@ + ENDIF(MSVC) + + SET(CMAKE_INCLUDE_CURRENT_DIR 1) +-# needed to make sure to not link debug libs +-# against release libs and vice versa +-IF(WIN32) +- SET(CMAKE_DEBUG_POSTFIX "d") +-ENDIF(WIN32) + + SET(targets) + +Index: configure.ac +=================================================================== +--- configure.ac (revision 1767) ++++ configure.ac (working copy) +@@ -1044,6 +1044,9 @@ + AM_CONDITIONAL([WITH_GCOV],[test "x$enable_coverage" = "xyes"]) + + # Produce these files, in addition to config.h. ++# LIB_POSTFIX is used by CMakeLists.txt for Windows debug builds. ++# Pass empty LIB_POSTFIX to *.pc files and pcre-config here. ++AC_SUBST(LIB_POSTFIX) + AC_CONFIG_FILES( + Makefile + libpcre.pc +Index: libpcre.pc.in +=================================================================== +--- libpcre.pc.in (revision 1767) ++++ libpcre.pc.in (working copy) +@@ -8,6 +8,6 @@ + Name: libpcre + Description: PCRE - Perl compatible regular expressions C library with 8 bit character support + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcre ++Libs: -L${libdir} -lpcre@LIB_POSTFIX@ + Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ +Index: libpcre16.pc.in +=================================================================== +--- libpcre16.pc.in (revision 1767) ++++ libpcre16.pc.in (working copy) +@@ -8,6 +8,6 @@ + Name: libpcre16 + Description: PCRE - Perl compatible regular expressions C library with 16 bit character support + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcre16 ++Libs: -L${libdir} -lpcre16@LIB_POSTFIX@ + Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ +Index: libpcre32.pc.in +=================================================================== +--- libpcre32.pc.in (revision 1767) ++++ libpcre32.pc.in (working copy) +@@ -8,6 +8,6 @@ + Name: libpcre32 + Description: PCRE - Perl compatible regular expressions C library with 32 bit character support + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcre32 ++Libs: -L${libdir} -lpcre32@LIB_POSTFIX@ + Libs.private: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ +Index: libpcrecpp.pc.in +=================================================================== +--- libpcrecpp.pc.in (revision 1767) ++++ libpcrecpp.pc.in (working copy) +@@ -8,5 +8,5 @@ + Name: libpcrecpp + Description: PCRECPP - C++ wrapper for PCRE + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcre -lpcrecpp ++Libs: -L${libdir} -lpcre@LIB_POSTFIX@ -lpcrecpp@LIB_POSTFIX@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ +Index: libpcreposix.pc.in +=================================================================== +--- libpcreposix.pc.in (revision 1767) ++++ libpcreposix.pc.in (working copy) +@@ -8,6 +8,6 @@ + Name: libpcreposix + Description: PCREPosix - Posix compatible interface to libpcre + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lpcreposix ++Libs: -L${libdir} -lpcreposix@LIB_POSTFIX@ + Cflags: -I${includedir} @PCRE_STATIC_CFLAG@ + Requires.private: libpcre +Index: pcre-config.in +=================================================================== +--- pcre-config.in (revision 1767) ++++ pcre-config.in (working copy) +@@ -91,7 +91,7 @@ + ;; + --libs-posix) + if test @enable_pcre8@ = yes ; then +- echo $libS$libR -lpcreposix -lpcre ++ echo $libS$libR -lpcreposix@LIB_POSTFIX@ -lpcre@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi +@@ -98,7 +98,7 @@ + ;; + --libs) + if test @enable_pcre8@ = yes ; then +- echo $libS$libR -lpcre ++ echo $libS$libR -lpcre@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi +@@ -105,7 +105,7 @@ + ;; + --libs16) + if test @enable_pcre16@ = yes ; then +- echo $libS$libR -lpcre16 ++ echo $libS$libR -lpcre16@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi +@@ -112,7 +112,7 @@ + ;; + --libs32) + if test @enable_pcre32@ = yes ; then +- echo $libS$libR -lpcre32 ++ echo $libS$libR -lpcre32@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi +@@ -119,7 +119,7 @@ + ;; + --libs-cpp) + if test @enable_cpp@ = yes ; then +- echo $libS$libR -lpcrecpp -lpcre ++ echo $libS$libR -lpcrecpp@LIB_POSTFIX@ -lpcre@LIB_POSTFIX@ + else + echo "${usage}" 1>&2 + fi diff --git a/ports/pcre/pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch b/ports/pcre/pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch new file mode 100644 index 00000000000000..59dbc8b21f6680 --- /dev/null +++ b/ports/pcre/pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt 2021-06-14 10:33:38.000000000 +0200 ++++ b/CMakeLists.txt 2021-06-18 17:59:59.155148900 +0200 +@@ -77,7 +77,6 @@ + # CMP0026 to avoid warnings for the use of LOCATION in GET_TARGET_PROPERTY. + + CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5) +-CMAKE_POLICY(SET CMP0026 OLD) + + # For FindReadline.cmake. This was changed to allow setting CMAKE_MODULE_PATH + # on the command line. +@@ -199,6 +198,7 @@ + ENDIF(MINGW) + + IF(MSVC) ++ add_definitions(/wd4703 /wd4146 /wd4308) + OPTION(PCRE_STATIC_RUNTIME + "ON=Compile against the static runtime (/MT)." + OFF) diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index 2cb9fce3488580..f96e2a5bfd45d6 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -1,10 +1,12 @@ -set(PCRE_VERSION 8.44) -set(EXPECTED_SHA adddec1236b25ff1c90e73835c2ba25d60a5839cbde2d6be7838a8ec099f7443dede931dc39002943243e21afea572eda71ee8739058e72235a192e4324398f0) +set(PCRE_VERSION 8.45) +set(EXPECTED_SHA 71f246c0abbf356222933ad1604cab87a1a2a3cd8054a0b9d6deb25e0735ce9f40f923d14cbd21f32fdac7283794270afcb0f221ad24662ac35934fcb73675cd) set(PATCHES # Fix CMake Deprecation Warning concerning OLD behavior for policy CMP0026 # Suppress MSVC compiler warnings C4703, C4146, C4308, which fixes errors # under x64-uwp and arm-uwp - pcre-8.44_suppress_cmake_and_compiler_warnings-errors.patch + pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch + # Modified for 8.45 from https://bugs.exim.org/show_bug.cgi?id=2600 + pcre-8.45_fix_postfix_for_debug_Windows_builds.patch export-cmake-targets.patch) vcpkg_download_distfile(ARCHIVE @@ -34,19 +36,20 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DPCRE_BUILD_TESTS=NO - -DPCRE_BUILD_PCREGREP=NO - -DPCRE_BUILD_PCRE32=YES - -DPCRE_BUILD_PCRE16=YES - -DPCRE_BUILD_PCRE8=YES - -DPCRE_SUPPORT_JIT=YES - -DPCRE_SUPPORT_UTF=YES - -DPCRE_SUPPORT_UNICODE_PROPERTIES=YES - # optional dependencies for PCREGREP - -DPCRE_SUPPORT_LIBBZ2=OFF - -DPCRE_SUPPORT_LIBZ=OFF - -DPCRE_SUPPORT_LIBEDIT=OFF - -DPCRE_SUPPORT_LIBREADLINE=OFF + OPTIONS + -DPCRE_BUILD_TESTS=NO + -DPCRE_BUILD_PCREGREP=NO + -DPCRE_BUILD_PCRE32=YES + -DPCRE_BUILD_PCRE16=YES + -DPCRE_BUILD_PCRE8=YES + -DPCRE_SUPPORT_JIT=YES + -DPCRE_SUPPORT_UTF=YES + -DPCRE_SUPPORT_UNICODE_PROPERTIES=YES + # optional dependencies for PCREGREP + -DPCRE_SUPPORT_LIBBZ2=OFF + -DPCRE_SUPPORT_LIBZ=OFF + -DPCRE_SUPPORT_LIBEDIT=OFF + -DPCRE_SUPPORT_LIBREADLINE=OFF # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 @@ -66,56 +69,7 @@ foreach(FILE ${CURRENT_PACKAGES_DIR}/include/pcre.h ${CURRENT_PACKAGES_DIR}/incl file(WRITE ${FILE} "${PCRE_H}") endforeach() -# Create pkgconfig files -set(PACKAGE_VERSION ${PCRE_VERSION}) -set(prefix "${CURRENT_INSTALLED_DIR}") -set(exec_prefix "\${prefix}") -set(libdir "\${prefix}/lib") -set(includedir "\${prefix}/include") -if(VCPKG_TARGET_IS_LINUX) - # Used here in .pc.in files: Libs.private: @PTHREAD_CFLAGS@ - set(PTHREAD_CFLAGS "-pthread") -endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - - configure_file("${SOURCE_PATH}/libpcre.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpcre.pc" @ONLY) - configure_file("${SOURCE_PATH}/libpcre16.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpcre16.pc" @ONLY) - configure_file("${SOURCE_PATH}/libpcre32.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpcre32.pc" @ONLY) - configure_file("${SOURCE_PATH}/libpcrecpp.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpcrecpp.pc" @ONLY) - configure_file("${SOURCE_PATH}/libpcreposix.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpcreposix.pc" @ONLY) -endif() -# debug -set(prefix "${CURRENT_INSTALLED_DIR}/debug") -set(exec_prefix "\${prefix}") -set(libdir "\${prefix}/lib") -set(includedir "\${prefix}/../include") -if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - configure_file("${SOURCE_PATH}/libpcre.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcre.pc" @ONLY) - configure_file("${SOURCE_PATH}/libpcre16.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcre16.pc" @ONLY) - configure_file("${SOURCE_PATH}/libpcre32.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcre32.pc" @ONLY) - configure_file("${SOURCE_PATH}/libpcrecpp.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcrecpp.pc" @ONLY) - configure_file("${SOURCE_PATH}/libpcreposix.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcreposix.pc" @ONLY) - - if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcre.pc - "-lpcre" "-lpcred" - ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcre16.pc - "-lpcre16" "-lpcre16d" - ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcre32.pc - "-lpcre32" "-lpcre32d" - ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcrecpp.pc - "-lpcre -lpcrecpp" "-lpcred -lpcrecppd" - ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpcreposix.pc - "-lpcreposix" "-lpcreposixd" - ) - endif() -endif() - -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) @@ -123,6 +77,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/man) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/man) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() vcpkg_copy_pdbs() configure_file(${CMAKE_CURRENT_LIST_DIR}/unofficial-pcre-config.cmake ${CURRENT_PACKAGES_DIR}/share/unofficial-pcre/unofficial-pcre-config.cmake @ONLY) diff --git a/ports/pcre/vcpkg.json b/ports/pcre/vcpkg.json new file mode 100644 index 00000000000000..2e6ddd7ca27c69 --- /dev/null +++ b/ports/pcre/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "pcre", + "version": "8.45", + "description": "Perl Compatible Regular Expressions", + "homepage": "https://www.pcre.org/" +} diff --git a/versions/baseline.json b/versions/baseline.json index 92a5d0ec7e69f1..ec26275f21a1cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4765,8 +4765,8 @@ "port-version": 4 }, "pcre": { - "baseline": "8.44", - "port-version": 8 + "baseline": "8.45", + "port-version": 0 }, "pcre2": { "baseline": "10.37", diff --git a/versions/p-/pcre.json b/versions/p-/pcre.json index 952fc1b7a77621..b8be22d8a3cedf 100644 --- a/versions/p-/pcre.json +++ b/versions/p-/pcre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "665bab8c2bf878815782cff93dfff5720316ab88", + "version": "8.45", + "port-version": 0 + }, { "git-tree": "69e232f12c4e3eab4115f0672466a6661978bea2", "version-string": "8.44", From 0f271d7e38f6c88404bce5009ff4d798bd54ab6e Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Fri, 25 Jun 2021 05:57:45 +0900 Subject: [PATCH 055/141] [gstreamer] create a new port (#17394) * [gstreamer] create port with meson * initial build config * nodownload in vcpkg_configure_meson needs be removed * [gstreamer] remove duplicated GL headers * 1st check for deps in windows * mac: fix regex for bison * [gstreamer] more detailed options * remove glib usage Will use WIP changes in microsoft/vcpkg * [gstreamer] build with glib port * [gstreamer] extract plugins to features * fix some config errors in windows * fails to find z.lib. this should be zlib.lib * [gstreamer] create patches to search 'zlib' * update tool list * [vcpkg meson] add path of GIT * use append for LINKER_FLAGS Allow injection of LINKER_FLAGS to vcpkg_configure_meson * [gstreamer] update baseline and port SHA * [gstreamer] zlib is required for Windows * Revert "[vcpkg meson] add path of GIT" This reverts commit 8a67fbd1d287fa769cf516b834981ea175463492. * [gstreamer] make git visible in meson * [gstreamer] fix platform expression * [gstreamer] revert change of vcpkg_configure_meson * [gstreamer] modify build.ninja after configure * [gstreamer] drop unknown flag with vcpkg_replace_string * [gstreamer] disable 'devtools' option * [gstreamer] remove dylib * [gstreamer] move dll,pdb after install * [gstreamer] remove 'nls' feature Co-authored-by: Billy Robert ONeal III --- ports/gstreamer/plugins-base-use-zlib.patch | 13 + ports/gstreamer/plugins-good-use-zlib.patch | 13 + ports/gstreamer/portfile.cmake | 262 ++++++++++++++++++++ ports/gstreamer/vcpkg.json | 75 ++++++ versions/baseline.json | 4 + versions/g-/gstreamer.json | 9 + 6 files changed, 376 insertions(+) create mode 100644 ports/gstreamer/plugins-base-use-zlib.patch create mode 100644 ports/gstreamer/plugins-good-use-zlib.patch create mode 100644 ports/gstreamer/portfile.cmake create mode 100644 ports/gstreamer/vcpkg.json create mode 100644 versions/g-/gstreamer.json diff --git a/ports/gstreamer/plugins-base-use-zlib.patch b/ports/gstreamer/plugins-base-use-zlib.patch new file mode 100644 index 00000000000000..57b997ca7d9d8c --- /dev/null +++ b/ports/gstreamer/plugins-base-use-zlib.patch @@ -0,0 +1,13 @@ +diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build +index 5ec3739..a6cff8d 100644 +--- a/gst-libs/gst/tag/meson.build ++++ b/gst-libs/gst/tag/meson.build +@@ -70,7 +70,7 @@ endif + core_conf.set('HAVE_ISO_CODES', have_iso_codes) + + # could drop optional zlib dep and use g_zlib_decompressor_new() +-zlib_dep = dependency('zlib', required : false) ++zlib_dep = dependency('zlib', required : true) + if not zlib_dep.found() + zlib_dep = cc.find_library('z', required : false) + if not zlib_dep.found() or not cc.has_header('zlib.h') diff --git a/ports/gstreamer/plugins-good-use-zlib.patch b/ports/gstreamer/plugins-good-use-zlib.patch new file mode 100644 index 00000000000000..efea351f165ea6 --- /dev/null +++ b/ports/gstreamer/plugins-good-use-zlib.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 9de3b01..091a7f0 100644 +--- a/meson.build ++++ b/meson.build +@@ -326,7 +326,7 @@ if have_gstgl + endif + endif + +-zlib_dep = dependency('zlib', required : false) ++zlib_dep = dependency('zlib', required : true) + if not zlib_dep.found() + zlib_dep = cc.find_library('z', required : false) + if not zlib_dep.found() or not cc.has_header('zlib.h') diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake new file mode 100644 index 00000000000000..add14ef7ddb88f --- /dev/null +++ b/ports/gstreamer/portfile.cmake @@ -0,0 +1,262 @@ +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "emscripten" "wasm32" "android" "ios") + +vcpkg_from_github( + OUT_SOURCE_PATH GST_BUILD_SOURCE_PATH + REPO gstreamer/gst-build + REF 1.18.4 + SHA512 9b3927ba1a2ba1e384f2141c454978f582087795a70246709ed60875bc983a42eef54f3db7617941b8dacc20c434f81ef9931834861767d7a4dc09d42beeb900 + HEAD_REF master +) +vcpkg_from_github( + OUT_SOURCE_PATH GST_SOURCE_PATH + REPO gstreamer/gstreamer + REF 1.18.4 + SHA512 684a7ce93143a0c3e0ce627ab2bf1451d49735b4bab273f308bc3b48d8312f7c13c0afa7e71f3a3a7274b90373215636dd8ff0076f143cbe26061de0c4efa102 + HEAD_REF master +) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch) + list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch) +endif() +vcpkg_from_github( + OUT_SOURCE_PATH GST_PLUGIN_BASE_SOURCE_PATH + REPO gstreamer/gst-plugins-base + REF 1.18.4 + SHA512 b89924e90f880195740421f2eec3f2a667b96f6ca92ccaf87da246e9c9fd13646bf6235376844c012414a79d38dfaea8f10d56ffec900fe0b9cb8f19e722f05e + HEAD_REF master + PATCHES ${PLUGIN_BASE_PATCHES} +) +vcpkg_from_github( + OUT_SOURCE_PATH GST_PLUGIN_GOOD_SOURCE_PATH + REPO gstreamer/gst-plugins-good + REF 1.18.4 + SHA512 d97f4b76b6fc089b7675a9b10cabf4c704d71d663a23f34133a2671761d98e931aa87df7158f663cd9ebb6a8febd9ab1833aef7eb8be2ef2b54fad288bd0ae66 + HEAD_REF master + PATCHES ${PLUGIN_GOOD_PATCHES} +) +vcpkg_from_github( + OUT_SOURCE_PATH GST_PLUGIN_BAD_SOURCE_PATH + REPO gstreamer/gst-plugins-bad + REF 1.18.4 + SHA512 0bf5344fbef883dbe0908495c9a50cd3bf915c5d328cf2768532ff077a9aa4255747f417a310c16c3ea86fcb79ac6ba4bf37375ff84776985451ab47b9d9ac6e + HEAD_REF master +) +vcpkg_from_github( + OUT_SOURCE_PATH GST_PLUGIN_UGLY_SOURCE_PATH + REPO gstreamer/gst-plugins-ugly + REF 1.18.4 + SHA512 01413155d21f654a90bcf7235b5605c244d3700632ae6c56cafbbabfb11192a09c2ab01c4662ab452eabb004b09c9ec2efa72024db8be5863054d25569034a03 + HEAD_REF master +) +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH GST_MESON_PORTS_SOURCE_PATH + REPO gstreamer/meson-ports/gl-headers + REF 5c8c7c0d3ca1f0b783272dac0b95e09414e49bc8 # master commit. Date 2021-04-21 + SHA512 d001535e1c1b5bb515ac96c7d15b25ca51460a5af0c858df53b11c7bae87c4a494e4a1b1b9c3c41a5989001db083645dde2054b82acbbeab7f9939308b676f9c + HEAD_REF master +) + +file(RENAME ${GST_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gstreamer) +file(RENAME ${GST_PLUGIN_BASE_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-base) +file(RENAME ${GST_PLUGIN_GOOD_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-good) +file(RENAME ${GST_PLUGIN_BAD_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-bad) +file(RENAME ${GST_PLUGIN_UGLY_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gst-plugins-ugly) +file(RENAME ${GST_MESON_PORTS_SOURCE_PATH} ${GST_BUILD_SOURCE_PATH}/subprojects/gl-headers) + +if(VCPKG_TARGET_IS_OSX) + # In Darwin platform, there can be an old version of `bison`, + # Which can't be used for `gst-build`. It requires 2.4+ + vcpkg_find_acquire_program(BISON) + execute_process( + COMMAND ${BISON} --version + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 2 AND BISON_MINOR GREATER_EQUAL 4)) + message(WARNING "'bison' upgrade is required. Please check the https://stackoverflow.com/a/35161881") + endif() +endif() + +# make tools like 'glib-mkenums' visible +get_filename_component(GLIB_TOOL_DIR ${CURRENT_INSTALLED_DIR}/tools/glib ABSOLUTE) +message(STATUS "Using glib tools: ${GLIB_TOOL_DIR}") +vcpkg_add_to_path(PREPEND ${GLIB_TOOL_DIR}) + +if("plugins-bad" IN_LIST FEATURES) + # requires 'libdrm', 'dssim', 'libmicrodns' + message(FATAL_ERROR "The feature 'plugins-bad' is not supported in this port version") + set(PLUGIN_BAD_SUPPORT enabled) +else() + set(PLUGIN_BAD_SUPPORT disabled) +endif() +if("plugins-ugly" IN_LIST FEATURES) + set(PLUGIN_UGLY_SUPPORT enabled) +else() + set(PLUGIN_UGLY_SUPPORT disabled) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(LIBRARY_LINKAGE "shared") +else() + set(LIBRARY_LINKAGE "static") +endif() + +# gst-build's meson configuration needs git. Make the tool visible. +vcpkg_find_acquire_program(GIT) +get_filename_component(GIT_DIR "${GIT}" DIRECTORY) +vcpkg_add_to_path("${GIT_DIR}") + +# +# check scripts/cmake/vcpkg_configure_meson.cmake +# --wrap-mode=nodownload +# +# References +# https://github.com/GStreamer/gst-build/blob/1.18.4/meson_options.txt +# https://github.com/GStreamer/gst-plugins-base/blob/1.18.4/meson_options.txt +# https://github.com/GStreamer/gst-plugins-good/blob/1.18.4/meson_options.txt +# https://github.com/GStreamer/gst-plugins-bad/blob/1.18.4/meson_options.txt +# https://github.com/GStreamer/gst-plugins-ugly/blob/1.18.4/meson_options.txt +# +vcpkg_configure_meson( + SOURCE_PATH ${GST_BUILD_SOURCE_PATH} + OPTIONS + # gstreamer + -Dgstreamer:default_library=${LIBRARY_LINKAGE} + -Dgstreamer:check=disabled + -Dgstreamer:libunwind=disabled + -Dgstreamer:libdw=disabled + -Dgstreamer:dbghelp=disabled + -Dgstreamer:bash-completion=disabled + -Dgstreamer:coretracers=disabled + -Dgstreamer:examples=disabled + -Dgstreamer:tests=disabled + -Dgstreamer:benchmarks=disabled + -Dgstreamer:tools=disabled + -Dgstreamer:gtk_doc=disabled + -Dgstreamer:introspection=disabled + -Dgstreamer:nls=disabled + # gst-plugins-base + -Dgst-plugins-base:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-base:examples=disabled + -Dgst-plugins-base:tests=disabled + -Dgst-plugins-base:tools=disabled + -Dgst-plugins-base:introspection=disabled + -Dgst-plugins-base:nls=disabled + -Dgst-plugins-base:orc=disabled + # gst-plugins-good + -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-good:qt5=disabled + -Dgst-plugins-good:soup=disabled + -Dgst-plugins-good:cairo=auto # cairo[gobject] + -Dgst-plugins-good:speex=auto # speex + -Dgst-plugins-good:taglib=auto # taglib + -Dgst-plugins-good:vpx=auto # libvpx + -Dgst-plugins-good:examples=disabled + -Dgst-plugins-good:tests=disabled + -Dgst-plugins-good:nls=disabled + -Dgst-plugins-good:orc=disabled + # gst-plugins-bad + -Dbad=${PLUGIN_BAD_SUPPORT} + -Dgst-plugins-bad:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-bad:opencv=disabled + -Dgst-plugins-bad:hls-crypto=openssl + -Dgst-plugins-bad:examples=disabled + -Dgst-plugins-bad:tests=disabled + -Dgst-plugins-bad:introspection=disabled + -Dgst-plugins-bad:nls=${LIBRARY_LINKAGE} + -Dgst-plugins-bad:orc=disabled + # gst-plugins-ugly + -Dugly=${PLUGIN_UGLY_SUPPORT} + -Dgst-plugins-ugly:default_library=${LIBRARY_LINKAGE} + -Dgst-plugins-ugly:tests=disabled + -Dgst-plugins-ugly:nls=disabled + -Dgst-plugins-ugly:orc=disabled + # see ${GST_BUILD_SOURCE_PATH}/meson_options.txt + -Dpython=disabled + -Dlibav=disabled + -Dlibnice=disabled # libnice + -Ddevtools=disabled + -Dges=disabled + -Drtsp_server=disabled + -Domx=disabled + -Dvaapi=disabled + -Dsharp=disabled + -Drs=disabled + -Dgst-examples=disabled + -Dtls=disabled + -Dtests=disabled # common options + -Dexamples=disabled + -Dintrospection=disabled + -Dnls=disabled + -Dorc=disabled + -Ddoc=disabled + -Dgtk_doc=disabled + -Ddevtools=disabled + OPTIONS_DEBUG + -Dgstreamer:gst_debug=true # plugins will reference this value + OPTIONS_RELEASE + -Dgstreamer:gst_debug=false + -Dgstreamer:gobject-cast-checks=disabled + -Dgstreamer:glib-asserts=disabled + -Dgstreamer:glib-checks=disabled + -Dgstreamer:extra-checks=disabled + -Dgst-plugins-base:gobject-cast-checks=disabled + -Dgst-plugins-base:glib-asserts=disabled + -Dgst-plugins-base:glib-checks=disabled + -Dgst-plugins-good:gobject-cast-checks=disabled + -Dgst-plugins-good:glib-asserts=disabled + -Dgst-plugins-good:glib-checks=disabled + -Dgst-plugins-bad:gobject-cast-checks=disabled + -Dgst-plugins-bad:glib-asserts=disabled + -Dgst-plugins-bad:glib-checks=disabled +) +if(VCPKG_TARGET_IS_WINDOWS) + # note: can't find where z.lib comes from. replace it to appropriate library name manually + get_filename_component(BUILD_NINJA_DBG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/build.ninja ABSOLUTE) + vcpkg_replace_string(${BUILD_NINJA_DBG} "z.lib" "zlibd.lib") + get_filename_component(BUILD_NINJA_REL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja ABSOLUTE) + vcpkg_replace_string(${BUILD_NINJA_REL} "z.lib" "zlib.lib") + vcpkg_replace_string(${BUILD_NINJA_REL} "\"-Wno-unused\"" "") # todo: may need a patch for `gst_debug=false` +endif() +vcpkg_install_meson() + +# Remove duplicated GL headers (we already have `opengl-registry`) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/KHR + ${CURRENT_PACKAGES_DIR}/include/GL +) +file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include/gst/gl/gstglconfig.h + ${CURRENT_PACKAGES_DIR}/include/gstreamer-1.0/gst/gl/gstglconfig.h +) + +file(INSTALL ${GST_BUILD_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/libexec + ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/include + ${CURRENT_PACKAGES_DIR}/libexec + ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/include +) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin + ${CURRENT_PACKAGES_DIR}/bin + ) + set(PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX}) + set(SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${PREFIX}gstreamer-full-1.0${SUFFIX} + ${CURRENT_PACKAGES_DIR}/lib/${PREFIX}gstreamer-full-1.0${SUFFIX} + ) +endif() +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB DBG_BINS ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll + ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb + ) + file(COPY ${DBG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(GLOB REL_BINS ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll + ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb + ) + file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE ${DBG_BINS} ${REL_BINS}) +endif() \ No newline at end of file diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json new file mode 100644 index 00000000000000..b1207ae3748e0d --- /dev/null +++ b/ports/gstreamer/vcpkg.json @@ -0,0 +1,75 @@ +{ + "name": "gstreamer", + "version": "1.18.4", + "description": "GStreamer open-source multimedia framework core library", + "homepage": "https://gstreamer.freedesktop.org/", + "license": "LGPL-2.0", + "supports": "(windows | osx) & (x64 | x86)", + "dependencies": [ + { + "name": "cairo", + "features": [ + "gobject" + ], + "platform": "windows | osx" + }, + { + "name": "freetype", + "features": [ + "brotli", + "png", + "zlib" + ] + }, + { + "name": "glib", + "host": true + }, + "graphene", + "libnice", + "libxml2", + { + "name": "opengl-registry", + "platform": "windows | osx" + }, + "openssl", + "tool-meson", + { + "name": "yasm-tool-helper", + "platform": "windows" + } + ], + "default-features": [ + "plugins-good", + "plugins-ugly" + ], + "features": { + "plugins-bad": { + "description": "'Bad' GStreamer plugins and helper libraries", + "dependencies": [ + "openh264" + ] + }, + "plugins-good": { + "description": "'Good' GStreamer plugins and helper libraries", + "dependencies": [ + "bzip2", + "jack2", + "libflac", + "libjpeg-turbo", + "libpng", + "libraw", + "libvpx", + "mpg123", + "speex", + "taglib" + ] + }, + "plugins-ugly": { + "description": "'Ugly' GStreamer plugins and helper libraries", + "dependencies": [ + "x264" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index ec26275f21a1cb..ee1928fcea0efc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2416,6 +2416,10 @@ "baseline": "2.8.112", "port-version": 0 }, + "gstreamer": { + "baseline": "1.18.4", + "port-version": 0 + }, "gtest": { "baseline": "1.11.0", "port-version": 0 diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json new file mode 100644 index 00000000000000..e38c1dcec04d42 --- /dev/null +++ b/versions/g-/gstreamer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "308df77361916f76938e3a022feab2520e2ce2a3", + "version": "1.18.4", + "port-version": 0 + } + ] +} From a61271aeeb71fe0574fc722efd414a5277131dba Mon Sep 17 00:00:00 2001 From: Ankur Verma <31362771+ankurverma85@users.noreply.github.com> Date: Fri, 25 Jun 2021 14:46:56 -0700 Subject: [PATCH 056/141] [python3] Fix python3:x64-linux builds (#18405) * Fix build * Update vcpkg.json * Fix build Co-authored-by: Ankur Verma Co-authored-by: Ankur Verma --- ports/python3/portfile.cmake | 1 - ports/python3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 3130bbfee67c69..4ee2b825da7d4b 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -172,7 +172,6 @@ else() ) vcpkg_install_make(ADD_BIN_TO_PATH INSTALL_TARGET altinstall) - file(COPY "${CURRENT_PACKAGES_DIR}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") file(COPY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") # Makefiles, c files, __pycache__, and other junk. diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 4694d7fed8cd70..2f562e6c6d004e 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "python3", "version-string": "3.9.5", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index ee1928fcea0efc..01aded6df0a18b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5050,7 +5050,7 @@ }, "python3": { "baseline": "3.9.5", - "port-version": 0 + "port-version": 1 }, "qca": { "baseline": "2.3.1", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index d0f4b3d9b94385..1cdad20b6b1220 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c58aaaa7b980102912bbd8b13ba3ac227b37bd4", + "version-string": "3.9.5", + "port-version": 1 + }, { "git-tree": "16ae1dd8eb0498d1357af3155c565035ba9a3f39", "version-string": "3.9.5", From 69654f607cd8bf846d220b6006d3c7fb6336aded Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 28 Jun 2021 10:33:25 -0700 Subject: [PATCH 057/141] CI Fixes from 2021-06-26 (#18664) * CI Fixes from 2021-06-26 https://dev.azure.com/vcpkg/public/_build/results?buildId=55364&view=logs&j=0a61404f-5c45-5632-e83c-408b7fcca1d6&t=59cc5a87-398a-597b-cb3d-5842723775f1 PASSING, REMOVE FROM FAIL LIST: aubio:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: aubio:x64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: aubio:x86-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: caf:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: chartdir:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: coolprop:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: fdk-aac:arm-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: fdk-aac:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: fdk-aac:x64-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: fontconfig:x64-windows-static-md (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: google-cloud-cpp:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: gtkmm:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: libmagic:x64-windows-static (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: libmagic:x64-windows-static-md (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: libopusenc:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: lua:arm-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: lua:x64-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: matio:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: offscale-libetcd-cpp:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: proj4:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: z3:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: zeromq:arm64-windows (.\scripts\ci.baseline.txt) :) REGRESSION: clipp:x86-windows. If expected, add clipp:x86-windows=fail to .\scripts\ci.baseline.txt. >[DEBUG] Downloading https://vcpkgteststorage.blob.core.windows.net/osxpr20201017/4645fafe85a8099ea97b85e939747a12e9b3b92213b5b8207a9c277537377b77b5daebd88a4c090ea89cfff2937a9fc155da6e8b5558574d7129227c28826e1c?sv=2019-12-12&ss=b&srt=sco&sp=rwlac&se=2021-06-01T19:00:00Z&st=2021-02-02T21:14:48Z&spr=https&sig=5OqlHLAKxxH9%2F2G%2BwO4ngXiG%2Bd0ASB81PklNDOIAUUk%3D >[DEBUG] Downloading https://github.com/muellan/clipp/archive/2c32b2f1f7cc530b1ec1f62c92f698643bb368db.tar.gz >Error: Failed to download from mirror set: >https://vcpkgteststorage.blob.core.windows.net/osxpr20201017/4645fafe85a8099ea97b85e939747a12e9b3b92213b5b8207a9c277537377b77b5daebd88a4c090ea89cfff2937a9fc155da6e8b5558574d7129227c28826e1c?sv=2019-12-12&ss=b&srt=sco&sp=rwlac&se=2021-06-01T19:00:00Z&st=2021-02-02T21:14:48Z&spr=https&sig=5OqlHLAKxxH9%2F2G%2BwO4ngXiG%2Bd0ASB81PklNDOIAUUk%3D: failed: status code 403 >https://github.com/muellan/clipp/archive/2c32b2f1f7cc530b1ec1f62c92f698643bb368db.tar.gz: failed: status code 502 >[DEBUG] C:\A\1\14\s\src\vcpkg\base\downloads.cpp(652) Looks like a transient download failure. Might be something funky with artifact caching. REGRESSION: liblas:arm64-windows. If expected, add liblas:arm64-windows=fail to .\scripts\ci.baseline.txt. >fatal error C1189: #error: The file liblas/detail/endian.hpp needs to be set up for your CPU type. Probably was blocked by one of the many "passing" libs on arm64-windows. Skipped. REGRESSION: libsbml:x64-windows-static. If expected, add libsbml:x64-windows-static=fail to .\scripts\ci.baseline.txt. >[DEBUG] Downloading https://vcpkgteststorage.blob.core.windows.net/osxpr20201017/49dedaa2fcd2077e7389a8f940adf931d80aa7a8f9d57330328372d2ac8ebcaeb03a20524df2fe0f1c6933587904613754585076c46e6cb5d6f7a001f427185b?sv=2019-12-12&ss=b&srt=sco&sp=rwlac&se=2021-06-01T19:00:00Z&st=2021-02-02T21:14:48Z&spr=https&sig=5OqlHLAKxxH9%2F2G%2BwO4ngXiG%2Bd0ASB81PklNDOIAUUk%3D >[DEBUG] Downloading https://sourceforge.net/projects/sbml/files/libsbml/5.18.0/stable/libSBML-5.18.0-core-plus-packages-src.tar.gz/download >Error: Failed to download from mirror set: >https://vcpkgteststorage.blob.core.windows.net/osxpr20201017/49dedaa2fcd2077e7389a8f940adf931d80aa7a8f9d57330328372d2ac8ebcaeb03a20524df2fe0f1c6933587904613754585076c46e6cb5d6f7a001f427185b?sv=2019-12-12&ss=b&srt=sco&sp=rwlac&se=2021-06-01T19:00:00Z&st=2021-02-02T21:14:48Z&spr=https&sig=5OqlHLAKxxH9%2F2G%2BwO4ngXiG%2Bd0ASB81PklNDOIAUUk%3D: failed: status code 403 >https://sourceforge.net/projects/sbml/files/libsbml/5.18.0/stable/libSBML-5.18.0-core-plus-packages-src.tar.gz/download: WinHttpReceiveResponse() failed: 12175 > >[DEBUG] C:\A\1\14\s\src\vcpkg\base\downloads.cpp(652) >[DEBUG] Exiting after 548953 us (542540 us) Looks like a transient download failure. But 403 forbidden looks like artifact caching failure... REGRESSION: luafilesystem:arm-uwp. If expected, add luafilesystem:arm-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: luafilesystem:x64-uwp. If expected, add luafilesystem:x64-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: luasocket:arm-uwp. If expected, add luasocket:arm-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: luasocket:x64-uwp. If expected, add luasocket:x64-uwp=fail to .\scripts\ci.baseline.txt. Were previously blocked by lua, marked as 'fail'. REGRESSION: vcpkg-find-acquire-program:arm-uwp. If expected, add vcpkg-find-acquire-program:arm-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: vcpkg-find-acquire-program:x64-windows-static. If expected, add vcpkg-find-acquire-program:x64-windows-static=fail to .\scripts\ci.baseline.txt. REGRESSION: vcpkg-find-acquire-program:x64-windows. If expected, add vcpkg-find-acquire-program:x64-windows=fail to .\scripts\ci.baseline.txt. These are almost certainly the same artifact caching transient. * Aubio typo. --- scripts/ci.baseline.txt | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d05d8f46d227b2..9c25fd9d76720b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -50,11 +50,8 @@ apr:arm64-windows=fail # Requires ATL for ARM64 to be installed in CI azure-storage-cpp:arm64-windows=fail -aubio:x64-uwp=fail aubio:arm-uwp=fail -aubio:x86-windows=fail -aubio:x64-windows=fail -aubio:arm64-windows=fail +aubio:x64-uwp=fail blend2d:arm64-windows=fail blend2d:arm-uwp=fail blend2d:x64-uwp=fail @@ -73,7 +70,6 @@ bullet3:arm64-windows=fail bullet3:arm-uwp=fail bullet3:x64-uwp=fail caf:arm-uwp=fail -caf:arm64-windows=fail caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail @@ -119,7 +115,6 @@ chartdir:x64-windows-static=fail chartdir:x86-windows=fail chartdir:x64-windows=fail chartdir:x64-windows-static-md=fail -chartdir:x64-linux=fail chartdir:x64-osx=fail chmlib:arm-uwp=fail chmlib:x64-uwp=fail @@ -150,7 +145,6 @@ coin:arm-uwp=fail coin:x64-uwp=fail constexpr-contracts:x64-linux=fail coolprop:arm-uwp=fail -coolprop:x64-linux=fail coolprop:x64-osx=fail coolprop:x64-uwp=fail coroutine:arm-uwp=fail @@ -298,9 +292,6 @@ fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail fastrtps:x64-windows-static-md=fail -fdk-aac:arm64-windows=fail -fdk-aac:arm-uwp=fail -fdk-aac:x64-uwp=fail fdlibm:arm-uwp=fail fdlibm:x64-uwp=fail fftw3:arm-uwp=fail @@ -415,7 +406,6 @@ gmmlib:x64-windows=fail gmmlib:x64-windows-static=fail gmmlib:x64-windows-static-md=fail gmmlib:x86-windows=fail -google-cloud-cpp:arm64-windows=fail google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail gppanel:x64-osx=fail @@ -432,7 +422,6 @@ graphqlparser:arm-uwp=fail graphqlparser:x64-uwp=fail gsl:arm-uwp=fail gsl:x64-uwp=fail -gtkmm:x64-linux=fail gts:x64-osx=fail guetzli:x64-osx=fail h3:arm64-windows=fail @@ -634,6 +623,7 @@ libigl:arm64-windows=fail libigl:arm-uwp=fail libigl:x64-uwp=fail libirecovery:x64-windows-static-md=fail +liblas:arm64-windows=fail liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail @@ -645,8 +635,6 @@ liblsl:arm-uwp=fail liblsl:x64-uwp=fail libmad:arm-uwp=fail libmad:x64-uwp=fail -libmagic:x64-windows-static=fail -libmagic:x64-windows-static-md=fail libmagic:x64-uwp=fail libmagic:arm64-windows=fail libmagic:arm-uwp=fail @@ -692,7 +680,6 @@ libnice:x64-osx=skip libopenmpt:x64-linux=fail libopenmpt:x64-osx=fail libopusenc:arm-uwp=fail -libopusenc:x64-linux=fail libopusenc:x64-osx=fail libopusenc:x64-uwp=fail libosip2:x64-windows-static-md=fail @@ -858,8 +845,6 @@ log4cplus:arm-uwp=fail log4cplus:x64-uwp=fail log4cxx:arm-uwp=fail log4cxx:x64-uwp=fail -lua:arm-uwp=fail -lua:x64-uwp=fail luajit:arm64-windows = skip luajit:arm-uwp = skip luajit:x64-linux = skip @@ -869,9 +854,13 @@ luajit:x64-windows = skip luajit:x64-windows-static = skip luajit:x64-windows-static-md=skip luajit:x86-windows = skip +luafilesystem:arm-uwp=fail +luafilesystem:x64-uwp=fail luasec:x64-windows-static=fail +luasocket:arm-uwp=fail luasocket:x64-linux=fail luasocket:x64-osx=fail +luasocket:x64-uwp=fail lzfse:arm-uwp=fail magnum:arm64-windows=skip marble:x64-windows-static=fail @@ -885,7 +874,6 @@ marl:arm-uwp=fail marl:x64-uwp=fail mathgl:x64-osx=fail mathgl:x64-uwp=fail -matio:x64-linux=fail matio:x64-osx=fail mdnsresponder:arm64-windows=fail mdnsresponder:arm-uwp=fail @@ -1070,7 +1058,6 @@ octomap:x64-uwp=fail ode:arm64-windows=fail ode:arm-uwp=fail ode:x64-uwp=fail -offscale-libetcd-cpp:arm64-windows=fail offscale-libetcd-cpp:arm-uwp=fail offscale-libetcd-cpp:x64-uwp=fail ogdf:arm64-windows = skip @@ -1266,7 +1253,6 @@ popsift:x64-windows-static-md=fail portable-snippets:arm-uwp=fail pqp:arm-uwp=fail pqp:x64-uwp=fail -proj4:arm64-windows=fail proj4:arm-uwp=fail proj4:x64-uwp=fail protobuf-c:x86-windows=fail @@ -1719,10 +1705,8 @@ yasm:x64-uwp=fail yato:arm64-windows=fail yato:arm-uwp=fail yato:x64-uwp=fail -z3:arm64-windows=fail z3:arm-uwp=fail z3:x64-uwp=fail -zeromq:arm64-windows=fail zeromq:arm-uwp=fail zeromq:x64-uwp=fail zkpp:x86-windows=fail @@ -1768,7 +1752,6 @@ 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 -fontconfig:x64-windows-static-md=fail gmp:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail keystone:x64-windows-static-md=fail From 4a676f993a6d3d4c63cefb07fc1e28fe096d59c9 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 29 Jun 2021 02:58:35 +0200 Subject: [PATCH 058/141] [netcdf-c] Fix pc files; use features (#18120) * Format manifest * New port-version * Quote filepath expressions * Port to vcpkg-cmake ports * Remove invalid nc-config file * Fix pc files * Use features * Add feature 'tools' * x-add-version * Fix build with msys2 mingw * Update git-tree --- ports/netcdf-c/CONTROL | 6 ---- ports/netcdf-c/config-pkg-location.patch | 15 -------- ports/netcdf-c/fix-dependency-zlib.patch | 13 +++++++ ports/netcdf-c/fix-manpage-msys.patch | 13 +++++++ ports/netcdf-c/fix-pkgconfig.patch | 37 +++++++++++++++++++ ports/netcdf-c/portfile.cmake | 45 ++++++++++++++++-------- ports/netcdf-c/vcpkg.json | 43 ++++++++++++++++++++++ versions/baseline.json | 2 +- versions/n-/netcdf-c.json | 5 +++ 9 files changed, 143 insertions(+), 36 deletions(-) delete mode 100644 ports/netcdf-c/CONTROL delete mode 100644 ports/netcdf-c/config-pkg-location.patch create mode 100644 ports/netcdf-c/fix-dependency-zlib.patch create mode 100644 ports/netcdf-c/fix-manpage-msys.patch create mode 100644 ports/netcdf-c/fix-pkgconfig.patch create mode 100644 ports/netcdf-c/vcpkg.json diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL deleted file mode 100644 index f770d30204914a..00000000000000 --- a/ports/netcdf-c/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: netcdf-c -Version: 4.7.4 -Port-Version: 2 -Build-Depends: hdf5, curl -Homepage: https://github.com/Unidata/netcdf-c -Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/netcdf-c/config-pkg-location.patch b/ports/netcdf-c/config-pkg-location.patch deleted file mode 100644 index 13f0aeaa69eba3..00000000000000 --- a/ports/netcdf-c/config-pkg-location.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd7c4f8..e4e92c6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2050,7 +2050,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ncdap_test/pingurl.c ${CMAKE_CURRENT_ - # Create CMake package configuration files. With these, other packages using - # cmake should be able to find netcdf using find_package and find_library. - # The EXPORT call is paired with one in liblib. --set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/netCDF) -+if(NOT DEFINED ConfigPackageLocation) -+ set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/netCDF) -+endif(NOT DEFINED ConfigPackageLocation) - - install(EXPORT netCDFTargets - DESTINATION ${ConfigPackageLocation} diff --git a/ports/netcdf-c/fix-dependency-zlib.patch b/ports/netcdf-c/fix-dependency-zlib.patch new file mode 100644 index 00000000000000..52c5d2ecdaef94 --- /dev/null +++ b/ports/netcdf-c/fix-dependency-zlib.patch @@ -0,0 +1,13 @@ +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index 5b578f7..0731460 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -58,7 +58,7 @@ ENDIF() + + SET(TLL_LIBS "") + +-SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) ++SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM}) + + # Add extra dependencies specified via NC_EXTRA_DEPS + SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) diff --git a/ports/netcdf-c/fix-manpage-msys.patch b/ports/netcdf-c/fix-manpage-msys.patch new file mode 100644 index 00000000000000..24374c95e62469 --- /dev/null +++ b/ports/netcdf-c/fix-manpage-msys.patch @@ -0,0 +1,13 @@ +diff --git a/libsrc/CMakeLists.txt b/libsrc/CMakeLists.txt +index 65a3f87..30a008d 100644 +--- a/libsrc/CMakeLists.txt ++++ b/libsrc/CMakeLists.txt +@@ -61,7 +61,7 @@ IF(HAVE_M4) + IF(NOT MSVC) + ADD_CUSTOM_TARGET(manpage ALL + +- COMMAND ${NC_M4} ${ARGS_MANPAGE} '${CMAKE_CURRENT_BINARY_DIR}/netcdf.m4' > '${CMAKE_CURRENT_BINARY_DIR}/netcdf.3' ++ COMMAND ${NC_M4} ${ARGS_MANPAGE} "${CMAKE_CURRENT_BINARY_DIR}/netcdf.m4" > "${CMAKE_CURRENT_BINARY_DIR}/netcdf.3" VERBATIM + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + diff --git a/ports/netcdf-c/fix-pkgconfig.patch b/ports/netcdf-c/fix-pkgconfig.patch new file mode 100644 index 00000000000000..f7827d6cb50c10 --- /dev/null +++ b/ports/netcdf-c/fix-pkgconfig.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57d2d4b..3de6f8c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1892,6 +1892,20 @@ LIST(REMOVE_DUPLICATES LINKFLAGS) + SET(LIBS ${NC_LIBS}) + SET(NC_LIBS "-lnetcdf") + ++set(NC_LIBS_PRIVATE " ${LIBS} ") ++set(NC_REQUIRES_PRIVATE "") ++macro(replace_pkgconfig_module PATTERN MODULE) ++ if(NC_LIBS_PRIVATE MATCHES " ${PATTERN} ") ++ string(REPLACE "${CMAKE_MATCH_0}" " " NC_LIBS_PRIVATE "${NC_LIBS_PRIVATE}") ++ string(APPEND NC_REQUIRES_PRIVATE " ${MODULE}") ++ endif() ++endmacro() ++replace_pkgconfig_module("-lhdf5_hl" "hdf5_hl") ++replace_pkgconfig_module("-lhdf5" "hdf5") ++replace_pkgconfig_module("-lmpi" "ompi-c") ++replace_pkgconfig_module("-lCURL[^ ]*" "libcurl") ++replace_pkgconfig_module("-lZLIB[^ ]*" "zlib") ++ + configure_file( + ${netCDF_SOURCE_DIR}/netcdf.pc.in + ${netCDF_BINARY_DIR}/netcdf.pc @ONLY) +diff --git a/netcdf.pc.in b/netcdf.pc.in +index 22b5594..a48b7c2 100644 +--- a/netcdf.pc.in ++++ b/netcdf.pc.in +@@ -9,5 +9,6 @@ Description: NetCDF Client Library for C + URL: http://www.unidata.ucar.edu/netcdf + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} @NC_LIBS@ +-Libs.private: @LIBS@ ++Libs.private: @NC_LIBS_PRIVATE@ + Cflags: -I${includedir} ++Requires.private: @NC_REQUIRES_PRIVATE@ diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 23e20f462c2de3..468237d2cbffc5 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -6,10 +6,12 @@ vcpkg_from_github( HEAD_REF master PATCHES no-install-deps.patch - config-pkg-location.patch use_targets.patch fix-dependency-libmath.patch fix-linkage-error.patch + fix-pkgconfig.patch + fix-dependency-zlib.patch + fix-manpage-msys.patch ) #Remove outdated find modules @@ -23,31 +25,46 @@ else() set(NC_USE_STATIC_CRT OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + dap ENABLE_DAP + netcdf-4 ENABLE_NETCDF_4 + netcdf-4 USE_HDF5 + tools BUILD_UTILITIES + INVERTED_FEATURES + dap CMAKE_DISABLE_FIND_PACKAGE_CURL + netcdf-4 CMAKE_DISABLE_FIND_PACKAGE_HDF5 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE # netcdf-c configures in the source! - PREFER_NINJA OPTIONS - -DBUILD_UTILITIES=OFF -DBUILD_TESTING=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_FILTER_TESTING=OFF - -DUSE_HDF5=ON -DENABLE_DAP_REMOTE_TESTS=OFF -DDISABLE_INSTALL_DEPENDENCIES=ON -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT} - -DConfigPackageLocation=share/netcdf + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf TARGET_PATH share/netcdf) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "netcdf" CONFIG_PATH "lib/cmake/netCDF") +vcpkg_fixup_pkgconfig() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/nc-config" "${CURRENT_PACKAGES_DIR}/bin/nc-config") # invalid +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES nccopy ncdump ncgen ncgen3 + AUTO_CLEAN + ) +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() -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") -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json new file mode 100644 index 00000000000000..6e65236081bedb --- /dev/null +++ b/ports/netcdf-c/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "netcdf-c", + "version-string": "4.7.4", + "port-version": 3, + "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", + "homepage": "https://github.com/Unidata/netcdf-c", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "dap", + "netcdf-4" + ], + "features": { + "dap": { + "description": "Build with DAP remote access client support", + "dependencies": [ + "curl" + ] + }, + "netcdf-4": { + "description": "Build with netCDF-4/HDF5 support", + "dependencies": [ + { + "name": "hdf5", + "features": [ + "zlib" + ] + } + ] + }, + "tools": { + "description": "Build utilities" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 01aded6df0a18b..a9516d07ec2678 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4294,7 +4294,7 @@ }, "netcdf-c": { "baseline": "4.7.4", - "port-version": 2 + "port-version": 3 }, "netcdf-cxx4": { "baseline": "4.3.1", diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index d30a4c2ada2ae4..75fcc46b1f377d 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "069ccb40f8ce75d6ec88b8fe31966c11fcf6906b", + "version-string": "4.7.4", + "port-version": 3 + }, { "git-tree": "aa42781f00db0c2de52798f0345801b667977c79", "version-string": "4.7.4", From d76114d4bc2190ba719db2f546a98f0fc77c8b8a Mon Sep 17 00:00:00 2001 From: Hendrik Date: Tue, 29 Jun 2021 03:04:09 +0200 Subject: [PATCH 059/141] [portaudio] Switch to vcpkg_from_github, minor format improvements (#18065) * Add portaudio:: namespace * Switch from vcpkg_from_git to vcpkg_from_github * Convert portfile to unix line-endings * Increase port-version of portaudio * Update version hash of portaudio * Remove namespace patch Signed-off-by: Hendrik * Update version hash of portaudio * Fix indent issue * Update the baseline version * Fix the port version * Fix baseline version * Remove redundant tag in portfile * Update version hash of portaudio Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- .../fix-library-can-not-be-found.patch | 32 +++---- ports/portaudio/portfile.cmake | 88 +++++++++---------- ports/portaudio/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/portaudio.json | 5 ++ 5 files changed, 67 insertions(+), 61 deletions(-) diff --git a/ports/portaudio/fix-library-can-not-be-found.patch b/ports/portaudio/fix-library-can-not-be-found.patch index 93353d7eed67a2..7ef3e581d921d5 100644 --- a/ports/portaudio/fix-library-can-not-be-found.patch +++ b/ports/portaudio/fix-library-can-not-be-found.patch @@ -1,16 +1,16 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1024016..266e6d5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -352,11 +352,6 @@ ENDIF() - # embedded builds this is not an issue as they will only build the configuration - # used in the host application. - MARK_AS_ADVANCED(PA_LIBNAME_ADD_SUFFIX) --IF(MSVC AND PA_BUILD_STATIC AND PA_BUILD_SHARED AND NOT PA_LIBNAME_ADD_SUFFIX) -- MESSAGE(WARNING "Building both shared and static libraries, and avoiding the suffix _static will lead to a name conflict") -- SET(PA_LIBNAME_ADD_SUFFIX ON CACHE BOOL "Forcing use of suffix _static to avoid name conflict between static and import library" FORCE) -- MESSAGE(WARNING "PA_LIBNAME_ADD_SUFFIX was set to ON") --ENDIF() - - SET(PA_TARGETS "") - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 122fe93..b571c38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -360,11 +360,6 @@ ENDIF() + # embedded builds this is not an issue as they will only build the configuration + # used in the host application. + MARK_AS_ADVANCED(PA_LIBNAME_ADD_SUFFIX) +-IF(MSVC AND PA_BUILD_STATIC AND PA_BUILD_SHARED AND NOT PA_LIBNAME_ADD_SUFFIX) +- MESSAGE(WARNING "Building both shared and static libraries, and avoiding the suffix _static will lead to a name conflict") +- SET(PA_LIBNAME_ADD_SUFFIX ON CACHE BOOL "Forcing use of suffix _static to avoid name conflict between static and import library" FORCE) +- MESSAGE(WARNING "PA_LIBNAME_ADD_SUFFIX was set to ON") +-ENDIF() + + SET(PA_TARGETS "") + diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake index 76f1e71f6cdce1..95d047b2432aed 100644 --- a/ports/portaudio/portfile.cmake +++ b/ports/portaudio/portfile.cmake @@ -1,44 +1,44 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL https://github.com/PortAudio/portaudio.git - REF 147dd722548358763a8b649b3e4b41dfffbcfbb6 - TAG v19.7.0 - PATCHES - fix-library-can-not-be-found.patch -) - -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic PA_BUILD_SHARED) -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static PA_BUILD_STATIC) - -# NOTE: the ASIO backend will be built automatically if the ASIO-SDK is provided -# in a sibling folder of the portaudio source in vcpkg/buildtrees/portaudio/src -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DPA_USE_DS=ON - -DPA_USE_WASAPI=ON - -DPA_USE_WDMKS=ON - -DPA_USE_WMME=ON - -DPA_LIBNAME_ADD_SUFFIX=OFF - -DPA_BUILD_SHARED=${PA_BUILD_SHARED} - -DPA_BUILD_STATIC=${PA_BUILD_STATIC} - -DPA_DLL_LINK_WITH_STATIC_RUNTIME=OFF - OPTIONS_DEBUG - -DPA_ENABLE_DEBUG_OUTPUT:BOOL=ON -) - -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -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}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fail_port_install(ON_TARGET "uwp") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PortAudio/portaudio + REF 147dd722548358763a8b649b3e4b41dfffbcfbb6 + SHA512 0f56e5f5b004f51915f29771b8fc1fe886f1fef5d65ab5ea1db43f43c49917476b9eec14b36aa54d3e9fb4d8bdf61e68c79624d00b7e548d4c493395a758233a + PATCHES + fix-library-can-not-be-found.patch +) + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic PA_BUILD_SHARED) +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static PA_BUILD_STATIC) + +# NOTE: the ASIO backend will be built automatically if the ASIO-SDK is provided +# in a sibling folder of the portaudio source in vcpkg/buildtrees/portaudio/src +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DPA_USE_DS=ON + -DPA_USE_WASAPI=ON + -DPA_USE_WDMKS=ON + -DPA_USE_WMME=ON + -DPA_LIBNAME_ADD_SUFFIX=OFF + -DPA_BUILD_SHARED=${PA_BUILD_SHARED} + -DPA_BUILD_STATIC=${PA_BUILD_STATIC} + -DPA_DLL_LINK_WITH_STATIC_RUNTIME=OFF + OPTIONS_DEBUG + -DPA_ENABLE_DEBUG_OUTPUT:BOOL=ON +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +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}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/portaudio/vcpkg.json b/ports/portaudio/vcpkg.json index 36d142e55c43a6..4d504978f70684 100644 --- a/ports/portaudio/vcpkg.json +++ b/ports/portaudio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "portaudio", "version": "19.7", + "port-version": 1, "description": "PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.", "homepage": "http://www.portaudio.com", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index a9516d07ec2678..1b49265fcbc37d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4950,7 +4950,7 @@ }, "portaudio": { "baseline": "19.7", - "port-version": 0 + "port-version": 1 }, "portmidi": { "baseline": "0.234", diff --git a/versions/p-/portaudio.json b/versions/p-/portaudio.json index 6bc40d06a11739..e0640fc378eb5d 100644 --- a/versions/p-/portaudio.json +++ b/versions/p-/portaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6254fa08fb9fd57617978cdc98a3890bc1205d1", + "version": "19.7", + "port-version": 1 + }, { "git-tree": "649b9ae44725c4e6fb4dd012f6202415424ffb1f", "version": "19.7", From 33dca6f2818ee408d7df2470f19edbda89ee86de Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Wed, 30 Jun 2021 01:13:44 +0900 Subject: [PATCH 060/141] [sleef] create a new port (#18075) * [sleef] create a new port * [sleef] update baseline * [sleef] update supports * add more supported architectures to sleef * [sleef] update ci.baseline.txt * Revert "[sleef] update ci.baseline.txt" This reverts commit 39685ae755048ebc4702ddfb659026f910ce885a. * [sleef] disable (arm & windows) The project's CI doesn't check it. Disable in support field. * Update ports/sleef/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [sleef] update git-tree SHA Co-authored-by: nicole mazzuca Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/sleef/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/sleef/vcpkg.json | 14 ++++++++++++++ scripts/ci.baseline.txt | 1 + versions/baseline.json | 4 ++++ versions/s-/sleef.json | 9 +++++++++ 5 files changed, 57 insertions(+) create mode 100644 ports/sleef/portfile.cmake create mode 100644 ports/sleef/vcpkg.json create mode 100644 versions/s-/sleef.json diff --git a/ports/sleef/portfile.cmake b/ports/sleef/portfile.cmake new file mode 100644 index 00000000000000..ce37b7ce7e4f40 --- /dev/null +++ b/ports/sleef/portfile.cmake @@ -0,0 +1,29 @@ +# x86: Reports ICE(Internal Compiler Error) for x86-windows/release. +# see ${SOURCE_PATH}/src/libm/sleefsimddp.c +# uwp: codegen fails +vcpkg_fail_port_install(ON_TARGET "uwp") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO shibatch/sleef + REF 3.5.1 + SHA512 e8e4e5028db52998c6b82bd462622c08d670e4e85273327f1c3bdbd900827dd7793b217c2876ca1229b6f672493bb96f40140e14366390cccea0e6780689e128 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_LIBM=ON + -DBUILD_DFT=ON + -DBUILD_QUAD=ON + -DBUILD_GNUABILIBS=${VCPKG_TARGET_IS_LINUX} + -DBUILD_TESTS=OFF + -DBUILD_INLINE_HEADERS=OFF +) +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) diff --git a/ports/sleef/vcpkg.json b/ports/sleef/vcpkg.json new file mode 100644 index 00000000000000..dcd74f6fc96250 --- /dev/null +++ b/ports/sleef/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "sleef", + "version": "3.5.1", + "description": "SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT", + "homepage": "https://sleef.org/", + "license": "BSL-1.0", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9c25fd9d76720b..c3e40ad2045ca2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1467,6 +1467,7 @@ skia:arm-uwp=fail skia:x64-linux=fail skia:x64-uwp=fail skia:x86-windows=fail +sleef:x86-windows=fail slikenet:arm-uwp=fail slikenet:x64-uwp=fail smpeg2:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 1b49265fcbc37d..21ac7f47908371 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5800,6 +5800,10 @@ "baseline": "1.13.0", "port-version": 0 }, + "sleef": { + "baseline": "3.5.1", + "port-version": 0 + }, "slikenet": { "baseline": "2019-10-22-2", "port-version": 0 diff --git a/versions/s-/sleef.json b/versions/s-/sleef.json new file mode 100644 index 00000000000000..304db6224f9952 --- /dev/null +++ b/versions/s-/sleef.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0c195bd94ab64769463a4891db9d140fa37508a4", + "version": "3.5.1", + "port-version": 0 + } + ] +} From 5163525f6c0ed50c5d054e9110b2c8cfb06ddb0b Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 29 Jun 2021 13:47:39 -0700 Subject: [PATCH 061/141] Update vcpkg tool to resolve leak of the asset cache token (#18720) --- scripts/azure-pipelines/linux/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/osx/azure-pipelines.yml | 3 ++- scripts/azure-pipelines/windows/azure-pipelines.yml | 4 ++-- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 83ef7e27c30408..0c126d886c65b2 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -14,9 +14,9 @@ jobs: value: /mnt/vcpkg-ci - name: VCPKG_DOWNLOADS value: /mnt/vcpkg-ci/downloads - - group: azblob-test-sas-group + - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES - value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite" + value: "x-azurl,$(root-url),$(sas),readwrite" steps: - bash: df -h diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 19612c3cc88ecc..2e9f05d6379dcd 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -17,8 +17,9 @@ jobs: - group: osx-2021-04-16 - name: BINARY_SOURCE_STUB value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)" + - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES - value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite" + value: "x-azurl,$(root-url),$(sas),readwrite" steps: - bash: df -h diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index a822888ab7afee..ed5a0a405040bf 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -14,9 +14,9 @@ jobs: value: D:\ - name: VCPKG_DOWNLOADS value: D:\downloads - - group: azblob-test-sas-group + - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES - value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite" + value: "x-azurl,$(root-url),$(sas),readwrite" steps: - task: PowerShell@2 diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 37cab340fbeb02..6ffcddddcecf21 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" -& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-19/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-29/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Write-Host "" if ($LASTEXITCODE -ne 0) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4ee1c11eb6194a..0c612cff2af07e 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -278,8 +278,8 @@ else fi # Do the build -vcpkgToolReleaseTag="2021-06-19" -vcpkgToolReleaseSha="e9626023b5b545ac88985a0b1bec2d1784f2c5724cc23c6dacf7bf5851c1c7b34649d11192bcd20e41a6340dc6a8d557cace20016a0e121cc8975613f11343ef" +vcpkgToolReleaseTag="2021-06-29" +vcpkgToolReleaseSha="ffaa649cdb996946deff538ed0df192dffff41eb838179566aa77f91cdaaeadea7cd058bb4b230057f4b14703fbcd3c557b398ec7388d94177d3fc31073e7b6b" vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" From 23acf6f2df24dbb3389984e9905d278de12e10f0 Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Wed, 30 Jun 2021 02:08:28 +0300 Subject: [PATCH 062/141] [llvm] update to 12.0.0, enable zlib and libxml2 (#17302) * [llvm] update to 12.0.0, enable zlib and libxml2 * [llvm] disable libxml2 by default, arm64-windows should be supported * [llvm] try to fix build with ffi on Windows #17663 * [llvm] re-enable libxml2 * [llvm] fix formatting * [llvm] overwrite version * [mesa] update to v21.1.0 * [llvm] update ci.baseline * [halide] update to the latest master commit * [llvm] disable libxml2 port until complete PR #15390 * update versions * [llvm] fix disabling of external libraries * update version * update ci.baseline * update ci.baseline * fix typo * [llvm] fix libxml2 (depends on #17945) * revert "[halide] update to the latest master commit" * update versions * [halide] fix zlib dependency for tools * update versions * [halide] update to official release v12.0.0 * update versions * [halide] update to v12.0.1 * update version * [mesa] remove llvm from defaults * update version * update ci.baseline * [mesa] update to v21.1.2 and fix build with LLVM on Windows * [llvm] allow to build libunwind project on Windows * update versions * [mesa] update ci.baseline.txt to disable x64-windows-static-md, may be fixed in the PR #18495 --- ports/halide/CONTROL | 64 ------ ports/halide/portfile.cmake | 38 ++-- ports/halide/vcpkg.json | 202 ++++++++++++++++++ ports/llvm/0001-add-msvc-options.patch | 31 --- ports/llvm/0003-fix-openmp-debug.patch | 11 +- ports/llvm/0006-workaround-msvc-bug.patch | 39 ---- ports/llvm/0008-fix-libcxx-install.patch | 24 +-- ports/llvm/0009-fix-tools-install-path.patch | 32 +-- ports/llvm/0010-fix-libffi.patch | 16 ++ ports/llvm/0011-fix-libxml2.patch | 34 +++ ports/llvm/portfile.cmake | 33 ++- ports/llvm/vcpkg.json | 18 +- ports/mesa/CONTROL | 32 --- ...a-part2.patch => dual-osmesa-part2b.patch} | 0 ports/mesa/dual-osmesa.patch | 80 ------- ports/mesa/portfile.cmake | 26 ++- ...patch => swravx512-post-static-link.patch} | 22 +- ports/mesa/vcpkg.json | 99 +++++++++ scripts/ci.baseline.txt | 3 +- versions/baseline.json | 8 +- versions/h-/halide.json | 5 + versions/l-/llvm.json | 5 + versions/m-/mesa.json | 5 + 23 files changed, 488 insertions(+), 339 deletions(-) delete mode 100644 ports/halide/CONTROL create mode 100644 ports/halide/vcpkg.json delete mode 100644 ports/llvm/0001-add-msvc-options.patch delete mode 100644 ports/llvm/0006-workaround-msvc-bug.patch create mode 100644 ports/llvm/0010-fix-libffi.patch create mode 100644 ports/llvm/0011-fix-libxml2.patch delete mode 100644 ports/mesa/CONTROL rename ports/mesa/{dual-osmesa-part2.patch => dual-osmesa-part2b.patch} (100%) delete mode 100644 ports/mesa/dual-osmesa.patch rename ports/mesa/{swravx512.patch => swravx512-post-static-link.patch} (87%) create mode 100644 ports/mesa/vcpkg.json diff --git a/ports/halide/CONTROL b/ports/halide/CONTROL deleted file mode 100644 index 8ffcc93dd99d51..00000000000000 --- a/ports/halide/CONTROL +++ /dev/null @@ -1,64 +0,0 @@ -Source: halide -Version: 11.0.1 -Homepage: https://github.com/halide/Halide -Description: Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines. -Supports: !uwp -Default-Features: jit -Build-Depends: llvm[enable-rtti,tools,clang] - -Feature: jit -Description: Include targets required for jit compilation -Build-Depends: halide[core,target-x86] (x86|x64), halide[core,target-arm] (arm&!arm64), halide[core,target-aarch64] (arm64), halide[target-all] (!x86&!x64&!arm&!arm64) - -Feature: target-all -Description: Include all targets -Build-Depends: halide[core,target-aarch64,target-amdgpu,target-arm,target-d3d12compute,target-hexagon,target-metal,target-mips,target-nvptx,target-opencl,target-opengl,target-powerpc,target-riscv,target-x86] - -Feature: target-aarch64 -Description: Include AArch64 target -Build-Depends: llvm[core,target-aarch64] - -Feature: target-amdgpu -Description: Include AMDGPU target -Build-Depends: llvm[core,target-amdgpu] - -Feature: target-arm -Description: Include ARM target -Build-Depends: llvm[core,target-arm] - -Feature: target-d3d12compute -Description: Include Direct3D 12 Compute target - -Feature: target-hexagon -Description: Include Hexagon target -Build-Depends: llvm[core,target-hexagon] - -Feature: target-metal -Description: Include Metal target - -Feature: target-mips -Description: Include Mips target -Build-Depends: llvm[core,target-mips] - -Feature: target-nvptx -Description: Include NVPTX target -Build-Depends: llvm[core,target-nvptx] - -Feature: target-opencl -Description: Include OpenCL-C target - -Feature: target-opengl -Description: Include OpenGL/GLSL target - -Feature: target-powerpc -Description: Include PowerPC target -Build-Depends: llvm[core,target-powerpc] - -Feature: target-riscv -Description: Include RISCV target -Build-Depends: llvm[core,target-riscv] - -Feature: target-x86 -Description: Include X86 target -Build-Depends: llvm[core,target-x86] - diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index b8e08adda471ef..83e8399aa58bab 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -8,25 +8,27 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO halide/Halide - REF 85c1b91c47ce15aab0d9502d955e48615f3bcee0 # v11.0.1 - SHA512 3bfdf9fc82d56d099cf74b6683c0017724c1c4ae791e824f5ef3b4d4c1dcb52dd5adddb740ccf6b073b71fcbb748238f42040071ddb64c155f8fdc2709b8121d - HEAD_REF release/11.x + REF 5dabcaa9effca1067f907f6c8ea212f3d2b1d99a # v12.0.1 + SHA512 5ab44703850885561337e23d8b538a5adfe1611e24e8daa4a1313756b4f9dfeb54e89bf8400d46a3340c00234402681b4f44ba3ed5322027fd6cb5dfbd525acd + HEAD_REF release/12.x ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - target-aarch64 TARGET_AARCH64 - target-amdgpu TARGET_AMDGPU - target-arm TARGET_ARM - target-d3d12compute TARGET_D3D12COMPUTE - target-hexagon TARGET_HEXAGON - target-metal TARGET_METAL - target-mips TARGET_MIPS - target-nvptx TARGET_NVPTX - target-opencl TARGET_OPENCL - target-opengl TARGET_OPENGL - target-powerpc TARGET_POWERPC - target-riscv TARGET_RISCV - target-x86 TARGET_X86 +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + target-aarch64 TARGET_AARCH64 + target-amdgpu TARGET_AMDGPU + target-arm TARGET_ARM + target-d3d12compute TARGET_D3D12COMPUTE + target-hexagon TARGET_HEXAGON + target-metal TARGET_METAL + target-mips TARGET_MIPS + target-nvptx TARGET_NVPTX + target-opencl TARGET_OPENCL + target-opengl TARGET_OPENGL + target-powerpc TARGET_POWERPC + target-riscv TARGET_RISCV + target-x86 TARGET_X86 ) vcpkg_configure_cmake( @@ -43,7 +45,7 @@ vcpkg_configure_cmake( -DHALIDE_INSTALL_CMAKEDIR=share/${PORT} ) -vcpkg_install_cmake() +vcpkg_install_cmake(ADD_BIN_TO_PATH) vcpkg_copy_tools( TOOL_NAMES diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json new file mode 100644 index 00000000000000..c66fef61b0da60 --- /dev/null +++ b/ports/halide/vcpkg.json @@ -0,0 +1,202 @@ +{ + "name": "halide", + "version": "12.0.1", + "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", + "homepage": "https://github.com/halide/Halide", + "supports": "!uwp", + "dependencies": [ + { + "name": "llvm", + "features": [ + "clang", + "enable-rtti", + "tools" + ] + } + ], + "default-features": [ + "jit" + ], + "features": { + "jit": { + "description": "Include targets required for jit compilation", + "dependencies": [ + { + "name": "halide", + "default-features": false, + "features": [ + "target-aarch64" + ], + "platform": "arm64" + }, + { + "name": "halide", + "default-features": false, + "features": [ + "target-x86" + ], + "platform": "x86 | x64" + }, + { + "name": "halide", + "default-features": false, + "features": [ + "target-arm" + ], + "platform": "arm & !arm64" + }, + { + "name": "halide", + "features": [ + "target-all" + ], + "platform": "!x86 & !x64 & !arm & !arm64" + } + ] + }, + "target-aarch64": { + "description": "Include AArch64 target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-aarch64" + ] + } + ] + }, + "target-all": { + "description": "Include all targets", + "dependencies": [ + { + "name": "halide", + "default-features": false, + "features": [ + "target-aarch64", + "target-amdgpu", + "target-arm", + "target-d3d12compute", + "target-hexagon", + "target-metal", + "target-mips", + "target-nvptx", + "target-opencl", + "target-opengl", + "target-powerpc", + "target-riscv", + "target-x86" + ] + } + ] + }, + "target-amdgpu": { + "description": "Include AMDGPU target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-amdgpu" + ] + } + ] + }, + "target-arm": { + "description": "Include ARM target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-arm" + ] + } + ] + }, + "target-d3d12compute": { + "description": "Include Direct3D 12 Compute target" + }, + "target-hexagon": { + "description": "Include Hexagon target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-hexagon" + ] + } + ] + }, + "target-metal": { + "description": "Include Metal target" + }, + "target-mips": { + "description": "Include Mips target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-mips" + ] + } + ] + }, + "target-nvptx": { + "description": "Include NVPTX target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-nvptx" + ] + } + ] + }, + "target-opencl": { + "description": "Include OpenCL-C target" + }, + "target-opengl": { + "description": "Include OpenGL/GLSL target" + }, + "target-powerpc": { + "description": "Include PowerPC target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-powerpc" + ] + } + ] + }, + "target-riscv": { + "description": "Include RISCV target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-riscv" + ] + } + ] + }, + "target-x86": { + "description": "Include X86 target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-x86" + ] + } + ] + } + } +} diff --git a/ports/llvm/0001-add-msvc-options.patch b/ports/llvm/0001-add-msvc-options.patch deleted file mode 100644 index be5ad818964b2b..00000000000000 --- a/ports/llvm/0001-add-msvc-options.patch +++ /dev/null @@ -1,31 +0,0 @@ - llvm/cmake/modules/HandleLLVMOptions.cmake | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake -index 5ef22eb493ba..3e2f372e80c9 100644 ---- a/llvm/cmake/modules/HandleLLVMOptions.cmake -+++ b/llvm/cmake/modules/HandleLLVMOptions.cmake -@@ -426,6 +426,12 @@ if( MSVC ) - - append("/Zc:inline" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) - -+ # Some projects use the __cplusplus preprocessor macro to check support for -+ # a particular version of the C++ standard. When this option is not specified -+ # explicitly, macro's value is "199711L" that implies C++98 Standard. -+ # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ -+ append("/Zc:__cplusplus" CMAKE_CXX_FLAGS) -+ - # Allow users to request PDBs in release mode. CMake offeres the - # RelWithDebInfo configuration, but it uses different optimization settings - # (/Ob1 vs /Ob2 or -O2 vs -O3). LLVM provides this flag so that users can get -@@ -478,6 +484,10 @@ if( MSVC ) - endif() - endif() - endif() -+ # By default MSVC has a 2^16 limit on the number of sections in an object file, -+ # but in many objects files need more than that. This flag is to increase the -+ # number of sections. -+ append("/bigobj" CMAKE_CXX_FLAGS) - endif( MSVC ) - - # Warnings-as-errors handling for GCC-compatible compilers: diff --git a/ports/llvm/0003-fix-openmp-debug.patch b/ports/llvm/0003-fix-openmp-debug.patch index 577785afdb2492..adf3c8ad01289e 100644 --- a/ports/llvm/0003-fix-openmp-debug.patch +++ b/ports/llvm/0003-fix-openmp-debug.patch @@ -1,9 +1,12 @@ + openmp/runtime/src/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt -index 81275c0483d..61468e048ec 100644 +index 822f9ca2b825..814e25864610 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt -@@ -136,7 +136,7 @@ libomp_get_ldflags(LIBOMP_CONFIGURED_LDFLAGS) - add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES}) +@@ -157,7 +157,7 @@ else() + endif() set_target_properties(omp PROPERTIES - PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_LIB_FILE}" @@ -11,7 +14,7 @@ index 81275c0483d..61468e048ec 100644 LINK_FLAGS "${LIBOMP_CONFIGURED_LDFLAGS}" LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} ) -@@ -215,7 +215,7 @@ if(WIN32) +@@ -232,7 +232,7 @@ if(WIN32) # Create new import library that is just the previously created one + kmp_import.cpp add_library(ompimp STATIC ${LIBOMP_GENERATED_IMP_LIB} kmp_import.cpp) set_target_properties(ompimp PROPERTIES diff --git a/ports/llvm/0006-workaround-msvc-bug.patch b/ports/llvm/0006-workaround-msvc-bug.patch deleted file mode 100644 index db1574b9ce43d3..00000000000000 --- a/ports/llvm/0006-workaround-msvc-bug.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp b/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp ---- a/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp -+++ b/llvm/lib/CodeGen/GlobalISel/LegalityPredicates.cpp -@@ -10,6 +10,17 @@ - // - //===----------------------------------------------------------------------===// - -+// Disable optimizations to work around MSVC debug mode bug in 32-bit: -+// https://developercommunity.visualstudio.com/content/problem/1179643/msvc-copies-overaligned-non-trivially-copyable-par.html -+// FIXME: Remove this when the issue is closed. -+#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_IX86) -+// We have to disable runtime checks in order to enable optimizations. This is -+// done for the entire file because the problem is actually observed in STL -+// template functions. -+#pragma runtime_checks("", off) -+#pragma optimize("gs", on) -+#endif -+ - #include "llvm/CodeGen/GlobalISel/LegalizerInfo.h" - - using namespace llvm; -diff --git a/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp b/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp ---- a/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp -+++ b/llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp -@@ -406,3 +406,13 @@ - 32, 8, AtomicOrdering::NotAtomic })); - } - } -+ -+// This code sequence doesn't do anything, but it covers a previously uncovered -+// codepath that used to crash in MSVC x86_32 debug mode. -+TEST(LegalizerInfoTest, MSVCDebugMiscompile) { -+ const LLT S1 = LLT::scalar(1); -+ const LLT P0 = LLT::pointer(0, 32); -+ LegalizerInfo LI; -+ auto Builder = LI.getActionDefinitionsBuilder(TargetOpcode::G_PTRTOINT); -+ (void)Builder.legalForCartesianProduct({S1}, {P0}); -+} - diff --git a/ports/llvm/0008-fix-libcxx-install.patch b/ports/llvm/0008-fix-libcxx-install.patch index 3af957eaf59480..ec4019dc2f86f4 100644 --- a/ports/llvm/0008-fix-libcxx-install.patch +++ b/ports/llvm/0008-fix-libcxx-install.patch @@ -2,17 +2,17 @@ 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt -index 2001c09761d9..e17de934534f 100644 +index 9965104cb5b2..0d2a33c6b33c 100644 --- a/libcxx/src/CMakeLists.txt +++ b/libcxx/src/CMakeLists.txt -@@ -364,9 +364,7 @@ if (LIBCXX_INSTALL_LIBRARY) - # NOTE: This install command must go after the cxx install command otherwise - # it will not be executed after the library symlinks are installed. - if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT) -- # Replace the libc++ filename with $ -- # after we required CMake 3.0. -- install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" -+ install(FILES "$" - DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} - COMPONENT libcxx) - endif() +@@ -372,9 +372,7 @@ endif() + # NOTE: This install command must go after the cxx install command otherwise + # it will not be executed after the library symlinks are installed. + if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT) +- # Replace the libc++ filename with $ +- # after we required CMake 3.0. +- install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" ++ install(FILES "$" + DESTINATION ${LIBCXX_INSTALL_PREFIX}${LIBCXX_INSTALL_LIBRARY_DIR} + COMPONENT libcxx) + endif() diff --git a/ports/llvm/0009-fix-tools-install-path.patch b/ports/llvm/0009-fix-tools-install-path.patch index eb6c75bd62d2ab..b544feec08ede3 100644 --- a/ports/llvm/0009-fix-tools-install-path.patch +++ b/ports/llvm/0009-fix-tools-install-path.patch @@ -74,10 +74,10 @@ index ec0702d76f18..9a34a09921b1 100644 endforeach() diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt -index 22edb974bac7..60f69d358fb9 100644 +index dd3d33439299..ded0b5530ad9 100644 --- a/clang/tools/scan-view/CMakeLists.txt +++ b/clang/tools/scan-view/CMakeLists.txt -@@ -22,7 +22,7 @@ if(CLANG_INSTALL_SCANVIEW) +@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} @@ -100,10 +100,10 @@ index 62f2de0cb15c..38dc821c76de 100644 add_custom_target(hmaptool ALL DEPENDS ${Depends}) diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake -index 7fe8b7e9f406..b338dddd0850 100644 +index ba36a234babf..1197a8d8ff32 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake -@@ -120,7 +120,7 @@ macro(add_flang_tool name) +@@ -119,7 +119,7 @@ macro(add_flang_tool name) install(TARGETS ${name} ${export_to_flangtargets} @@ -113,24 +113,24 @@ index 7fe8b7e9f406..b338dddd0850 100644 if(NOT LLVM_ENABLE_IDE) diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt -index f3af6e8312fe..aa58108b332b 100644 +index 2e5350aecdc6..b4ab145846b5 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt -@@ -58,7 +58,7 @@ endforeach() +@@ -63,12 +63,12 @@ endforeach() add_custom_target(module_files ALL DEPENDS ${MODULE_FILES}) -install(TARGETS f18 DESTINATION bin) +install(TARGETS f18 DESTINATION tools/llvm) - set(FLANG_INTRINSIC_MODULES_DIR ${FLANG_BINARY_DIR}/include/flang) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${CMAKE_BINARY_DIR}/tools/flang/bin/flang @ONLY) -@@ -68,4 +68,4 @@ set(FLANG_INTRINSIC_MODULES_DIR ${CMAKE_INSTALL_PREFIX}/include/flang) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.sh.in ${FLANG_BINARY_DIR}/bin/flang-install.sh @ONLY) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/f18_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/f18_version.h @ONLY) - --install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION bin RENAME flang PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE) -+install(PROGRAMS ${FLANG_BINARY_DIR}/bin/flang-install.sh DESTINATION tools/llvm RENAME flang PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE) + # This flang shell script will only work in a POSIX shell. + if (NOT WIN32) + file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/flang + DESTINATION ${CMAKE_BINARY_DIR}/bin + FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE) +- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin) ++ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION tools/llvm) + endif() diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake index 23df41312403..86f4eafeed07 100644 --- a/lld/cmake/modules/AddLLD.cmake @@ -145,7 +145,7 @@ index 23df41312403..86f4eafeed07 100644 if(NOT CMAKE_CONFIGURATION_TYPES) diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt -index e6f72fcd3488..0e5a2c81e825 100644 +index 5cff736ff57f..32f43bc1c9be 100644 --- a/lld/tools/lld/CMakeLists.txt +++ b/lld/tools/lld/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries(lld @@ -156,7 +156,7 @@ index e6f72fcd3488..0e5a2c81e825 100644 + RUNTIME DESTINATION tools/llvm) if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld ld64.lld wasm-ld) + set(LLD_SYMLINKS_TO_CREATE diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index 4ed5c647c5d2..cb31901dddbb 100644 --- a/lldb/cmake/modules/AddLLDB.cmake diff --git a/ports/llvm/0010-fix-libffi.patch b/ports/llvm/0010-fix-libffi.patch new file mode 100644 index 00000000000000..e98825595d3c69 --- /dev/null +++ b/ports/llvm/0010-fix-libffi.patch @@ -0,0 +1,16 @@ + llvm/cmake/config-ix.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake +index 818fafbce148..66fc9f509ac7 100644 +--- a/llvm/cmake/config-ix.cmake ++++ b/llvm/cmake/config-ix.cmake +@@ -335,7 +335,7 @@ if( LLVM_ENABLE_FFI ) + message(FATAL_ERROR "libffi includes are not found.") + endif() + +- find_library(FFI_LIBRARY_PATH ffi PATHS ${FFI_LIBRARY_DIR}) ++ find_library(FFI_LIBRARY_PATH NAMES ffi libffi PATHS ${FFI_LIBRARY_DIR}) + if( NOT FFI_LIBRARY_PATH ) + message(FATAL_ERROR "libffi is not found.") + endif() diff --git a/ports/llvm/0011-fix-libxml2.patch b/ports/llvm/0011-fix-libxml2.patch new file mode 100644 index 00000000000000..b5deff09f9b60f --- /dev/null +++ b/ports/llvm/0011-fix-libxml2.patch @@ -0,0 +1,34 @@ + clang/tools/c-index-test/CMakeLists.txt | 6 +----- + lldb/cmake/modules/LLDBConfig.cmake | 2 +- + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt +index ceef4b086..40b9e9955 100644 +--- a/clang/tools/c-index-test/CMakeLists.txt ++++ b/clang/tools/c-index-test/CMakeLists.txt +@@ -40,11 +40,7 @@ set_target_properties(c-index-test + + # If libxml2 is available, make it available for c-index-test. + if (CLANG_HAVE_LIBXML) +- if ((CMAKE_OSX_SYSROOT) AND (EXISTS ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR})) +- include_directories(SYSTEM ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR}) +- else() +- include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR}) +- endif() ++ include_directories(SYSTEM ${LIBXML2_INCLUDE_DIRS}) + target_link_libraries(c-index-test PRIVATE ${LIBXML2_LIBRARIES}) + endif() + +diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake +index 2fdf1502d..beeeeb9b1 100644 +--- a/lldb/cmake/modules/LLDBConfig.cmake ++++ b/lldb/cmake/modules/LLDBConfig.cmake +@@ -214,7 +214,7 @@ if (LLDB_ENABLE_LZMA) + endif() + + if (LLDB_ENABLE_LIBXML2) +- include_directories(${LIBXML2_INCLUDE_DIR}) ++ include_directories(${LIBXML2_INCLUDE_DIRS}) + endif() + + include_directories(BEFORE diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 356a25bf1792bf..c242f99e489629 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -1,4 +1,4 @@ -set(LLVM_VERSION "11.1.0") +set(LLVM_VERSION "12.0.0") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,18 +6,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project REF llvmorg-${LLVM_VERSION} - SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 + SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 HEAD_REF master PATCHES - 0001-add-msvc-options.patch # Fixed in LLVM 12.0.0 0002-fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. 0003-fix-openmp-debug.patch 0004-fix-dr-1734.patch 0005-fix-tools-path.patch - 0006-workaround-msvc-bug.patch # Fixed in LLVM 12.0.0 0007-fix-compiler-rt-install-path.patch 0008-fix-libcxx-install.patch 0009-fix-tools-install-path.patch + 0010-fix-libffi.patch + 0011-fix-libxml2.patch ) vcpkg_check_features( @@ -43,6 +43,25 @@ list(APPEND FEATURE_OPTIONS -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON ) +# Force enable or disable external libraries +set(llvm_external_libraries + zlib + libxml2 +) +foreach(external_library IN LISTS llvm_external_libraries) + string(TOLOWER "enable-${external_library}" feature_name) + string(TOUPPER "LLVM_ENABLE_${external_library}" define_name) + if(feature_name IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS + -D${define_name}=FORCE_ON + ) + else() + list(APPEND FEATURE_OPTIONS + -D${define_name}=OFF + ) + endif() +endforeach() + # By default assertions are enabled for Debug configuration only. if("enable-assertions" IN_LIST FEATURES) # Force enable assertions for all configurations. @@ -119,9 +138,6 @@ if("libcxxabi" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "libcxxabi") endif() if("libunwind" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Building libunwind with MSVC is not supported. Disable it until issues are fixed.") - endif() list(APPEND LLVM_ENABLE_PROJECTS "libunwind") endif() if("lld" IN_LIST FEATURES) @@ -204,9 +220,6 @@ vcpkg_configure_cmake( -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_BUILD_TESTS=OFF - # Disable optional dependencies to libxml2 and zlib. - -DLLVM_ENABLE_LIBXML2=OFF - -DLLVM_ENABLE_ZLIB=OFF # Force TableGen to be built with optimization. This will significantly improve build time. -DLLVM_OPTIMIZED_TABLEGEN=ON "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}" diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 4590e5111dcd05..06ef3712bba345 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "llvm", - "version-string": "11.1.0", + "version-string": "12.0.0", "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "supports": "!uwp", @@ -42,9 +42,9 @@ "disable-assertions", "disable-clang-static-analyzer", "enable-bindings", - "enable-rtti", "enable-terminfo", - "enable-threads" + "enable-threads", + "enable-zlib" ] } ] @@ -122,6 +122,12 @@ "libffi" ] }, + "enable-libxml2": { + "description": "Build with LibXml2.", + "dependencies": [ + "libxml2" + ] + }, "enable-rtti": { "description": "Build LLVM with run-time type information." }, @@ -131,6 +137,12 @@ "enable-threads": { "description": "Use threads if available." }, + "enable-zlib": { + "description": "Build with ZLib.", + "dependencies": [ + "zlib" + ] + }, "flang": { "description": "Include Fortran front end.", "dependencies": [ diff --git a/ports/mesa/CONTROL b/ports/mesa/CONTROL deleted file mode 100644 index 8ad3e5474f40e4..00000000000000 --- a/ports/mesa/CONTROL +++ /dev/null @@ -1,32 +0,0 @@ -Source: mesa -Version: 20.2.2 -Port-Version: 1 -Homepage: https://www.mesa3d.org/ -Description: Mesa - The 3D Graphics Library -Build-Depends: zlib, zstd, tool-meson -Default-Features: default-features -Supports: !(windows&arm) - -Feature: default-features -Description: Platform dependent default features -Build-Depends: mesa[core,llvm](x64), mesa[core,opengl], mesa[core,gles1], mesa[core,gles2] - -Feature: llvm -Description: Build with llvmpipe -Build-Depends: llvm[core] - -Feature: gles1 -Description: Build support for OpenGL ES 1.x -Build-Depends: mesa[core] - -Feature: gles2 -Description: Build support for OpenGL ES 2.x and 3.x -Build-Depends: mesa[core] - -Feature: opengl -Description: Build support for OpenGL (all versions) -Build-Depends: mesa[core] - -Feature: egl -Description: Build support for EGL platform -Build-Depends: mesa[core] \ No newline at end of file diff --git a/ports/mesa/dual-osmesa-part2.patch b/ports/mesa/dual-osmesa-part2b.patch similarity index 100% rename from ports/mesa/dual-osmesa-part2.patch rename to ports/mesa/dual-osmesa-part2b.patch diff --git a/ports/mesa/dual-osmesa.patch b/ports/mesa/dual-osmesa.patch deleted file mode 100644 index 8acebe64b57d7b..00000000000000 --- a/ports/mesa/dual-osmesa.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/include/meson.build b/include/meson.build -index a64d9373a92..22c50eb5eb7 100644 ---- a/include/meson.build -+++ b/include/meson.build -@@ -89,7 +89,7 @@ if with_egl - ) - endif - --if with_osmesa != 'none' -+if with_osmesa != [] - install_headers('GL/osmesa.h', subdir : 'GL') - endif - -diff --git a/meson.build b/meson.build -index 898d025f066..d73818e7ce5 100644 ---- a/meson.build -+++ b/meson.build -@@ -444,7 +444,7 @@ if with_any_vk and (with_platform_x11 and not with_dri3) - error('Vulkan drivers require dri3 for X11 support') - endif - if with_dri -- if with_glx == 'disabled' and not with_egl and not with_gbm and with_osmesa != 'classic' -+ if with_glx == 'disabled' and not with_egl and not with_gbm and not with_osmesa.contains('classic') - error('building dri drivers require at least one windowing system or classic osmesa') - endif - endif -@@ -1508,8 +1508,8 @@ else - dep_unwind = null_dep - endif - --if with_osmesa != 'none' -- if with_osmesa == 'gallium' and not with_gallium_softpipe -+if with_osmesa != [] -+ if with_osmesa.contains('gallium') and not with_gallium_softpipe - error('OSMesa gallium requires gallium softpipe or llvmpipe.') - endif - if host_machine.system() == 'windows' -@@ -1710,10 +1710,10 @@ lines = ['', - with_gles2 ? 'yes' : 'no'), - ] - --if with_osmesa != 'none' -+if with_osmesa != [] - lines += '' - suffix = '' -- if with_osmesa == 'gallium' -+ if with_osmesa.contains('gallium') - suffix = '(Gallium)' - endif - lines += 'OSMesa: lib' + osmesa_lib_name + suffix -diff --git a/meson_options.txt b/meson_options.txt -index 626baf3d5c2..cb3dc3b383f 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -295,9 +295,9 @@ option( - ) - option( - 'osmesa', -- type : 'combo', -- value : 'none', -- choices : ['none', 'classic', 'gallium'], -+ type : 'array', -+ value : [], -+ choices : ['classic', 'gallium'], - description : 'Build OSmesa.' - ) - option( -diff --git a/src/mesa/meson.build b/src/mesa/meson.build -index fa5c54cc6fb..f7b223862fa 100644 ---- a/src/mesa/meson.build -+++ b/src/mesa/meson.build -@@ -744,7 +744,7 @@ libmesa_gallium = static_library( - ) - - subdir('drivers/dri') --if with_osmesa == 'classic' -+if with_osmesa.contains('classic') - subdir('drivers/osmesa') - endif - if with_glx == 'xlib' diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 9461dc2c598740..0409a61d825f91 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -1,14 +1,14 @@ # Build-Depends: From X Window PR: zstd, drm (!windows), elfutils (!windows), wayland (!windows), wayland-protocols (!windows), xdamage, xshmfence (!windows), x11, xcb, xfixes, xext, xxf86vm, xrandr, xv, xvmc (!windows), egl-registry, opengl-registry, tool-meson # Required LLVM modules: LLVM (modules: bitwriter, core, coroutines, engine, executionengine, instcombine, mcdisassembler, mcjit, scalaropts, transformutils) found: YES -#patches are from https://github.com/pal1000/mesa-dist-win/tree/master/patches -set(PATCHES dual-osmesa.patch - dual-osmesa-part2.patch - swravx512.patch - ) +# Patches are from https://github.com/pal1000/mesa-dist-win/tree/master/patches +set(PATCHES + # Fix swrAVX512 build + swravx512-post-static-link.patch +) vcpkg_check_linkage(ONLY_DYNAMIC_CRT) -IF(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) # some parts of this port can only build as a shared library. endif() @@ -16,10 +16,10 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa - REF df2977f871fc70ebd6be48c180d117189b5861b5 #v20.2.2 - SHA512 6c51d817fe265ea6405c4e8afbb516f30cf697d00cf39f162473ea8a59c202bcdfbfe4b6f7c4a6fd2d4e98eb4a1604cb5e0a02558338bf415e53fe5421cbfbbe - HEAD_REF master # branch name - PATCHES ${PATCHES} #patch name + REF mesa-21.1.2 + SHA512 746ef292dd93ddd23ab34e18e87196db63302defd99357f31ac24876003c75b32cfa8ed38d0292271cd9142a056f6a6549ffcd0f086d0c69c4ff83ac7195188c + HEAD_REF master + PATCHES ${PATCHES} ) vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) @@ -115,9 +115,7 @@ list(APPEND MESA_OPTIONS -Dvalgrind=disabled) list(APPEND MESA_OPTIONS -Dglvnd=false) list(APPEND MESA_OPTIONS -Dglx=disabled) list(APPEND MESA_OPTIONS -Dgbm=disabled) -#list(APPEND MESA_OPTIONS -Dosmesa=['gallium','classic']) # classic has compiler errors. -list(APPEND MESA_OPTIONS -Dosmesa=['gallium']) - +list(APPEND MESA_OPTIONS -Dosmesa=true) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND MESA_OPTIONS -Dshared-swr=false) @@ -160,9 +158,9 @@ endif() list(APPEND MESA_OPTIONS -Dshared-glapi=enabled) #shared GLAPI required when building two or more of the following APIs - opengl, gles1 gles2 - if(VCPKG_TARGET_IS_WINDOWS) list(APPEND MESA_OPTIONS -Dplatforms=['windows']) + list(APPEND MESA_OPTIONS -Dmicrosoft-clc=disabled) endif() vcpkg_configure_meson( diff --git a/ports/mesa/swravx512.patch b/ports/mesa/swravx512-post-static-link.patch similarity index 87% rename from ports/mesa/swravx512.patch rename to ports/mesa/swravx512-post-static-link.patch index c1085252f1b2df..ac88d9bd738c58 100644 --- a/ports/mesa/swravx512.patch +++ b/ports/mesa/swravx512-post-static-link.patch @@ -1,17 +1,8 @@ diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build -index 2fad60365a3..dce7f656d64 100644 +index 11ea7d3f43e..f34e88b1eec 100644 --- a/src/gallium/drivers/swr/meson.build +++ b/src/gallium/drivers/swr/meson.build -@@ -249,7 +249,7 @@ endif - - if with_swr_arches.contains('knl') - swr_knl_args = cpp.first_supported_argument( -- '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', -+ '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', '/arch:AVX512', - ) - if swr_knl_args == [] - error('Cannot find KNL support for swr.') -@@ -274,7 +274,7 @@ endif +@@ -213,7 +213,7 @@ endif if with_swr_arches.contains('skx') swr_skx_args = cpp.first_supported_argument( @@ -20,3 +11,12 @@ index 2fad60365a3..dce7f656d64 100644 ) if swr_skx_args == [] error('Cannot find SKX support for swr.') +@@ -252,7 +252,7 @@ endif + + if with_swr_arches.contains('knl') + swr_knl_args = cpp.first_supported_argument( +- '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', ++ '-march=knl', '-target-cpu=mic-knl', '-xMIC-AVX512', '/arch:AVX512', + ) + if swr_knl_args == [] + error('Cannot find KNL support for swr.') diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json new file mode 100644 index 00000000000000..60db1d7a724c59 --- /dev/null +++ b/ports/mesa/vcpkg.json @@ -0,0 +1,99 @@ +{ + "name": "mesa", + "version": "21.1.2", + "description": "Mesa - The 3D Graphics Library", + "homepage": "https://www.mesa3d.org/", + "supports": "!(windows & arm)", + "dependencies": [ + "tool-meson", + "zlib", + "zstd" + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Platform dependent default features", + "dependencies": [ + { + "name": "mesa", + "default-features": false, + "features": [ + "gles1" + ] + }, + { + "name": "mesa", + "default-features": false, + "features": [ + "gles2" + ] + }, + { + "name": "mesa", + "default-features": false, + "features": [ + "opengl" + ] + }, + { + "name": "mesa", + "default-features": false, + "features": [ + "llvm" + ], + "platform": "x64" + } + ] + }, + "egl": { + "description": "Build support for EGL platform", + "dependencies": [ + { + "name": "mesa", + "default-features": false + } + ] + }, + "gles1": { + "description": "Build support for OpenGL ES 1.x", + "dependencies": [ + { + "name": "mesa", + "default-features": false + } + ] + }, + "gles2": { + "description": "Build support for OpenGL ES 2.x and 3.x", + "dependencies": [ + { + "name": "mesa", + "default-features": false + } + ] + }, + "llvm": { + "description": "Build with llvmpipe", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "libclc" + ] + } + ] + }, + "opengl": { + "description": "Build support for OpenGL (all versions)", + "dependencies": [ + { + "name": "mesa", + "default-features": false + } + ] + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c3e40ad2045ca2..dbf417741b856d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -826,8 +826,8 @@ live555:x64-windows-static-md=fail live555:x86-windows=fail llgl:arm-uwp=fail llgl:x64-uwp=fail -llvm:arm-uwp=fail llvm:arm64-windows=fail +llvm:arm-uwp=fail llvm:x64-uwp=fail lmdb:arm-uwp=fail lmdb:x64-uwp=fail @@ -894,6 +894,7 @@ memorymodule:x64-osx=fail memorymodule:x64-uwp=fail # Due to static crt. mesa:x64-windows-static=fail +mesa:x64-windows-static-md=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index 21ac7f47908371..b68835a3db7a49 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2457,7 +2457,7 @@ "port-version": 0 }, "halide": { - "baseline": "11.0.1", + "baseline": "12.0.1", "port-version": 0 }, "happly": { @@ -3781,7 +3781,7 @@ "port-version": 1 }, "llvm": { - "baseline": "11.1.0", + "baseline": "12.0.0", "port-version": 0 }, "lmdb": { @@ -3965,8 +3965,8 @@ "port-version": 0 }, "mesa": { - "baseline": "20.2.2", - "port-version": 1 + "baseline": "21.1.2", + "port-version": 0 }, "meschach": { "baseline": "1.2b-3", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index ba54cd36986d1d..9d1bf20db20a67 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50e2c4835a57bb4a172c4b82b2a0e0a3077088ab", + "version": "12.0.1", + "port-version": 0 + }, { "git-tree": "eea72c77e90fcc209eafe9906f8b035ec64af984", "version-string": "11.0.1", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index fb9e68ce977683..843314d7c9c96e 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6597ffba14111050d8e68af4852ea5766c81a78c", + "version-string": "12.0.0", + "port-version": 0 + }, { "git-tree": "7b30e5aa5227b4af185b967afbe34e84cf8c7638", "version-string": "11.1.0", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index b28bb72de859e0..aeb14f4b6cb1fd 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58f52d4a0724c6d4d393b48e232ca323d8670df6", + "version": "21.1.2", + "port-version": 0 + }, { "git-tree": "2966b4bb6816c1fa46e65c61f4cb30efb5c8381a", "version-string": "20.2.2", From 7bd415a938cfecc41ece3a436ce4258326f8cbc2 Mon Sep 17 00:00:00 2001 From: Billy Robert ONeal III Date: Wed, 30 Jun 2021 00:51:32 -0700 Subject: [PATCH 063/141] [vcpkg internal] Update compiler test scripts to use asset caching. --- scripts/azure-pipelines/windows-unstable/job.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/azure-pipelines/windows-unstable/job.yml b/scripts/azure-pipelines/windows-unstable/job.yml index d440ef7fa82189..93690e957df794 100644 --- a/scripts/azure-pipelines/windows-unstable/job.yml +++ b/scripts/azure-pipelines/windows-unstable/job.yml @@ -14,6 +14,9 @@ jobs: value: D:\ - name: VCPKG_DOWNLOADS value: D:\downloads + - group: vcpkg-asset-caching-credentials + - name: X_VCPKG_ASSET_SOURCES + value: "x-azurl,$(root-url),$(sas),readwrite" steps: - task: DownloadBuildArtifacts@0 From 223f351fd8f5ccafcc798b9db55a54ff3edd1f6f Mon Sep 17 00:00:00 2001 From: evpobr Date: Thu, 1 Jul 2021 01:06:48 +0500 Subject: [PATCH 064/141] [mpg123] Upgrade to 1.28.0 (#18403) * [mpg123] Upgrade to 1.28.0 * [libopenmpt] Upgrade to 2017-01-28-cf2390140-2 * [mpg123] Disable UWP port * Fix libmpg123 UWP build * Fix libout123 UWP build * Fix libsyn123 UWP build * Update ports/libopenmpt/CMakeLists.txt Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/libopenmpt/CMakeLists.txt Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libopenmpt] Update libopenmpt.json * [mpg123] Separate UWP patches Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/libopenmpt/CMakeLists.txt | 46 +-- ports/libopenmpt/vcpkg.json | 2 +- ports/mpg123/0001-fix-checkcpuarch-path.patch | 13 + ports/mpg123/0001-fix-x86-build.patch | 37 --- .../mpg123/0002-fix-libmpg123-uwp-build.patch | 21 ++ .../mpg123/0003-fix-libout123-uwp-build.patch | 266 ++++++++++++++++++ .../mpg123/0004-fix-libsyn123-uwp-build.patch | 52 ++++ ports/mpg123/portfile.cmake | 88 ++---- ports/mpg123/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/l-/libopenmpt.json | 5 + versions/m-/mpg123.json | 5 + 12 files changed, 401 insertions(+), 140 deletions(-) create mode 100644 ports/mpg123/0001-fix-checkcpuarch-path.patch delete mode 100644 ports/mpg123/0001-fix-x86-build.patch create mode 100644 ports/mpg123/0002-fix-libmpg123-uwp-build.patch create mode 100644 ports/mpg123/0003-fix-libout123-uwp-build.patch create mode 100644 ports/mpg123/0004-fix-libsyn123-uwp-build.patch diff --git a/ports/libopenmpt/CMakeLists.txt b/ports/libopenmpt/CMakeLists.txt index e1aa118e4fb79b..6f4ad1b57627a4 100644 --- a/ports/libopenmpt/CMakeLists.txt +++ b/ports/libopenmpt/CMakeLists.txt @@ -11,21 +11,11 @@ endif() find_package(ZLIB REQUIRED) -find_path(MPG123_INCLUDE_DIR NAMES mpg123.h) -find_library(MPG123_LIBRARY NAMES mpg123 libmpg123) +find_package(MPG123 REQUIRED) +find_package(Vorbis REQUIRED) +find_package(FLAC REQUIRED) -find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h) -find_path(OGG_INCLUDE_DIR ogg/ogg.h) - -find_library(OGG_LIBRARY NAMES ogg) -find_library(VORBIS_LIBRARY NAMES vorbis) -find_library(VORBISFILE_LIBRARY NAMES vorbisfile) - -find_path(FLAC_INCLUDE_DIR FLAC/all.h) -find_library(FLAC_LIBRARY NAMES FLAC flac) - -find_path(PORTAUDIO_INCLUDE_DIR NAMES portaudio.h) -find_library(PORTAUDIO_LIBRARY NAMES portaudio) +find_package(portaudio REQUIRED) set( lib_headers @@ -52,11 +42,6 @@ include_directories( sounddsp soundlib openmpt123 - ${MPG123_INCLUDE_DIR} - ${VORBIS_INCLUDE_DIR} - ${OGG_INCLUDE_DIR} - ${FLAC_INCLUDE_DIR} - ${PORTAUDIO_INCLUDE_DIR} ) set( @@ -242,28 +227,27 @@ endif() target_link_libraries( libopenmpt PRIVATE - ${OGG_LIBRARY} - ${MPG123_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBIS_LIBRARY} - ${VORBISFILE_LIBRARY} + MPG123::libmpg123 + Vorbis::vorbisfile + FLAC::FLAC ZLIB::ZLIB ) +if(BUILD_SHARED_LIBS) + set(PORTAUDIO_TARGET portaudio) +else() + set(PORTAUDIO_TARGET portaudio_static) +endif() + target_link_libraries( openmpt123 PRIVATE libopenmpt - ${OGG_LIBRARY} - ${MPG123_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBIS_LIBRARY} - ${VORBISFILE_LIBRARY} - ${FLAC_LIBRARY} - ${PORTAUDIO_LIBRARY} Winmm ZLIB::ZLIB + ${PORTAUDIO_TARGET} ) + install( TARGETS libopenmpt RUNTIME DESTINATION bin diff --git a/ports/libopenmpt/vcpkg.json b/ports/libopenmpt/vcpkg.json index 18c3bf100a1ca0..3668ed848b6a70 100644 --- a/ports/libopenmpt/vcpkg.json +++ b/ports/libopenmpt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libopenmpt", "version-string": "2017-01-28-cf2390140", - "port-version": 1, + "port-version": 2, "description": "a library to render tracker music", "homepage": "https://github.com/OpenMPT/openmpt", "supports": "!uwp", diff --git a/ports/mpg123/0001-fix-checkcpuarch-path.patch b/ports/mpg123/0001-fix-checkcpuarch-path.patch new file mode 100644 index 00000000000000..d6d3bc4771e05e --- /dev/null +++ b/ports/mpg123/0001-fix-checkcpuarch-path.patch @@ -0,0 +1,13 @@ +diff --git a/ports/cmake/cmake/CheckCPUArch.cmake b/ports/cmake/cmake/CheckCPUArch.cmake +index 84dab8a..925aa09 100644 +--- a/ports/cmake/cmake/CheckCPUArch.cmake ++++ b/ports/cmake/cmake/CheckCPUArch.cmake +@@ -2,7 +2,7 @@ macro(_CHECK_CPU_ARCH ARCH ARCH_DEFINES VARIABLE) + if(NOT DEFINED HAVE_${VARIABLE}) + message(STATUS "Check CPU architecture is ${ARCH}") + set(CHECK_CPU_ARCH_DEFINES ${ARCH_DEFINES}) +- configure_file(${PROJECT_SOURCE_DIR}/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY) ++ configure_file(${PROJECT_SOURCE_DIR}/cmake/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY) + try_compile(HAVE_${VARIABLE} "${PROJECT_BINARY_DIR}" + "${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c") + if(HAVE_${VARIABLE}) diff --git a/ports/mpg123/0001-fix-x86-build.patch b/ports/mpg123/0001-fix-x86-build.patch deleted file mode 100644 index 9c098c67926984..00000000000000 --- a/ports/mpg123/0001-fix-x86-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/libmpg123/mangle.h b/src/libmpg123/mangle.h -index e37386a..b474e7f 100644 ---- a/src/libmpg123/mangle.h -+++ b/src/libmpg123/mangle.h -@@ -85,6 +85,10 @@ - #define ASM_VALUE(a) MANGLE_MACROCAT($,a) - #endif - -+#if defined(_WIN32) && !defined(_WIN64) -+#define OPT_X86 -+#endif -+ - /* Enable position-independent code for certain platforms. */ - - #if defined(OPT_X86) -@@ -130,7 +134,7 @@ Lpic_base: \ - /* Dummies for everyone else. */ - #define LOCAL_VAR(a) a - #define GLOBAL_VAR ASM_NAME --#define GLOBAL_VAR_PTR(a) .err Cannot use indirect addressing in non-PIC object. -+#define GLOBAL_VAR_PTR(a) // #error Cannot use indirect addressing in non-PIC object. - #define FUNC ASM_NAME - #define EXTERNAL_FUNC ASM_NAME - #define GET_GOT -diff --git a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -index f2bc362..07e81cd 100644 ---- a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -+++ b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -@@ -1194,7 +1194,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - - - -- Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) -+ Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) - $(IntDir);%(AdditionalLibraryDirectories) - true - diff --git a/ports/mpg123/0002-fix-libmpg123-uwp-build.patch b/ports/mpg123/0002-fix-libmpg123-uwp-build.patch new file mode 100644 index 00000000000000..ab37d023862426 --- /dev/null +++ b/ports/mpg123/0002-fix-libmpg123-uwp-build.patch @@ -0,0 +1,21 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index b843152..b8ff89b 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -39,8 +39,6 @@ check_include_file("termios.h" HAVE_TERMIOS) + check_include_file("unistd.h" HAVE_UNISTD_H) + check_include_file("windows.h" HAVE_WINDOWS_H) + +-check_symbol_exists(strerror "string.h" HAVE_STRERROR) +- + function(check_m) + set(CMAKE_REQUIRED_LIBRARIES m) + check_function_exists(sin HAVE_M) +@@ -59,6 +57,7 @@ check_function_exists(shmget HAVE_SHMGET) + check_function_exists(shmat HAVE_SHMAT) + check_function_exists(shmdt HAVE_SHMDT) + check_function_exists(shmctl HAVE_SHMCTL) ++check_function_exists(strerror HAVE_STRERROR) + + search_libs(gethostbyname GETHOSTBYNAME_LIB nsl socket network) + search_libs(socket SOCKET_LIB socket) diff --git a/ports/mpg123/0003-fix-libout123-uwp-build.patch b/ports/mpg123/0003-fix-libout123-uwp-build.patch new file mode 100644 index 00000000000000..2302c4283d276f --- /dev/null +++ b/ports/mpg123/0003-fix-libout123-uwp-build.patch @@ -0,0 +1,266 @@ +diff --git a/ports/cmake/CMakeLists.txt b/ports/cmake/CMakeLists.txt +index b5008da..8e6309a 100644 +--- a/ports/cmake/CMakeLists.txt ++++ b/ports/cmake/CMakeLists.txt +@@ -5,6 +5,13 @@ read_api_version(MPG123_VERSION API_VERSION OUTAPI_VERSION SYNAPI_VERSION) + + project(mpg123 VERSION ${MPG123_VERSION} LANGUAGES C ASM) + ++option(BUILD_LIBOUT123 "build libout123" ON) ++if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ message(WARNING "Output module is not implemented for '${CMAKE_SYSTEM_NAME}' platform.") ++ message(WARNING "To prevent build errors 'BUILD_LIBOUT123' option is set to OFF.") ++ set(BUILD_LIBOUT123 OFF) ++endif() ++ + include(cmake/search_libs.cmake) + include(CMakePackageConfigHelpers) + include(GNUInstallDirs) +@@ -34,17 +41,28 @@ set(exec_prefix "${CMAKE_INSTALL_PREFIX}") + set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") + set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libmpg123.pc.in" libmpg123.pc @ONLY) +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libout123.pc.in" libout123.pc @ONLY) ++if(BUILD_LIBOUT123) ++ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libout123.pc.in" libout123.pc @ONLY) ++endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libsyn123.pc.in" libsyn123.pc @ONLY) + + install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/libmpg123.pc" +- "${CMAKE_CURRENT_BINARY_DIR}/libout123.pc" + "${CMAKE_CURRENT_BINARY_DIR}/libsyn123.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + install( + FILES + "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/mpg123.1" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/out123.1" + DESTINATION "${CMAKE_INSTALL_MANDIR}") ++ ++if(BUILD_LIBOUT123) ++ install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/libout123.pc" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ++ install( ++ FILES ++ "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/out123.1" ++ DESTINATION "${CMAKE_INSTALL_MANDIR}") ++endif() +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index b843152..3945c7e 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -194,112 +194,114 @@ endif() + + # Modules + +-if(CHECK_MODULES) +- list(FIND CHECK_MODULES alsa ALSA_REQUIRED) +- list(FIND CHECK_MODULES coreaudio COREAUDIO_REQUIRED) +- list(FIND CHECK_MODULES pulse PULSE_REQUIRED) +- list(FIND CHECK_MODULES jack JACK_REQUIRED) +- list(FIND CHECK_MODULES tinyalsa TINYALSA_REQUIRED) +- list(FIND CHECK_MODULES win32 WIN32_REQUIRED) +- list(FIND CHECK_MODULES win32_wasapi WIN32_WASAPI_REQUIRED) +- set(MODULE_NOT_FOUND_MESSAGE "module required but couldn't be found") +-endif() +- +-if(NOT CHECK_MODULES OR NOT ALSA_REQUIRED EQUAL -1) +- find_package(ALSA) +- if(TARGET ALSA::ALSA) +- list(APPEND OUTPUT_MODULES alsa) +- elseif(CHECK_MODULES AND NOT ALSA_REQUIRED EQUAL -1) +- message(FATAL_ERROR "alsa ${MODULE_NOT_FOUND_MESSAGE}") ++if(BUILD_LIBOUT123) ++ if(CHECK_MODULES) ++ list(FIND CHECK_MODULES alsa ALSA_REQUIRED) ++ list(FIND CHECK_MODULES coreaudio COREAUDIO_REQUIRED) ++ list(FIND CHECK_MODULES pulse PULSE_REQUIRED) ++ list(FIND CHECK_MODULES jack JACK_REQUIRED) ++ list(FIND CHECK_MODULES tinyalsa TINYALSA_REQUIRED) ++ list(FIND CHECK_MODULES win32 WIN32_REQUIRED) ++ list(FIND CHECK_MODULES win32_wasapi WIN32_WASAPI_REQUIRED) ++ set(MODULE_NOT_FOUND_MESSAGE "module required but couldn't be found") + endif() +-endif() + +-if(NOT CHECK_MODULES OR NOT COREAUDIO_REQUIRED EQUAL -1) +- if(APPLE) +- find_library(AUDIO_TOOLBOX AudioToolbox) +- list(APPEND OUTPUT_MODULES coreaudio) +- elseif(CHECK_MODULES AND NOT COREAUDIO_REQUIRED EQUAL -1) +- message(FATAL_ERROR "coreaudio ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT ALSA_REQUIRED EQUAL -1) ++ find_package(ALSA) ++ if(TARGET ALSA::ALSA) ++ list(APPEND OUTPUT_MODULES alsa) ++ elseif(CHECK_MODULES AND NOT ALSA_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "alsa ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() +-endif() + +-find_package(PkgConfig) +-if(PKG_CONFIG_FOUND) +- if(NOT CHECK_MODULES OR NOT PULSE_REQUIRED EQUAL -1) +- pkg_search_module(PULSE libpulse-simple) +- if(PULSE_FOUND) +- list(APPEND OUTPUT_MODULES pulse) +- elseif(CHECK_MODULES AND NOT PULSE_REQUIRED EQUAL -1) +- message(FATAL_ERROR "pulse ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT COREAUDIO_REQUIRED EQUAL -1) ++ if(APPLE) ++ find_library(AUDIO_TOOLBOX AudioToolbox) ++ list(APPEND OUTPUT_MODULES coreaudio) ++ elseif(CHECK_MODULES AND NOT COREAUDIO_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "coreaudio ${MODULE_NOT_FOUND_MESSAGE}") + endif() + endif() + +- if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1) +- pkg_search_module(JACK jack) +- if(JACK_FOUND) +- list(APPEND OUTPUT_MODULES jack) +- elseif(CHECK_MODULES AND NOT JACK_REQUIRED EQUAL -1) +- message(FATAL_ERROR "jack ${MODULE_NOT_FOUND_MESSAGE}") ++ find_package(PkgConfig) ++ if(PKG_CONFIG_FOUND) ++ if(NOT CHECK_MODULES OR NOT PULSE_REQUIRED EQUAL -1) ++ pkg_search_module(PULSE libpulse-simple) ++ if(PULSE_FOUND) ++ list(APPEND OUTPUT_MODULES pulse) ++ elseif(CHECK_MODULES AND NOT PULSE_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "pulse ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() ++ endif() ++ ++ if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1) ++ pkg_search_module(JACK jack) ++ if(JACK_FOUND) ++ list(APPEND OUTPUT_MODULES jack) ++ elseif(CHECK_MODULES AND NOT JACK_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "jack ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() +- endif() + +- if(NOT CHECK_MODULES OR NOT TINYALSA_REQUIRED EQUAL -1) +- pkg_search_module(TINYALSA tinyalsa) +- if(TINYALSA_FOUND) +- list(APPEND OUTPUT_MODULES tinyalsa) +- elseif(CHECK_MODULES AND NOT TINYALSA_REQUIRED EQUAL -1) +- message(FATAL_ERROR "tinyalsa ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT TINYALSA_REQUIRED EQUAL -1) ++ pkg_search_module(TINYALSA tinyalsa) ++ if(TINYALSA_FOUND) ++ list(APPEND OUTPUT_MODULES tinyalsa) ++ elseif(CHECK_MODULES AND NOT TINYALSA_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "tinyalsa ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() + endif() +-endif() + +-if(NOT CHECK_MODULES OR NOT WIN32_REQUIRED EQUAL -1) +- if(HAVE_WINDOWS_H) +- set(WIN32_LIBRARIES winmm) +- list(APPEND OUTPUT_MODULES win32) +- elseif(CHECK_MODULES AND NOT WIN32_REQUIRED EQUAL -1) +- message(FATAL_ERROR "win32 ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT WIN32_REQUIRED EQUAL -1) ++ if(HAVE_WINDOWS_H) ++ set(WIN32_LIBRARIES winmm) ++ list(APPEND OUTPUT_MODULES win32) ++ elseif(CHECK_MODULES AND NOT WIN32_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "win32 ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() +-endif() + +-if(NOT CHECK_MODULES OR NOT WIN32_WASAPI_REQUIRED EQUAL -1) +- set(WASAPI_INCLUDES "initguid.h" "audioclient.h" "mmdeviceapi.h" "avrt.h") +- check_include_files("${WASAPI_INCLUDES}" HAVE_WASAPI) +- if(HAVE_WASAPI) +- set(WIN32_WASAPI_LIBRARIES ole32 avrt) +- list(APPEND OUTPUT_MODULES win32_wasapi) +- elseif(CHECK_MODULES AND NOT WIN32_WASAPI_REQUIRED EQUAL -1) +- message(FATAL_ERROR "win32_wasapi ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT WIN32_WASAPI_REQUIRED EQUAL -1) ++ set(WASAPI_INCLUDES "initguid.h" "audioclient.h" "mmdeviceapi.h" "avrt.h") ++ check_include_files("${WASAPI_INCLUDES}" HAVE_WASAPI) ++ if(HAVE_WASAPI) ++ set(WIN32_WASAPI_LIBRARIES ole32 avrt) ++ list(APPEND OUTPUT_MODULES win32_wasapi) ++ elseif(CHECK_MODULES AND NOT WIN32_WASAPI_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "win32_wasapi ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() +-endif() + +-if(CHECK_MODULES) +- list(REMOVE_AT CHECK_MODULES +- ${ALSA_REQUIRED} +- ${COREAUDIO_REQUIRED} +- ${PULSE_REQUIRED} +- ${JACK_REQUIRED} +- ${TINYALSA_REQUIRED} +- ${WIN32_REQUIRED} +- ${WIN32_WASAPI_REQUIRED}) +- list(LENGTH CHECK_MODULES CHECK_MODULES_LENGTH) +- if(NOT CHECK_MODULES_LENGTH EQUAL 0) +- message(FATAL_ERROR "Dunno how to find modules: ${CHECK_MODULES}") ++ if(CHECK_MODULES) ++ list(REMOVE_AT CHECK_MODULES ++ ${ALSA_REQUIRED} ++ ${COREAUDIO_REQUIRED} ++ ${PULSE_REQUIRED} ++ ${JACK_REQUIRED} ++ ${TINYALSA_REQUIRED} ++ ${WIN32_REQUIRED} ++ ${WIN32_WASAPI_REQUIRED}) ++ list(LENGTH CHECK_MODULES CHECK_MODULES_LENGTH) ++ if(NOT CHECK_MODULES_LENGTH EQUAL 0) ++ message(FATAL_ERROR "Dunno how to find modules: ${CHECK_MODULES}") ++ endif() + endif() +-endif() + +-if(NOT OUTPUT_MODULES) +- set(DEFAULT_OUTPUT_MODULE dummy) +- set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE}) +-else() +- list(GET OUTPUT_MODULES 0 _DEFAULT_OUTPUT_MODULE) +- set(DEFAULT_OUTPUT_MODULE ${_DEFAULT_OUTPUT_MODULE} CACHE STRING "Default output module") +- if(BUILD_SHARED_LIBS) +- string(REPLACE ";" "," DEFAULT_OUTPUT_MODULES "${OUTPUT_MODULES}") +- else() ++ if(NOT OUTPUT_MODULES) ++ set(DEFAULT_OUTPUT_MODULE dummy) + set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE}) ++ else() ++ list(GET OUTPUT_MODULES 0 _DEFAULT_OUTPUT_MODULE) ++ set(DEFAULT_OUTPUT_MODULE ${_DEFAULT_OUTPUT_MODULE} CACHE STRING "Default output module") ++ if(BUILD_SHARED_LIBS) ++ string(REPLACE ";" "," DEFAULT_OUTPUT_MODULES "${OUTPUT_MODULES}") ++ else() ++ set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE}) ++ endif() ++ set_property(CACHE DEFAULT_OUTPUT_MODULE PROPERTY STRINGS ${OUTPUT_MODULES}) + endif() +- set_property(CACHE DEFAULT_OUTPUT_MODULE PROPERTY STRINGS ${OUTPUT_MODULES}) + endif() + + option(ACCURATE_ROUNDING "use rounding instead of fast truncation for integer output, where possible" ON) +@@ -362,7 +364,9 @@ add_compile_options( + + add_subdirectory("compat") + add_subdirectory("libmpg123") +-add_subdirectory("libout123") ++if(BUILD_LIBOUT123) ++ add_subdirectory("libout123") ++endif() + add_subdirectory("libsyn123") + + if(UNIX) diff --git a/ports/mpg123/0004-fix-libsyn123-uwp-build.patch b/ports/mpg123/0004-fix-libsyn123-uwp-build.patch new file mode 100644 index 00000000000000..803296dedeb491 --- /dev/null +++ b/ports/mpg123/0004-fix-libsyn123-uwp-build.patch @@ -0,0 +1,52 @@ +diff --git a/src/libmpg123/sample.h b/src/libmpg123/sample.h +index 4d244fe..ed3ef86 100644 +--- a/src/libmpg123/sample.h ++++ b/src/libmpg123/sample.h +@@ -171,7 +171,7 @@ static inline int16_t ftoi16(float x) + ( (u >= 2147483648UL) \ + ? (int32_t)((uint32_t)u - (uint32_t)2147483648UL) \ + : ((u == 0) \ +- ? (int32_t)-2147483648UL \ ++ ? -(int32_t)2147483648UL \ + : -(int32_t)((uint32_t)2147483648UL - u) ) \ + ) + +diff --git a/src/libsyn123/resample.c b/src/libsyn123/resample.c +index b92f7f2..3552ffa 100644 +--- a/src/libsyn123/resample.c ++++ b/src/libsyn123/resample.c +@@ -2005,7 +2005,7 @@ syn123_resample_intotal_64(long inrate, long outrate, int64_t outs) + // First offset is -inrate. + // You may want to work it out for yourself. Or trust me;-) + int err; +- uint64_t vtot = muloffdiv64(outs, vinrate, -vinrate, voutrate, &err, NULL); ++ uint64_t vtot = muloffdiv64(outs, vinrate, -(int64_t)vinrate, voutrate, &err, NULL); + if(err) + return SYN123_OVERFLOW; + if(vtot == UINT64_MAX) +diff --git a/src/libsyn123/sampleconv.c b/src/libsyn123/sampleconv.c +index 6e8fb3f..7179957 100644 +--- a/src/libsyn123/sampleconv.c ++++ b/src/libsyn123/sampleconv.c +@@ -21,6 +21,8 @@ + #include "syn123_int.h" + #include "sample.h" + #include "debug.h" ++// Avoid conflict with pragmas in isnan() and friends. ++#undef warning + + /* Conversions between native byte order encodings. */ + +diff --git a/src/libsyn123/volume.c b/src/libsyn123/volume.c +index de018a2..a80851d 100644 +--- a/src/libsyn123/volume.c ++++ b/src/libsyn123/volume.c +@@ -12,6 +12,8 @@ + #define NO_SMAX + #include "syn123_int.h" + #include "debug.h" ++// Avoid conflict with pragmas in isnan() and friends. ++#undef warning + + static const double db_min = -SYN123_DB_LIMIT; + static const double db_max = SYN123_DB_LIMIT; diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index eea5769e1575c8..dd12ddc0d595e5 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -1,26 +1,13 @@ -set(MPG123_VERSION 1.26.5) -set(MPG123_HASH 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a) +set(MPG123_VERSION 1.28.0) +set(MPG123_HASH 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77) -#architecture detection -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(MPG123_ARCH Win32) - set(MPG123_CONFIGURATION _x86) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(MPG123_ARCH x64) - set(MPG123_CONFIGURATION _x86) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(MPG123_ARCH ARM) - set(MPG123_CONFIGURATION _Generic) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(MPG123_ARCH ARM64) - set(MPG123_CONFIGURATION _Generic) -else() - message(FATAL_ERROR "unsupported architecture") -endif() - -#linking -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(MPG123_CONFIGURATION_SUFFIX _Dll) +set(PATCHES "") +if(VCPKG_TARGET_IS_UWP) + set(PATCHES + 0002-fix-libmpg123-uwp-build.patch + 0003-fix-libout123-uwp-build.patch + 0004-fix-libsyn123-uwp-build.patch + ) endif() vcpkg_from_sourceforge( @@ -30,60 +17,25 @@ vcpkg_from_sourceforge( FILENAME "mpg123-${MPG123_VERSION}.tar.bz2" SHA512 ${MPG123_HASH} PATCHES - 0001-fix-x86-build.patch + 0001-fix-checkcpuarch-path.patch + ${PATCHES} ) include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) yasm_tool_helper(APPEND_TO_PATH) -macro(read_api_version) - file(READ "${SOURCE_PATH}/configure.ac" configure_ac) - string(REGEX MATCH "API_VERSION=([0-9]+)" result ${configure_ac}) - set(API_VERSION ${CMAKE_MATCH_1}) -endmacro() - -if(VCPKG_TARGET_IS_UWP) - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH ports/MSVC++/2015/uwp/libmpg123/libmpg123.vcxproj - OPTIONS /p:UseEnv=True - PLATFORM ${MPG123_ARCH} - RELEASE_CONFIGURATION Release_uwp - DEBUG_CONFIGURATION Debug_uwp - ) - - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/mpg123.h - ${SOURCE_PATH}/src/libmpg123/fmt123.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include - ) +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - read_api_version() - configure_file( - ${SOURCE_PATH}/src/libmpg123/mpg123.h.in - ${CURRENT_PACKAGES_DIR}/include/mpg123.h.in @ONLY - ) - -elseif(VCPKG_TARGET_IS_WINDOWS) - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj - OPTIONS /p:UseEnv=True - RELEASE_CONFIGURATION Release${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} - DEBUG_CONFIGURATION Debug${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} - ) - - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/mpg123.h - ${SOURCE_PATH}/src/libmpg123/fmt123.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/ports/cmake + OPTIONS -DUSE_MODULES=OFF ) + vcpkg_install_cmake() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + vcpkg_fixup_pkgconfig() - read_api_version() - configure_file( - ${SOURCE_PATH}/src/libmpg123/mpg123.h.in - ${CURRENT_PACKAGES_DIR}/include/mpg123.h.in @ONLY - ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") elseif(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) set(MPG123_OPTIONS diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index 1661997476cdd7..e699f891557b0e 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mpg123", - "version": "1.26.5", + "version": "1.28.0", "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/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b68835a3db7a49..2cb30c68f1a5ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3410,7 +3410,7 @@ }, "libopenmpt": { "baseline": "2017-01-28-cf2390140", - "port-version": 1 + "port-version": 2 }, "libopusenc": { "baseline": "0.2.1", @@ -4141,7 +4141,7 @@ "port-version": 0 }, "mpg123": { - "baseline": "1.26.5", + "baseline": "1.28.0", "port-version": 0 }, "mpi": { diff --git a/versions/l-/libopenmpt.json b/versions/l-/libopenmpt.json index d97f5018173262..30e4512e13ead9 100644 --- a/versions/l-/libopenmpt.json +++ b/versions/l-/libopenmpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "465b2d6e597952e0ef962af05dce08769dba11e7", + "version-string": "2017-01-28-cf2390140", + "port-version": 2 + }, { "git-tree": "a6579258d2dab9e661a439e241ff20f2427b918e", "version-string": "2017-01-28-cf2390140", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 60740511bea295..098759f80d31ab 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b34c661c7e28355ade113c330d1c3b93a77a4e13", + "version": "1.28.0", + "port-version": 0 + }, { "git-tree": "6e185d93bd44a85eda8d650c24df2f96da710d56", "version": "1.26.5", From 2de6d81a5a7a50b65d72d346cbcb37e6f3895fcb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 30 Jun 2021 22:12:06 +0200 Subject: [PATCH 065/141] [vcpkg_configure_make] Fix mingw (cross) build issues (#18554) * Set ENV{WINDRES} for mingw * Fix passing of '${prefix}' for mingw cross builds --- scripts/cmake/vcpkg_configure_make.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 86b42a17348703..d1b87d454a0848 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -385,6 +385,8 @@ function(vcpkg_configure_make) _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}") _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") _vcpkg_append_to_configure_environment(CONFIGURE_ENV CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + _vcpkg_append_to_configure_environment(CONFIGURE_ENV RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + _vcpkg_append_to_configure_environment(CONFIGURE_ENV WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") if(VCPKG_DETECTED_CMAKE_AR) _vcpkg_append_to_configure_environment(CONFIGURE_ENV AR "${VCPKG_DETECTED_CMAKE_AR}") else() @@ -791,8 +793,10 @@ function(vcpkg_configure_make) unset(_link_path) unset(_lib_env_vars) - if(VCPKG_TARGET_IS_WINDOWS) + if(CMAKE_HOST_WIN32) set(command "${base_cmd}" -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}") + elseif(VCPKG_TARGET_IS_WINDOWS) + set(command "${base_cmd}" -c "${CONFIGURE_ENV} $@" -- "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) else() set(command "${base_cmd}" "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) endif() From 29e6b9e3e0b1e2e7396d20729cc737dd0226a7b3 Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Thu, 1 Jul 2021 04:16:16 +0800 Subject: [PATCH 066/141] [vcpkg] Add static triplet for arm-windows (#18300) --- triplets/community/arm-windows-static.cmake | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 triplets/community/arm-windows-static.cmake diff --git a/triplets/community/arm-windows-static.cmake b/triplets/community/arm-windows-static.cmake new file mode 100644 index 00000000000000..9ba5feed79f78d --- /dev/null +++ b/triplets/community/arm-windows-static.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) From e007046a428bbf86ef0c001c5a2a21ee83e2e637 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 30 Jun 2021 22:16:51 +0200 Subject: [PATCH 067/141] [scripts] Add vcpkg_completions.zsh (#18274) * Add vcpkg_completions.zsh * Update scripts/vcpkg_completion.zsh --- scripts/vcpkg_completion.zsh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 scripts/vcpkg_completion.zsh diff --git a/scripts/vcpkg_completion.zsh b/scripts/vcpkg_completion.zsh new file mode 100644 index 00000000000000..ee499f67161567 --- /dev/null +++ b/scripts/vcpkg_completion.zsh @@ -0,0 +1,9 @@ + +_vcpkg_completions() +{ + local vcpkg_executable=${COMP_WORDS[0]} + local remaining_command_line=${COMP_LINE:(${#vcpkg_executable}+1)} + COMPREPLY=($(${vcpkg_executable} autocomplete "${remaining_command_line}" -- 2>/dev/null)) +} + +complete -F _vcpkg_completions vcpkg From 622ab55338ddb13fd4b32c7d7503920d50ab2cdc Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 1 Jul 2021 22:14:24 +0800 Subject: [PATCH 068/141] [vcpkg baseline][simage] Update to 1.8.1 (#18645) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [simage] Update to 1.8.1 * Format manifest and update version files * Revert the changes for arm and uwp in ci.baseline.txt * Update versions/s-/simage.json * Update ports/simage/portfile.cmake * Update ports/simage/portfile.cmake * Update ports/simage/portfile.cmake * Update versions/s-/simage.json * Add options to packages * Update versions/s-/simage.json * Update portfile.cmake * Update versions/s-/simage.json * Update portfile.cmake * Update versions/s-/simage.json * [simage] Reorganize all features, add features * Install tool simage-config on non-Windows * fix typo * Add supports field and update ci.baseline.txt * Update versions/s-/simage.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY --- ports/simage/CONTROL | 6 - ports/simage/disable-cpackd.patch | 10 -- ports/simage/disable-examples.patch | 44 ------- ports/simage/disable-tests.patch | 49 -------- ports/simage/link-flac-library.patch | 60 --------- ports/simage/link-math-library.patch | 14 --- ports/simage/link-ogg-library.patch | 16 --- ports/simage/portfile.cmake | 97 ++++++++------ ...uninitialized-local-pointer-variable.patch | 26 ---- ports/simage/requies-all-dependencies.patch | 37 ++++++ ports/simage/vcpkg.json | 118 ++++++++++++++++++ scripts/ci.baseline.txt | 4 - versions/baseline.json | 8 +- versions/s-/simage.json | 5 + 14 files changed, 220 insertions(+), 274 deletions(-) delete mode 100644 ports/simage/CONTROL delete mode 100644 ports/simage/disable-cpackd.patch delete mode 100644 ports/simage/disable-examples.patch delete mode 100644 ports/simage/disable-tests.patch delete mode 100644 ports/simage/link-flac-library.patch delete mode 100644 ports/simage/link-math-library.patch delete mode 100644 ports/simage/link-ogg-library.patch delete mode 100644 ports/simage/potentially-uninitialized-local-pointer-variable.patch create mode 100644 ports/simage/requies-all-dependencies.patch create mode 100644 ports/simage/vcpkg.json diff --git a/ports/simage/CONTROL b/ports/simage/CONTROL deleted file mode 100644 index e25840834342e1..00000000000000 --- a/ports/simage/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: simage -Version: 1.8.0 -Port-Version: 1 -Description: Image file format library abstraction layer -Build-Depends: giflib (!windows&!osx), libjpeg-turbo (!windows&!osx), libpng (!windows&!osx), libsndfile, tiff (!windows&!osx), libvorbis, zlib (!windows&!osx) -Homepage: https://github.com/coin3d/simage diff --git a/ports/simage/disable-cpackd.patch b/ports/simage/disable-cpackd.patch deleted file mode 100644 index 6fd227a62a5bb6..00000000000000 --- a/ports/simage/disable-cpackd.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 775037a..e3deb01 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -627,4 +627,4 @@ install(EXPORT ${PROJECT_NAME} - - # ############################################################################ - # New CPACK section, please see the README file inside cpack.d directory. --add_subdirectory(cpack.d) -+#add_subdirectory(cpack.d) diff --git a/ports/simage/disable-examples.patch b/ports/simage/disable-examples.patch deleted file mode 100644 index dc9236c97f5449..00000000000000 --- a/ports/simage/disable-examples.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 775037a..fbd81b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -482,23 +489,23 @@ endif() - # Build examples - # ############################################################################ - --set(SIMAGE_EXAMPLE_SOURCE -- ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c -- ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c -+#set(SIMAGE_EXAMPLE_SOURCE -+# ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c -+# ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c - # ${CMAKE_CURRENT_SOURCE_DIR}/examples/mpeg2enc.cpp # requires Coin to build -- ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c -- ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c --) -- --foreach(_source ${SIMAGE_EXAMPLE_SOURCE}) -- get_filename_component(_example ${_source} NAME_WE) -- add_executable(${_example} ${_source}) -- target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) -- target_link_libraries(${_example} simage) -- if(UNIX) -- target_link_libraries(${_example} m) -- endif() --endforeach() -+# ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c -+# ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c -+#) -+ -+#foreach(_source ${SIMAGE_EXAMPLE_SOURCE}) -+# get_filename_component(_example ${_source} NAME_WE) -+# add_executable(${_example} ${_source}) -+# target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) -+# target_link_libraries(${_example} simage) -+# if(UNIX) -+# target_link_libraries(${_example} m) -+# endif() -+#endforeach() - - # ############################################################################ - # Build tests diff --git a/ports/simage/disable-tests.patch b/ports/simage/disable-tests.patch deleted file mode 100644 index 46790227fa21df..00000000000000 --- a/ports/simage/disable-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 775037a..b82734a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -504,25 +511,25 @@ endforeach() - # Build tests - # ############################################################################ - --enable_testing() -- --add_executable(loaders tests/loaders.c) --target_link_libraries(loaders simage) --target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) --if(UNIX) -- target_link_libraries(loaders m) --endif() -- --add_test( -- loaders -- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif --) -+#enable_testing() -+ -+#add_executable(loaders tests/loaders.c) -+#target_link_libraries(loaders simage) -+#target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) -+#if(UNIX) -+# target_link_libraries(loaders m) -+#endif() -+ -+#add_test( -+# loaders -+# ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif -+#) - - # Add a target to generate API documentation with Doxygen - if(SIMAGE_BUILD_DOCUMENTATION) diff --git a/ports/simage/link-flac-library.patch b/ports/simage/link-flac-library.patch deleted file mode 100644 index 7b8e35a10c28ae..00000000000000 --- a/ports/simage/link-flac-library.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 775037a..2de9b9f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -108,6 +108,10 @@ find_package(Jasper) - find_package(OggVorbis) - find_package(Sndfile) - -+if(SNDFILE_FOUND) -+ find_package(FLAC) -+endif() -+ - if(APPLE AND SIMAGE_USE_CGIMAGE) - check_cxx_source_compiles(" - #include -@@ -467,6 +471,9 @@ endif() - if(SNDFILE_FOUND) - target_include_directories(simage PRIVATE ${SNDFILE_INCLUDE_DIRS}) - target_link_libraries(simage PRIVATE ${SNDFILE_LIBRARIES}) -+ if(FLAC_FOUND) -+ target_link_libraries(simage PRIVATE ${FLAC_LIBRARIES}) -+ endif() - endif() - - if(TIFF_FOUND) -diff --git a/FindFLAC.cmake b/FindFLAC.cmake -new file mode 100644 -index 0000000..ce40a11 ---- /dev/null -+++ b/FindFLAC.cmake -@@ -0,0 +1,29 @@ -+include(FindPackageHandleStandardArgs) -+ -+find_path(FLAC_INCLUDE_DIR FLAC/all.h) -+ -+mark_as_advanced(FLAC_INCLUDE_DIR) -+ -+set(FLAC_INCLUDE_DIRS ${FLAC_INCLUDE_DIR}) -+ -+find_library(FLAC_LIBRARY NAMES FLAC) -+ -+mark_as_advanced( -+ FLAC_INCLUDE_DIR -+ FLAC_LIBRARY -+) -+ -+set(FLAC_LIBRARIES ${FLAC_LIBRARY}) -+ -+find_package_handle_standard_args( -+ FLAC -+ DEFAULT_MSG -+ FLAC_INCLUDE_DIRS -+ FLAC_LIBRARIES -+) -+ -+if(FLAC_FOUND AND NOT TARGET FLAC::FLAC) -+ add_library(FLAC::FLAC UNKNOWN IMPORTED) -+ set_target_properties(FLAC::FLAC PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${FLAC_INCLUDE_DIR}") -+ set_property(TARGET FLAC::FLAC APPEND PROPERTY IMPORTED_LOCATION "${FLAC_LIBRARY}") -+endif() diff --git a/ports/simage/link-math-library.patch b/ports/simage/link-math-library.patch deleted file mode 100644 index 4ffe98bf1aba39..00000000000000 --- a/ports/simage/link-math-library.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4a978dd..e7abd57 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -454,6 +454,9 @@ endif() - if(PNG_FOUND) - target_include_directories(simage PRIVATE ${PNG_INCLUDE_DIR}) - target_link_libraries(simage PRIVATE ${PNG_LIBRARIES}) -+ if(UNIX) -+ target_link_libraries(simage PRIVATE m) -+ endif() - endif() - - if(SIMAGE_QIMAGE_SUPPORT) diff --git a/ports/simage/link-ogg-library.patch b/ports/simage/link-ogg-library.patch deleted file mode 100644 index 752754411bfbe2..00000000000000 --- a/ports/simage/link-ogg-library.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/FindOggVorbis.cmake b/FindOggVorbis.cmake -index a33e63e..7e2708b 100644 ---- a/FindOggVorbis.cmake -+++ b/FindOggVorbis.cmake -@@ -28,10 +28,10 @@ mark_as_advanced( - - set( - OGGVORBIS_LIBRARIES -- ${OGG_LIBRARY} - ${VORBIS_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBISENC_LIBRARY} -+ ${OGG_LIBRARY} - ) - - find_package_handle_standard_args( diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake index 6b890c8a5c75b3..6868fb16e13bc3 100644 --- a/ports/simage/portfile.cmake +++ b/ports/simage/portfile.cmake @@ -1,64 +1,79 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + +set(SIMAGE_VERSION 1.8.1) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Coin3D/simage - REF simage-1.8.0 - SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c + REF 72bdc2fddb171ab08325ced9c4e04b27bbd2da6c #v1.8.1 + SHA512 8e0d4b246318e9a08d9a17e0550fae4e3902e5d14ff9d7e43569624d1ceb9308c1cbc2401cedc4bff4da8b136fc57fc6b11c6800f1db15914b13186b0d5dc8f1 HEAD_REF master - PATCHES - disable-cpackd.patch - disable-examples.patch - disable-tests.patch - link-flac-library.patch - link-math-library.patch - link-ogg-library.patch - potentially-uninitialized-local-pointer-variable.patch + PATCHES requies-all-dependencies.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(SIMAGE_BUILD_SHARED_LIBS OFF) -else() - set(SIMAGE_BUILD_SHARED_LIBS ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SIMAGE_BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMAGE_USE_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" SIMAGE_USE_MSVC_STATIC_RUNTIME) -set(OSX_OR_WINDOWS OFF) -if((VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) OR VCPKG_TARGET_IS_OSX) - set(OSX_OR_WINDOWS ON) -endif() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) - set(SIMAGE_USE_AVIENC ON) - set(SIMAGE_USE_GDIPLUS ON) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + oggvorbis SIMAGE_OGGVORBIS_SUPPORT + sndfile SIMAGE_LIBSNDFILE_SUPPORT +) + +# Depends on the platform +if(VCPKG_TARGET_IS_WINDOWS) + set(SIMAGE_ON_WIN ON) + set(SIMAGE_ON_NON_WIN OFF) else() - set(SIMAGE_USE_AVIENC OFF) - set(SIMAGE_USE_GDIPLUS OFF) + set(SIMAGE_ON_WIN OFF) + set(SIMAGE_ON_NON_WIN ON) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DSIMAGE_BUILD_SHARED_LIBS=${SIMAGE_BUILD_SHARED_LIBS} - -DSIMAGE_USE_AVIENC=${SIMAGE_USE_AVIENC} - -DSIMAGE_USE_GDIPLUS=${SIMAGE_USE_GDIPLUS} - -DCMAKE_DISABLE_FIND_PACKAGE_FLAC=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON - -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${OSX_OR_WINDOWS} - -DCMAKE_DISABLE_FIND_PACKAGE_GIF=${OSX_OR_WINDOWS} - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${OSX_OR_WINDOWS} - -DCMAKE_DISABLE_FIND_PACKAGE_PNG=${OSX_OR_WINDOWS} - -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=${OSX_OR_WINDOWS} + OPTIONS ${FEATURE_OPTIONS} + -DSIMAGE_BUILD_SHARED_LIBS:BOOL=${SIMAGE_BUILD_SHARED_LIBS} + -DSIMAGE_USE_STATIC_LIBS:BOOL=${SIMAGE_USE_STATIC_LIBS} + -DSIMAGE_USE_MSVC_STATIC_RUNTIME:BOOL=${SIMAGE_USE_MSVC_STATIC_RUNTIME} + -DSIMAGE_USE_AVIENC=${SIMAGE_ON_WIN} + -DSIMAGE_USE_GDIPLUS=${SIMAGE_ON_WIN} + # Available on Linux, OSX and Windows without gdiplus + -DSIMAGE_ZLIB_SUPPORT=${SIMAGE_ON_NON_WIN} + -DSIMAGE_GIF_SUPPORT=${SIMAGE_ON_NON_WIN} + -DSIMAGE_JPEG_SUPPORT=${SIMAGE_ON_NON_WIN} + -DSIMAGE_PNG_SUPPORT=${SIMAGE_ON_NON_WIN} + -DSIMAGE_TIFF_SUPPORT=${SIMAGE_ON_NON_WIN} + # + -DSIMAGE_USE_CGIMAGE=OFF + -DSIMAGE_USE_QIMAGE=OFF + -DSIMAGE_USE_QT6=OFF + -DSIMAGE_USE_QT5=OFF + -DSIMAGE_USE_CPACK=OFF + -DSIMAGE_LIBJASPER_SUPPORT=OFF + -DSIMAGE_EPS_SUPPORT=OFF + -DSIMAGE_MPEG2ENC_SUPPORT=OFF + -DSIMAGE_PIC_SUPPORT=OFF + -DSIMAGE_RGB_SUPPORT=OFF + -DSIMAGE_XWD_SUPPORT=OFF + -DSIMAGE_TGA_SUPPORT=OFF + -DSIMAGE_BUILD_MSVC_MP=OFF + -DSIMAGE_BUILD_EXAMPLES=OFF + -DSIMAGE_BUILD_TESTS=OFF + -DSIMAGE_BUILD_DOCUMENTATION=OFF ) vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-1.8.0) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + vcpkg_copy_tools(TOOL_NAMES simage-config AUTO_CLEAN) endif() 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/simage/potentially-uninitialized-local-pointer-variable.patch b/ports/simage/potentially-uninitialized-local-pointer-variable.patch deleted file mode 100644 index 1b74a2f89878cd..00000000000000 --- a/ports/simage/potentially-uninitialized-local-pointer-variable.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/examples/img2avi.c b/examples/img2avi.c -index 7a5ca96..d0ee057 100644 ---- a/examples/img2avi.c -+++ b/examples/img2avi.c -@@ -30,7 +30,7 @@ int main(int argc, char *argv[]) - int first; - int width; - int height; -- s_movie * movie; -+ s_movie * movie = NULL; - s_params * params; - s_image *image; - char formatbuf[20]; -diff --git a/mpeg2enc/putvlc.c b/mpeg2enc/putvlc.c -index 6a84fbd..b373fea 100644 ---- a/mpeg2enc/putvlc.c -+++ b/mpeg2enc/putvlc.c -@@ -103,7 +103,7 @@ void - simpeg_encode_putAC(simpeg_encode_context * context,int run, int signed_level, int vlcformat) - { - int level, len; -- VLCtable *ptab; -+ VLCtable *ptab = NULL; - - level = (signed_level<0) ? -signed_level : signed_level; /* abs(signed_level) */ - diff --git a/ports/simage/requies-all-dependencies.patch b/ports/simage/requies-all-dependencies.patch new file mode 100644 index 00000000000000..ef0536a960c65e --- /dev/null +++ b/ports/simage/requies-all-dependencies.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d869715..073a73f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,10 +117,10 @@ endif() + # On Windows GDI+ supports GIF, JPEG, EXIF, PNG, and TIFF. + # see https://docs.microsoft.com/en-us/windows/desktop/gdiplus/-gdiplus-types-of-bitmaps-about + if(SIMAGE_USE_GDIPLUS) +- find_package(GdiPlus) ++ find_package(GdiPlus REQUIRED) + endif() + if(SIMAGE_USE_AVIENC) +- find_package(Vfw) ++ find_package(Vfw REQUIRED) + endif() + + # On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA. +@@ -267,7 +267,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT) + find_package(Ogg REQUIRED) + find_package(Vorbis REQUIRED) + if(OGG_FOUND) +- find_package(Opus) ++ find_package(Opus REQUIRED) + endif() + endif() + +@@ -287,8 +287,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD + if(SIMAGE_TIFF_SUPPORT) + find_package(TIFF REQUIRED) + if(TIFF_FOUND) +- find_package(LibLZMA) +- find_package(Zstd) ++ find_package(LibLZMA REQUIRED) ++ find_package(Zstd REQUIRED) + endif() + endif() + diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json new file mode 100644 index 00000000000000..2b50a2c6dc19f6 --- /dev/null +++ b/ports/simage/vcpkg.json @@ -0,0 +1,118 @@ +{ + "name": "simage", + "version-semver": "1.8.1", + "description": "Image file format library abstraction layer", + "homepage": "https://github.com/coin3d/simage", + "supports": "!uwp", + "default-features": [ + "all" + ], + "features": { + "all": { + "description": "Enable all features", + "dependencies": [ + { + "name": "simage", + "default-features": false, + "features": [ + "oggvorbis" + ] + }, + { + "name": "simage", + "default-features": false, + "features": [ + "sndfile" + ] + }, + { + "name": "simage", + "default-features": false, + "features": [ + "giflib" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "jpeg" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "png" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "tiff" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "zlib" + ], + "platform": "!windows" + } + ] + }, + "giflib": { + "description": "Enable support for GIF images", + "dependencies": [ + "giflib" + ] + }, + "jpeg": { + "description": "Enable support for JPEG images", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "oggvorbis": { + "description": "Enable support for ogg/vorbis extensions", + "dependencies": [ + "libogg", + "libvorbis", + "opus" + ] + }, + "png": { + "description": "Enable support for PNG images", + "dependencies": [ + "libpng" + ] + }, + "sndfile": { + "description": "Use libsndfile to load/save sampled sound", + "dependencies": [ + "libflac", + "libsndfile" + ] + }, + "tiff": { + "description": "Enable support for TIFF images", + "dependencies": [ + "liblzma", + "tiff", + "zstd" + ] + }, + "zlib": { + "description": "Enable support for zlib library", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dbf417741b856d..bd0f256d4008a8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1796,9 +1796,5 @@ dimcli:x64-windows-static=fail # cppgraphqlgen triggers an ICE on Apple Clang that comes with MacOS 11. cppgraphqlgen:x64-osx=fail -# Visual Studio 2019 version 16.10's XAML compiler seems to be crashing processing this port -simage:x64-uwp=fail -simage:arm-uwp=fail - # Changes in Python have broken tensorflow on our osx hardware tensorflow-cc:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2cb30c68f1a5ce..af48d953bda06d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3543,8 +3543,8 @@ "libsigcpp-3": { "baseline": "3.0.3", "port-version": 1 - }, - "libsmb2": { + }, + "libsmb2": { "baseline": "2021-04-29", "port-version": 0 }, @@ -5773,8 +5773,8 @@ "port-version": 0 }, "simage": { - "baseline": "1.8.0", - "port-version": 1 + "baseline": "1.8.1", + "port-version": 0 }, "simde": { "baseline": "0.7.0", diff --git a/versions/s-/simage.json b/versions/s-/simage.json index e245aca0bee948..d20b1cd9065457 100644 --- a/versions/s-/simage.json +++ b/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "429f5758def1d9514aa6f3f2bbcb98d8a3f19cd1", + "version-semver": "1.8.1", + "port-version": 0 + }, { "git-tree": "7efea762708b2fa21ac7919656bfcdfccbd84339", "version-string": "1.8.0", From afa94b6a2facd9df5c0082cd9c3a86912c7947c8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 1 Jul 2021 16:22:56 +0200 Subject: [PATCH 069/141] [curl] Fix linker flags in curl-config and libcurl.pc for osx (#17790) * Fix exported framework linker flags for osx * x-add-version * Remove cmake version check * Update git-tree --- ports/curl/0020-fix-pc-file.patch | 16 ++++++++++++++++ ports/curl/portfile.cmake | 1 + ports/curl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/curl/0020-fix-pc-file.patch diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch new file mode 100644 index 00000000000000..cd79597821941e --- /dev/null +++ b/ports/curl/0020-fix-pc-file.patch @@ -0,0 +1,16 @@ +diff -urw a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-05-10 20:46:52.204346972 +0200 ++++ b/CMakeLists.txt 2021-05-11 19:39:00.065235266 +0200 +@@ -1482,6 +1482,12 @@ + message(WARNING "Bad lib in library list: ${_libname}") + continue() + endif() ++ elseif(_lib MATCHES "^(.*)/([^/]*)[.]framework$") ++ if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) ++ set(_lib "-framework ${CMAKE_MATCH_2}") ++ else() ++ set(_lib "-framework ${_lib}") ++ endif() + endif() + if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-") + set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}") diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 3512adeaf81e58..6d410fb58b9231 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( 0010_fix_othertests_cmake.patch 0011_fix_static_build.patch 0012-fix-dependency-idn2.patch + 0020-fix-pc-file.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 6efa34f0f645d4..7059f6d4749868 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "curl", "version": "7.74.0", - "port-version": 7, + "port-version": 8, "description": "A library for transferring data with URLs", "homepage": "https://github.com/curl/curl", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index af48d953bda06d..0fc47b4a6ae4d0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1562,7 +1562,7 @@ }, "curl": { "baseline": "7.74.0", - "port-version": 7 + "port-version": 8 }, "curlpp": { "baseline": "2018-06-15-3", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index dfca5d4c4a0045..e0b511bb645e8b 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd05855cc1cd2d0f221664f0bfbe639b685fa028", + "version": "7.74.0", + "port-version": 8 + }, { "git-tree": "2184d79bb98ed36af015203385175cade013d8af", "version": "7.74.0", From c73b42ed1f456f3428fab2465e241d9e452a9d72 Mon Sep 17 00:00:00 2001 From: Alex Reinking Date: Thu, 1 Jul 2021 07:24:48 -0700 Subject: [PATCH 070/141] [halide] Fix several issues with the Halide port after v12 (#18747) * Fix several issues with the Halide port after v12 1. Use vcpkg-cmake and vcpkg-cmake-config ports 2. Fix usage file to point to relevant documentation 3. Remove OpenGL feature (Halide 12 dropped support) 4. Drop VCPKG_POLICY_EMPTY_PACKAGE 5. Set new Halide packaging variables for better vcpkg compliance. * update versions --- ports/halide/portfile.cmake | 28 ++++++++++++++++------------ ports/halide/usage | 2 +- ports/halide/vcpkg.json | 13 +++++++++---- versions/baseline.json | 2 +- versions/h-/halide.json | 5 +++++ 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index 83e8399aa58bab..486726c289e395 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -1,10 +1,5 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -# Halide distributes some loadable modules that belong in lib on all platforms. -# CMake defaults module DLLs into the lib folder, which is incompatible with -# vcpkg’s current policy. This sidesteps that issue, a bit bluntly. -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO halide/Halide @@ -25,15 +20,13 @@ vcpkg_check_features( target-mips TARGET_MIPS target-nvptx TARGET_NVPTX target-opencl TARGET_OPENCL - target-opengl TARGET_OPENGL target-powerpc TARGET_POWERPC target-riscv TARGET_RISCV target-x86 TARGET_X86 ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DWITH_DOCS=NO -DWITH_PYTHON_BINDINGS=NO @@ -42,10 +35,14 @@ vcpkg_configure_cmake( -DWITH_UTILS=NO -DCMAKE_INSTALL_LIBDIR=bin -DCMAKE_INSTALL_DATADIR=share/${PORT} - -DHALIDE_INSTALL_CMAKEDIR=share/${PORT} + -DHalide_INSTALL_CMAKEDIR=share/${PORT} + -DHalide_INSTALL_HELPERSDIR=share/HalideHelpers + -DHalide_INSTALL_PLUGINDIR=bin ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +# ADD_BIN_TO_PATH needed to compile autoschedulers, +# which use Halide.dll (and deps) during the build. +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_copy_tools( TOOL_NAMES @@ -56,9 +53,16 @@ vcpkg_copy_tools( AUTO_CLEAN ) -vcpkg_copy_pdbs() +# Release mode MODULE targets in CMake don't get PDBs. +# Exclude those to avoid warning with default globs. +vcpkg_copy_pdbs( + BUILD_PATHS + "${CURRENT_PACKAGES_DIR}/bin/Halide.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" +) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(PACKAGE_NAME HalideHelpers) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/halide/usage b/ports/halide/usage index 117e243b6c0507..591e497db458ef 100644 --- a/ports/halide/usage +++ b/ports/halide/usage @@ -11,4 +11,4 @@ The package halide provides CMake targets: target_link_libraries(main PRIVATE filter) For more information see: - https://github.com/halide/Halide/blob/v11.0.1/README_cmake.md + https://github.com/halide/Halide/blob/v12.0.1/README_cmake.md diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json index c66fef61b0da60..baa99449ae8893 100644 --- a/ports/halide/vcpkg.json +++ b/ports/halide/vcpkg.json @@ -1,6 +1,7 @@ { "name": "halide", "version": "12.0.1", + "port-version": 1, "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", "homepage": "https://github.com/halide/Halide", "supports": "!uwp", @@ -12,6 +13,14 @@ "enable-rtti", "tools" ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ @@ -82,7 +91,6 @@ "target-mips", "target-nvptx", "target-opencl", - "target-opengl", "target-powerpc", "target-riscv", "target-x86" @@ -159,9 +167,6 @@ "target-opencl": { "description": "Include OpenCL-C target" }, - "target-opengl": { - "description": "Include OpenGL/GLSL target" - }, "target-powerpc": { "description": "Include PowerPC target", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0fc47b4a6ae4d0..2a12dd0e453b26 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2458,7 +2458,7 @@ }, "halide": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "happly": { "baseline": "2021-03-19", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index 9d1bf20db20a67..8a2628d869f258 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "512cb4dd40ca40afbf0c6a35f7bdc595589a0b10", + "version": "12.0.1", + "port-version": 1 + }, { "git-tree": "50e2c4835a57bb4a172c4b82b2a0e0a3077088ab", "version": "12.0.1", From 7fd3aa022650b7858f06b106309fb90cc60133d7 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 1 Jul 2021 22:25:35 +0800 Subject: [PATCH 071/141] [nettle] Remove from ci.baseline.txt (#18745) * [nettle] Test on x64 windows * Revert the changes for nettle --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bd0f256d4008a8..668d0e0f2416bb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1030,9 +1030,6 @@ nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail nethost:x64-uwp=fail nethost:arm-uwp=fail -nettle:x64-windows-static=skip -nettle:x64-windows-static-md=skip -nettle:x64-windows=skip ngspice:x64-windows-static=fail nng:arm-uwp=fail nng:x64-uwp=fail From 0121405719c1c413b70ddbd55be4b5976e26d793 Mon Sep 17 00:00:00 2001 From: aggieNick02 Date: Thu, 1 Jul 2021 09:27:37 -0500 Subject: [PATCH 072/141] [tbb] Remove ability to disable exception support in TBB runtime (#18740) * After filing an issue with TBB (https://github.com/oneapi-src/oneTBB/issues/414), I found out that building the library with exceptions explicitly disabled as I had added support for had gone from not officially supported to more explicitly disallowed * update tbb port-version * run x-add-version --- ports/tbb/CMakeLists.txt | 6 +----- ports/tbb/CONTROL | 2 +- ports/tbb/portfile.cmake | 15 --------------- versions/baseline.json | 2 +- versions/t-/tbb.json | 5 +++++ 5 files changed, 8 insertions(+), 22 deletions(-) diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt index a485d119d53dfb..ae53c40f2a6251 100644 --- a/ports/tbb/CMakeLists.txt +++ b/ports/tbb/CMakeLists.txt @@ -1,13 +1,9 @@ project(tbb CXX) -option(DISABLE_EXCEPTIONS "Set exceptions=0 for make to turn off exception support in TBB" OFF) file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*) file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src) include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED) -if(DISABLE_EXCEPTIONS) - set(DISABLE_EXCEPTIONS_ARG exceptions=0) -endif() if(NOT BUILD_SHARED_LIBS) set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc) endif() @@ -30,7 +26,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() endif() -tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${DISABLE_EXCEPTIONS_ARG} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT}) +tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT}) set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir) if(CMAKE_BUILD_TYPE STREQUAL "Release") diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index ea2bdc140dea17..b089a3e7d91707 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,6 +1,6 @@ Source: tbb Version: 2020_U3 -Port-Version: 4 +Port-Version: 5 Homepage: https://github.com/01org/tbb Description: Intel's Threading Building Blocks. Supports: !(uwp|arm|arm64) | linux | osx diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index ada16a7d7138ad..bf65511b788943 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -14,22 +14,11 @@ vcpkg_from_github( ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -if (TBB_DISABLE_EXCEPTIONS) - message(STATUS "Building TBB with exception-handling constructs disabled because TBB_DISABLE_EXCEPTIONS is set to ON.") -else() - message(STATUS "TBB uses exception-handling constructs by default (if supported by the compiler). This use can be disabled with 'SET(TBB_DISABLE_EXCEPTIONS ON)' in your custom triplet.") -endif() if (NOT VCPKG_TARGET_IS_WINDOWS) - if (TBB_DISABLE_EXCEPTIONS) - set(DISABLE_EXCEPTIONS ON) - else() - set(DISABLE_EXCEPTIONS OFF) - endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DDISABLE_EXCEPTIONS=${DISABLE_EXCEPTIONS} ) vcpkg_install_cmake() @@ -73,10 +62,6 @@ else() string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE" "\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_RUNTIME" SLN_CONFIGURE "${SLN_CONFIGURE}") endif() - if (TBB_DISABLE_EXCEPTIONS) - string(REPLACE "%(PreprocessorDefinitions)<\/PreprocessorDefinitions>" - "TBB_USE_EXCEPTIONS=0;%(PreprocessorDefinitions)<\/PreprocessorDefinitions>" SLN_CONFIGURE "${SLN_CONFIGURE}") - endif() file(WRITE ${CONFIGURE_FILE_NAME} "${SLN_CONFIGURE}") endmacro() diff --git a/versions/baseline.json b/versions/baseline.json index 2a12dd0e453b26..a81a9e3263ee8c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6098,7 +6098,7 @@ }, "tbb": { "baseline": "2020_U3", - "port-version": 4 + "port-version": 5 }, "tcl": { "baseline": "core-9-0-a1", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 2655af3fd20897..71c441dbf8051e 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "475f44cf5033c6f3bfb5c69c5a301cddf18e7aa0", + "version-string": "2020_U3", + "port-version": 5 + }, { "git-tree": "4e6228578b0ca40358f584aa1ea8b4a9ac2d4ed9", "version-string": "2020_U3", From c5f443896949d9d8db8dc1f65e27aaa307e11f4c Mon Sep 17 00:00:00 2001 From: Yuriy O'Donnell Date: Thu, 1 Jul 2021 16:29:16 +0200 Subject: [PATCH 073/141] [libressl] update to 3.3.3 (#18729) Resolves #18682 --- ports/libressl/0001-enable-ocspcheck-on-msvc.patch | 2 +- ports/libressl/0002-suppress-msvc-warnings.patch | 2 +- ports/libressl/CONTROL | 8 -------- ports/libressl/portfile.cmake | 10 ++++++---- ports/libressl/vcpkg.json | 11 +++++++++++ versions/baseline.json | 4 ++-- versions/l-/libressl.json | 5 +++++ 7 files changed, 26 insertions(+), 16 deletions(-) delete mode 100644 ports/libressl/CONTROL create mode 100644 ports/libressl/vcpkg.json diff --git a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch index fa1884a2e45646..53083d314e8229 100644 --- a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch +++ b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch @@ -9,7 +9,7 @@ index 3c80458..e8d3bf5 100644 OCSPCHECK_SRC http.c @@ -13,13 +11,27 @@ else() - set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) + set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c) endif() +check_function_exists(getopt HAVE_GETOPT) diff --git a/ports/libressl/0002-suppress-msvc-warnings.patch b/ports/libressl/0002-suppress-msvc-warnings.patch index 7a5bf0038ec1ca..79d756622b42b4 100644 --- a/ports/libressl/0002-suppress-msvc-warnings.patch +++ b/ports/libressl/0002-suppress-msvc-warnings.patch @@ -3,7 +3,7 @@ index a6a7554..b20fd4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,6 +111,11 @@ if(WIN32) - set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32) + set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt) endif() +if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912) diff --git a/ports/libressl/CONTROL b/ports/libressl/CONTROL deleted file mode 100644 index 2b7d62ec20a9a6..00000000000000 --- a/ports/libressl/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: libressl -Version: 2.9.1 -Port-Version: 3 -Description: LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes. -Supports: !(uwp|arm) - -Feature: tools -Description: Build openssl and ocspcheck executables diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 7e37c207edd966..7483e02c880e92 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") -set(LIBRESSL_VERSION 2.9.1) -set(LIBRESSL_HASH 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354) +set(LIBRESSL_VERSION 3.3.3) +set(LIBRESSL_HASH 2d0b5f4cfe37d573bc64d5967abb77f536dbe581fbad9637d925332bcdfd185fe6810335b2af80a89f92d7e6edaa8ea3ba2492c60a117e47ea1b2d6aacf01f0f) vcpkg_download_distfile( LIBRESSL_SOURCE_ARCHIVE @@ -26,7 +26,8 @@ vcpkg_extract_source_archive_ex( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "tools" LIBRESSL_APPS + FEATURES + "tools" LIBRESSL_APPS ) vcpkg_configure_cmake( @@ -59,6 +60,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc/ssl/certs" + "${CURRENT_PACKAGES_DIR}/debug/etc/ssl/certs" "${CURRENT_PACKAGES_DIR}/share/man" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" @@ -68,7 +70,7 @@ vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -if((VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib") foreach(LIB ${LIBS}) string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}") diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json new file mode 100644 index 00000000000000..59c18243c2fb50 --- /dev/null +++ b/ports/libressl/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libressl", + "version": "3.3.3", + "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", + "supports": "!(uwp | arm)", + "features": { + "tools": { + "description": "Build openssl and ocspcheck executables" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index a81a9e3263ee8c..6ea15d8f218903 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3505,8 +3505,8 @@ "port-version": 0 }, "libressl": { - "baseline": "2.9.1", - "port-version": 3 + "baseline": "3.3.3", + "port-version": 0 }, "librsvg": { "baseline": "2.40.20", diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index 62ab6a809d3ef2..c8d28210087c96 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24a18d6ed79f2b8c4c01c5201998981b2d831a1a", + "version": "3.3.3", + "port-version": 0 + }, { "git-tree": "3de8a5b9f15524db17ccff3c0a4c61266d8fb3b1", "version-string": "2.9.1", From 580551a17229a02e77809be4685bdef30109f714 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 1 Jul 2021 16:29:42 +0200 Subject: [PATCH 074/141] [asio] update to 1.18.2 (#18728) * [asio] update to 1.18.2 * update versions --- ports/asio/inline_dummy_return.patch | 13 ------------- ports/asio/portfile.cmake | 7 ++----- ports/asio/vcpkg.json | 3 +-- versions/a-/asio.json | 5 +++++ versions/baseline.json | 4 ++-- 5 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 ports/asio/inline_dummy_return.patch diff --git a/ports/asio/inline_dummy_return.patch b/ports/asio/inline_dummy_return.patch deleted file mode 100644 index 7df7ca641e5336..00000000000000 --- a/ports/asio/inline_dummy_return.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/asio/include/asio/impl/use_awaitable.hpp b/asio/include/asio/impl/use_awaitable.hpp -index 60a6f5cd..af7be635 100644 ---- a/asio/include/asio/impl/use_awaitable.hpp -+++ b/asio/include/asio/impl/use_awaitable.hpp -@@ -236,7 +236,7 @@ T dummy_return() - } - - template <> --void dummy_return() -+inline void dummy_return() - { - } - #endif // defined(_MSC_VER) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index af3683874e75d1..d5f65149acdd39 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-18-1 - SHA512 c84e6fca448ed419a976756840f3f4543291a5a7d4f62d4de7c06945b2cd9ececca6633049ad5e36367d60f67a4f2735be017445514ae9fa9497d4af2a4d48f8 + REF asio-1-18-2 + SHA512 5a2312f1a14106e3109a9f02e8ac65a1d639b411834f0aa301767a4dd30d8384f6f1a94034b6016ef989c7d7880fd4c8de11c7be0cb58b4dc64a49ec335a7113 HEAD_REF master - PATCHES - inline_dummy_return.patch ) # Always use "ASIO_STANDALONE" to avoid boost dependency @@ -30,4 +28,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 076b4f60894754..5f285c16fa15a0 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "asio", - "version": "1.18.1", - "port-version": 1, + "version": "1.18.2", "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", "documentation": "https://think-async.com/Asio/asio-1.18.0/doc/", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index abb5129252526a..658bbdd9af9d03 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae594f45685a04883ec38208caf740ee9c9635e8", + "version": "1.18.2", + "port-version": 0 + }, { "git-tree": "09afe8ce875f1c4e5e46d54c7c8bd5d0b9b512fc", "version": "1.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index 6ea15d8f218903..8b61f7dde9e525 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -165,8 +165,8 @@ "port-version": 0 }, "asio": { - "baseline": "1.18.1", - "port-version": 1 + "baseline": "1.18.2", + "port-version": 0 }, "asiosdk": { "baseline": "2.3.3", From 6ee3b8e39b5b0b956c9a4b5d0a194f0ad979119a Mon Sep 17 00:00:00 2001 From: eao197 Date: Thu, 1 Jul 2021 17:30:13 +0300 Subject: [PATCH 075/141] [json-dto] Update to 0.2.13 (#18710) * json_dto updated to 0.2.13. * x-add-version for json-dto. --- ports/json-dto/portfile.cmake | 5 +++-- ports/json-dto/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/json-dto.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/json-dto/portfile.cmake b/ports/json-dto/portfile.cmake index 682991ae1a4b09..dd888973ab9ea6 100644 --- a/ports/json-dto/portfile.cmake +++ b/ports/json-dto/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/json_dto - REF a1375492e93cc698af60fe7937511ff28d87a5c8 # v.0.2.12 - SHA512 d9306b7ea8b682ae7d76c6df518c64c444772c47b2b6750f5ebb609476aac5bd9ad529be802ad3348775e30169b0e86d8588aa897766d2f51c2f5186f7cb1354 + REF 7fce92cd3bdacdcd0b41ed26d2cc981e3f70956e # v.0.2.13 + SHA512 f678545cc60828ab76d6e8532ac9dbf8e4e68d873d0a98f17d62934dd0b3a3e255b38adf838b65a12e0d954edc7866eb6393f6783709f6f7fac29167886e7bf3 ) vcpkg_configure_cmake( @@ -23,3 +23,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/ports/json-dto/vcpkg.json b/ports/json-dto/vcpkg.json index b97740acaeb93e..8681bd20fc10e7 100644 --- a/ports/json-dto/vcpkg.json +++ b/ports/json-dto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "json-dto", - "version": "0.2.12", + "version": "0.2.13", "description": "A small header-only library for converting data between json representation and c++ structs.", "homepage": "https://github.com/Stiffstream/json_dto", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 8b61f7dde9e525..3ebdf957ae6556 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2773,7 +2773,7 @@ "port-version": 1 }, "json-dto": { - "baseline": "0.2.12", + "baseline": "0.2.13", "port-version": 0 }, "json-link": { diff --git a/versions/j-/json-dto.json b/versions/j-/json-dto.json index eea4d02cff5ff2..d04ece23db4d60 100644 --- a/versions/j-/json-dto.json +++ b/versions/j-/json-dto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4576b8566a843cf16e9a38143d1a99ae832d130", + "version": "0.2.13", + "port-version": 0 + }, { "git-tree": "9a981571e3da6bf7df6ad44cb3ee5f816134c5f9", "version": "0.2.12", From 3576a3efe6984686ad54c27c4a3b3699ecda4806 Mon Sep 17 00:00:00 2001 From: goyarn <59996142+goyarn@users.noreply.github.com> Date: Thu, 1 Jul 2021 23:35:24 +0900 Subject: [PATCH 076/141] [README_ko_KR.md] Fix typo for korean doc (#18673) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 원도우 -> 윈도우 --- README_ko_KR.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_ko_KR.md b/README_ko_KR.md index f9270fe7cc60b4..3f76ac0c5c0d67 100644 --- a/README_ko_KR.md +++ b/README_ko_KR.md @@ -20,7 +20,7 @@ vcpkg 사용을 시작하는 방법은 [시작하기](#시작하기) 섹션을 - [Vcpkg: 개요 둘러보기](#vcpkg-개요) - [목차](#목차) - [시작하기](#시작하기) - - [빠르게 시작하기: 원도우](#빠르게-시작하기-원도우) + - [빠르게 시작하기: 윈도우](#빠르게-시작하기-윈도우) - [빠르게 시작하기: 유닉스](#빠르게-시작하기-유닉스) - [리눅스 개발자 도구 설치하기](#리눅스-개발자-도구-설치하기) - [macOS 개발자 도구 설치하기](#macos-개발자-도구-설치하기) From 48026b70b01abd0fc29c9e95601de7f8286e003a Mon Sep 17 00:00:00 2001 From: Charles Karney Date: Thu, 1 Jul 2021 10:35:58 -0400 Subject: [PATCH 077/141] [geographiclib] Update to version 1.52 (#18694) * [geographiclib] Update to version 1.52 * run ./vcpkg x-add-version geographiclib * ports/geographiclib/vcpkg.json: version-string -> version * Another iteration with x-add-version --- ports/geographiclib/cxx-library-only.patch | 19 +++---------------- ports/geographiclib/portfile.cmake | 4 ++-- ports/geographiclib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/geographiclib.json | 5 +++++ 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/ports/geographiclib/cxx-library-only.patch b/ports/geographiclib/cxx-library-only.patch index 2e3893a9745fe4..d1201794b55597 100644 --- a/ports/geographiclib/cxx-library-only.patch +++ b/ports/geographiclib/cxx-library-only.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 345df69b..cb891034 100644 +index eb08bd48..88552153 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,6 +196,11 @@ else () @@ -74,23 +74,10 @@ index 345df69b..cb891034 100644 if (GEOGRAPHICLIB_PRECISION EQUAL 2) set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index cbc21961..69c923bc 100644 +index fd0669f2..4744e08d 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt -@@ -33,10 +33,10 @@ configure_file (project-config.cmake.in - configure_file (project-config-version.cmake.in - "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" @ONLY) - export (TARGETS -- ${PROJECT_ALL_LIBRARIES} ${TOOLS} -+ ${PROJECT_ALL_LIBRARIES} - FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake") - export (TARGETS -- ${PROJECT_ALL_LIBRARIES} ${TOOLS} -+ ${PROJECT_ALL_LIBRARIES} - NAMESPACE ${PROJECT_NAME}:: - FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake") - -@@ -44,13 +44,7 @@ export (TARGETS +@@ -56,13 +56,7 @@ export (TARGETS # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative # path to the root from there. (Note that the whole install tree can # be relocated.) diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index e948114cd65649..3b7bd3f51fa256 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_sourceforge ( OUT_SOURCE_PATH SOURCE_PATH REPO geographiclib REF distrib - FILENAME "GeographicLib-1.51.tar.gz" - SHA512 34487a09fa94a34d24179cfe9fd2e5fdda28675966703ca137cbfe6cc88760c2fbde55f76c464de060b58bfe0a516e22c0f59318cf85ae7cc01c5c6a73dd6ead + FILENAME "GeographicLib-1.52.tar.gz" + SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859 PATCHES cxx-library-only.patch ) diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index 18deaa7714082e..df18eaf32021b4 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "geographiclib", - "version-string": "1.51", + "version": "1.52", "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 3ebdf957ae6556..3c5d6d28031c6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2221,7 +2221,7 @@ "port-version": 3 }, "geographiclib": { - "baseline": "1.51", + "baseline": "1.52", "port-version": 0 }, "geos": { diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json index dd034bcd511365..8fd320c34ee033 100644 --- a/versions/g-/geographiclib.json +++ b/versions/g-/geographiclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b80d69df97ec60b98b202270c5357b72729fbc90", + "version": "1.52", + "port-version": 0 + }, { "git-tree": "eafff91d7abd708bd49584dc4070e091d427e333", "version-string": "1.51", From f761e2537cf8927ba4a975eec82eb58e7a1206f2 Mon Sep 17 00:00:00 2001 From: Daumantas Kavolis <12998363+dkavolis@users.noreply.github.com> Date: Thu, 1 Jul 2021 15:36:27 +0100 Subject: [PATCH 078/141] [spdlog] Do not build examples (#18639) * Don't build spdlog examples * Update port version --- ports/spdlog/portfile.cmake | 1 + ports/spdlog/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/spdlog.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 1af8b142b0735a..0d95db43a76aab 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_cmake_configure( -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_INSTALL=ON -DSPDLOG_BUILD_SHARED=${SPDLOG_BUILD_SHARED} + -DSPDLOG_BUILD_EXAMPLE=OFF ) vcpkg_cmake_install() diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index aa24c34b7246c4..21f33d83defaac 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spdlog", "version-semver": "1.8.5", - "port-version": 2, + "port-version": 3, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 3c5d6d28031c6d..359f098e2fb658 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5930,7 +5930,7 @@ }, "spdlog": { "baseline": "1.8.5", - "port-version": 2 + "port-version": 3 }, "spectra": { "baseline": "0.9.0", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index 533df0dca00405..f0dd94172b7e08 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f74643a7b8056237da08c41a653f5b0592870906", + "version-semver": "1.8.5", + "port-version": 3 + }, { "git-tree": "9aa80a12ad92e29cfc19df70b9fd615b4aa5997b", "version-semver": "1.8.5", From 1e25ffdf4fc0ff57893a64cc632ffb8ed0e525fd Mon Sep 17 00:00:00 2001 From: An Tao Date: Thu, 1 Jul 2021 22:36:43 +0800 Subject: [PATCH 079/141] [drogon] Update to 1.7.1 (#18643) --- ports/drogon/CONTROL | 2 +- ports/drogon/portfile.cmake | 8 +++++--- ports/drogon/ssize_t.patch | 13 ------------- versions/baseline.json | 2 +- versions/d-/drogon.json | 5 +++++ 5 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 ports/drogon/ssize_t.patch diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL index e4da939a31efdb..fc00ee3ad3b79a 100644 --- a/ports/drogon/CONTROL +++ b/ports/drogon/CONTROL @@ -1,5 +1,5 @@ Source: drogon -Version: 1.6.0 +Version: 1.7.1 Homepage: https://github.com/an-tao/drogon Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows Build-Depends: trantor, zlib, jsoncpp, libmariadb (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows) diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 69ea0cf5559259..0171af1d511968 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.6.0 - SHA512 3e3012bbee0a12cfabf79581bc0f57592065bc9618ed18c17ef77afee55750c8a8b8626053863208928b173cd0629f271a14a07e602f8ea93976c43b3ba5c9db + REF v1.7.1 + SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6 HEAD_REF master PATCHES vcpkg.patch resolv.patch drogon_config.patch - ssize_t.patch ) vcpkg_check_features( @@ -30,6 +29,9 @@ vcpkg_install_cmake() # Fix CMake files vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Drogon) + +vcpkg_fixup_pkgconfig() + # Copy drogon_ctl if("ctl" IN_LIST FEATURES) message("copying tools") diff --git a/ports/drogon/ssize_t.patch b/ports/drogon/ssize_t.patch deleted file mode 100644 index aae977522a37ef..00000000000000 --- a/ports/drogon/ssize_t.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/orm_lib/inc/drogon/orm/Mapper.h b/orm_lib/inc/drogon/orm/Mapper.h -index d248625..8911f7f 100644 ---- a/orm_lib/inc/drogon/orm/Mapper.h -+++ b/orm_lib/inc/drogon/orm/Mapper.h -@@ -21,7 +21,7 @@ - #include - - #ifdef _WIN32 --using ssize_t = std::intptr_t; -+using ssize_t = long long; - #endif - - namespace drogon diff --git a/versions/baseline.json b/versions/baseline.json index 359f098e2fb658..342edfe090d26c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1749,7 +1749,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.6.0", + "baseline": "1.7.1", "port-version": 0 }, "dtl": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index fad0fff2c3f229..309d7689d78652 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a325c34025250341e3f721353d5d3dfa66017e2b", + "version-string": "1.7.1", + "port-version": 0 + }, { "git-tree": "29f71d851bbd006bfed9aaad62b34158b3f7cc0a", "version-string": "1.6.0", From 009d1dbb90e3371301ab6273fab90243002495a8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 1 Jul 2021 22:38:43 +0800 Subject: [PATCH 080/141] [socket-io-client] update to 3.0.0 (#18646) * [socket-io-client] update to 3.0.0 * update version * update patch file * update version --- ports/socket-io-client/CONTROL | 4 -- ports/socket-io-client/fix-error-C3321.patch | 13 +++++++ .../socket-io-client/fix-file-not-found.patch | 38 +++++++++++++++++++ ports/socket-io-client/fix-install.patch | 22 ----------- ports/socket-io-client/portfile.cmake | 13 ++++--- ports/socket-io-client/vcpkg.json | 11 ++++++ versions/baseline.json | 2 +- versions/s-/socket-io-client.json | 5 +++ 8 files changed, 76 insertions(+), 32 deletions(-) delete mode 100644 ports/socket-io-client/CONTROL create mode 100644 ports/socket-io-client/fix-error-C3321.patch create mode 100644 ports/socket-io-client/fix-file-not-found.patch delete mode 100644 ports/socket-io-client/fix-install.patch create mode 100644 ports/socket-io-client/vcpkg.json diff --git a/ports/socket-io-client/CONTROL b/ports/socket-io-client/CONTROL deleted file mode 100644 index bd7b036a8d09e9..00000000000000 --- a/ports/socket-io-client/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: socket-io-client -Version: 1.6.1-1 -Description: C++11 implementation of Socket.IO client -Build-Depends: boost, rapidjson, websocketpp diff --git a/ports/socket-io-client/fix-error-C3321.patch b/ports/socket-io-client/fix-error-C3321.patch new file mode 100644 index 00000000000000..6a36e9d979f87d --- /dev/null +++ b/ports/socket-io-client/fix-error-C3321.patch @@ -0,0 +1,13 @@ +diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp +index f78aea4..6780e26 100644 +--- a/src/internal/sio_client_impl.cpp ++++ b/src/internal/sio_client_impl.cpp +@@ -286,7 +286,7 @@ namespace sio + if(ec || m_con.expired()) + { + if (ec != asio::error::operation_aborted) +- LOG("ping exit,con is expired?"< Date: Thu, 1 Jul 2021 10:39:09 -0400 Subject: [PATCH 081/141] [morton-nd] Update to v4.0.0. (#18652) * Update morton-nd to v4.0.0. * Update baselines. --- ports/morton-nd/CONTROL | 2 +- ports/morton-nd/portfile.cmake | 6 +++--- versions/baseline.json | 2 +- versions/m-/morton-nd.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/morton-nd/CONTROL b/ports/morton-nd/CONTROL index e6866779ecc869..34bd160e57f36b 100644 --- a/ports/morton-nd/CONTROL +++ b/ports/morton-nd/CONTROL @@ -1,4 +1,4 @@ Source: morton-nd -Version: 3.0.0 +Version: 4.0.0 Homepage: https://github.com/kevinhartman/morton-nd Description: header-only constexpr library for fast Morton encoding/decoding in N dimensions. diff --git a/ports/morton-nd/portfile.cmake b/ports/morton-nd/portfile.cmake index 46aa5bef5ecdbe..bd2d6dd0018d0e 100644 --- a/ports/morton-nd/portfile.cmake +++ b/ports/morton-nd/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kevinhartman/morton-nd - REF v3.0.0 - SHA512 659c903c0c4a4ee4179d01950a952fe0c40d2c426063c10515ae5d2ad13ec8ca6b83d8de50c9eb86dd3c2c3747e1594d832f0c28cd6d414703baf9a7ab2f1f36 - HEAD_REF master + REF v4.0.0 + SHA512 19dc51ae5d7fc868625a9c9f0dddec95a77fdeac714300033008f096bc3a83f146738e525e8a0ec541903263355a7fec84b1873d8eacfca4b93d3cd8945653da + HEAD_REF main ) vcpkg_configure_cmake( diff --git a/versions/baseline.json b/versions/baseline.json index 8f298878adbd1c..efaf27134ba417 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4109,7 +4109,7 @@ "port-version": 0 }, "morton-nd": { - "baseline": "3.0.0", + "baseline": "4.0.0", "port-version": 0 }, "mosquitto": { diff --git a/versions/m-/morton-nd.json b/versions/m-/morton-nd.json index 9ae9a06d431d46..d21bc7c5418717 100644 --- a/versions/m-/morton-nd.json +++ b/versions/m-/morton-nd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "949f90299960d91f4cfd457a093dd70c5e285782", + "version-string": "4.0.0", + "port-version": 0 + }, { "git-tree": "acdac4e47f9b91d7a7dd27aa9689f029fdd43895", "version-string": "3.0.0", From 5dfb46e1e48a0f965a367f3b019b7f77f331f41d Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 1 Jul 2021 23:25:25 +0800 Subject: [PATCH 082/141] [libdatachannel] Fix usage (#18621) * [libdatachannel] Fix usage * Update version files --- ports/libdatachannel/portfile.cmake | 10 +++++++++- ports/libdatachannel/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 563224524f9692..4104d890a6bf88 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -34,4 +34,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libdatachannel) vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake DATACHANNEL_CONFIG) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake " +include(CMakeFindDependencyMacro) +find_dependency(Threads) +find_dependency(OpenSSL) +find_dependency(libjuice) +${DATACHANNEL_CONFIG}") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 7ba32db68fba45..903b994033788d 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdatachannel", "version-semver": "0.12.2", + "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/versions/baseline.json b/versions/baseline.json index efaf27134ba417..55356ebc339363 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3082,7 +3082,7 @@ }, "libdatachannel": { "baseline": "0.12.2", - "port-version": 0 + "port-version": 1 }, "libdatrie": { "baseline": "0.2.10-3", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 2b289cd5d9c467..ea8a70416a8504 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a13526e9cfc5bfca3aa00e95afa184b498890f69", + "version-semver": "0.12.2", + "port-version": 1 + }, { "git-tree": "dd3107dd99419236f97e299ce4b61c2379a08f55", "version-semver": "0.12.2", From bbfd21ec4132a022ef9998b7149157fa5192c2a2 Mon Sep 17 00:00:00 2001 From: Matt Haynie Date: Thu, 1 Jul 2021 08:26:35 -0700 Subject: [PATCH 083/141] [fmt] Fix an easily avoidable compilation warning (#18622) * Fix an unconditional #pragma warning breaking other compilers. * Increase fmt version * re-ran vcpkg x-add-version --all --overwrite-version, this time it produced a different result for some reason --- ports/fmt/fix-warning4189.patch | 6 ++++-- ports/fmt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fmt.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch index 0efab0f1c98985..76431c3672b268 100644 --- a/ports/fmt/fix-warning4189.patch +++ b/ports/fmt/fix-warning4189.patch @@ -2,11 +2,13 @@ diff --git a/include/fmt/format.h b/include/fmt/format.h index 4e96539..0f1d179 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h -@@ -33,6 +33,7 @@ +@@ -33,6 +33,9 @@ #ifndef FMT_FORMAT_H_ #define FMT_FORMAT_H_ - + ++#ifdef _MSC_VER +#pragma warning(disable:4189) ++#endif #include #include #include diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index 2328012478dde5..b55b731cca125d 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fmt", "version": "7.1.3", - "port-version": 4, + "port-version": 5, "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 55356ebc339363..c67d2a51e18cd4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2054,7 +2054,7 @@ }, "fmt": { "baseline": "7.1.3", - "port-version": 4 + "port-version": 5 }, "folly": { "baseline": "2020.10.19.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 69976a238ea7fc..13c7be1723249b 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52a5c56d85771a278330e955b703f4db86cfe86d", + "version": "7.1.3", + "port-version": 5 + }, { "git-tree": "230e140a15afbb9089537e153d8b83f5b994adbe", "version": "7.1.3", From 611d246e09ee0607e3b679c1f9fb89d560d9de1d Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 1 Jul 2021 17:37:59 +0200 Subject: [PATCH 084/141] [sentry-native] Update to 0.4.10 (#18627) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 6 +++--- ports/sentry-native/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 706d212d21b471..e810d504ced2b7 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -3,9 +3,9 @@ if(NOT VCPKG_TARGET_IS_OSX) endif() vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.9/sentry-native.zip" - FILENAME "sentry-native-0.4.9.zip" - SHA512 152e3c6cfc7a72421f088f0e9853f016b62e2c22c580edb6255355648d293a31507974bc5c12ef3c0cd721d07797b9948f53ecafa1482d3264504cafac1fe8a3 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.10/sentry-native.zip" + FILENAME "sentry-native-0.4.10.zip" + SHA512 fd7aa8de707b19dfc3704e3f1d73bb35aa65cf26e95df0baf2061ce756232b76b26d406ffc11b53e57d949f5f14899265095d8d4d3f8ff4777cdeceeca5b6f94 ) vcpkg_extract_source_archive_ex( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index cca64cbfbf2e91..131b08ce3b6f0f 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sentry-native", - "version-semver": "0.4.9", - "port-version": 1, + "version-semver": "0.4.10", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index c67d2a51e18cd4..298aa0680a0ad8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5709,8 +5709,8 @@ "port-version": 0 }, "sentry-native": { - "baseline": "0.4.9", - "port-version": 1 + "baseline": "0.4.10", + "port-version": 0 }, "septag-sx": { "baseline": "2019-05-07-2", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index f85102c8e50735..995604ea7dfcf1 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "487eaee55f15e263063288c15aab12d296ac598f", + "version-semver": "0.4.10", + "port-version": 0 + }, { "git-tree": "8200b5e337c4e6074c67a6a2398fa7bbbb3c2e4b", "version-semver": "0.4.9", From 96a383faab056b591c7d4ba0cd4ffd6b80dc6abf Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Thu, 1 Jul 2021 17:38:44 +0200 Subject: [PATCH 085/141] [Vc] Update to 1.4.2 (#18601) --- ports/vc/CONTROL | 3 +-- ports/vc/portfile.cmake | 4 ++-- versions/baseline.json | 4 ++-- versions/v-/vc.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/vc/CONTROL b/ports/vc/CONTROL index c3962f4b49e55f..8b905405668846 100644 --- a/ports/vc/CONTROL +++ b/ports/vc/CONTROL @@ -1,6 +1,5 @@ Source: vc -Version: 1.4.1 -Port-Version: 1 +Version: 1.4.2 Homepage: https://github.com/VcDevel/Vc Description: SIMD Vector Classes for C++ . Supports: !arm64 diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake index 7853834d1a61b8..3b51c814190784 100644 --- a/ports/vc/portfile.cmake +++ b/ports/vc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VcDevel/Vc - REF 1.4.1 - SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a + REF 1.4.2 + SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf HEAD_REF 1.4 PATCHES "correct_cmake_config_path.patch" diff --git a/versions/baseline.json b/versions/baseline.json index 298aa0680a0ad8..2fd1831c432802 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6501,8 +6501,8 @@ "port-version": 0 }, "vc": { - "baseline": "1.4.1", - "port-version": 1 + "baseline": "1.4.2", + "port-version": 0 }, "vcglib": { "baseline": "1.0.1", diff --git a/versions/v-/vc.json b/versions/v-/vc.json index 8777c912d0eac4..11a39281256508 100644 --- a/versions/v-/vc.json +++ b/versions/v-/vc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "510cde85ec14ef88187857247829183c1c275f63", + "version-string": "1.4.2", + "port-version": 0 + }, { "git-tree": "1ab229fb781ff549e05917c4ec46a1fcd6bd1a3a", "version-string": "1.4.1", From 4843ba4db1f052084d61032a958bfef3182cdb6a Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Thu, 1 Jul 2021 08:41:40 -0700 Subject: [PATCH 086/141] [seal] Fixed cannot find SEAL. (#18596) * Fixed cannot find seal. * Updated versioning. --- ports/seal/portfile.cmake | 2 +- ports/seal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/seal.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index f24241a3f9475d..b458c9067f7209 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -31,7 +31,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/") +vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/SEAL-3.6") if("hexl" IN_LIST FEATURES) vcpkg_fixup_pkgconfig(SKIP_CHECK) diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json index ef5b166a57de3f..f7a7928dd8e3ee 100644 --- a/ports/seal/vcpkg.json +++ b/ports/seal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "seal", "version-semver": "3.6.6", + "port-version": 1, "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", "supports": "!windows | (windows & static)", diff --git a/versions/baseline.json b/versions/baseline.json index 2fd1831c432802..07b88996946215 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5694,7 +5694,7 @@ }, "seal": { "baseline": "3.6.6", - "port-version": 0 + "port-version": 1 }, "secp256k1": { "baseline": "2017-19-10", diff --git a/versions/s-/seal.json b/versions/s-/seal.json index 53e227f6dae866..56f081d64ba5ed 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89d120a6c3ac5306d90e29913048b518dc5a2c9b", + "version-semver": "3.6.6", + "port-version": 1 + }, { "git-tree": "e487b9120a78480800a1fd914477acf03f677919", "version-semver": "3.6.6", From 0bbfab79e6f35661666d6507269ebddd7bb19018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 1 Jul 2021 19:03:05 +0300 Subject: [PATCH 087/141] [mongo-c-driver] Fix for custom VCPKG_BUILD_TYPE (#18569) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix mongo-c-driver for custom VCPKG_BUILD_TYPE * Update version * Update ports/mongo-c-driver/portfile.cmake * Update versions/m-/mongo-c-driver.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert ONeal III --- ports/mongo-c-driver/CONTROL | 2 +- ports/mongo-c-driver/portfile.cmake | 34 ++++++++++++++++++----------- versions/baseline.json | 2 +- versions/m-/mongo-c-driver.json | 5 +++++ 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index 6472ce1a20fca9..54a225a02e5a46 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -1,6 +1,6 @@ Source: mongo-c-driver Version: 1.16.1 -Port-Version: 4 +Port-Version: 5 Build-Depends: libbson, openssl (!windows), zlib Description: Client library written in C for MongoDB. Homepage: https://github.com/mongodb/mongo-c-driver diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 9ddf3a6b41da61..eca359bd6dc728 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -85,20 +85,28 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_TARGET_IS_UWP) - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) + if(NOT VCPKG_TARGET_IS_WINDOWS) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) + endif() else() - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + endif() endif() # drop the __declspec(dllimport) when building static diff --git a/versions/baseline.json b/versions/baseline.json index 07b88996946215..831cc1f74c0856 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4082,7 +4082,7 @@ }, "mongo-c-driver": { "baseline": "1.16.1", - "port-version": 4 + "port-version": 5 }, "mongo-cxx-driver": { "baseline": "3.4.0-5", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index ae610504943f88..033ff1e25338d8 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a68782eaa1afe2fc3de47db769e230ebd542ca7", + "version-string": "1.16.1", + "port-version": 5 + }, { "git-tree": "6b948f7f7ff67f47481c2630ba40ab300bceee01", "version-string": "1.16.1", From 0c0bdc5d7fbf5b52e0371a85976ee93bb01ae5f1 Mon Sep 17 00:00:00 2001 From: bucurb Date: Thu, 1 Jul 2021 17:10:50 +0100 Subject: [PATCH 088/141] [protobuf] Fixed protoc path (#18741) * fixed protoc path * bumped version --- ports/protobuf/vcpkg-cmake-wrapper.cmake | 2 +- ports/protobuf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/protobuf.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/protobuf/vcpkg-cmake-wrapper.cmake b/ports/protobuf/vcpkg-cmake-wrapper.cmake index 542a16c2b8a300..7269aedcca508f 100644 --- a/ports/protobuf/vcpkg-cmake-wrapper.cmake +++ b/ports/protobuf/vcpkg-cmake-wrapper.cmake @@ -11,6 +11,6 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) cmake_policy(POP) endif() -find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/tools/protobuf" NO_DEFAULT_PATH) +find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../tools/protobuf" NO_DEFAULT_PATH) _find_package(${ARGS}) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 5f1926a088ef4d..0e85e376c0ca9e 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "protobuf", "version-semver": "3.15.8", - "port-version": 2, + "port-version": 3, "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 831cc1f74c0856..2e0268409fc5ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4990,7 +4990,7 @@ }, "protobuf": { "baseline": "3.15.8", - "port-version": 2 + "port-version": 3 }, "protobuf-c": { "baseline": "1.3.2-2", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index 7ce8bc35fdf464..547ba83f2e6606 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88066eeef097b56edc3bff316ce292d57c132d12", + "version-semver": "3.15.8", + "port-version": 3 + }, { "git-tree": "1c52c3eb43c2dfd9603673eb5c173ec69c21ea73", "version-semver": "3.15.8", From b7e39651e85b75baf59774b2d0813217e60c5931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 2 Jul 2021 00:14:08 +0800 Subject: [PATCH 089/141] [recast] Export unofficial target (#18671) * [recast] Export unofficial target * update version record * Export INTERFACE_INCLUDE_DIRECTORIES * Export more include dirs. * Update versions/r-/recast.json --- ports/recast/CMakeLists.txt | 26 ++++++++++++++++++-------- ports/recast/CONTROL | 4 ---- ports/recast/portfile.cmake | 12 +++++++----- ports/recast/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++-- versions/r-/recast.json | 5 +++++ 6 files changed, 49 insertions(+), 19 deletions(-) delete mode 100644 ports/recast/CONTROL create mode 100644 ports/recast/vcpkg.json diff --git a/ports/recast/CMakeLists.txt b/ports/recast/CMakeLists.txt index 5b54f6e208a621..7ccc0828a1f31b 100644 --- a/ports/recast/CMakeLists.txt +++ b/ports/recast/CMakeLists.txt @@ -1,14 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(recast) -include_directories( - DebugUtils/Include - Detour/Include - DetourCrowd/Include - DetourTileCache/Include - Recast/Include -) - set(SRC DebugUtils/Source/DebugDraw.cpp DebugUtils/Source/DetourDebugDraw.cpp @@ -42,12 +34,30 @@ set(SRC add_library(recast ${SRC}) +target_include_directories( + recast PUBLIC + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ +) + install( TARGETS recast + EXPORT unofficial-recast-config LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +install(EXPORT unofficial-recast-config DESTINATION share/unofficial-recast) + if(NOT DISABLE_INSTALL_HEADERS) install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils) install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour) diff --git a/ports/recast/CONTROL b/ports/recast/CONTROL deleted file mode 100644 index 3726b99d501307..00000000000000 --- a/ports/recast/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: recast -Version: 1.5.1-3 -Homepage: https://github.com/recastnavigation/recastnavigation -Description: Navigation-mesh Toolset for Games diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake index 3b6038e41c5b92..11484caa16b9d1 100644 --- a/ports/recast/portfile.cmake +++ b/ports/recast/portfile.cmake @@ -8,16 +8,18 @@ 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_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/recast RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast) vcpkg_copy_pdbs() +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/recast/vcpkg.json b/ports/recast/vcpkg.json new file mode 100644 index 00000000000000..5abe9f93b06f5d --- /dev/null +++ b/ports/recast/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "recast", + "version": "1.5.1", + "port-version": 4, + "description": "Navigation-mesh Toolset for Games", + "homepage": "https://github.com/recastnavigation/recastnavigation", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 2e0268409fc5ef..aad2d7d7c02ce2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5473,8 +5473,8 @@ "port-version": 1 }, "recast": { - "baseline": "1.5.1-3", - "port-version": 0 + "baseline": "1.5.1", + "port-version": 4 }, "redis-plus-plus": { "baseline": "1.2.3", diff --git a/versions/r-/recast.json b/versions/r-/recast.json index d4fcf997122c22..82f778cd71bafd 100644 --- a/versions/r-/recast.json +++ b/versions/r-/recast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f34af0b398b4c37f0cdf3fcd8dc9db965e4dd5e", + "version": "1.5.1", + "port-version": 4 + }, { "git-tree": "41f8cc06fc981d330671b88e08d02de55934155c", "version-string": "1.5.1-3", From 1acb0ed642e2897a16545c0001485779b1638f3e Mon Sep 17 00:00:00 2001 From: Sander Cox Date: Thu, 1 Jul 2021 18:21:55 +0200 Subject: [PATCH 090/141] [vcpkg] Expand Architecture list with escape chars (#18156) * Expand Architecture list with escape chars This expands the architecture lists with escape characters. When building FAT binaries for macos using multiple architectures in the values they need to be escaped otherwise they are passed on to CMake incorrectly #14932 * Adding the architecture fix to vcpkg-cmake port updating port vcpkg-cmake version * updated version in baseline --- ports/vcpkg-cmake/vcpkg.json | 4 ++-- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 6 ++++-- scripts/cmake/vcpkg_configure_cmake.cmake | 7 ++++--- versions/baseline.json | 4 ++-- versions/v-/vcpkg-cmake.json | 5 +++++ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 8e2ac9ec664858..ffda714e3fe066 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2021-02-28", - "port-version": 3 + "version-date": "2021-06-25", + "port-version": 4 } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index acc6f365547aa8..beffd32b0519ba 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -251,6 +251,7 @@ function(vcpkg_cmake_configure) endif() + list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecture_string) list(APPEND arg_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" @@ -274,7 +275,7 @@ function(vcpkg_cmake_configure) "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}" "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}" - "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" + "-DVCPKG_TARGET_ARCHITECTURE=${target_architecture_string}" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" @@ -289,7 +290,8 @@ function(vcpkg_cmake_configure) # Sets configuration variables for macOS builds foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) if(DEFINED VCPKG_${config_var}) - list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") + list(JOIN VCPKG_${config_var} "\;" config_var_value) + list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}") endif() endforeach() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index fdf054e43ee975..1eb50e852b9699 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -231,7 +231,7 @@ function(vcpkg_configure_cmake) endif() endif() - + list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecure_string) list(APPEND arg_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" @@ -255,7 +255,7 @@ function(vcpkg_configure_cmake) "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}" "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}" - "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" + "-DVCPKG_TARGET_ARCHITECTURE=${target_architecure_string}" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" @@ -272,7 +272,8 @@ function(vcpkg_configure_cmake) # Sets configuration variables for macOS builds foreach(config_var INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) if(DEFINED VCPKG_${config_var}) - list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") + list(JOIN VCPKG_${config_var} "\;" config_var_value) + list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}") endif() endforeach() diff --git a/versions/baseline.json b/versions/baseline.json index aad2d7d7c02ce2..33c150b7e5966f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6509,8 +6509,8 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2021-02-28", - "port-version": 3 + "baseline": "2021-06-25", + "port-version": 4 }, "vcpkg-cmake-config": { "baseline": "2021-05-22", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 1f1fb408b63923..96d5eb75da9fca 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "acc25ec22f8fd8887a865705580b1d6de041616d", + "version-date": "2021-06-25", + "port-version": 4 + }, { "git-tree": "0e8bb94599a00fd9c61fd0ae524c22a067c21420", "version-date": "2021-02-28", From 98dd796fe9f3bb93e6950b18c7113f502c163277 Mon Sep 17 00:00:00 2001 From: omartijn <44672243+omartijn@users.noreply.github.com> Date: Thu, 1 Jul 2021 18:24:59 +0200 Subject: [PATCH 091/141] [ffmpeg] multi arch support (#18635) * Expand Architecture list with escape chars This expands the architecture lists with escape characters. When building FAT binaries for macos using multiple architectures in the values they need to be escaped otherwise they are passed on to CMake incorrectly #14932 * Adding the architecture fix to vcpkg-cmake port updating port vcpkg-cmake version * updated version in baseline * Allow building ffmpeg for multiple architectures on macOS Since ffmpeg does _not_ support multi-arch builds due to their use of autotools and config.h which then includes the wrong platform-dependent functions, we must perform two separate builds and join them using lipo * fixup! Allow building ffmpeg for multiple architectures on macOS * fixup! Allow building ffmpeg for multiple architectures on macOS Co-authored-by: Sander Cox Co-authored-by: Martijn Otto --- ports/ffmpeg/build.sh.in | 93 ++++++++++++++++++++++++++++++++++--- ports/ffmpeg/portfile.cmake | 27 ++++++++++- ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 ++ 5 files changed, 119 insertions(+), 10 deletions(-) diff --git a/ports/ffmpeg/build.sh.in b/ports/ffmpeg/build.sh.in index 58040884b11f6c..b7e53982c14f2c 100644 --- a/ports/ffmpeg/build.sh.in +++ b/ports/ffmpeg/build.sh.in @@ -15,6 +15,61 @@ cygpath() { fi } +move_binary() { + SOURCE=$1 + TARGET=$2 + BINARY=$3 + + # run lipo over the command to check whether it really + # is a binary that we need to merge architectures + lipo $SOURCE/$BINARY -info &> /dev/null || return 0 + + # get the directory name the file is in + DIRNAME=$(dirname $BINARY) + + # ensure the directory to move the binary to exists + mkdir -p $TARGET/$DIRNAME + + # now finally move the binary + mv $SOURCE/$BINARY $TARGET/$BINARY +} + +move_binaries() { + SOURCE=$1 + TARGET=$2 + + [ ! -d $SOURCE ] && return 0 + pushd $SOURCE + + for BINARY in $(find . -type f); do + move_binary $SOURCE $TARGET $BINARY + done + + popd +} + +merge_binaries() { + TARGET=$1 + SOURCE=$2 + + shift + shift + + pushd $SOURCE/$1 + BINARIES=$(find . -type f) + popd + + for BINARY in $BINARIES; do + COMMAND="lipo -create -output $TARGET/$BINARY" + + for ARCH in $@; do + COMMAND="$COMMAND -arch $ARCH $SOURCE/$ARCH/$BINARY" + done + + $($COMMAND) + done +} + export PKG_CONFIG_PATH="$(cygpath -p "${PKG_CONFIG_PATH}")" # Export HTTP(S)_PROXY as http(s)_proxy: @@ -27,19 +82,45 @@ PATH_TO_PACKAGE_DIR=$(cygpath "@INST_PREFIX@") JOBS=@VCPKG_CONCURRENCY@ +OSX_ARCHS="@OSX_ARCHS@" +OSX_ARCH_COUNT=0@OSX_ARCH_COUNT@ + # Default to hardware concurrency if unset. : ${JOBS:=$(nproc)} +build_ffmpeg() { + echo "=== CONFIGURING ===" + + sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@ $@ + + echo "=== BUILDING ===" + + make -j${JOBS} + + echo "=== INSTALLING ===" + + make install +} + cd "$PATH_TO_BUILD_DIR" -echo "=== CONFIGURING ===" +if [ $OSX_ARCH_COUNT -gt 1 ]; then + for ARCH in $OSX_ARCHS; do + echo "=== CLEANING FOR $ARCH ===" + + make clean && make distclean -sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@ + build_ffmpeg --enable-cross-compile --arch=$ARCH --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH -echo "=== BUILDING ===" + echo "=== COLLECTING BINARIES FOR $ARCH ===" -make -j${JOBS} + move_binaries $PATH_TO_PACKAGE_DIR/lib $PATH_TO_BUILD_DIR/stage/$ARCH/lib + move_binaries $PATH_TO_PACKAGE_DIR/bin $PATH_TO_BUILD_DIR/stage/$ARCH/bin + done -echo "=== INSTALLING ===" + echo "=== MERGING ARCHITECTURES ===" -make install + merge_binaries $PATH_TO_PACKAGE_DIR $PATH_TO_BUILD_DIR/stage $OSX_ARCHS +else + build_ffmpeg +fi diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 0f3121bf4a9628..1dfe4b18e21a14 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -550,8 +550,22 @@ else() set(OPTIONS "${OPTIONS} --disable-zlib") endif() +set(CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/vars.cmake") +vcpkg_internal_get_cmake_vars(OUTPUT_FILE CMAKE_VARS_FILE) +include("${CMAKE_VARS_FILE}") + 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 "") @@ -564,8 +578,17 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU 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) # VCPKG_TARGET_ARCHITECTURE = arm64 - 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") + elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") # VCPKG_TARGET_ARCHITECTURE = arm64 + # 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") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index fe16cfed194c3f..1b5c40f0a0d672 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 5, + "port-version": 6, "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 33c150b7e5966f..e83e77263fbb0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 5 + "port-version": 6 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index a39b1d79a8f05f..14c7c2f68b7c56 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29", + "version": "4.4", + "port-version": 6 + }, { "git-tree": "234eb0e352d2a7be0a3b34fb9eb8a9f0417ffe94", "version": "4.4", From 1fadf432123101edf6c216ef8e3e7992a58773b3 Mon Sep 17 00:00:00 2001 From: bucurb Date: Thu, 1 Jul 2021 17:49:04 +0100 Subject: [PATCH 092/141] [libxml2] Fix target (#18714) * fix LibXml2 target dependencies * updated version files --- ports/libxml2/vcpkg-cmake-wrapper.cmake | 3 +++ ports/libxml2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libxml2.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 405b94670762ea..31bab78f790b65 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -12,6 +12,9 @@ if(LibXml2_FOUND) select_library_configurations(ICONV) select_library_configurations(CHARSET) list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) + if(TARGET LibXml2::LibXml2) + target_link_libraries(LibXml2::LibXml2 INTERFACE "liblzma::liblzma" "ZLIB::ZLIB") + endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBXML2_LIBRARIES m) endif() diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 617e3a4a5b4a50..fbcd7b114e5841 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.10", - "port-version": 7, + "port-version": 8, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e83e77263fbb0c..33a407bb52f347 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3714,7 +3714,7 @@ }, "libxml2": { "baseline": "2.9.10", - "port-version": 7 + "port-version": 8 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 3675ab5183614a..6fe34d800a2f9e 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0cf9aec6fb5cd87ae6358e9015e92e9d113c1f1", + "version-semver": "2.9.10", + "port-version": 8 + }, { "git-tree": "f86ba7081b940af77e935875fbdf9cbf69446b9f", "version-semver": "2.9.10", From 52c9fa5f380b3cdb199228291db8978545b71170 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 2 Jul 2021 01:14:42 +0800 Subject: [PATCH 093/141] [bzip2] Update repository (#18705) * [bzip2] Update repository * Update version files --- ports/bzip2/portfile.cmake | 16 ++++++++++------ ports/bzip2/vcpkg.json | 4 ++-- versions/b-/bzip2.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index 19314eb0ee6446..36141ffcbc6e8b 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -1,10 +1,14 @@ -vcpkg_from_git( +set(BZIP2_VERSION 1.0.8) +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz" + FILENAME "bzip2-${BZIP2_VERSION}.tar.gz" + SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 +) + +vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - URL https://sourceware.org/git/bzip2.git - REF 75a94bea3918e612b879d6a11ca64b8689526147 # REFERENCE BZIP2 VERSION 1.0.8 - SHA512 4611105f9090477b5f6f6dbd303a282099df71644e04d8a998ef81de487f6c8cac4c0ec1283ad737f6767c51f1e3b4e24e2ee021c6dd085925617d9ed145b2ba - PATCHES - fix-import-export-macros.patch + ARCHIVE ${ARCHIVE} + PATCHES fix-import-export-macros.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json index 8c7520de83e597..2f8b8aabf328a9 100644 --- a/ports/bzip2/vcpkg.json +++ b/ports/bzip2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bzip2", - "version-string": "1.0.8", - "port-version": 1, + "version-semver": "1.0.8", + "port-version": 2, "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.", "homepage": "https://sourceware.org/bzip2/", "documentation": "https://sourceware.org/bzip2/docs.html" diff --git a/versions/b-/bzip2.json b/versions/b-/bzip2.json index 807881050df8b7..7025c509f3b16e 100644 --- a/versions/b-/bzip2.json +++ b/versions/b-/bzip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1ea352502e69888a565563d9151d3f7ab609fb1", + "version-semver": "1.0.8", + "port-version": 2 + }, { "git-tree": "5a1b1b8d666b9ef64e8596e4716c2e2f654f4532", "version-string": "1.0.8", diff --git a/versions/baseline.json b/versions/baseline.json index 33a407bb52f347..dc56a7b10bf7ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1090,7 +1090,7 @@ }, "bzip2": { "baseline": "1.0.8", - "port-version": 1 + "port-version": 2 }, "c-ares": { "baseline": "1.17.1", From cbbe3a062667d86458210e5210b4cbb90616a083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 2 Jul 2021 01:20:48 +0800 Subject: [PATCH 094/141] [tgui] Fix feature tool dependency (#18724) * [tgui] Fix feature tool dependency * update version record --- ports/tgui/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/t-/tgui.json | 5 +++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json index 96fef2d0973832..387a20c909c0ac 100644 --- a/ports/tgui/vcpkg.json +++ b/ports/tgui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tgui", "version-date": "2021-04-19", - "port-version": 1, + "port-version": 2, "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", "homepage": "https://tgui.eu", "default-features": [ @@ -35,7 +35,16 @@ ] }, "tool": { - "description": "Build GUI builder" + "description": "Build GUI builder", + "dependencies": [ + { + "name": "tgui", + "features": [ + "sdl2", + "sfml" + ] + } + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index dc56a7b10bf7ac..fe92991c8a07c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6154,7 +6154,7 @@ }, "tgui": { "baseline": "2021-04-19", - "port-version": 1 + "port-version": 2 }, "theia": { "baseline": "0.8", diff --git a/versions/t-/tgui.json b/versions/t-/tgui.json index 184813be079cae..f04e637e79f05e 100644 --- a/versions/t-/tgui.json +++ b/versions/t-/tgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fd517c4e738da62e959b791a6cdd952e7bd8345", + "version-date": "2021-04-19", + "port-version": 2 + }, { "git-tree": "354b5135bda4bcef9c5e7cbfeaff3d457b336e8c", "version-date": "2021-04-19", From 9840c4b27155bf1eea78603d77f5180452e89f0b Mon Sep 17 00:00:00 2001 From: Lev Stipakov Date: Thu, 1 Jul 2021 20:21:44 +0300 Subject: [PATCH 095/141] [OpenSSL] support for "no-autoload-config" config option (#18389) * [OpenSSL]: support for "no-autoload-config" config option OpenSSL has "no-autoload-config" config option, which disables automatic config loading: https://github.com/openssl/openssl/pull/5959 This patch allows to set above option via variable in custom triplet: # build-openssl-no-autoload-config.cmake set(OPENSSL_NO_AUTOLOAD_CONFIG ON) and use it like: vcpkg install --overlay-triplets= \ openssl:build-openssl-no-autoload-config Signed-off-by: Lev Stipakov * [OpenSSL] bump version Signed-off-by: Lev Stipakov --- ports/openssl/vcpkg.json | 2 +- ports/openssl/windows/portfile.cmake | 4 ++++ versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index cd7b732c001604..547f7ba5daf086 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "port-version": 5, + "port-version": 6, "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" } diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 7a3bf08ed57c4b..3065abddc6f04f 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -29,6 +29,10 @@ if(DEFINED OPENSSL_USE_NOPINSHARED) set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-pinshared) endif() +if(OPENSSL_NO_AUTOLOAD_CONFIG) + set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-autoload-config) +endif() + set(CONFIGURE_COMMAND "${PERL}" Configure ${CONFIGURE_OPTIONS}) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") diff --git a/versions/baseline.json b/versions/baseline.json index fe92991c8a07c5..02d14d2fd3cd6f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4610,7 +4610,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 5 + "port-version": 6 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 281a232db0cb6e..21a4dfb25adc98 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3", + "version-string": "1.1.1k", + "port-version": 6 + }, { "git-tree": "9cbfcf1a35e62330f5ebddca9d0f1ea493172ef7", "version-string": "1.1.1k", From 82fba6f1423f7ac2e5a8363a487445526493b8f6 Mon Sep 17 00:00:00 2001 From: "Michael R. P. Ragazzon" Date: Thu, 1 Jul 2021 19:25:42 +0200 Subject: [PATCH 096/141] [rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat --- ports/rmlui/add-robin-hood.patch | 38 ++++++++++++++++++++++ ports/rmlui/portfile.cmake | 56 ++++++++++++++++++++++++++++++++ ports/rmlui/vcpkg.json | 34 +++++++++++++++++++ versions/baseline.json | 4 +++ versions/r-/rmlui.json | 9 +++++ 5 files changed, 141 insertions(+) create mode 100644 ports/rmlui/add-robin-hood.patch create mode 100644 ports/rmlui/portfile.cmake create mode 100644 ports/rmlui/vcpkg.json create mode 100644 versions/r-/rmlui.json diff --git a/ports/rmlui/add-robin-hood.patch b/ports/rmlui/add-robin-hood.patch new file mode 100644 index 00000000000000..4a39a8a5a1aa96 --- /dev/null +++ b/ports/rmlui/add-robin-hood.patch @@ -0,0 +1,38 @@ +diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake +index 9c3042c..c3820df 100644 +--- a/CMake/FileList.cmake ++++ b/CMake/FileList.cmake +@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp +- ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62432f1..d9287c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -387,6 +387,8 @@ if( ENABLE_SVG_PLUGIN ) + message("-- Can SVG plugin be enabled - yes - lunasvg library found") + endif() + ++find_path(ROBIN_HOOD_INCLUDE_DIR robin_hood.h) ++include_directories(${ROBIN_HOOD_INCLUDE_DIR}) + + if(NOT BUILD_FRAMEWORK) + #=================================== +diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h +index dc42753..5249e1d 100644 +--- a/Include/RmlUi/Config/Config.h ++++ b/Include/RmlUi/Config/Config.h +@@ -57,7 +57,7 @@ + #else + #include "../Core/Containers/chobo/flat_map.hpp" + #include "../Core/Containers/chobo/flat_set.hpp" +-#include "../Core/Containers/robin_hood.h" ++#include + #endif // RMLUI_NO_THIRDPARTY_CONTAINERS + + namespace Rml { diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake new file mode 100644 index 00000000000000..cf9ec6f057002d --- /dev/null +++ b/ports/rmlui/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mikke89/RmlUi + REF 4.1 + SHA512 f79bd30104c42469142e4c79a81f120c61f5bd3ae918df9847fa42d05fcda372d3adb5f6884c81c8517a440a81235e70ffcdde8d98751a14d2e4265fc2051a01 + HEAD_REF master + PATCHES + add-robin-hood.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + lua BUILD_LUA_BINDINGS + INVERTED_FEATURES + freetype NO_FONT_INTERFACE_DEFAULT +) + +# Remove built-in header, instead we use vcpkg version (from robin-hood-hashing port) +file(REMOVE ${SOURCE_PATH}/Include/RmlUi/Core/Containers/robin_hood.h) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/RmlUi/cmake +) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/RmlUi + ${CURRENT_PACKAGES_DIR}/lib/RmlUi +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Core/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Debugger/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + if ("lua" IN_LIST FEATURES) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Lua/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + endif() +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json new file mode 100644 index 00000000000000..9b42867c63570c --- /dev/null +++ b/ports/rmlui/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "rmlui", + "version": "4.1", + "maintainers": "Michael R. P. Ragazzon ", + "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", + "homepage": "https://github.com/mikke89/RmlUi", + "documentation": "https://mikke89.github.io/RmlUiDoc/", + "license": "MIT", + "dependencies": [ + "robin-hood-hashing", + "vcpkg-cmake", + "vcpkg-cmake-config" + ], + "default-features": [ + "freetype" + ], + "features": { + "freetype": { + "description": "Include font engine based on FreeType", + "dependencies": [ + { + "name": "freetype", + "default-features": false + } + ] + }, + "lua": { + "description": "Build Lua bindings", + "dependencies": [ + "lua" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 02d14d2fd3cd6f..eafe0100460761 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5528,6 +5528,10 @@ "baseline": "0.3.0", "port-version": 0 }, + "rmlui": { + "baseline": "4.1", + "port-version": 0 + }, "roaring": { "baseline": "2019-03-05-2", "port-version": 0 diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json new file mode 100644 index 00000000000000..f3c15b656f8e82 --- /dev/null +++ b/versions/r-/rmlui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "83f463f3ebcc4e415d6903bea260fb1601a14dd2", + "version": "4.1", + "port-version": 0 + } + ] +} From 8897d54156aed93fc1b45186815bc2ddd2c18342 Mon Sep 17 00:00:00 2001 From: mathijs727 Date: Thu, 1 Jul 2021 19:41:20 +0200 Subject: [PATCH 097/141] [cnl] Update to version 1.1.7 (#18439) * [cnl] update to version 1.1.7 * Update baseline.json * Update ports/cnl/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/cnl/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update HEAD_REF to point to main * Bump port-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Run vcpkg x-add-version cnl * Update versions/c-/cnl.json Co-authored-by: Robert Schumacher * Update ports/cnl/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/c-/cnl.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update git tree with vcpkg x-add-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/cnl/CONTROL | 3 ++- ports/cnl/portfile.cmake | 7 +++---- versions/baseline.json | 2 +- versions/c-/cnl.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/cnl/CONTROL b/ports/cnl/CONTROL index 8daea5ae60981d..ac6f8f2caa1b92 100644 --- a/ports/cnl/CONTROL +++ b/ports/cnl/CONTROL @@ -1,3 +1,4 @@ Source: cnl -Version: 2019-06-23 +Version: 1.1.7 Description: A Compositional Numeric Library for C++ +Homepage: https://github.com/johnmcfarlane/cnl diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake index da03f7900e57ca..3c54e457914edc 100644 --- a/ports/cnl/portfile.cmake +++ b/ports/cnl/portfile.cmake @@ -1,11 +1,10 @@ # header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO johnmcfarlane/cnl - REF 48428242e72b8239cb14c963e40f724929d54df7 - SHA512 c7e012d99409977137a44915dd7a4df5014b6e8540ceee3e82492052541ce77a254d79e624d766b510e7d3a6b17a9d9b02391c6993ae55d3904334116e747983 - HEAD_REF develop + REF 2dde6e62e608a4adc3c5504f067575efa4910568 #v1.1.7 + SHA512 33a81ea726802c71a684bcd002b5119cde4db471ebc9ba02cd15c7487ab468eeca09fb8dcaed953e3f3cded2cd813a903f808d97527b0ec7f393647b64a22572 + HEAD_REF main ) vcpkg_configure_cmake( diff --git a/versions/baseline.json b/versions/baseline.json index eafe0100460761..314465712a6960 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1325,7 +1325,7 @@ "port-version": 0 }, "cnl": { - "baseline": "2019-06-23", + "baseline": "1.1.7", "port-version": 0 }, "coin": { diff --git a/versions/c-/cnl.json b/versions/c-/cnl.json index 9f2ab96483c086..dc0a2ce0168c5b 100644 --- a/versions/c-/cnl.json +++ b/versions/c-/cnl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "645e64c52fc7d6d9570376aba9c684ca45038f54", + "version-string": "1.1.7", + "port-version": 0 + }, { "git-tree": "4778a9818faef4bfac563accbca398763a725cfc", "version-string": "2019-06-23", From ef1ae8ab81ac566a803b3076f9f3b10c725fff38 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 1 Jul 2021 10:45:01 -0700 Subject: [PATCH 098/141] [vcpkg.cmake] fix X_VCPKG_APPLOCAL_DEPS_INSTALL (#18607) * [vcpkg.cmake] fix X_VCPKG_APPLOCAL_DEPS_INSTALL * Billy CR --- scripts/buildsystems/vcpkg.cmake | 95 +++++++++++++++++++------------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 58d3da956a0a10..a25f0f716c1d7b 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -609,29 +609,48 @@ endfunction() # # Note that this function requires CMake 3.14 for policy CMP0087 function(x_vcpkg_install_local_dependencies) - if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") - cmake_parse_arguments(PARSE_ARGV 0 __VCPKG_APPINSTALL "" "DESTINATION;COMPONENT" "TARGETS") + if(CMAKE_VERSION VERSION_LESS "3.14") + message(FATAL_ERROR "x_vcpkg_install_local_dependencies and X_VCPKG_APPLOCAL_DEPS_INSTALL require at least CMake 3.14 +(current version: ${CMAKE_VERSION})" + ) + endif() + + cmake_parse_arguments(PARSE_ARGV 0 arg + "" + "DESTINATION;COMPONENT" + "TARGETS" + ) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_DESTINATION) + message(FATAL_ERROR "DESTINATION must be specified") + endif() + + if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "^(windows|uwp)$") + # Install CODE|SCRIPT allow the use of generator expressions + cmake_policy(SET CMP0087 NEW) + z_vcpkg_set_powershell_path() - if(NOT IS_ABSOLUTE "${__VCPKG_APPINSTALL_DESTINATION}") - set(__VCPKG_APPINSTALL_DESTINATION "\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}") + if(NOT IS_ABSOLUTE "${arg_DESTINATION}") + set(arg_DESTINATION "\${CMAKE_INSTALL_PREFIX}/${arg_DESTINATION}") endif() - if(__VCPKG_APPINSTALL_COMPONENT) - set(__VCPKG_APPINSTALL_COMPONENT COMPONENT ${__VCPKG_APPINSTALL_COMPONENT}) + + set(component_param "") + if(DEFINED arg_COMPONENT) + set(component_param COMPONENT "${arg_COMPONENT}") endif() - foreach(TARGET IN LISTS __VCPKG_APPINSTALL_TARGETS) - get_target_property(TARGETTYPE "${TARGET}" TYPE) - if(NOT TARGETTYPE STREQUAL "INTERFACE_LIBRARY") - # Install CODE|SCRIPT allow the use of generator expressions - if(POLICY CMP0087) - cmake_policy(SET CMP0087 NEW) - endif() - install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") + + foreach(target IN LISTS arg_TARGETS) + get_target_property(target_type "${target}" TYPE) + if(NOT target_type STREQUAL "INTERFACE_LIBRARY") + install(CODE "message(\"-- Installing app dependencies for ${target}...\") execute_process(COMMAND \"${Z_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${Z_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" - -targetBinary \"${__VCPKG_APPINSTALL_DESTINATION}/$\" + -targetBinary \"${arg_DESTINATION}/$\" -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin\" -OutVariable out)" - ${__VCPKG_APPINSTALL_COMPONENT} - ) + ${component_param} + ) endif() endforeach() endif() @@ -644,41 +663,43 @@ if(X_VCPKG_APPLOCAL_DEPS_INSTALL) if(ARGV0 STREQUAL "TARGETS") # Will contain the list of targets - set(PARSED_TARGETS "") + set(parsed_targets "") # Destination - [RUNTIME] DESTINATION argument overrides this - set(DESTINATION "bin") + set(destination "bin") + + set(component_param "") # Parse arguments given to the install function to find targets and (runtime) destination - set(MODIFIER "") # Modifier for the command in the argument - set(LAST_COMMAND "") # Last command we found to process - foreach(ARG IN LISTS ARGS) - if(ARG MATCHES "ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE|INCLUDES") - set(MODIFIER "${ARG}") + set(modifier "") # Modifier for the command in the argument + set(last_command "") # Last command we found to process + foreach(arg IN LISTS ARGS) + if(arg MATCHES "^(ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE|INCLUDES)$") + set(modifier "${arg}") continue() endif() - if(ARG MATCHES "TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP|EXPORT") - set(LAST_COMMAND "${ARG}") + if(arg MATCHES "^(TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP|EXPORT)$") + set(last_command "${arg}") continue() endif() - if(LAST_COMMAND STREQUAL "TARGETS") - list(APPEND PARSED_TARGETS "${ARG}") + if(last_command STREQUAL "TARGETS") + list(APPEND parsed_targets "${arg}") endif() - if(LAST_COMMAND STREQUAL "DESTINATION" AND (MODIFIER STREQUAL "" OR MODIFIER STREQUAL "RUNTIME")) - set(DESTINATION "${ARG}") + if(last_command STREQUAL "DESTINATION" AND (MODIFIER STREQUAL "" OR MODIFIER STREQUAL "RUNTIME")) + set(destination "${arg}") endif() - if(LAST_COMMAND STREQUAL "COMPONENT") - set(COMPONENT "${ARG}") + if(last_command STREQUAL "COMPONENT") + set(component_param "COMPONENT" "${arg}") endif() endforeach() - # COMPONENT is optional only set it when it's been set by the install rule - if(COMPONENT) - set(COMPONENT "COMPONENT" ${COMPONENT}) - endif() - x_vcpkg_install_local_dependencies(TARGETS "${PARSED_TARGETS}" DESTINATION "${DESTINATION}" ${COMPONENT}) + x_vcpkg_install_local_dependencies( + TARGETS ${parsed_targets} + DESTINATION "${destination}" + ${component_param} + ) endif() endfunction() endif() From 3079151a9db335c1fc16b6cb64d151e2c908ab67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Maia?= Date: Tue, 6 Jul 2021 18:29:48 +0100 Subject: [PATCH 099/141] [klein] create a new port (#18279) * [klein] new port * [klein] Replace version-string by version * [klein] Add call to vcpkg_fixup_pkgconfig() * [klein] Replace klein by ${PORT} * [klein] Add patch to avoid using FetchContent * [klein] Change version to version-date * update version * Apply suggestions from code review Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update git-tree version Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/klein/find_simde_first.patch | 23 +++++++++++++++++++++++ ports/klein/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/klein/usage | 10 ++++++++++ ports/klein/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/klein.json | 9 +++++++++ 6 files changed, 91 insertions(+) create mode 100644 ports/klein/find_simde_first.patch create mode 100644 ports/klein/portfile.cmake create mode 100644 ports/klein/usage create mode 100644 ports/klein/vcpkg.json create mode 100644 versions/k-/klein.json diff --git a/ports/klein/find_simde_first.patch b/ports/klein/find_simde_first.patch new file mode 100644 index 00000000000000..ab9f715c6bddc4 --- /dev/null +++ b/ports/klein/find_simde_first.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5d6f3f..a3ba161 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,16 +29,7 @@ endif() + option(KLEIN_BUILD_SYM "Enable compilation of symbolic Klein utility" ON) + option(KLEIN_BUILD_C_BINDINGS "Enable compilation of the Klein C bindings" ON) + +-include(FetchContent) +-FetchContent_Declare( +- simde +- GIT_REPOSITORY https://github.com/simd-everywhere/simde +- GIT_TAG v0.7.2 +- GIT_SHALLOW ON +-) +-FetchContent_GetProperties(simde) +-if(NOT simde_POPULATED) +- FetchContent_Populate(simde) +-endif() ++find_path(SIMDE_INCLUDE_DIR "simde/x86/sse4.1.h" REQUIRED) ++set(simde_SOURCE_DIR ${SIMDE_INCLUDE_DIR}/simde) + + # The default platform and instruction set is x86 SSE3 diff --git a/ports/klein/portfile.cmake b/ports/klein/portfile.cmake new file mode 100644 index 00000000000000..aea4b100a3b902 --- /dev/null +++ b/ports/klein/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jeremyong/klein + REF 92023c6a946af84e716deb1488cad22048d3e08d + SHA512 5d12ae143f07173992a6f9aa90539c4cb6c895a7169e5c086a10f78a31f7b2c9d64faf5ce1db014bd3badd92d24ff612dd2d2dc2f7508baac59307e3dccb6ebe + HEAD_REF master + PATCHES + "find_simde_first.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DKLEIN_ENABLE_PERF=OFF + -DKLEIN_ENABLE_TESTS=OFF + -DKLEIN_VALIDATE=OFF + -DKLEIN_BUILD_SYM=OFF + -DKLEIN_BUILD_C_BINDINGS=OFF + -DKLEIN_INSTALL=ON +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + diff --git a/ports/klein/usage b/ports/klein/usage new file mode 100644 index 00000000000000..63658e26e8b645 --- /dev/null +++ b/ports/klein/usage @@ -0,0 +1,10 @@ +The package klein:x64-windows provides CMake targets: + + find_package(klein CONFIG REQUIRED) + target_link_libraries(main PRIVATE klein::klein) + + # Or use the C++ 11 version + target_link_libraries(main PRIVATE klein::klein_cxx11) + + # Or use the SSE4.1 version + target_link_libraries(main PRIVATE klein::klein_sse42) diff --git a/ports/klein/vcpkg.json b/ports/klein/vcpkg.json new file mode 100644 index 00000000000000..9b6393b3bc6f74 --- /dev/null +++ b/ports/klein/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "klein", + "version-date": "2021-05-09", + "description": "Klein is an implementation of P(R*_{3, 0, 1}), aka 3D Projective Geometric Algebra. It is designed for applications that demand high-throughput (animation libraries, kinematic solvers, etc).", + "dependencies": [ + "simde", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 314465712a6960..e27e392aeec5ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2924,6 +2924,10 @@ "baseline": "2020-03-30", "port-version": 0 }, + "klein": { + "baseline": "2021-05-09", + "port-version": 0 + }, "knet": { "baseline": "1.0.2", "port-version": 0 diff --git a/versions/k-/klein.json b/versions/k-/klein.json new file mode 100644 index 00000000000000..37c6367090e3b2 --- /dev/null +++ b/versions/k-/klein.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5a367eafd82860f61245c54f64306b35a9e0978c", + "version-date": "2021-05-09", + "port-version": 0 + } + ] +} From b12ca07a910522171b4b30588a22e39f8b05b125 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 7 Jul 2021 04:29:20 +0800 Subject: [PATCH 100/141] [vcpkg baseline][cnl] Disable tests (#18767) --- ports/cnl/CONTROL | 4 ---- ports/cnl/disable-test.patch | 15 +++++++++++++++ ports/cnl/portfile.cmake | 2 ++ ports/cnl/vcpkg.json | 7 +++++++ versions/baseline.json | 2 +- versions/c-/cnl.json | 5 +++++ 6 files changed, 30 insertions(+), 5 deletions(-) delete mode 100644 ports/cnl/CONTROL create mode 100644 ports/cnl/disable-test.patch create mode 100644 ports/cnl/vcpkg.json diff --git a/ports/cnl/CONTROL b/ports/cnl/CONTROL deleted file mode 100644 index ac6f8f2caa1b92..00000000000000 --- a/ports/cnl/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cnl -Version: 1.1.7 -Description: A Compositional Numeric Library for C++ -Homepage: https://github.com/johnmcfarlane/cnl diff --git a/ports/cnl/disable-test.patch b/ports/cnl/disable-test.patch new file mode 100644 index 00000000000000..58ecad53552ba9 --- /dev/null +++ b/ports/cnl/disable-test.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73111fc..a0cb3db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,8 +9,8 @@ project(cnl) + + cmake_minimum_required(VERSION 3.5.1) + +-include(CTest) +-add_subdirectory("test") ++# include(CTest) ++# add_subdirectory("test") + + # the CNL library + add_library(Cnl INTERFACE) diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake index 3c54e457914edc..13ba7327585ffb 100644 --- a/ports/cnl/portfile.cmake +++ b/ports/cnl/portfile.cmake @@ -5,6 +5,8 @@ vcpkg_from_github( REF 2dde6e62e608a4adc3c5504f067575efa4910568 #v1.1.7 SHA512 33a81ea726802c71a684bcd002b5119cde4db471ebc9ba02cd15c7487ab468eeca09fb8dcaed953e3f3cded2cd813a903f808d97527b0ec7f393647b64a22572 HEAD_REF main + PATCHES + disable-test.patch ) vcpkg_configure_cmake( diff --git a/ports/cnl/vcpkg.json b/ports/cnl/vcpkg.json new file mode 100644 index 00000000000000..930fcdeed6706b --- /dev/null +++ b/ports/cnl/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cnl", + "version-string": "1.1.7", + "port-version": 1, + "description": "A Compositional Numeric Library for C++", + "homepage": "https://github.com/johnmcfarlane/cnl" +} diff --git a/versions/baseline.json b/versions/baseline.json index e27e392aeec5ce..bb58000f81f228 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1326,7 +1326,7 @@ }, "cnl": { "baseline": "1.1.7", - "port-version": 0 + "port-version": 1 }, "coin": { "baseline": "4.0.0", diff --git a/versions/c-/cnl.json b/versions/c-/cnl.json index dc0a2ce0168c5b..a7f667331c872e 100644 --- a/versions/c-/cnl.json +++ b/versions/c-/cnl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fe1aa7188d2e673265a0c1f20616bdf647c7390", + "version-string": "1.1.7", + "port-version": 1 + }, { "git-tree": "645e64c52fc7d6d9570376aba9c684ca45038f54", "version-string": "1.1.7", From 4b88247857f7efc64d3569ceb986ed824e38d842 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 6 Jul 2021 22:34:41 +0200 Subject: [PATCH 101/141] [hdf5] Fix linking order in pc file (#18825) * Fix link order in pc file * x-add-version --- ports/hdf5/pkgconfig-link-order.patch | 11 +++++++++++ ports/hdf5/portfile.cmake | 1 + ports/hdf5/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hdf5.json | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/hdf5/pkgconfig-link-order.patch diff --git a/ports/hdf5/pkgconfig-link-order.patch b/ports/hdf5/pkgconfig-link-order.patch new file mode 100644 index 00000000000000..66349c66c9b108 --- /dev/null +++ b/ports/hdf5/pkgconfig-link-order.patch @@ -0,0 +1,11 @@ +diff --git a/config/cmake/libhdf5.pc.in b/config/cmake/libhdf5.pc.in +index 4a2ebaa..3cb42d2 100644 +--- a/config/cmake/libhdf5.pc.in ++++ b/config/cmake/libhdf5.pc.in +@@ -10,5 +10,5 @@ Version: @_PKG_CONFIG_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@ + Requires: @_PKG_CONFIG_REQUIRES@ +-Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@ ++Libs.private: @_PKG_CONFIG_LIBS@ @_PKG_CONFIG_LIBS_PRIVATE@ + Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@ diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 0cd1cb52c1b428..cd85ab359c5dcd 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( szip.patch mingw-import-libs.patch pkgconfig-requires.patch + pkgconfig-link-order.patch ) if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES) diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 1cb6985d5b5af7..3912a629ea26c9 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hdf5", "version": "1.12.0", - "port-version": 3, + "port-version": 4, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index bb58000f81f228..c6b44eee57f573 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2478,7 +2478,7 @@ }, "hdf5": { "baseline": "1.12.0", - "port-version": 3 + "port-version": 4 }, "healpix": { "baseline": "1.12.10", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index 72096684eb9a7c..0440a7f6fd933e 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77eb81be380363280c67a3b15043696f6cee2001", + "version": "1.12.0", + "port-version": 4 + }, { "git-tree": "0a7e8bbf885fa0b111c3041102cb2c9adb45f5c3", "version": "1.12.0", From b782875df22e94b2b8db7433690837348cb5f883 Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Tue, 6 Jul 2021 22:36:25 +0200 Subject: [PATCH 102/141] [catch2] Fix linux build in NTFS fs (#18814) file(RENAME Camel lower) works fine when running vcpkg in Windows Powershell with triplet x64-windows in NTFS fs. file(RENAME Camel lower) does not work fine when running vcpkg in WSL with triplet x64-linux in NTFS. --- ports/catch2/portfile.cmake | 6 ++++-- ports/catch2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 1d0291a5717b06..0b2c4c0e752208 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -16,8 +16,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2_") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/share/catch2") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2) diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index ddca8ee6722333..e0199bffa190c2 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "catch2", "version-semver": "2.13.6", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2" } diff --git a/versions/baseline.json b/versions/baseline.json index c6b44eee57f573..1271d201005e72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1146,7 +1146,7 @@ }, "catch2": { "baseline": "2.13.6", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index a9aa348e991af0..cca4c3a0064f3d 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c", + "version-semver": "2.13.6", + "port-version": 1 + }, { "git-tree": "17d502dbaa50c2e6d255331addb14259372fb6c5", "version-semver": "2.13.6", From 989cf2ee31fc84d6b16dc06cab332b523ab62502 Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Tue, 6 Jul 2021 22:37:15 +0200 Subject: [PATCH 103/141] [binarycaching.md] Improve Azure DevOps example (#18807) Add a missing, but required task for Azure DevOps Pipelines, to automatically authenticate against the Artifacts registry. This should help any vcpkg newcomer to integrate easily. --- docs/users/binarycaching.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md index f646ad7896bec2..0e2ea19cb54a49 100644 --- a/docs/users/binarycaching.md +++ b/docs/users/binarycaching.md @@ -130,6 +130,10 @@ Next, you will need to create a feed for your project; see the [Azure DevOps Art variables: - name: VCPKG_BINARY_SOURCES value: 'clear;nuget,,readwrite' + +steps: +# Remember to add this task to allow vcpkg to upload archives via NuGet +- task: NuGetAuthenticate@0 ``` If you are using custom agents with a non-Windows OS, you will need to install Mono to run `nuget.exe` (`apt install mono-complete`, `brew install mono`, etc). From 1dd5bd1f94101b068dda0843208659447eeab5fe Mon Sep 17 00:00:00 2001 From: JackMacWindows Date: Tue, 6 Jul 2021 16:38:46 -0400 Subject: [PATCH 104/141] [sdl2-mixer] Add fluidsynth feature (#18826) * [sdl2-mixer] Add fluidsynth feature * [sdl2-mixer] Add fluidsynth feature * [sdl2-mixer] Add fluidsynth feature * Updated versions & fixed style * Fixed version hash --- ports/sdl2-mixer/CMakeLists.txt | 12 ++++++++++++ ports/sdl2-mixer/portfile.cmake | 3 ++- ports/sdl2-mixer/vcpkg.json | 8 +++++++- versions/baseline.json | 2 +- versions/s-/sdl2-mixer.json | 5 +++++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index 6b422142c2e4df..b350d5bc332b34 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -74,6 +74,18 @@ if(SDL_MIXER_ENABLE_OPUS) endif() endif() +# Fluidsynth support +if(SDL_MIXER_ENABLE_FLUIDSYNTH) + find_path(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h) + find_library(FLUIDSYNTH_LIBRARY fluidsynth) + list(APPEND SDL_MIXER_INCLUDES ${FLUIDSYNTH_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_MID_FLUIDSYNTH) + if (SDL_DYNAMIC_LOAD) + get_filename_component(FLUIDSYNTH_LIBRARY_NAME "${FLUIDSYNTH_LIBRARY}" NAME_WE) + list(APPEND SDL_MIXER_LOAD_DEFINES -DFLUIDSYNTH_DYNAMIC="${FLUIDSYNTH_LIBRARY_NAME}${LIBRARY_SUFFIX}") + endif() +endif() + add_library(SDL2_mixer effect_position.c effect_stereoreverse.c diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index 16e45c5d88ab76..122df61e183d2f 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -35,6 +35,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libvorbis SDL_MIXER_ENABLE_OGGVORBIS opusfile SDL_MIXER_ENABLE_OPUS nativemidi SDL_MIXER_ENABLE_NATIVEMIDI + fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH ) vcpkg_configure_cmake( @@ -53,4 +54,4 @@ vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index acd9b060ecdccc..4ea851c9e42a8b 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-mixer", "version": "2.0.4", - "port-version": 11, + "port-version": 12, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://www.libsdl.org/projects/SDL_mixer", "dependencies": [ @@ -14,6 +14,12 @@ "dynamic-load": { "description": "Load plugins with dynamic call." }, + "fluidsynth": { + "description": "Support for FluidSynth MIDI/SF2 audio format.", + "dependencies": [ + "fluidsynth" + ] + }, "libflac": { "description": "Support for FLAC audio format.", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1271d201005e72..5d1cb0dcf37730 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5686,7 +5686,7 @@ }, "sdl2-mixer": { "baseline": "2.0.4", - "port-version": 11 + "port-version": 12 }, "sdl2-net": { "baseline": "2.0.1-8", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index b563ccff515654..2828ed5b13fbe6 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe2777f2acc7962d9d08092e4778221468e212cd", + "version": "2.0.4", + "port-version": 12 + }, { "git-tree": "1ccb56f06529841debee949a42b71f5ce4ad1f16", "version": "2.0.4", From c1836c4b48f81ca129352bdb04ac9999da653a26 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 7 Jul 2021 04:40:02 +0800 Subject: [PATCH 105/141] [paho-mqtt] update to 1.3.9 (#18765) * [paho-mqtt] update to 1.3.9 * update version * revert patch format * update version --- ports/paho-mqtt/CONTROL | 5 ----- ports/paho-mqtt/fix-install-path.patch | 8 ++++---- ports/paho-mqtt/portfile.cmake | 10 +++++----- ports/paho-mqtt/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/p-/paho-mqtt.json | 5 +++++ 6 files changed, 24 insertions(+), 15 deletions(-) delete mode 100644 ports/paho-mqtt/CONTROL create mode 100644 ports/paho-mqtt/vcpkg.json diff --git a/ports/paho-mqtt/CONTROL b/ports/paho-mqtt/CONTROL deleted file mode 100644 index 590722471c53ed..00000000000000 --- a/ports/paho-mqtt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: paho-mqtt -Version: 1.3.8 -Homepage: https://github.com/eclipse/paho.mqtt.c -Description: Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things -Build-Depends: openssl diff --git a/ports/paho-mqtt/fix-install-path.patch b/ports/paho-mqtt/fix-install-path.patch index 06bf396a92ea61..68cb3b4c4b89cc 100644 --- a/ports/paho-mqtt/fix-install-path.patch +++ b/ports/paho-mqtt/fix-install-path.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3df385a..1ee7be0 100644 +index aa4ad05..669adde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,8 +60,8 @@ IF (NOT PAHO_BUILD_SHARED AND NOT PAHO_BUILD_STATIC) @@ -10,11 +10,11 @@ index 3df385a..1ee7be0 100644 - set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt) +IF(1) + set(CMAKE_INSTALL_DOCDIR share/paho-mqtt) + set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) + set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=") ENDIF() - - ADD_SUBDIRECTORY(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 20b578a..75dc833 100644 +index 0bc7194..db4a0ac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -183,7 +183,7 @@ IF (PAHO_BUILD_STATIC) diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index a5215dd82e8735..7c7875bb2be7b6 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.c - REF 317fb008e1541838d1c29076d2bc5c3e4b6c4f53 # v1.3.8 - SHA512 065d850dbcd20144e7f5534d0cac30170c7f90b1cdca90f4eaaa6b7d69056d9e1bfe951ef34aa7e1a2d3bbc193e95a1526d4dee40ea2f243f3120620b577aacb + REF 3b7ae6348bc917d42c04efa962e4868c09bbde9f # v1.3.9 + SHA512 73c10b7da7aa228100511db280ae56484cb8c42b8f0cfafb2fa3f6e230b4bb1d6b3611aa9219736a0baa9d7de0baf802dd70dbf308077f1a745bd61a67a797c7 HEAD_REF master PATCHES - remove_compiler_options.patch - fix-install-path.patch - fix-unresolvedsymbol-arm.patch + remove_compiler_options.patch + fix-install-path.patch + fix-unresolvedsymbol-arm.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) diff --git a/ports/paho-mqtt/vcpkg.json b/ports/paho-mqtt/vcpkg.json new file mode 100644 index 00000000000000..186e1299ef7af0 --- /dev/null +++ b/ports/paho-mqtt/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "paho-mqtt", + "version-semver": "1.3.9", + "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things", + "homepage": "https://github.com/eclipse/paho.mqtt.c", + "dependencies": [ + "openssl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5d1cb0dcf37730..9d58bea0b2d849 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4713,7 +4713,7 @@ "port-version": 0 }, "paho-mqtt": { - "baseline": "1.3.8", + "baseline": "1.3.9", "port-version": 0 }, "paho-mqttpp3": { diff --git a/versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json index c441cbd9a4fb01..91f6400606605e 100644 --- a/versions/p-/paho-mqtt.json +++ b/versions/p-/paho-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b35399fddec4f6e4eb68e16308d2b1d86b0e5427", + "version-semver": "1.3.9", + "port-version": 0 + }, { "git-tree": "a8ecb2168805d1f3745453512d5f82cccd7d391a", "version-string": "1.3.8", From 47af31d15d41e9b8197c8b4a1b9d12e9df104665 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 6 Jul 2021 22:43:23 +0200 Subject: [PATCH 106/141] [Qt6] Update to 6.1.2 (#18787) * update qt to 6.1.2 * version stuff --- ports/qt/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtbase/clang-cl_source_location.patch | 5 ++- ports/qtbase/cmake/qt_port_details.cmake | 48 ++++++++++----------- ports/qtbase/dc5e7b6.diff | 22 ---------- ports/qtbase/portfile.cmake | 1 - ports/qtbase/vcpkg.json | 2 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 2 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquickcontrols2/vcpkg.json | 2 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/vcpkg.json | 2 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- versions/baseline.json | 48 ++++++++++----------- versions/q-/qt.json | 5 +++ versions/q-/qt5compat.json | 5 +++ versions/q-/qtactiveqt.json | 5 +++ versions/q-/qtbase.json | 5 +++ versions/q-/qtcharts.json | 5 +++ versions/q-/qtcoap.json | 5 +++ versions/q-/qtdatavis3d.json | 5 +++ versions/q-/qtdeclarative.json | 5 +++ versions/q-/qtdoc.json | 5 +++ versions/q-/qtimageformats.json | 5 +++ versions/q-/qtlottie.json | 5 +++ versions/q-/qtmqtt.json | 5 +++ versions/q-/qtnetworkauth.json | 5 +++ versions/q-/qtopcua.json | 5 +++ versions/q-/qtquick3d.json | 5 +++ versions/q-/qtquickcontrols2.json | 5 +++ versions/q-/qtquicktimeline.json | 5 +++ versions/q-/qtscxml.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 +++ 53 files changed, 195 insertions(+), 97 deletions(-) delete mode 100644 ports/qtbase/dc5e7b6.diff diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 2c4c3da6322638..ffe756fdd5d668 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 85c1e355ac06e7..5397492fdbd16b 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index 99dbf9e75899d0..ac68a5c1ee2270 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "ActiveQt", "homepage": "https://www.qt.io/", "supports": "windows", diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch index 6432202454e209..1eeb67aaf74c07 100644 --- a/ports/qtbase/clang-cl_source_location.patch +++ b/ports/qtbase/clang-cl_source_location.patch @@ -2,12 +2,13 @@ diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 823b2057b..4a8cd4fa8 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h -@@ -49,7 +49,7 @@ +@@ -49,8 +49,8 @@ #include -#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) +#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval) - #include + #include + #if defined(__cpp_lib_source_location) #define QT_SOURCE_LOCATION_NAMESPACE std #define QT_PROPERTY_COLLECT_BINDING_LOCATION diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index e86a38c650e6b3..ac9fab8f4fad92 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.1.1) +set(QT_VERSION 6.1.2) set(QT_GIT_TAG v${QT_VERSION}) #set(QT_UPDATE_VERSION TRUE) @@ -37,30 +37,30 @@ foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF 9461362fb0aa5ec91bcfafe1169bd32cf9cfc828) -set(qttools_REF 3fa59b12c7e23e0eb3fbb0f3a9d3f7fee2669f72) -set(qtdeclarative_REF 34d723b38ef9b2ef851f589dfd0523420f4c5acc) -set(qtsvg_REF 242d6a797b6051baccd101978f3e138293701159) -set(qt5compat_REF 57202ccee96b7297202ba11c867178cff32b6eef) -set(qtshadertools_REF 954b90fa332b37ba1b60a2fcd92c06a0de6a6322) -set(qtquicktimeline_REF 2cb89aa7b120ec0ac84426d9f50bf8c613bbcd1e) -set(qtquick3d_REF 6c5ec5b14829f4181d035ad357f594e32e0e4119) -set(qttranslations_REF 47deef3a86795ef97708ec1da403a06cf696ec1c) -set(qtwayland_REF f2c5c1304fc1a5123243a3a83ac8d8f3f67138ca) -set(qtdoc_REF 097bdcbf52a3cd798b66318f2b453cd01640e06b) -set(qtimageformats_REF 6cd036f63ff4b939f2ceb02fda98303a89a1b4b1) -set(qtmqtt_REF d5c00c7245916a919b408578a6dd17bfac0e064d) -set(qtquickcontrols2_REF 1d84dc70059a6e324faab3535cb3958c6fa52fab) -set(qtnetworkauth_REF a903abe7e43123ecd727ca2e29d552c5ed639552) -set(qtcoap_REF 160c3fb6850be44c09142150aef165a09946a608) -set(qtopcua_REF c025fe5182a369723a67be06d64cbfbf2760ba0e) -set(qtactiveqt_REF b9cf1840e44d5283f2212a73ba7b74ec18564d5a) -set(qtdatavis3d_REF 1629d860192ffc644a5c0c7d63e18a6ee6d5e295) +set(qtbase_REF c7c05ab0610ca521a7fcbfdd8d063358d62531b0) +set(qttools_REF 304bae0d5acdee4313405c25dcd259db92dff23d) +set(qtdeclarative_REF bfe2822fb615fb9264c19cebc07994c7a719d159) +set(qtsvg_REF e4950cbb5810fb9e0fd1c42ba888e6d77c21d4b6) +set(qt5compat_REF ff070674ce05e580f023634d5c0fb33c27bb95fd) +set(qtshadertools_REF 2e4aae72dad87eb6d32aa505d6fdcc51b7be057a) +set(qtquicktimeline_REF 72f2f03964068d7a66f878949e739fa933d12246) +set(qtquick3d_REF 261ad084def2fb0147a9def96a55d9ca2c469268) +set(qttranslations_REF caa1100446f659ab992585aecd647612df1d0755) +set(qtwayland_REF 549e6892a0932b76ff7f4004057644980445df36) +set(qtdoc_REF 5a1cc893a66e84155924a94d538ab9401aa02976) +set(qtimageformats_REF 99a0ff33dc46582235363f5ca64a01ce3c1b9fe3) +set(qtmqtt_REF cef4c58c9b60248ab4fb0ae60815efb906a20f2a) +set(qtquickcontrols2_REF 2d2e99d44337867585fa0dba8de5bd7ecd7ad6e7) +set(qtnetworkauth_REF b3e45d0dad36a0ec402bb6e3e85459546378ed22) +set(qtcoap_REF aa40b3cd7d699c926c8527fe7708436cc47eeced) +set(qtopcua_REF 615ea73989fa5b2a7f560a292d3054af5d0663ed) +set(qtactiveqt_REF 020d8da4e22be449846eefcfaa805cd8309cac20) +set(qtdatavis3d_REF a4ea8afeba164d2dc8229e693c541d364e99f3de) #set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF f6a4557b1484b9ad7db4bae8c5b6b264618876e5) -set(qtscxml_REF 666adc604fec06fa5b38be4d4f1b0e9b56f16c2b) -set(qtvirtualkeyboard_REF 5c7df0c55a96e9855bd27c23a18d6f2d91305d31) -set(qtcharts_REF 251d18d960a6f6ee04f07ba338beb317c425e0a2) +set(qtlottie_REF 35e46e52d8849caf84269f92701a5b342824582c) +set(qtscxml_REF d92013adb0a4ad0a80e94a265ec13b5c1730ee05) +set(qtvirtualkeyboard_REF 4e71c9ae1ef8bfe1d9193cd14d11a4e1cf9ea7bc) +set(qtcharts_REF 68a5725a5c97adad88a9d7a6318b06547f7bf1a3) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qtbase/dc5e7b6.diff b/ports/qtbase/dc5e7b6.diff deleted file mode 100644 index e420267b2a80aa..00000000000000 --- a/ports/qtbase/dc5e7b6.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake -index 0eeccce..2ee41c2 100644 ---- a/cmake/QtFlagHandlingHelpers.cmake -+++ b/cmake/QtFlagHandlingHelpers.cmake -@@ -421,7 +421,7 @@ - # cache variable with FORCE will overwrite the non-cache variable in this - # function scope, but we need to use the original value before that change. - foreach(flag_value IN LISTS flag_values) -- string(${replace_type} "${flag_value}" "" ${flag_var_name} "${${flag_var_name}}") -+ string(${replace_type} "${flag_value}" " " ${flag_var_name} "${${flag_var_name}}") - endforeach() - string(STRIP "${${flag_var_name}}" ${flag_var_name}) - set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE) -@@ -433,7 +433,7 @@ - # Work exclusively on cache variable value only. - set(mod_flags $CACHE{${flag_var_name}}) - foreach(flag_value IN LISTS flag_values) -- string(${replace_type} "${flag_value}" "" mod_flags "${mod_flags}") -+ string(${replace_type} "${flag_value}" " " mod_flags "${mod_flags}") - endforeach() - string(STRIP "${mod_flags}" mod_flags) - get_property(help_text CACHE ${flag_var_name} PROPERTY HELPSTRING) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 0ae81659b9e1f3..9d48e0ed5c445d 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -12,7 +12,6 @@ set(${PORT}_PATCHES dont_force_cmakecache.patch fix_find_dep.patch 20b3eb0.diff # Upstream fix to build with clang-cl; didn't make 6.1.1 so I backported the patch. - dc5e7b6.diff clang-cl_source_location.patch ) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 3ca8dc78838632..4f1ba221496c08 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtbase", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 4129cdfcaaea92..f95150d161a0be 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "QtCharts module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 0b1deb3cd25174..b35622815042eb 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 35bdd4a67c5e72..9f31e8fb5426b1 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 9e70f72cf797ee..63ef0793508f17 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 59bf0aaf249a09..12196eae89e65b 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index 22353d2a81ec31..ef42be64d9f8ee 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index c235aa64043eea..d0e7964840c22d 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "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/", "dependencies": [ diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index fb1be27af8e9da..e54eb9bbae5730 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index ddc43cbb29b328..bbfb1d0d9a0d3e 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 22226b88535c46..dc096d20e4c378 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 6ec42763f386e5..980faf4759bb9e 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquickcontrols2/vcpkg.json b/ports/qtquickcontrols2/vcpkg.json index 699d9f53d21701..139b2a8289f208 100644 --- a/ports/qtquickcontrols2/vcpkg.json +++ b/ports/qtquickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickcontrols2", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Quick Controls 2", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 5ed5f43bd456af..aec0718bd95983 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 4cc3c4d0ca1e8b..c6d3ac8a89392b 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 4821d9e198895f..5810e64f779a1c 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "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/", "dependencies": [ diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 817abf5e7b0678..9b1a0bd7dd0794 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt SVG", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 7567f22208a8c4..2ec5a91edf5ff7 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index c6b80e9434b825..d4fb9d8c46d9e2 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Translations", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index e73d5f3e9bfc15..fca230939277ef 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index a8f732f6a617dd..9799150e1db707 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "supports": "!windows", diff --git a/versions/baseline.json b/versions/baseline.json index 9d58bea0b2d849..d7cd7cc130ad21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5081,7 +5081,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5261,7 +5261,7 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qt6betablock": { @@ -5269,35 +5269,35 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtbase": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtcharts": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtcoap": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtdoc": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtimageformats": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtkeychain": { @@ -5305,59 +5305,59 @@ "port-version": 0 }, "qtlottie": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtmqtt": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtopcua": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtquick3d": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtquickcontrols2": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtscxml": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtshadertools": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtsvg": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qttools": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qttranslations": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtwayland": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index cc389853f57517..0f5fca8a6aa584 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6744ad0c2da924c58372492b96d9ea9b43747440", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "21fd23ba62f5f9c76024d715eb025a6d7458266b", "version-semver": "6.1.1", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 927a76006c580f..6933b9db0ba8e5 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3d8792b65b0a5f83423ed425d01bf77759c33d0", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "b47025d88998f99cdfe58e3df9498c3a08d72883", "version-semver": "6.1.1", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 590f24102bdd95..e0a42c7e938f6e 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "746af755dc6d69853c6a369b2fa61aad7ec33c45", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "3e20968097c4a9d81833f16c2f6637b67e72258f", "version-semver": "6.1.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index b351db070bcc47..784fc5be001804 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "953b2fbc4ecc9e3ec83df47f2470d078f21758bd", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "8f4c208e4c4606ae0f7663901399720437358e76", "version-semver": "6.1.1", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 1a1d8b8bdead07..e65901685f8605 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74995a3fee551bc872bd44d0a0592a67cc20f3bb", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "5c3e47558bcd193afac22d72771d726b4e4721a1", "version-semver": "6.1.1", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 198ee4ec557d5d..0b674f5e105615 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10c8de5683f1878cdee669c101dcbf50fefaf10e", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "2dec36ef658a413500ce4486e1d82fe377b3a99c", "version-semver": "6.1.1", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 855b909e927066..8ff8df3dddb62a 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b25e2c719ecc3c1476ceb68579e97f3562eb9899", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "0940f08a99ce3d6f46e2ad01242645ee4b4d61d5", "version-semver": "6.1.1", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index ba440fd7b8b206..f995b8a92007d7 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b283ef4063b4040b652dcfe42bf37006cded85a5", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "54b33929f07b96d7284b3b79923cafd06bdcb207", "version-semver": "6.1.1", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 67e0524dc0aaf6..0d5ec5fa97826a 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a74cb89e81a66827639d45083efcc0e19260f70", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "5bf8d66cd624cdbc6158070163895171a76feb3e", "version-semver": "6.1.1", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 31046ef5b33607..a0a9ca9d6224da 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e3d92605b4a236be559ec0bfb55a5a282de0fe7", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "e5b06628ae9af1093a1b5a858cec9ca49d0488a6", "version-semver": "6.1.1", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 9188cc93328108..86d633bc8bc9f1 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d8b35dbd8e41a85097752ce057623380ae023f2", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "58c76699b4615a2d73f708a7216bee9f1e04e265", "version-semver": "6.1.1", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 0761cb41b659a2..da47891ded765b 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c21f77ae949388eb4787d5abc8e3a94667ee584", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "a1503fed7d188e3ec61c12c590c34dd5bd80c88c", "version-semver": "6.1.1", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index e30eed15f990de..1d69784b3a2d02 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3dbdc5974015e8c9e41087a13cd2d83b5f33394", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "1176858af90b88c983584218ed702abdb184b942", "version-semver": "6.1.1", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 0356ac85e53e96..03ca84289fef7e 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "477ed1c8be16624d2d7ca9b548aea3d733c30c5e", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "12ea0d30494f580a959c288490e0443e06ecc5b8", "version-semver": "6.1.1", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 58346078dfbdda..ee1d8c034212a8 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f9db44634b543a34b525ffc1444f764afe0241e", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "a9df9d17c45c39e2a6bf24cff0458bc690f16f1c", "version-semver": "6.1.1", diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json index d6728198442b30..0c5c05551768f7 100644 --- a/versions/q-/qtquickcontrols2.json +++ b/versions/q-/qtquickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7a3f18e05756732c1344a336558851d7f1adafc", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "ab667ec0d159c9e2b729dd42c7a0225c9cca6000", "version-semver": "6.1.1", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index f00a9a40b1db04..140017053cd854 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd4994e897733cbbdab700567854117998f2986a", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "8ae8944b42dacf2e13322dd2946e008056b27dea", "version-semver": "6.1.1", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 2934589e7f48bf..53261ba801b86b 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12a020d23caf6939a8b10c126bd6dd5230f3c5bf", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "fab8ae306010c0bc21189d746169b8f52d728c40", "version-semver": "6.1.1", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 5c3be9ac5f793d..df6dd8f4845f8e 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef324b3fad33f5340cc707700c6666663ca94de2", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "68ddad00b0176a27f54fa87b04c55e612f9ee87f", "version-semver": "6.1.1", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 54177ac31eac17..dfa7c1ea33157a 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fafae2d0f01bb61cff47d039ea5fa28f1f17967", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "12588c47b6c0faa970cdfc550f5f1526e8811c79", "version-semver": "6.1.1", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 5054857f584f87..4f9682210a1d73 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f09d833f7ce9934bcc02650cd9c580b84932f6bc", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "93ebe354c38cc124370c24d066d2a631444347e8", "version-semver": "6.1.1", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index ffb86daf3ae02f..72e6c3bfc3e3f4 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "899f3c456dd7aad0a3680083ef8d0f118b6c6761", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "8a70306f29690e0d5bb1a8fa99ed1c4108b5a247", "version-semver": "6.1.1", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 354106b8b0a52b..71bfc82866b0ca 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1ed3185f1204d32b530464acdd1f843e5edbf95", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "6d8d0ee73c77d2b796669b3e874f91d0c7270aa7", "version-semver": "6.1.1", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 8391bd3793be12..63008b3e47883f 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39df5f0a73c89113b633ae47582d88e6b63b09c3", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "3b9d48c269a94eb37c62a7e81358855065cdd6cf", "version-semver": "6.1.1", From f3252d0be24ba7dd56efb2aaa4f6b66fe497a630 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Tue, 6 Jul 2021 21:45:15 +0100 Subject: [PATCH 107/141] [ffmpeg] fix LGPL build, disable avisynthplus on static builds (#18803) * [ffmpeg] do not pull in postproc for LGPL build * [ffmpeg] disable avisynthplus on static builds (as it is not functional) * [ffmpeg] bump port version * [ffmpeg] x-add-version --- ports/ffmpeg/portfile.cmake | 4 ++-- ports/ffmpeg/vcpkg.json | 35 ++++++++++++++++++++++++++++++++--- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1dfe4b18e21a14..9b70694c2a5688 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -20,8 +20,8 @@ if("ass" IN_LIST FEATURES) endif() if("avisynthplus" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS)) - message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp'") + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_LIBRARY_LINKAGE STREQUAL "static")) + message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp | static'") endif() endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 1b5c40f0a0d672..8ce76f9e343ce4 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 6, + "port-version": 7, "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." @@ -28,7 +28,12 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ + "avcodec", + "avdevice", + "avfilter", + "avformat", "avresample", "bzip2", "freetype", @@ -40,6 +45,8 @@ "snappy", "soxr", "speex", + "swresample", + "swscale", "theora", "vorbis", "vpx", @@ -49,6 +56,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "sdl2" ], @@ -56,6 +64,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "opencl" ], @@ -63,6 +72,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "openh264" ], @@ -70,6 +80,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "xml2" ], @@ -77,6 +88,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "ilbc" ], @@ -84,6 +96,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "ass" ], @@ -91,6 +104,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fribidi" ], @@ -98,6 +112,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "ssh" ], @@ -105,6 +120,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "dav1d" ], @@ -112,6 +128,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "modplug" ], @@ -119,6 +136,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "tensorflow" ], @@ -126,6 +144,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "opengl" ], @@ -133,6 +152,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "nvcodec" ], @@ -140,6 +160,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "tesseract" ], @@ -147,6 +168,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fontconfig" ], @@ -159,13 +181,16 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "all", - "gpl" + "gpl", + "postproc" ] }, { "name": "ffmpeg", + "default-features": false, "features": [ "x264" ], @@ -173,6 +198,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "x265" ], @@ -180,10 +206,11 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "avisynthplus" ], - "platform": "windows & !arm & !uwp" + "platform": "windows & !arm & !uwp & !static" } ] }, @@ -192,6 +219,7 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "all-gpl", "nonfree", @@ -200,6 +228,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fdk-aac" ], diff --git a/versions/baseline.json b/versions/baseline.json index d7cd7cc130ad21..7ff70cf1c37829 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 6 + "port-version": 7 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 14c7c2f68b7c56..c510b16ed25c50 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efdbc20f5003313df2fde681a28ab8718455495f", + "version": "4.4", + "port-version": 7 + }, { "git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29", "version": "4.4", From d8c150de65dc9cb6f7f1c98acd8244cec50da98c Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 6 Jul 2021 16:46:21 -0400 Subject: [PATCH 108/141] [google-cloud-cpp] update to latest release (v1.29.0) (#18759) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 6c3378c2f6f83a..101f01a83c2550 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.28.0 - SHA512 066655495d9d1a5a183b3efb682daf5b97e6f76943c7f6075694386075b9e8efacd102927e2e265bd4b509317088b4af70584695648e598b2a21d0df4111a6b6 + REF v1.29.0 + SHA512 1dda15eaece6d574ba49eb3756e8a72eac6c9b508acf30ed1de0a0234e1e36a352f11494411a84533f8412779040da3e3ffc98d33d43a99b3626c15627513f20 HEAD_REF master ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index bd486a0457edba..c402577ae895f9 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.28.0", + "version": "1.29.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 7ff70cf1c37829..a83597b5a3e571 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2345,7 +2345,7 @@ "port-version": 6 }, "google-cloud-cpp": { - "baseline": "1.28.0", + "baseline": "1.29.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 15642cef76ece6..e4907ec96a499d 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47a4d6d3258efe94ffe95b10abd1f0a19c48aab2", + "version": "1.29.0", + "port-version": 0 + }, { "git-tree": "41623bc51fa4b9763aa83d192130ff37119afe33", "version": "1.28.0", From 171cf98688f7a10f7769fcfa3d00fa76271c1d3d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 7 Jul 2021 04:48:44 +0800 Subject: [PATCH 109/141] [exiv2] update to 0.27.4 (#18750) * [exiv2] update to 0.27.4 * update version --- ports/exiv2/CONTROL | 17 ------------- ports/exiv2/fix-ninja-error.patch | 42 +++++++++++++++++++++++++++++++ ports/exiv2/portfile.cmake | 36 ++++++++++++++++++++------ ports/exiv2/vcpkg.json | 32 +++++++++++++++++++++++ versions/baseline.json | 4 +-- versions/e-/exiv2.json | 5 ++++ 6 files changed, 109 insertions(+), 27 deletions(-) delete mode 100644 ports/exiv2/CONTROL create mode 100644 ports/exiv2/fix-ninja-error.patch create mode 100644 ports/exiv2/vcpkg.json diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL deleted file mode 100644 index 17141299b0a151..00000000000000 --- a/ports/exiv2/CONTROL +++ /dev/null @@ -1,17 +0,0 @@ -Source: exiv2 -Version: 0.27.3 -Port-Version: 4 -Build-Depends: zlib, libiconv, gettext -Description: Image metadata library and tools -Homepage: https://www.exiv2.org -Supports: !uwp - -Feature: unicode -Description: Compile with unicode support on windows - -Feature: xmp -Description: Build with XMP metadata support -Build-Depends: expat - -Feature: video -Description: Build video support into library diff --git a/ports/exiv2/fix-ninja-error.patch b/ports/exiv2/fix-ninja-error.patch new file mode 100644 index 00000000000000..71f52f5615e62e --- /dev/null +++ b/ports/exiv2/fix-ninja-error.patch @@ -0,0 +1,42 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c52b352..b19c438 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -149,7 +149,7 @@ set_target_properties( exiv2lib_int PROPERTIES + + target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR}) + target_include_directories(exiv2lib PRIVATE +- $ ++ ${PROJECT_SOURCE_DIR}/xmpsdk/include + ${ZLIB_INCLUDE_DIR} + ) + +@@ -215,7 +215,7 @@ else() + endif() + + if( EXIV2_ENABLE_PNG ) +- target_link_libraries( exiv2lib PRIVATE $) ++ target_link_libraries( exiv2lib PRIVATE ${ZLIB_LIBRARIES}) + endif() + + if( EXIV2_ENABLE_NLS ) +diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt +index a22698f..ca6ffe0 100644 +--- a/xmpsdk/CMakeLists.txt ++++ b/xmpsdk/CMakeLists.txt +@@ -27,13 +27,12 @@ add_library(exiv2-xmp STATIC + ) + + target_link_libraries(exiv2-xmp +- PRIVATE +- $ ++ PRIVATE ${EXPAT_LIBRARY} + ) + + target_include_directories(exiv2-xmp + PRIVATE +- $ ++ ${PROJECT_SOURCE_DIR}/xmpsdk/include + ${EXPAT_INCLUDE_DIR} + ) + diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index 01fa8c6ae67110..eea46e2ba5212e 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -4,17 +4,23 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 - REF 194bb65ac568a5435874c9d9d73b1c8a68e4edec #v0.27.3 - SHA512 35a5a41e0a6cfe04d1ed005c8116ad4430516402b925db3d4f719e2385e2cfb09359eb7ab51853bc560138f221900778cd2e2d39f108c513b3e7d22dbb9bf503 + REF 15098f4ef50cc721ad0018218acab2ff06e60beb #v0.27.4 + SHA512 4be0a9c4c64c65a9ca85291ba2cf54efacc5a88dae534c2d9252986df4e12212899c33093b07695369108e3763b3d74592a6153d832743694ec95c9a03c7e2c3 HEAD_REF master + PATCHES + fix-ninja-error.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - unicode EXIV2_ENABLE_WIN_UNICODE - xmp EXIV2_ENABLE_XMP - video EXIV2_ENABLE_VIDEO + FEATURES + unicode EXIV2_ENABLE_WIN_UNICODE + xmp EXIV2_ENABLE_XMP + video EXIV2_ENABLE_VIDEO + png EXIV2_ENABLE_PNG ) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" EXIV2_CRT_DYNAMIC) + if("unicode" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "Feature unicode only supports Windows platform.") endif() @@ -24,9 +30,23 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} - -DEXIV2_BUILD_EXIV2_COMMAND:BOOL=FALSE - -DEXIV2_BUILD_UNIT_TESTS:BOOL=FALSE - -DEXIV2_BUILD_SAMPLES:BOOL=FALSE + -DEXIV2_BUILD_EXIV2_COMMAND=OFF + -DEXIV2_BUILD_UNIT_TESTS=OFF + -DEXIV2_BUILD_SAMPLES=OFF + -DEXIV2_BUILD_DOC=OFF + -DEXIV2_ENABLE_EXTERNAL_XMP=OFF + -DEXIV2_ENABLE_NLS=OFF + -DEXIV2_ENABLE_PRINTUCS2=OFF + -DEXIV2_ENABLE_LENSDATA=ON + -DEXIV2_ENABLE_DYNAMIC_RUNTIME=${EXIV2_CRT_DYNAMIC} + -DEXIV2_ENABLE_WEBREADY=OFF + -DEXIV2_ENABLE_CURL=OFF + -DEXIV2_ENABLE_SSH=OFF + -DEXIV2_ENABLE_BMFF=OFF + -DEXIV2_TEAM_EXTRA_WARNINGS=OFF + -DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF + -DEXIV2_TEAM_PACKAGING=OFF + -DEXIV2_TEAM_USE_SANITIZERS=OFF ) vcpkg_install_cmake() diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json new file mode 100644 index 00000000000000..2b9a3675537bf8 --- /dev/null +++ b/ports/exiv2/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "exiv2", + "version": "0.27.4", + "description": "Image metadata library and tools", + "homepage": "https://www.exiv2.org", + "supports": "!uwp", + "dependencies": [ + "gettext", + "libiconv" + ], + "features": { + "png": { + "description": "Build with png support (requires libz)", + "dependencies": [ + "libpng", + "zlib" + ] + }, + "unicode": { + "description": "Compile with unicode support on windows" + }, + "video": { + "description": "Build video support into library" + }, + "xmp": { + "description": "Build with XMP metadata support", + "dependencies": [ + "expat" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index a83597b5a3e571..73b3ec5532eb9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1889,8 +1889,8 @@ "port-version": 4 }, "exiv2": { - "baseline": "0.27.3", - "port-version": 4 + "baseline": "0.27.4", + "port-version": 0 }, "expat": { "baseline": "2.4.1", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index 6f6848cc146cb0..f02a909cc0f3ee 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f716a33e59b24c79140216d836644fe0603e322b", + "version": "0.27.4", + "port-version": 0 + }, { "git-tree": "e38c35650c00596aafb8dda45b0d0e7f0a591563", "version-string": "0.27.3", From 31b21863a9cb69719eb1dc06ebbb8bcf62600810 Mon Sep 17 00:00:00 2001 From: Luca Schlecker Date: Tue, 6 Jul 2021 22:49:23 +0200 Subject: [PATCH 110/141] [crow] update to v0.3+1 (#18706) Signed-off-by: Luca Schlecker --- ports/crow/portfile.cmake | 4 ++-- ports/crow/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/crow.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake index eac8694c7109bb..fefc42cba15723 100644 --- a/ports/crow/portfile.cmake +++ b/ports/crow/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow - REF fc27f73f84967ffc1140cfd106dcab35bc8bca9e #0.3 - SHA512 efc47833ec84757898c72a63018e383611261cfbbf121984c272c6183025ef6551595941177ae41627c623982343c1d824c4ec25c3141c6c01a9aee0fade8ac3 + REF 6a1623b69c5f788b1ea248f0046634fa1e7b0e03 #0.3+1 + SHA512 6c3e1e89e0f0ea9dcbe9206071189ad692c34400b1a3e101002e9bd97729851db94a40ce45b8fc9aa747df409cfdbdbdf09af806361d1e7df6f515f4c50e7a80 HEAD_REF master ) diff --git a/ports/crow/vcpkg.json b/ports/crow/vcpkg.json index c512e753d79487..9bf62431d8ac29 100644 --- a/ports/crow/vcpkg.json +++ b/ports/crow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "crow", - "version": "0.3", + "version": "0.3.1", "description": "Very fast and easy to use C++ micro web framework", "homepage": "https://github.com/CrowCpp/crow" } diff --git a/versions/baseline.json b/versions/baseline.json index 73b3ec5532eb9e..ea64d3790bb09d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1517,7 +1517,7 @@ "port-version": 0 }, "crow": { - "baseline": "0.3", + "baseline": "0.3.1", "port-version": 0 }, "cryptopp": { diff --git a/versions/c-/crow.json b/versions/c-/crow.json index 1f50e34a832856..fcad8922338947 100644 --- a/versions/c-/crow.json +++ b/versions/c-/crow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c50547dfc3c5f5bf5a08887d6515e51a7203130", + "version": "0.3.1", + "port-version": 0 + }, { "git-tree": "4a0d69a7e34aa3d77de7ba2c01ce45ae730478a1", "version": "0.3", From 5636f02ead6780aa190ecaee1341169cb2adacae Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 7 Jul 2021 06:51:11 +1000 Subject: [PATCH 111/141] [irrlicht] Add OSX support (#18725) * Fix Irrlicht compilation on OSX * Update port description * Update portfile instructions * Update version * Fix patch files * Add missing cmake dependencies * Remove obsolete comment * Update version * Remove OBJCXX language from project definition to prevent Windows builds from failing * Update versions * Code review tweaks * Update version * Update versions/i-/irrlicht.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Fix qt5-3d build failure on OSX * Update qt5-3d version * Update port-version for qt5-3d * Update version for qt5-3d * [qt5-3d] Revert modification to previous version entry Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/irrlicht/CMakeLists.txt | 57 +++++++++++++++++------- ports/irrlicht/CONTROL | 9 ++-- ports/irrlicht/fix-osx-compilation.patch | 28 ++++++++++++ ports/irrlicht/portfile.cmake | 16 ++++--- ports/qt5-3d/CONTROL | 1 + ports/qt5-3d/portfile.cmake | 2 + scripts/ci.baseline.txt | 1 - versions/baseline.json | 6 +-- versions/i-/irrlicht.json | 5 +++ versions/q-/qt5-3d.json | 5 +++ 10 files changed, 100 insertions(+), 30 deletions(-) create mode 100644 ports/irrlicht/fix-osx-compilation.patch diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt index d7e0c8f50ff405..cc6edc785b5916 100644 --- a/ports/irrlicht/CMakeLists.txt +++ b/ports/irrlicht/CMakeLists.txt @@ -1,11 +1,11 @@ # # Irrlicht 3D engine # -cmake_minimum_required(VERSION 3.8) -project(Irrlicht) +cmake_minimum_required(VERSION 3.16) +project(Irrlicht LANGUAGES C CXX) set_property(GLOBAL PROPERTY USE_FOLDERS ON) - + # Irrlicht directories # ------------------------------------------------------------------------------------------------- set(IRR_SRC_DIR "source/Irrlicht") @@ -48,7 +48,15 @@ glob_c_cpp_sources(IRR_TOOL_FILES_FILE_TO_HEADER ${IRR_TOOL_DIR}/FileToHeader glob_c_cpp_sources(IRR_TOOL_FILES_GUI_EDITOR ${IRR_TOOL_DIR}/GUIEditor/) glob_c_cpp_sources(IRR_TOOL_FILES_FONT_TOOL ${IRR_TOOL_DIR}/IrrFontTool/newFontTool/) glob_c_cpp_sources(IRR_TOOL_FILES_MESH_CONVERTER ${IRR_TOOL_DIR}/MeshConverter/) - + +if(APPLE) + file(GLOB IRR_SRC_FILES_OSX + "${IRR_SRC_DIR}/MacOSX/*.mm" + "${IRR_SRC_DIR}/MacOSX/*.h") + + set(IRR_SRC_FILES ${IRR_SRC_FILES} ${IRR_SRC_FILES_OSX}) +endif() + # Group files # ------------------------------------------------------------------------------------------------- source_group(Irrlicht\\engine FILES ${IRR_SRC_FILES}) @@ -79,11 +87,29 @@ else() add_library(Irrlicht STATIC ${IRR_ALL_SRC_FILES}) endif() -target_link_libraries(Irrlicht PRIVATE - ${PNG_LIBRARY} - ${JPEG_LIBRARY} +if(APPLE) + target_include_directories(Irrlicht PRIVATE ${IRR_SRC_DIR}/MacOSX) + + target_compile_definitions(Irrlicht PRIVATE SYSTEM=MacOSX) + + target_link_libraries(Irrlicht ${OSX_LIBRARIES}) + + target_compile_options(Irrlicht PRIVATE "-ObjC++") + + set(ADDITIONAL_LIRARIES + "-framework OpenGL" + "-framework IOKit" + "-framework Carbon" + "-framework AppKit" + "-framework Cocoa") +endif() + +target_link_libraries(Irrlicht PRIVATE + ${PNG_LIBRARY} + ${JPEG_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARY} + ${ADDITIONAL_LIRARIES} ) if(IRR_BUILD_TOOLS) @@ -112,7 +138,7 @@ target_include_directories(Irrlicht ) # I dont realy understand why this is necesary or what it is doing, -# but it is necesarry to build and export a package. +# but it is necesarry to build and export a package. # See: https://cmake.org/cmake/help/v3.8/command/target_include_directories.html target_include_directories(Irrlicht PUBLIC $ @@ -177,7 +203,6 @@ if(WIN32) target_compile_options(Irrlicht PRIVATE /arch:SSE2) endif() endif() - elseif(UNIX) # Standard mode target_compile_options(Irrlicht @@ -185,7 +210,7 @@ elseif(UNIX) PRIVATE -pipe PRIVATE -fno-exceptions PRIVATE -fno-strict-aliasing) - + # Disable RTTI on C++ files only (no sense for C files) set_source_files_properties(${IRR_SRC_FILES} ${IRR_SRC_FILES_AESGLADMAN} PROPERTIES COMPILE_FLAGS -fno-rtti) @@ -194,10 +219,12 @@ elseif(UNIX) target_compile_options(Irrlicht PRIVATE $<$:-D_DEBUG>) # X11 and OpenGL - target_link_libraries(Irrlicht - PRIVATE X11 - PRIVATE GL - PRIVATE Xxf86vm) + if(NOT APPLE) + target_link_libraries(Irrlicht + PRIVATE X11 + PRIVATE GL + PRIVATE Xxf86vm) + endif() endif() # Installation @@ -214,7 +241,7 @@ install(FILES ${IRR_SRC_FILES_INTERFACE} DESTINATION "include/irrlicht" CONFIGUR if(IRR_BUILD_TOOLS) install( - TARGETS FileToHeader GUIEditor FontTool MeshConverter + TARGETS FileToHeader GUIEditor FontTool MeshConverter RUNTIME DESTINATION tools/irrlicht/ CONFIGURATIONS Release ) diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index e8ff45bdd81fd5..5161a33b2671d0 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -1,9 +1,10 @@ Source: irrlicht -Version: 1.8.4-10 +Version: 1.8.4 +Port-Version: 11 Homepage: http://irrlicht.sourceforge.net -Description: Irrlicht lightning fast 3d engine -Build-Depends: zlib, libpng, bzip2, libjpeg-turbo -Supports: !(arm|uwp|osx) +Description: The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers. +Build-Depends: zlib, libpng, bzip2, libjpeg-turbo, vcpkg-cmake, vcpkg-cmake-config +Supports: !(arm|uwp) Feature: unicode Description: Support unicode path on windows diff --git a/ports/irrlicht/fix-osx-compilation.patch b/ports/irrlicht/fix-osx-compilation.patch new file mode 100644 index 00000000000000..6f623db265e214 --- /dev/null +++ b/ports/irrlicht/fix-osx-compilation.patch @@ -0,0 +1,28 @@ +diff --git a/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp +index 66144326c..4ea224c24 100644 +--- a/source/Irrlicht/CImageLoaderJPG.cpp ++++ b/source/Irrlicht/CImageLoaderJPG.cpp +@@ -68,7 +68,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo) + boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo) + { + // DO NOTHING +- return 1; ++ return TRUE; + } + + +diff --git a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +index 53029eb45..e75b707e1 100644 +--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm ++++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +@@ -495,8 +495,8 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key) + if(!CreationParams.WindowId) //load menus if standalone application + { + [[NSAutoreleasePool alloc] init]; +- [NSApplication sharedApplication]; +- [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; ++ [[NSApplication sharedApplication] activateIgnoringOtherApps]; ++ [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; + [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]]; + [NSApp finishLaunching]; + } diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 754119f3ed9ec2..9641f8fddc837d 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "osx" "uwp") +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -6,7 +6,10 @@ vcpkg_from_sourceforge( REF 1.8/1.8.4 FILENAME "irrlicht-1.8.4.zip" SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 - PATCHES fix-encoding.patch fix-sysctl.patch + PATCHES + fix-encoding.patch + fix-sysctl.patch + fix-osx-compilation.patch ) configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) @@ -21,17 +24,16 @@ vcpkg_check_features( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS + OPTIONS -DIRR_SHARED_LIB=${SHARED_LIB} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() if("tools" IN_LIST FEATURES) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/) diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index 7868a6595c2c04..1ec0c15a669e54 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,5 @@ Source: qt5-3d Version: 5.15.2 +Port-Version: 1 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-base[core], qt5-declarative, qt5-imageformats, qt5-gamepad, assimp diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index 912bad83dc6b51..62a01e4de459a9 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -45,6 +45,8 @@ if(BZ2_DBG) endif() if(VCPKG_TARGET_IS_WINDOWS) set(SYSTEM_LIBS "Advapi32.lib user32.lib gdi32.lib") +elseif(VCPKG_TARGET_IS_OSX) + set(SYSTEM_LIBS "-framework OpenGL -framework Cocoa -framework Carbon -framework IOKit -framework AppKit") else() set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11") endif() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 668d0e0f2416bb..f8f39297af4904 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -487,7 +487,6 @@ intelrdfpmathlib:x64-linux=fail intelrdfpmathlib:x64-uwp=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail -irrlicht:x64-osx=fail irrlicht:x64-uwp=fail isal:arm64-windows=fail isal:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index ea64d3790bb09d..4f7f0ee18461ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2701,8 +2701,8 @@ "port-version": 2 }, "irrlicht": { - "baseline": "1.8.4-10", - "port-version": 0 + "baseline": "1.8.4", + "port-version": 11 }, "irrxml": { "baseline": "0", @@ -5094,7 +5094,7 @@ }, "qt5-3d": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-activeqt": { "baseline": "5.15.2", diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index a5fb44f207eb38..6d884cfe326ed8 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18ae08d6099b5457ccedbdb7209c79321a9e9027", + "version-string": "1.8.4", + "port-version": 11 + }, { "git-tree": "e2b2dd836e693401dab067c5064665e926a46b07", "version-string": "1.8.4-10", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index d29595cbe01ae1..ca2dd24e74b219 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c3c15324a4764d3501798299c8ad8087905b136", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "c9a8b7a2360c554409f283143edf9202bebe6a3b", "version-string": "5.15.2", From 7e12acc89ae10f56351e3a45dbba844609f0c4d6 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 6 Jul 2021 22:57:41 +0200 Subject: [PATCH 112/141] [mapbox-wagyu] add new port (#18771) * add wagyu * add versions * update hash * update versions --- ports/mapbox-wagyu/portfile.cmake | 15 +++++++++++++++ ports/mapbox-wagyu/vcpkg.json | 6 ++++++ versions/baseline.json | 4 ++++ versions/m-/mapbox-wagyu.json | 9 +++++++++ 4 files changed, 34 insertions(+) create mode 100644 ports/mapbox-wagyu/portfile.cmake create mode 100644 ports/mapbox-wagyu/vcpkg.json create mode 100644 versions/m-/mapbox-wagyu.json diff --git a/ports/mapbox-wagyu/portfile.cmake b/ports/mapbox-wagyu/portfile.cmake new file mode 100644 index 00000000000000..b43c60ce2ca0c4 --- /dev/null +++ b/ports/mapbox-wagyu/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/wagyu + REF 0.5.0 + SHA512 d2ef6c056b25e60677da4f53154790558ddb43c56aa117a4d5108f8c7686cceff9e5d54d71138e2eb504f053315d28f7cb8190ff45833c5606d511b685acf40d + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/mapbox-wagyu/vcpkg.json b/ports/mapbox-wagyu/vcpkg.json new file mode 100644 index 00000000000000..8da0b64441f4ee --- /dev/null +++ b/ports/mapbox-wagyu/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mapbox-wagyu", + "version-semver": "0.5.0", + "description": "A general library for geometry operations of union, intersections, difference, and xor", + "homepage": "https://github.com/mapbox/wagyu" +} diff --git a/versions/baseline.json b/versions/baseline.json index 4f7f0ee18461ef..45047b0a04e6ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3912,6 +3912,10 @@ "baseline": "1.2.0", "port-version": 0 }, + "mapbox-wagyu": { + "baseline": "0.5.0", + "port-version": 0 + }, "marble": { "baseline": "19.08.2", "port-version": 2 diff --git a/versions/m-/mapbox-wagyu.json b/versions/m-/mapbox-wagyu.json new file mode 100644 index 00000000000000..8efd1e5f02d870 --- /dev/null +++ b/versions/m-/mapbox-wagyu.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "84cb6917fd5563c88998e47c219f429e05aea9d5", + "version-semver": "0.5.0", + "port-version": 0 + } + ] +} From 66a792ecb8f5875dd4d1a5b06e35f916021fad7c Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 7 Jul 2021 05:01:56 +0800 Subject: [PATCH 113/141] [ftxui] Add new port (fix #16327) (#18360) * [ftxui] Add new port (fix #16327) * [ftxui] x-add-version ftxui * [ftxui] Drop UWP support * [ftxui] Update to 2021-06-16 * [ftxui] Overwrite version * [ftxui] Try to fix linux and macOS build * [ftxui] Overwrite version * [ftxui] Fail fast on UWP * [ftxui] Clean version file * [ftxui] Overwrite version * [ftxui] Update to 2021-06-17 * [ftxui] Overwrite version * [ftxui] Remove debug/share * [ftxui] Overwrite version * [ftxui] Quote paths * [ftxui] Overwrite version --- ports/ftxui/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/ftxui/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/f-/ftxui.json | 9 +++++++++ 4 files changed, 59 insertions(+) create mode 100644 ports/ftxui/portfile.cmake create mode 100644 ports/ftxui/vcpkg.json create mode 100644 versions/f-/ftxui.json diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake new file mode 100644 index 00000000000000..bdb21781fc95c0 --- /dev/null +++ b/ports/ftxui/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ArthurSonzogni/FTXUI + REF 3d5e4eb6ca11a0827bff68a04f4bf68ca9820e20 + SHA512 670b0e5d95f7e6132ca7115005efdb1dee645146af82566af3e48bfff64d82dbc058c2f524b8b9d1d92182e4835ff6024067f0eab8dd6204514efa0207b3d33c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DFTXUI_BUILD_EXAMPLES=OFF + -DFTXUI_ENABLE_INSTALL=ON + -DFTXUI_BUILD_TESTS=OFF + -DFTXUI_BUILD_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +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) diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json new file mode 100644 index 00000000000000..34557d19ac9c94 --- /dev/null +++ b/ports/ftxui/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ftxui", + "version-date": "2021-06-17", + "description": "C++ Functional Terminal User Interface", + "homepage": "https://github.com/ArthurSonzogni/FTXUI", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 45047b0a04e6ef..72fc83a5739559 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2144,6 +2144,10 @@ "baseline": "2.4.0-2", "port-version": 0 }, + "ftxui": { + "baseline": "2021-06-17", + "port-version": 0 + }, "function2": { "baseline": "4.2.0", "port-version": 0 diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json new file mode 100644 index 00000000000000..329be420782cad --- /dev/null +++ b/versions/f-/ftxui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d7dd27584c015a37dd3266255530e889b16aebcf", + "version-date": "2021-06-17", + "port-version": 0 + } + ] +} From 4c513b1b9c646d0310e834b7fc50752d0fb5f7a0 Mon Sep 17 00:00:00 2001 From: Ronald <3665590+playgithub@users.noreply.github.com> Date: Wed, 7 Jul 2021 05:04:12 +0800 Subject: [PATCH 114/141] [xlsxio] new port (#18438) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add port: xlsxio * vcpkg x-add-version xlsxio * fix deps * add vcpkg_fixup_pkgconfig() * Apply suggestions from code review To be consistent, `OUT_FEATURE_OPTIONS FEATURE_OPTIONS` in a new line, as in `vcpkg_from_git`. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/xlsxio/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * format * use date as version string * vcpkg format-manifest * Update ports/xlsxio/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * patch for dependency * fix typo * vcpkg x-add-version * remove feature wide * Update ports/xlsxio/vcpkg.json deprecate libzip that's an alternative and imperfect Co-authored-by: Robert Schumacher * Update ports/xlsxio/vcpkg.json Co-authored-by: Robert Schumacher * Update versions/x-/xlsxio.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Remove x64-windows-cpp17 community triplet Co-authored-by: abc Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/xlsxio/fix-dependencies.patch | 16 ++++++++++ ports/xlsxio/portfile.cmake | 46 +++++++++++++++++++++++++++++ ports/xlsxio/vcpkg.json | 15 ++++++++++ versions/baseline.json | 4 +++ versions/x-/xlsxio.json | 9 ++++++ 5 files changed, 90 insertions(+) create mode 100644 ports/xlsxio/fix-dependencies.patch create mode 100644 ports/xlsxio/portfile.cmake create mode 100644 ports/xlsxio/vcpkg.json create mode 100644 versions/x-/xlsxio.json diff --git a/ports/xlsxio/fix-dependencies.patch b/ports/xlsxio/fix-dependencies.patch new file mode 100644 index 00000000000000..7a02d8f9de7635 --- /dev/null +++ b/ports/xlsxio/fix-dependencies.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 490ee5c..05c7ee5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,9 +49,8 @@ IF(WITH_LIBZIP) + SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES}) + SET(ANYZIP_DEF USE_LIBZIP) + ELSE() +- FIND_PACKAGE(Minizip REQUIRED) +- SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) +- SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES}) ++ FIND_PACKAGE(minizip CONFIG REQUIRED) ++ SET(ANYZIP_LIBRARIES minizip::minizip) + SET(ANYZIP_DEF USE_MINIZIP) + ENDIF() + # dependancy: expat diff --git a/ports/xlsxio/portfile.cmake b/ports/xlsxio/portfile.cmake new file mode 100644 index 00000000000000..74b004755dc9da --- /dev/null +++ b/ports/xlsxio/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO brechtsanders/xlsxio + REF e3acace39e5fb153f5ce3500a4952c2bf93175bd + SHA512 8148b89c43cf45653c583d51fb8050714d3cd0a76ab9a05d46604f3671a06487e4fc58d3f6f9f2a9f9b57a9f9fe1863ef07017c74197f151390576c5aac360ea + HEAD_REF master + PATCHES fix-dependencies.patch +) + +file(REMOVE ${SOURCE_PATH}/CMake/FindMinizip.cmake) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libzip WITH_LIBZIP +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(BUILD_STATIC ON) + set(BUILD_SHARED OFF) +else() + set(BUILD_SHARED ON) + set(BUILD_STATIC OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_SHARED=${BUILD_SHARED} + -DBUILD_STATIC=${BUILD_STATIC} + -DWITH_WIDE=OFF + -DBUILD_DOCUMENTATION=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_PC_FILES=OFF + -DBUILD_TOOLS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_pkgconfig() + +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/xlsxio/vcpkg.json b/ports/xlsxio/vcpkg.json new file mode 100644 index 00000000000000..bc61d92e4176c8 --- /dev/null +++ b/ports/xlsxio/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "xlsxio", + "version-date": "2021-03-24", + "description": "Cross-platform C library for reading values from and writing values to .xlsx files", + "homepage": "https://github.com/brechtsanders/xlsxio", + "dependencies": [ + "expat", + { + "name": "minizip", + "features": [ + "bzip2" + ] + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 72fc83a5739559..f1cc0278d68b75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6732,6 +6732,10 @@ "baseline": "1.5.0", "port-version": 1 }, + "xlsxio": { + "baseline": "2021-03-24", + "port-version": 0 + }, "xmlsec": { "baseline": "1.2.32", "port-version": 0 diff --git a/versions/x-/xlsxio.json b/versions/x-/xlsxio.json new file mode 100644 index 00000000000000..167faf72b63b99 --- /dev/null +++ b/versions/x-/xlsxio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "363ef11ba53c472f8ec8186c455f964b49088d7f", + "version-date": "2021-03-24", + "port-version": 0 + } + ] +} From 494bfa02d0fb1400fb8c3ae61713f4b0a8aa4dbb Mon Sep 17 00:00:00 2001 From: omartijn <44672243+omartijn@users.noreply.github.com> Date: Tue, 6 Jul 2021 23:05:13 +0200 Subject: [PATCH 115/141] [boost-modular-build-helper] Fix boost build toolchain options not being used (#18529) * Fix boost build toolchain options not being used The issue was due to the options only being set for the gcc toolchain, and then only for a specific version. On platforms defaulting to a different toolchain (e.g. macOS) this didn't work at all. Additionally, some missing flags were not propagated, in particular the CMAKE_OSX_DEPLOYMENT_TARGET, CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES * [boost-modular-build-helper] Apply CR comments Co-authored-by: Martijn Otto Co-authored-by: Robert Schumacher --- .../boost-modular-build-helper/CMakeLists.txt | 37 ++++++++++++++++--- .../boost-modular-build.cmake | 1 + .../user-config.jam | 2 +- ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++ versions/baseline.json | 2 +- 6 files changed, 41 insertions(+), 8 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 043636ee8d9629..b38b0e3137fdef 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -46,13 +46,17 @@ else() endif() if(APPLE) - list(APPEND B2_OPTIONS target-os=darwin toolset=clang) + set(B2_TOOLSET clang) + list(APPEND B2_OPTIONS target-os=darwin) elseif(WIN32) - list(APPEND B2_OPTIONS target-os=windows toolset=gcc) + set(B2_TOOLSET gcc) + list(APPEND B2_OPTIONS target-os=windows) elseif(ANDROID) - list(APPEND B2_OPTIONS target-os=android toolset=gcc) + set(B2_TOOLSET gcc) + list(APPEND B2_OPTIONS target-os=android) else() - list(APPEND B2_OPTIONS target-os=linux toolset=gcc) + set(B2_TOOLSET gcc) + list(APPEND B2_OPTIONS target-os=linux) endif() if(WIN32) @@ -80,6 +84,28 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "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() + + # 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(STRIP "${CXXFLAGS}" CXXFLAGS) string(STRIP "${CFLAGS}" CFLAGS) string(STRIP "${LDFLAGS}" LDFLAGS) @@ -122,7 +148,7 @@ foreach(INCDIR ${CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES}) endforeach() if(APPLE) - set(CXXFLAGS "${CXXFLAGS} -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") + set(CXXFLAGS "${CXXFLAGS} -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") set(LDFLAGS "${LDFLAGS} -stdlib=libc++") endif() @@ -157,6 +183,7 @@ endif() add_custom_target(boost ALL COMMAND "${B2_EXE}" + toolset=${B2_TOOLSET} --user-config=${CMAKE_CURRENT_BINARY_DIR}/user-config.jam --stagedir=${CMAKE_CURRENT_BINARY_DIR}/stage --build-dir=${CMAKE_CURRENT_BINARY_DIR} diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 3acc75afda72a2..69eb899a16db99 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -84,6 +84,7 @@ function(boost_modular_build) if(DEFINED _bm_BOOST_CMAKE_FRAGMENT) list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}") endif() + vcpkg_configure_cmake( SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build PREFER_NINJA diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index 550423965fd33c..afd1d7dc6ac06c 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -10,7 +10,7 @@ if "@VCPKG_PLATFORM_TOOLSET@" != "external" } else { - using gcc : 5.4.1 : @CMAKE_CXX_COMPILER@ + using @B2_TOOLSET@ : : @CMAKE_CXX_COMPILER@ : @CMAKE_RANLIB@ @CMAKE_AR@ diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index e8475362d26a99..699b93b47809bf 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.75.0", - "port-version": 9, + "port-version": 10, "dependencies": [ "boost-build", "boost-uninstall" diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index cdd24d924b3fb3..67ffb430dc2550 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95cad6d5f2d9a858aacbb3b2bc0e3a0db4b06b4b", + "version-string": "1.75.0", + "port-version": 10 + }, { "git-tree": "c475b268ac42e886acfdc783944e1e3a988b0ac8", "version-string": "1.75.0", diff --git a/versions/baseline.json b/versions/baseline.json index f1cc0278d68b75..45d06d2b53d626 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -738,7 +738,7 @@ }, "boost-modular-build-helper": { "baseline": "1.75.0", - "port-version": 9 + "port-version": 10 }, "boost-move": { "baseline": "1.75.0", From d98bc44174d11bf3090f4b832832ee176af7b3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Tabin?= Date: Tue, 6 Jul 2021 23:05:52 +0200 Subject: [PATCH 116/141] [libzippp] Update to 4.1-1.8.0 (#18553) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cédric Tabin --- ports/libzippp/CONTROL | 3 +-- ports/libzippp/portfile.cmake | 16 ++++++++-------- versions/baseline.json | 4 ++-- versions/l-/libzippp.json | 5 +++++ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ports/libzippp/CONTROL b/ports/libzippp/CONTROL index 42aec5142c66f5..93964ad5f7402a 100644 --- a/ports/libzippp/CONTROL +++ b/ports/libzippp/CONTROL @@ -1,6 +1,5 @@ Source: libzippp -Version: 4.0-1.7.3 -Port-Version: 3 +Version: 4.1-1.8.0 Homepage: https://github.com/ctabin/libzippp Description: Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling Build-Depends: zlib, libzip[core,bzip2] diff --git a/ports/libzippp/portfile.cmake b/ports/libzippp/portfile.cmake index 85a1bb3681d1b6..9a011f8014e2cf 100644 --- a/ports/libzippp/portfile.cmake +++ b/ports/libzippp/portfile.cmake @@ -1,16 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ctabin/libzippp - REF 791bdc43eb18b87e3bdfa087493e3e32217e672c #v4.0-1.7.3 with CXX std version c++11 - SHA512 c6a90ecec21bb2d9e3af681c35d7eec0bee7b356fc1438004dc84be32ee7b94d047c35817d46b222237d54699ea54afa4fd3ae5deeba40dfce4fd2035a38b0e5 - HEAD_REF libzippp-v4.0-1.7.3 + REF 8299422194ce3c5be0677550ce3d6d4e15d40dd8 #v4.1-1.8.0 with CXX std version c++11 + SHA512 091c744377707899456b027a35059e048e1552e013330c68920f88f94a42904cf1a6afc7f853cf34cc9bbb3956c3c16907f089520e808520a671c59646d5e351 + HEAD_REF master PATCHES fix-find-lzma.patch ) -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - encryption LIBZIPPP_ENABLE_ENCRYPTION -) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + encryption LIBZIPPP_ENABLE_ENCRYPTION) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -34,4 +34,4 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/versions/baseline.json b/versions/baseline.json index 45d06d2b53d626..1940fb098a885a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3757,8 +3757,8 @@ "port-version": 2 }, "libzippp": { - "baseline": "4.0-1.7.3", - "port-version": 3 + "baseline": "4.1-1.8.0", + "port-version": 0 }, "licensepp": { "baseline": "2020-05-19", diff --git a/versions/l-/libzippp.json b/versions/l-/libzippp.json index f82ee71731c57f..25607575ce671d 100644 --- a/versions/l-/libzippp.json +++ b/versions/l-/libzippp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6ab6d33444f3671ea875f4c98bc2937b2d32ee9", + "version-string": "4.1-1.8.0", + "port-version": 0 + }, { "git-tree": "b599e7e8cf8101b7ad23965c00bca32c24de4b88", "version-string": "4.0-1.7.3", From 2417fe3fd72e9a1a54e55ace63fd14e2a00b0c9e Mon Sep 17 00:00:00 2001 From: shishirb-MSFT <50385517+shishirb-MSFT@users.noreply.github.com> Date: Wed, 7 Jul 2021 09:24:53 -0700 Subject: [PATCH 117/141] [proxywrapper] Remove proxywrapper package (#18692) * Remove proxywrapper package * [proxywrapper] Remove from baseline since there is no longer a tested version of the port Co-authored-by: Robert Schumacher --- ports/proxywrapper/CONTROL | 5 ----- ports/proxywrapper/fix-find-libproxy.patch | 20 ------------------- ports/proxywrapper/fix-macos-build.patch | 15 -------------- ports/proxywrapper/portfile.cmake | 23 ---------------------- versions/baseline.json | 4 ---- 5 files changed, 67 deletions(-) delete mode 100644 ports/proxywrapper/CONTROL delete mode 100644 ports/proxywrapper/fix-find-libproxy.patch delete mode 100644 ports/proxywrapper/fix-macos-build.patch delete mode 100644 ports/proxywrapper/portfile.cmake diff --git a/ports/proxywrapper/CONTROL b/ports/proxywrapper/CONTROL deleted file mode 100644 index c982b2c5b7f191..00000000000000 --- a/ports/proxywrapper/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: proxywrapper -Version: 1.0.0 -Description: Provides a standalone wrapper around the libproxy library. -Homepage: https://github.com/microsoft/proxy-wrapper -Build-Depends: libproxy diff --git a/ports/proxywrapper/fix-find-libproxy.patch b/ports/proxywrapper/fix-find-libproxy.patch deleted file mode 100644 index aeb45b98def77e..00000000000000 --- a/ports/proxywrapper/fix-find-libproxy.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a867a4..3ba85fa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,11 +5,12 @@ project(proxywrapper) - - include(GNUInstallDirs) - --find_library(proxy REQUIRED) -+find_package(libproxy REQUIRED) - --add_library(proxywrapper SHARED ProxyWrapper.cpp) -+add_library(proxywrapper ProxyWrapper.cpp) - --target_link_libraries(proxywrapper proxy) -+target_link_libraries(proxywrapper PRIVATE ${LIBPROXY_LIBRARIES}) -+target_include_directories(proxywrapper PRIVATE ${LIBPROXY_INCLUDE_DIR}) - - install(TARGETS proxywrapper EXPORT proxywrapper DESTINATION ${CMAKE_INSTALL_LIBDIR}) - diff --git a/ports/proxywrapper/fix-macos-build.patch b/ports/proxywrapper/fix-macos-build.patch deleted file mode 100644 index 8bdaeac5674abf..00000000000000 --- a/ports/proxywrapper/fix-macos-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3ba85fa..f18fd1e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,9 @@ - - cmake_minimum_required(VERSION 3.8) - --project(proxywrapper) -+project(proxywrapper C CXX) -+ -+set(CMAKE_CXX_STANDARD 11) - - include(GNUInstallDirs) - diff --git a/ports/proxywrapper/portfile.cmake b/ports/proxywrapper/portfile.cmake deleted file mode 100644 index 048a9f995dcab7..00000000000000 --- a/ports/proxywrapper/portfile.cmake +++ /dev/null @@ -1,23 +0,0 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO microsoft/proxy-wrapper - REF b113aa0a284508ce0c2878febf9073d1f03b59dc - SHA512 9793ec8b9cc0467c88d850ea51a96a0fdc3c3027cc5b7fd9f5d0362d7fd559e909f19a4eaca6554a9316d6e3a86bb5f541034ca9ce2fb8797fb2e5bdff42b0de - HEAD_REF master - PATCHES - fix-find-libproxy.patch - fix-macos-build.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake() - -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/versions/baseline.json b/versions/baseline.json index 1940fb098a885a..9c42ced979a25f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5020,10 +5020,6 @@ "baseline": "2020.10.19.00", "port-version": 0 }, - "proxywrapper": { - "baseline": "1.0.0", - "port-version": 0 - }, "psimd": { "baseline": "2021-02-21", "port-version": 0 From 78060d896b589ac694e88c155ae93777cc1846bd Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 8 Jul 2021 00:26:06 +0800 Subject: [PATCH 118/141] [glew] Improve messages for system opengl dependency (#18672) * [glew] Fix the dependency * Update baseline version * Adress the review suggestions * Update the baseline revision --- ports/glew/CONTROL | 6 ------ ports/glew/portfile.cmake | 4 ++++ ports/glew/vcpkg.json | 10 ++++++++++ versions/baseline.json | 2 +- versions/g-/glew.json | 5 +++++ 5 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 ports/glew/CONTROL create mode 100644 ports/glew/vcpkg.json diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL deleted file mode 100644 index 5d8250fd5b7665..00000000000000 --- a/ports/glew/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: glew -Version: 2.1.0 -Port-Version: 10 -Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. -Homepage: https://github.com/nigels-com/glew -Build-Depends: opengl diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 6ca6591d9f47ee..5dd0c03ce3dfb9 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} requires the following libraries from the system package manager:\n libxmu-dev\n libxi-dev\n libgl-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxmu-dev libxi-dev libgl-dev.") +endif() + # Don't change to vcpkg_from_github! The sources in the git repository (archives) are missing some files that are distributed inside releases. # More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13 vcpkg_download_distfile(ARCHIVE diff --git a/ports/glew/vcpkg.json b/ports/glew/vcpkg.json new file mode 100644 index 00000000000000..22271d883d6107 --- /dev/null +++ b/ports/glew/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "glew", + "version-string": "2.1.0", + "port-version": 11, + "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.", + "homepage": "https://github.com/nigels-com/glew", + "dependencies": [ + "opengl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 9c42ced979a25f..3ffddc96e2033b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2294,7 +2294,7 @@ }, "glew": { "baseline": "2.1.0", - "port-version": 10 + "port-version": 11 }, "glfw3": { "baseline": "3.3.4", diff --git a/versions/g-/glew.json b/versions/g-/glew.json index 78ebd98dd8f36b..8969554ac1c67c 100644 --- a/versions/g-/glew.json +++ b/versions/g-/glew.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "622e27b2a746c088f0acd2f98445c0968f485a69", + "version-string": "2.1.0", + "port-version": 11 + }, { "git-tree": "c87d7f619c69630fa4d1bd0bf3767f0d31ef22d6", "version-string": "2.1.0", From 238bdaf981f61337ec39f7fdeed31b440d6408fa Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 8 Jul 2021 00:26:53 +0800 Subject: [PATCH 119/141] [socket-io-client]fix socket-io-client use (#18768) * update patch file * update version --- .../socket-io-client/fix-file-not-found.patch | 19 +++++++++++++------ ports/socket-io-client/portfile.cmake | 2 -- ports/socket-io-client/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/socket-io-client.json | 5 +++++ 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ports/socket-io-client/fix-file-not-found.patch b/ports/socket-io-client/fix-file-not-found.patch index a7fbdb1e3a48c9..f733b56a079075 100644 --- a/ports/socket-io-client/fix-file-not-found.patch +++ b/ports/socket-io-client/fix-file-not-found.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 19c5e54..ca8a00d 100644 +index 19c5e54..9d2e1ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,16 +31,20 @@ add_definitions( +@@ -31,17 +31,20 @@ add_definitions( -D_WEBSOCKETPP_CPP11_FUNCTIONAL_ ) @@ -20,13 +20,13 @@ index 19c5e54..ca8a00d 100644 set_property(TARGET sioclient PROPERTY CXX_STANDARD 11) set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON) -+target_link_libraries(sioclient PRIVATE websocketpp::websocketpp) -+target_link_libraries(sioclient PRIVATE asio asio::asio) -+target_link_libraries(sioclient PRIVATE rapidjson) ++target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio asio::asio rapidjson) ++ if(BUILD_SHARED_LIBS) set_target_properties(sioclient -@@ -56,9 +60,6 @@ if(OPENSSL_FOUND) + PROPERTIES +@@ -56,15 +59,12 @@ if(OPENSSL_FOUND) add_library(sioclient_tls ${ALL_SRC}) target_include_directories(sioclient_tls PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src @@ -36,3 +36,10 @@ index 19c5e54..ca8a00d 100644 ${OPENSSL_INCLUDE_DIR} ) + set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD 11) + set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD_REQUIRED ON) +-target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} ) ++target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} websocketpp::websocketpp asio asio::asio rapidjson) + target_compile_definitions(sioclient_tls PRIVATE -DSIO_TLS) + if(BUILD_SHARED_LIBS) + set_target_properties(sioclient_tls diff --git a/ports/socket-io-client/portfile.cmake b/ports/socket-io-client/portfile.cmake index 7b81118ba8ff3b..1dafa3221060f8 100644 --- a/ports/socket-io-client/portfile.cmake +++ b/ports/socket-io-client/portfile.cmake @@ -11,8 +11,6 @@ vcpkg_from_github( fix-error-C3321.patch ) -file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzstd.cmake") - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/socket-io-client/vcpkg.json b/ports/socket-io-client/vcpkg.json index 6ecf8b90b43fd5..7a182c190ecc19 100644 --- a/ports/socket-io-client/vcpkg.json +++ b/ports/socket-io-client/vcpkg.json @@ -1,6 +1,7 @@ { "name": "socket-io-client", "version": "3.0.0", + "port-version": 1, "description": "C++11 implementation of Socket.IO client", "homepage": "https://github.com/socketio/socket.io-client-cpp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 3ffddc96e2033b..fad9490b4ef236 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5854,7 +5854,7 @@ }, "socket-io-client": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "sockpp": { "baseline": "0.7", diff --git a/versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json index d81657ab177c61..5b757efdf2e1b2 100644 --- a/versions/s-/socket-io-client.json +++ b/versions/s-/socket-io-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb9a92d56d3208354e66f4a449698af2e2d2fd2f", + "version": "3.0.0", + "port-version": 1 + }, { "git-tree": "a84a0e4ab231050bf881b44603070de5da27ae05", "version": "3.0.0", From 26c0e4a67e7f65b639feeec1a17f99057e5c4952 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 7 Jul 2021 21:31:06 +0200 Subject: [PATCH 120/141] [boost] update to 1.76.0 (#17335) * [boost] update generator script for boost 1.76 * [boost] update ports to 1.76.0 (run generator) * [boost] fix windows build? * [quantlib] update and fix mac build * [symengine] update and fix build * [avro-cpp] update to latest master and fix windows build * [folly] update to 2021.05.31.00 * [fbthrift, fizz, wangle] update to v2021.05.31.00 and fix build * [proxygen] update to version 2021.05.31.00 * [fizz, proxygen, fbthrift] fix sodium target * [proxygen] also works on macOS * [quantlib] use fix from upstream to fix mac build * [symengine] minimize patch file and fix deprecation warning * [folly,proxygen,wangle,fizz,fbthrift] update to 2021.06.14.00 * [fbthrift] remove unnecessary dependency rsocket I couldn't find any information that this dependency exists. The term is used in the code, but not in the context of a dependency * [fizz,fbthrift] fix zlib dependency * [fbthrift] pass required flex executable to cmake configure * add version files * [boost] generate-ports.ps1: Apply code review * [boost] changes from new version of generate-ports script * update version files * [boost] generate-ports.ps1: Apply code review --- ports/avro-cpp/CONTROL | 10 - ports/avro-cpp/fix-windows-build.patch | 33 ++ ports/avro-cpp/install.patch | 22 +- ports/avro-cpp/portfile.cmake | 5 +- ports/avro-cpp/vcpkg.json | 30 ++ ports/boost-accumulators/portfile.cmake | 4 +- ports/boost-accumulators/vcpkg.json | 2 +- ports/boost-algorithm/portfile.cmake | 4 +- ports/boost-algorithm/vcpkg.json | 2 +- ports/boost-align/portfile.cmake | 4 +- ports/boost-align/vcpkg.json | 2 +- ports/boost-any/portfile.cmake | 4 +- ports/boost-any/vcpkg.json | 2 +- ports/boost-array/portfile.cmake | 4 +- ports/boost-array/vcpkg.json | 2 +- ports/boost-asio/inline_dummy_return.patch | 13 - ports/boost-asio/portfile.cmake | 8 +- ports/boost-asio/vcpkg.json | 5 +- ports/boost-assert/portfile.cmake | 4 +- ports/boost-assert/vcpkg.json | 2 +- ports/boost-assign/portfile.cmake | 4 +- ports/boost-assign/vcpkg.json | 2 +- ports/boost-atomic/portfile.cmake | 4 +- ports/boost-atomic/vcpkg.json | 4 +- ports/boost-beast/portfile.cmake | 4 +- ports/boost-beast/vcpkg.json | 2 +- ports/boost-bimap/portfile.cmake | 4 +- ports/boost-bimap/vcpkg.json | 2 +- ports/boost-bind/portfile.cmake | 4 +- ports/boost-bind/vcpkg.json | 2 +- ports/boost-callable-traits/portfile.cmake | 4 +- ports/boost-callable-traits/vcpkg.json | 2 +- ports/boost-chrono/portfile.cmake | 4 +- ports/boost-chrono/vcpkg.json | 3 +- ports/boost-circular-buffer/portfile.cmake | 4 +- ports/boost-circular-buffer/vcpkg.json | 3 +- ports/boost-compatibility/portfile.cmake | 4 +- ports/boost-compatibility/vcpkg.json | 2 +- ports/boost-compute/portfile.cmake | 4 +- ports/boost-compute/vcpkg.json | 2 +- .../fix-warning-c4834.patch | 13 - ports/boost-concept-check/portfile.cmake | 6 +- ports/boost-concept-check/vcpkg.json | 3 +- ports/boost-config/portfile.cmake | 4 +- ports/boost-config/vcpkg.json | 3 +- ports/boost-container-hash/portfile.cmake | 4 +- ports/boost-container-hash/vcpkg.json | 3 +- ports/boost-container/portfile.cmake | 4 +- ports/boost-container/vcpkg.json | 9 +- ...xports_for_32bit_GNU_asm_for_windows.patch | 45 --- ports/boost-context/portfile.cmake | 5 +- ports/boost-context/vcpkg.json | 4 +- ports/boost-contract/portfile.cmake | 4 +- ports/boost-contract/vcpkg.json | 3 +- ports/boost-conversion/portfile.cmake | 4 +- ports/boost-conversion/vcpkg.json | 2 +- ports/boost-convert/portfile.cmake | 4 +- ports/boost-convert/vcpkg.json | 2 +- ports/boost-core/portfile.cmake | 4 +- ports/boost-core/vcpkg.json | 3 +- ports/boost-coroutine/portfile.cmake | 4 +- ports/boost-coroutine/vcpkg.json | 4 +- ports/boost-coroutine2/portfile.cmake | 4 +- ports/boost-coroutine2/vcpkg.json | 2 +- ports/boost-crc/portfile.cmake | 4 +- ports/boost-crc/vcpkg.json | 3 +- ports/boost-date-time/portfile.cmake | 4 +- ports/boost-date-time/vcpkg.json | 5 +- ports/boost-detail/portfile.cmake | 4 +- ports/boost-detail/vcpkg.json | 3 +- ports/boost-dll/portfile.cmake | 4 +- ports/boost-dll/vcpkg.json | 3 +- ports/boost-dynamic-bitset/portfile.cmake | 4 +- ports/boost-dynamic-bitset/vcpkg.json | 10 +- ports/boost-endian/portfile.cmake | 4 +- ports/boost-endian/vcpkg.json | 3 +- ports/boost-exception/portfile.cmake | 4 +- ports/boost-exception/vcpkg.json | 3 +- ports/boost-fiber/portfile.cmake | 4 +- ports/boost-fiber/vcpkg.json | 3 +- ports/boost-filesystem/portfile.cmake | 4 +- ports/boost-filesystem/vcpkg.json | 4 +- ports/boost-flyweight/portfile.cmake | 4 +- ports/boost-flyweight/vcpkg.json | 2 +- ports/boost-foreach/portfile.cmake | 4 +- ports/boost-foreach/vcpkg.json | 2 +- ports/boost-format/portfile.cmake | 4 +- ports/boost-format/vcpkg.json | 3 +- ports/boost-function-types/portfile.cmake | 4 +- ports/boost-function-types/vcpkg.json | 2 +- ports/boost-function/portfile.cmake | 4 +- ports/boost-function/vcpkg.json | 2 +- ports/boost-functional/portfile.cmake | 4 +- ports/boost-functional/vcpkg.json | 2 +- ports/boost-fusion/portfile.cmake | 4 +- ports/boost-fusion/vcpkg.json | 2 +- ports/boost-geometry/portfile.cmake | 4 +- ports/boost-geometry/vcpkg.json | 2 +- ports/boost-gil/portfile.cmake | 4 +- ports/boost-gil/vcpkg.json | 2 +- ports/boost-graph-parallel/portfile.cmake | 4 +- ports/boost-graph-parallel/vcpkg.json | 3 +- ports/boost-graph/portfile.cmake | 4 +- ports/boost-graph/vcpkg.json | 4 +- ports/boost-hana/portfile.cmake | 4 +- ports/boost-hana/vcpkg.json | 2 +- ports/boost-heap/portfile.cmake | 4 +- ports/boost-heap/vcpkg.json | 4 +- ports/boost-histogram/portfile.cmake | 4 +- ports/boost-histogram/vcpkg.json | 2 +- ports/boost-hof/portfile.cmake | 4 +- ports/boost-hof/vcpkg.json | 2 +- ports/boost-icl/portfile.cmake | 4 +- ports/boost-icl/vcpkg.json | 2 +- ports/boost-integer/portfile.cmake | 4 +- ports/boost-integer/vcpkg.json | 3 +- ports/boost-interprocess/portfile.cmake | 4 +- ports/boost-interprocess/vcpkg.json | 3 +- ports/boost-interval/portfile.cmake | 4 +- ports/boost-interval/vcpkg.json | 3 +- ports/boost-intrusive/portfile.cmake | 4 +- ports/boost-intrusive/vcpkg.json | 3 +- ports/boost-io/portfile.cmake | 4 +- ports/boost-io/vcpkg.json | 2 +- ports/boost-iostreams/portfile.cmake | 4 +- ports/boost-iostreams/vcpkg.json | 3 +- ports/boost-iterator/portfile.cmake | 4 +- ports/boost-iterator/vcpkg.json | 3 +- ports/boost-json/portfile.cmake | 5 +- ports/boost-json/vcpkg.json | 3 +- ports/boost-lambda/portfile.cmake | 4 +- ports/boost-lambda/vcpkg.json | 5 +- ports/boost-leaf/portfile.cmake | 4 +- ports/boost-leaf/vcpkg.json | 2 +- ports/boost-lexical-cast/portfile.cmake | 4 +- ports/boost-lexical-cast/vcpkg.json | 3 +- ports/boost-local-function/portfile.cmake | 4 +- ports/boost-local-function/vcpkg.json | 2 +- ports/boost-locale/portfile.cmake | 4 +- ports/boost-locale/vcpkg.json | 4 +- ports/boost-lockfree/portfile.cmake | 4 +- ports/boost-lockfree/vcpkg.json | 2 +- ports/boost-log/portfile.cmake | 4 +- ports/boost-log/vcpkg.json | 5 +- ports/boost-logic/portfile.cmake | 4 +- ports/boost-logic/vcpkg.json | 2 +- ports/boost-math/b2-options.cmake | 3 + ports/boost-math/portfile.cmake | 15 +- ports/boost-math/vcpkg.json | 8 +- ports/boost-metaparse/portfile.cmake | 4 +- ports/boost-metaparse/vcpkg.json | 2 +- ports/boost-modular-build-helper/Jamroot.jam | 4 +- .../boost-modular-build.cmake | 2 +- ports/boost-modular-build-helper/vcpkg.json | 3 +- ports/boost-move/portfile.cmake | 4 +- ports/boost-move/vcpkg.json | 4 +- ports/boost-mp11/portfile.cmake | 4 +- ports/boost-mp11/vcpkg.json | 2 +- ports/boost-mpi/portfile.cmake | 4 +- ports/boost-mpi/vcpkg.json | 4 +- ports/boost-mpl/portfile.cmake | 4 +- ports/boost-mpl/vcpkg.json | 2 +- ports/boost-msm/portfile.cmake | 4 +- ports/boost-msm/vcpkg.json | 2 +- ports/boost-multi-array/portfile.cmake | 4 +- ports/boost-multi-array/vcpkg.json | 13 +- ports/boost-multi-index/portfile.cmake | 4 +- ports/boost-multi-index/vcpkg.json | 3 +- ports/boost-multiprecision/portfile.cmake | 4 +- ports/boost-multiprecision/vcpkg.json | 8 +- ports/boost-nowide/portfile.cmake | 4 +- ports/boost-nowide/vcpkg.json | 3 +- ports/boost-numeric-conversion/portfile.cmake | 4 +- ports/boost-numeric-conversion/vcpkg.json | 6 +- ports/boost-odeint/portfile.cmake | 4 +- ports/boost-odeint/vcpkg.json | 2 +- ports/boost-optional/portfile.cmake | 4 +- ports/boost-optional/vcpkg.json | 2 +- ports/boost-outcome/portfile.cmake | 4 +- ports/boost-outcome/vcpkg.json | 4 +- ports/boost-parameter-python/portfile.cmake | 4 +- ports/boost-parameter-python/vcpkg.json | 2 +- ports/boost-parameter/portfile.cmake | 4 +- ports/boost-parameter/vcpkg.json | 2 +- ports/boost-pfr/portfile.cmake | 4 +- ports/boost-pfr/vcpkg.json | 2 +- ports/boost-phoenix/portfile.cmake | 4 +- ports/boost-phoenix/vcpkg.json | 2 +- ports/boost-poly-collection/portfile.cmake | 4 +- ports/boost-poly-collection/vcpkg.json | 2 +- ports/boost-polygon/portfile.cmake | 4 +- ports/boost-polygon/vcpkg.json | 3 +- ports/boost-pool/portfile.cmake | 4 +- ports/boost-pool/vcpkg.json | 3 +- ports/boost-predef/portfile.cmake | 4 +- ports/boost-predef/vcpkg.json | 2 +- ports/boost-preprocessor/portfile.cmake | 4 +- ports/boost-preprocessor/vcpkg.json | 2 +- ports/boost-process/portfile.cmake | 4 +- ports/boost-process/vcpkg.json | 2 +- ports/boost-program-options/portfile.cmake | 4 +- ports/boost-program-options/vcpkg.json | 4 +- ports/boost-property-map/portfile.cmake | 4 +- ports/boost-property-map/vcpkg.json | 3 +- ports/boost-property-tree/portfile.cmake | 4 +- ports/boost-property-tree/vcpkg.json | 3 +- ports/boost-proto/portfile.cmake | 4 +- ports/boost-proto/vcpkg.json | 2 +- ports/boost-ptr-container/portfile.cmake | 4 +- ports/boost-ptr-container/vcpkg.json | 2 +- ports/boost-python/portfile.cmake | 4 +- ports/boost-python/vcpkg.json | 4 +- ports/boost-qvm/portfile.cmake | 4 +- ports/boost-qvm/vcpkg.json | 7 +- ports/boost-random/portfile.cmake | 4 +- ports/boost-random/vcpkg.json | 7 +- ports/boost-range/portfile.cmake | 4 +- ports/boost-range/vcpkg.json | 3 +- ports/boost-ratio/portfile.cmake | 4 +- ports/boost-ratio/vcpkg.json | 2 +- ports/boost-rational/portfile.cmake | 4 +- ports/boost-rational/vcpkg.json | 2 +- ports/boost-regex/portfile.cmake | 4 +- ports/boost-regex/vcpkg.json | 4 +- ports/boost-safe-numerics/portfile.cmake | 4 +- ports/boost-safe-numerics/vcpkg.json | 2 +- ports/boost-scope-exit/portfile.cmake | 4 +- ports/boost-scope-exit/vcpkg.json | 2 +- ports/boost-serialization/portfile.cmake | 4 +- ports/boost-serialization/vcpkg.json | 4 +- ports/boost-signals2/portfile.cmake | 4 +- ports/boost-signals2/vcpkg.json | 2 +- ports/boost-smart-ptr/portfile.cmake | 4 +- ports/boost-smart-ptr/vcpkg.json | 3 +- ports/boost-sort/portfile.cmake | 4 +- ports/boost-sort/vcpkg.json | 4 +- ports/boost-spirit/portfile.cmake | 4 +- ports/boost-spirit/vcpkg.json | 4 +- ports/boost-stacktrace/portfile.cmake | 4 +- ports/boost-stacktrace/vcpkg.json | 3 +- ports/boost-statechart/portfile.cmake | 4 +- ports/boost-statechart/vcpkg.json | 2 +- ports/boost-static-assert/portfile.cmake | 4 +- ports/boost-static-assert/vcpkg.json | 2 +- ports/boost-static-string/portfile.cmake | 4 +- ports/boost-static-string/vcpkg.json | 2 +- ports/boost-stl-interfaces/portfile.cmake | 4 +- ports/boost-stl-interfaces/vcpkg.json | 2 +- ports/boost-system/portfile.cmake | 4 +- ports/boost-system/vcpkg.json | 4 +- ports/boost-test/portfile.cmake | 4 +- ports/boost-test/vcpkg.json | 5 +- ports/boost-thread/portfile.cmake | 4 +- ports/boost-thread/vcpkg.json | 4 +- ports/boost-throw-exception/portfile.cmake | 4 +- ports/boost-throw-exception/vcpkg.json | 2 +- ports/boost-timer/portfile.cmake | 4 +- ports/boost-timer/vcpkg.json | 5 +- ports/boost-tokenizer/portfile.cmake | 4 +- ports/boost-tokenizer/vcpkg.json | 2 +- ports/boost-tti/portfile.cmake | 4 +- ports/boost-tti/vcpkg.json | 2 +- ports/boost-tuple/portfile.cmake | 4 +- ports/boost-tuple/vcpkg.json | 2 +- ports/boost-type-erasure/portfile.cmake | 4 +- ports/boost-type-erasure/vcpkg.json | 3 +- ports/boost-type-index/portfile.cmake | 4 +- ports/boost-type-index/vcpkg.json | 3 +- ports/boost-type-traits/portfile.cmake | 4 +- ports/boost-type-traits/vcpkg.json | 2 +- ports/boost-typeof/portfile.cmake | 4 +- ports/boost-typeof/vcpkg.json | 2 +- ports/boost-ublas/portfile.cmake | 4 +- ports/boost-ublas/vcpkg.json | 2 +- ports/boost-units/portfile.cmake | 4 +- ports/boost-units/vcpkg.json | 2 +- ports/boost-unordered/portfile.cmake | 4 +- ports/boost-unordered/vcpkg.json | 3 +- ports/boost-utility/portfile.cmake | 4 +- ports/boost-utility/vcpkg.json | 3 +- ports/boost-uuid/portfile.cmake | 4 +- ports/boost-uuid/vcpkg.json | 4 +- ports/boost-variant/portfile.cmake | 4 +- ports/boost-variant/vcpkg.json | 2 +- ports/boost-variant2/portfile.cmake | 4 +- ports/boost-variant2/vcpkg.json | 3 +- ports/boost-vmd/portfile.cmake | 4 +- ports/boost-vmd/vcpkg.json | 2 +- ports/boost-wave/portfile.cmake | 4 +- ports/boost-wave/vcpkg.json | 4 +- ports/boost-winapi/portfile.cmake | 4 +- ports/boost-winapi/vcpkg.json | 2 +- ports/boost-xpressive/portfile.cmake | 4 +- ports/boost-xpressive/vcpkg.json | 3 +- ports/boost-yap/portfile.cmake | 4 +- ports/boost-yap/vcpkg.json | 2 +- ports/boost/portfile.cmake | 2 +- ports/boost/vcpkg.json | 2 +- ports/fbthrift/CONTROL | 6 - ports/fbthrift/fix-sodium-target.patch | 16 + ports/fbthrift/fix-zlib.patch | 100 +++++ ports/fbthrift/portfile.cmake | 11 +- ports/fbthrift/vcpkg.json | 24 ++ ports/fizz/CONTROL | 5 - ports/fizz/find-zlib.patch | 14 - ports/fizz/fix-zlib.patch | 36 ++ ports/fizz/portfile.cmake | 14 +- ports/fizz/vcpkg.json | 13 + ports/folly/CONTROL | 31 -- ports/folly/fix-windows-minmax.patch | 12 + ports/folly/missing-include-atomic.patch | 12 - ports/folly/portfile.cmake | 6 +- ports/folly/vcpkg.json | 68 ++++ ports/proxygen/CONTROL | 6 - ports/proxygen/fix-duplicated-target.patch | 16 + ports/proxygen/portfile.cmake | 7 +- ports/proxygen/remove-register.patch | 12 + ports/proxygen/vcpkg.json | 23 ++ ports/quantlib/CONTROL | 5 - ports/quantlib/fix-mac-build.patch | 15 + ports/quantlib/portfile.cmake | 12 +- ports/quantlib/vcpkg.json | 40 ++ ports/symengine/CONTROL | 30 -- ports/symengine/fix-build.patch | 13 + ports/symengine/portfile.cmake | 15 +- ports/symengine/vcpkg.json | 52 +++ ports/wangle/CONTROL | 6 - ports/wangle/portfile.cmake | 4 +- ports/wangle/vcpkg.json | 19 + scripts/boost/generate-ports.ps1 | 98 ++--- scripts/boost/post-source-stubs/json.cmake | 1 + scripts/boost/post-source-stubs/math.cmake | 6 + versions/a-/avro-cpp.json | 5 + versions/b-/boost-accumulators.json | 5 + versions/b-/boost-algorithm.json | 5 + versions/b-/boost-align.json | 5 + versions/b-/boost-any.json | 5 + versions/b-/boost-array.json | 5 + versions/b-/boost-asio.json | 5 + versions/b-/boost-assert.json | 5 + versions/b-/boost-assign.json | 5 + versions/b-/boost-atomic.json | 5 + versions/b-/boost-beast.json | 5 + versions/b-/boost-bimap.json | 5 + versions/b-/boost-bind.json | 5 + versions/b-/boost-callable-traits.json | 5 + versions/b-/boost-chrono.json | 5 + versions/b-/boost-circular-buffer.json | 5 + versions/b-/boost-compatibility.json | 5 + versions/b-/boost-compute.json | 5 + versions/b-/boost-concept-check.json | 5 + versions/b-/boost-config.json | 5 + versions/b-/boost-container-hash.json | 5 + versions/b-/boost-container.json | 5 + versions/b-/boost-context.json | 5 + versions/b-/boost-contract.json | 5 + versions/b-/boost-conversion.json | 5 + versions/b-/boost-convert.json | 5 + versions/b-/boost-core.json | 5 + versions/b-/boost-coroutine.json | 5 + versions/b-/boost-coroutine2.json | 5 + versions/b-/boost-crc.json | 5 + versions/b-/boost-date-time.json | 5 + versions/b-/boost-detail.json | 5 + versions/b-/boost-dll.json | 5 + versions/b-/boost-dynamic-bitset.json | 5 + versions/b-/boost-endian.json | 5 + versions/b-/boost-exception.json | 5 + versions/b-/boost-fiber.json | 5 + versions/b-/boost-filesystem.json | 5 + versions/b-/boost-flyweight.json | 5 + versions/b-/boost-foreach.json | 5 + versions/b-/boost-format.json | 5 + versions/b-/boost-function-types.json | 5 + versions/b-/boost-function.json | 5 + versions/b-/boost-functional.json | 5 + versions/b-/boost-fusion.json | 5 + versions/b-/boost-geometry.json | 5 + versions/b-/boost-gil.json | 5 + versions/b-/boost-graph-parallel.json | 5 + versions/b-/boost-graph.json | 5 + versions/b-/boost-hana.json | 5 + versions/b-/boost-heap.json | 5 + versions/b-/boost-histogram.json | 5 + versions/b-/boost-hof.json | 5 + versions/b-/boost-icl.json | 5 + versions/b-/boost-integer.json | 5 + versions/b-/boost-interprocess.json | 5 + versions/b-/boost-interval.json | 5 + versions/b-/boost-intrusive.json | 5 + versions/b-/boost-io.json | 5 + versions/b-/boost-iostreams.json | 5 + versions/b-/boost-iterator.json | 5 + versions/b-/boost-json.json | 5 + versions/b-/boost-lambda.json | 5 + versions/b-/boost-leaf.json | 5 + versions/b-/boost-lexical-cast.json | 5 + versions/b-/boost-local-function.json | 5 + versions/b-/boost-locale.json | 5 + versions/b-/boost-lockfree.json | 5 + versions/b-/boost-log.json | 5 + versions/b-/boost-logic.json | 5 + versions/b-/boost-math.json | 5 + versions/b-/boost-metaparse.json | 5 + versions/b-/boost-modular-build-helper.json | 6 +- versions/b-/boost-move.json | 5 + versions/b-/boost-mp11.json | 5 + versions/b-/boost-mpi.json | 5 + versions/b-/boost-mpl.json | 5 + versions/b-/boost-msm.json | 5 + versions/b-/boost-multi-array.json | 5 + versions/b-/boost-multi-index.json | 5 + versions/b-/boost-multiprecision.json | 5 + versions/b-/boost-nowide.json | 5 + versions/b-/boost-numeric-conversion.json | 5 + versions/b-/boost-odeint.json | 5 + versions/b-/boost-optional.json | 5 + versions/b-/boost-outcome.json | 5 + versions/b-/boost-parameter-python.json | 5 + versions/b-/boost-parameter.json | 5 + versions/b-/boost-pfr.json | 5 + versions/b-/boost-phoenix.json | 5 + versions/b-/boost-poly-collection.json | 5 + versions/b-/boost-polygon.json | 5 + versions/b-/boost-pool.json | 5 + versions/b-/boost-predef.json | 5 + versions/b-/boost-preprocessor.json | 5 + versions/b-/boost-process.json | 5 + versions/b-/boost-program-options.json | 5 + versions/b-/boost-property-map.json | 5 + versions/b-/boost-property-tree.json | 5 + versions/b-/boost-proto.json | 5 + versions/b-/boost-ptr-container.json | 5 + versions/b-/boost-python.json | 5 + versions/b-/boost-qvm.json | 5 + versions/b-/boost-random.json | 5 + versions/b-/boost-range.json | 5 + versions/b-/boost-ratio.json | 5 + versions/b-/boost-rational.json | 5 + versions/b-/boost-regex.json | 5 + versions/b-/boost-safe-numerics.json | 5 + versions/b-/boost-scope-exit.json | 5 + versions/b-/boost-serialization.json | 5 + versions/b-/boost-signals2.json | 5 + versions/b-/boost-smart-ptr.json | 5 + versions/b-/boost-sort.json | 5 + versions/b-/boost-spirit.json | 5 + versions/b-/boost-stacktrace.json | 5 + versions/b-/boost-statechart.json | 5 + versions/b-/boost-static-assert.json | 5 + versions/b-/boost-static-string.json | 5 + versions/b-/boost-stl-interfaces.json | 5 + versions/b-/boost-system.json | 5 + versions/b-/boost-test.json | 5 + versions/b-/boost-thread.json | 5 + versions/b-/boost-throw-exception.json | 5 + versions/b-/boost-timer.json | 5 + versions/b-/boost-tokenizer.json | 5 + versions/b-/boost-tti.json | 5 + versions/b-/boost-tuple.json | 5 + versions/b-/boost-type-erasure.json | 5 + versions/b-/boost-type-index.json | 5 + versions/b-/boost-type-traits.json | 5 + versions/b-/boost-typeof.json | 5 + versions/b-/boost-ublas.json | 5 + versions/b-/boost-units.json | 5 + versions/b-/boost-unordered.json | 5 + versions/b-/boost-utility.json | 5 + versions/b-/boost-uuid.json | 5 + versions/b-/boost-variant.json | 5 + versions/b-/boost-variant2.json | 5 + versions/b-/boost-vmd.json | 5 + versions/b-/boost-wave.json | 5 + versions/b-/boost-winapi.json | 5 + versions/b-/boost-xpressive.json | 5 + versions/b-/boost-yap.json | 5 + versions/b-/boost.json | 5 + versions/baseline.json | 372 +++++++++--------- versions/f-/fbthrift.json | 5 + versions/f-/fizz.json | 5 + versions/f-/folly.json | 5 + versions/p-/proxygen.json | 5 + versions/q-/quantlib.json | 5 + versions/s-/symengine.json | 5 + versions/w-/wangle.json | 5 + 485 files changed, 2046 insertions(+), 1041 deletions(-) delete mode 100644 ports/avro-cpp/CONTROL create mode 100644 ports/avro-cpp/fix-windows-build.patch create mode 100644 ports/avro-cpp/vcpkg.json delete mode 100644 ports/boost-asio/inline_dummy_return.patch delete mode 100644 ports/boost-concept-check/fix-warning-c4834.patch delete mode 100644 ports/boost-context/fix_exports_for_32bit_GNU_asm_for_windows.patch create mode 100644 ports/boost-math/b2-options.cmake delete mode 100644 ports/fbthrift/CONTROL create mode 100644 ports/fbthrift/fix-sodium-target.patch create mode 100644 ports/fbthrift/fix-zlib.patch create mode 100644 ports/fbthrift/vcpkg.json delete mode 100644 ports/fizz/CONTROL delete mode 100644 ports/fizz/find-zlib.patch create mode 100644 ports/fizz/fix-zlib.patch create mode 100644 ports/fizz/vcpkg.json delete mode 100644 ports/folly/CONTROL create mode 100644 ports/folly/fix-windows-minmax.patch delete mode 100644 ports/folly/missing-include-atomic.patch create mode 100644 ports/folly/vcpkg.json delete mode 100644 ports/proxygen/CONTROL create mode 100644 ports/proxygen/fix-duplicated-target.patch create mode 100644 ports/proxygen/remove-register.patch create mode 100644 ports/proxygen/vcpkg.json delete mode 100644 ports/quantlib/CONTROL create mode 100644 ports/quantlib/fix-mac-build.patch create mode 100644 ports/quantlib/vcpkg.json delete mode 100644 ports/symengine/CONTROL create mode 100644 ports/symengine/fix-build.patch create mode 100644 ports/symengine/vcpkg.json delete mode 100644 ports/wangle/CONTROL create mode 100644 ports/wangle/vcpkg.json create mode 100644 scripts/boost/post-source-stubs/math.cmake diff --git a/ports/avro-cpp/CONTROL b/ports/avro-cpp/CONTROL deleted file mode 100644 index 85518d7577fcb7..00000000000000 --- a/ports/avro-cpp/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: avro-cpp -Version: 1.9.2 -Homepage: https://github.com/apache/avro -Description: Apache Avro is a data serialization system -Build-Depends: boost-format, boost-thread, boost-filesystem, boost-iostreams, boost-program-options, boost-random, boost-crc, boost-test, libzip, bzip2, liblzma, zlib, zstd -Supports: !(windows&static) - -Feature: snappy -Build-Depends: snappy -Description: Support Snappy for compression diff --git a/ports/avro-cpp/fix-windows-build.patch b/ports/avro-cpp/fix-windows-build.patch new file mode 100644 index 00000000000000..b20706fdc1485c --- /dev/null +++ b/ports/avro-cpp/fix-windows-build.patch @@ -0,0 +1,33 @@ +diff --git a/lang/c++/impl/avrogencpp.cc b/lang/c++/impl/avrogencpp.cc +index 61570413..0b6b35a2 100644 +--- a/lang/c++/impl/avrogencpp.cc ++++ b/lang/c++/impl/avrogencpp.cc +@@ -804,8 +804,8 @@ static string readGuard(const string &filename) { + + int main(int argc, char **argv) { + const string NS("namespace"); +- const string OUT("output"); +- const string IN("input"); ++ const string OUT_FILE("output"); ++ const string IN_FILE("input"); + const string INCLUDE_PREFIX("include-prefix"); + const string NO_UNION_TYPEDEF("no-union-typedef"); + +@@ -817,14 +817,14 @@ int main(int argc, char **argv) { + po::store(po::parse_command_line(argc, argv, desc), vm); + po::notify(vm); + +- if (vm.count("help") || vm.count(IN) == 0 || vm.count(OUT) == 0) { ++ if (vm.count("help") || vm.count(IN_FILE) == 0 || vm.count(OUT_FILE) == 0) { + std::cout << desc << std::endl; + return 1; + } + + string ns = vm.count(NS) > 0 ? vm[NS].as() : string(); +- string outf = vm.count(OUT) > 0 ? vm[OUT].as() : string(); +- string inf = vm.count(IN) > 0 ? vm[IN].as() : string(); ++ string outf = vm.count(OUT_FILE) > 0 ? vm[OUT_FILE].as() : string(); ++ string inf = vm.count(IN_FILE) > 0 ? vm[IN_FILE].as() : string(); + string incPrefix = vm[INCLUDE_PREFIX].as(); + bool noUnion = vm.count(NO_UNION_TYPEDEF) != 0; + if (incPrefix == "-") { diff --git a/ports/avro-cpp/install.patch b/ports/avro-cpp/install.patch index 12ead28612157d..1035b3bf35c8f1 100644 --- a/ports/avro-cpp/install.patch +++ b/ports/avro-cpp/install.patch @@ -1,8 +1,8 @@ diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt -index 30a5d66..f7f2b94 100644 +index bf764ce4..e84524d0 100644 --- a/lang/c++/CMakeLists.txt +++ b/lang/c++/CMakeLists.txt -@@ -40,6 +40,8 @@ set (AVRO_VERSION_MINOR "0") +@@ -48,6 +48,8 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH) project (Avro-cpp) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) @@ -11,12 +11,13 @@ index 30a5d66..f7f2b94 100644 if (WIN32 AND NOT CYGWIN AND NOT MSYS) add_definitions (/EHa) add_definitions ( -@@ -118,11 +120,11 @@ set_target_properties (avrocpp PROPERTIES +@@ -125,12 +127,12 @@ set_target_properties (avrocpp PROPERTIES set_target_properties (avrocpp_s PROPERTIES - VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}) + VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH}) -target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB) + target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR}) add_executable (precompile test/precompile.cc) @@ -25,13 +26,12 @@ index 30a5d66..f7f2b94 100644 macro (gen file ns) add_custom_command (OUTPUT ${file}.hh -@@ -151,34 +153,40 @@ gen (crossref cr) - gen (primitivetypes pt) +@@ -160,37 +162,42 @@ gen (primitivetypes pt) + gen (cpp_reserved_words cppres) add_executable (avrogencpp impl/avrogencpp.cc) -target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB) -+ -enable_testing() +if(BUILD_TESTING) @@ -57,6 +57,9 @@ index 30a5d66..f7f2b94 100644 -unittest (JsonTests) -unittest (AvrogencppTests) -unittest (CompilerTests) +-unittest (AvrogencppTestReservedWords) +- +-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) - -add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh - tweet_hh @@ -75,6 +78,9 @@ index 30a5d66..f7f2b94 100644 + unittest (JsonTests) + unittest (AvrogencppTests) + unittest (CompilerTests) ++ unittest (AvrogencppTestReservedWords) ++ ++ add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) + + add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh + tweet_hh @@ -86,7 +92,7 @@ index 30a5d66..f7f2b94 100644 include (InstallRequiredSystemLibraries) -@@ -189,9 +197,9 @@ include (CPack) +@@ -201,9 +208,9 @@ include (CPack) install (TARGETS avrocpp avrocpp_s LIBRARY DESTINATION lib ARCHIVE DESTINATION lib diff --git a/ports/avro-cpp/portfile.cmake b/ports/avro-cpp/portfile.cmake index 49f0af20ce77b2..43a2fd27814ffe 100644 --- a/ports/avro-cpp/portfile.cmake +++ b/ports/avro-cpp/portfile.cmake @@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/avro - REF release-1.9.2 - SHA512 6a6980901eea964c050eb3d61fadf28712e2f02c36985bf8e5176b668bba48985f6a666554a1964435448de29b18d790ab86b787d0288a22fd9cba00746a7846 + REF 2ab8fa85d05f04387bd5d63b10ad1c8fd2243616 + SHA512 fd21f0919b0e5e884bdf4d66c4d5ba056f04c426b309ec0b5ab26642a5f6b00d46f4dd965431b10130bc5f0d81699e2195780e90e127f63049ee5763403ef7c8 HEAD_REF master PATCHES install.patch + fix-windows-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/avro-cpp/vcpkg.json b/ports/avro-cpp/vcpkg.json new file mode 100644 index 00000000000000..72cf168bc81c4f --- /dev/null +++ b/ports/avro-cpp/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "avro-cpp", + "version-date": "2021-06-01", + "description": "Apache Avro is a data serialization system", + "homepage": "https://github.com/apache/avro", + "supports": "!(windows & static)", + "dependencies": [ + "boost-crc", + "boost-filesystem", + "boost-format", + "boost-iostreams", + "boost-program-options", + "boost-random", + "boost-test", + "boost-thread", + "bzip2", + "liblzma", + "libzip", + "zlib", + "zstd" + ], + "features": { + "snappy": { + "description": "Support Snappy for compression", + "dependencies": [ + "snappy" + ] + } + } +} diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index c16b8fbeef241d..c89e31181c5280 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/accumulators - REF boost-1.75.0 - SHA512 1ac43f8a6df1d184261a022c37ffefe9db505e1cc3d4f17cf7ffdf42648d79ebc55653ed299089ff4cf56ccfb90ca565a71fef81735805ef435ac858cf65fae4 + REF boost-1.76.0 + SHA512 51c5a64ec68274c77a674dfa15b106df2a341018498501a882d1fbeddcdee40944422184cf102986ce5c5fb1e7e5bf388566f94893a2bb6da98ec666fa20287d HEAD_REF master ) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index a45654ef940d55..b0d7a0cc1e4e53 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-accumulators", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", "dependencies": [ diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 03817d4c82c101..056fdcd511d43a 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/algorithm - REF boost-1.75.0 - SHA512 6ae80682fcd31caf4dc593f60df6b0c6c26688e2d8aa39277077c29556ae7c4a314cd9037b4d36464ddd3ce28350aa6691e4343617220aae813f98f25611af1a + REF boost-1.76.0 + SHA512 1a421f88244e07de254ea8f050e74ed0b0de889ea7a39d95daaf1f55ec5455d9dc7bcb3ae55970885dc6cd5ac6b5f9637146420eadcc59a12fc2753c842207c3 HEAD_REF master ) diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index f324572f0abec1..98aa477b93bf89 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-algorithm", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", "dependencies": [ diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index be2905a3d14312..c19f35cb6fe74c 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/align - REF boost-1.75.0 - SHA512 51d138b368a565ecdd9484a333eb0e1a97a23606d3e195ac3a3aa6f64f9b028f1c2abdfa4b28bc49e11044f8f73692a5d86b5591e8ecaf7aa292a0892361a132 + REF boost-1.76.0 + SHA512 5b9f646512a79c7848989b5d9c2d1e67b3db86cc751d2e1034969412715c7d27a7558ecfececcad3db3ddb49a9b4ca664c9ae844f3e57b32d443549968e2ac9b HEAD_REF master ) diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index e1ec625282e39d..6556e1dafdf306 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-align", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost align module", "homepage": "https://github.com/boostorg/align", "dependencies": [ diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index 60bda37d8a2c0e..cbfc500920d099 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/any - REF boost-1.75.0 - SHA512 426c4c1b47f86e1637514be45ad60ff2df40c91012c275819a2817ec0edd3fa6de107a16fbdc2cdd3d51d50fa76232f6bfc6b80a963e2fc60e94dd464a7994be + REF boost-1.76.0 + SHA512 38f0bf6dddcdf5ce5527d068057de1ce9594605d51dde8f1591decb6423a912be2047fd2ed1b77acf42eb22d5e44a29276db9e9a24fad1596c589a58354307ba HEAD_REF master ) diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index 0360a82dc15486..ccddcf0a54d520 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-any", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost any module", "homepage": "https://github.com/boostorg/any", "dependencies": [ diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 677ecd161c1b5e..9dbcd35278b178 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/array - REF boost-1.75.0 - SHA512 0ba02e3b084cb7c334d9709ea12d1408461d0ff0b32b35e69869d0cd81e30bd3ab06c2941fa16b51194d5961648d7283e15ebd0d8c8b843d7491a4470e72dd53 + REF boost-1.76.0 + SHA512 76109a4c45ba9ec880fd419cb6287ffc7f78b141c3b42f8ac934317093fbb632376381895863fa874187252e3047cd9cf4501f3fef04b559fb90a66e3b6acb50 HEAD_REF master ) diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index 552296090bbc37..dd907b0d824ab4 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-array", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost array module", "homepage": "https://github.com/boostorg/array", "dependencies": [ diff --git a/ports/boost-asio/inline_dummy_return.patch b/ports/boost-asio/inline_dummy_return.patch deleted file mode 100644 index b4c29a6316d1b0..00000000000000 --- a/ports/boost-asio/inline_dummy_return.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/asio/include/asio/impl/use_awaitable.hpp b/asio/include/asio/impl/use_awaitable.hpp -index 60a6f5cd..af7be635 100644 ---- a/include/boost/asio/impl/use_awaitable.hpp -+++ b/include/boost/asio/impl/use_awaitable.hpp -@@ -236,7 +236,7 @@ T dummy_return() - } - - template <> --void dummy_return() -+inline void dummy_return() - { - } - #endif // defined(_MSC_VER) diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index 2c511452696963..a2da348041f418 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -3,12 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.75.0 - SHA512 5f332644207f87af8ffbf93d9f1f72b7ca6dfa96d77a871308951c492ae27fac20bad2bfdf4e1de06585c1405d1875c4d4335786b3fc08aa0a76ef4de3626c27 + REF boost-1.76.0 + SHA512 d9706045510dc65dfb5d84fded39cb7bbbf44d9f1ba079efc3802962f30ba36ceb7b1610d47822348a910bbca857d0fee8ffef767921a9a75ee9565f9eb63a79 HEAD_REF master - PATCHES - windows_alloca_header.patch - inline_dummy_return.patch + PATCHES windows_alloca_header.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 2c95b02eb78d33..8effa61df868a9 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-asio", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", "supports": "!emscripten", @@ -10,7 +9,6 @@ "boost-assert", "boost-bind", "boost-chrono", - "boost-compatibility", "boost-config", { "name": "boost-coroutine", @@ -19,7 +17,6 @@ "boost-date-time", "boost-detail", "boost-function", - "boost-integer", "boost-regex", "boost-smart-ptr", "boost-system", diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index 5ec9af67128c7d..b50ec9f1b11da2 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assert - REF boost-1.75.0 - SHA512 3a20f892b6f49d03e0d8488623e1cd3dff3eff708c77851007e50ad7e8bb2e80696a333da7dfa95cacc30e4ddc9f25dce061793670c9b8733df9227631501a08 + REF boost-1.76.0 + SHA512 bcd8d1fea358916d4ac8a707edee13bdc4b269a05f1456c3780fa525a2fe1438e8af1ca8689171da8bb3bb7ea2b02f0ed10ddc1204a5b52a885e2eebd1ba4f23 HEAD_REF master ) diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index 9c038a8bc4fa79..9e92a39cac3a48 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-assert", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", "dependencies": [ diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 790de67746939d..3628044ae12d88 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assign - REF boost-1.75.0 - SHA512 33c5adc9fe35b670ab9be1e68d61970e6c1ea0a870791fd446669cf501e665e615e72da5bb50a61e0e6bc6d7e695513d1bf73e91f845c5d1b47e694868da2baf + REF boost-1.76.0 + SHA512 fce24fed1b909d108176ed9c52e9c8dfd53aa7eab063f99d83bf7b0d37db64494c5d47fe60bcade57d59afb4da53c50c0101c4a14316b043e5a018444ed4e34a HEAD_REF master ) diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index e8a960f18e8181..512d9b55aa7412 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-assign", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", "dependencies": [ diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 01ec5674495c02..2c5f291955f93a 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.75.0 - SHA512 4045b4b9cd920854bd8a98298ba8662000bd045fe1322748c7ef0b96fdcb17ce8b55a16e3f10bc7344f37993d1c6df0720ddcc1b5b4255b54a5ca1fc29e253f1 + REF boost-1.76.0 + SHA512 8677c5bd03f089b75f8fac891f9d0383510096c64490936b766a94fdbfd984cd550f41e3e7dbed76372ca81ab8264d2d5fc2dcaadb87a52b4ebb7b0aa3b6feeb HEAD_REF master ) diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index 037194b3d2765c..4a684f35575602 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-atomic", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", "dependencies": [ @@ -12,7 +11,6 @@ "host": true }, "boost-config", - "boost-integer", { "name": "boost-modular-build-helper", "host": true diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index a99c6d6c1d1f09..b4d0f94efa4041 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/beast - REF boost-1.75.0 - SHA512 c153b550610834d27e07786d9ad651429d0dea9e47e57578fccd17e463722d413259a4cfbd039a4b30a06b2bd99bd519869ff94e1029e8f22ea1c7f5d9c5ec5f + REF boost-1.76.0 + SHA512 8fca87bdbd17ba7701fab6527043ff33c15b0c544b62448a2c269e4c0baab51fcedaf7f4bce746eb7a8d9390a37234aa96d0519fba7507d34656f20097a60c9e HEAD_REF master ) diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index d1f0fdf941cb16..1373359a59f865 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-beast", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", "supports": "!emscripten", diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 0ca4f115b51068..cbd7bd71f1ec4a 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bimap - REF boost-1.75.0 - SHA512 fa8d6666554090b4d37795284e6c3c8e631c4c5e1288ca38da391ff13515d92ef7ba2407ae0b6f45df3bc1cbb736f774bbb58fe582c36514068281e3138d83ad + REF boost-1.76.0 + SHA512 efa156483c4b696bf88e1f752f1810916699254cb22038d7ea2f3399938dcaebf14795572a2a42558bed356e19d0be154443282bdadc20c8235a057ac5a72fb6 HEAD_REF master ) diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index be69ae87edd2c1..fc9dcd3c69a6c9 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-bimap", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", "dependencies": [ diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 1f3b06150772b8..9ce296fe9fe9ba 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bind - REF boost-1.75.0 - SHA512 6c3ef2f4be49222956ad9d8770413486f1f7b216c489bdd9793a859f15b38d15813e16b2554e77314f373ecdfafa6b88c4862c34f5f058752d17a9942b4adf9e + REF boost-1.76.0 + SHA512 a2e40c56d5092818bcddd22b90c6fe6705e2d322b9d96e5abb3524fa166e1d7fc6e5a9c98acf14409663a639c77274d12f9e9840eaa4c963b872c7363caa54ba HEAD_REF master ) diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index b6523bb7427cc3..f39026aa03363e 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-bind", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", "dependencies": [ diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index cb9e910b9995f4..80cd42a75da807 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/callable_traits - REF boost-1.75.0 - SHA512 fbed9560bff606778f1ff30978a6a87bb03f55bef5160f3c40329aa06262e2232fcafeb4a56994c697141bdba3c24b9615b299309a8b3adeb50e4321773596ce + REF boost-1.76.0 + SHA512 9ccc62f33001179b9ab6576cc6ac9a3e1a8117a557fbdd65c7eec0b522aa1b7e5e4f31601205819d1e3507afa4e327cfd56d58589974404c8f9c14f970bad79f HEAD_REF master ) diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index c5021b3ca623b6..83bdb17a423aeb 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-callable-traits", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", "dependencies": [ diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 2ab75a2533c2c5..a02bebd10822eb 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.75.0 - SHA512 97ce109ad99a9687d2528c7b15f56059dcbdfcb120646644a6707cb98f1a9407a70b9c8d295dc933375b923348e6a33817b596fd55d45a8c96e3f1ab9a335ac2 + REF boost-1.76.0 + SHA512 ebfea42589e69152256fb175175d753fbb86f96d988fd2678e0df82d6bf7c2e226c8223280ab044cbb1533a690692e23134ee09f665db38a5d1a7e10dd79da22 HEAD_REF master ) diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index 402856f5ad5655..234f656ddfe149 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-chrono", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", "dependencies": [ diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 4aff473d55b356..25afaf23f36b33 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/circular_buffer - REF boost-1.75.0 - SHA512 08a51f1d6947802097245d2e97ab23be89447fbaa47ff9538f04ce9e1a3077b6bf0b7ec8be5e21d02eb24c6721f330ed485f57d2fd2e4759021eef508690d5f2 + REF boost-1.76.0 + SHA512 0e85b0cd8d66552f8cbf2c90dcd3685d4666b2d4608f5352c68e3f1e03e68cdaf368777235b0cc6a17420e07c767c61ca026f753d1d1d6e35c6d7c3a11deac9f HEAD_REF master ) diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index 86d9ad60647c5e..0edf67d872b34c 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-circular-buffer", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-concept-check", "boost-config", "boost-core", diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index e51625ca932f81..562fa62a5871ac 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compatibility - REF boost-1.75.0 - SHA512 9a7dfa28325cdc257d26de9203d64015453a3245c90de63895c7fd8a0ef24e3acea5203737d6ccf69ce51563010772ff7807137e2531f55a1fa7f63e4b2d0547 + REF boost-1.76.0 + SHA512 ca17b6a6021d7f87692a37aa8e558b76235095f6e7850432ebc3c945afe25c01ce0b7d26e8d239636ff38d2d697ba057b9109f8c06b7d70ae154a4b8223733ce HEAD_REF master ) diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index 1f8d2d19a3d21d..cd59ff838f2a04 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compatibility", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", "dependencies": [ diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index e2a9b1624d441a..7b85fd92a17a9c 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compute - REF boost-1.75.0 - SHA512 740e351c466d133058b2730311194198f958504b6b0c20517e54ad7809d71d3fe11d35b7935d6bf49f191d4dea7a9f37be21fa4f8d363331588a32d73febc047 + REF boost-1.76.0 + SHA512 93f20c281e71ba205fdfc458a40f437cec09c2c9593e41ccf59e927b2f9e6c2f31b89389605c5a1f5b4893097928f16ded38b794dccf95adbdfac68f4e016ad9 HEAD_REF master ) diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index 7ebc60191015e0..a994479bc81440 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compute", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", "dependencies": [ diff --git a/ports/boost-concept-check/fix-warning-c4834.patch b/ports/boost-concept-check/fix-warning-c4834.patch deleted file mode 100644 index 1932163912a5da..00000000000000 --- a/ports/boost-concept-check/fix-warning-c4834.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/boost/concept_check.hpp b/include/boost/concept_check.hpp -index abbadb7..cab58e5 100644 ---- a/include/boost/concept_check.hpp -+++ b/include/boost/concept_check.hpp -@@ -352,7 +352,7 @@ namespace boost - private: - void test(boost::false_type) - { -- f(first,second); -+ (void) f(first,second); - Return r = f(first, second); // require operator() - (void)r; - } diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index a643ad9d370b19..3b1b2373fc5174 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/concept_check - REF boost-1.75.0 - SHA512 823e3af47881c98f864c70686a3a2f6c9b7d5e6bf0ae61f2983f6c2ba26a70aaa888b683a74ef504ec7f5f479609731e35fad3518f1731954e01e7d67636e5d4 + REF boost-1.76.0 + SHA512 f10bcd81ed88a036078188647a0b8aa2245d0c343fe29d4c13c16fe8dc551d843281bbe1fb903c71026c8183f02f57bbad2cbbf3eb6c3f4f885ec8773afb8bde HEAD_REF master - PATCHES - fix-warning-c4834.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index 6feae5b412c823..4017b24b9ee32a 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-concept-check", - "version-string": "1.75.0", - "port-version": 2, + "version": "1.76.0", "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", "dependencies": [ diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 10850a47bb2a21..31de221d14d9d3 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.75.0 - SHA512 458cd2e2d1649b6cba86eb1b0be61259a36ca716ccc418d5501dbcc78f2884226ae5d2ddcb99a644df6c90ea1601a2f7d8a0484389ccd2148e18cee137165f23 + REF boost-1.76.0 + SHA512 cef30b35f4d791c9220aad28b347acb28ed87e58ecf319c9fe7dfdb0c36d8c2a1ba7f996fbf2da201a2c4fae8cf2ca1b45224754482c7ecb074cee382f33e7ab HEAD_REF master ) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index 3b4035dc8d550c..dd1e63c10f1274 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,10 +1,9 @@ { "name": "boost-config", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "dependencies": [ - "boost-compatibility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index e35664e365cd47..7fd29b82f630e8 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container_hash - REF boost-1.75.0 - SHA512 4d1a8381e9b7554884597db4b1e365465845b1fd7e665ec5bc89c38f859fb4b62e024e77b2cd818f3bdf959476dedae0fc49fc43e28e4e9043e0386a366f9a43 + REF boost-1.76.0 + SHA512 59dbd3028e65ff5a499ebf316354eb4e46dcefa736d07954b9f99471cf0195b080821180925923814fad50f44e21f93e0a90b2d86ef3a6cf1b7d478a6d1122bf HEAD_REF master ) diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index c2d8bee8920116..48f987d51f8fb8 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-container-hash", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index f595c1a14b3567..133d7aecdbab2b 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.75.0 - SHA512 b49609fcf1195f8661b1603d8328bd6009d2667c85dce5a4b3309582976c5e73ae21bc64a58100a9a7ef8fa10bc18075bb0c06f0e56cc16c50cda8b31cea26dc + REF boost-1.76.0 + SHA512 5e73508ea1bb67ccbb83785c1f7db4a92d0cf9435a6383394dd1aecd83f88697a16b054c762bdd4d06c3ec92629d1f4b89cf32d2fafefa0a0702318bc01d5dd4 HEAD_REF master ) diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index d4b72049e6627c..c63d37c106d63f 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-container", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost container module", "homepage": "https://github.com/boostorg/container", "dependencies": [ @@ -11,9 +10,8 @@ "host": true }, "boost-config", - "boost-container-hash", "boost-core", - "boost-integer", + "boost-detail", "boost-intrusive", { "name": "boost-modular-build-helper", @@ -22,6 +20,7 @@ "boost-move", "boost-static-assert", "boost-type-traits", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + "boost-winapi" ] } diff --git a/ports/boost-context/fix_exports_for_32bit_GNU_asm_for_windows.patch b/ports/boost-context/fix_exports_for_32bit_GNU_asm_for_windows.patch deleted file mode 100644 index 30d38af1eb1eac..00000000000000 --- a/ports/boost-context/fix_exports_for_32bit_GNU_asm_for_windows.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d52ce8ca89674e31e689a7af3b0fc9304018be5a Mon Sep 17 00:00:00 2001 -From: Julien Schueller -Date: Thu, 20 Aug 2020 12:51:30 +0200 -Subject: [PATCH] Revert "Fix exports for 32-bit GNU assembler files targeting - Windows." - -This reverts 85783e8, as the wrong linker was used - -Closes #136 ---- - src/asm/jump_i386_ms_pe_gas.asm | 2 +- - src/asm/make_i386_ms_pe_gas.asm | 2 +- - src/asm/ontop_i386_ms_pe_gas.asm | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/asm/jump_i386_ms_pe_gas.asm b/src/asm/jump_i386_ms_pe_gas.asm -index bf5c75a4..6eb45326 100644 ---- a/src/asm/jump_i386_ms_pe_gas.asm -+++ b/src/asm/jump_i386_ms_pe_gas.asm -@@ -120,4 +120,4 @@ _jump_fcontext: - jmp *%ecx - - .section .drectve --.ascii " -export:\"_jump_fcontext\"" -+.ascii " -export:\"jump_fcontext\"" -diff --git a/src/asm/make_i386_ms_pe_gas.asm b/src/asm/make_i386_ms_pe_gas.asm -index 10277bb5..608ddf3a 100644 ---- a/src/asm/make_i386_ms_pe_gas.asm -+++ b/src/asm/make_i386_ms_pe_gas.asm -@@ -150,4 +150,4 @@ finish: - .def __exit; .scl 2; .type 32; .endef /* standard C library function */ - - .section .drectve --.ascii " -export:\"_make_fcontext\"" -+.ascii " -export:\"make_fcontext\"" -diff --git a/src/asm/ontop_i386_ms_pe_gas.asm b/src/asm/ontop_i386_ms_pe_gas.asm -index c23e18a2..abe9002a 100644 ---- a/src/asm/ontop_i386_ms_pe_gas.asm -+++ b/src/asm/ontop_i386_ms_pe_gas.asm -@@ -128,4 +128,4 @@ _ontop_fcontext: - jmp *%ecx - - .section .drectve --.ascii " -export:\"_ontop_fcontext\"" -+.ascii " -export:\"ontop_fcontext\"" diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index 8563ece8398029..df48741264584c 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.75.0 - SHA512 e1ba126cf1c785c38e196c1eddc347b5b06badf980d3b83d7b1c41d77ca060fbe18b34758d5beadcb53d54e13ce76775fcea24963f1754fab4e482da099cfade + REF boost-1.76.0 + SHA512 f004e38d63b73e96492ab7267a2e4c3b9993eebc7df6e17fbc5daeb4feb002ee8be815ad8db26ec954471678eefd3609d12a81a34adab3115032209002b663eb HEAD_REF master - PATCHES fix_exports_for_32bit_GNU_asm_for_windows.patch ) file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 22f652b556a06b..0faddcdb5feb54 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-context", - "version-string": "1.75.0", - "port-version": 4, + "version": "1.76.0", "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "supports": "!uwp & !emscripten", @@ -14,7 +13,6 @@ "boost-config", "boost-core", "boost-detail", - "boost-integer", { "name": "boost-modular-build-helper", "host": true diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index b83962defe0bc2..2317a74e0a88d2 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.75.0 - SHA512 6dc5bad8e9d54c9a33f68da89956fbcf89af51bedbd4b8c539cff23d59e14ed93f521f88d247b66816ed8bc4d13634d2573ff52e3e05356906e1141490615966 + REF boost-1.76.0 + SHA512 964290bd77ca345330e50ee76af6e976aba2190bf2186a5376f4fd4b581d2a62f4e5bf6d74938e36f9f06179471ba434721948e1190dd07e41b6b3b0deb9258f HEAD_REF master ) diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index 1c1765b3f84d7c..369eacd3266cb7 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-contract", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", "dependencies": [ diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index a085460733e659..1e22924881a47c 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/conversion - REF boost-1.75.0 - SHA512 0f9f1d7eb9a6b9cf69322aa5007c237cf4775a2778613b2f14da6be6158dad18dcf266ade7a9394a7ac9f85cc9e3b2d600f4a978f2139aa41cfee7f404a161ba + REF boost-1.76.0 + SHA512 2f14ad44d8fc8645704c1f9aeca7a824747c35422ee795faedc6ae78341d28f38f7100b063107a25fc62cb84a5cdedbe4a6308607168196322cde4abb1453bdd HEAD_REF master ) diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index da1ac08150a804..790eff2c6536bb 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-conversion", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", "dependencies": [ diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index a21f716390e184..693fca09a64832 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/convert - REF boost-1.75.0 - SHA512 e977b0336ea5cc01d9597cd6b2a4ed814c8f84520837742fa40f671dfaa2f49df7f133464fc86819c837f32afcff15c66e399d9b77de020c245e223501399e7e + REF boost-1.76.0 + SHA512 104a220d275b16654f53edcd7048ef78123b38ac820d7bb3d76a0493fc31714d55706a61d0a1f7097daa5190b27c666c22beb19024bb15c52a365cd0cfcfd603 HEAD_REF master ) diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index 9a36044b4c1b67..20bf35943bbe40 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-convert", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", "dependencies": [ diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index 4b79ee17a0216a..fa1e14078d150c 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/core - REF boost-1.75.0 - SHA512 316fb165037850b7c70d24d1c78ebd188613049d389cc2d59a1da4a3d130708ce945191e46a599452e9aa2bc224ac12fe23ad6f118e8335c474d4a202c6a8d6e + REF boost-1.76.0 + SHA512 95fc5db2580ebd4d8de1a377c7b006e3f89e99c3613620334caa2747b82e28356bb8e023a79f53fca9425a6a9aa9af28b53eefc2cb7222f0f5c5447f448c0143 HEAD_REF master ) diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index 6486bb72857267..74767a24ee593b 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -1,10 +1,11 @@ { "name": "boost-core", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost core module", "homepage": "https://github.com/boostorg/core", "dependencies": [ "boost-config", + "boost-static-assert", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index e65e5d422174c9..6df9c62ce3a974 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.75.0 - SHA512 0fe4181896b4cca48c8aced4fba47974a06547e5d7477284b7e6564171ab61ae0f2564b720e164a27b5c7cebeae911f8741732f9516d2bdb04c8dd3aff835051 + REF boost-1.76.0 + SHA512 9554ef6a3200b7bd79d6ca953af65ae229e2c8649b2f4e67f911d0844924856163e0eb88fdce03e2c1cb120737e1a9f6cb8bf326ae0b44f161aac213b11b1640 HEAD_REF master ) diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index 1f83361372f458..9fb993438be750 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-coroutine", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", "supports": "!arm & !uwp & !emscripten", @@ -19,7 +18,6 @@ "boost-core", "boost-detail", "boost-exception", - "boost-integer", { "name": "boost-modular-build-helper", "host": true diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index ee3f3c7f5f97c0..b2d9b451ba8a62 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine2 - REF boost-1.75.0 - SHA512 76fb3edec0edc82b9aea20e8b3732a9848f5eab7851a3ff287d4b043c89a99ceb217b797630234131bb1c8163af799a48da25dbbb7ff9d276823186da41f3330 + REF boost-1.76.0 + SHA512 746f03de8f9b2108d95eca2d940462c16660db2021b0612966f0f3e46a5a0d16708a3ef19c605ee56574a5427a93d435597c7dc7a411c2ffbba117afd660b291 HEAD_REF master ) diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index 23262aaad941fa..ff9ecae6219e3e 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-coroutine2", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", "supports": "!emscripten", diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 9f37576607a901..1685331f55e4f8 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/crc - REF boost-1.75.0 - SHA512 500ee5b9b91d45dfb00486905e0953e88be5a64f7c1d256c1bd5af0497a1ff02f6c64c22b07a31c2331480bf1b3d6956ca79dabc2183110662b271b76a8541f8 + REF boost-1.76.0 + SHA512 714041c7525dff54ca47d61482d691a06fbb8bf65c93cf87a34f522798657d2d4a01633c2d23c9688626b13e37e4f9f18ab66dccf1499518ba9927499f59e8b2 HEAD_REF master ) diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index 5bed63a5fc8f98..e87e147c25eb77 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-crc", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", "dependencies": [ "boost-array", - "boost-compatibility", "boost-config", "boost-integer", "boost-type-traits", diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 2c4d40bcb8610b..91971f2cc51e57 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.75.0 - SHA512 9500e4db431c7a805d6a1acdd3c71c464aed2ad4c42fe6f86fea05f1144b4243fc5fab90c79e41d4723323f5efe747b48c2edceb43e101c00a5117a5c0f5ad09 + REF boost-1.76.0 + SHA512 f3d2f78e595762b9d31241d3df3d89a54520557d9cbea945c85a0604ad4a1499382dcb7e55e2c33e45908cbca71d9eb36c9bf72ce1392b7dc24ee34e3b18ba02 HEAD_REF master ) diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index 12ea0168a2e477..36be9680caa6e8 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-date-time", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", "dependencies": [ @@ -11,11 +10,9 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", - "boost-integer", "boost-io", "boost-lexical-cast", "boost-math", diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index 8a832f186c23c3..eff68f8902aa4f 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/detail - REF boost-1.75.0 - SHA512 69950608f8c1a923fdad229b479230c2e2e63bddb813b0621ae196afed2a79edf35676ef6e63f13b2fb85b39d5354139b96fdf0a67092d9850d4c2025880a91c + REF boost-1.76.0 + SHA512 c1958a1ef6ab2fd9fbf2a16d6a0a4a8e49237e66b36c1f8f515d4c84386c1e98bac6d519f1395628441b9a7cdf01b479ebd28dd203835992e99f614dee5b609b HEAD_REF master ) diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index 1b9204c63a8cf4..39db2d8557dcea 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -1,10 +1,9 @@ { "name": "boost-detail", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", "dependencies": [ - "boost-compatibility", "boost-config", "boost-preprocessor", "boost-vcpkg-helpers" diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index e4b63ea78e780b..c626a92c5950ef 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dll - REF boost-1.75.0 - SHA512 ae9490fb8fdcad0f350d2e3fa99eae4c72d890503b64f7bf1a2a2fad18babe27c18ddfc5fb0075a3d101ddbc6791df5bb0eaf295d6cc59ea9dcec11ab9fde11b + REF boost-1.76.0 + SHA512 df41f44a89d1f661b87f1863b0dc551a44040ccd002c9eab6728dc4ad4cc789853ab29c04ce6b17f0d94303cbd9f06ba53521c54f7ec614a061e2cb02db1462a HEAD_REF master ) diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index 623816e38511a5..cbf24031081932 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-dll", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", "dependencies": [ @@ -12,7 +12,6 @@ "platform": "!uwp" }, "boost-function", - "boost-integer", "boost-move", "boost-predef", "boost-smart-ptr", diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 67146a1ef13877..9f02f766e3fbec 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dynamic_bitset - REF boost-1.75.0 - SHA512 6612007e0c344ef6ec9ff502922e43aba9422c6f80e50830be9f02817310df4424a6b8b15d70088491e1d6b0b4a5ede5c69150b1833afcbb72c70e04274e0050 + REF boost-1.76.0 + SHA512 5ca3153b18b2a57574c158e09af1bc3e79b769f73988de8d16fc16d4fddb375ce9aaebbee3204a8b5afaaafe6ca484d8a2d85162dec6a576c6bc52674c9d4a3f HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index a98c6d58188025..46a5834bd4b039 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -1,10 +1,18 @@ { "name": "boost-dynamic-bitset", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", "dependencies": [ + "boost-assert", + "boost-config", "boost-core", + "boost-detail", + "boost-functional", + "boost-integer", + "boost-move", + "boost-static-assert", + "boost-throw-exception", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index 7731ffa6aaa3e0..b7451f6aa5e2f8 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/endian - REF boost-1.75.0 - SHA512 cd8ba3b22303424b848e2c985cd3e1da632ce299bff1e0fa7ff42539a077707cf50389505786c7418b6b6786c545728583baeaba8a65ead37c8c595457e64458 + REF boost-1.76.0 + SHA512 8075e7127872d134954708287aef372f872937ecec50db91fd78cc9de33056ba732519a8f7f76ce9bbcfbec0894416b3f3738259ba93ad2cc47702e58366516f HEAD_REF master ) diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index 33e92015997543..209e7119b5cc62 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-endian", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", "dependencies": [ "boost-config", "boost-core", - "boost-integer", "boost-static-assert", "boost-type-traits", "boost-vcpkg-helpers" diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index b6fcea59b80cea..4414015ea2904f 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.75.0 - SHA512 fe7c62f3970b7041ac94922105305696374fbee59f8cfe3a48035f6487e616f430a1a577bfad997e2be34dc50393b9301726ca27612689f9275b64633c3fab1e + REF boost-1.76.0 + SHA512 e77b6c6088ad7a5443b635d2336605eb5c04fa97849fae7150df2b2521fe47916bf5c17fead55eefa3aa278eb826ca22058c4145d01e09ccc41c0a7ccf961506 HEAD_REF master ) diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index f5e67cf901fd5c..aadce7d0c7c6f6 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-exception", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", "dependencies": [ diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index dad07c59e75938..c9fbc34da7065e 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.75.0 - SHA512 8b6355aaf804bbf8c33d65e7cb8c5c0e26ca33af0f4da49369073b92ff2afe84c992adf204c1aeedb137daa7f544ed7b40550fca294ed2ba62c8a615b4e5f7da + REF boost-1.76.0 + SHA512 b7994427313de7959144b929806a947fae20087c7215df25e2925dbd553e2aa88d8f1c39a70cbbde61f111c005cded7a664961bf633f0251be4b204e42f1fcbb HEAD_REF master ) diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index 35d537197a554f..97cace4b1d4093 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-fiber", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", "supports": "!osx & !uwp & !arm & !emscripten", diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index e1bc985ea920ea..55241314a0567b 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.75.0 - SHA512 e79008f39568eaa4763110e4c172b022220b0667d7f05c606daed92f6f5c3977f2478063b6b16db6517b3e33b2df8ec13f8f0ae134fb2020a93d64895170b08d + REF boost-1.76.0 + SHA512 1df89b441c2528844218e447e420c7c9aea0d72f8563ff20f86acebbc7d0d69ed9661422b3625e51005b975d73d7fac3efb69692e21ee13dd92fc1855f119088 HEAD_REF master ) diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index dd89855eeeb6bc..d5f6438d160daa 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-filesystem", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", "supports": "!uwp", @@ -15,7 +14,6 @@ "boost-core", "boost-detail", "boost-functional", - "boost-integer", "boost-io", "boost-iterator", { diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index 35e6593b59ae9e..9d14c96eee7fd5 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/flyweight - REF boost-1.75.0 - SHA512 ab39e5c10f2e2ef75caefd7fa56f2cae013a3d45554e3e66466bf985ef56c942a69a4b5da98de415258119b420a7514fe9b28d1e62f8822eaeacdf4d15e25451 + REF boost-1.76.0 + SHA512 f772c0e7c3efd66c191383c6490ace32294b34f67af569c885abb375c2afdbfeb64de810b50096a902d90bc9f05bae19323a8ec9546f0cc3b9021cdbc497e97a HEAD_REF master ) diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index afc8d8019abd8b..39b9f8965d383b 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-flyweight", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", "dependencies": [ diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index ffca9e681d803e..1c2ded7100758c 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/foreach - REF boost-1.75.0 - SHA512 6e88997825127ed0876c3d496b108b4bb7cdfba0e37705288868491150ed455a52624bec49653d9ffc547d98288e1395fd9b95c09a31d763618c76184c9d4853 + REF boost-1.76.0 + SHA512 b2d82918147aa9e22fba6ad798479fc4fca6a437a73c005cde715c5d19adf7320f986637a270742783d0d40bcadb11ae1cc7abbec4358363496d08b8c8d908e0 HEAD_REF master ) diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index fe096e9dd1ef76..2f117a39234b5b 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-foreach", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", "dependencies": [ diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 600a66bfa40ddc..33456281ba9e64 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/format - REF boost-1.75.0 - SHA512 618ad8b4d7b2982973b21b69e4c8d9c982b56d775756b52399aea3dbdece718e6e77a202e8ecaeec5597a5781227893acc2da837a224ce89f439579d8395b05a + REF boost-1.76.0 + SHA512 7f988f0a3bf2e483d09edc7eb698128286b5c19bb9c4e39e9947ec4d1457b5c3d0b6d7b6f656dd9a2f96e4d372745d62843cd2836b12b96624059576c1905e3b HEAD_REF master ) diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index 7dbab9f356196b..e824cf9d2ba28c 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-format", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost format module", "homepage": "https://github.com/boostorg/format", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index 35c6b81318001b..c0486271721c1d 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function_types - REF boost-1.75.0 - SHA512 990e67e874a7bf135d1a4c3ef4654a2a5e4879e8d21445c1fee56c37be76477ade7401bd4106b8bac07de54e1cf14a5a9ec643ff647c170877e1153a878ba762 + REF boost-1.76.0 + SHA512 d95ffacc507baf0bedb495f1ea7e0639a19db45b1d55f212dee1eea1e0a9de932e4b74da623200666eef5ead3aea60b66bf7f73cda845b95e54d26714dcdc2e6 HEAD_REF master ) diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index 39362d0fab2a06..539544f2f816ff 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function-types", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", "dependencies": [ diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index b73fdd694543e6..afce6022126d4d 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function - REF boost-1.75.0 - SHA512 5e7753aa8857a032d77abdbeded9633b00df5cf93f79dd3f53e957db00fbbe3b6ee5fe9a01c3fc9830c159f0dd62aac1fbf062909e832c5fa7dabed003003822 + REF boost-1.76.0 + SHA512 d8ad636b47fc77208b3b438494c8bfc286938fd310e91adb9a55a099b552f70a86dfde263fcf100c77fe43b300050dd19c289802366beaa9bd36f38a8539b34e HEAD_REF master ) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index 9f13b38beb3382..4d760713048b5b 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost function module", "homepage": "https://github.com/boostorg/function", "dependencies": [ diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index 54ba8db2b969a8..dba5df091fbffd 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/functional - REF boost-1.75.0 - SHA512 f5f9b759b27c92b8b948c0043f83eaebef206e75430b85a4da27d2f643e15cf31c56ca06ad9b30b291d28fadcc93eabaa0b13277a3d14be0abe9eb5a07259393 + REF boost-1.76.0 + SHA512 9b63cdbba4a997c04a887775dd4d351eb3fce55ebc6f620865f88f696d969cc56d47675c21ed7a976f19b64eee4875b0e47dd0949e56a576f19fb1a6c59fe31a HEAD_REF master ) diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index a20b8c410cd948..df76a7e8763af7 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-functional", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", "dependencies": [ diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 7d11ff35d24dae..707ca68e867574 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fusion - REF boost-1.75.0 - SHA512 13c0dcd2b0c9466f240843c5edaef7e292c118f26e598595b9fe30d3ae5952c0617b3c7786e93cf1589e419444d87f1bb2fa5254878c89e422497d86fb25428d + REF boost-1.76.0 + SHA512 4e8244962d5f165de9953f7669248002d36c82c213ae3e6374c2b997a3a39f151cf1bee2a5e5e45ae06f9ee7eb0322aeeb0ef7e4215d0829e9aa94f9000ee4b9 HEAD_REF master ) diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index ebfa81e5fb09cf..c32b2d333df5fb 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-fusion", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", "dependencies": [ diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index 1a34a81d04d3f2..0bba9bc932b396 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/geometry - REF boost-1.75.0 - SHA512 d5fb18363bb4a9e25079b36190b253e5134196ad8942e935c4be31a8495750343779115e83e9e6c787692ff22cf6c6b41f1263abcf49d2cbaf1e6e6328edff15 + REF boost-1.76.0 + SHA512 2ae1af6337cbb820cef2c34c24b55fb032e4b57ead2a5fc5ee041a083f08e1c35c873e94a135d1c990809e1f160d19aedb31d8a1715f2c211361279fd9707236 HEAD_REF master ) diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index 884a4093742f7c..573f8e2ded62b8 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-geometry", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", "dependencies": [ diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index e2d12ee2ebe4dd..ac480b26286ccf 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/gil - REF boost-1.75.0 - SHA512 aff1ea0e3455ce18faf691b02481e8c591e5cf0918981d1a3cf95971ea93f31ed72a51efbf7b8557ab51d186d4a7fbed03dbf996c7f2e0be28c5d5fc67277048 + REF boost-1.76.0 + SHA512 ba3504fb8af75406c1e41d5f17fe8a31629949902cee75719890250bdbe45ab170d36e66f76e20dfe8612fb1888f152158bc21f4488e85a5a25ebc3aad18dd4d HEAD_REF master ) diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index de58f8e5aea6f5..402b9e0fdd3188 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-gil", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "dependencies": [ diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index ef24ef770a9259..03830932976c98 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.75.0 - SHA512 46d86b9d6822a0b762d9587d96da35cf784b21853d99e2ea4d6172c4b2a1382158037652f0a73d0545793edabdde5e21e6515c01991cb761a1a3fa304bfa742e + REF boost-1.76.0 + SHA512 6328aa909cb611728e10cb23f666b68ce11d2a79130946e60da3ce664c5aa71da43e05269720455647f0b52f4b4d7e941ea1cfd1e203bf42a494a44f770185c2 HEAD_REF master ) diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index 48600dda68e3a8..7fbb59aa391fa4 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-graph-parallel", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-concept-check", "boost-config", "boost-container-hash", diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index 2978a9d0f2aeac..bff59f5c57ce0b 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.75.0 - SHA512 163ddbd6e439bcb53632cd3ec1e670d128e69ec5347737a6e10c5b5af231ad7cc085d594f1bf55894f342a81a141ca4309582f660c74b0db3fe1f7aa78c208cf + REF boost-1.76.0 + SHA512 4a5699193adea6ad2df7c1fc9152be58a1234e79fad03a92dd7eca32cac41d2295b1b529b876b7d179b21097baadd8663e68a7d237abcf4b255772ed18f42a1a HEAD_REF master ) diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index c4c8bf1164615c..eb3e7e79fd24e0 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-graph", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", "dependencies": [ @@ -15,7 +14,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-concept-check", "boost-config", "boost-container-hash", diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index dfa8be6aa9cfd2..324cc11bd7fca5 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana - REF boost-1.75.0 - SHA512 6c5ea81f9f7bdb735035a8a49fd82768102d2586cc4a1ee65e83260b26e3a39244f8053266b4d41a3260d8922bca667609fe9f360d1fe09a7f778035b318fbe5 + REF boost-1.76.0 + SHA512 839eb1684335ae541dd9342fda8ef5df5003b470922abd5fd72c175e03be4f0158d5cb2892bbce071358b641f5591a852c180f81ac3fb9777e2b88dd095491f2 HEAD_REF master ) diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index 4d00d9a5fc22f2..1a075a79b978eb 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hana", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", "dependencies": [ diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index c20839543af52f..34a53fdf0bf84b 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.75.0 - SHA512 1f8127aba16efce6694451dd04130cae92a88257937d87860fdbf9111405f458e8a162f3d541b00c5e4d0e3eba4cadc1c9fd2424eb03e52ce1302cd8ef1e0af5 + REF boost-1.76.0 + SHA512 11f16b0a573108d2c2f58ba9669371d2db5e6090f9d50abc367fd295fb5966a985793081e222742305e9cc86d950c8545f1afa0a855d43eab6cabf41a36e9335 HEAD_REF master ) diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index 20b631d6aeb747..a59c675fd3709f 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-heap", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", "dependencies": [ @@ -8,8 +8,8 @@ "boost-assert", "boost-bind", "boost-concept-check", + "boost-config", "boost-core", - "boost-integer", "boost-intrusive", "boost-iterator", "boost-parameter", diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index 37d244bab68317..1246b2a273c887 100644 --- a/ports/boost-histogram/portfile.cmake +++ b/ports/boost-histogram/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/histogram - REF boost-1.75.0 - SHA512 de5299b1c3f05bbb052c0bca0537ed8b7cf4268741a263b1ed12c97dd7a94f52571d8b566c33c27d387f1409e26d5a70b2eaf92a346aa9226403930cba6c1bca + REF boost-1.76.0 + SHA512 0bef1cfbc328f73f14bd364902a157a519343ade5751466db3bfdfc63ab76490a9c7f11f8b6d0e24450646f7c26bb967f93719a0fb49f399de6e71b7a19827ff HEAD_REF master ) diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index 868625a863b4cb..00e04b7a5d5e02 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-histogram", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", "dependencies": [ diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index c99bc95d300f46..7f07484da253f8 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hof - REF boost-1.75.0 - SHA512 85bc5fa2d479557f5265480d310a8a18885980bb1c516a99d73d445758ddc2132ae3cab7162652fd9091918fa2ac440703837f3c7b81466aa43dfd66898e549c + REF boost-1.76.0 + SHA512 40d70bd531c1c69bcefe0105001ff9c423e23029197a60e46c163abf2b66c726e7d8411503c1201946a1d6d0aa8aef5caded9942968b7844023fbe023a1509c8 HEAD_REF master ) diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 200b09dd44521b..3695f5ac94f79c 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hof", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", "dependencies": [ diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index 8f356be608d277..ce5ffd240124a1 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/icl - REF boost-1.75.0 - SHA512 6fb317621c19c0bd6ab7ca8cc9048c42e4d362496f32973d5c226a0d91ecb861af54d59d6396587e7241d184f04ca445657dd4f033665be2e31ac21e913e3e59 + REF boost-1.76.0 + SHA512 e8561b8217cc8048b8bcaed49f827ec26ab6f0169050d299a5d85bd87bc2fcbc6cf9a078ff9de2751f8a419e9a1556f93b70742cec6bea2e88a353ce17db5e12 HEAD_REF master ) diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 684746c5bcd731..69d0c261f6d3dc 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-icl", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", "dependencies": [ diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index d158c13790dc47..618bafcf9e5a24 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/integer - REF boost-1.75.0 - SHA512 ed1b7749052c57e1535005d75ca2fe3707a0fa7bb7261b6ca0c2db12dfbe024aeda4aba2104209b5706f5b1c87bfb9b69115e1433e3f84456a70180e6fbebce5 + REF boost-1.76.0 + SHA512 d0df93ba10d4c6004c4b23aca512e3346c40cf6684d53059090b79dfcc633e89449beeae3b2f8f4e0c721076b55f92159dd5c6a7665405e426c66251ea2913a8 HEAD_REF master ) diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index f06684ccffe307..5f6bc4df062fb9 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-integer", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 2e682eb3181c26..f4f402123ab593 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interprocess - REF boost-1.75.0 - SHA512 02c01e16a3050e24b179290fbf72056599c22e766035121a44e72277cbc4535f2ba959bca7b5746f64a397b01bd78424dc05490217f7accd4f01f08d3ed0a837 + REF boost-1.76.0 + SHA512 853cb0d6a51d42223d2c242d03b339f723e18c54c7a1f4e2be841a85a816ebc1524f5b9b90441c054072d5a408a724ee8dbeac22997ef5dfb3cf78c87c2acf71 HEAD_REF master ) diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index b5b376a37e5db2..765d308702f400 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-interprocess", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-container", "boost-core", diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 95876e633fe73d..88017359bff32b 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interval - REF boost-1.75.0 - SHA512 25ba8052f562585ca1d98be93fe97facd0d485a70e230f0f7d95911a6ce92bd60d3d56844782e5136a89a51303fbf8d751897578ac4e9bc8c2672b84cac7cc3d + REF boost-1.76.0 + SHA512 72e7712634c314fe51733ecf8dcad5ddf6361cbae9df4471ec632b4b8c126a0965f3ded1a15c9229e2b2c817024cf27ec1febbe641b10fefa2572611ace5f4b7 HEAD_REF master ) diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index 6402338cad0256..fccc60b6609768 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -1,10 +1,9 @@ { "name": "boost-interval", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", "dependencies": [ - "boost-compatibility", "boost-config", "boost-detail", "boost-logic", diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index c1fd05513b1d50..9a7a4f0afe5baa 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/intrusive - REF boost-1.75.0 - SHA512 4d211523102861cbfa01413dcdaff153bc51ce095e98f8a7cab061901f6dec79ba1cdc898df0e217cff1d1f3febbb9ee4c3188ef200d6161c883b3c6a928d08a + REF boost-1.76.0 + SHA512 272ad56917b9f54d1a4ff578ac690766a692932ca7226a496b9a161d399c9a2e00f762db21924d7de6a446757f1dc5723af5e977a62ccfe408e4422c80cf76a8 HEAD_REF master ) diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index b56916ebc995b0..2f043a7b6a6f10 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-intrusive", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", "dependencies": [ @@ -8,7 +8,6 @@ "boost-config", "boost-container-hash", "boost-core", - "boost-integer", "boost-move", "boost-static-assert", "boost-vcpkg-helpers" diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index d72f41f29d7be9..ba9c1f960b6607 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/io - REF boost-1.75.0 - SHA512 0c5efe91d1a83a7a42e035de0720e92d7f4ca9af692913845d9a5a5e3ba994c5b9664c87b60d5f6345c5dd395e8d0c2074827e37d8e76f75548d95f845c194d2 + REF boost-1.76.0 + SHA512 e03511225fe52fb18842404f1218bf1cab4b36010d43c65ae8296a6b845e0dfce4b7efdb15c8784b54ad099cfe1ab46b535b628cff193d98662bb268d7db6d41 HEAD_REF master ) diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index f9ed7c1fbc74b1..06a482f8d79bc7 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-io", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost io module", "homepage": "https://github.com/boostorg/io", "dependencies": [ diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 4a506016001dcc..3c6838f269e7e5 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.75.0 - SHA512 683a3fba09c0732168d4f1c7cbe4f7e29fe9dce737ed5ee08a56000084c467a1816d67d46ec04c6ba8e18413a66ac6cad896e2364491b3fc18c20eb423ed645c + REF boost-1.76.0 + SHA512 3107bc329adf835b4f8592ec2c8988b377910bc6a724ba2f378dccf9e050da14ef593e5927ad53029e3ed8a51febbbef36af3dc6e889999c4768d8b9c1616393 HEAD_REF master PATCHES Removeseekpos.patch ) diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 4f772d939b6cf6..98d632ddbcf228 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-iostreams", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "supports": "!uwp", diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index 241b8e4008480a..f55e4328eef63f 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iterator - REF boost-1.75.0 - SHA512 28148a5980f31e8d6e553800387335c9cb9ace06533c54825337178488efe1726f8ceb333da80dff394685c64aaf4848598845555a7f16bbde0bd73cf5c80e9b + REF boost-1.76.0 + SHA512 0c890932dc16d87e350f3cfa0942aa92e9a590174d6f330259fe0b1eb2ead9ca3f1d0e0c2bb56e086e5eda9f2122e2eda2b67b52a4df8e614876a64ab014a300 HEAD_REF master ) diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index 805fcb3193963f..df8348d3933b71 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-iterator", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-concept-check", "boost-config", "boost-conversion", diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index 6dbc2ee5314117..882daae7d4295a 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/json - REF boost-1.75.0 - SHA512 887a8758d247eb76b41526107e4006de7d18f107afc9692d95eb2ba7beb9cfa6d5f2e721523a8d4530aec38bd1f6eb0f6364aa05b5bf95f5428f4c9fa3d24b7c + REF boost-1.76.0 + SHA512 86807c1efafc582d41d6d46b0d83f95dcb4eebe071e8b6f25cb6c2706ee4c1f5be6dc70c5a28d76877390654889b3c02a77f655a132f715690f794be0336a00e HEAD_REF master ) @@ -13,6 +13,7 @@ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "import ../../config/checks/ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "\n /boost//container/off" "") vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "import ../config/checks/config" "import build/config/checks/config") +vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "..//check_basic_alignas" "..//..//..//check_basic_alignas") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index 0b36bbf832602d..e58aac4e250785 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-json", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "dependencies": [ diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index c0b0b4e91dd13f..8a17fdb72f8b70 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda - REF boost-1.75.0 - SHA512 c459cb7d64fa1a8d5b755f2a1153dcea77fdcbeacf117db54e3288b8599998b58cb138a801c7c68c682296f72e28787027ce84ead424b6dda56b23c23ce71168 + REF boost-1.76.0 + SHA512 3cde15d39798398938a896b9bba624ff78ca3eb22ae04b3293f7f63fa5408bfac227ce191b0cee8753ca8f521e16b682b2d035125d75788815635586f122355a HEAD_REF master ) diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index 49f999875016cf..f8ae2329f4a342 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -1,13 +1,16 @@ { "name": "boost-lambda", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", "dependencies": [ "boost-bind", "boost-config", + "boost-core", "boost-detail", "boost-mpl", + "boost-preprocessor", + "boost-tuple", "boost-type-traits", "boost-utility", "boost-vcpkg-helpers" diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake index fd9db4cb9644fb..7f158826071add 100644 --- a/ports/boost-leaf/portfile.cmake +++ b/ports/boost-leaf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/leaf - REF boost-1.75.0 - SHA512 9570e3c7964e7e3999fe469a1ca71edec7bd5435865ca0230b232b94ba84bcc1d218773262855868b379483a902bf9bdda50ddcceec7c5d282be208a39c5f6d6 + REF boost-1.76.0 + SHA512 3ab95ba1d75cb9137805e656d7331cbf9fa290400ee88dc4f2088d26983c6c948c4fc7f05615f3bf5b9533aab84b259ec2158a97b4447f619f907b5377571b55 HEAD_REF master ) diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index 7ff64d65237018..72ee4ace096e2c 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-leaf", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", "dependencies": [ diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 3af9340f7549b3..fae7b7fdbc06db 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lexical_cast - REF boost-1.75.0 - SHA512 6c1454cb9224dd5aba6d575fe266af3299433a1789253a4a15f4d8227fe82f7fd71e2754e9c83b4f70fb50293f5597b5e90c5b9eaee8f7d7b0d296d987236b02 + REF boost-1.76.0 + SHA512 80f3fe792e2f66fab4096c9d327091bce66f004b3355de0ee28c2c1ea438412fceae2a84799113f7e901393e86fa8dacddf6b6338d3e6265f528c636065dd06a HEAD_REF master ) diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index a976cf7d8ec3c9..5767a4253a41f7 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-lexical-cast", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", "dependencies": [ "boost-array", "boost-assert", - "boost-compatibility", "boost-config", "boost-container", "boost-core", diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index 010a55479c6b38..9b3f1bc7f11083 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/local_function - REF boost-1.75.0 - SHA512 83807dfc36810a27194841eac25b70905572f6da656e75d5f04e5b4d4abec58710a34d17e69fb6588154950f1099702c8205c26c47770fe21f875a9bd7641fe6 + REF boost-1.76.0 + SHA512 e1637f892c70e0e7df67e1e9c28658787305b873198d9c1a60826d4bd581a0b866aa675339d7c85927bb74d74711d14eb8bbb47663ab69fa10945ca21a5ec220 HEAD_REF master ) diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index 1d5f9ac682d2cc..74d77a16fbee09 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-local-function", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", "dependencies": [ diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index fb0f617c4153f0..981ce574329fe8 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.75.0 - SHA512 13bc48ef4ae0805abd5eecde90406486a00c350187343ae2cc7da9b7e94d15be952312c1c07c4faf4d62e13401c6e450c3c3d06649af01a690fc7200a20744ed + REF boost-1.76.0 + SHA512 509de7eb111cb408d1e4f766ab60388a4ecf593cb644ab22572765d0e0c6197937d6da886627d341e3665bdaa697f2c8cc4adef2f298858f16d72ae1029e5dac HEAD_REF master PATCHES 0001-Fix-boost-ICU-support.patch diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index 7e800829019306..014a13569aacf6 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-locale", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "supports": "!uwp", @@ -13,7 +12,6 @@ }, "boost-config", "boost-function", - "boost-integer", "boost-iterator", { "name": "boost-modular-build-helper", diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index f94ebccb16d716..8156322ee345ec 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lockfree - REF boost-1.75.0 - SHA512 e4b6db2595688f6a13e9adbfe647b692db3e45ab40b213565e675a5de39d4556d3eca9c6b626690737163d22b80c7447c7e9df40ac2c726173ffa820677c4f61 + REF boost-1.76.0 + SHA512 eb4f387306e843ed4fa16e4a8709d6ef8a54280f42dd453347ad9485d301835541bf256edcf237aefc7da94029b044ad3b8bc429b5afdeeebda75fa9bf8df2bd HEAD_REF master ) diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index 05ed46e19e8ba2..f889222381526a 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lockfree", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", "dependencies": [ diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index ea35d818200cd9..9b16049e95f5e8 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.75.0 - SHA512 4c500217aa8ba0fe88afdff5f901da2a8977f7825a37fcc0de4a46a723dbfc3be8a25a712e4e49cf2ae4a95432dc80d66b5e8860815f320b7cb90d66592dc6bf + REF boost-1.76.0 + SHA512 9d29404852d9e79241bd745757960563e11c854887d2aa2fad5a0306f7c327351a70f526ebb8e9c603c79c6979678ca220071e6a62e0148a2bd51f30af952f07 HEAD_REF master ) diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index 8c4752f7f552dc..1b700bb911ca7d 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-log", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost log module", "homepage": "https://github.com/boostorg/log", "supports": "!uwp & !emscripten", @@ -19,7 +18,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-container", "boost-core", @@ -32,7 +30,6 @@ }, "boost-function-types", "boost-fusion", - "boost-integer", "boost-interprocess", "boost-intrusive", "boost-io", diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index 5b286f404845fd..2d2c461bc2772d 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/logic - REF boost-1.75.0 - SHA512 145654dc2397cf5740cd2cf161b0428d608a1ca02d7b53c6ebf363342bbf9d3db351913772820a853a599b8edff862d83ffc9324dbf3162ba4a913bfdd904ad8 + REF boost-1.76.0 + SHA512 6795e97a02f1b02c115951a075338fb62bf7458e30bd297071940d5a68990f0860736b29a18adbcf6bd3ca8c1af4042ddf64054c2ba873e54da3cbd587c098c4 HEAD_REF master ) diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index f4ea7c967dbd60..440963f50e1880 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-logic", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", "dependencies": [ diff --git a/ports/boost-math/b2-options.cmake b/ports/boost-math/b2-options.cmake new file mode 100644 index 00000000000000..57388346841878 --- /dev/null +++ b/ports/boost-math/b2-options.cmake @@ -0,0 +1,3 @@ +if(APPLE) + list(APPEND B2_OPTIONS cxxstd=11) +endif() diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index b5a1f2b39b30fa..9fbcba6a6d41ab 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -3,15 +3,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.75.0 - SHA512 d0b31cc55d2c0788b7376bc8be877acb30b0f23a71f83aa6df27d47fc8887542924df9f33b1d69da2befdb4ab087d6905d126ee3a8ae98a91aba0ad3c70311ee + REF boost-1.76.0 + SHA512 50967b962ac4b3cfc799733e5cbbcc15215c27135368a739d2441a70aa6e4a7ccfb617bf3ccd571201568d8bacb209d2a98acbe0593cde7714c7da9faa09ee17 HEAD_REF master ) +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "import ../../config/checks/config" "import config/checks/config") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "check-target-builds ../config//has_gcc_visibility" "check-target-builds ../has_gcc_visibility.cpp") + +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-math requires a newer version of vcpkg in order to build.") endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) -boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index bce6096a226175..044d88f7a53380 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-math", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost math module", "homepage": "https://github.com/boostorg/math", "dependencies": [ @@ -13,12 +12,10 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-concept-check", "boost-config", "boost-core", "boost-detail", - "boost-fusion", "boost-integer", "boost-lambda", "boost-lexical-cast", @@ -26,14 +23,11 @@ "name": "boost-modular-build-helper", "host": true }, - "boost-mp11", - "boost-mpl", "boost-predef", "boost-range", "boost-smart-ptr", "boost-static-assert", "boost-throw-exception", - "boost-tuple", "boost-type-traits", "boost-utility", "boost-vcpkg-helpers" diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 44721ab236ef7e..4056d81fe901b0 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/metaparse - REF boost-1.75.0 - SHA512 a998db95cf70e24183b7f850f2ae4b9cb7994ede7ddbdbe560c686a0fde3437657c4d40d5d29b07ed03bf1be5756edfce22ec121eb8694edfffe1247e780e2a6 + REF boost-1.76.0 + SHA512 27a9cc14b97f815960682da087137e656479069a0a5d57b26f9fbd43467217ba34b0d2f2336318e2394190c5d34d95d4fa71c6b3a2f95ccdae5a6010299e5783 HEAD_REF master ) diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index b24d2b231e327a..f91cd2f8c01599 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-metaparse", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", "dependencies": [ diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index 4117fce60134d7..7917408c36d7a5 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam @@ -1,5 +1,5 @@ -constant BOOST_VERSION : 1.75.0 ; -constant BOOST_VERSION_ABI_TAG : 1_75 ; +constant BOOST_VERSION : 1.76.0 ; +constant BOOST_VERSION_ABI_TAG : 1_76 ; constant BOOST_JAMROOT_MODULE : $(__name__) ; import boostcpp ; diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 69eb899a16db99..fecb98651c1348 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -416,7 +416,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries - string(REPLACE "-1_75" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries + string(REPLACE "-1_76" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") # nothing to do elseif(EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 699b93b47809bf..d7460d8dbe38ee 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-modular-build-helper", - "version-string": "1.75.0", - "port-version": 10, + "version-string": "1.76.0", "dependencies": [ "boost-build", "boost-uninstall" diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index 7a773d10c6b19e..2ebcbc847c24de 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/move - REF boost-1.75.0 - SHA512 73cd70bb613cfbb2f6b2f15a2a2fd0d40411de7b8ea7639c18d40a80471bc084ee845037bf9175bb50dfeedc750289ccd126a6f2a147d2fb3cb86f3da49480c2 + REF boost-1.76.0 + SHA512 f136696c88f398d27e97f77141f10c1ab80b0bccf9acdecc3c0e886c8f32e8e9bc9fe51ba563c814e20d71a15c01f70d96ffd88d5a6c5e297f568959492bc982 HEAD_REF master ) diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index 2386e134af1823..e197249a9bee88 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -1,15 +1,13 @@ { "name": "boost-move", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost move module", "homepage": "https://github.com/boostorg/move", "dependencies": [ "boost-assert", "boost-config", "boost-core", - "boost-integer", "boost-static-assert", - "boost-utility", "boost-vcpkg-helpers", "boost-winapi" ] diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index 77f933c59182cf..759f4849f57585 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mp11 - REF boost-1.75.0 - SHA512 bacad2fe97d687e9bb49d0274cd97f6b9344bc6f00537b93a3075603b2b486deaf472fd819635eca435b814486c2dff13a8ca572ac216cb0452340fd08492b15 + REF boost-1.76.0 + SHA512 fcdf427339f5e9a617d4ebcb5bbbf81eb6fd25568dbac64ad8f570df53997372d0c03e04b2c32d5ee704576a98008015f489d2a64726b50732da1cc3ab331531 HEAD_REF master ) diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index 7128f6b324b68b..4eb15cb1d83e83 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mp11", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", "dependencies": [ diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index ec27ec0b284ab8..e8d6079d95a885 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.75.0 - SHA512 0fc0721564c431a959bfe5d5c8c5b8b3c1d2eba32f14a3158746386806be0eaee8abedadce1b4bbb9a82a63764ff351d5b1e3c2be224ea49cd55ef4ebfa9ae5f + REF boost-1.76.0 + SHA512 42870fa1a8d85814aa125664bdadfd986112b6e9eb4b1007835f3434c4eacccad8971fc0767e9ac7b935068ed0c0031cea5820cbb79291d2b281ace565cd8bc5 HEAD_REF master ) diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index 36f924a6aa5893..3fadfc06003232 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-mpi", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", "dependencies": [ @@ -10,7 +9,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-foreach", diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 1c741009d92bc8..982679e0146d15 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpl - REF boost-1.75.0 - SHA512 21326d25fd6b9e95ba066ac06585d4b1c643b5cf2d3e927db5f8d94bb804ab8bc6a85f500c793756187f96b0b7c4b06462a9a11d77e00822a213ae46004ee416 + REF boost-1.76.0 + SHA512 90362fbe99563754c9b692466f61a0c5cfbb1bcb7c24d107d9e1525755b928cb9bb741768ba2dceaf4f44efd4c644cf1ea184d2ee3fbf419459dfc12a42430f1 HEAD_REF master ) diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index 1bf8235732a932..999fbb596b40d4 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mpl", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", "dependencies": [ diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index dc0a89607e4a43..37b9e89a023720 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/msm - REF boost-1.75.0 - SHA512 e476c5c316c9e80d98f579f873150d2e1fbc9a80cc7f5cb0dd4f034ade5abfe0297c4b7d22dab96be07095cf9ba0c280420a489e0d94df2b5fdb98c42d6f51b8 + REF boost-1.76.0 + SHA512 88734ef44bd8b8fe41920ed2e2d0576c87b86604fe8bb33e5512e01719593287028475bbd1a597ba4b8d32bc7cc119e2c62d9efc8006f772abce0fb988f8e9d1 HEAD_REF master ) diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index ac45635322c54a..4704144e07136a 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-msm", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", "dependencies": [ diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 01dc570cf9b4e7..625a9c98882736 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_array - REF boost-1.75.0 - SHA512 4455eb06192091522a17473bba1b14eb34626a74e3201e92a5a5c57e2dd56501079b4a48bb6e61d223a5c6b87e9d930c38d5ddda294e6ece326640ae23fdba23 + REF boost-1.76.0 + SHA512 1e6487b127e8205ba9ce790fefa39994bfe85417e9f87ef332e73f4465f8e26ea2ffc54e4d3096f6c7d48dd30768e910f6bf2ebd3b49d0ba490be7f0bda0c965 HEAD_REF master ) diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index 16477bd4e8aff1..07804cbd4a2046 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -1,11 +1,20 @@ { "name": "boost-multi-array", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", "dependencies": [ - "boost-compatibility", + "boost-array", + "boost-assert", + "boost-concept-check", "boost-config", + "boost-core", + "boost-functional", + "boost-iterator", + "boost-mpl", + "boost-static-assert", + "boost-type-traits", + "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index 1295859041acc2..e8ac4693463505 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_index - REF boost-1.75.0 - SHA512 162ee2d46ee899cf15f27e12248dbb02b34d22f38f63afb90abc8ac24aabd2ca58864acc56af0eded999baebac36452ca502e59fc985ce2146df24d5f9e43f01 + REF boost-1.76.0 + SHA512 b7b19d5fb3f7c93009d7af6ab8e80694208f045d012778637bd57b018360311ce14d3921d0ee6163e0aaa01001a466c2b68cf32017361ef6c0c9858db14d8615 HEAD_REF master ) diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index cb9a5467ab92ae..4bc77042b7982b 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-multi-index", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", "dependencies": [ "boost-assert", "boost-bind", - "boost-compatibility", "boost-config", "boost-container-hash", "boost-core", diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 618981a8b4e919..8002d71867e9fd 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.75.0 - SHA512 e937cf51cb41178ffe6edd7359cf63a55b36931cf835e6a7528dbaad0a09fa5b3fdc52bd07fe9f7552770b83e06050f6927d176622033f806c84fd845f693d59 + REF boost-1.76.0 + SHA512 ced4b1d4f1f4549dcc5d9f1ea470af5fe69af79208e8609656d5d807c5c1f54b0835f0807eda476b8ac59103ba1045a0458ea124bfd61439aa3e3d56d011313d HEAD_REF master ) diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index cb4e8d0970aa78..523e5fb2ce253c 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -1,26 +1,20 @@ { "name": "boost-multiprecision", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", "dependencies": [ "boost-array", "boost-assert", - "boost-atomic", "boost-config", "boost-container-hash", "boost-core", "boost-functional", "boost-integer", "boost-lexical-cast", - "boost-mpl", "boost-predef", "boost-rational", - "boost-smart-ptr", - "boost-static-assert", "boost-throw-exception", - "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index b4fc82d51733f0..924d952de876c0 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.75.0 - SHA512 15f836928459477339e11780b7ead2aa7f1721ec5c443a5370e1d6dd732228185f9055cbad169982aa6dee3d5c9efdce3076d9228d12cebfbe40475490503128 + REF boost-1.76.0 + SHA512 42acb8ef8d0c3ab01673814ada908dcfb6673c8fb6a4f056043b0a81bbeb9cc8bdd7b52febe0d06d5899d39af9717fa2e63f3678f7005e56d0bc4765e8a232c0 HEAD_REF master ) diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index f23a27d273001b..08d1daca387c9f 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-nowide", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "dependencies": [ diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index 437ddfd2418872..24ebf24f7205dd 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/numeric_conversion - REF boost-1.75.0 - SHA512 bea107d1281a7ba8f988eee849872bc8c61f3585e1f61e2af06c988cb72213ff2162436a5e9e67e03df9d5e20a19343da76ad931894dbb0137c06e85a461ece1 + REF boost-1.76.0 + SHA512 cd659c91ae7f3b25e3d0b13b44c028fcc86295fe414fde70e5decbe1d8fcb1dbd233c6a36b90b33def4e0709075a41661aa311305329f38ba36810326306427b HEAD_REF master ) diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index eec4c866d6a9e0..a25310104e6e18 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -1,17 +1,17 @@ { "name": "boost-numeric-conversion", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", "dependencies": [ - "boost-compatibility", "boost-config", "boost-conversion", "boost-core", "boost-detail", - "boost-integer", + "boost-mpl", "boost-preprocessor", "boost-throw-exception", + "boost-type-traits", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index a354baf2c4409c..0a7c9e2fb3685d 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/odeint - REF boost-1.75.0 - SHA512 972afd04ca564aa1ac8d803d36b07ccf8fac7f3931e7c916c7459435313de13d511508793364d67e0aa19a79ba91c50ce4dc774ae2702142afdcb4b08de192e9 + REF boost-1.76.0 + SHA512 8bc70dd31f948f467249caa4c67bf9dcb58bba524edd303cd4312037cff49409108c88321649ff31363da4897f8fa6053e4e5b632fbfe19f0529db4fdc734cd8 HEAD_REF master ) diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index f3025958e44bcc..483ea6e86b8c1b 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-odeint", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "dependencies": [ diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 829dcfecf499f6..0705d960add47d 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/optional - REF boost-1.75.0 - SHA512 0ca750030089267e1fc2f5a91b85bdddb239ffb2dfa02457176c7bee2caa926457a70cf8bcaec78658668b36e70c9d927823d7cf960d5a37ce8d879cefb3029d + REF boost-1.76.0 + SHA512 4802a27da00446384ae4c91075593f0d67628192d9f9cbc2378a190d1ef5491979c40934b3ac0e72145522847d0abbd1afd44345696cd936875189ab0013138c HEAD_REF master ) diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index 7afa11956ee9eb..5cfaf9a3aba305 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-optional", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", "dependencies": [ diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index 1a22d038ccc380..b434f1f22fdd50 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/outcome - REF boost-1.75.0 - SHA512 838c4a0a698cf3250891ef02184669d14e0891f366c52e646e76b25727be5d2fc0596a3ed95ac18f5d180ea35a1c24db3b8e8913277d62683908900d0394b9b1 + REF boost-1.76.0 + SHA512 0e15ccdbb06db9308524e4e11b75b6c1802aec0237d139bcc6929a2dbeeee1cec21f2819cb8a881ba4d9d1d1934a91527cbf4a0044de34f9ff2c3bfdd01cb543 HEAD_REF master ) diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index 01622ebbd7aed7..fe9ab77a21c146 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -1,10 +1,12 @@ { "name": "boost-outcome", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", "dependencies": [ "boost-config", + "boost-exception", + "boost-system", "boost-throw-exception", "boost-vcpkg-helpers" ] diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index 46b6a368974aac..79ef14dbaa5d9b 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter_python - REF boost-1.75.0 - SHA512 8a9591c51ea7f39b231293d0f731572cc014288c43f1cbaa5a3fd98d6eccb4359b6c8c064554efa438495b13866f475fde7dbfee255c7ee471bbfd4e94770ad9 + REF boost-1.76.0 + SHA512 d9e1cc0adae766e9c78fdd5002f2740902092f57f4c187f95e18d3cd9062bf8f9e5678caa9e7e2bc8a27d009302ba335ef8e7b7795a1e2577ab166c6adce9d7d HEAD_REF master ) diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index d9f704e7319b7c..104daca2d96c69 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter-python", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", "supports": "!emscripten", diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index f4382824e0342f..2d9c1acc512241 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter - REF boost-1.75.0 - SHA512 aebb583003b532566d6e8527a1f307b0baac0083d89e88ad63eb3aac7861832aad557a4412adaf56a962c721629056e2e56b8334964e0fafd3e23cdbf82f25c6 + REF boost-1.76.0 + SHA512 737dac55fac0e4e31e80fb4adfa75880a857a41007d2cdbfacb58f89171410b7136bae69cee590a9de3735b58dc9c9bbf8c724f3ef4b4ac4cf27f695f8efc640 HEAD_REF master ) diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index 3012eca5854e8f..d662d36a764c45 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", "dependencies": [ diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake index abde62533232a6..7c6489e2771c84 100644 --- a/ports/boost-pfr/portfile.cmake +++ b/ports/boost-pfr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pfr - REF boost-1.75.0 - SHA512 68f4c111451f8d9d695d083b713ffb6efaa6d81e5b83ffa8ee901cd43e1eb41abe75a80be03b039036d53625c5629daa12a999217d1ac8aebc5806d1916f6ace + REF boost-1.76.0 + SHA512 cb6108970c50fff93677f70f4610376d1d917b372633c913290fcefbd92c24329717fd95060a9403afe19daf9a525ee129c88eed7ce5320dd44dd6c56c7ec63f HEAD_REF master ) diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index ace648fd1bdc31..6c6cbf410192c2 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-pfr", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", "dependencies": [ diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 2f51ff7fbc1737..9c3f00410bb765 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/phoenix - REF boost-1.75.0 - SHA512 e888960ee154d73f9eb5d5d97d681aa5a8bba7295ab2150d80a316ab6c8aaf66efb3187ac618d59ad21aa0459b29ce68dcd106d5f6242b7db2ec3d61c92fa107 + REF boost-1.76.0 + SHA512 515895386647ea13a40045814f8f91989aa1ec257f139fff150401247fdf8684e8b1df73b18edd69ffeee87d6c25d4d895dbd6dbef54fec61ba0f192904eaad1 HEAD_REF master ) diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index 63a44db1d132c0..49196cb71e1b2a 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-phoenix", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", "dependencies": [ diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index 7234d833b37c93..695cc40c86e141 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/poly_collection - REF boost-1.75.0 - SHA512 b647e6256d566117dc35ec3452c849aadbcc06a71b70426d7b41e63e2e369e0c3373628f7a33e2b16eefd86efb128cd03ee7b49473f1d83da775ae2cd1043709 + REF boost-1.76.0 + SHA512 9bc910a72b232e8615d43e967f5a19d2b5910dcaf1641c71b9bbc67ea72e8fb96a834fab8657bce89be574ec9d56e298cb8f36d7663476a5604876fba6ae1cde HEAD_REF master ) diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index 25999dba871c72..50040ac1a376d1 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-poly-collection", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", "dependencies": [ diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index ed8e27acf084ae..6f81c5c16ff109 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/polygon - REF boost-1.75.0 - SHA512 8c4241e1c392fb63b118c3e59a9207126627e02a4e3ecb5be1e7c73adfe156320d4d61ccf8274c6434447cdcdf2dfb960574437be8edb771ad143f7bfce14377 + REF boost-1.76.0 + SHA512 3b735ae15c75581297ad920a79c30ad3e58da4a747333ff9c6637ad10e08c536d0e9b495b20ecc743af98a9d46af92aa602b52aede50c1a77de84f121cd13a4a HEAD_REF master ) diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index 7f42e2c93564fe..89a857b1bd939b 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-polygon", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", "dependencies": [ "boost-config", - "boost-integer", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index de1145ad21886d..a2d4d2296f2ceb 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pool - REF boost-1.75.0 - SHA512 6726fd14ae1aafdabe65529d081fcc2d66e61b622b4c4312bced797dc5484211d03e1c93f18ecb1fe995557291f079bdaef89049eea94e2f3dabe492e4d9b9e6 + REF boost-1.76.0 + SHA512 df25c5df62471b176699300aac2b8fdfced427ebcf76bf9ef4f17679e5dfd52c25c227e628654de487b3403ecbd64c4a864d1c2ef52d52b58f185c5acbe9588e HEAD_REF master ) diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index 94ad6b384a50ad..8cdb410b3f8016 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-pool", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-detail", "boost-integer", diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 2f58cb3ebfaf89..50f64847e149e9 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/predef - REF boost-1.75.0 - SHA512 ecac133772c24c0e2da6ebcb9a39fb9a14b23cdc14689421eca7c59513bc559f822b3ecff70643df4175379c05d435e8fa9300231dafac61f1d0857179b47c58 + REF boost-1.76.0 + SHA512 89c04eff29e31010072fbe79c8d4ecb3baa0dd48cd8eba8847b836fe6d355a5e1243726156ff7343be11d849096049cdb9420d5238792ea116dbe8e2645f3bf6 HEAD_REF master ) diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index 0290057040d2b9..2c571dccf6c461 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-predef", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", "dependencies": [ diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index 025a06b879e358..b70eb0a1c3afbe 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/preprocessor - REF boost-1.75.0 - SHA512 e76c3e6d810ca0c21d6f58ccf421cbba3078e3e300cb967b0e1b7ade1000d8c984fa1133d6e47b6b0d6c1a6507de4e5ef47934f0415c2acdc10442cf4bd052e5 + REF boost-1.76.0 + SHA512 f7849c57fe0985ba872e591133fed8adf24bfd337b04847d1a30c5978881a8cc2050ad43b4e9ce0bc32a593bd87c14e9f0433aeb7d0b61a9d05ec3bd9d53c7b7 HEAD_REF master ) diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index a78c26e7547595..c92339abe02d29 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-preprocessor", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", "dependencies": [ diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index f7bb992e6361a8..c59feceb935003 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.75.0 - SHA512 2cb372836c5341eef1399eed54a792a11a42e915837d12cb03049681160cc496e8e47cf9d8937caa860a50da52d1572c620cc082a9e2814277684ddd2bcacbe9 + REF boost-1.76.0 + SHA512 d704892dee6ca83b4234bea9b267dae7db8d78ee740b037e054ab15051de0e09ea9bb9707be545c3c6d423f4a58259300de563cee54c3c76f632f13ab6bdce21 HEAD_REF master ) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 61fac938120b4b..580cfbfa6d77d6 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-process", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "supports": "!emscripten", diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 4b1d8bd0749f23..77bc117b6653fc 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.75.0 - SHA512 62d0a56afc111783ba49928a6aeeee4d9ad1cba6b8e59933cb49b64594e5e845a17ba4627d45a392199e327e3c9d3694a4c5e4a5d8934f6c26e7a21d6859355b + REF boost-1.76.0 + SHA512 5cbd02923de60da9b8b4ac232daabc4b3ac8c07f46d8de1a69576c331d1f13951166d4c61649328c68405d7e4d2cb2bf5996521a53c211f5399bd67acb546bce HEAD_REF master ) diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index ebad7f23e4e0d8..f4bab0e24d9a28 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-program-options", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", "dependencies": [ @@ -11,7 +10,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 453830eae71382..c3e8e212730b1c 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map - REF boost-1.75.0 - SHA512 f7af2810712609b6c7911a2a209e2affab70cadc443bced3b660bff4dc53b280e1c77b2e86d21410b8e9120b0cb18365d9c888183df4b911d34abb00009f2fc7 + REF boost-1.76.0 + SHA512 aa9778cc00a11af811a8163ab1530b92d23ded36b48b1fa3edfeef0926530c9318be93da0c3e5c13691a841c288d5189145d89d4f1d321884dc1f0a84fc2feba HEAD_REF master ) diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index 11640d4c326986..d9960f408719fe 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-property-map", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", "dependencies": [ @@ -11,7 +11,6 @@ "boost-config", "boost-core", "boost-function", - "boost-integer", "boost-iterator", "boost-lexical-cast", "boost-math", diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index c255361f000bed..dd20b347b53560 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_tree - REF boost-1.75.0 - SHA512 387499ce979696e248a260471b8abdd6d41ea6e631ac30977dcb4c63c8f40b4c1f496b66aef28d5471fb82bb8e92e2a87b7369d0d547413d4affdc3b1bc094f5 + REF boost-1.76.0 + SHA512 bd138f9ead12144b2975cf961d9820d6df4729491c259123b15f49f85c54b0391093874a5f825fbc9fce6d67746cef0a0bde893b448d0e07489abec67aa1eee1 HEAD_REF master ) diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index b519b086f647b5..c01c411e2b19a8 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-property-tree", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", "dependencies": [ "boost-any", "boost-assert", "boost-bind", - "boost-compatibility", "boost-config", "boost-core", "boost-format", diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index 3621ef27af16b1..e643b8bb4a7347 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/proto - REF boost-1.75.0 - SHA512 cccd53370972656d13c27fcc7c8726fc4d940bb4767e45d0a427337980ed2f7c7b1902a49e58502975dc2741ea4ab5c4809df44282812da3174d1d7541897a29 + REF boost-1.76.0 + SHA512 0acca1fe1e0d41f919fd721a60dedcba9c88fc490a37012cdda617272caac036a2f1686bbf8cc380b3989cee4e3cfce9fed4ebe3242ef9b7394b944212ba545d HEAD_REF master ) diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index 55fb7f458fe4bf..9adf4165390def 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-proto", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", "dependencies": [ diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 21f4855da3c42c..da341f87842a19 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ptr_container - REF boost-1.75.0 - SHA512 6c5a1739fa5cf15aa7732794cf030e30279f7d51dc8e4a978df512a8ce5dd2c2debccc6ec9076f6839f0147ff69c46ff05435b20ebc12f1a59e4ad6a1d0e9e1f + REF boost-1.76.0 + SHA512 11a08ff378e0e70f18a79ded47c339eee9e1bf4fb7bd7ea5283f9d7b888112904453d8e6e3970993706f3d90069bd765bf848ec9a8b8edb0595f5b40f19ce1d8 HEAD_REF master ) diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index 79440cbccbb048..1edc6dfe2fb379 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ptr-container", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", "dependencies": [ diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 9293a86f8fc4a5..097f770f2073e4 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.75.0 - SHA512 aca87fde436e8dd98d64149c1ba85f2bef33a76fa9cfc650d23055aa3ce12e94ac39b72b0704e7fd6d0d4adc55c4ec93d841b37bac3297ceb04264ed9adfffab + REF boost-1.76.0 + SHA512 ab2d99f752dced241045c597408d3a76f78c800717752dc091510542a754fb86140359fdab81b57ff8405d05a1814083c3ddfa032b0d692cc40c3af4af496e91 HEAD_REF master ) diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 8751ddd8e59e79..02c309ff467f1c 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-python", - "version-string": "1.75.0", - "port-version": 3, + "version": "1.76.0", "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "supports": "!uwp & !(arm & windows) & !emscripten", @@ -11,7 +10,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-conversion", "boost-core", diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index 3cf0c2e6ea2e86..eaf65eb1f2f9dc 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/qvm - REF boost-1.75.0 - SHA512 7bba9ea21bc86699a54d571c45bd994353ad3207ac7696a111c5e8f08e9de03b6344236b8ce11a19d10696a682fdbd8cc5c4bca84c2337f4f009b92c82e77c81 + REF boost-1.76.0 + SHA512 98fc06a38ca220e53383295b0dae966272871e2d99ef23e2fb14790722ce36d75de158ef6d34bc44e99ee8692e33cae69762d2f058e88059e625574012e336ce HEAD_REF master ) diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index eedba0c2cf9d03..9ead8ef80be78b 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -1,14 +1,9 @@ { "name": "boost-qvm", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", "dependencies": [ - "boost-assert", - "boost-exception", - "boost-static-assert", - "boost-throw-exception", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index fe0763aa0aa6c7..1786248e6bdb6a 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.75.0 - SHA512 b18c8b6d1c0a3ae551e81a1b4d2c213910f748f236358b54eafc25342a6fba4cf7a4eafec2bf972446ee8aed5a937c5fea00a46b6c678604a42f5449319d7c73 + REF boost-1.76.0 + SHA512 d34405b2b5d9e4de201b07d97a2440dbc49f54eba6e1f13f37a50f453d2e09ca7e0a0c2559706eab7f57651219325d2606cd29e91bff0710af269976504abb73 HEAD_REF master ) diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index 5a67fca81801d3..4f40f9d6c1798c 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -1,28 +1,25 @@ { "name": "boost-random", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost random module", "homepage": "https://github.com/boostorg/random", "dependencies": [ + "boost-array", "boost-assert", { "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", "boost-dynamic-bitset", "boost-integer", "boost-io", - "boost-math", { "name": "boost-modular-build-helper", "host": true }, - "boost-multiprecision", "boost-range", "boost-static-assert", "boost-system", diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index a4810e59c96658..aa78a1ae6c47b2 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/range - REF boost-1.75.0 - SHA512 f722aadac7ad61bf7a773eb701c762b209e68c121948bb79bef5257539e1e7f62557430ef52f58e7758124f9e005426644a89702d40647f1b66be84fe4056e3c + REF boost-1.76.0 + SHA512 dc7801aad1bb271c28d9a0ec6e132b5b6992d4638b90c007e392148903acb27ef9bfe1273d00db181416e0325beb756eac26f458a360740889c521b8f5424fb4 HEAD_REF master ) diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index 4d65bf99863d31..b17779eed83b05 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-range", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost range module", "homepage": "https://github.com/boostorg/range", "dependencies": [ @@ -12,7 +12,6 @@ "boost-conversion", "boost-core", "boost-detail", - "boost-integer", "boost-iterator", "boost-mpl", "boost-numeric-conversion", diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 09d44f9df64753..9c87047e74118c 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ratio - REF boost-1.75.0 - SHA512 f7e17ba770041af85a4a5c2dce36681de73bb5513b38d128c9d1d54a0a0b41ecd118f23beb2bebfb4bc67e0df37938249587ab10f0f31330564734542703e080 + REF boost-1.76.0 + SHA512 514fa35a91604ff823ee6c4736a5e5d6059ba445466884e2e58c38f6daba6e36c18f4071ca928bbc338036e67435d210d130822b122e029a3440c409507df201 HEAD_REF master ) diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index 75772ccc51b69b..e3f71c4a6a432f 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ratio", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", "dependencies": [ diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index 02726eb14e4e7e..61cf338a57ccc5 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/rational - REF boost-1.75.0 - SHA512 72b499b5abc825a2bcd06dd2c1047004d77271c9134bbb9c30860e87c347d366f0189849fd0159c886de86b1dce050ea6b96be497bf05d83bd21c47a7e07b5b8 + REF boost-1.76.0 + SHA512 399c1f49a73701f6db9304ac476f88af50470d96d400a68695ed3b3f8462622b4dde671053c6b3fcdd6474e5c2e7527946b79a5ea378af77337eee3b0ed16680 HEAD_REF master ) diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index fcd8367b8685bf..b3d2a6091ef377 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-rational", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", "dependencies": [ diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index aa7afe23825215..e5c7381147b112 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.75.0 - SHA512 966cd68fc8190b92f0a23e7e1f08602b5ab50674c6fe4d93761de46f8758a6e1a2dfa7fef5e5f814f94a8acfca57e842b914f2f2013768e6a91e427fb2de4559 + REF boost-1.76.0 + SHA512 03af2b4ced7e09c3cf14fe9d7befed41e2be1f6e999445d2c376f0a6fcf82fa29ee39d6bdab976d76281a388466d39e71cb9ea069bc8df079137427d4576e264 HEAD_REF master ) diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index 0bbcb88c9f7bfa..96f3069106e911 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-regex", - "version-string": "1.75.0", - "port-version": 2, + "version": "1.76.0", "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "dependencies": [ @@ -10,7 +9,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-concept-check", "boost-config", "boost-container-hash", diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index ab9552626aa763..0994a9ba594f8a 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/safe_numerics - REF boost-1.75.0 - SHA512 47b576b702c01eb32c6211e5b23ce4495504c37b6f65318f43af21898200681f3ebf08ca5b1b0c54e763ce863e2f427e7e51eab019c3f941a34ddd60b739df23 + REF boost-1.76.0 + SHA512 450b69bbd03713189d8ea0e309ffa3e397d832ef0422862b67a8bca9d4615698cc3380a19cdb7b97f53c32ceb7afd18f258f0be7552a5641bf83351ac41b3973 HEAD_REF master ) diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index 27ed80ed66a846..bbe3943bebc256 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-safe-numerics", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", "dependencies": [ diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 589e9e1c876237..cf95910f72e856 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/scope_exit - REF boost-1.75.0 - SHA512 2b2887087a748374466fd518c9bfb092f3ff07d998cc8ff5e8230a1f1b8444b7b73d27fe7cbcd5fb2629dfc91035291776bdd514a5cbc5d85ebef22748ca09e5 + REF boost-1.76.0 + SHA512 addc6040749187ca5c6d22d9c33ef839422658f80588841b2c722c508049e04c6b41a228c739066438c9562ffc1c35cc2ec3f3e4ea5b2443fdef532e5708d08f HEAD_REF master ) diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index d9bf5bdbee3c3c..7f0b9400c711ad 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-scope-exit", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", "dependencies": [ diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 27609925f8579c..c0ffebaef8ed52 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.75.0 - SHA512 0398ff271722509719fcdf54ff752df386dcc5f94364e7d0e695e52db3daa1b0ca26db8c20279525d149d26d640ec2bf8e56121064ededf536bacb039f71a197 + REF boost-1.76.0 + SHA512 ac9a0453f6244518a250c3d51f341b001618f2032b723467ad7a93aaf77a66d970d22b4a06072e98d4fc30b1b850c3cb9a7c7e3b46d6e4ea1adb2d9b55ff4b68 HEAD_REF master ) diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index ffaea91bbd0afe..172efc1629264e 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-serialization", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", "dependencies": [ @@ -11,7 +10,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index ae3e6e1e48f370..f65973dd6784f3 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/signals2 - REF boost-1.75.0 - SHA512 6ccacd7bc2d210ea36913f5dc8af5264633b79e89a81f8cd75ddbf7e62257577359509dcf83561f2254dfc55298ff509bbf96f7d9511e338621130ac08163f3c + REF boost-1.76.0 + SHA512 d298a325c35dc0eda9614b6e8a4e84e7ef240e83e2b5938bc521ac99e5095c13b7a4e6a48b1b30bf1c038dd4c3e43d23dd85c14473da942cf65c5723fbb1c954 HEAD_REF master ) diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index 48d8728a6c67cd..caebbac00cca80 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-signals2", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", "dependencies": [ diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index fb57f61fde7741..83120dd9896b84 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/smart_ptr - REF boost-1.75.0 - SHA512 0c8e41eec34e81e12cb7accfe2fe76454e2121e30c9a719922a27e2c173d9eb0210af5bf090ee107b0f8946e33893ce6a36d8faea31b17a71262df45099ec699 + REF boost-1.76.0 + SHA512 e6ac81d1da13daf080d67f046fae19e98ef4f1eeb17b65743b8ff52e4a28b15152b6fdf083662f9a2555694a93064f78fd0ec432bfe09d617d13fa7422e7f28b HEAD_REF master ) diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index d199b31cf4666a..c50e9a2e6cb631 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-smart-ptr", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", "dependencies": [ "boost-assert", "boost-config", "boost-core", - "boost-integer", "boost-move", "boost-static-assert", "boost-throw-exception", diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 0f1516a8957dfe..08925d5f70eff5 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/sort - REF boost-1.75.0 - SHA512 e7b193f54de684e7f7dde9e1283cba1979b9f5337ea10a60c83d1aff3346c431d85674167a24cc11300b49005db6c4476650039a6f39a757bb46cbb8ceb82224 + REF boost-1.76.0 + SHA512 71fd8a9b5ccf29d5971bdb2b58288555a6a63c12b5463dcd0e11fc7132f0c620a77fde4492005204e8ef4a9084a9ecb29f6c9ad8e325227e491a99ba033f2080 HEAD_REF master ) diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index fd4b9c73644a1b..ec6278f4915b07 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -1,10 +1,10 @@ { "name": "boost-sort", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", "dependencies": [ - "boost-integer", + "boost-config", "boost-range", "boost-static-assert", "boost-type-traits", diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index 3ff4e47fb5cb27..829172d4836448 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/spirit - REF boost-1.75.0 - SHA512 83d4cb3aad1e635e14640dace19d44db7886a0e25a30f9c5ff5384c5be8f6961231f947f4df0baf07f9bbda6893988ed9099700d596f99ff39ea22151e436912 + REF boost-1.76.0 + SHA512 0ef312d514fac39636c9f7f1aff1746592eaf69be820d488503a99ce28530e2c987f7102f7d2928f31a263de5e1053500a29ec512684fac3489d0bc48a44cfa2 HEAD_REF master ) diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index 382e0954f3d277..3ba81888f24125 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-spirit", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", "dependencies": [ "boost-array", "boost-assert", - "boost-compatibility", "boost-config", "boost-core", "boost-detail", @@ -18,7 +17,6 @@ "boost-integer", "boost-io", "boost-iterator", - "boost-math", "boost-move", "boost-mpl", "boost-optional", diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index 11f5f706880c92..ccc0d595894e78 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.75.0 - SHA512 e5445ecbebf9a3099f95beaf7f9e77cec958f2f35c20261ec9d96d1f2100ec781fb7ed3553d189cab0a0568c6dff02bddeca1835795b1070ea1a080dd13db5e4 + REF boost-1.76.0 + SHA512 4a3ea0279fd41f19755ea6f90d7bb0b271d1e6c43c6e631acd17104a200bd425b9dd58a9cfcd7b1b1203e86c5a9216507d8e033f125bd582c5b68564a2a8200f HEAD_REF master ) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index 870b8dd7d4b1bb..ff1b17488b2c08 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-stacktrace", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", "supports": "!uwp", diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index 9b80a27aa197d1..d1271b2dd5937c 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/statechart - REF boost-1.75.0 - SHA512 7f7344f272c2172b5297ee2c83af44791843003da624ff24fc0b51c6adb5eec2ac55453e92e35a5174b019379e63a38eef9888710f51108bbb887f8f4ad63c81 + REF boost-1.76.0 + SHA512 3b9476d1b59ecaf867c19f106c4e6ff9e66c5b26f9793256a52b8dc47c26ca63dfd67dfef374b20596287764589d7b274bf88e079fc191ff186321946ae3050d HEAD_REF master ) diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index ef30a780315d61..b1a7d268751a57 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-statechart", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", "dependencies": [ diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 999f87e8673962..ab617b641acda2 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_assert - REF boost-1.75.0 - SHA512 dbb17a379e745a888c6ddafbec14565cadd2270356bff5787096d7dc00bc4804bdf17b424891edb3b2df8db4e2bb79ce08c57b59b76ba185fa4c83f37195c610 + REF boost-1.76.0 + SHA512 efd94b25d66f9841d41c8ad22e751e8489fc78de68172554ec2a82be61b7163c6b90fff56ab8dcf14da7b03770c6f2d14f317be5abbef796dc4d4366efd6498f HEAD_REF master ) diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index beb398fab484c8..6a27f491a5f0ed 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-static-assert", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", "dependencies": [ diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index 8468e38aabbf08..5b1936e93e8fae 100644 --- a/ports/boost-static-string/portfile.cmake +++ b/ports/boost-static-string/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_string - REF boost-1.75.0 - SHA512 d3d0326250743783434c57d9c5c9f60c195978be862fa9bf377952385b06ce44f236f63c1423c5267b093ba28ac3aef74a4fd8e012bfb2f30620afc5e16cafbd + REF boost-1.76.0 + SHA512 cf7908b40eddc0ef478479834ce73f3352c8f29729a77698f9ebfa4fdf944b2aafce82410977764b5bedf4bfc92e000fc2c7c0df4cbdf487e0bb790cd5f35111 HEAD_REF master ) diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index 0406e828a05ec4..0137445f012e54 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-static-string", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", "dependencies": [ diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index 8ddeaa61ad531a..21d0f03fe9a70f 100644 --- a/ports/boost-stl-interfaces/portfile.cmake +++ b/ports/boost-stl-interfaces/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stl_interfaces - REF boost-1.75.0 - SHA512 9cf6d2fb8d7bd0730a383068847d711ba3e5b5b979f72448a1606a50c26ceb903ccebbec5bbf57e35388c720b9030278a3f385b29c78d4548d9c1f61fdb5a585 + REF boost-1.76.0 + SHA512 6e260882bda4b57369fefbd4515273617b84708bd5b68f1e5ee77038b1a80e88efb43bddf1931ec6af346bfe25ae4afe7e282fb65712eb3959da88ff0d110ece HEAD_REF master ) diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 23ff866f3e163b..8939c1fa4d1001 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-stl-interfaces", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", "dependencies": [ diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index e26a02be7c8af6..bfc5dee5af2e2f 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.75.0 - SHA512 8d079906e513605d9c372fc42dcc29e0e537ef690ecd2140040bd8c40619a218e61950d6a59074d11db910f6a68e8306633b5bc2b6190813fcd47c7aacbdb0ad + REF boost-1.76.0 + SHA512 7943bab559c0629fec008fca6e4377fb34ac45f809fd67250cda8a364f5a47149bbb3541d1e684a7f92903e7b3b90c1fb0f6902c7a827c1f69a3ab7b5da1facd HEAD_REF master ) diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index f311f0c8b0fa8d..39ffb53b2f4394 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-system", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost system module", "homepage": "https://github.com/boostorg/system", "dependencies": [ @@ -10,7 +9,6 @@ "host": true }, "boost-config", - "boost-integer", { "name": "boost-modular-build-helper", "host": true diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 858ec62b715f5f..0f98c557d09b6f 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.75.0 - SHA512 7ea116de82140b50113d7971e861d5ee7f2664c11ac79861f453066adf41d4581d3aadb7c484045050f88e7aca3b4d90a078f916dbb6c7f40a1ff9bf6a7c1d47 + REF boost-1.76.0 + SHA512 87b4e949adefd840ca1ac61ad97b5798508742ef10ca12d05be0181150b5cd23fa25e473ff5cb077a55afb04d61846b96f7dae298c2dbb2deb71589e6dbcc968 HEAD_REF master ) diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index 6ae0847b08c374..6b2c8edffbab63 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-test", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost test module", "homepage": "https://github.com/boostorg/test", "supports": "!uwp", @@ -13,13 +12,11 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", "boost-exception", "boost-function", - "boost-integer", "boost-io", "boost-iterator", { diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index f16abdf672a6ed..564a247abe7b02 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.75.0 - SHA512 b5fb6aed2ff3dd59f8b91c3e2758e27264f2bbb40636371f6b0aa130a6dad8b4dba93eeaa37ec960d56ea30fa28f9559a98349c9b7e40d08f6b7273a1aa49246 + REF boost-1.76.0 + SHA512 ed833316025be8a52ccfb620b874f9b9956c778e453de01a657745563184efc123f461dd54dc048946df3319c1b512810a9ce1fb8940fd75771a171c95349e28 HEAD_REF master ) diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index be64e494b7a555..9e76367b9f2c2d 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-thread", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "dependencies": [ @@ -23,7 +22,6 @@ "boost-detail", "boost-exception", "boost-function", - "boost-integer", "boost-intrusive", "boost-io", "boost-lexical-cast", diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index 79e121bdd7aec2..592e1402a47276 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/throw_exception - REF boost-1.75.0 - SHA512 b4bd96f9ef37f1345db8eb26715b1da43a9f7ea2b7eaf4618be2caf3e7e4e6904fa5a32e2b62fd032dd6ebb99d0bbd7e37efbd94edb31aeb3d49c68065f3be28 + REF boost-1.76.0 + SHA512 875d7332eb2d80ff30a3bf51817d20260cae9fc598c3e51b0e1e1fe3627f86003a36da6a3a4fe957b943bb8afe33ba1fdb4931d067024a01cd3e6a34c13aa86f HEAD_REF master ) diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index b32ea2c12b7609..8718629dd0eaf3 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-throw-exception", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", "dependencies": [ diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index 0cc16578d30bd5..fcca8cb5b98ec0 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.75.0 - SHA512 718b469ed561ea8897bee96c12aa90a2840ba9c4772e963ab35d53d0d161ad39e630ef954b393155f834309607d1cd4f7b63b537e4465b8e50ad303438e3ba30 + REF boost-1.76.0 + SHA512 c61fa1957a193600091959b49f5d84137ce8823fbe53bb3761bd40c9c0bd7d3660b7e449c0a903cdd6249e21d84ee19d86e26449aabe0df8404e400af946aa87 HEAD_REF master ) diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index 82da293c24dd22..aceb8db8758337 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-timer", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", "dependencies": [ @@ -10,10 +9,8 @@ "host": true }, "boost-chrono", - "boost-compatibility", "boost-config", "boost-core", - "boost-integer", "boost-io", { "name": "boost-modular-build-helper", diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index e655ef33352c0e..9d00409818a91a 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tokenizer - REF boost-1.75.0 - SHA512 12b86b1295d1080192f3537a1a984c234a2351e7021829dea8af635680ed8007485bba1843452b1d7706dcf9fd2754967cd8db784b06ad9c9d626e8ae87f6f67 + REF boost-1.76.0 + SHA512 287916582c98aaf8c6549899f9258b1428a0c20942677cfe10b9285487918ac10a17cb7896eaceb800ed645587dcdbab5a58d3e7c18bb13eec230d00056fc453 HEAD_REF master ) diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index 3b52cc9a142e73..f679818ddd174f 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tokenizer", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", "dependencies": [ diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index 6fee186c3060f6..b61649bc632085 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tti - REF boost-1.75.0 - SHA512 9cb18d992e5f149f9b35b3e97ea63b41752ed03cba8c23b68dfd5b9d55538a55d1aa13abe1d16a6bfd596a144c85947ad0609a64715dbc72a6cede7f3961be71 + REF boost-1.76.0 + SHA512 7ccc41099e3b800fab74d90ed47943e3358f4c0dd88c1fe901d9f81f601794e78a6d0df9c7ab04dd59261870820371d89a8d5bb5c4983143b48bd9d5a22394a2 HEAD_REF master ) diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index aebf9f124ea167..d64351cea337bf 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tti", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", "dependencies": [ diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 36e605055921f7..5f731c81a0d0e1 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tuple - REF boost-1.75.0 - SHA512 6ccc5e0e1c115f2c2840a2780e4639b184665f9993d1e21b8524b7ca775fecb38a554c53bc01eeec8a2643e45172540f176dddc8af684a5dbd14b98c6ded8b6b + REF boost-1.76.0 + SHA512 22c40d1c9f63cd22d0b632d81b15b30767273be019afe4ae8030cd9ac740e84f50e2db202b62448e9aa44bad2d8f0a3102e54cf1648b414ab7e30814c9da6219 HEAD_REF master ) diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index 832c954651227a..3ec8a549cb5f1a 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tuple", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", "dependencies": [ diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 339449d5f09fc6..b7afec0973ed29 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.75.0 - SHA512 b25841b9ce94a5567c05fa465b0539bead832d8cc12beb66ee0739a8717641d422f7b894b06d8465cf1d1cf18ef914bf8f27a4a38da22b72d1b639eb2aa9c584 + REF boost-1.76.0 + SHA512 8f304de312dfb59d3d02d90f1806908bf91a74459c6ad156902bbc7d72ad326e98e07c43f6cef76b6b82ba37d3f074584722e04212100272cdea613e4c47104e HEAD_REF master ) diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index 1ea175c18969be..867e95e8879b2a 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-type-erasure", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", "dependencies": [ diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index bb59d8395be5cc..64942aefe29881 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_index - REF boost-1.75.0 - SHA512 f76b38f82ea2ba8508715122c6b899034a57e206ac01a4560220df03c185885a6b50f56559f070ae873addccd8b05df2dc1f35dffeee36e8384e8de2f6f5e220 + REF boost-1.76.0 + SHA512 8103eea4f14f15046761adc0b438a182adb1cfc245f02dc8211b9a7985d67c859f88fae2de2d7aef8f2bd969dcaccc28515e1339c0207551fa44e43ff4d8fbbf HEAD_REF master ) diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index 7f9a1931ec019d..ecc5bdaf5b9fe7 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-index", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", "dependencies": [ @@ -8,7 +8,6 @@ "boost-container-hash", "boost-core", "boost-preprocessor", - "boost-smart-ptr", "boost-static-assert", "boost-throw-exception", "boost-type-traits", diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index a7dc81bec82e20..10bf763268d956 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_traits - REF boost-1.75.0 - SHA512 bf6dd23c9c2194a6507a0e513b1622e6444ce57d2da42079bea6acbe72d5ce5a510b5c223a0031cba7cd00b77bc51ebbd483296a9f598c80b82d1b8a658e94aa + REF boost-1.76.0 + SHA512 3dcaedf9dbb95c6b96ce5d836ad85c1a5cdf766a3421b3235dfa4a0e4db94d0322d714e03d53961a7a0cbe597bf0c7c8689c61a23274b2c9c70f90780b349659 HEAD_REF master ) diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index 8033416b8399c2..93322f28eb885e 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-traits", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", "dependencies": [ diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index 5140a906a45250..d162575d4bc275 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/typeof - REF boost-1.75.0 - SHA512 d0b2bf6c129054471c945b76d871e3e7281f115e8373d7a7d659a80e05fac50f64a3f2b0958c40d5570cc5815516d99327a4cb155b33fcde2b08d754a617c2cf + REF boost-1.76.0 + SHA512 3126a39a1e37cfe20d98f46ddecf88d8d6ed6f996a08087d47771d6eab8229b08ebc9e949e92363f109936de9ea9df1004f6df6d433f9b4957f8f7812d845da3 HEAD_REF master ) diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index f69177c5a7d86b..489c94e4ec3bca 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-typeof", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", "dependencies": [ diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index d322ded2a2c771..0e856f5d0fdabf 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ublas - REF boost-1.75.0 - SHA512 a6c20d97c92c7d2706aeeec71a2bf6672099ba17eb90e3bae9f0a01417b0e68fc2886d1867914aba2c975fcacbd243c5bcefdebdc4eb1b4947571a93c91881a5 + REF boost-1.76.0 + SHA512 b685374b8871f0f2edb8b1d2431ca448a28285e8d267123ee2cc9abe39e97775eacb47fc7f098547da7e3537ded1a3ba2b9ae73a7774302bf7cbe50d558431dd HEAD_REF master ) diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index 9c63a113170c00..1b0d943b44b5ed 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ublas", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", "dependencies": [ diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index bcfdcdf88897c2..7ac447db4467a8 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/units - REF boost-1.75.0 - SHA512 6003fc27913be7f3d31e98fbb2493a487e0d1bf9ff93da318761dcefb93c19ab1754c9d6ad74a332ac0959fe827dba2771ac7b72170160d734ad89ca4252d152 + REF boost-1.76.0 + SHA512 84eff531365db19254d52ef0cdc31631a6806b766a8d2be6f01aaf0b468b367c8cd9f4979d2c28434c19c6377f8be5a42851f0e90bb876501738b1da9245ebb4 HEAD_REF master ) diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index 15b5d9eabb03cc..7b5b94d2561cc3 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-units", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost units module", "homepage": "https://github.com/boostorg/units", "dependencies": [ diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index d8d3e8d647faf8..4e443ec3261fd2 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.75.0 - SHA512 57dc180b31e2132ef260971fddfbb51792660bbde24f7146825ddf66b0bc80725e089b756f7187d4367ca86a988e042880fffb8e19522438a927feec45705cab + REF boost-1.76.0 + SHA512 77047942a8561c84a196606fc4d6964687f52c7da52b419e69cc0f73a8751ba937393ff25e2a7d3fa9f0487df1c78f34cd633c9440a1b2c47da53cfe66d5b526 HEAD_REF master ) diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index 4b65536cac373c..8675aff1b4e2af 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-unordered", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-container", "boost-container-hash", diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index cb854087df2ca6..6ae1500d91546a 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/utility - REF boost-1.75.0 - SHA512 43c02e8e1ca9e81e6de660c677ea6af6a84a82de0be06a24db1277bb38150b15da0c5466adc7b8f1c527718ebcbd51945671b8362c790322ae9468e4381b1752 + REF boost-1.76.0 + SHA512 48beacbe0853d4d8cd7c5099639c0e52595640ee31827a039f1b06bf6f13b108a86bb6bafe1eb2eee03ec2a2d4e9fa65d8ee87cb45522eaa89f6b6672024468a HEAD_REF master ) diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index 1370bd4ac1f92c..66b6454166ed4b 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-utility", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", "dependencies": [ @@ -8,7 +8,6 @@ "boost-container-hash", "boost-core", "boost-detail", - "boost-integer", "boost-io", "boost-preprocessor", "boost-throw-exception", diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index a7a38462db1de4..bfe621ed0469fc 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/uuid - REF boost-1.75.0 - SHA512 f1df5e8a2a4e2bb5c9a4c6ee9876e55d060e75cfeb893163302bafb32048da43b3960fbae82f7da17c60005c236c6535fc802b49f2448a87464bea26debd4856 + REF boost-1.76.0 + SHA512 9d0a4ee60cc941e8458a0796955860a2e760eff30bff0faa665a9e9dac78631af0f06a6b6d8146b73059d968f9cbc2065b341943bbaa6606bd6d02f4db9bfcb9 HEAD_REF master ) diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index 71664c694eaadf..f703a3a6e6e7ba 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -1,16 +1,14 @@ { "name": "boost-uuid", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-container-hash", "boost-conversion", "boost-core", - "boost-integer", "boost-io", "boost-move", "boost-numeric-conversion", diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index 1bcac29c625c3c..e7768285453def 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant - REF boost-1.75.0 - SHA512 094bd5f932f621e265afcc6aad08c159ac83a061bb63c370480e2d243d41395378e565e7d2ff5c852cbd0fdaabec294373dadaab01fdc114a347555e1073696d + REF boost-1.76.0 + SHA512 d4c5afd1bda28021b4c1eaa0a98db16320144aec2595cf52564486da3c33d89b7a486ec35389af228169a37b928956b6e6405fe86c3dfb3f949cf3e26f372779 HEAD_REF master ) diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index b22a988c91b1ff..0d3547aab4cb7b 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-variant", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", "dependencies": [ diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index 809170e6d228fe..5519083b326905 100644 --- a/ports/boost-variant2/portfile.cmake +++ b/ports/boost-variant2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant2 - REF boost-1.75.0 - SHA512 f1aee0b7729935f0ea41aaffeeea81c9eb3870dc3f4719be6f28a007ff5a83b49ca0abce55118d3a165bb477a87a11895ed346d357a2b4b8aba57a0da8067880 + REF boost-1.76.0 + SHA512 5888d24d5ccfeea6d1e774f4388e9820a7fbc1e9899d8cee35942777df5120c959ea2cb16668ed7d5d7105f3fc42e4dbe5175ae98037a9ef80ac8f003742e50e HEAD_REF master ) diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index 4c9b060f691fd8..e4a06c5a0f7573 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-variant2", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", "dependencies": [ "boost-config", "boost-detail", - "boost-integer", "boost-mp11", "boost-vcpkg-helpers" ] diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index eb7f809b691f59..1754882e45e58c 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/vmd - REF boost-1.75.0 - SHA512 863365347baa8980e5aa9aaa2b13293167af6479eb93c0d6860634468578499662bc0cec7dbc7abc9f3f07df82341e18ab20e0de0d88c34a08adf6f949aef6a9 + REF boost-1.76.0 + SHA512 a5abe1352bce1a8358230df914ad19acc99ecb6a077248274bf2aca956a0bd0f7b9490f38891c51e3ee3323b37878c4098e39b61ea86e63f0f915a81f8553283 HEAD_REF master ) diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index 126c0a6acad1dc..125cc7fc56e08c 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-vmd", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", "dependencies": [ diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index 1f6f1765a0df23..db17a26737eccb 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.75.0 - SHA512 16d26051a92b6902e9729473802027ff6f9f301593fff7ab72c1d6ad09325e876d2acaef766bfc82befbe7e720f8d5b3036c6254a3d63181dca1625fdbfb4b2f + REF boost-1.76.0 + SHA512 eb44ee15a836d926fa24585389a7e3eb355141846401e9e9b3a69754235d8a99fa3a01107462b8e4081dff072be47222b7e52c510b2ca884dfdb65dfaff2fe1e HEAD_REF master ) diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index 8be600478f56c4..2d07b287d25c8b 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-wave", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", "supports": "!uwp", @@ -19,7 +18,6 @@ "name": "boost-filesystem", "platform": "!uwp" }, - "boost-integer", "boost-iterator", "boost-lexical-cast", "boost-math", diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index 64104479ce14ff..c95542ab5e58c7 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/winapi - REF boost-1.75.0 - SHA512 ae1cc764c2190e42f5b409fda214e6653a0b46cdb6ee4272406f6e416bf0ee8f497d4edfab45ccb52412ef1645a0a30c418e6b72e7004b3ea5421fc09bce06ce + REF boost-1.76.0 + SHA512 f16965928f0781123a17d13b0f73b1af33d22baa412f87acf4355c6f110318f424b535a559d366d61b111ed1f9eda9140e7cc357f50936e0f8049e1fd44bbe47 HEAD_REF master ) diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index baf2b9c0d22cee..804e1be14e4933 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-winapi", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", "dependencies": [ diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 043f7b9ae8440a..302004ee91da9d 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/xpressive - REF boost-1.75.0 - SHA512 09b06dc00fc7a7d0ec30454195a6ba437c45b9b3deb770b80735e726fbf808d24035fc65b6ac924043c7ba62423590ec06f54db54daa913c5127713593d7c326 + REF boost-1.76.0 + SHA512 ce0ecfde6f1bbd0dcb0765a8a4648a6978e090f5563c7828e0bd95ea35e91788d1871965c3cec4f2a6d366cd9d2ef29f75b47474a8bfeb684873d074c002e1f1 HEAD_REF master ) diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index 8a27ba751d6767..99c4899e2017e0 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-xpressive", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-conversion", "boost-core", diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index 54cb5d7c239b8e..d2a6e23f92d55a 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/yap - REF boost-1.75.0 - SHA512 3680933d091a4b89094be7d123d5813d5f7e882e4fa4d2e233623a950a0d37ec750f3697e50e9f49bfe66191ca032ab412ce40c2f25d5870f52338d7a35cafbf + REF boost-1.76.0 + SHA512 88c97e7b36748f925b2566c6308729b74419c118095de17011900497017bd3a0a445a0c29a0912da8852284b6fdf5d0e34bb63e7aa6790a9213b460ad57d1983 HEAD_REF master ) diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index 58d2c84dfac9b0..58313ddbf6a03d 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-yap", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", "dependencies": [ diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 0283a20857db3e..df3ab59c3ba7c0 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -1,2 +1,2 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - + diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index eecff5fbcf1ec8..2ea1d4d3b8f83d 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "dependencies": [ diff --git a/ports/fbthrift/CONTROL b/ports/fbthrift/CONTROL deleted file mode 100644 index d650963821926e..00000000000000 --- a/ports/fbthrift/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: fbthrift -Version: 2020.10.19.00 -Homepage: https://github.com/facebook/fbthrift -Description: Facebook's branch of Apache Thrift, including a new C++ server. -Build-Depends: openssl, zlib, fmt, gflags, glog, rsocket, fizz, folly, wangle, zstd, boost-context, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread -Supports: x64 diff --git a/ports/fbthrift/fix-sodium-target.patch b/ports/fbthrift/fix-sodium-target.patch new file mode 100644 index 00000000000000..89d32e53db647d --- /dev/null +++ b/ports/fbthrift/fix-sodium-target.patch @@ -0,0 +1,16 @@ +diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake +index c664ccbe3..3c3f1245c 100644 +--- a/build/fbcode_builder/CMake/FindSodium.cmake ++++ b/build/fbcode_builder/CMake/FindSodium.cmake +@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS) + else() + set(_LIB_TYPE SHARED) + endif() +-add_library(sodium ${_LIB_TYPE} IMPORTED) ++ ++if(NOT TARGET sodium) ++ add_library(sodium ${_LIB_TYPE} IMPORTED) ++endif() + + set_target_properties(sodium PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}" diff --git a/ports/fbthrift/fix-zlib.patch b/ports/fbthrift/fix-zlib.patch new file mode 100644 index 00000000000000..d9a185ad1ffeaa --- /dev/null +++ b/ports/fbthrift/fix-zlib.patch @@ -0,0 +1,100 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 150671504a9..7b248a0105e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,7 +106,7 @@ if(lib_only OR build_all) + find_package(fizz CONFIG REQUIRED) + find_package(fmt CONFIG REQUIRED) + find_package(wangle CONFIG REQUIRED) +- find_package(Zlib REQUIRED) ++ find_package(ZLIB REQUIRED) + find_package(Zstd REQUIRED) + # https://cmake.org/cmake/help/v3.9/module/FindThreads.html + set(THREADS_PREFER_PTHREAD_FLAG ON) +@@ -115,7 +115,6 @@ if(lib_only OR build_all) + ${LIBGFLAGS_INCLUDE_DIR} + ${GLOG_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} +- ${ZLIB_INCLUDE_DIRS} + ${ZSTD_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ) +diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in +index 69b29b948c5..e1297ed18c3 100644 +--- a/thrift/cmake/FBThriftConfig.cmake.in ++++ b/thrift/cmake/FBThriftConfig.cmake.in +@@ -28,6 +28,8 @@ else() + set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") + endif() + ++find_dependency(ZLIB REQUIRED) ++ + if (NOT TARGET FBThrift::thriftcpp2) + include("${FBTHRIFT_CMAKE_DIR}/FBThriftTargets.cmake") + endif() +diff --git a/thrift/cmake/FindZlib.cmake b/thrift/cmake/FindZlib.cmake +deleted file mode 100644 +index c15525b411f..00000000000 +--- a/thrift/cmake/FindZlib.cmake ++++ /dev/null +@@ -1,46 +0,0 @@ +-# Copyright (c) Facebook, Inc. and its affiliates. +-# +-# Licensed under the Apache License, Version 2.0 (the "License"); +-# you may not use this file except in compliance with the License. +-# You may obtain a copy of the License at +-# +-# http://www.apache.org/licenses/LICENSE-2.0 +-# +-# Unless required by applicable law or agreed to in writing, software +-# distributed under the License is distributed on an "AS IS" BASIS, +-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-# See the License for the specific language governing permissions and +-# limitations under the License. +- +-# +-# - Try to find Facebook zstd library +-# This will define +-# ZLIB_FOUND +-# ZLIB_INCLUDE_DIR +-# ZLIB_LIBRARIES +-# +- +-find_path( +- ZLIB_INCLUDE_DIRS zlib.h +- HINTS +- $ENV{ZLIB_ROOT}/include +- ${ZLIB_ROOT}/include +-) +- +-find_library( +- ZLIB_LIBRARIES z zlib +- HINTS +- $ENV{ZLIB_ROOT}/lib +- ${ZLIB_ROOT}/lib +-) +- +-# For some reason ZLIB_FOUND is never marked as TRUE +-set(ZLIB_FOUND TRUE) +-mark_as_advanced(ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES) +- +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Zstd ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES) +- +-if(ZLIB_FOUND AND NOT ZLIB_FIND_QUIETLY) +- message(STATUS "ZLIB: ${ZLIB_INCLUDE_DIRS}") +-endif() +diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt +index 681622594c9..3df0b5717db 100644 +--- a/thrift/lib/cpp/CMakeLists.txt ++++ b/thrift/lib/cpp/CMakeLists.txt +@@ -77,8 +77,8 @@ target_link_libraries( + thrift-core + rpcmetadata + Folly::folly ++ ZLIB::ZLIB + ${OPENSSL_LIBRARIES} +- ${ZLIB_LIBRARIES} + ${ZSTD_LIBRARIES} + ) + diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 62c1a7a2e2e8f0..016fac181af6a6 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -6,9 +6,12 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift - REF e184b41448dab2f462094fa005ed05269cfba3e3 # v2020.10.19.00 - SHA512 df03e1779fd3f1868ed7be21292bcd91ae65bcca591b0265a40391dde7e3b3b81d83fe7eb4ec8dd5c440be471375b8e2c8c24befefaca3ae0cab9ce10bfd362c + REF v2021.06.14.00 + SHA512 e59465adcd57722626e5a4407529b164472cde3942bd100b3d6e92c5057f88f1a8544b7181a01e05ed3077ffd2b3811b687aa6741d08aedef6b79aea02305798 HEAD_REF master + PATCHES + fix-sodium-target.patch # fixed in master + fix-zlib.patch # fixed in master ) vcpkg_configure_cmake( @@ -16,6 +19,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBISON_EXECUTABLE=${BISON} + -DFLEX_EXECUTABLE=${FLEX} ) vcpkg_install_cmake() @@ -41,7 +45,8 @@ 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/py3/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 ) vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN) diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json new file mode 100644 index 00000000000000..4e9237e2c5f6ed --- /dev/null +++ b/ports/fbthrift/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "fbthrift", + "version-string": "2021.06.14.00", + "description": "Facebook's branch of Apache Thrift, including a new C++ server.", + "homepage": "https://github.com/facebook/fbthrift", + "supports": "x64", + "dependencies": [ + "boost-context", + "boost-filesystem", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", + "fizz", + "fmt", + "folly", + "gflags", + "glog", + "openssl", + "wangle", + "zlib", + "zstd" + ] +} diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL deleted file mode 100644 index 19b03e429fffa2..00000000000000 --- a/ports/fizz/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: fizz -Version: 2020.10.19.00 -Homepage: https://github.com/facebookincubator/fizz -Build-Depends: folly, openssl, libsodium, zlib, fmt -Description: a TLS 1.3 implementation by Facebook \ No newline at end of file diff --git a/ports/fizz/find-zlib.patch b/ports/fizz/find-zlib.patch deleted file mode 100644 index 7222db04e5003d..00000000000000 --- a/ports/fizz/find-zlib.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt -index 7e3347b..76ee974 100644 ---- a/fizz/CMakeLists.txt -+++ b/fizz/CMakeLists.txt -@@ -89,6 +89,9 @@ else() - list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR}) - endif() - -+find_package(ZLIB REQUIRED) -+list(APPEND FIZZ_SHINY_DEPENDENCIES ZLIB::ZLIB) -+ - set(FIZZ_HEADER_DIRS - client - crypto diff --git a/ports/fizz/fix-zlib.patch b/ports/fizz/fix-zlib.patch new file mode 100644 index 00000000000000..88b6fabe9d727d --- /dev/null +++ b/ports/fizz/fix-zlib.patch @@ -0,0 +1,36 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index 485e38fc..471d61a5 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -87,6 +87,8 @@ else() + list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR}) + endif() + ++find_package(ZLIB REQUIRED) ++ + find_package(Libevent CONFIG QUIET) + if(TARGET event) + message(STATUS "Found libevent from package config") +@@ -246,6 +248,7 @@ target_link_libraries(fizz + ${OPENSSL_LIBRARIES} + sodium + Threads::Threads ++ ZLIB::ZLIB + PRIVATE + ${GLOG_LIBRARIES} + ${GFLAGS_LIBRARIES} +diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in +index d9918469..679b0e61 100644 +--- a/fizz/cmake/fizz-config.cmake.in ++++ b/fizz/cmake/fizz-config.cmake.in +@@ -25,7 +25,10 @@ endif() + + set(FIZZ_LIBRARIES fizz::fizz) + ++include(CMakeFindDependencyMacro) + find_dependency(Sodium) ++find_dependency(folly CONFIG) ++find_dependency(ZLIB) + + if (NOT fizz_FIND_QUIETLY) + message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}") diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 459c6a8079c170..8af6d336fdc7d8 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -3,11 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz - REF 1c40fde31b5eff8a05f928497429bffe7425b4fd # v2020.10.19.00 - SHA512 9e0de756855941c377f2a52d9b751e6ae066c8d8ae4e7a06211b2537a039e533cbc782cbce947cb703d7bd4c5cb5fb4420e71eeafdcb5f1264d788ca3eb0b76d + REF v2021.06.14.00 + SHA512 ff55f933d55031128b5355707fd025649ad90d261d91ec5f9d793433a77e63d3c2527a7f0111d6a3151667ab29f4117f96a505bcb80c1a4a99bd60346f05f4de HEAD_REF master PATCHES - find-zlib.patch + fix-zlib.patch ) # Prefer installed config files @@ -29,13 +29,7 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fizz) vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake _contents) -string(REPLACE "lib/cmake/fizz" "share/fizz" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake -"include(CMakeFindDependencyMacro) -find_dependency(folly CONFIG) -find_dependency(ZLIB) -${_contents}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake" "lib/cmake/fizz" "share/fizz") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json new file mode 100644 index 00000000000000..efc70e89783540 --- /dev/null +++ b/ports/fizz/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "fizz", + "version-string": "2021.06.14.00", + "description": "a TLS 1.3 implementation by Facebook", + "homepage": "https://github.com/facebookincubator/fizz", + "dependencies": [ + "fmt", + "folly", + "libsodium", + "openssl", + "zstd" + ] +} diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL deleted file mode 100644 index 8b31a73b67f2ba..00000000000000 --- a/ports/folly/CONTROL +++ /dev/null @@ -1,31 +0,0 @@ -Source: folly -Version: 2020.10.19.00 -Homepage: https://github.com/facebook/folly -Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows -Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr, fmt -Default-Features: zlib -Supports: x64 - -Feature: zlib -Build-Depends: zlib -Description: Support zlib for compression - -Feature: bzip2 -Build-Depends: bzip2 -Description: Support bzip2 for compression - -Feature: lzma -Build-Depends: liblzma -Description: Support LZMA for compression - -Feature: zstd -Build-Depends: zstd -Description: Support zstd for compression - -Feature: snappy -Build-Depends: snappy -Description: Support Snappy for compression - -Feature: lz4 -Build-Depends: lz4 -Description: Support lz4 for compression diff --git a/ports/folly/fix-windows-minmax.patch b/ports/folly/fix-windows-minmax.patch new file mode 100644 index 00000000000000..1fc69a43a83e5b --- /dev/null +++ b/ports/folly/fix-windows-minmax.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake +index ec2ce1a1d..16deda71c 100644 +--- a/CMake/FollyCompilerMSVC.cmake ++++ b/CMake/FollyCompilerMSVC.cmake +@@ -289,6 +289,7 @@ function(apply_folly_compile_options_to_target THETARGET) + # And the extra defines: + target_compile_definitions(${THETARGET} + PUBLIC ++ NOMINMAX + _CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions. + _CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps. + _SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps. diff --git a/ports/folly/missing-include-atomic.patch b/ports/folly/missing-include-atomic.patch deleted file mode 100644 index 54c1a48170509e..00000000000000 --- a/ports/folly/missing-include-atomic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp -index 2891c4c..7c98975 100644 ---- a/folly/portability/PThread.cpp -+++ b/folly/portability/PThread.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 3016caec974385..a2e8a436e88ac7 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -12,14 +12,14 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF 430aa0d8db79989dd56f8a0361fcb1c305618e41 # v2020.10.19.00 - SHA512 d9f6aa0f7a8aee044c01af289d71e4c80d63e40ff128ac840663e3103d19cdd0da161a0b0d106493d950b9ac9a905c5e2abf8c1970c2f16b94dd95c0d1b1943e + REF v2021.06.14.00 + SHA512 aee5adc1a44d9b193f3f41b5fc9fa7575c677d8bf27ed3a3b612a2fbe53505f82481ce78f13fb41ae3ca81ca25446426fbdfdc578f503f919b4af5abe56ad71c HEAD_REF master PATCHES - missing-include-atomic.patch reorder-glog-gflags.patch disable-non-underscore-posix-names.patch boost-1.70.patch + fix-windows-minmax.patch ) file(COPY diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json new file mode 100644 index 00000000000000..e7762e6cf923e2 --- /dev/null +++ b/ports/folly/vcpkg.json @@ -0,0 +1,68 @@ +{ + "name": "folly", + "version-string": "2021.06.14.00", + "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", + "homepage": "https://github.com/facebook/folly", + "supports": "x64", + "dependencies": [ + "boost-chrono", + "boost-context", + "boost-conversion", + "boost-crc", + "boost-date-time", + "boost-filesystem", + "boost-multi-index", + "boost-program-options", + "boost-regex", + "boost-smart-ptr", + "boost-system", + "boost-thread", + "double-conversion", + "fmt", + "gflags", + "glog", + "libevent", + "openssl" + ], + "default-features": [ + "zlib" + ], + "features": { + "bzip2": { + "description": "Support bzip2 for compression", + "dependencies": [ + "bzip2" + ] + }, + "lz4": { + "description": "Support lz4 for compression", + "dependencies": [ + "lz4" + ] + }, + "lzma": { + "description": "Support LZMA for compression", + "dependencies": [ + "liblzma" + ] + }, + "snappy": { + "description": "Support Snappy for compression", + "dependencies": [ + "snappy" + ] + }, + "zlib": { + "description": "Support zlib for compression", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Support zstd for compression", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/ports/proxygen/CONTROL b/ports/proxygen/CONTROL deleted file mode 100644 index 5b660c3df5f072..00000000000000 --- a/ports/proxygen/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: proxygen -Version: 2020.10.19.00 -Homepage: https://github.com/facebook/proxygen -Description: It comprises the core C++ HTTP abstractions used at Facebook. -Build-Depends: folly, fizz, wangle, zstd, zlib, openssl, boost-iostreams, boost-context, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread -Supports: !windows&!osx diff --git a/ports/proxygen/fix-duplicated-target.patch b/ports/proxygen/fix-duplicated-target.patch new file mode 100644 index 00000000000000..89d32e53db647d --- /dev/null +++ b/ports/proxygen/fix-duplicated-target.patch @@ -0,0 +1,16 @@ +diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake +index c664ccbe3..3c3f1245c 100644 +--- a/build/fbcode_builder/CMake/FindSodium.cmake ++++ b/build/fbcode_builder/CMake/FindSodium.cmake +@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS) + else() + set(_LIB_TYPE SHARED) + endif() +-add_library(sodium ${_LIB_TYPE} IMPORTED) ++ ++if(NOT TARGET sodium) ++ add_library(sodium ${_LIB_TYPE} IMPORTED) ++endif() + + set_target_properties(sodium PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}" diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index abe5633e20aac9..d2789572d9d96d 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_fail_port_install(ON_TARGET "Windows") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF bb2b1f2b3660fa1f15bbdff14ddba2a4ff5c43fa #v2020.10.19.00 - SHA512 8547a8c329764f8448a9f294811ef1dfcfcfa77a15fa2fdd9ab25a5f7ab8d40c9932348d3a1b16b87ba56844c13ebf918e7080f247ff7fadad7363a70e2d0fe2 + REF v2021.06.14.00 + SHA512 f5ab54514575f86897438f40a481796c34031101775b61a01581338c91686159995e4f822909e42eed4c006b2c6a6351887d469cc9df1df80711dba10cc15a19 HEAD_REF master + PATCHES + remove-register.patch + fix-duplicated-target.patch # fixed in master ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/proxygen/remove-register.patch b/ports/proxygen/remove-register.patch new file mode 100644 index 00000000000000..18a930649c3a43 --- /dev/null +++ b/ports/proxygen/remove-register.patch @@ -0,0 +1,12 @@ +diff --git a/proxygen/lib/utils/gen_perfect_hash_table.sh b/proxygen/lib/utils/gen_perfect_hash_table.sh +index a870b2d67..2dec9c5a1 100755 +--- a/proxygen/lib/utils/gen_perfect_hash_table.sh ++++ b/proxygen/lib/utils/gen_perfect_hash_table.sh +@@ -35,6 +35,7 @@ function generate_perfect_hash_table { + LC_ALL=C sort -u ${1?} | awk "${6?}" - "${5?}" | \ + ${8:-gperf} -m5 -D --output-file="${7?}" + perl -p -i -e "s/\/\*FALLTHROUGH\*\//FOLLY_FALLTHROUGH;/g" "${7?}" ++ perl -p -i -e "s/register//g" "${7?}" + + # Here we delete one of the comment lines gperf adds to the top of the file. + # i.e. /* Command-line: .../gperf -m5 --output-file=... */ diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json new file mode 100644 index 00000000000000..2e8dd6606b95db --- /dev/null +++ b/ports/proxygen/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "proxygen", + "version-string": "2021.06.14.00", + "description": "It comprises the core C++ HTTP abstractions used at Facebook.", + "homepage": "https://github.com/facebook/proxygen", + "supports": "!windows", + "dependencies": [ + "boost-context", + "boost-date-time", + "boost-filesystem", + "boost-iostreams", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", + "fizz", + "folly", + "openssl", + "wangle", + "zlib", + "zstd" + ] +} diff --git a/ports/quantlib/CONTROL b/ports/quantlib/CONTROL deleted file mode 100644 index 50c006335b6b38..00000000000000 --- a/ports/quantlib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: quantlib -Version: 2019-09-02 -Description: The QuantLib C++ library -Homepage: https://www.quantlib.org/ -Build-Depends: boost-accumulators, boost-algorithm, boost-any, boost-array, boost-assert, boost-assign, boost-atomic, boost-bind, boost-config, boost-core, boost-date-time, boost-dynamic-bitset, boost-format, boost-function, boost-functional, boost-iterator, boost-lexical-cast, boost-math, boost-multi-array, boost-multiprecision, boost-optional, boost-preprocessor, boost-random, boost-serialization, boost-signals2, boost-smart-ptr, boost-thread, boost-tuple, boost-type-traits, boost-ublas, boost-unordered, boost-utility diff --git a/ports/quantlib/fix-mac-build.patch b/ports/quantlib/fix-mac-build.patch new file mode 100644 index 00000000000000..a114f96e7d56ae --- /dev/null +++ b/ports/quantlib/fix-mac-build.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62ab08a115..2b383c1dd5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,10 @@ cmake_minimum_required() + + project(QuantLib) + ++if(APPLE AND NOT CMAKE_CXX_STANDARD) ++ set(CMAKE_CXX_STANDARD 11) ++endif() ++ + include(CTest) + include(${CMAKE_CURRENT_LIST_DIR}/cmake/quantlib.cmake) + diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index 9479252ec40daf..f7cf9b7770da75 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF f09141b5cce9134c0bcdbaf36e81359e6ba30705 - SHA512 d4b19d33594a7072a0d90b7eac3d74fb27c526269713a9223b84c0451b1e06a58f0c98350305d68a55086d1971260ff249049112aaadea59397ec195a3291490 + REF QuantLib-v1.22 + SHA512 279c2e9273dd0fbc03d19ac19814e8a3b5544545cc1441982232f89bd313fe76b6e252dbcae8a3d146ecc4f1d1e64632ac412096b89da882ba879a66776fdb91 HEAD_REF master PATCHES disable-examples-tests.patch + fix-mac-build.patch # fixed in next release ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" USE_BOOST_DYNAMIC_LIBRARIES) @@ -14,13 +15,6 @@ set(QL_MSVC_RUNTIME ${VCPKG_LIBRARY_LINKAGE}) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -# TODO: Fix it in the upstream -vcpkg_replace_string( - "${SOURCE_PATH}/ql/userconfig.hpp" - "//# define QL_USE_STD_UNIQUE_PTR" - "# define QL_USE_STD_UNIQUE_PTR" -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json new file mode 100644 index 00000000000000..ee732abc26e96f --- /dev/null +++ b/ports/quantlib/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "quantlib", + "version": "1.22", + "description": "The QuantLib C++ library", + "homepage": "https://www.quantlib.org/", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-any", + "boost-array", + "boost-assert", + "boost-assign", + "boost-atomic", + "boost-bind", + "boost-config", + "boost-core", + "boost-date-time", + "boost-dynamic-bitset", + "boost-format", + "boost-function", + "boost-functional", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-multi-array", + "boost-multiprecision", + "boost-optional", + "boost-preprocessor", + "boost-random", + "boost-serialization", + "boost-signals2", + "boost-smart-ptr", + "boost-thread", + "boost-tuple", + "boost-type-traits", + "boost-ublas", + "boost-unordered", + "boost-utility" + ] +} diff --git a/ports/symengine/CONTROL b/ports/symengine/CONTROL deleted file mode 100644 index 4e829ba5ba3090..00000000000000 --- a/ports/symengine/CONTROL +++ /dev/null @@ -1,30 +0,0 @@ -Source: symengine -Version: 2020-05-25 -Description: SymEngine is a fast symbolic manipulation library -Homepage: https://github.com/symengine/symengine -Build-Depends: boost-math, boost-random -Default-Features: integer-class-boostmp - -Feature: arb -Description: Build with arb -Build-Depends: arb - -Feature: flint -Description: Build with flint -Build-Depends: flint - -Feature: mpfr -Description: Build with mpfr -Build-Depends: mpfr - -Feature: integer-class-boostmp -Description: Use Boost.multiprecision integer class -Build-Depends: boost-multiprecision - -Feature: integer-class-flint -Description: Use flint integer class -Build-Depends: flint, gmp - -Feature: tcmalloc -Description: Build with tcmalloc -Build-Depends: gperftools diff --git a/ports/symengine/fix-build.patch b/ports/symengine/fix-build.patch new file mode 100644 index 00000000000000..5087428e60f7f7 --- /dev/null +++ b/ports/symengine/fix-build.patch @@ -0,0 +1,13 @@ +diff --git a/symengine/mp_boost.cpp b/symengine/mp_boost.cpp +index db20930c4..f3997707e 100644 +--- a/symengine/mp_boost.cpp ++++ b/symengine/mp_boost.cpp +@@ -279,7 +279,7 @@ unsigned long mp_scan1(const integer_class &i) + if (i == 0) { + return ULONG_MAX; + } +- return find_lsb(i, int_<0>()); ++ return find_lsb(i, {}); + } + + // define simple 2x2 matrix with exponentiation by repeated squaring diff --git a/ports/symengine/portfile.cmake b/ports/symengine/portfile.cmake index d61271d6806802..a0677af8a2dcbc 100644 --- a/ports/symengine/portfile.cmake +++ b/ports/symengine/portfile.cmake @@ -1,17 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO symengine/symengine - REF 4f669d5954977e86f4da0f53cb5110d2eb6320b6 - SHA512 091ebc83240d3823fb73e0f65f80732d2a85e55f19c8e1a3d1435f05cfa0d1b95d893e8a3c432e1698953a35c56a6af78044ee59db04f03706cf33e0798a02c7 + REF v0.7.0 + SHA512 fd3198bc4a05ca2b9b8a58039cc21af65b44457f295362a1a9b8dbf9c6e3df5186c0c84b289bc9fe85d9efd5ac1a683f6b7ba9a661fb6d913d6ceefb14ee2348 HEAD_REF master + PATCHES + fix-build.patch ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - arb WITH_ARB - flint WITH_FLINT - mpfr WITH_MPFR - tcmalloc WITH_TCMALLOC + FEATURES + arb WITH_ARB + flint WITH_FLINT + mpfr WITH_MPFR + tcmalloc WITH_TCMALLOC ) if(integer-class-boostmp IN_LIST FEATURES) diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json new file mode 100644 index 00000000000000..4768ffb5660858 --- /dev/null +++ b/ports/symengine/vcpkg.json @@ -0,0 +1,52 @@ +{ + "name": "symengine", + "version": "0.7.0", + "description": "SymEngine is a fast symbolic manipulation library", + "homepage": "https://github.com/symengine/symengine", + "dependencies": [ + "boost-math", + "boost-random" + ], + "default-features": [ + "integer-class-boostmp" + ], + "features": { + "arb": { + "description": "Build with arb", + "dependencies": [ + "arb" + ] + }, + "flint": { + "description": "Build with flint", + "dependencies": [ + "flint" + ] + }, + "integer-class-boostmp": { + "description": "Use Boost.multiprecision integer class", + "dependencies": [ + "boost-multiprecision" + ] + }, + "integer-class-flint": { + "description": "Use flint integer class", + "dependencies": [ + "flint", + "gmp" + ] + }, + "mpfr": { + "description": "Build with mpfr", + "dependencies": [ + "mpfr" + ] + }, + "tcmalloc": { + "description": "Build with tcmalloc", + "dependencies": [ + "gperftools" + ] + } + } +} diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL deleted file mode 100644 index 2e7e17686eaa5c..00000000000000 --- a/ports/wangle/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: wangle -Version: 2020.10.19.00 -Port-Version: 1 -Homepage: https://github.com/facebook/wangle -Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context -Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way. diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index f63ae8781eb46b..dca45cfe4502b1 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 4bf3896ad5e938a01ba20efaf1ea59317d846fb2 # v2020.10.19.00 - SHA512 1c21199225ebfe9a95391c2bb607412ebadc7aac326373e30dc9d49223a2437b382b4c3160fb2147a505bc2182f03f651c95f7c67f916e336ac81af76884f5fa + REF v2021.06.14.00 + SHA512 15fd2c9515ec3d0c3293a8f96d01d3e91e2ef82694d592aae6573648957f691a7da5d7c2aef7391a827a67e2f58fef7668778e0f0323aac11c5b16a1ba889cc3 HEAD_REF master PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json new file mode 100644 index 00000000000000..c499e71f04ece4 --- /dev/null +++ b/ports/wangle/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wangle", + "version-string": "2021.06.14.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", + "dependencies": [ + "boost-context", + "boost-filesystem", + "boost-regex", + "boost-system", + "boost-thread", + "double-conversion", + "fizz", + "folly", + "glog", + "libevent", + "openssl" + ] +} diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index f863d8811095a1..38e7b2671efc16 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.75.0", + $version = "1.76.0", $portsDir = $null ) @@ -27,12 +27,6 @@ else # Clear this array when moving to a new boost version $port_versions = @{ #e.g. "asio" = 1; - "asio" = 1; - "python" = 3; - "context" = 3; - "concept-check" = 2; - "regex" = 2; - "json" = 1; } $per_port_data = @{ @@ -84,9 +78,9 @@ function TransformReference() [string]$library ) - if ($per_port_data[$library].supports) + if ($per_port_data.Contains($library) -and $per_port_data[$library].Contains('supports')) { - @{name="boost-$library"; platform=$per_port_data[$library].supports} + @{name="boost-$library"; platform=$per_port_data[$library]['supports']} } else { @@ -107,22 +101,17 @@ function Generate() New-Item -ItemType "Directory" "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null $controlLines = @{ name="boost-$PortName"; ` - "version-string"=$version; ` + "version"=$version; ` dependencies=$Depends; ` homepage="https://github.com/boostorg/$Name"; ` description="Boost $Name module" ` } - if ($port_versions[$PortName]) + if ($port_versions.Contains($PortName)) { $controlLines["port-version"] = $port_versions[$PortName] } - elseif ($NeedsBuild) - { - # This can be removed on next update; this is used to track the host dependencies change - $controlLines["port-version"] = 1 - } - if ($per_port_data[$PortName]) + if ($per_port_data.Contains($PortName)) { $controlLines += $per_port_data[$PortName] } @@ -150,8 +139,8 @@ function Generate() " SHA512 $Hash" " HEAD_REF master" ) - $patches = Get-ChildItem $portsDir/boost-$PortName/*.patch - if ($patches.Count -eq 0) + [Array]$patches = Get-Item -Path "$portsDir/boost-$PortName/*.patch" + if ($null -eq $patches -or $patches.Count -eq 0) { } elseif ($patches.Count -eq 1) @@ -227,7 +216,10 @@ function Generate() } $portfileLines += @("") - $($portfileLines -join "`r`n") | out-file -enc ascii "$portsDir/boost-$PortName/portfile.cmake" -NoNewline + Set-Content -LiteralPath "$portsDir/boost-$PortName/portfile.cmake" ` + -Value "$($portfileLines -join "`r`n")" ` + -Encoding UTF8 ` + -NoNewline } if (!(Test-Path "$scriptsDir/boost")) @@ -318,27 +310,19 @@ foreach ($library in $libraries) pushd $unpacked try { - if ($IsWindows) - { - $groups = $( - findstr /si /C:"include ).*", "`$1" ` - -replace "/|\.hp?p?| ","" } | group | % name | % { + -replace " *# *include *[<`"]boost/([a-zA-Z0-9\._]*)[/>`"].*", "`$1" ` + -replace "/|\.hp?p?| ","" + } | group | % name | % { # mappings Write-Verbose "${library}: $_" if ($_ -match "aligned_storage") { "type_traits" } @@ -346,9 +330,9 @@ foreach ($library in $libraries) elseif ($_ -eq "type") { "core" } elseif ($_ -match "concept|concept_archetype") { "concept_check" } elseif ($_ -match "unordered_") { "unordered" } - elseif ($_ -match "cstdint|integer_fwd|integer_traits") { "integer" } + elseif ($_ -match "integer_fwd|integer_traits") { "integer" } elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior|compressed_pair") { "utility" } - elseif ($_ -match "^version|^workaround") { "config" } + elseif ($_ -match "^version|^workaround|^config|cstdint|cxx11_char_types|limits") { "config" } elseif ($_ -match "enable_shared_from_this|shared_ptr|make_shared|make_unique|intrusive_ptr|scoped_ptr|pointer_cast|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" } elseif ($_ -match "iterator_adaptors|generator_iterator|pointee") { "iterator" } elseif ($_ -eq "regex_fwd") { "regex" } @@ -358,7 +342,6 @@ foreach ($library in $libraries) elseif ($_ -eq "circular_buffer_fwd") { "circular_buffer" } elseif ($_ -eq "archive") { "serialization" } elseif ($_ -match "none|none_t") { "optional" } - elseif ($_ -eq "limits") { "compatibility" } elseif ($_ -match "cstdfloat|math_fwd") { "math" } elseif ($_ -eq "cast") { "conversion"; "numeric_conversion" } # DEPRECATED header file, includes and elseif ($_ -match "polymorphic_cast|implicit_cast") { "conversion" } @@ -373,7 +356,9 @@ foreach ($library in $libraries) elseif ($_ -eq "numeric" -and $library -notmatch "numeric_conversion|interval|odeint|ublas") { "numeric_conversion"; "interval"; "odeint"; "ublas" } elseif ($_ -eq "io_fwd") { "io" } else { $_ } - } | group | % name | ? { $_ -ne $library } + } | group | % name | ? { + $_ -ne $library + } #"`nFor ${library}:" " [known] " + $($groups | ? { $libraries_found -contains $_ }) @@ -467,23 +452,26 @@ if ($libraries_in_boost_port.length -gt 1) { $boostDependsList = $libraries_in_boost_port | ? { $_ -notmatch "boost-mpi" } @{ - name="boost"; - "version-string"=$version; - "port-version"= $port_versions.boost ? $port_versions.boost : 0; - homepage="https://boost.org"; - description="Peer-reviewed portable C++ source libraries"; - dependencies=$boostDependsList; - features=@( + name = "boost"; + "version" = $version; + "port-version" = $port_versions.Contains('boost') ? $port_versions['boost'] : 0; + homepage = "https://boost.org"; + description = "Peer-reviewed portable C++ source libraries"; + dependencies = $boostDependsList; + features = @( @{ - name="mpi"; - description="Build with MPI support"; - dependencies=@("boost-mpi"); + name = "mpi"; + description = "Build with MPI support"; + dependencies = @("boost-mpi"); } ); - } | ConvertTo-Json -Depth 10 -Compress | out-file -enc ascii $portsDir/boost/vcpkg.json + } ` + | ConvertTo-Json -Depth 10 -Compress ` + | Out-File -Encoding UTF8 -FilePath "$portsDir/boost/vcpkg.json" & $vcpkg format-manifest "$portsDir/boost/vcpkg.json" - "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" | out-file -enc ascii $portsDir/boost/portfile.cmake + Set-Content -LiteralPath "$portsDir/boost/portfile.cmake" ` + -Value "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" ` + -Encoding UTF8 ` + -NoNewline } - -return diff --git a/scripts/boost/post-source-stubs/json.cmake b/scripts/boost/post-source-stubs/json.cmake index 698c7060a32e62..bdc751886f89f7 100644 --- a/scripts/boost/post-source-stubs/json.cmake +++ b/scripts/boost/post-source-stubs/json.cmake @@ -3,5 +3,6 @@ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "import ../../config/checks/ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "\n /boost//container/off" "") vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "import ../config/checks/config" "import build/config/checks/config") +vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "..//check_basic_alignas" "..//..//..//check_basic_alignas") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") diff --git a/scripts/boost/post-source-stubs/math.cmake b/scripts/boost/post-source-stubs/math.cmake new file mode 100644 index 00000000000000..fcbdd58149f1a2 --- /dev/null +++ b/scripts/boost/post-source-stubs/math.cmake @@ -0,0 +1,6 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "import ../../config/checks/config" "import config/checks/config") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "check-target-builds ../config//has_gcc_visibility" "check-target-builds ../has_gcc_visibility.cpp") + +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/") diff --git a/versions/a-/avro-cpp.json b/versions/a-/avro-cpp.json index 51e35c874836fc..0fb40249df62a3 100644 --- a/versions/a-/avro-cpp.json +++ b/versions/a-/avro-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecafbb456636115f10c5670a8bb484181c133d89", + "version-date": "2021-06-01", + "port-version": 0 + }, { "git-tree": "e6253ca701d576b97c1625beeb8a1767eb73bae4", "version-string": "1.9.2", diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index f916e3c4f3e357..91997673a2de26 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94824d664d1b512dd44c3c84652b59da7726273a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5b1b9c1e8dbb75740b1795ae712e8a4612e91c58", "version-string": "1.75.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index 04901523949df1..d4abb0b559e95d 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6ce23e02aaf8b595e852e9746677fa7f85819ca", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c720beaff3f3325f63ed3c0d76bfce956e2d9442", "version-string": "1.75.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index da2cad1dca9ba7..53a6ac2c0819c7 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b28cfbc210773962783f57f6526678f1085be471", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9f77d89d4c76cf998be2d4f15aa922e04f233f1c", "version-string": "1.75.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index 54e0c539b4771b..c548b6c62c022c 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20631fecfd4ef3388bcaca6a3491d27b23bde42d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c78437716768273f86dc2f9132d865a0f44a0971", "version-string": "1.75.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index 6a3a3ec2cf83c2..2f0eb1855c5e42 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bea67607788bd73e3c83b93848a507090f886b7c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5cc33df23211b2d4a2ed7b0b563140ddd74a7358", "version-string": "1.75.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index 8000bfd27b1527..1043fdf4e953d1 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c422367cb9f7a8de0fcbf1809e1a2cab1983bce9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "43233c66944ac53a423bba45a46708a308d786e3", "version-string": "1.75.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index a91b00d33b2729..38aa1d4aef9d52 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d756c428b49e3aed8ce71c1d0b946426e929ef8a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "3393715b4ebe30fe1c3b68acf7f84363e611f156", "version-string": "1.75.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index 8b0b744625abcf..1ee54c914b441c 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b026e0722c90b595f8125caab74275b68dcd81f9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "593134d9603cdcd0232608aea11c4969df7f5b1f", "version-string": "1.75.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index 182248dc4f9017..be30f33fed6b10 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfe27152cb82633d279f5c55b3eb9ba3b454e23e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b0eb6bd0f609a494f58910e9f5c640144d5f8890", "version-string": "1.75.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index 2ee59827ce49fe..f3d48090a1a0dc 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d135f2fabb815ef2c643e71db48e227494aa3dd", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cf5aa1fd8b53f127b259d919c0bbf4659d3196e0", "version-string": "1.75.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index 765ede68ba247c..afb682e39ff2b1 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a01b028c11f40a89e1f0157f97e866ed4d53046", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ca2e28851246c3fcbba2e8c5b36ba2b1e43587a7", "version-string": "1.75.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index b7822f37ccbb75..bf814c60da97a8 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e622ce41f16af974c759e51dd9a250b054b3a71", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "110fc6710128cce06256143e5c2df83bf3060a42", "version-string": "1.75.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index aa3cfb2628691b..adc0b9f7b85de2 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61e468bd018412606e863d2b43d9b01c54205ba8", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7f76365f342942ba11c0c1352434d980dc905f13", "version-string": "1.75.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index fa4098f6af9fc6..92397aedc80356 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9852214af239e8f5f34ba4299ac07b5e207f01da", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "23fe79b0d84dee32f51951fa275a5949e1188930", "version-string": "1.75.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index 311c0cc4d7f9b3..0d7578bab4845c 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcf85566e4489a3d73496650c2ae9481ff3640ef", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b3714023e5d74d66c24ef7aad21acf08146cb200", "version-string": "1.75.0", diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index 8fbd1de76d96a0..2c9f8fb1e4b7f3 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06fb2597b509bc3d29528cb737c46db0ee09ecdc", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cda5675366367789659c59aca65fc57d03c51deb", "version-string": "1.75.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index 412e344161d8d3..34cca0afd07914 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "805aad1fd978317024fd94885e2cfde0b90af4ef", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "37841dcc219f46d503d6c8d6710e759583403020", "version-string": "1.75.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index f7e82f958e5db1..a8e62830292a1c 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6c3818b3fbea8e53859becf5f7a80ab8e583a85", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5dc46166c76c1f47d2d6dd9ee3e2f5287b81fff0", "version-string": "1.75.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index 61c6ba3c590e16..05000084115e7c 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a840275c02416548a8fa29b9d6170cb0a6e14680", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ca82ca1b9c1739c91f3cf42c68cee56c896ae6bd", "version-string": "1.75.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index 49df2775691a98..ca606953d67d27 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8f8aa1976367c2a674b1a8a91ec5e2ceee25a4c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "bf472c23d29c3d80b562c43471eb92cea998f372", "version-string": "1.75.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index e5995c4e89f8cb..2da6fb4ca8a376 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d24b325327cadb5031964d839a0c89ca482d87ad", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5d351bf7c795d3dd8437d2beed167bd3cd66e10b", "version-string": "1.75.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 5b8f1d427c8176..57b42e3d475a14 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7543f135833a2b698617f25a5206dd4194fe01bb", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "73ede4d1c06f12b1162f39e0b03935cc429c763a", "version-string": "1.75.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index f97dcb6b6192e9..6a3914a3853c10 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b8c36f8582d262cc3c02dc91e98309dd53b5a4b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "caa424eb6255cef5c6b00c3d9f1b7b38c9b84b60", "version-string": "1.75.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index bdffee7bec2318..339724897c4afb 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a18dc435cbe0aa35d32830fbe85d7d5ab0b71bf0", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9f366dd9e7f48c0cbf16725eff9b035ed7ff2d5a", "version-string": "1.75.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index 7cf739e9b822ea..b12a031b753a8a 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d13b694428c83a3f00302d0a4af2d2c457f13f05", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5c71e3bd86d4e105b3ec7722e5f1468a50ad6fb5", "version-string": "1.75.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index 54c24b14d77399..03ec7ef2090feb 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f72d1f923bbbf99709e9cbaf54f36b7c2d22d169", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "20a19f6ece37686a02eed33e1f58add8b7a2582a", "version-string": "1.75.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index 692a304edc6852..f00bc267b98ddc 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55c94396b67927007f75ce08b2acc2b9adc908e5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cb03de5030c0a5c3b49eff0acb5b363156c458ba", "version-string": "1.75.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index e0c61519093a0b..a77f8efe666668 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fe20c2b3573e82f0db30917b005310bc8697f88", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "2123dd1b276ae094358dc982c1f37661d0f38e04", "version-string": "1.75.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index 0c84cc46d92141..b3f8af42036c7a 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9fb53c9bd706bc62d747a6e19e7d0639da9805d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d85306a89ba8e94f3f9ce92dcff832b54b6fe36c", "version-string": "1.75.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index a31abe162c0d72..7f7d43699c327e 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47a2624a239c59fd89846f7b24fc3b108b31e82b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7aa83d25af20b0a43ab00bc3e00a16ab41bd45d4", "version-string": "1.75.0", diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index fb255c7c0c83d6..6697d99353ed4d 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69e27a71e0cacff0f2a9b005f03bc6262fe97210", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "96744251f025f9b3c856a275dfc338031876777b", "version-string": "1.75.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index bb21663e21f0e7..fd55ed1b7e57ac 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b04bd18cc23d270ccaf152f5d28d5948ca69a664", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d3a8b7568bf78bb6d894cfbf857dee96be2298b9", "version-string": "1.75.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index 04f10d446a162a..a8f5f199bbd1b8 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0d3d3b2abd89405fba3564e8db5e05a02fb2902", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "8616ee67880d16f75306371c1c1be70f8df9a189", "version-string": "1.75.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index 2ab901a183e08b..45e4a268e7f554 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c191f1b591ce4455f933fa254ca32dfa5796058d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "4c89bc4f6b5208fc931ba4d79223ad085bb4490a", "version-string": "1.75.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index 3d6d792165fb4d..5dc5968a1ce35c 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa0a09700d91a3cd3bf1fbf6b8463e20ede77053", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "913ecf461f245ac3467948fdddf49ce4b6f1b6ff", "version-string": "1.75.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index 8843076c5654d2..fc78d022445ba7 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9b109cf5a3f708a5036ddeee8b58676357b3db9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5bc8081de24231b39f115cbc347055f2d71c151d", "version-string": "1.75.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index 36731112625790..b26dbff27f8211 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9265c46ce355c8470fa5bf8941b59dd27428d92e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "58be75cc63e0e3e34cf5e38841e7a9b397ff6c0f", "version-string": "1.75.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index fca664ca7cc617..06bb8dcdfa2038 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "476c374b6a92402048db19b98376eff8b3e05782", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "dee29c76a897b9430f109238464d04d1a892b2c5", "version-string": "1.75.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index ffd3e94757445a..e5dec6f11b9c26 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e0fdd6589d7f0f04406efec82efcec315fa337e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "0858efd566bcda59a52b99a57203ef4d6fbfe1cf", "version-string": "1.75.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index 73adda35f84b7d..e398345e83b313 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "352c9212fd097f4c147caf0dab9cec05cd47aa1a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9ebb4d57edeea6e294e0974f2fa68c61267d7c1e", "version-string": "1.75.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index 1ea97fc7c2cdb5..b7af3e73873dad 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f33a85bf7a578c9659b4bccd02296568bae3f3e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "a6cb5686b38457ecccc96480f5268772bef6a6fb", "version-string": "1.75.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 037a6c1f982cd2..eb9a5ce127640e 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad37e24486926b336f2ee015a3fa88cc8f8a2490", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7698d7fd2822972ca04cfe1c9778c9f04fb56c3e", "version-string": "1.75.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index 84a3d600a332df..cc58bf42acdd02 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e84b797bddccd2a46e818d4364f71810f687b117", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "f74e3af1a511361a97810fef8ed7aedbfff6706e", "version-string": "1.75.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index cf200027f501f1..58cb0d00bfbcc2 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6168fcf7f513e57e8f01f5c0ab19f446a66cd57", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "4a2c7b6ae8f3faad83ee354e4bf9023ab9e7d1c1", "version-string": "1.75.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index 5e380e53277cbd..a0b8d11cf2fcc1 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7de8c6c9ed0908a5d85b3dd739d27922fa213931", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1d40cdf7af5bd875fe73020d7efa5e7a61ea07a1", "version-string": "1.75.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index e8c0565e0ac4d2..b1f28b1fb07cf1 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d323694c269cffa88a705e2eec5339c1dd391d3", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1e6fa6894d7d35173abae2aab50e772fe6219340", "version-string": "1.75.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index d78c07d7071449..8bb123d97a9aa9 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e71dd1ba560f6dfcfefa262a5c6762a15b94e3d4", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "2dac60f2be18293521f7b65f6b47cd1f94760491", "version-string": "1.75.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index a815ee5961010d..41ac721d97992f 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c14b7885fb22225d265897b942a090ee43bcc1c3", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "699b83c06257c66df62492390eacfd6b1608b9c0", "version-string": "1.75.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index 94fd4bab003972..469ac151c7cf69 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55d762dd0711b68ad1e494dc5d7f3e88ba6b6889", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1e41f17ca0e3d7b6918bb37a2918cee5399c0b39", "version-string": "1.75.0", diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index 0f60a30c5ec458..5053b07d52a525 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7901583dc54be5f2453147da8fc772c5295f3ccd", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b9b42d92244a3cbc265a562cee71f792997fe5a9", "version-string": "1.75.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index 065ff002b88fec..928b7b07867675 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcdf8ce8a1b3b6563bc1aae0ef60afaaac061f89", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ab55551ec17e50829409f586a5a34adf5a50ae5c", "version-string": "1.75.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index 189ceaf26e3e48..15433f00b380f2 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bc8af27f9d16f09f9c17a179abdf230d39a24eb", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6f5fab9a08a313e03867147bf73ba966873039b7", "version-string": "1.75.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index 782e1d5de7540b..96f0dbfdabc863 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70080f8e245f5ba2caa54b447f946bee8c998ec8", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ed49dae8b85d0e4833c06dee49367ea99083cb8b", "version-string": "1.75.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index 163716e558d517..511c3d1539c271 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77a69013cb4d850223122dff3bff12318a140d82", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "de70ce0d1500df1eda3496c4f98f42f5db256b4a", "version-string": "1.75.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index 35135b8b445639..48908e0498c2b1 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e0c78814b07fcfe58e421f651bda285081dcd48", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1ad6903e562cc3464bbb35bcef49019bdfc81c5c", "version-string": "1.75.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index 68ff4e08f36eba..5f1944f771b3c8 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c7ee56a1456d43b67e772976c40eab0f96e10e8", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "f397df607d232f6a241571ee0b105bcdac4eb6d9", "version-string": "1.75.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index e36f203d997b06..a691948cfcd569 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c63e249209fcddec92063bb59266892ed6bfab38", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "138cc5e30e17278c8247882027053e5e55983edb", "version-string": "1.75.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index 5833ed32ae15d9..2ca5c987ab6a0f 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33d8fc8dd5a42e12f4d1cd0989c147a674d5c6f1", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7bf3407372f8fc2a99321d24a0e952d44fe25bf3", "version-string": "1.75.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index ec3b267e73e7dd..348cd0d1e2b618 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0909e271c34f98d1e5857091ce21b16e1d165e05", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1f0088410d7f47204c0e74c97aff4bde77c75a9c", "version-string": "1.75.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index 9bc957fc342f84..69f4d6577466fa 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "504d724993ea74e0bc0b17b4101539cd603460d5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9796d7066c411c9e540919d37456d79e54cdc2cc", "version-string": "1.75.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index 7b3ab3d307732f..b09be2c5fda44a 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7a48d6f43ab6578d7f25969c0aaf0c385036c8a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cece09f870caaed77b754156a1f568ee05c9e653", "version-string": "1.75.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index 3cbfcd3ed0aaa3..f1bd8dd4251949 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63ee28b3c29f04ba5d62bb8d0c9ab8e4b051dd1c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c3c314ac0cc6971f58c7dd9fc1708caaa059b7ae", "version-string": "1.75.0", diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index f1202177d2671f..429812e0a37fc3 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5d414a21f12b33a083b6595ef485d21e6e4df76", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b6f4d7fa7cc1bdf8c780bf165d4c4d1fcbb337ff", "version-string": "1.75.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index a4ed70008ff562..378637e5a2d6c9 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "966a986af9237664ffc3b35384ccbe006b83e196", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "8f6324928977e29a23540dcd6c8c3ec74984362d", "version-string": "1.75.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index 06d2d473219c5f..b4821984049c25 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e9c798dfb0bba3dd3833464354ff492e735231e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d7fd32b69bcf0f1037f2fa6a136b8a48622f32f6", "version-string": "1.75.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index 229eeebf4ff46b..7bd52febbd9ccc 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76b51eadd7efd7d81d23c39d126a50abd1cb82e5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "57d2fc3f09cab641387b6e152fb5df483d8944a2", "version-string": "1.75.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index acbbc4fa320d22..66c9bc446ac270 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22166eccd3d3b536062ee1648d147ee357a058ed", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b844f385ea73f91499660ae8626dc9cb01548988", "version-string": "1.75.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index c537db15de60a8..d7baec9dfaa3f6 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e1221d665804faaebfc9c5b91c89a6b3f66f91d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "87961d58edfbf7464239d5ca351243d88ae9adf7", "version-string": "1.75.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index 971463989d6eec..5abc466097af6a 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee745d1ee8b0842a39a46d7830655c765b438bca", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "39dcf6bd80995585db199c583ab79be17711948c", "version-string": "1.75.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index ea2008d7057c10..413344d928d060 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "448de1ada43d74ffd7b4511c34319a5cc25bbec0", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c64c9882971998a3d0330928f7e8c48a3e584658", "version-string": "1.75.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index 865769be3b67dd..4b3a52a0e436d5 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44ca94c8ff9e03288a08adedfbccd61541867d75", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "06142d599d8265c27584b59a352f07264b5137c7", "version-string": "1.75.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 67ffb430dc2550..7ba71e16edd113 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "95cad6d5f2d9a858aacbb3b2bc0e3a0db4b06b4b", - "version-string": "1.75.0", - "port-version": 10 + "git-tree": "e0f858222eaf2c58a7270d10d649bc88e2e149b6", + "version-string": "1.76.0", + "port-version": 0 }, { "git-tree": "c475b268ac42e886acfdc783944e1e3a988b0ac8", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index 5e36bc27d777b8..e8cebf7bebc3be 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6563abd760c2241004acc0da699152ab8c4b294", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ffdab61d5b17d4a25826bc539dba867ed992b276", "version-string": "1.75.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index 21eee097b35d61..77668299003d03 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8aa7b3c86aa66c1629ac5cf5ce4e4b6a4a95b61e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d70457824e1e3084281f6841211641a548a2ea56", "version-string": "1.75.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index d06d6d81dc22f5..57f691cb92834c 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21a8e85d8e04d477e9127f80d78b6abf1d130651", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "e3cf57eeb5bb24cb4e1d9743f0aae9f327a155d5", "version-string": "1.75.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index 9a7aa904760c7a..59a9f4267bd220 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "250327ba168c480f1f530792a14e87cd4d13b63d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "3c6847d1a221443ccdfefc9a8618c928af1137da", "version-string": "1.75.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index 12e907338d44e5..4e4dcbbd53d885 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba54ee9c431c0c499935a7d7bc8a255cd5e9cac7", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cf4e64e71731c3fc1db88a352aa9727082f80626", "version-string": "1.75.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index 1f4fd3c26e0244..e705e3ca788dde 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc5acbb8051e16c1e48d8e82ea0fac48c6024287", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "44693eca97005d75a9871243de567016b1716a56", "version-string": "1.75.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index a57ae6486c167e..d0fa4e3195257f 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1e0c81cdc2adb33d2963722016c0b13a15055f7", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6de9dddaca9c32451cad1f9ab60a27ecdcb345e6", "version-string": "1.75.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index 82418b10f48dd5..aec911444d9378 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55ee6b85fe02f7875374cb3f78a427365ba7beb5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6d5a003c951b208d27de281020c305977859eedb", "version-string": "1.75.0", diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index 1b327fde828721..79290c812354cf 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b1a6083440b08b8b266524dac6a8aa200e417dc", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "641c12e14ae3d025d4c55e5de19b00a65f916dcf", "version-string": "1.75.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index 4fe4b9b3cd8cbc..290443486eef2d 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ab3a3a915ad6bff1aa094641e7471e5ddc8a11d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9de299c79ee96b9090a3a27cbbaee41b62455003", "version-string": "1.75.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index 2fc3ae4f86b6fa..c0d98ace1af294 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89c69f304356b50d3e4e58155bb08009629de385", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "92ab84d7e417a2d14c7358145cf83af87e7c85c0", "version-string": "1.75.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index 10afad5dc6d61c..00a11e946e0542 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a824aac647806d7f8d03ea8ec715faea895d54a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "bc9caf056bf385d810fd7cea00b6ef7a646edee6", "version-string": "1.75.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index a98413cf640b91..3944d0a8183b07 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ea91b17815f03d2702bf3721f8002cb8d64cb85", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "078abc59d831a640ca9ab5391f63e8aa8a95bf99", "version-string": "1.75.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index ef367d39bb4b80..746e6f6c960d9c 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e57e6544326fe84416a0060a9d93723d05b9bb54", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "dec159c5ad8645f1527a9c00d9cd56840a7bea2a", "version-string": "1.75.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index f896a6d384b1cf..73318e03cd26d5 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e064373327329af8a7624ad00073dbfdbc196a48", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "04759c54c296fc98c5fd452b7e1707b5d2e8908d", "version-string": "1.75.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index 6909df69afbe4e..072e5835d00a79 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f58af0deba41766f33ad383428463f59cf38d976", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "96688c29c3a5a60c3b347391664756f884eda90d", "version-string": "1.75.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index 82ed89c3d88a73..114477982c1621 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20af48e0084ec80f69c580872c2fc4e01fffd4fc", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5f58bbd7060a9f72ea2a61edb03250ee079965a4", "version-string": "1.75.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index 6c08f6628d8a96..5072c7ed77c65b 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "603662ddf6590592848f2dd714fb08776d3a9616", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6867f4f5795c457b9f726b907606da8570c9f66f", "version-string": "1.75.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index f82066aaa585c7..85a7bea32b3500 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a6ab42b35df132f8a1f7c52dc7d92eb8a7cb894", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "990f655bf0d76d2a916bd7c0631f01a7a6516c05", "version-string": "1.75.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index 61dd5c74ea64ba..0ddce84599ecca 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9ae22b07f1f3b91d8b90f8532480abfbd0a24ac", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "90d72e8d8b2f27deb72fc883542f130142878a86", "version-string": "1.75.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index ed3a483c27219c..5428d428aeb1a6 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "240a1963be7f74c2de3f507bf034e765c632f033", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d4eea152778c8edf5ac36cfc804b4a4c38e2586a", "version-string": "1.75.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index f71afabc17e264..dd306d354b2786 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c618127e3c475a0991c59922fa57c2fee6eabd40", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "8d78b8ba2e9f54cb00137115ddd2ffec1c63c149", "version-string": "1.75.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index 10fe607619719d..df9877e51715a0 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd105bdb8e892a098738e054cfb90cb1786c856e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5d47762887873d2311645a3bd38757e2cb657f8e", "version-string": "1.75.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index c2b54cfcded3d1..b147dcb9d588ec 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e841e59b06375faa95855cefe7cf14515ddcc42", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ee283d4e95ac33a966a83743758d49db470bb4c9", "version-string": "1.75.0", diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index 693df9881c2d31..b14a178136f604 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68d4dfac2cedfe5786ecfb96bbe974c7257c73c7", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5d13650ce8dc9bd2f1af435bc5a3ee2f96e699a3", "version-string": "1.75.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index befd8639c729c6..260a3a16b915a4 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "099a09d3ed31651c57f2f3c735da5948dce45b66", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "dbd7fa06c82727307d26033c3ce4679c05489726", "version-string": "1.75.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index afd97bf4e22744..b1a2f8bfca3bb9 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7d8b52790eabfc30fa162d68055d3fe30c8b20c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "212e0551c299f67ccaf077cf376ed9da38af6b5b", "version-string": "1.75.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index 96c9433b0e3440..da82a8157a191b 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a46fb253999b4a420c6ae8c060351bb56dfb303", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "a864f78b06709be6f35ed5b8e64919f3794a5a74", "version-string": "1.75.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index 22f4660751f813..7735ac9e1b2b53 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22a76d7b62c1e7eab693c827b1ca942acdb46a1b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "f5565087e1c90779cbe05bd19ba172a699ccc743", "version-string": "1.75.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index 6803932b17db30..423359537de1b8 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70b5734ed30839efbf4048f5749af11e292df641", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "93abe1969976dcf265014b8e7f5463ee3b3b76d1", "version-string": "1.75.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index 479aa64446d608..7ab2951c76318b 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "174356d3aa0622ffc40c5a8a2c4c4d2813498a2e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "69bb9f285b6db1c861d662eb9b449ef5e2b2b5e4", "version-string": "1.75.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index 8bcfa6406d2a2f..5eb03734bbe21e 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e595f4b0f7135b43d0bef283fec3c0d4d742dc51", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "57c3a7dae1c551c1839a35a2d518c2ea0dd43795", "version-string": "1.75.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index c421a7ae32e1fb..0f17ec5e3ae618 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "002edb9b01fe471f968eba09c80bed4ea60fa865", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "bfdcac03e6dd3a24818ca99a96f464a2404f2f0b", "version-string": "1.75.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index 37dd056f1b3575..749b85e1dbcfbd 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f6911d5b98ba7669956568acb155112e623927b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "27fc174ae8a94007819eecfa02e8830e85017ebd", "version-string": "1.75.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 80880dcfed2de6..756cd71c8f30f7 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7803a877c9e9acd2162106e3bc15eb363b6b069a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9b5c6faa967ec00a8f3ed0aa1bb1f82564e3e064", "version-string": "1.75.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index 2e6eea223a21a1..388d351f2d33b2 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69c7ccf5d656e92b0a71e2456933481338ddb675", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1a6a483b16ebab8a08db06a64157d9eb563ec0ea", "version-string": "1.75.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 5cb79cdaf32a6b..351561ea0be17f 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "419330b673f261bc92184d6f65b442bda6fb0fbb", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b9b04d9a4c678589f8944d4bdb2b33746cfe21d5", "version-string": "1.75.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index 512e8ba3c3239d..127e96e7c1da79 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cd97a04356c141db68bfb6aec62c68e467f9ea6", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "69941aa4846ac99c267c3173ddd5d4fc0e64aa42", "version-string": "1.75.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index 5ab1948051e437..a03b6c18449e9f 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c574224ceed1d97eb67edfdb398117fb908b91c9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "767d42c39507b5461591bf3c212ac5c5f1f29b91", "version-string": "1.75.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index 4b2552d12a6586..08a929562f634e 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f43e22c2f1e0d71baa91b8ac5d995ab0cc0a802e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d18232c6100b5b8836e3c14faca691fa9afb1e1a", "version-string": "1.75.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index eb02daa301ae9e..2d9c8e0517190d 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "078e3d6c36e55a55d2af19d02036437d6dabff5e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6838da5ade313772c95807dadf2c6f10978887b8", "version-string": "1.75.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index 72d3e3862ebd83..4ec1efb6e5dffb 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fd209b14daf0b5990c60a1e10a6d92dd03c009c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7e42477706e50953271cf2b9ce6d3f4ad9669124", "version-string": "1.75.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index 6de4d470bfe5a7..06611a53b9f9d3 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02837608d604cde8de8bcbd5dcc706e406a808dd", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "eabe320c7c22c3c4a389aa75ed6ea630fffc5020", "version-string": "1.75.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index f4359f237fb5cf..934fe3ac9f9791 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94c1acd6353e0db7370f742c082c160114f7af8a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "0a5df3d26698c16a1152ab418b6f6258621eff40", "version-string": "1.75.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index bd3d32b8e716d9..5a1eef7dfe40dd 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc334c3a07d041efa802d868ece12150bdef34b9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "2a41c4703c7122de25b1c60510c43edc9371f63d", "version-string": "1.75.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index 7fcb2fdc9e036e..ce71f6e327c466 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "990abb2e15b868e2f80750422c3750e11700bc17", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "3bbe6c7f88321969abd4926c439851286fa4cfb0", "version-string": "1.75.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index fe5a16137bb850..4b44371ba7992f 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b74daa481d1f60e2d6f9c6b221a80dc8668cde7", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "39f712a73b762150961fda9a9f81edfe2ecaea32", "version-string": "1.75.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index 6ffab9dcd42aff..61c8f4ce493fe5 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0286de08a3fa5ba043e432b986df78f4defcc96", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "0a1188e2c052f77ac0b2152eb3ad78e19ed29e0c", "version-string": "1.75.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index 488330588fef73..de7fd15ef740e6 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bab6b8839833eda9df6a0016d8634d129fef485", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5ae561192927eb3f6f55b6e4370e5f85d18f72f0", "version-string": "1.75.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index 392d113b6d11ff..b6358cf03ec3af 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef29c4cc84cd28ca6cc812794dfb264709dac11e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "281c8b8c17e414c9b0fd0b0bc6a569fba02d4fff", "version-string": "1.75.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index 0f4fbc0ac2cf55..673c72566a54b9 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29a39e0d594d74febccddce3a077ff39c484fe21", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b13bdf32a20786a0165cc20205ef63765cac0627", "version-string": "1.75.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index 0d6fc6351297d9..70ad94f66e17c6 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e8fe8dd0d1524fc679c48bf4ca41f31a99ebc36", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7375c2b2d13b38482bd523adda933c11bd113b51", "version-string": "1.75.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index 143d1c7b486c1b..ab96011fdd1445 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b9b3cbc205006491c43f7244cd4a046961e610c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ce248c1ba37037937a656c72bfaafb0d523559e4", "version-string": "1.75.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index 2ef3e80d8bdf46..49ab50a25cfffe 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "878a097bf8023343a8af384bb30e0eee437a6904", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9881d849d33fedde2628cd86c41a58731c18f3e7", "version-string": "1.75.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index 7ea3faa97c7cb0..47483eab79645a 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b10179f5ffe71f697610799b865c72d7be1dfb2", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "22e3d000a178a88992c430d8ae8a0244c7dea674", "version-string": "1.75.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index 34cf302a64b03b..4e4fa5edf48b10 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b488a742d2f94e05da4f00a2fd3c9cb46fba13df", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9daa807310b682ea2ed54c59d9428d3b2723c32f", "version-string": "1.75.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index 01d346a59973cb..5c43e79438857f 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2125b24468cfbf25aaf0c3f600cda9b6773ffb18", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1ed3f10185cfa0140d6b5dd5e7be18b7b3b447c6", "version-string": "1.75.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index 313697d7f2b480..0769cc4346d054 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2feae16df79f9f3d24b98d407e542458706426c5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "8829793f6c6c913257314caa317599f8d253a5ca", "version-string": "1.75.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index ab03fa8bfe94a1..fe3d24d7eb02f4 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f493f75125a3d4c8b69fccc3c72ed6b868368c4", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "99523ccd2d55e2f3f04e1548a5e9ad899d482740", "version-string": "1.75.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index d7fb9dee6bb47b..843391a4c5a522 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "845a49ec34532fe2ba0d071e489eec10808499ab", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c1e8379989f44bf779ee47f1b102bb450963799d", "version-string": "1.75.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index 4bcdd75fff047e..df5f79b312cad6 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fce0be543d0eabb6160e3294f89c10165623e53f", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "2ffcf405ef8f3b0cf735c47a21bd7082ccc17779", "version-string": "1.75.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index 7f546635cbd509..a68e71d84cc4ca 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f950f2d90f50ec8d7982801ae8df77ab848285a6", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "28c6f9fc668fed0a0f193cda0a99619e8beeb398", "version-string": "1.75.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index 430739b7df1f12..94ad46f2c516f2 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa3e587e5d4f80c8aa934cde043ac5940adaed55", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "47572946bf6a63c731b9c4142eecb8bef3d3b270", "version-string": "1.75.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index 538d1378648fcb..92e4a8ec156cb1 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5da2f125967693081c7afcf81a327fb6b63343f0", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6fdc41ce442e95260c89dbb925edf9de8fe69fa4", "version-string": "1.75.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index a7903a3a0197f0..87d228c23607c3 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc3ce58ddedfd3cf1d23a75154f3939a1f7604bb", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "3ecbd86059d27b3f63278089ffe13cf974f11926", "version-string": "1.75.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index cc9b33a05f53bf..3482f58425a9d8 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3a2b15165133dd1a0ab0c5477e521e25ad02a31", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "fe84b0a24b896d88677494ee69347a7501746002", "version-string": "1.75.0", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index 560d29677a759e..1bd9429ef119fb 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2e44500c55aa436e9d239130203e1953f4d713c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "68de048561ba7a30f2cbba3c472c19cae63230e4", "version-string": "1.75.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index 56c5cba1d2730b..1e613bd3028a49 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b25e696df99e6186c1018a04d8c66607d330b89", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d32de46cd9dde4e3a3206a7fa1d48743ec92928b", "version-string": "1.75.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index e7dfd17457bd09..fe729f3679eabc 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48b21bc998317a6d60c63e07b38c83f4126b107b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "e7ad07379e1cbc96c79a08a773441845e8f86691", "version-string": "1.75.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index f2ef5a871db8b8..eef160d461f8c5 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fea61636685db99cf11030e507f028cfa212bee", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "4529a218720a8856e510778eaf5e2c8c1f1ca971", "version-string": "1.75.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index 61b63f81cd9e86..7365300b554a48 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daf7f224a26824ae0f4deb4e605e952d97755eb6", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ecf8a43a095687fe67389aa43323e30464646089", "version-string": "1.75.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index fe86c1f0b9f943..6c3c1e0c95a598 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e18b90b86df900244b7c8c7001ceeac37b083ae", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d24cc9e13f1aef8ae26b68f3b3e34495431110e3", "version-string": "1.75.0", diff --git a/versions/baseline.json b/versions/baseline.json index fad9490b4ef236..1054a12d91e50c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -233,7 +233,7 @@ "port-version": 0 }, "avro-cpp": { - "baseline": "1.9.2", + "baseline": "2021-06-01", "port-version": 0 }, "aws-c-common": { @@ -441,55 +441,55 @@ "port-version": 0 }, "boost": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-accumulators": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-algorithm": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-align": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-any": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-array": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-asio": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-assert": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-assign": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-atomic": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-beast": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-bimap": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-bind": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-build": { @@ -497,79 +497,79 @@ "port-version": 0 }, "boost-callable-traits": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-chrono": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-circular-buffer": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-compatibility": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-compute": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-concept-check": { - "baseline": "1.75.0", - "port-version": 2 + "baseline": "1.76.0", + "port-version": 0 }, "boost-config": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-container": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-container-hash": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-context": { - "baseline": "1.75.0", - "port-version": 4 + "baseline": "1.76.0", + "port-version": 0 }, "boost-contract": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-conversion": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-convert": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-core": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-coroutine": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-coroutine2": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-crc": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-date-time": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-detail": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-di": { @@ -577,407 +577,407 @@ "port-version": 0 }, "boost-dll": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-dynamic-bitset": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-endian": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-exception": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-fiber": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-filesystem": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-flyweight": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-foreach": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-format": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-function": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-function-types": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-functional": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-fusion": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-geometry": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-gil": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-graph": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-graph-parallel": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-hana": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-heap": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-histogram": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-hof": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-icl": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-integer": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-interprocess": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-interval": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-intrusive": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-io": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-iostreams": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-iterator": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-json": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-lambda": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-leaf": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-lexical-cast": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-local-function": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-locale": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-lockfree": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-log": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-logic": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-math": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-metaparse": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-modular-build-helper": { - "baseline": "1.75.0", - "port-version": 10 + "baseline": "1.76.0", + "port-version": 0 }, "boost-move": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-mp11": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-mpi": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-mpl": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-msm": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-multi-array": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-multi-index": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-multiprecision": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-nowide": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-numeric-conversion": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-odeint": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-optional": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-outcome": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-parameter": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-parameter-python": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-pfr": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-phoenix": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-poly-collection": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-polygon": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-pool": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-predef": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-preprocessor": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-process": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-program-options": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-property-map": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-property-tree": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-proto": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-ptr-container": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-python": { - "baseline": "1.75.0", - "port-version": 3 + "baseline": "1.76.0", + "port-version": 0 }, "boost-qvm": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-random": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-range": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-ratio": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-rational": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-regex": { - "baseline": "1.75.0", - "port-version": 2 + "baseline": "1.76.0", + "port-version": 0 }, "boost-safe-numerics": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-scope-exit": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-serialization": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-signals2": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-smart-ptr": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-sort": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-spirit": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-stacktrace": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-statechart": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-static-assert": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-static-string": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-stl-interfaces": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-system": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-test": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-thread": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-throw-exception": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-timer": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-tokenizer": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-tti": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-tuple": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-type-erasure": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-type-index": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-type-traits": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-typeof": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-ublas": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-uninstall": { @@ -985,27 +985,27 @@ "port-version": 1 }, "boost-units": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-unordered": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-utility": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-uuid": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-variant": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-variant2": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-vcpkg-helpers": { @@ -1013,23 +1013,23 @@ "port-version": 2 }, "boost-vmd": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-wave": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-winapi": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-xpressive": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-yap": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boringssl": { @@ -1965,7 +1965,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2020.10.19.00", + "baseline": "2021.06.14.00", "port-version": 0 }, "fcl": { @@ -2005,7 +2005,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2020.10.19.00", + "baseline": "2021.06.14.00", "port-version": 0 }, "flann": { @@ -2057,7 +2057,7 @@ "port-version": 5 }, "folly": { - "baseline": "2020.10.19.00", + "baseline": "2021.06.14.00", "port-version": 0 }, "font-chef": { @@ -5017,7 +5017,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2020.10.19.00", + "baseline": "2021.06.14.00", "port-version": 0 }, "psimd": { @@ -5369,7 +5369,7 @@ "port-version": 0 }, "quantlib": { - "baseline": "2019-09-02", + "baseline": "1.22", "port-version": 0 }, "quaternions": { @@ -6073,7 +6073,7 @@ "port-version": 2 }, "symengine": { - "baseline": "2020-05-25", + "baseline": "0.7.0", "port-version": 0 }, "systemc": { @@ -6597,8 +6597,8 @@ "port-version": 0 }, "wangle": { - "baseline": "2020.10.19.00", - "port-version": 1 + "baseline": "2021.06.14.00", + "port-version": 0 }, "wavelib": { "baseline": "2020-05-29", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index c5ab1556e9a5c8..e6231a686d009c 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f57f144d8d7fe3db4534798d827e2e217f6e9b35", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "4f77ee90c3b33600d679483776c5b5f7cb59def7", "version-string": "2020.10.19.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 84d20909bca4ba..076a17f99ede8e 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "522047f79c1dde2cfbc509a21b4f1faf910efb12", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "2ff51a6f541e733b1c5ae13927be1fd83c7ea977", "version-string": "2020.10.19.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 827da2bec249c4..28e912a52ddf90 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a11b9cd2ca209a5277f7b90bc8d1c6c6b501079", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "d7afcb1c0bffe2133bdb889652977a7c31937828", "version-string": "2020.10.19.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 326f97c3419466..24859be6070a5e 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4a04ef230bcd866c6c1a078ac3e11d926333b21", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "bfaabcaacfc585c9597b455a0853c1f4497e6e69", "version-string": "2020.10.19.00", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 4e0e8260b62992..5e0cca721eb777 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2d3e38a4ca6467154bf1a46fd2663d937c3858b", + "version": "1.22", + "port-version": 0 + }, { "git-tree": "bc5ea971009318ab7528c34d8ef715c3e59ed96e", "version-string": "2019-09-02", diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index ef1fa5c75dc9c6..d926e2391ee137 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33504d33db8201730839751693d6c4f643f7e0c9", + "version": "0.7.0", + "port-version": 0 + }, { "git-tree": "3d7345924811530e7b9a5e0b3ae588bbb32be2b1", "version-string": "2020-05-25", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 1b2e88f0d18b62..80d9cd9a5f87c4 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "070f35ba95d1f0b817f225896daa7bd48ce3e47d", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "ec02b3b7d30905067fdd9af8ae6e11652ea78a00", "version-string": "2020.10.19.00", From 638aef66ecaa1b23ffbc3383fa84a04b17442d08 Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Wed, 7 Jul 2021 23:15:45 +0200 Subject: [PATCH 121/141] [cctag] Add new port (#16719) * [cctag] add port * [cctag] using version-semver * [cctag] fix for multithreaded compilation * [cctag] update ci.baseline * [cctag] fix format json * [cctag] fix version with semver * [cctag] update version sha * [cctag] v1.0.0-rc2 * [cctag] v1.0.0-rc3 with vcpkg_copy_tools(), much simpler * [cctag] update port file * [cctag] v1.0.0-rc4 * [cctag] update version file * [cctag] v1.0.0 * [cctag] update version file v1.0.0 --- ports/cctag/portfile.cmake | 49 +++++++++++++++++++++++++++++++++++ ports/cctag/vcpkg.json | 52 ++++++++++++++++++++++++++++++++++++++ scripts/ci.baseline.txt | 1 + versions/baseline.json | 4 +++ versions/c-/cctag.json | 9 +++++++ 5 files changed, 115 insertions(+) create mode 100644 ports/cctag/portfile.cmake create mode 100644 ports/cctag/vcpkg.json create mode 100644 versions/c-/cctag.json diff --git a/ports/cctag/portfile.cmake b/ports/cctag/portfile.cmake new file mode 100644 index 00000000000000..36cf48c04c4950 --- /dev/null +++ b/ports/cctag/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alicevision/cctag + REF v1.0.0 + SHA512 49028356215dd703727b2eedd6aa72d81af84e5ca36f8dc7e9caf85a85c7f500b3eeaaa7369314a40049a72593d70049b709b453c30ff352d98ab0dea3afef76 + HEAD_REF develop +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cuda CCTAG_WITH_CUDA + apps CCTAG_BUILD_APPS +) + +if("cuda" IN_LIST FEATURES) + include(${CURRENT_INSTALLED_DIR}/share/vcpkg_find_cuda/vcpkg_find_cuda.cmake) + vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) + + message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DCCTAG_BUILD_TESTS:BOOL=OFF ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CCTag) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +# remove test files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cctag/geometry/test" "${CURRENT_PACKAGES_DIR}/include/cctag/test") +# remove cuda headers +if(NOT "cuda" IN_LIST FEATURES) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cctag/cuda") +endif() + + # move the bin directory to tools +if ("apps" IN_LIST FEATURES) + set(CCTAG_TOOLS detection regression simulation) + vcpkg_copy_tools(TOOL_NAMES ${CCTAG_TOOLS} AUTO_CLEAN) +endif() + +file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctag RENAME copyright) \ No newline at end of file diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json new file mode 100644 index 00000000000000..b90383fc79d1ed --- /dev/null +++ b/ports/cctag/vcpkg.json @@ -0,0 +1,52 @@ +{ + "name": "cctag", + "version-semver": "1.0.0", + "maintainers": "alicevision-team@googlegroups.com", + "description": "Computer vision library for detecting CCTag markers made up of concentric circles", + "homepage": "https://github.com/alicevision/CCTag", + "documentation": "https://cctag.readthedocs.io/", + "supports": "!(uwp | arm | arm64 | android | x86)", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-container", + "boost-date-time", + "boost-exception", + "boost-filesystem", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-multi-array", + "boost-program-options", + "boost-ptr-container", + "boost-serialization", + "boost-spirit", + "boost-stacktrace", + "boost-static-assert", + "boost-test", + "boost-thread", + "boost-throw-exception", + "boost-timer", + "boost-type-traits", + "boost-unordered", + "eigen3", + "opencv3", + "tbb" + ], + "features": { + "apps": { + "description": "Sample applications for detecting CCTag markers in images and videos", + "dependencies": [ + "boost-program-options", + "boost-system" + ] + }, + "cuda": { + "description": "Enable Cuda support for faster detection", + "dependencies": [ + "cuda" + ] + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f8f39297af4904..d81db9b1ba9b11 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -91,6 +91,7 @@ catch-classic:x64-windows-static-md=skip catch-classic:x86-windows = skip ccd:arm-uwp=fail ccd:x64-uwp=fail +cctag:x64-windows-static-md=fail cello:arm-uwp=fail cello:x64-uwp=fail cfitsio:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 1054a12d91e50c..2e410a6f85cded 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1160,6 +1160,10 @@ "baseline": "2.5", "port-version": 7 }, + "cctag": { + "baseline": "1.0.0", + "port-version": 0 + }, "cctz": { "baseline": "2.3-2", "port-version": 0 diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json new file mode 100644 index 00000000000000..fafc644be20c20 --- /dev/null +++ b/versions/c-/cctag.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8abc2227c7e5fc5232f928d407d5dac772afb48b", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} From 5b12899b6285e0db6769aa28f5dfba7f678acbc0 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Wed, 7 Jul 2021 18:06:54 -0400 Subject: [PATCH 122/141] [sleepy-discord] Add new port (#17604) * New port sleepy-discord * Add versions for Sleepy Discord * SleepyDiscord: use website as homepage * SleepyDiscord: Remove No newline at end git diff * SleepyDiscord: format manifest * SleepyDiscord: rerun x-add-version * SleepyDiscord: add compression feature * SleepyDiscord: Update version string * SleepyDiscord: rerun x-add-version again * SleepyDiscord: set version-date * SleepyDiscord: rerun add-version * SleepyDiscord: Add requested changes * SleepyDiscord: run add version * SleepyDiscord: update library * SleepyDiscord: rerun x-add-version * SleepyDiscord: copy config file to share folder * SleepyDiscord: run add-version * SleepyDiscord: Fix issue with parallel configuring * SleepyDiscord: x-add-version * SleepyDiscord: replace deprecated functions * SleepyDiscord: x-add-version * SleepyDiscord: Install config during configure * SleepyDiscord: x-add-version * [sleepy-discord] update: add Select Menus * [sleepy-discord] run add-version * [sleepy-discord] rerun add-verion --- ports/sleepy-discord/portfile.cmake | 43 ++++++++++++++++++++++++++++ ports/sleepy-discord/vcpkg.json | 44 +++++++++++++++++++++++++++++ versions/baseline.json | 4 +++ versions/s-/sleepy-discord.json | 14 +++++++++ 4 files changed, 105 insertions(+) create mode 100644 ports/sleepy-discord/portfile.cmake create mode 100644 ports/sleepy-discord/vcpkg.json create mode 100644 versions/s-/sleepy-discord.json diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake new file mode 100644 index 00000000000000..b59a2779f6ca95 --- /dev/null +++ b/ports/sleepy-discord/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "websocketpp" USE_WEBSOCKETPP + "websocketpp" USE_BOOST_ASIO + "cpr" USE_CPR + "voice" ENABLE_VOICE + "compression" USE_ZLIB +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yourWaifu/sleepy-discord + REF 53e68d6a569ab6da17b74279e308bf94919db933 + SHA512 1ee6de7aa70f3d7fc6ec0e21f5e65c6a868c23a29b4f26f614b59bbce3425c1305ce192562bf287d40f98060301b8638bc4bef95789fe8594ce5809adb6dc1e5 + HEAD_REF develop +) + +# Handle version data here to prevent issues from doing this twice in parallel +set(SLEEPY_DISCORD_VERSION_HASH 53e68d6a569ab6da17b74279e308bf94919db933) +set(SLEEPY_DISCORD_VERSION_BUILD 908) +set(SLEEPY_DISCORD_VERSION_BRANCH "develop") +set(SLEEPY_DISCORD_VERSION_IS_MASTER 0) +set(SLEEPY_DISCORD_VERSION_DESCRIPTION_CONCAT " ") +set(SLEEPY_DISCORD_VERSION_DESCRIPTION "53e68d6") +configure_file( + "${SOURCE_PATH}/include/sleepy_discord/version.h.in" + "${SOURCE_PATH}/include/sleepy_discord/version.h" +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DSLEEPY_VCPKG=ON + -DAUTO_DOWNLOAD_LIBRARY=OFF + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sleepy-discord) + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json new file mode 100644 index 00000000000000..2e4ff128eeb36a --- /dev/null +++ b/ports/sleepy-discord/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "sleepy-discord", + "version-date": "2021-07-07", + "description": "C++ library for the Discord chat client", + "homepage": "https://yourwaifu.dev/sleepy-discord/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + "cpr", + "websocketpp" + ], + "features": { + "compression": { + "description": "Allow compression for Websockets connection", + "dependencies": [ + "zlib" + ] + }, + "cpr": { + "description": "Use CPR library for handling HTTPS", + "dependencies": [ + "cpr" + ] + }, + "voice": { + "description": "Voice Chat support", + "dependencies": [ + "libsodium", + "opus" + ] + }, + "websocketpp": { + "description": "Use Websocketpp for handling WebSockets", + "dependencies": [ + "boost-random", + "websocketpp" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 2e410a6f85cded..0ddbe5f6a69db1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5820,6 +5820,10 @@ "baseline": "3.5.1", "port-version": 0 }, + "sleepy-discord": { + "baseline": "2021-07-07", + "port-version": 0 + }, "slikenet": { "baseline": "2019-10-22-2", "port-version": 0 diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json new file mode 100644 index 00000000000000..49b1554c315898 --- /dev/null +++ b/versions/s-/sleepy-discord.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "9ef84b8cb8cdd5d278b005a551044a6635490bda", + "version-date": "2021-07-07", + "port-version": 0 + }, + { + "git-tree": "0d9d62b7213333d04c90878bb1e6573ad3f5316f", + "version-date": "2021-05-02", + "port-version": 0 + } + ] +} From 849e964adb5afd40c9670de8907e465fe1ee79b4 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 7 Jul 2021 18:24:13 -0700 Subject: [PATCH 123/141] Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used (#18858) Alternative resolution of https://github.com/microsoft/vcpkg/pull/18846/ --- ports/gl3w/CONTROL | 5 ----- ports/gl3w/portfile.cmake | 25 +++++++++++++++---------- ports/gl3w/vcpkg.json | 10 ++++++++++ versions/baseline.json | 4 ++-- versions/g-/gl3w.json | 5 +++++ 5 files changed, 32 insertions(+), 17 deletions(-) delete mode 100644 ports/gl3w/CONTROL create mode 100644 ports/gl3w/vcpkg.json diff --git a/ports/gl3w/CONTROL b/ports/gl3w/CONTROL deleted file mode 100644 index 02550fdc5d2eab..00000000000000 --- a/ports/gl3w/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: gl3w -Version: 2018-05-31-2 -Homepage: https://github.com/skaslev/gl3w -Description: Simple OpenGL core profile loading -Build-Depends: opengl-registry diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake index da12c18cbbe4ce..1cf3e0f2beba9f 100644 --- a/ports/gl3w/portfile.cmake +++ b/ports/gl3w/portfile.cmake @@ -8,19 +8,27 @@ vcpkg_from_github( 0001-enable-shared-build.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h DESTINATION ${SOURCE_PATH}/include/GL) +# Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used +vcpkg_download_distfile(KHRPLATFORM_H + URLS "https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h" + FILENAME khrplatform.h + SHA512 93d9075718eddb69c44482acdc72bbbd3511741272a6124d05ab1ef0702ef03e918501403b6fd334faf2c61f3332f34b7730158aa090db3d448c32b5dd9d9e67 + ) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h" DESTINATION "${SOURCE_PATH}/include/GL") +file(COPY "${KHRPLATFORM_H}" DESTINATION "${SOURCE_PATH}/include/KHR") vcpkg_find_acquire_program(PYTHON3) vcpkg_execute_required_process( - COMMAND ${PYTHON3} ${SOURCE_PATH}/gl3w_gen.py - WORKING_DIRECTORY ${SOURCE_PATH} + COMMAND "${PYTHON3}" "${SOURCE_PATH}/gl3w_gen.py" + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME gl3w-gen ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) @@ -30,10 +38,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(HEADER ${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h) - file(READ ${HEADER} _contents) - string(REPLACE "#define GL3W_API" "#define GL3W_API __declspec(dllimport)" _contents "${_contents}") - file(WRITE ${HEADER} "${_contents}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h" "#define GL3W_API" "#define GL3W_API __declspec(dllimport)") endif() -file(INSTALL ${SOURCE_PATH}/UNLICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gl3w RENAME copyright) +file(INSTALL "${SOURCE_PATH}/UNLICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gl3w/vcpkg.json b/ports/gl3w/vcpkg.json new file mode 100644 index 00000000000000..f38702da242839 --- /dev/null +++ b/ports/gl3w/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "gl3w", + "version-date": "2018-05-31", + "port-version": 3, + "description": "Simple OpenGL core profile loading", + "homepage": "https://github.com/skaslev/gl3w", + "dependencies": [ + "opengl-registry" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0ddbe5f6a69db1..d5e7fa636b2cc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2285,8 +2285,8 @@ "port-version": 0 }, "gl3w": { - "baseline": "2018-05-31-2", - "port-version": 0 + "baseline": "2018-05-31", + "port-version": 3 }, "glad": { "baseline": "0.1.34", diff --git a/versions/g-/gl3w.json b/versions/g-/gl3w.json index 0cfc000c43214a..a718bca62bd5d1 100644 --- a/versions/g-/gl3w.json +++ b/versions/g-/gl3w.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbd82479631534cfe954646d63d29734c3b7728f", + "version-date": "2018-05-31", + "port-version": 3 + }, { "git-tree": "7786d613957355b4d238d8fd2278f78fbab5a886", "version-string": "2018-05-31-2", From fa7442b25eb8131a77a97c19d6205e0f3778f6cf Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 8 Jul 2021 00:17:17 -0700 Subject: [PATCH 124/141] [azure-core-cpp] Update to 1.1.0 (#18779) * [azure-core-cpp] Update to 1.1.0 ## 1.1.0 (2021-07-02) ### Bugs Fixed - Fixed a memory leak issue in `Base64Encode()`. (A community contribution, courtesy of _[jorgen](https://github.com/jorgen)_) ### Other Changes - Made internal-only changes to support the Azure Key Vault client library. ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - Jorgen Lind _([GitHub](https://github.com/jorgen))_ * [azure-storage-common-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) ### Bug Fixes - Fixed a memory leak issue while parsing XML. * [azure-storage-blobs-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) ### Bug Fixes - Fixed a bug where transactional MD5 hash was treated as blob MD5 hash when downloading partial blob. * [azure-storage-files-datalake-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) ### Bug Fixes - Fixed a bug where transactional MD5 hash was treated as blob MD5 hash when downloading partial blob. * [azure-storage-files-shares-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) No API changes since `12.0.0`. * Remove curl version from vcpkg manifest * Update version files Co-authored-by: Anton Kolesnyk --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 5 +++-- ports/azure-storage-blobs-cpp/portfile.cmake | 4 ++-- ports/azure-storage-blobs-cpp/vcpkg.json | 8 +++++--- ports/azure-storage-common-cpp/portfile.cmake | 4 ++-- ports/azure-storage-common-cpp/vcpkg.json | 8 +++++--- ports/azure-storage-files-datalake-cpp/portfile.cmake | 4 ++-- ports/azure-storage-files-datalake-cpp/vcpkg.json | 8 +++++--- ports/azure-storage-files-shares-cpp/portfile.cmake | 4 ++-- ports/azure-storage-files-shares-cpp/vcpkg.json | 8 +++++--- versions/a-/azure-core-cpp.json | 5 +++++ versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/a-/azure-storage-files-datalake-cpp.json | 5 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/baseline.json | 10 +++++----- 16 files changed, 63 insertions(+), 29 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index d1e06d0b573dc0..4f83c7daa23b37 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.0.0 - SHA512 84b1f56103677166b0bff1aa4837fed950545a4851e260f3aaf304d797d7fb270b5dc52d373fcb73de0c3e6a9366d860ff4f4d90eae9ba3f8e2ffe4eb211e3f2 + REF azure-core_1.1.0 + SHA512 83d8ba283179531fbd5b1e81b468b5fdb1d3aa846b2b9edd579a4e56a44f412986ad3558c98009a274e8c8fda301a5a434caf62dd990e3d9e8b07993d5218520 ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 8cf29fd1a9f75f..496f70b0e46fe0 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,12 +1,13 @@ { "name": "azure-core-cpp", - "version-semver": "1.0.0", + "version-semver": "1.1.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++." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/core/azure-core", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "openssl", diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index fa93714038d557..e046137a5e59d5 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.0.0 - SHA512 1e7b30c99131fa69ec7a7255a6c192e47b39d62347dc417fc71934f6ff73287e1639fb8daf96a74e3e6c7414fa7a338594169e365ab731b2ea7868fbe9410aff + REF azure-storage-blobs_12.0.1 + SHA512 401905e0c593a34a5985e73ef529989bd42a268c52c9b0623965e062d47667e37be3648ee7df3bdfe5f965534796c6aab87eaeb0fec261a263c036bc0ee53d23 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 01306454a8681e..62eb9e91e53b27 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,16 +1,18 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.0.0", + "version-semver": "12.0.1", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-blobs", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-blobs", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false + "default-features": false, + "version>=": "12.0.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 913075574662e6..79a3ceda75bdfc 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.0.0 - SHA512 3e1dc8cb7a3cbf6384f20ce263eb7cbb3ccc428ea2f1314b182d48534dfeb5094fe56316e9777389a9c8aee104f2774a6014b4e9cf1d4d90401059b458996b92 + REF azure-storage-common_12.0.1 + SHA512 72f345fb128888f40485112a4d8a95837f93bdd6667c532cab17c35a471c7081d7a0c72625b3853cd51ec8c06357af6235434e8876eb7850fd5f5f532b8a6fbd ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index dec543c059b98e..fa955270ce04fe 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,16 +1,18 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.0.0", + "version-semver": "12.0.1", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-common", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.0.0" }, "libxml2", { diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index df5b5620bf9bca..0107feffb06e44 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.0.0 - SHA512 481ea3e314574a66ab9ccd7fc306f9c6624f8925e2f8207899e234de218f471cb6a467c2bfe890fb56f4f3c09e9eccb41a12458caad3187d2c177e898ddaa821 + REF azure-storage-files-datalake_12.0.1 + SHA512 2f952f7b300b90ff1ade6165ccd9e0441a5155797334a3c327c47dd35c5e9e54fc16ee737d6dceb68f5d898358325fed9cbccecbbe2b032b791929a2ececce3c ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index ffb8633ad1355d..79a8a8b80301ef 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,16 +1,18 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.0.0", + "version-semver": "12.0.1", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-datalake", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-datalake", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-storage-blobs-cpp", - "default-features": false + "default-features": false, + "version>=": "12.0.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 0bc5ec77ec51e4..612afb3ffb007f 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.0.0 - SHA512 6554c84caae7e57f7a1e1d696a75c1c7b012eae4326d9a6b6fd4381b6c6eb8db4bec83e28430c5e8f4660ca3cab7da8cdbf8b2041f72ae32a36d48b6baa0e48c + REF azure-storage-files-shares_12.0.1 + SHA512 d38dcf6bca6047b15972199c2bce2ca463b9ce83106703ac5395c3b91ebc3b3ec8e4dabc63703a7fc9700102eaf222dc476625c762bd78747dfca93bd287ce3f ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 6f82b759fdbe96..73a2d9c82817b8 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,16 +1,18 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.0.0", + "version-semver": "12.0.1", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-shares", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-shares", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false + "default-features": false, + "version>=": "12.0.0" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index 9211c149f79968..f0d6d6571ae52e 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b330962cc2223833ef92e2be4e8d7e825dd3e141", + "version-semver": "1.1.0", + "port-version": 0 + }, { "git-tree": "15d579e95b536829e42fc2fda4c8b6365180eb3a", "version-semver": "1.0.0", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 1058f4c0628305..9360d7da82ac53 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07131431279c91d81edd9ec56005ee8628c3efdb", + "version-semver": "12.0.1", + "port-version": 0 + }, { "git-tree": "71e03bcc9bb5f7443f1db8724b6cc4fd4e43647b", "version-semver": "12.0.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index c8ac1fbef7e6b9..fba5190b1da0b0 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4ce9c53796add134d3ce8f29a9be4e33eba6c2a", + "version-semver": "12.0.1", + "port-version": 0 + }, { "git-tree": "2f672ff6a49e9d420141dc67013b50726f85684c", "version-semver": "12.0.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index ee56e63c8a841c..d677d463b89563 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "305658dfe1b6b28abc8be014794e6b21e8ba5722", + "version-semver": "12.0.1", + "port-version": 0 + }, { "git-tree": "392c7e0294f16ed82323ccc8b5b7961f20b0b2e3", "version-semver": "12.0.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index 199740ca765709..e574f13dd00e6c 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70c68c7920b221b2b571ba85d48ba215c0e9cb58", + "version-semver": "12.0.1", + "port-version": 0 + }, { "git-tree": "354a077c26bd9cce9ade81180e2f9b1dfaf6f514", "version-semver": "12.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index d5e7fa636b2cc4..257f943c95f26a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -265,7 +265,7 @@ "port-version": 1 }, "azure-core-cpp": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "azure-identity-cpp": { @@ -293,11 +293,11 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.0.0", + "baseline": "12.0.1", "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.0.0", + "baseline": "12.0.1", "port-version": 0 }, "azure-storage-cpp": { @@ -305,11 +305,11 @@ "port-version": 0 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.0.0", + "baseline": "12.0.1", "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.0.0", + "baseline": "12.0.1", "port-version": 0 }, "azure-uamqp-c": { From 297a6a2a299b03360b1d1faf535bf63d377f4d56 Mon Sep 17 00:00:00 2001 From: Twice Date: Fri, 9 Jul 2021 00:03:30 +0800 Subject: [PATCH 125/141] [protopuf] Update to 2.1.0 (#18757) * [protopuf] update to 2.1.0 * [protopuf] add version info --- ports/protopuf/portfile.cmake | 4 ++-- ports/protopuf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/protopuf.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/protopuf/portfile.cmake b/ports/protopuf/portfile.cmake index 083e72d58686d1..80b7535e484873 100644 --- a/ports/protopuf/portfile.cmake +++ b/ports/protopuf/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PragmaTwice/protopuf - REF v2.0.0 - SHA512 30af4132e9fa04936da2d9639b98cc0080cb71a5a0bea8cdba149eb0948327b4427b2ea84c18d3302850b5ba63995101c5fd76f8f293f3419c3b037f9470aed1 + REF v2.1.0 + SHA512 328fe2a861009c8eaa38299bf1ba31d3a47d73220018d3539b8457bb1d5d512c05e9652769a0261f0ae18be4e1e4e839e5471dfabdf0e6d130361e719ff6aadc HEAD_REF master ) diff --git a/ports/protopuf/vcpkg.json b/ports/protopuf/vcpkg.json index 959330012fcd92..82833fd83a84e7 100644 --- a/ports/protopuf/vcpkg.json +++ b/ports/protopuf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "protopuf", - "version-semver": "2.0.0", + "version-semver": "2.1.0", "description": "A little, highly templated, and protobuf-compatible serialization/deserialization library written in C++20", "homepage": "https://github.com/PragmaTwice/protopuf" } diff --git a/versions/baseline.json b/versions/baseline.json index 257f943c95f26a..5d459f4067ff40 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5013,7 +5013,7 @@ "port-version": 0 }, "protopuf": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "protozero": { diff --git a/versions/p-/protopuf.json b/versions/p-/protopuf.json index 4b20ed99ebdbfe..824b017b3f93c4 100644 --- a/versions/p-/protopuf.json +++ b/versions/p-/protopuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ba0da5deda1a9f0acd728f149206d1c1c5644a1", + "version-semver": "2.1.0", + "port-version": 0 + }, { "git-tree": "96530b73da47255f08d702838bc39791a8fcbb32", "version-semver": "2.0.0", From b8cf8499a15a6457d9938330e09fe7d43f347aaf Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 9 Jul 2021 01:50:43 +0800 Subject: [PATCH 126/141] [utf8proc] Export cmake targets (#18860) * [utf8proc] Export cmake targets * Update the baseline version --- ports/utf8proc/CONTROL | 4 ---- ports/utf8proc/export-cmake-targets.patch | 27 ++++++++++++++++++++++ ports/utf8proc/portfile.cmake | 28 +++++++++++++++-------- ports/utf8proc/vcpkg.json | 16 +++++++++++++ versions/baseline.json | 2 +- versions/u-/utf8proc.json | 5 ++++ 6 files changed, 67 insertions(+), 15 deletions(-) delete mode 100644 ports/utf8proc/CONTROL create mode 100644 ports/utf8proc/export-cmake-targets.patch create mode 100644 ports/utf8proc/vcpkg.json diff --git a/ports/utf8proc/CONTROL b/ports/utf8proc/CONTROL deleted file mode 100644 index 8dd63aebcc52de..00000000000000 --- a/ports/utf8proc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: utf8proc -Version: 2.5.0 -Homepage: https://github.com/JuliaLang/utf8proc -Description: Clean C library for processing UTF-8 Unicode data. diff --git a/ports/utf8proc/export-cmake-targets.patch b/ports/utf8proc/export-cmake-targets.patch new file mode 100644 index 00000000000000..9c75e4a46b88dc --- /dev/null +++ b/ports/utf8proc/export-cmake-targets.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea6b80e..5e5e829 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ add_library (utf8proc + ) + + # expose header path, for when this is part of a larger cmake project +-target_include_directories(utf8proc PUBLIC .) ++target_include_directories(utf8proc PUBLIC $ $) + + if (BUILD_SHARED_LIBS) + # Building shared library +@@ -51,10 +51,13 @@ set_target_properties (utf8proc PROPERTIES + + if (UTF8PROC_INSTALL) + install(TARGETS utf8proc ++ EXPORT unofficial-utf8proc-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + ++ install(EXPORT unofficial-utf8proc-config DESTINATION share/unofficial-utf8proc) ++ + install( + FILES + "${PROJECT_SOURCE_DIR}/utf8proc.h" diff --git a/ports/utf8proc/portfile.cmake b/ports/utf8proc/portfile.cmake index b4629defa524bc..e8e4f9c05db097 100644 --- a/ports/utf8proc/portfile.cmake +++ b/ports/utf8proc/portfile.cmake @@ -1,25 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JuliaLang/utf8proc - REF 0890a538bf8238cded9be0c81171f57e43f2c755 # v2.5.0 - SHA512 5daca349dc9ba6575efbd93d7a4e072202a2e1c2e55233d2e52be20586bb5fb26455654a77ec53336e9cdf59806457d1c31d1a926f7ef5bdd56b0232d96190dc + REF 3203baa7374d67132384e2830b2183c92351bffc # v2.6.1 + SHA512 582831c4c2d118f1c6f9e6de812878b96428d8fa1b9a2bbca32633a3853cb1981c917c724d2a8db51282ed13fd1654ca45f5d227731f5b90b17e7fc3acc93b07 + PATCHES + export-cmake-targets.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA) + OPTIONS + -DUTF8PROC_ENABLE_TESTING=OFF + -DUTF8PROC_INSTALL=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-utf8proc CONFIG_PATH share/unofficial-utf8proc) -vcpkg_install_cmake() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(READ ${CURRENT_PACKAGES_DIR}/include/utf8proc.h UTF8PROC_H) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(READ "${CURRENT_PACKAGES_DIR}/include/utf8proc.h" UTF8PROC_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) string(REPLACE "defined UTF8PROC_SHARED" "0" UTF8PROC_H "${UTF8PROC_H}") else() string(REPLACE "defined UTF8PROC_SHARED" "1" UTF8PROC_H "${UTF8PROC_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/utf8proc.h "${UTF8PROC_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/utf8proc.h" "${UTF8PROC_H}") -file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/utf8proc) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/utf8proc/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/utf8proc/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/utf8proc/vcpkg.json b/ports/utf8proc/vcpkg.json new file mode 100644 index 00000000000000..4ecd90926b7e3c --- /dev/null +++ b/ports/utf8proc/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "utf8proc", + "version": "2.6.1", + "description": "Clean C library for processing UTF-8 Unicode data.", + "homepage": "https://github.com/JuliaLang/utf8proc", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5d459f4067ff40..c85159388d1978 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6469,7 +6469,7 @@ "port-version": 0 }, "utf8proc": { - "baseline": "2.5.0", + "baseline": "2.6.1", "port-version": 0 }, "utfcpp": { diff --git a/versions/u-/utf8proc.json b/versions/u-/utf8proc.json index 3c2983307ce655..bfe00d35236fb2 100644 --- a/versions/u-/utf8proc.json +++ b/versions/u-/utf8proc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "659423c8c76de9194980ba25a2755bde258ed173", + "version": "2.6.1", + "port-version": 0 + }, { "git-tree": "2b0e7ac6367f7dbe8fc0e6fea7d0ad81cbbedba6", "version-string": "2.5.0", From 0839d3d13569cefc932157f298d8a8288d18eeee Mon Sep 17 00:00:00 2001 From: Xing Ji <33065325+jixingcn@users.noreply.github.com> Date: Fri, 9 Jul 2021 01:51:05 +0800 Subject: [PATCH 127/141] [gli] upgrade the gli to latest (#18715) * upgrade the gli to latest * update the version of gli * update the version of gli * [gli] Revert patch, use date scheme Co-authored-by: Robert Schumacher --- ports/gli/CONTROL | 5 ----- ports/gli/portfile.cmake | 6 +++--- ports/gli/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/g-/gli.json | 5 +++++ 5 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 ports/gli/CONTROL create mode 100644 ports/gli/vcpkg.json diff --git a/ports/gli/CONTROL b/ports/gli/CONTROL deleted file mode 100644 index ffd0ea80449d21..00000000000000 --- a/ports/gli/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: gli -Version: dd17acf-1 -Build-Depends: glm -Description: OpenGL Image (GLI) -Homepage: https://gli.g-truc.net \ No newline at end of file diff --git a/ports/gli/portfile.cmake b/ports/gli/portfile.cmake index c958eb95ba6dc9..5168aca1e5d738 100644 --- a/ports/gli/portfile.cmake +++ b/ports/gli/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO g-truc/gli - REF dd17acf9cc7fc6e6abe9f9ec69949eeeee1ccd82 - SHA512 9e3a4ab9ee73d5c271b8346cf81339cd3cd0c20d20991524b816313b6a99e8d3a01863316a38cf1a52ef9c5b31d689ecccf6248b12d1d270460c048bf904650b + REF 779b99ac6656e4d30c3b24e96e0136a59649a869 + SHA512 6e7ab46b7943cb185c8c1f6e45b765f5463e03628973043a0e8b866458ccceb5249f69a2a77b5e69c73f3ace85af96c7b9b2137685ceb6d0fcb67e491a49be69 HEAD_REF master PATCHES disable-test.patch @@ -17,7 +17,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gli TARGET_PATH share/gli) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gli) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) diff --git a/ports/gli/vcpkg.json b/ports/gli/vcpkg.json new file mode 100644 index 00000000000000..e1d746619608c9 --- /dev/null +++ b/ports/gli/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "gli", + "version-date": "2021-07-06", + "description": "OpenGL Image (GLI)", + "homepage": "https://gli.g-truc.net", + "dependencies": [ + "glm" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c85159388d1978..e8a21c16be90e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2305,7 +2305,7 @@ "port-version": 0 }, "gli": { - "baseline": "dd17acf-1", + "baseline": "2021-07-06", "port-version": 0 }, "glib": { diff --git a/versions/g-/gli.json b/versions/g-/gli.json index 07cfbac5b5e035..bf68470d3fbaa8 100644 --- a/versions/g-/gli.json +++ b/versions/g-/gli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8960dd5e56bd32e4cd09edacd38a7a311e05fcd", + "version-date": "2021-07-06", + "port-version": 0 + }, { "git-tree": "d6453871d306fd1f5501954f4b3722f97cd525d4", "version-string": "dd17acf-1", From abaa482f0b5bd5758d7075e918eda44186a419b5 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 8 Jul 2021 19:51:32 +0200 Subject: [PATCH 128/141] [protozero] update to 1.7.0 (#18842) * update protozero to 1.7.0 * update versions * apply suggestions * version --- ports/protozero/CONTROL | 5 ----- ports/protozero/portfile.cmake | 14 ++++++++------ ports/protozero/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/p-/protozero.json | 5 +++++ 5 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 ports/protozero/CONTROL create mode 100644 ports/protozero/vcpkg.json diff --git a/ports/protozero/CONTROL b/ports/protozero/CONTROL deleted file mode 100644 index c8e1403716eb8b..00000000000000 --- a/ports/protozero/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: protozero -Version: 1.6.8 -Homepage: https://github.com/am2222/mapnik-windows/ -Description: Minimalist protocol buffer decoder and encoder in C++ -Build-Depends: protobuf \ No newline at end of file diff --git a/ports/protozero/portfile.cmake b/ports/protozero/portfile.cmake index 55703492df19fa..fda45303cc87cb 100644 --- a/ports/protozero/portfile.cmake +++ b/ports/protozero/portfile.cmake @@ -2,18 +2,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/protozero - SHA512 24bab4bf4ff7c67b4f2d8e97919ccde115db4fa476462926102da2f48b4689d6b454df56dbc30754d0e81c37f669535e4b2101033b079ace0f4ea2706447abe1 - REF v1.6.8 + SHA512 d09a34865c535264c52f9c605ccb6f453c357f5e3a7b0dc72b097de288eabc6985a5b81ddbe79c47d0af2d8f74e33bd380fefce47acb15d8d51d5c151d71786b + REF v1.7.0 HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF ) - vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug") -file(COPY ${SOURCE_PATH}/include/protozero DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -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) diff --git a/ports/protozero/vcpkg.json b/ports/protozero/vcpkg.json new file mode 100644 index 00000000000000..aae619a1e56c20 --- /dev/null +++ b/ports/protozero/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "protozero", + "version-semver": "1.7.0", + "description": "Minimalist protocol buffer decoder and encoder in C++", + "homepage": "https://github.com/mapbox/protozero", + "dependencies": [ + "protobuf" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e8a21c16be90e3..cdcb50a9ffa105 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5017,7 +5017,7 @@ "port-version": 0 }, "protozero": { - "baseline": "1.6.8", + "baseline": "1.7.0", "port-version": 0 }, "proxygen": { diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json index d29b982255cc4d..d05d0ecf2306ca 100644 --- a/versions/p-/protozero.json +++ b/versions/p-/protozero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23f6ec11be6bbf623dc7590b128027ccb7f69727", + "version-semver": "1.7.0", + "port-version": 0 + }, { "git-tree": "b064bd3211a8ba5ddfe33a49c84bcfa714d1bf8c", "version-string": "1.6.8", From 1d770b3f6c22de8f2af12216c823f7b2babbf1da Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 8 Jul 2021 19:53:01 +0200 Subject: [PATCH 129/141] [sentry-native] Update to 0.4.11 (#18856) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 6 +++--- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index e810d504ced2b7..7fac38cf575ae0 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -3,9 +3,9 @@ if(NOT VCPKG_TARGET_IS_OSX) endif() vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.10/sentry-native.zip" - FILENAME "sentry-native-0.4.10.zip" - SHA512 fd7aa8de707b19dfc3704e3f1d73bb35aa65cf26e95df0baf2061ce756232b76b26d406ffc11b53e57d949f5f14899265095d8d4d3f8ff4777cdeceeca5b6f94 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.11/sentry-native.zip" + FILENAME "sentry-native-0.4.11.zip" + SHA512 3d66295526c0cd068a0b7c2180dbeae7594775b3eb3199a74da7efe634cbc19cff6eba8d44b1479037c43c6eb58a9ba4fdaf8da6995767f27c585a0d42582c37 ) vcpkg_extract_source_archive_ex( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 131b08ce3b6f0f..afbe40dc8f3dc1 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version-semver": "0.4.10", + "version-semver": "0.4.11", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index cdcb50a9ffa105..198e1bcc42d25a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5725,7 +5725,7 @@ "port-version": 0 }, "sentry-native": { - "baseline": "0.4.10", + "baseline": "0.4.11", "port-version": 0 }, "septag-sx": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 995604ea7dfcf1..1d4503503aa30f 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8343307e093e40faaf7e894be6aed4f60cb327d0", + "version-semver": "0.4.11", + "port-version": 0 + }, { "git-tree": "487eaee55f15e263063288c15aab12d296ac598f", "version-semver": "0.4.10", From 5b02a877076923ed3bc2932d54594bf47a4a73c5 Mon Sep 17 00:00:00 2001 From: Charlie Barto Date: Thu, 8 Jul 2021 11:04:14 -0700 Subject: [PATCH 130/141] [ avcpp ] Update version (#18436) * remove avcpp patch that was accepted upstream. revert port version * update versions --- .../0001-remove-problematic-compound-literal.patch | 14 -------------- ports/avcpp/portfile.cmake | 5 ++--- ports/avcpp/vcpkg.json | 3 +-- versions/a-/avcpp.json | 5 +++++ versions/baseline.json | 4 ++-- 5 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 ports/avcpp/0001-remove-problematic-compound-literal.patch diff --git a/ports/avcpp/0001-remove-problematic-compound-literal.patch b/ports/avcpp/0001-remove-problematic-compound-literal.patch deleted file mode 100644 index aa6c58cc234617..00000000000000 --- a/ports/avcpp/0001-remove-problematic-compound-literal.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/avutils.h b/src/avutils.h -index 29c4ae0..3bfaf82 100644 ---- a/src/avutils.h -+++ b/src/avutils.h -@@ -42,7 +42,7 @@ namespace av { - // Basic FFmpeg constants - constexpr auto NoPts = static_cast(AV_NOPTS_VALUE); - constexpr auto TimeBase = static_cast(AV_TIME_BASE); --constexpr auto TimeBaseQ = static_cast(AV_TIME_BASE_Q); -+constexpr auto TimeBaseQ = AVRational{1, AV_TIME_BASE}; - - - template - diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake index c472590ee1e34b..fcbf37585e8839 100644 --- a/ports/avcpp/portfile.cmake +++ b/ports/avcpp/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO h4tr3d/avcpp - REF d1a39cf6e1ccfe78ababe5a65d02d57f1e65bea1 - SHA512 48eb3bdd8729c9f61c53b152f0bb7283b40d2c8f043a1d6bb4fb1fadb0ceebf754822eeb7fa85edcacbca267eea0999dd9e78e378b04984db6dc25f9a6fab7d0 + REF fa9a1ef70bbf9e9f3963fbaa4540e8aac4ad8daa + SHA512 e0821d8e01e0fdb28d58564c87cafa7f9349b1b31dc90d4f2ea4c22c51fc16555f4a01f30d7575798138067921a011faa10e4d2ac2ac02acdf224546724e0338 HEAD_REF master PATCHES - 0001-remove-problematic-compound-literal.patch 0002-av_init_packet_deprecation.patch ) diff --git a/ports/avcpp/vcpkg.json b/ports/avcpp/vcpkg.json index 8a2495d98e80c5..9f1e0673844488 100644 --- a/ports/avcpp/vcpkg.json +++ b/ports/avcpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "avcpp", - "version-date": "2021-05-06", - "port-version": 1, + "version-date": "2021-06-14", "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.", "homepage": "https://github.com/h4tr3d/avcpp", "dependencies": [ diff --git a/versions/a-/avcpp.json b/versions/a-/avcpp.json index 56837510f3e241..4b4edbcc803fd2 100644 --- a/versions/a-/avcpp.json +++ b/versions/a-/avcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4e6dcc1706046f3b2b6fca62df98bbc7696eb19", + "version-date": "2021-06-14", + "port-version": 0 + }, { "git-tree": "102cfc337c2a08e57246c399812a540315ae4531", "version-date": "2021-05-06", diff --git a/versions/baseline.json b/versions/baseline.json index 198e1bcc42d25a..db78c108189c94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -221,8 +221,8 @@ "port-version": 0 }, "avcpp": { - "baseline": "2021-05-06", - "port-version": 1 + "baseline": "2021-06-14", + "port-version": 0 }, "avisynthplus": { "baseline": "3.7.0", From cfdb8a1d0bb93c20d80df19846ba0bf2257f588e Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Sat, 10 Jul 2021 13:59:47 -0400 Subject: [PATCH 131/141] [daw-json-link daw-utf-range daw-header-libraries] new port --- ports/daw-header-libraries/portfile.cmake | 16 +++ ports/daw-header-libraries/vcpkg.json | 6 + .../moved_dragonbox_and_utfcpp.patch | 39 ++++++ ports/daw-json-link/portfile.cmake | 41 ++++++ ports/daw-json-link/vcpkg.json | 9 ++ ports/daw-utf-range/my_utfcpp.patch | 119 ++++++++++++++++++ ports/daw-utf-range/portfile.cmake | 19 +++ ports/daw-utf-range/vcpkg.json | 9 ++ ports/json-link/portfile.cmake | 29 ----- ports/json-link/vcpkg.json | 16 --- versions/baseline.json | 12 ++ versions/d-/daw-header-libraries.json | 9 ++ versions/d-/daw-json-link.json | 9 ++ versions/d-/daw-utf-range.json | 9 ++ 14 files changed, 297 insertions(+), 45 deletions(-) create mode 100644 ports/daw-header-libraries/portfile.cmake create mode 100644 ports/daw-header-libraries/vcpkg.json create mode 100644 ports/daw-json-link/moved_dragonbox_and_utfcpp.patch create mode 100644 ports/daw-json-link/portfile.cmake create mode 100644 ports/daw-json-link/vcpkg.json create mode 100644 ports/daw-utf-range/my_utfcpp.patch create mode 100644 ports/daw-utf-range/portfile.cmake create mode 100644 ports/daw-utf-range/vcpkg.json delete mode 100644 ports/json-link/portfile.cmake delete mode 100644 ports/json-link/vcpkg.json create mode 100644 versions/d-/daw-header-libraries.json create mode 100644 versions/d-/daw-json-link.json create mode 100644 versions/d-/daw-utf-range.json diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake new file mode 100644 index 00000000000000..4154b0c1d888ff --- /dev/null +++ b/ports/daw-header-libraries/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/header_libraries + REF 2fb3c668d90a3eb4158de40daf18a860c6eb3115 + SHA512 ae4f1c8fa5c2ca5e0fe7e21ba0f43cf42d746a324b69c8de5bbc2c89d7dd5f31f76302a9f713ac51533df2ace703e20b35291e30577449df1565f6a3e14ab659 + HEAD_REF master +) + +file( + COPY + ${SOURCE_PATH}/include/daw + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/ +) + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json new file mode 100644 index 00000000000000..19162f575add55 --- /dev/null +++ b/ports/daw-header-libraries/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "daw-header-libraries", + "version-date": "2021-06-28", + "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", + "homepage": "https://github.com/beached/header_libraries" +} diff --git a/ports/daw-json-link/moved_dragonbox_and_utfcpp.patch b/ports/daw-json-link/moved_dragonbox_and_utfcpp.patch new file mode 100644 index 00000000000000..2763eba693a3b6 --- /dev/null +++ b/ports/daw-json-link/moved_dragonbox_and_utfcpp.patch @@ -0,0 +1,39 @@ +diff --git a/include/daw/json/impl/daw_json_to_string.h b/include/daw/json/impl/daw_json_to_string.h +index a848c6f7..9e37e161 100644 +--- a/include/daw/json/impl/daw_json_to_string.h ++++ b/include/daw/json/impl/daw_json_to_string.h +@@ -17,14 +17,14 @@ + #include + #include + #include +-#include ++#include + + #include + #include + #include + #include + #ifndef DAW_JSON_CUSTOM_D2S +-#include ++#include + #elif __has_include( "custom_d2s.h" ) + #include "custom_d2s.h" + #else +@@ -247,7 +247,7 @@ namespace daw::json::utils { + copy_to_iterator( OutputIterator it, Container const &container ) { + if constexpr( do_escape ) { + using iter = daw::remove_cvref_t; +- using it_t = utf8::unchecked::iterator; ++ using it_t = daw::utf8::unchecked::iterator; + auto first = it_t( std::begin( container ) ); + auto const last = it_t( std::end( container ) ); + while( first != last ) { +@@ -328,7 +328,7 @@ namespace daw::json::utils { + } + if constexpr( do_escape ) { + +- auto chr_it = utf8::unchecked::iterator( ptr ); ++ auto chr_it = daw::utf8::unchecked::iterator( ptr ); + while( *chr_it.base( ) != '\0' ) { + auto const cp = *chr_it++; + switch( cp ) { diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake new file mode 100644 index 00000000000000..7b3b4f646fc143 --- /dev/null +++ b/ports/daw-json-link/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/daw_json_link + REF 37ecbfe7cd9d0ba660ef77998228c827ab407ff3 + SHA512 0ed32115e0e51fa008c02ada9def131b699332f0765718333c2d02707b985cd5a1f558d63e40e72d290f6a9329946cdde101b2b33d50b04bf54a715efd5c3e40 + HEAD_REF master + PATCHES moved_dragonbox_and_utfcpp.patch +) + +file( + COPY + ${SOURCE_PATH}/include/daw + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/ +) +file( + COPY + ${SOURCE_PATH}/include/third_party + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/daw +) + +# Append the json-link and dragonbox license information into a single +# copyright file (they are both Boost v1.0 but it is good to be clear). +file(APPEND ${SOURCE_PATH}/copyright [=[+----------------------------------------------------------------------------+ +| json-link copywrite | ++----------------------------------------------------------------------------+ +]=]) +file(READ ${SOURCE_PATH}/LICENSE json_link_copywrite) +file(APPEND ${SOURCE_PATH}/copyright ${json_link_copywrite}) +file(APPEND ${SOURCE_PATH}/copyright [=[ + + ++----------------------------------------------------------------------------+ +| dragonbox copywrite | ++----------------------------------------------------------------------------+ +]=]) + +file(READ ${SOURCE_PATH}/LICENSE_Dragonbox dragonbox_copywrite) +file(APPEND ${SOURCE_PATH}/copyright ${dragonbox_copywrite}) +file(INSTALL ${SOURCE_PATH}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json new file mode 100644 index 00000000000000..7c5a455322539b --- /dev/null +++ b/ports/daw-json-link/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "daw-json-link", + "version-date": "2021-05-16", + "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", + "homepage": "https://github.com/beached/daw_json_link", + "dependencies": [ + "daw-utf-range" + ] +} diff --git a/ports/daw-utf-range/my_utfcpp.patch b/ports/daw-utf-range/my_utfcpp.patch new file mode 100644 index 00000000000000..271b187189b41b --- /dev/null +++ b/ports/daw-utf-range/my_utfcpp.patch @@ -0,0 +1,119 @@ +diff --git a/include/daw/utf_range/daw_utf_range.h b/include/daw/utf_range/daw_utf_range.h +index 36fe70d..c794934 100644 +--- a/include/daw/utf_range/daw_utf_range.h ++++ b/include/daw/utf_range/daw_utf_range.h +@@ -10,7 +10,7 @@ + + #include + #include +-#include ++#include + + #include + #include +@@ -21,7 +21,7 @@ + namespace daw { + namespace range { + using char_iterator = char const *; +- using utf_iterator = utf8::unchecked::iterator; ++ using utf_iterator = daw::utf8::unchecked::iterator; + using utf_val_type = utf_iterator::value_type; + + constexpr size_t hash_sequence( char_iterator first, +@@ -95,7 +95,7 @@ namespace daw { + + constexpr void advance( size_t const n ) noexcept { + assert( n <= m_size ); +- utf8::unchecked::advance( m_begin, n ); ++ daw::utf8::unchecked::advance( m_begin, n ); + m_size -= n; + } + +@@ -317,7 +317,7 @@ namespace daw { + + inline std::string from_u32string( std::u32string const &other ) { + std::string result; +- utf8::unchecked::utf32to8( other.begin( ), other.end( ), ++ daw::utf8::unchecked::utf32to8( other.begin( ), other.end( ), + std::back_inserter( result ) ); + return result; + } +diff --git a/include/daw/utf_range/daw_utf_string.h b/include/daw/utf_range/daw_utf_string.h +index 1cce2da..780a472 100644 +--- a/include/daw/utf_range/daw_utf_string.h ++++ b/include/daw/utf_range/daw_utf_string.h +@@ -10,7 +10,7 @@ + + #include + #include +-#include ++#include + + #include + #include +@@ -174,7 +174,7 @@ namespace daw { + std::copy( cbegin( ), cend( ), std::back_inserter( result ) ); + std::sort( result.begin( ), result.end( ) ); + m_values.clear( ); +- utf8::unchecked::utf32to8( result.cbegin( ), result.cend( ), ++ daw::utf8::unchecked::utf32to8( result.cbegin( ), result.cend( ), + std::back_inserter( m_values ) ); + m_range = daw::range::create_char_range( m_values ); + } +diff --git a/include/utf8/checked.h b/include/utf8/checked.h +index c74171e..4d6f211 100644 +--- a/include/utf8/checked.h ++++ b/include/utf8/checked.h +@@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE. + #include + #include + +-namespace utf8 { ++namespace daw::utf8 { + // Exceptions that may be thrown from the library functions. + class invalid_code_point { + uint32_t cp; +@@ -379,4 +379,4 @@ namespace utf8 { + }; // class iterator + template + iterator( octet_iterator ) -> iterator; +-} // namespace utf8 ++} // namespace daw::utf8 +diff --git a/include/utf8/core.h b/include/utf8/core.h +index bd9e461..78d7acc 100644 +--- a/include/utf8/core.h ++++ b/include/utf8/core.h +@@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE. + #include + #include + +-namespace utf8 { ++namespace daw::utf8 { + // The typedefs for 8-bit, 16-bit and 32-bit unsigned integers + // You may need to change them to match your system. + // These typedefs have the same names as ones from cstdint, or boost/cstdint +@@ -333,4 +333,4 @@ namespace utf8 { + ( utf8::internal::mask8( *it++ ) ) == bom[1] && + ( utf8::internal::mask8( *it ) ) == bom[2] ); + } +-} // namespace utf8 ++} // namespace daw::utf8 +diff --git a/include/utf8/unchecked.h b/include/utf8/unchecked.h +index 7f00df9..b48397a 100644 +--- a/include/utf8/unchecked.h ++++ b/include/utf8/unchecked.h +@@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE. + #include "core.h" + #include + +-namespace utf8 { ++namespace daw::utf8 { + namespace unchecked { + template + constexpr octet_iterator append( uint32_t cp, +@@ -276,4 +276,4 @@ namespace utf8 { + return it -= n; + } + } // namespace unchecked +-} // namespace utf8 ++} // namespace daw::utf8 diff --git a/ports/daw-utf-range/portfile.cmake b/ports/daw-utf-range/portfile.cmake new file mode 100644 index 00000000000000..1acd9f74963293 --- /dev/null +++ b/ports/daw-utf-range/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/utf_range + REF 6069d058c48f7b98ee2999929c146eb60a3b1313 + SHA512 6a9f3abdf4c2b9569ebf3d5937a0671df33eaecc3cfc328c22dc0802a7f864f5556c50fcf31aea7e558025c801c8be693276106a7020fad951d52b67c8e5e7e5 + HEAD_REF master + PATCHES my_utfcpp.patch +) + +file( + COPY + ${SOURCE_PATH}/include/utf8.h + ${SOURCE_PATH}/include/utf8 + ${SOURCE_PATH}/include/daw/utf_range + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/daw +) + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/daw-utf-range/vcpkg.json b/ports/daw-utf-range/vcpkg.json new file mode 100644 index 00000000000000..cff97aa3f0b8ef --- /dev/null +++ b/ports/daw-utf-range/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "daw-utf-range", + "version-date": "2021-06-15", + "description": "Header-only utf8 string range used by daw-json-link. Includes a constexpr/noexcept modified version of utfcpp.", + "homepage": "https://github.com/beached/header_libraries", + "dependencies": [ + "daw-header-libraries" + ] +} diff --git a/ports/json-link/portfile.cmake b/ports/json-link/portfile.cmake deleted file mode 100644 index 2a21c12fcc9a4f..00000000000000 --- a/ports/json-link/portfile.cmake +++ /dev/null @@ -1,29 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO beached/daw_json_link - REF v2.9.5 - SHA512 cc4581fe93455e5ecf72cabbcc54a580f5fae733aa1cacbf6feb83cf75a8cf0b1d6565aa386fbb537207fc87eabe5a4b4e3b535cdecbbef2d49329eda7866fad - HEAD_REF release -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DDAW_ENABLE_TESTING=OFF -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/daw_header_libraries DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/daw_utf_range) -vcpkg_cmake_config_fixup(CONFIG_PATH share/json_link/cmake$) -vcpkg_cmake_config_fixup(CONFIG_PATH share/json_link/cmake) - -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/share/json_link -) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/json-link/vcpkg.json b/ports/json-link/vcpkg.json deleted file mode 100644 index cfab3cdf9ffadf..00000000000000 --- a/ports/json-link/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "json-link", - "version-semver": "2.9.5", - "description": "JSON serialize-deserialize fast, modern, low CPU, with compile-time data contracts.", - "homepage": "https://github.com/beached/daw_json_link", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index db78c108189c94..fd107dff5a0921 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1620,6 +1620,18 @@ "baseline": "0.8.2", "port-version": 1 }, + "daw-header-libraries": { + "baseline": "2021-06-28", + "port-version": 0 + }, + "daw-json-link": { + "baseline": "2021-05-16", + "port-version": 0 + }, + "daw-utf-range": { + "baseline": "2021-06-15", + "port-version": 0 + }, "dbg-macro": { "baseline": "2019-07-11", "port-version": 0 diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json new file mode 100644 index 00000000000000..789dc94bb44422 --- /dev/null +++ b/versions/d-/daw-header-libraries.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c260aacaf0465e85fbbec1136b82a4bea5f63251", + "version-date": "2021-06-28", + "port-version": 0 + } + ] +} diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json new file mode 100644 index 00000000000000..e12bba09e7a32e --- /dev/null +++ b/versions/d-/daw-json-link.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "227d57e89bd2b9668d1755cb44508a24e7c00c86", + "version-date": "2021-05-16", + "port-version": 0 + } + ] +} diff --git a/versions/d-/daw-utf-range.json b/versions/d-/daw-utf-range.json new file mode 100644 index 00000000000000..3e054f3808198e --- /dev/null +++ b/versions/d-/daw-utf-range.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "55f43fed58cd2901788701bb3191245b12784e59", + "version-date": "2021-06-15", + "port-version": 0 + } + ] +} From 86890f18bf35788e1915a2fbe4345e3717877780 Mon Sep 17 00:00:00 2001 From: mheyman Date: Sun, 18 Jul 2021 09:33:29 -0400 Subject: [PATCH 132/141] [daw-header-libraries daw-utf-range daw-json-link]: vcpkg_cmake_configure, vcpkg_cmake_install, vcpkg_cmake_config_fixup --- ports/daw-header-libraries/portfile.cmake | 15 ++- ports/daw-header-libraries/rename_port.patch | 44 ++++++++ ports/daw-header-libraries/vcpkg.json | 12 +- .../moved_dragonbox_and_utfcpp.patch | 39 ------- ports/daw-json-link/portfile.cmake | 22 ++-- .../thirdparty_and_portname.patch | 104 ++++++++++++++++++ ports/daw-json-link/vcpkg.json | 10 +- ports/daw-utf-range/portfile.cmake | 16 ++- ...utfcpp.patch => utfcpp_and_portname.patch} | 68 ++++++++++++ ports/daw-utf-range/vcpkg.json | 10 +- 10 files changed, 272 insertions(+), 68 deletions(-) create mode 100644 ports/daw-header-libraries/rename_port.patch delete mode 100644 ports/daw-json-link/moved_dragonbox_and_utfcpp.patch create mode 100644 ports/daw-json-link/thirdparty_and_portname.patch rename ports/daw-utf-range/{my_utfcpp.patch => utfcpp_and_portname.patch} (59%) diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index 4154b0c1d888ff..538c9f9a05de6c 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -4,13 +4,18 @@ vcpkg_from_github( REF 2fb3c668d90a3eb4158de40daf18a860c6eb3115 SHA512 ae4f1c8fa5c2ca5e0fe7e21ba0f43cf42d746a324b69c8de5bbc2c89d7dd5f31f76302a9f713ac51533df2ace703e20b35291e30577449df1565f6a3e14ab659 HEAD_REF master + PATCHES rename_port.patch ) -file( - COPY - ${SOURCE_PATH}/include/daw - DESTINATION - ${CURRENT_PACKAGES_DIR}/include/ +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DDAW_ENABLE_TESTING=OFF ) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/daw-header-libraries/rename_port.patch b/ports/daw-header-libraries/rename_port.patch new file mode 100644 index 00000000000000..cc17801e2397d5 --- /dev/null +++ b/ports/daw-header-libraries/rename_port.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 21cfdf48..6ac9a828 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + + cmake_minimum_required(VERSION 3.14) + +-project("header_libraries" ++project("header-libraries" + VERSION "1.20.1" + DESCRIPTION "Various headers" + HOMEPAGE_URL "https://github.com/beached/header_libraries" +@@ -61,9 +61,9 @@ install(TARGETS ${PROJECT_NAME} + include(CMakePackageConfigHelpers) + + configure_package_config_file( +- "${PROJECT_SOURCE_DIR}/cmake/daw_${PROJECT_NAME}Config.cmake.in" ++ "${PROJECT_SOURCE_DIR}/cmake/daw-${PROJECT_NAME}Config.cmake.in" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" +- INSTALL_DESTINATION lib/cmake/daw_${PROJECT_NAME} ++ INSTALL_DESTINATION lib/cmake/daw-${PROJECT_NAME} + # INSTALL_DESTINATION + # ${header_libraries_INSTALL_CMAKEDIR} + ) +@@ -75,13 +75,13 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + install(EXPORT ${PROJECT_NAME}_Targets + FILE ${PROJECT_NAME}Targets.cmake + NAMESPACE daw:: +- DESTINATION lib/cmake/daw_${PROJECT_NAME} ++ DESTINATION lib/cmake/daw-${PROJECT_NAME} + # ${header_libraries_INSTALL_CMAKEDIR} + ) + + install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" +- DESTINATION lib/cmake/daw_${PROJECT_NAME} ++ DESTINATION lib/cmake/daw-${PROJECT_NAME} + #DESTINATION ${header_libraries_INSTALL_CMAKEDIR}$ + ) + +diff --git a/cmake/daw_header_librariesConfig.cmake.in b/cmake/daw-header-librariesConfig.cmake.in +rename from cmake/daw_header_librariesConfig.cmake.in +rename to cmake/daw-header-librariesConfig.cmake.in diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index 19162f575add55..99b5782f6ff73c 100644 --- a/ports/daw-header-libraries/vcpkg.json +++ b/ports/daw-header-libraries/vcpkg.json @@ -2,5 +2,15 @@ "name": "daw-header-libraries", "version-date": "2021-06-28", "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", - "homepage": "https://github.com/beached/header_libraries" + "homepage": "https://github.com/beached/header_libraries", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/daw-json-link/moved_dragonbox_and_utfcpp.patch b/ports/daw-json-link/moved_dragonbox_and_utfcpp.patch deleted file mode 100644 index 2763eba693a3b6..00000000000000 --- a/ports/daw-json-link/moved_dragonbox_and_utfcpp.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/include/daw/json/impl/daw_json_to_string.h b/include/daw/json/impl/daw_json_to_string.h -index a848c6f7..9e37e161 100644 ---- a/include/daw/json/impl/daw_json_to_string.h -+++ b/include/daw/json/impl/daw_json_to_string.h -@@ -17,14 +17,14 @@ - #include - #include - #include --#include -+#include - - #include - #include - #include - #include - #ifndef DAW_JSON_CUSTOM_D2S --#include -+#include - #elif __has_include( "custom_d2s.h" ) - #include "custom_d2s.h" - #else -@@ -247,7 +247,7 @@ namespace daw::json::utils { - copy_to_iterator( OutputIterator it, Container const &container ) { - if constexpr( do_escape ) { - using iter = daw::remove_cvref_t; -- using it_t = utf8::unchecked::iterator; -+ using it_t = daw::utf8::unchecked::iterator; - auto first = it_t( std::begin( container ) ); - auto const last = it_t( std::end( container ) ); - while( first != last ) { -@@ -328,7 +328,7 @@ namespace daw::json::utils { - } - if constexpr( do_escape ) { - -- auto chr_it = utf8::unchecked::iterator( ptr ); -+ auto chr_it = daw::utf8::unchecked::iterator( ptr ); - while( *chr_it.base( ) != '\0' ) { - auto const cp = *chr_it++; - switch( cp ) { diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake index 7b3b4f646fc143..7f676eee24f453 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -4,22 +4,20 @@ vcpkg_from_github( REF 37ecbfe7cd9d0ba660ef77998228c827ab407ff3 SHA512 0ed32115e0e51fa008c02ada9def131b699332f0765718333c2d02707b985cd5a1f558d63e40e72d290f6a9329946cdde101b2b33d50b04bf54a715efd5c3e40 HEAD_REF master - PATCHES moved_dragonbox_and_utfcpp.patch + PATCHES thirdparty_and_portname.patch ) -file( - COPY - ${SOURCE_PATH}/include/daw - DESTINATION - ${CURRENT_PACKAGES_DIR}/include/ -) -file( - COPY - ${SOURCE_PATH}/include/third_party - DESTINATION - ${CURRENT_PACKAGES_DIR}/include/daw +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DDAW_ENABLE_TESTING=OFF ) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + # Append the json-link and dragonbox license information into a single # copyright file (they are both Boost v1.0 but it is good to be clear). file(APPEND ${SOURCE_PATH}/copyright [=[+----------------------------------------------------------------------------+ diff --git a/ports/daw-json-link/thirdparty_and_portname.patch b/ports/daw-json-link/thirdparty_and_portname.patch new file mode 100644 index 00000000000000..abee399954beed --- /dev/null +++ b/ports/daw-json-link/thirdparty_and_portname.patch @@ -0,0 +1,104 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 923dd670..a0a28311 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + + cmake_minimum_required(VERSION 3.10) + +-project("json_link" ++project("json-link" + VERSION "2.9.6" + DESCRIPTION "Static JSON parsing in C++" + HOMEPAGE_URL "https://github.com/beached/daw_json_link" +@@ -18,12 +18,11 @@ set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard whose features are requ + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + +-add_subdirectory(extern) + option(DAW_ENABLE_TESTING "Build unit tests" OFF) + + include(GNUInstallDirs) + set(json_link_INSTALL_CMAKEDIR +- "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake" ++ "lib/cmake/daw-${PROJECT_NAME}" + CACHE STRING + "The install directory to use for CMake package config files") + +@@ -83,25 +82,26 @@ install(TARGETS ${PROJECT_NAME} + include(CMakePackageConfigHelpers) + + configure_package_config_file( +- "${PROJECT_SOURCE_DIR}/cmake/daw_${PROJECT_NAME}Config.cmake.in" +- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ "${PROJECT_SOURCE_DIR}/cmake/daw-${PROJECT_NAME}Config.cmake.in" ++ "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}Config.cmake" + INSTALL_DESTINATION + ${json_link_INSTALL_CMAKEDIR}) + +-write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" ++write_basic_package_version_file("daw-${PROJECT_NAME}ConfigVersion.cmake" + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion) + + install(EXPORT ${PROJECT_NAME}_Targets +- FILE ${PROJECT_NAME}Targets.cmake ++ FILE daw-${PROJECT_NAME}Targets.cmake + NAMESPACE daw:: + DESTINATION ${json_link_INSTALL_CMAKEDIR}) + +-install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" +- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" +- DESTINATION ${json_link_INSTALL_CMAKEDIR}$) ++install(FILES "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}Config.cmake" ++ "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}ConfigVersion.cmake" ++ DESTINATION ${json_link_INSTALL_CMAKEDIR}) + +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include/) ++install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/daw DESTINATION include ) ++install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/third_party DESTINATION include/daw ) + + if (DAW_ENABLE_TESTING) + enable_testing() +diff --git a/include/daw/json/impl/daw_json_to_string.h b/include/daw/json/impl/daw_json_to_string.h +index a848c6f7..9e37e161 100644 +--- a/include/daw/json/impl/daw_json_to_string.h ++++ b/include/daw/json/impl/daw_json_to_string.h +@@ -17,14 +17,14 @@ + #include + #include + #include +-#include ++#include + + #include + #include + #include + #include + #ifndef DAW_JSON_CUSTOM_D2S +-#include ++#include + #elif __has_include( "custom_d2s.h" ) + #include "custom_d2s.h" + #else +@@ -247,7 +247,7 @@ namespace daw::json::utils { + copy_to_iterator( OutputIterator it, Container const &container ) { + if constexpr( do_escape ) { + using iter = daw::remove_cvref_t; +- using it_t = utf8::unchecked::iterator; ++ using it_t = daw::utf8::unchecked::iterator; + auto first = it_t( std::begin( container ) ); + auto const last = it_t( std::end( container ) ); + while( first != last ) { +@@ -328,7 +328,7 @@ namespace daw::json::utils { + } + if constexpr( do_escape ) { + +- auto chr_it = utf8::unchecked::iterator( ptr ); ++ auto chr_it = daw::utf8::unchecked::iterator( ptr ); + while( *chr_it.base( ) != '\0' ) { + auto const cp = *chr_it++; + switch( cp ) { +diff --git a/cmake/daw_json_linkConfig.cmake.in b/cmake/daw-json-linkConfig.cmake.in +rename from cmake/daw_json_linkConfig.cmake.in +rename to cmake/daw-json-linkConfig.cmake.in diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json index 7c5a455322539b..98c028978e071e 100644 --- a/ports/daw-json-link/vcpkg.json +++ b/ports/daw-json-link/vcpkg.json @@ -4,6 +4,14 @@ "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", "homepage": "https://github.com/beached/daw_json_link", "dependencies": [ - "daw-utf-range" + "daw-utf-range", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/daw-utf-range/portfile.cmake b/ports/daw-utf-range/portfile.cmake index 1acd9f74963293..ef12562f5b320c 100644 --- a/ports/daw-utf-range/portfile.cmake +++ b/ports/daw-utf-range/portfile.cmake @@ -4,16 +4,14 @@ vcpkg_from_github( REF 6069d058c48f7b98ee2999929c146eb60a3b1313 SHA512 6a9f3abdf4c2b9569ebf3d5937a0671df33eaecc3cfc328c22dc0802a7f864f5556c50fcf31aea7e558025c801c8be693276106a7020fad951d52b67c8e5e7e5 HEAD_REF master - PATCHES my_utfcpp.patch + PATCHES utfcpp_and_portname.patch ) -file( - COPY - ${SOURCE_PATH}/include/utf8.h - ${SOURCE_PATH}/include/utf8 - ${SOURCE_PATH}/include/daw/utf_range - DESTINATION - ${CURRENT_PACKAGES_DIR}/include/daw -) +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/daw-utf-range/my_utfcpp.patch b/ports/daw-utf-range/utfcpp_and_portname.patch similarity index 59% rename from ports/daw-utf-range/my_utfcpp.patch rename to ports/daw-utf-range/utfcpp_and_portname.patch index 271b187189b41b..d7f3993d3bc535 100644 --- a/ports/daw-utf-range/my_utfcpp.patch +++ b/ports/daw-utf-range/utfcpp_and_portname.patch @@ -1,3 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04b9ac6..eb19fe3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + + cmake_minimum_required( VERSION 3.10 ) + +-project( "utf_range" ++project( "utf-range" + VERSION "1.2.2" + DESCRIPTION "UTF8 Iterator/Range for traversing utf8 text" + HOMEPAGE_URL "https://github.com/beached/utf_range" +@@ -18,8 +18,6 @@ set( CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard whose features are req + set( CMAKE_CXX_STANDARD_REQUIRED ON) + set( CMAKE_CXX_EXTENSIONS OFF) + +-add_subdirectory(extern) +- + include( GNUInstallDirs) + set( utf_range_INSTALL_CMAKEDIR + "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake" +@@ -49,31 +47,31 @@ install( TARGETS ${PROJECT_NAME} + include( CMakePackageConfigHelpers) + + configure_package_config_file( +- "${PROJECT_SOURCE_DIR}/cmake/daw_${PROJECT_NAME}Config.cmake.in" +- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" +- INSTALL_DESTINATION lib/cmake/daw_${PROJECT_NAME} ++ "${PROJECT_SOURCE_DIR}/cmake/daw-${PROJECT_NAME}Config.cmake.in" ++ "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}Config.cmake" ++ INSTALL_DESTINATION lib/cmake/daw-${PROJECT_NAME} + # INSTALL_DESTINATION + # ${utf_range_INSTALL_CMAKEDIR} + ) + +-write_basic_package_version_file( "${PROJECT_NAME}ConfigVersion.cmake" ++write_basic_package_version_file( "daw-${PROJECT_NAME}ConfigVersion.cmake" + VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion) + + install( EXPORT ${PROJECT_NAME}_Targets +- FILE ${PROJECT_NAME}Targets.cmake ++ FILE daw-${PROJECT_NAME}Targets.cmake + NAMESPACE daw:: +- DESTINATION lib/cmake/daw_${PROJECT_NAME} ++ DESTINATION lib/cmake/daw-${PROJECT_NAME} + #DESTINATION ${utf_range_INSTALL_CMAKEDIR} + ) + +-install( FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" +- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" +- DESTINATION lib/cmake/daw_${PROJECT_NAME} ++install( FILES "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}Config.cmake" ++ "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}ConfigVersion.cmake" ++ DESTINATION lib/cmake/daw-${PROJECT_NAME} + # ${utf_range_INSTALL_CMAKEDIR}$ + ) + + install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/daw DESTINATION include ) +-install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/utf8 DESTINATION include ) +-install( FILES ${PROJECT_SOURCE_DIR}/include/utf8.h DESTINATION include ) ++install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/utf8 DESTINATION include/daw ) ++install( FILES ${PROJECT_SOURCE_DIR}/include/utf8.h DESTINATION include/daw ) + diff --git a/include/daw/utf_range/daw_utf_range.h b/include/daw/utf_range/daw_utf_range.h index 36fe70d..c794934 100644 --- a/include/daw/utf_range/daw_utf_range.h @@ -117,3 +182,6 @@ index 7f00df9..b48397a 100644 } // namespace unchecked -} // namespace utf8 +} // namespace daw::utf8 +diff --git a/cmake/daw_utf_rangeConfig.cmake.in b/cmake/daw-utf-rangeConfig.cmake.in +rename from cmake/daw_utf_rangeConfig.cmake.in +rename to cmake/daw-utf-rangeConfig.cmake.in diff --git a/ports/daw-utf-range/vcpkg.json b/ports/daw-utf-range/vcpkg.json index cff97aa3f0b8ef..64157dbc0fdd31 100644 --- a/ports/daw-utf-range/vcpkg.json +++ b/ports/daw-utf-range/vcpkg.json @@ -4,6 +4,14 @@ "description": "Header-only utf8 string range used by daw-json-link. Includes a constexpr/noexcept modified version of utfcpp.", "homepage": "https://github.com/beached/header_libraries", "dependencies": [ - "daw-header-libraries" + "daw-header-libraries", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From 0b566c550d6fe2ced8e49ebb9116a94309184b23 Mon Sep 17 00:00:00 2001 From: mheyman Date: Sun, 18 Jul 2021 09:54:26 -0400 Subject: [PATCH 133/141] [daw-json-link daw-utf-range daw-header-libraries] vcpkg x-add-version --- versions/d-/daw-header-libraries.json | 2 +- versions/d-/daw-json-link.json | 2 +- versions/d-/daw-utf-range.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index 789dc94bb44422..ba60a68b579f11 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c260aacaf0465e85fbbec1136b82a4bea5f63251", + "git-tree": "ac2e26b64cc9c547c9d78fa19cf733d2c6b6a064", "version-date": "2021-06-28", "port-version": 0 } diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index e12bba09e7a32e..7a3a10f60d0a71 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "227d57e89bd2b9668d1755cb44508a24e7c00c86", + "git-tree": "0285ca0ade967334ccf07c69e803c1435da01147", "version-date": "2021-05-16", "port-version": 0 } diff --git a/versions/d-/daw-utf-range.json b/versions/d-/daw-utf-range.json index 3e054f3808198e..7000e0e9ca7a0c 100644 --- a/versions/d-/daw-utf-range.json +++ b/versions/d-/daw-utf-range.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "55f43fed58cd2901788701bb3191245b12784e59", + "git-tree": "c92a96715337b9019c1c12b2dae9596ec57c6dcc", "version-date": "2021-06-15", "port-version": 0 } From ee32418ea317d405439cbfaf4cc9c7bfdf47466b Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Tue, 20 Jul 2021 23:52:10 -0700 Subject: [PATCH 134/141] Remove useless version file --- versions/j-/json-link.json | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 versions/j-/json-link.json diff --git a/versions/j-/json-link.json b/versions/j-/json-link.json deleted file mode 100644 index 046b6e2f9ad62d..00000000000000 --- a/versions/j-/json-link.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "92e0e77fb68cbf1915b2f9b696a612241f92731a", - "version-semver": "2.9.5", - "port-version": 0 - } - ] -} From ec36220f6dc89303de36f37e1f451d058a3d3ef6 Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Sat, 24 Jul 2021 12:26:38 -0400 Subject: [PATCH 135/141] [daw-header-libraries daw-utf-8 daw-json-link] newest source --- ports/daw-header-libraries/portfile.cmake | 11 +- ports/daw-header-libraries/rename_port.patch | 44 ----- ports/daw-header-libraries/vcpkg.json | 2 +- ports/daw-json-link/portfile.cmake | 9 +- .../thirdparty_and_portname.patch | 104 ---------- ports/daw-json-link/vcpkg.json | 2 +- ports/daw-utf-range/portfile.cmake | 12 +- ports/daw-utf-range/utfcpp_and_portname.patch | 187 ------------------ ports/daw-utf-range/vcpkg.json | 2 +- 9 files changed, 18 insertions(+), 355 deletions(-) delete mode 100644 ports/daw-header-libraries/rename_port.patch delete mode 100644 ports/daw-json-link/thirdparty_and_portname.patch delete mode 100644 ports/daw-utf-range/utfcpp_and_portname.patch diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index 538c9f9a05de6c..f46de4cb6dfddf 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -1,17 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries - REF 2fb3c668d90a3eb4158de40daf18a860c6eb3115 - SHA512 ae4f1c8fa5c2ca5e0fe7e21ba0f43cf42d746a324b69c8de5bbc2c89d7dd5f31f76302a9f713ac51533df2ace703e20b35291e30577449df1565f6a3e14ab659 + REF b44178fed16111944d1338999d88b129797608ce + SHA512 0b13bec450ba68e2b2ac2e76c9c529fa84a95df092b104660c88e9cfda91df9e5b70f0f7f6bcbb4f7ea05c1a5613734ceff8d84929b37b115c2bc86c232d9261 HEAD_REF master - PATCHES rename_port.patch ) -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DDAW_ENABLE_TESTING=OFF -) +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) diff --git a/ports/daw-header-libraries/rename_port.patch b/ports/daw-header-libraries/rename_port.patch deleted file mode 100644 index cc17801e2397d5..00000000000000 --- a/ports/daw-header-libraries/rename_port.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 21cfdf48..6ac9a828 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,7 @@ - - cmake_minimum_required(VERSION 3.14) - --project("header_libraries" -+project("header-libraries" - VERSION "1.20.1" - DESCRIPTION "Various headers" - HOMEPAGE_URL "https://github.com/beached/header_libraries" -@@ -61,9 +61,9 @@ install(TARGETS ${PROJECT_NAME} - include(CMakePackageConfigHelpers) - - configure_package_config_file( -- "${PROJECT_SOURCE_DIR}/cmake/daw_${PROJECT_NAME}Config.cmake.in" -+ "${PROJECT_SOURCE_DIR}/cmake/daw-${PROJECT_NAME}Config.cmake.in" - "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" -- INSTALL_DESTINATION lib/cmake/daw_${PROJECT_NAME} -+ INSTALL_DESTINATION lib/cmake/daw-${PROJECT_NAME} - # INSTALL_DESTINATION - # ${header_libraries_INSTALL_CMAKEDIR} - ) -@@ -75,13 +75,13 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - install(EXPORT ${PROJECT_NAME}_Targets - FILE ${PROJECT_NAME}Targets.cmake - NAMESPACE daw:: -- DESTINATION lib/cmake/daw_${PROJECT_NAME} -+ DESTINATION lib/cmake/daw-${PROJECT_NAME} - # ${header_libraries_INSTALL_CMAKEDIR} - ) - - install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" - "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" -- DESTINATION lib/cmake/daw_${PROJECT_NAME} -+ DESTINATION lib/cmake/daw-${PROJECT_NAME} - #DESTINATION ${header_libraries_INSTALL_CMAKEDIR}$ - ) - -diff --git a/cmake/daw_header_librariesConfig.cmake.in b/cmake/daw-header-librariesConfig.cmake.in -rename from cmake/daw_header_librariesConfig.cmake.in -rename to cmake/daw-header-librariesConfig.cmake.in diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index 99b5782f6ff73c..25c09477650138 100644 --- a/ports/daw-header-libraries/vcpkg.json +++ b/ports/daw-header-libraries/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-header-libraries", - "version-date": "2021-06-28", + "version-semver": "1.21.1", "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", "homepage": "https://github.com/beached/header_libraries", "dependencies": [ diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake index 7f676eee24f453..3e9e1ce4bdc64f 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -1,20 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link - REF 37ecbfe7cd9d0ba660ef77998228c827ab407ff3 - SHA512 0ed32115e0e51fa008c02ada9def131b699332f0765718333c2d02707b985cd5a1f558d63e40e72d290f6a9329946cdde101b2b33d50b04bf54a715efd5c3e40 + REF d8cb3a25a545b27b6ab5e68f4480b92ad0dc78fe + SHA512 19f486c6782f6134db0f7c8a1a4031b69aeae7f64846f186bccfa37927c8a688545fe5825de841e5ec5408267922b0334db3727d00fcb96b1a36eee81a05eae9 HEAD_REF master - PATCHES thirdparty_and_portname.patch ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DDAW_ENABLE_TESTING=OFF + -DDAW_USE_PACKAGE_MANAGEMENT=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/daw-json-link/thirdparty_and_portname.patch b/ports/daw-json-link/thirdparty_and_portname.patch deleted file mode 100644 index abee399954beed..00000000000000 --- a/ports/daw-json-link/thirdparty_and_portname.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 923dd670..a0a28311 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,7 @@ - - cmake_minimum_required(VERSION 3.10) - --project("json_link" -+project("json-link" - VERSION "2.9.6" - DESCRIPTION "Static JSON parsing in C++" - HOMEPAGE_URL "https://github.com/beached/daw_json_link" -@@ -18,12 +18,11 @@ set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard whose features are requ - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - --add_subdirectory(extern) - option(DAW_ENABLE_TESTING "Build unit tests" OFF) - - include(GNUInstallDirs) - set(json_link_INSTALL_CMAKEDIR -- "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake" -+ "lib/cmake/daw-${PROJECT_NAME}" - CACHE STRING - "The install directory to use for CMake package config files") - -@@ -83,25 +82,26 @@ install(TARGETS ${PROJECT_NAME} - include(CMakePackageConfigHelpers) - - configure_package_config_file( -- "${PROJECT_SOURCE_DIR}/cmake/daw_${PROJECT_NAME}Config.cmake.in" -- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" -+ "${PROJECT_SOURCE_DIR}/cmake/daw-${PROJECT_NAME}Config.cmake.in" -+ "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}Config.cmake" - INSTALL_DESTINATION - ${json_link_INSTALL_CMAKEDIR}) - --write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" -+write_basic_package_version_file("daw-${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${PROJECT_VERSION} - COMPATIBILITY SameMajorVersion) - - install(EXPORT ${PROJECT_NAME}_Targets -- FILE ${PROJECT_NAME}Targets.cmake -+ FILE daw-${PROJECT_NAME}Targets.cmake - NAMESPACE daw:: - DESTINATION ${json_link_INSTALL_CMAKEDIR}) - --install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" -- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" -- DESTINATION ${json_link_INSTALL_CMAKEDIR}$) -+install(FILES "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}Config.cmake" -+ "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}ConfigVersion.cmake" -+ DESTINATION ${json_link_INSTALL_CMAKEDIR}) - --install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include/) -+install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/daw DESTINATION include ) -+install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/third_party DESTINATION include/daw ) - - if (DAW_ENABLE_TESTING) - enable_testing() -diff --git a/include/daw/json/impl/daw_json_to_string.h b/include/daw/json/impl/daw_json_to_string.h -index a848c6f7..9e37e161 100644 ---- a/include/daw/json/impl/daw_json_to_string.h -+++ b/include/daw/json/impl/daw_json_to_string.h -@@ -17,14 +17,14 @@ - #include - #include - #include --#include -+#include - - #include - #include - #include - #include - #ifndef DAW_JSON_CUSTOM_D2S --#include -+#include - #elif __has_include( "custom_d2s.h" ) - #include "custom_d2s.h" - #else -@@ -247,7 +247,7 @@ namespace daw::json::utils { - copy_to_iterator( OutputIterator it, Container const &container ) { - if constexpr( do_escape ) { - using iter = daw::remove_cvref_t; -- using it_t = utf8::unchecked::iterator; -+ using it_t = daw::utf8::unchecked::iterator; - auto first = it_t( std::begin( container ) ); - auto const last = it_t( std::end( container ) ); - while( first != last ) { -@@ -328,7 +328,7 @@ namespace daw::json::utils { - } - if constexpr( do_escape ) { - -- auto chr_it = utf8::unchecked::iterator( ptr ); -+ auto chr_it = daw::utf8::unchecked::iterator( ptr ); - while( *chr_it.base( ) != '\0' ) { - auto const cp = *chr_it++; - switch( cp ) { -diff --git a/cmake/daw_json_linkConfig.cmake.in b/cmake/daw-json-linkConfig.cmake.in -rename from cmake/daw_json_linkConfig.cmake.in -rename to cmake/daw-json-linkConfig.cmake.in diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json index 98c028978e071e..84ccbe00a3c7fe 100644 --- a/ports/daw-json-link/vcpkg.json +++ b/ports/daw-json-link/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-json-link", - "version-date": "2021-05-16", + "version-semver": "2.9.11", "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", "homepage": "https://github.com/beached/daw_json_link", "dependencies": [ diff --git a/ports/daw-utf-range/portfile.cmake b/ports/daw-utf-range/portfile.cmake index ef12562f5b320c..156cf3d0d469c1 100644 --- a/ports/daw-utf-range/portfile.cmake +++ b/ports/daw-utf-range/portfile.cmake @@ -1,13 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/utf_range - REF 6069d058c48f7b98ee2999929c146eb60a3b1313 - SHA512 6a9f3abdf4c2b9569ebf3d5937a0671df33eaecc3cfc328c22dc0802a7f864f5556c50fcf31aea7e558025c801c8be693276106a7020fad951d52b67c8e5e7e5 + REF b20d4037db30f69ef73daa4428a631f95e0bbb10 + SHA512 4f9d4b4831c4bd6dc560830077965ae5b3351dc7695d0523262bc6229c8d7623e03338be772337f89084038d7039b4a0b41ef8de2ef98eb880f85ca5e01d5838 HEAD_REF master - PATCHES utfcpp_and_portname.patch ) -vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_cmake_configure( + SOURCE_PATH + ${SOURCE_PATH} + OPTIONS + -DDAW_USE_PACKAGE_MANAGEMENT=ON +) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) diff --git a/ports/daw-utf-range/utfcpp_and_portname.patch b/ports/daw-utf-range/utfcpp_and_portname.patch deleted file mode 100644 index d7f3993d3bc535..00000000000000 --- a/ports/daw-utf-range/utfcpp_and_portname.patch +++ /dev/null @@ -1,187 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04b9ac6..eb19fe3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,7 @@ - - cmake_minimum_required( VERSION 3.10 ) - --project( "utf_range" -+project( "utf-range" - VERSION "1.2.2" - DESCRIPTION "UTF8 Iterator/Range for traversing utf8 text" - HOMEPAGE_URL "https://github.com/beached/utf_range" -@@ -18,8 +18,6 @@ set( CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard whose features are req - set( CMAKE_CXX_STANDARD_REQUIRED ON) - set( CMAKE_CXX_EXTENSIONS OFF) - --add_subdirectory(extern) -- - include( GNUInstallDirs) - set( utf_range_INSTALL_CMAKEDIR - "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake" -@@ -49,31 +47,31 @@ install( TARGETS ${PROJECT_NAME} - include( CMakePackageConfigHelpers) - - configure_package_config_file( -- "${PROJECT_SOURCE_DIR}/cmake/daw_${PROJECT_NAME}Config.cmake.in" -- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" -- INSTALL_DESTINATION lib/cmake/daw_${PROJECT_NAME} -+ "${PROJECT_SOURCE_DIR}/cmake/daw-${PROJECT_NAME}Config.cmake.in" -+ "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}Config.cmake" -+ INSTALL_DESTINATION lib/cmake/daw-${PROJECT_NAME} - # INSTALL_DESTINATION - # ${utf_range_INSTALL_CMAKEDIR} - ) - --write_basic_package_version_file( "${PROJECT_NAME}ConfigVersion.cmake" -+write_basic_package_version_file( "daw-${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${PROJECT_VERSION} - COMPATIBILITY SameMajorVersion) - - install( EXPORT ${PROJECT_NAME}_Targets -- FILE ${PROJECT_NAME}Targets.cmake -+ FILE daw-${PROJECT_NAME}Targets.cmake - NAMESPACE daw:: -- DESTINATION lib/cmake/daw_${PROJECT_NAME} -+ DESTINATION lib/cmake/daw-${PROJECT_NAME} - #DESTINATION ${utf_range_INSTALL_CMAKEDIR} - ) - --install( FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" -- "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" -- DESTINATION lib/cmake/daw_${PROJECT_NAME} -+install( FILES "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}Config.cmake" -+ "${PROJECT_BINARY_DIR}/daw-${PROJECT_NAME}ConfigVersion.cmake" -+ DESTINATION lib/cmake/daw-${PROJECT_NAME} - # ${utf_range_INSTALL_CMAKEDIR}$ - ) - - install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/daw DESTINATION include ) --install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/utf8 DESTINATION include ) --install( FILES ${PROJECT_SOURCE_DIR}/include/utf8.h DESTINATION include ) -+install( DIRECTORY ${PROJECT_SOURCE_DIR}/include/utf8 DESTINATION include/daw ) -+install( FILES ${PROJECT_SOURCE_DIR}/include/utf8.h DESTINATION include/daw ) - -diff --git a/include/daw/utf_range/daw_utf_range.h b/include/daw/utf_range/daw_utf_range.h -index 36fe70d..c794934 100644 ---- a/include/daw/utf_range/daw_utf_range.h -+++ b/include/daw/utf_range/daw_utf_range.h -@@ -10,7 +10,7 @@ - - #include - #include --#include -+#include - - #include - #include -@@ -21,7 +21,7 @@ - namespace daw { - namespace range { - using char_iterator = char const *; -- using utf_iterator = utf8::unchecked::iterator; -+ using utf_iterator = daw::utf8::unchecked::iterator; - using utf_val_type = utf_iterator::value_type; - - constexpr size_t hash_sequence( char_iterator first, -@@ -95,7 +95,7 @@ namespace daw { - - constexpr void advance( size_t const n ) noexcept { - assert( n <= m_size ); -- utf8::unchecked::advance( m_begin, n ); -+ daw::utf8::unchecked::advance( m_begin, n ); - m_size -= n; - } - -@@ -317,7 +317,7 @@ namespace daw { - - inline std::string from_u32string( std::u32string const &other ) { - std::string result; -- utf8::unchecked::utf32to8( other.begin( ), other.end( ), -+ daw::utf8::unchecked::utf32to8( other.begin( ), other.end( ), - std::back_inserter( result ) ); - return result; - } -diff --git a/include/daw/utf_range/daw_utf_string.h b/include/daw/utf_range/daw_utf_string.h -index 1cce2da..780a472 100644 ---- a/include/daw/utf_range/daw_utf_string.h -+++ b/include/daw/utf_range/daw_utf_string.h -@@ -10,7 +10,7 @@ - - #include - #include --#include -+#include - - #include - #include -@@ -174,7 +174,7 @@ namespace daw { - std::copy( cbegin( ), cend( ), std::back_inserter( result ) ); - std::sort( result.begin( ), result.end( ) ); - m_values.clear( ); -- utf8::unchecked::utf32to8( result.cbegin( ), result.cend( ), -+ daw::utf8::unchecked::utf32to8( result.cbegin( ), result.cend( ), - std::back_inserter( m_values ) ); - m_range = daw::range::create_char_range( m_values ); - } -diff --git a/include/utf8/checked.h b/include/utf8/checked.h -index c74171e..4d6f211 100644 ---- a/include/utf8/checked.h -+++ b/include/utf8/checked.h -@@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE. - #include - #include - --namespace utf8 { -+namespace daw::utf8 { - // Exceptions that may be thrown from the library functions. - class invalid_code_point { - uint32_t cp; -@@ -379,4 +379,4 @@ namespace utf8 { - }; // class iterator - template - iterator( octet_iterator ) -> iterator; --} // namespace utf8 -+} // namespace daw::utf8 -diff --git a/include/utf8/core.h b/include/utf8/core.h -index bd9e461..78d7acc 100644 ---- a/include/utf8/core.h -+++ b/include/utf8/core.h -@@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE. - #include - #include - --namespace utf8 { -+namespace daw::utf8 { - // The typedefs for 8-bit, 16-bit and 32-bit unsigned integers - // You may need to change them to match your system. - // These typedefs have the same names as ones from cstdint, or boost/cstdint -@@ -333,4 +333,4 @@ namespace utf8 { - ( utf8::internal::mask8( *it++ ) ) == bom[1] && - ( utf8::internal::mask8( *it ) ) == bom[2] ); - } --} // namespace utf8 -+} // namespace daw::utf8 -diff --git a/include/utf8/unchecked.h b/include/utf8/unchecked.h -index 7f00df9..b48397a 100644 ---- a/include/utf8/unchecked.h -+++ b/include/utf8/unchecked.h -@@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE. - #include "core.h" - #include - --namespace utf8 { -+namespace daw::utf8 { - namespace unchecked { - template - constexpr octet_iterator append( uint32_t cp, -@@ -276,4 +276,4 @@ namespace utf8 { - return it -= n; - } - } // namespace unchecked --} // namespace utf8 -+} // namespace daw::utf8 -diff --git a/cmake/daw_utf_rangeConfig.cmake.in b/cmake/daw-utf-rangeConfig.cmake.in -rename from cmake/daw_utf_rangeConfig.cmake.in -rename to cmake/daw-utf-rangeConfig.cmake.in diff --git a/ports/daw-utf-range/vcpkg.json b/ports/daw-utf-range/vcpkg.json index 64157dbc0fdd31..468da7e7c44b18 100644 --- a/ports/daw-utf-range/vcpkg.json +++ b/ports/daw-utf-range/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-utf-range", - "version-date": "2021-06-15", + "version-semver": "2.1.0", "description": "Header-only utf8 string range used by daw-json-link. Includes a constexpr/noexcept modified version of utfcpp.", "homepage": "https://github.com/beached/header_libraries", "dependencies": [ From 829a103a2e279e776b93fc5e7c547306e458c3ca Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Sat, 24 Jul 2021 12:28:18 -0400 Subject: [PATCH 136/141] [daw-header-libraries daw-utf-range daw-json-link] vcpkg x-add-version --- versions/baseline.json | 14 +++++++------- versions/d-/daw-header-libraries.json | 5 +++++ versions/d-/daw-json-link.json | 5 +++++ versions/d-/daw-utf-range.json | 5 +++++ 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index ddf588c9b7d94a..95455e4c7a3ecd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1625,15 +1625,15 @@ "port-version": 1 }, "daw-header-libraries": { - "baseline": "2021-06-28", + "baseline": "1.21.1", "port-version": 0 }, "daw-json-link": { - "baseline": "2021-05-16", + "baseline": "2.9.11", "port-version": 0 }, "daw-utf-range": { - "baseline": "2021-06-15", + "baseline": "2.1.0", "port-version": 0 }, "dbg-macro": { @@ -3132,14 +3132,14 @@ "baseline": "0.6.0-1", "port-version": 0 }, - "libebur128": { - "baseline": "1.2.6", - "port-version": 0 - }, "libe57": { "baseline": "1.1.312", "port-version": 0 }, + "libebur128": { + "baseline": "1.2.6", + "port-version": 0 + }, "libepoxy": { "baseline": "1.5.5", "port-version": 0 diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index ba60a68b579f11..434297d647f164 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de065ce0440bc2a7590d29b3973e5626b5578478", + "version-semver": "1.21.1", + "port-version": 0 + }, { "git-tree": "ac2e26b64cc9c547c9d78fa19cf733d2c6b6a064", "version-date": "2021-06-28", diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index 7a3a10f60d0a71..a2129b19d33ec9 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b0fd6b35fca94fbfbd426477e187865a8a927a3", + "version-semver": "2.9.11", + "port-version": 0 + }, { "git-tree": "0285ca0ade967334ccf07c69e803c1435da01147", "version-date": "2021-05-16", diff --git a/versions/d-/daw-utf-range.json b/versions/d-/daw-utf-range.json index 7000e0e9ca7a0c..eab6394d42412e 100644 --- a/versions/d-/daw-utf-range.json +++ b/versions/d-/daw-utf-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c64f9ccd83260eebb2d17002ba29004b2eb6c21d", + "version-semver": "2.1.0", + "port-version": 0 + }, { "git-tree": "c92a96715337b9019c1c12b2dae9596ec57c6dcc", "version-date": "2021-06-15", From 43eee125a431dbdd0d59bd74217ab451c57213e6 Mon Sep 17 00:00:00 2001 From: mheyman Date: Sat, 31 Jul 2021 06:37:56 -0400 Subject: [PATCH 137/141] [daw-header-libraries daw-json-link daw-utf-range] doc: comment as header-only in portfile.cmake --- ports/daw-header-libraries/portfile.cmake | 2 ++ ports/daw-json-link/portfile.cmake | 2 ++ ports/daw-utf-range/portfile.cmake | 2 ++ 3 files changed, 6 insertions(+) diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index f46de4cb6dfddf..06753efd930d86 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -1,3 +1,4 @@ +# Header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries @@ -11,6 +12,7 @@ vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +# remove empty lib and debug/lib directories (and duplicate files from debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake index 3e9e1ce4bdc64f..97ec4b5e3fec65 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -1,3 +1,4 @@ +# Header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link @@ -15,6 +16,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) +# remove empty lib and debug/lib directories (and duplicate files from debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Append the json-link and dragonbox license information into a single diff --git a/ports/daw-utf-range/portfile.cmake b/ports/daw-utf-range/portfile.cmake index 156cf3d0d469c1..e3b8e10c892ce3 100644 --- a/ports/daw-utf-range/portfile.cmake +++ b/ports/daw-utf-range/portfile.cmake @@ -1,3 +1,4 @@ +# Header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/utf_range @@ -16,6 +17,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +# remove empty lib and debug/lib directories (and duplicate files from debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 02ae5ad0843f9b74bc58f12c3f760afb35e364de Mon Sep 17 00:00:00 2001 From: mheyman Date: Sat, 31 Jul 2021 06:42:18 -0400 Subject: [PATCH 138/141] [daw-header-libraries daw-json-link daw-utf-range] --overwrite-version x-add-version --- versions/d-/daw-header-libraries.json | 2 +- versions/d-/daw-json-link.json | 2 +- versions/d-/daw-utf-range.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index 434297d647f164..09c03e38b6070c 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "de065ce0440bc2a7590d29b3973e5626b5578478", + "git-tree": "6687948f2f2f4c3ba578a8ac41624c58a541f1a2", "version-semver": "1.21.1", "port-version": 0 }, diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index a2129b19d33ec9..99459567cc1b60 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7b0fd6b35fca94fbfbd426477e187865a8a927a3", + "git-tree": "04d0df53fc3b69309aa10f53cc92f0933e8139b8", "version-semver": "2.9.11", "port-version": 0 }, diff --git a/versions/d-/daw-utf-range.json b/versions/d-/daw-utf-range.json index eab6394d42412e..a4a924164ad083 100644 --- a/versions/d-/daw-utf-range.json +++ b/versions/d-/daw-utf-range.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c64f9ccd83260eebb2d17002ba29004b2eb6c21d", + "git-tree": "e1c08fdf12013384e9a86e5233245321fea58793", "version-semver": "2.1.0", "port-version": 0 }, From d4c360a8ccf5eae3291e2c3b1bbb24167ad7f2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 2 Aug 2021 14:08:36 +0800 Subject: [PATCH 139/141] Update versions/d-/daw-header-libraries.json --- versions/d-/daw-header-libraries.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index 09c03e38b6070c..7abb51e03b8d8a 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -4,11 +4,6 @@ "git-tree": "6687948f2f2f4c3ba578a8ac41624c58a541f1a2", "version-semver": "1.21.1", "port-version": 0 - }, - { - "git-tree": "ac2e26b64cc9c547c9d78fa19cf733d2c6b6a064", - "version-date": "2021-06-28", - "port-version": 0 } ] } From ce2e42f6d3a29c28239bbde108dfbc5728088701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 2 Aug 2021 14:08:42 +0800 Subject: [PATCH 140/141] Update versions/d-/daw-json-link.json --- versions/d-/daw-json-link.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index 99459567cc1b60..7f49b0d5743026 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -4,11 +4,6 @@ "git-tree": "04d0df53fc3b69309aa10f53cc92f0933e8139b8", "version-semver": "2.9.11", "port-version": 0 - }, - { - "git-tree": "0285ca0ade967334ccf07c69e803c1435da01147", - "version-date": "2021-05-16", - "port-version": 0 } ] } From 028a75774986cbf5214bfc185c7bf07c25279d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 2 Aug 2021 14:08:48 +0800 Subject: [PATCH 141/141] Update versions/d-/daw-utf-range.json --- versions/d-/daw-utf-range.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/d-/daw-utf-range.json b/versions/d-/daw-utf-range.json index a4a924164ad083..dec5553b5c7070 100644 --- a/versions/d-/daw-utf-range.json +++ b/versions/d-/daw-utf-range.json @@ -4,11 +4,6 @@ "git-tree": "e1c08fdf12013384e9a86e5233245321fea58793", "version-semver": "2.1.0", "port-version": 0 - }, - { - "git-tree": "c92a96715337b9019c1c12b2dae9596ec57c6dcc", - "version-date": "2021-06-15", - "port-version": 0 } ] }