diff --git a/ports/ableton-link/portfile.cmake b/ports/ableton-link/portfile.cmake index 037080cdc05b5a..f256465ac308f6 100644 --- a/ports/ableton-link/portfile.cmake +++ b/ports/ableton-link/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ableton/link REF "Link-${VERSION}" - SHA512 4c62357b74ed8bed21455d977504787ff4c11a862a0ee583c491742c93f6f4bc44b98df2a35f7811584277456b7580835098bc7b9afdd57caf7bd91f9462d202 + SHA512 d82529d08897833c3fd6f19eca1689dfbfeac945daa4f1cb5a5719248ba1428875084155761d4de9521d486552e82ea47c71009fa8ef868ed4dca86a561f5c3e HEAD_REF master PATCHES replace_local_asiostandalone_by_vcpkg_asio.patch diff --git a/ports/ableton-link/vcpkg.json b/ports/ableton-link/vcpkg.json index 4dc7efc5b33316..c31232eb3914a3 100644 --- a/ports/ableton-link/vcpkg.json +++ b/ports/ableton-link/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ableton-link", - "version": "3.1.0", + "version": "3.1.1", "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.", "homepage": "https://www.ableton.com/en/link/", "documentation": "http://ableton.github.io/link/", diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 7737254f8d825c..5b48dd025d2077 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp REF "${VERSION}" - SHA512 14390380655c41483a98487e3b012110dd8d1743fdd68d8cde7e0d7c2730312d564b15726d8c9d2fff237d2fce3983bbbb5213f59612c7c6feaeb402dff9609f + SHA512 41504899ac4fd4a6eaa0a5fdf27a7765ec81962fb99b6a07982ceed32c5289e9eb12206c83a70fd44c5c3e1b96c2bfa160eb12f1dbbb45f1109d632c7690de90 HEAD_REF master ) diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 80a5876b1def11..8af6da0828b70d 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "abseil", - "version": "20230802.1", + "version": "20240116.1", "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake index b1bcf668f6afc4..70150d26303c4f 100644 --- a/ports/ada-url/portfile.cmake +++ b/ports/ada-url/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ada-url/ada REF "v${VERSION}" - SHA512 941b522f8aec7959557a1238b23a48b7d3e4ff4035b0897d23fc7dba26cc227b2b3e48d8ecd03431c871041d52870015361ff6a595fa4872a640943b55c62617 + SHA512 987782dacee5115f061f5579257fddf3ed26cdb8654279ce47915bef03abe7ca9904f0f4082b774be23772a3400925e908db45d9da935c7683269aae0ac2186a HEAD_REF main PATCHES no-cpm.patch diff --git a/ports/ada-url/vcpkg.json b/ports/ada-url/vcpkg.json index 6458884acdf4a6..dbc0417161a156 100644 --- a/ports/ada-url/vcpkg.json +++ b/ports/ada-url/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ada-url", - "version": "2.7.6", + "version": "2.7.7", "description": "WHATWG-compliant and fast URL parser written in modern C++", "homepage": "https://ada-url.com/", "license": "MIT", diff --git a/ports/alsa/portfile.cmake b/ports/alsa/portfile.cmake index 1dfcaab8cddc1a..e60bf0817c58c8 100644 --- a/ports/alsa/portfile.cmake +++ b/ports/alsa/portfile.cmake @@ -11,6 +11,12 @@ On Alpine: apk add autoconf automake libtool" ) +vcpkg_download_distfile(ALSA_VERSION_SCRIPT_PATCH + URLS https://github.com/alsa-project/alsa-lib/commit/2a736a0d2543f206fd2653aaae8a08a4c42eb917.diff?full_index=1 + FILENAME alsa-version-script-2a736a.patch + SHA512 d3f2c73b8e8fbae36de43c1db6b59489a0a28c1bc7992f13f40e83f64dfcaaee2d6688b7133668f54685e2d92a2cc06ad03b2efdb40c3c1da7f020f9f0a04de7 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alsa-project/alsa-lib @@ -18,17 +24,10 @@ vcpkg_from_github( SHA512 da9277007dd3b197fcafb748ced4ace89fdb1ab5eafae7596e91935ee9fb410be54fa76aabe86cdd83227e48cd073a7df319e90bdf06fa2da7c97470c085645d HEAD_REF master PATCHES - "fix-plugin-dir.patch" + fix-plugin-dir.patch + ${ALSA_VERSION_SCRIPT_PATCH} ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(BUILD_OPTS --enable-shared=yes --enable-static=no) -else() - set(BUILD_OPTS --enable-shared=no --enable-static=yes) -endif() - - - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(ALSA_PLUGIN_DIR "/usr/lib/x86_64-linux-gnu/alsa-lib") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") diff --git a/ports/alsa/usage b/ports/alsa/usage index 283dfeac717734..7a69ce572b2582 100644 --- a/ports/alsa/usage +++ b/ports/alsa/usage @@ -1,5 +1,4 @@ +alsa is compatible with built-in CMake targets: -CMake provides the module target: - - find_package("ALSA" MODULE REQUIRED) - target_link_libraries("main" PRIVATE "ALSA::ALSA") + find_package(ALSA REQUIRED) + target_link_libraries(main PRIVATE ALSA::ALSA) # since CMake 3.12 diff --git a/ports/alsa/vcpkg.json b/ports/alsa/vcpkg.json index 031df979fa7460..50c18047db9a29 100644 --- a/ports/alsa/vcpkg.json +++ b/ports/alsa/vcpkg.json @@ -1,6 +1,7 @@ { "name": "alsa", "version": "1.2.11", + "port-version": 1, "description": "The Advanced Linux Sound Architecture (ALSA) - library", "homepage": "https://www.alsa-project.org/", "license": "LGPL-2.1-or-later", diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 4b06f9f3d70ea4..22776d389554b8 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 b426421336c6bc3757626b2743a039d3c7030ad257c3bcf3247a236462dbc140b7eff4476cb727f4d048144a90c1368740c139318f8237d6cc20e87d3efdaf74 + SHA512 6c83e3be1e5840c30387f088315b74aca8e7c2d060793af70a156effb496a71e3e6af0693188c0f46f8a4a061a263a47095912ef04a5dc8141abd59075b14c78 ) vcpkg_extract_source_archive( SOURCE_PATH diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 6eef74be651fcf..26f50909529f95 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "arrow", - "version": "15.0.1", + "version": "15.0.2", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake index 917ed3bb2979da..663fe4ea4b03bc 100644 --- a/ports/aws-c-auth/portfile.cmake +++ b/ports/aws-c-auth/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-auth REF "v${VERSION}" - SHA512 d062c22b718e35f5da843b4ae0071405a3627982c0ad55d4214920650086cd6da35f0c3b21d6360c4324dde3f647faa47e5c3331fd5a58930c6de31d27093321 + SHA512 48081ef8b9fb824f84e34b2083c17faa42d6098b014cf2a9b3399a18c87f4027adfbddd9faf1bbedc658f54e343d6abbcf14b545ec36b4e08e23138507b49ae8 HEAD_REF master ) diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json index 33d2c12be6da8c..9b5c0f0aa286a8 100644 --- a/ports/aws-c-auth/vcpkg.json +++ b/ports/aws-c-auth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-auth", - "version": "0.7.14", + "version": "0.7.16", "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", "homepage": "https://github.com/awslabs/aws-c-auth", "license": "Apache-2.0", diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake index 3cef1fbb2825a2..744a3bc704a71e 100644 --- a/ports/aws-c-cal/portfile.cmake +++ b/ports/aws-c-cal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-cal REF "v${VERSION}" - SHA512 deee106b366522e6781974c92b1aa06542b7857b91a8d4cb59eb0e17247ce7fc3ffacb044c032ff7f2a0f9baca807d4c2d9a14934d4576966f48bfc0661e5edb + SHA512 b3a00aa7cd322e16216744f622b7e36028da4a7a085e7bd967d5946ca4026f8d88c1d3891e970e2d8ae96939cb2c1b4ae30f8ca8117187877309979810863f36 HEAD_REF master PATCHES remove-libcrypto-messages.patch ) diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json index b1d22ed8eade63..14b30dc5b0a9b0 100644 --- a/ports/aws-c-cal/vcpkg.json +++ b/ports/aws-c-cal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-cal", - "version": "0.6.9", + "version": "0.6.10", "description": "C99 wrapper for cryptography primitives.", "homepage": "https://github.com/awslabs/aws-c-cal", "license": "Apache-2.0", diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index bc6320315c3c2f..8e1d2c4f775afc 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common REF "v${VERSION}" - SHA512 8bcada7b7b89f25b9469a3f21dad250f9e1ffde185f3202ba32cc47c27ade1994505f8b5bd19ccefb6ef905d2ffbd985f406c5c0337fbd8a936f71798710ff0e + SHA512 9c9f9c7294216d569724104096ab93b5b0635435603763f2caf35a4ec596758397ed1c91655d5f566fc4344275841708c21723b1d2cef7b772c95ac62c14705c HEAD_REF master PATCHES disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json index 438e962b6e4a21..6e770905c2b9d2 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-common", - "version": "0.9.12", + "version": "0.9.14", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", "license": "Apache-2.0", diff --git a/ports/aws-c-compression/portfile.cmake b/ports/aws-c-compression/portfile.cmake index 0cd5e84c66da67..dbcdcd43268e2d 100644 --- a/ports/aws-c-compression/portfile.cmake +++ b/ports/aws-c-compression/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-compression REF "v${VERSION}" - SHA512 7813ae3d19336a187dd218d22748a09b397aea68f344e44ce0472490babdd7c7a4bb94d586a38d7f0c7d3b6f29502ec9ccf080b020e15fd24891ec1b3cdb4663 + SHA512 1f955719fbaa40a7b57b2a6cffac485ce0008fdcbddcea10785456458d16a402b43f8129dd9fd4d057031c3aa83f5e65b9e0b72879e2a56ad23235ab048d0646 HEAD_REF master ) diff --git a/ports/aws-c-compression/vcpkg.json b/ports/aws-c-compression/vcpkg.json index 351ad87cea14cd..ec08caa7cd2117 100644 --- a/ports/aws-c-compression/vcpkg.json +++ b/ports/aws-c-compression/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-compression", - "version": "0.2.17", + "version": "0.2.18", "description": "C99 implementation of huffman encoding/decoding", "homepage": "https://github.com/awslabs/aws-c-compression", "license": "Apache-2.0", diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake index b22fcd23ae0270..d89b1457da31a6 100644 --- a/ports/aws-c-event-stream/portfile.cmake +++ b/ports/aws-c-event-stream/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-event-stream REF "v${VERSION}" - SHA512 839dbdd6878481aebdbb44a273e42009898256bed63cc10414f0a4fc9e207feeeb8191b60196f6d0c936d70d8035cd0e8e2fff35864b2c0f546714d41b401067 + SHA512 5ae252c4b774f988ad81163a6e7ed8d971b7ffabcbc4ee1fc950cce3f5986f6ee57454178ee52dbdda1ff3ee74716fcfe0ac9349feb67b5bc10961fb92cf7ff9 HEAD_REF master ) diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json index 82917bcf76949d..f8a6f5ba966b68 100644 --- a/ports/aws-c-event-stream/vcpkg.json +++ b/ports/aws-c-event-stream/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-event-stream", - "version": "0.4.1", + "version": "0.4.2", "description": "C99 implementation of the vnd.amazon.event-stream content-type.", "homepage": "https://github.com/awslabs/aws-c-event-stream", "license": "Apache-2.0", diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake index 78e1c6e1eec5ac..331383e5430b7a 100644 --- a/ports/aws-c-io/portfile.cmake +++ b/ports/aws-c-io/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-io REF "v${VERSION}" - SHA512 bb8666853abbd583aea2f30099fe947562809ccab36ae11708c118b5bd6a7876b8d94ef45bb988b44c4dd1dc76e6dff70adb7a20b8b5d89d2d7ea2138b3ecea8 + SHA512 45346375ababd3331750a81b0632a3ddbc64ed9716f54809c6bd6f097368a7f586d5c74e5663cabbea2dfa74c9395bd2eb91e7402f80a7a9e18b242b49134a73 HEAD_REF master ) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index 82c44b016691b8..d31e971405a62e 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-io", - "version": "0.14.3", + "version": "0.14.6", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", "license": "Apache-2.0", diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake index ff0f9a4af0b880..32eeafdc2e4cb1 100644 --- a/ports/aws-c-mqtt/portfile.cmake +++ b/ports/aws-c-mqtt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-mqtt REF "v${VERSION}" - SHA512 05c435b1310ecc3ab1ef38ec65b3ec483c0923f12d83d9cc73e20bf78068421de7d254cef763deddcf128d34a8d0126b22a6e98009c851aea30d8dd65af9b72b + SHA512 1ad2056a9ae4695b10d91752f04e7dbd8c5a1568eacb107cbdb46584cee2fea3f8a64dd808b7304cf952bbaa314e483eb8070219c703120a23299c0ac581d5d8 HEAD_REF master ) diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json index d2c323386b2d5a..fbd546e1286e63 100644 --- a/ports/aws-c-mqtt/vcpkg.json +++ b/ports/aws-c-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-mqtt", - "version": "0.10.1", + "version": "0.10.3", "description": "C99 implementation of the MQTT 3.1.1 specification.", "homepage": "https://github.com/awslabs/aws-c-mqtt", "license": "Apache-2.0", diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake index 452e8556447398..3ac7bf55fff8a7 100644 --- a/ports/aws-c-s3/portfile.cmake +++ b/ports/aws-c-s3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-s3 REF "v${VERSION}" - SHA512 9c97327ce06e3977b7cce409a679c1f815fb6b315c61b2c2cb8912b76fc7a19e0bbe5d2733630fa7dccb76a9d8f61236d60191c57b896eb9bf6ae3961dda39d1 + SHA512 2fe2a33fa1470a6f993e53c66dff3cc984dcd25b50001fb49e8e901602ea22a6b363a6d5221e56e54356615245718459eed73f63d1d2425c88b35496572845f1 HEAD_REF master ) diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json index 0b8e74ccd743af..3ef2d57fc5d685 100644 --- a/ports/aws-c-s3/vcpkg.json +++ b/ports/aws-c-s3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-s3", - "version": "0.5.0", + "version": "0.5.3", "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.", "homepage": "https://github.com/awslabs/aws-c-s3", "license": "Apache-2.0", diff --git a/ports/aws-c-sdkutils/portfile.cmake b/ports/aws-c-sdkutils/portfile.cmake index e4ef1f31eda034..4a8beb5ed389fd 100644 --- a/ports/aws-c-sdkutils/portfile.cmake +++ b/ports/aws-c-sdkutils/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-sdkutils REF "v${VERSION}" - SHA512 e364613363c6dd50a97209bd4fa7b926fec2ca5eb4bac07fb0c44eecbf847d2d1a671ffa7edda613bbbab4eaf27973945be61d66b32b851ae31c8f3508e7137a + SHA512 ea2a018393f93a453f45a369915ce8155f88d4014e3eb622063813060ca72e941356cac3dfa4a83617ab36876521f58ce73beaffea352fbeb0745247271bf5ae HEAD_REF master ) diff --git a/ports/aws-c-sdkutils/vcpkg.json b/ports/aws-c-sdkutils/vcpkg.json index 4bfe24f3b46ee2..45961a0984674e 100644 --- a/ports/aws-c-sdkutils/vcpkg.json +++ b/ports/aws-c-sdkutils/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-sdkutils", - "version": "0.1.14", + "version": "0.1.15", "description": "C99 library implementing AWS SDK specific utilities. Includes utilities for ARN parsing, reading AWS profiles, etc...", "homepage": "https://github.com/awslabs/aws-c-sdkutils", "license": "Apache-2.0", diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake index 07234e6ca53ba2..beb960323ad03b 100644 --- a/ports/aws-checksums/portfile.cmake +++ b/ports/aws-checksums/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-checksums REF "v${VERSION}" - SHA512 b75f5442db9a61f8856756c4a784339fd446effca0cdb02c67e51ce9f14ea76f5ca94d29a69f2a452c63c868598489343ec1d097432a8a0159868731422cfbf4 + SHA512 2c2557bed09c77717d70814e86fb9a71284f8f3b9d87e2c2d477f39307a13fe1fbb652a6bb90021114154ee195e8da993ac7df965acc62cd53a597f12817a7a6 HEAD_REF master ) diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json index c915c21576cc5d..a184c9875f0919 100644 --- a/ports/aws-checksums/vcpkg.json +++ b/ports/aws-checksums/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-checksums", - "version": "0.1.17", + "version": "0.1.18", "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-checksums", "license": "Apache-2.0", diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake index 5234ae83852f8d..9016387a392c9f 100644 --- a/ports/aws-crt-cpp/portfile.cmake +++ b/ports/aws-crt-cpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-crt-cpp REF "v${VERSION}" - SHA512 f48c955fb1e9feef2a963572ed1bdc49e52f5ea6b3150d2f49f1c6d94e58ecd016ff020bf8ee272e5c192f0e214dbf8e47aad5f4fa722d4d207c170b029b3c80 + SHA512 357fd22056b24e939d300a2e5f3eb61e6f2683cc1ec187a3a198b25b5908f07c07af38c3e862befb17254a0029f4994e4af43c070620a6a03e7d112c6eabcd25 PATCHES no-werror.patch ) diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json index f952d931bff6c6..aabbe7187aceaa 100644 --- a/ports/aws-crt-cpp/vcpkg.json +++ b/ports/aws-crt-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-crt-cpp", - "version": "0.26.1", + "version": "0.26.4", "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.", "homepage": "https://github.com/awslabs/aws-crt-cpp", "license": "Apache-2.0", diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 0c41c11f3e80d6..93a78e109f3606 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 1d34541c4e310634df7cde51cb18b3bc741579b7e513085f4d1a5c2248c55daa24f9b21f0383434c91b357c13ef4f24fed18b204680e5caad2965722f67563c6 + SHA512 826be806ddd87eb452f97df70b19df4194e984775408d8f99246244b6949abcab583e4cbe1ae3bc5d61f3c78267d0e75ea9e69956188ab12e0318344a4314591 PATCHES patch-relocatable-rpath.patch fix-aws-root.patch diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index cbe626657fef08..f080de705895da 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.11.255", + "version": "1.11.285", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/ports/backward-cpp/portfile.cmake b/ports/backward-cpp/portfile.cmake index a81ef1fdc5bdda..feaad6324f6fed 100644 --- a/ports/backward-cpp/portfile.cmake +++ b/ports/backward-cpp/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBACKWARD_TESTS=OFF ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/backward) diff --git a/ports/backward-cpp/vcpkg.json b/ports/backward-cpp/vcpkg.json index 8499af6b165550..a2560755659907 100644 --- a/ports/backward-cpp/vcpkg.json +++ b/ports/backward-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "backward-cpp", "version-date": "2023-11-24", + "port-version": 1, "description": "A beautiful stack trace pretty printer for C++", "homepage": "https://github.com/bombela/backward-cpp", "supports": "!uwp & !(windows & arm)", diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake index 60d9c241fcc2e9..7a6f29fde95105 100644 --- a/ports/baresip-libre/portfile.cmake +++ b/ports/baresip-libre/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baresip/re REF "v${VERSION}" - SHA512 d19fc5c48399ad4942c27d86c47350f579f8ebeaf8dc04b13a930b930c13a20e5e7dd5f0fe05d11b6b365667d8306f2499f5cb925850f4484049ba853d36b0b1 + SHA512 f7aadce42e6d3477ab36cac44557d0c1c2df2f5a4c8f0d295d230345b1a73e2747360893d4d5de7dce3326eb0713680f59865eb86bdd3f224015c197fa41ccfe HEAD_REF main PATCHES fix-static-library-build.patch diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index 9ba2447ad1b98b..49008e4245abd7 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,6 +1,6 @@ { "name": "baresip-libre", - "version": "3.9.0", + "version": "3.10.0", "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index 4c41721c2da773..ba03b3419db6f7 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BOINC/boinc REF "client_release/${MAJOR_MINOR}/${VERSION}" - SHA512 d66664df49b83fb71e8f06e6f9ca0aee720ec04b1fb95b08426ee9af365403605624ba6dc1f78f3fba3f966d365b610ed24ceffdc54b071509f4f0bf959e027c + SHA512 ca3eeee36270c73926e2a3a10e400d356c95046c1bc9ea08378b835f4d4958c7145d55888c8f3048ef0b8f8136126cf442104fd57d8b75c9d7420c28fd50466b HEAD_REF master ) diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 9c51a90402fea1..9350668a262e37 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boinc", - "version": "7.24.3", + "version": "8.0.0", "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 272051b82b8191..aaa168aaae9b5c 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -9,7 +9,11 @@ set(USER_CONFIG_TOOLSET_OPTIONS "") set(USER_CONFIG_EXTRA_LINES "") set(USER_CONFIG_REQUIREMENTS "") -set(B2_OPTIONS "") +# Avoid forcing initialization of B2_OPTIONS here to allow some users to add custom configuration options to this command via VCPKG_CHAINLOAD_TOOLCHAIN_FILE. +if(NOT DEFINED B2_OPTIONS) + set(B2_OPTIONS "") +endif() + include("${VCPKG_CMAKE_VARS_FILE}") @@ -247,6 +251,9 @@ if(NOT python_versions STREQUAL "") endif() endif() +# Remove duplicates from B2_OPTIONS since VCPKG_CHAINLOAD_TOOLCHAIN_FILE may be loaded multiple times in some cases. +list(REMOVE_DUPLICATES B2_OPTIONS) + if("${PORT}" STREQUAL "boost-mpi" OR "${PORT}" STREQUAL "boost-graph-parallel") string(APPEND USER_CONFIG_EXTRA_LINES "using mpi : : \"${CURRENT_INSTALLED_DIR}/lib\"\n" diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 216989d9492eda..e6a0b676a3590b 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-modular-build-helper", "version": "1.84.0", - "port-version": 2, + "port-version": 3, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/ports/botan/fix-cmake-usage.patch b/ports/botan/fix-cmake-usage.patch new file mode 100644 index 00000000000000..3c5f5b06960ab8 --- /dev/null +++ b/ports/botan/fix-cmake-usage.patch @@ -0,0 +1,62 @@ +diff --git a/src/build-data/botan-config.cmake.in b/src/build-data/botan-config.cmake.in +index 8d14c4e..46e2cbc 100644 +--- a/src/build-data/botan-config.cmake.in ++++ b/src/build-data/botan-config.cmake.in +@@ -65,21 +65,29 @@ if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_FOUND AND NOT ${${CMAKE_FIND_PACKAGE_NAME} + return() + endif() + +-# botan-config.cmake lives in "${_Botan_PREFIX}/lib/cmake/Botan-X": traverse up to $_Botan_PREFIX ++# botan-config.cmake lives in "${_Botan_PREFIX}/share/botan": traverse up to $_Botan_PREFIX + set(_Botan_PREFIX "${CMAKE_CURRENT_LIST_DIR}") + get_filename_component(_Botan_PREFIX "${_Botan_PREFIX}" DIRECTORY) + get_filename_component(_Botan_PREFIX "${_Botan_PREFIX}" DIRECTORY) +-get_filename_component(_Botan_PREFIX "${_Botan_PREFIX}" DIRECTORY) + + %{if build_static_lib} + if(NOT TARGET Botan::Botan-static) + add_library(Botan::Botan-static STATIC IMPORTED) + set_target_properties(Botan::Botan-static + PROPERTIES +- IMPORTED_LOCATION "${_Botan_PREFIX}/lib/%{static_lib_name}" +- INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include/botan-%{version_major}" ++ INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include" + IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" + INTERFACE_LINK_OPTIONS "SHELL:%{cxx_abi_flags}") ++ if(EXISTS "${_Botan_PREFIX}/debug/lib/%{static_lib_name}") ++ set_property(TARGET Botan::Botan-static APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) ++ set_target_properties(Botan::Botan-static PROPERTIES ++ IMPORTED_LOCATION_DEBUG "${_Botan_PREFIX}/debug/lib/%{static_lib_name}" ++ ) ++ endif() ++ set_property(TARGET Botan::Botan-static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) ++ set_target_properties(Botan::Botan-static PROPERTIES ++ IMPORTED_LOCATION_RELEASE "${_Botan_PREFIX}/lib/%{static_lib_name}" ++ ) + endif() + %{endif} + +@@ -100,10 +108,20 @@ if(NOT TARGET Botan::Botan) + add_library(Botan::Botan SHARED IMPORTED) + set_target_properties(Botan::Botan + PROPERTIES +- IMPORTED_LOCATION "${_Botan_shared_lib}" +- IMPORTED_IMPLIB "${_Botan_implib}" +- INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include/botan-%{version_major}" ++ INTERFACE_INCLUDE_DIRECTORIES "${_Botan_PREFIX}/include" + INTERFACE_LINK_OPTIONS "SHELL:%{cxx_abi_flags}") ++ if(EXISTS "${_Botan_PREFIX}/debug/lib/%{implib_name}") ++ set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) ++ set_target_properties(Botan::Botan PROPERTIES ++ IMPORTED_IMPLIB_DEBUG "${_Botan_PREFIX}/debug/lib/%{implib_name}" ++ IMPORTED_LOCATION_DEBUG "${_Botan_PREFIX}/debug/bin/%{shared_lib_name}" ++ ) ++ endif() ++ set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) ++ set_target_properties(Botan::Botan PROPERTIES ++ IMPORTED_IMPLIB_RELEASE "${_Botan_PREFIX}/lib/%{implib_name}" ++ IMPORTED_LOCATION_RELEASE "${_Botan_PREFIX}/bin/%{shared_lib_name}" ++ ) + set_property(TARGET Botan::Botan APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) + set_target_properties(Botan::Botan + PROPERTIES diff --git a/ports/botan/libcxx-winpthread-fixes.patch b/ports/botan/libcxx-winpthread-fixes.patch index e490804de36d66..2b6b0274b2fa55 100644 --- a/ports/botan/libcxx-winpthread-fixes.patch +++ b/ports/botan/libcxx-winpthread-fixes.patch @@ -15,7 +15,7 @@ @@ -627,6 +627,8 @@ static_cast(pthread_set_name_np(thread.native_handle(), name.c_str())); #elif defined(BOTAN_TARGET_OS_IS_NETBSD) - static_cast(pthread_set_name_np(thread.native_handle(), "%s", const_cast(name.c_str()))); + static_cast(pthread_setname_np(thread.native_handle(), "%s", const_cast(name.c_str()))); + #elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(_LIBCPP_HAS_THREAD_API_PTHREAD) + static_cast(pthread_setname_np(thread.native_handle(), name.c_str())); #elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(BOTAN_BUILD_COMPILER_IS_MSVC) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index ca6a0c14ee7553..1854eee9010e8a 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan REF "${VERSION}" - SHA512 13f40635fc92b00b9392aa8ed96b5825f0cc8147d51337e2c225e0f29d0428732293190aa5fb2a7d2c5e7d57db748ae0fbed4536dee8af00e8d6fd405e784e1d + SHA512 5b3e22ad14bf0c37d97835c8309d1a5797cfab67b14ebfad9fd69a999ee27fe97d42ecff5e57e598d21575d053c07c30995f8c2d5f3a23433fb59d6bab45e1e7 HEAD_REF master PATCHES embed-debug-info.patch @@ -11,6 +11,7 @@ vcpkg_from_github( configure-zlib.patch fix_android.patch libcxx-winpthread-fixes.patch + fix-cmake-usage.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}") @@ -176,6 +177,8 @@ else() endif() endif() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Botan-3.3.0) + file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-3/botan" "${CURRENT_PACKAGES_DIR}/include/botan") if(pkgconfig_requires) diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 5a28565a04a91b..5ff0ca125b3e8e 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,12 +1,15 @@ { "name": "botan", - "version": "3.2.0", - "port-version": 1, + "version": "3.3.0", "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", "supports": "!uwp", "dependencies": [ + { + "name": "vcpkg-cmake-config", + "host": true + }, { "name": "vcpkg-cmake-get-vars", "host": true diff --git a/ports/brpc/fix-build.patch b/ports/brpc/fix-build.patch index 3e193c4677b3b4..89376a4d984a91 100644 --- a/ports/brpc/fix-build.patch +++ b/ports/brpc/fix-build.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4ac815d6..dbb9b7ee 100644 +index f364cd13..f4add26d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,8 @@ endif() @@ -91,7 +91,7 @@ index dfad5fd8..8423d55a 100644 set(GFLAGS_FOUND TRUE) endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fbcc7cc5..95037a0d 100644 +index fbcc7cc5..868270ea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,16 +31,24 @@ add_dependencies(SOURCES_LIB PROTO_LIB) @@ -121,7 +121,7 @@ index fbcc7cc5..95037a0d 100644 # for protoc-gen-mcpack set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin) -@@ -49,35 +57,62 @@ set(protoc_gen_mcpack_SOURCES +@@ -49,35 +57,63 @@ set(protoc_gen_mcpack_SOURCES ) add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES}) @@ -131,7 +131,7 @@ index fbcc7cc5..95037a0d 100644 add_library(brpc-shared SHARED $ $ $) -- target_link_libraries(brpc-shared ${DYNAMIC_LIB}) + target_link_libraries(brpc-shared ${DYNAMIC_LIB}) + target_include_directories(brpc-shared PUBLIC $) if(BRPC_WITH_GLOG) target_link_libraries(brpc-shared ${GLOG_LIB}) diff --git a/ports/brpc/fix-glog.patch b/ports/brpc/fix-glog.patch index 3eb40acadaa23f..04800e98c0c0db 100644 --- a/ports/brpc/fix-glog.patch +++ b/ports/brpc/fix-glog.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4add26..b87e845 100644 +index f4add26d..b87e8455 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,9 +80,10 @@ include(GNUInstallDirs) @@ -54,7 +54,7 @@ index f4add26..b87e845 100644 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") #required by butil/crc32.cc to boost performance for 10x diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 95037a0..24007d7 100644 +index 868270ea..a70ad23f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,6 +31,10 @@ add_dependencies(SOURCES_LIB PROTO_LIB) @@ -78,9 +78,9 @@ index 95037a0..24007d7 100644 target_include_directories(brpc-static PUBLIC $) SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) -@@ -64,9 +65,6 @@ if(BUILD_SHARED_LIBS) - $ +@@ -65,9 +66,6 @@ if(BUILD_SHARED_LIBS) $) + target_link_libraries(brpc-shared ${DYNAMIC_LIB}) target_include_directories(brpc-shared PUBLIC $) - if(BRPC_WITH_GLOG) - target_link_libraries(brpc-shared ${GLOG_LIB}) diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index 4d394cfce70500..20a60977f2a80a 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "brpc", "version": "1.6.1", - "port-version": 2, + "port-version": 3, "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "homepage": "https://github.com/apache/incubator-brpc", "license": "Apache-2.0", diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index 02b2a5051437c2..e9b47b2114baac 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool REF "v${VERSION}" - SHA512 37ebde68a9dc74204fc3df90a8f69cf17be241224eb2176d0841be0d412f8882ecf9abcc7eb61a19874b542988c22a88b4f7087efa86d0f435f996fa438eef5a + SHA512 4908f00def23082e7ddc0b24a710e53b3fde51b02188e79cfcd9dabb22627ebd1b6e5b3c4bf1b366eae79660c26878cc034c171747c3d0b7ef8a98c85a77033b HEAD_REF master ) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 9001e25978365c..9390a97180c19e 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bshoshany-thread-pool", - "version": "4.0.1", + "version": "4.1.0", "maintainers": "Barak Shoshany ", "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library", "homepage": "https://github.com/bshoshany/thread-pool", diff --git a/ports/cctz/fix_vs177.patch b/ports/cctz/fix_vs177.patch deleted file mode 100644 index 02f3839d5f8141..00000000000000 --- a/ports/cctz/fix_vs177.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/include/cctz/civil_time_detail.h b/include/cctz/civil_time_detail.h -index decc5f2..26c5aef 100644 ---- a/include/cctz/civil_time_detail.h -+++ b/include/cctz/civil_time_detail.h -@@ -353,11 +353,11 @@ class civil_time { - : civil_time(ct.f_) {} - - // Factories for the maximum/minimum representable civil_time. -- static CONSTEXPR_F civil_time (max)() { -+ static CONSTEXPR_F auto (max)() -> civil_time { - const auto max_year = (std::numeric_limits::max)(); - return civil_time(max_year, 12, 31, 23, 59, 59); - } -- static CONSTEXPR_F civil_time (min)() { -+ static CONSTEXPR_F auto (min)() -> civil_time { - const auto min_year = (std::numeric_limits::min)(); - return civil_time(min_year, 1, 1, 0, 0, 0); - } diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake index e9ba61e343507e..5457d5939cbb78 100644 --- a/ports/cctz/portfile.cmake +++ b/ports/cctz/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/cctz - REF v2.3 - SHA512 e688ddac1bff108e8315bf94cb61483b72b0d16f601e4e1eeb0fd5c064aefe5a573eee66e8903401aa4c2be71ea9f10dd6c9a9cdf8379f5bb6073248a21a83ff + REF "v${VERSION}" + SHA512 6d50fe5263b66f93bc3f9aee0da395352d0e95187e6a761afd1b82a461c127823fe93e06139e9d8989f24875b70de3058aab6e66639b408c7930f117e1815e5e HEAD_REF master - PATCHES - fix_vs177.patch #https://github.com/google/cctz/pull/273 ) vcpkg_cmake_configure( diff --git a/ports/cctz/vcpkg.json b/ports/cctz/vcpkg.json index 2c5ebb92be476b..a74fb5c6417ab0 100644 --- a/ports/cctz/vcpkg.json +++ b/ports/cctz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cctz", - "version": "2.3", - "port-version": 7, + "version": "2.4", "description": "two libraries that cooperate with to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.", "homepage": "https://github.com/google/cctz", "dependencies": [ diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 5ceb1570cb02ae..4cc25786876e63 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -4,12 +4,9 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.6 - SHA512 87817169f49c30d8dc4fa5e61ce9b28be5b1f0a9fcd3ebe0cb08b044631a2455de76c53d3cffaa1984f033f5fe21c9b55f54628fc431b7d3a34b3b3e18ad206d + REF v5.6.1 + SHA512 943413bf3b94da066d47051b22f1c1b66a39a43dad865dd0e4912a9ae6508d9a490bcfe4ef7d662844e9a1ba6e552748fad785b52b2cce98133c2dfdfbfe1a4d HEAD_REF master - PATCHES - x86_windows.patch - # Upstream patch: https://github.com/CGAL/cgal/pull/7635 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index 89915389e310a9..3e2f96999d29af 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cgal", - "version": "5.6", - "port-version": 1, + "version": "5.6.1", "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.", "homepage": "https://github.com/CGAL/cgal", "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0", diff --git a/ports/cld3/fix-build.patch b/ports/cld3/fix-build.patch new file mode 100644 index 00000000000000..5711d518bb4ac4 --- /dev/null +++ b/ports/cld3/fix-build.patch @@ -0,0 +1,83 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2fa3908..37e9944 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,11 +1,11 @@ + # This cmake scripts only builds a static cld3 lib and the unittests. + +-project(cld3) + + # Old versions of cmake dont search/find protobuf lite + cmake_minimum_required(VERSION 3.9) ++project(cld3) + +-find_package(Protobuf REQUIRED) ++find_package(Protobuf CONFIG REQUIRED) + message(STATUS "Protobuf_FOUND= ${Protobuf_FOUND}") + message(STATUS "Protobuf_VERSION= ${Protobuf_VERSION}") + message(WARNING "Protobuf 2.5 and CLD3 seems happy together. This script does NOT check if your verison of protobuf is compatible.") +@@ -20,9 +20,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/misc/myprotobuf.cmake) + my_protobuf_generate_cpp(cld_3/protos PROTO_SRCS PROTO_HDRS src/feature_extractor.proto src/sentence.proto src/task_spec.proto) + message(STATUS "PROTO_HDRS= ${PROTO_HDRS}") + +-add_definitions(-fPIC) # Position Independant Code +-add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) +-add_definitions(-std=c++11) # Needed for std::to_string(), ... + + include_directories(${CMAKE_CURRENT_BINARY_DIR} ${Protobuf_INCLUDE_DIRS}) # needed to include generated pb headers + +@@ -58,6 +55,10 @@ add_library(${PROJECT_NAME} + src/script_span/fixunicodevalue.cc + ) + ++target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) ++target_link_libraries(${PROJECT_NAME} PUBLIC protobuf::libprotobuf-lite) ++ ++if(BUILD_TESTS) + # unit tests exec: + add_executable(language_identifier_main src/language_identifier_main.cc) + target_link_libraries(language_identifier_main cld3 ${Protobuf_LITE_LIBRARIES}) +@@ -67,3 +68,4 @@ target_link_libraries(getonescriptspan_test cld3 ${Protobuf_LITE_LIBRARIES}) + + add_executable(language_identifier_features_test src/language_identifier_features_test.cc) + target_link_libraries(language_identifier_features_test cld3 ${Protobuf_LITE_LIBRARIES}) ++endif() +diff --git a/src/base.h b/src/base.h +index 20189e2..3c610e3 100644 +--- a/src/base.h ++++ b/src/base.h +@@ -71,7 +71,7 @@ typedef unsigned short uint16; // NOLINT + typedef signed int char32; + #endif // SWIG + +-#ifdef COMPILER_MSVC ++#ifdef _MSC_VER + typedef __int64 int64; + #else + typedef long long int64; // NOLINT +diff --git a/src/script_span/utf8statetable.cc b/src/script_span/utf8statetable.cc +index 8fcfb1e..87da972 100644 +--- a/src/script_span/utf8statetable.cc ++++ b/src/script_span/utf8statetable.cc +@@ -17,7 +17,7 @@ + // 32- or 16-bit Unicode values. + // + +-#ifdef COMPILER_MSVC ++#ifdef _MSC_VER + // MSVC warns: warning C4309: 'initializing' : truncation of constant value + // But the value is in fact not truncated. 0xFF still comes out 0xFF at + // runtime. +diff --git a/src/sentence_features.h b/src/sentence_features.h +index cc0be88..e2e27d2 100644 +--- a/src/sentence_features.h ++++ b/src/sentence_features.h +@@ -34,7 +34,7 @@ using WholeSentenceExtractor = FeatureExtractor; + // for clang's -Wundefined-var-template. However, MSVC has a bug which treats + // this declaration as a definition, leading to multiple definition errors, so + // omit this on MSVC. +-#if !defined(COMPILER_MSVC) ++#if !defined(_MSC_VER) + template <> + WholeSentenceFeature::Registry + *RegisterableClass::registry_; diff --git a/ports/cld3/portfile.cmake b/ports/cld3/portfile.cmake index a6057fc221521b..4f204c6ce0f5ab 100644 --- a/ports/cld3/portfile.cmake +++ b/ports/cld3/portfile.cmake @@ -9,12 +9,12 @@ vcpkg_from_github( SHA512 c3650ffbf5855aaf04d03930f01c6efd76e1f2b2d47365348721f16531a14653ae5b3aff8fefa8e5fa1c769fdf1a9b441a88bc687f97f8c579b84f17c6984c9e HEAD_REF master PATCHES + fix-build.patch unofficial-export.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/cld3/unofficial-export.patch b/ports/cld3/unofficial-export.patch index 1f4474627eb1fd..99b900d089e09a 100644 --- a/ports/cld3/unofficial-export.patch +++ b/ports/cld3/unofficial-export.patch @@ -1,35 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2fa3908..d776dd1 100644 +index 37e9944..fb27632 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -21,7 +21,6 @@ my_protobuf_generate_cpp(cld_3/protos PROTO_SRCS PROTO_HDRS src/feature_extracto - message(STATUS "PROTO_HDRS= ${PROTO_HDRS}") +@@ -57,6 +57,19 @@ add_library(${PROJECT_NAME} - add_definitions(-fPIC) # Position Independant Code --add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) - add_definitions(-std=c++11) # Needed for std::to_string(), ... - - include_directories(${CMAKE_CURRENT_BINARY_DIR} ${Protobuf_INCLUDE_DIRS}) # needed to include generated pb headers -@@ -58,6 +57,7 @@ add_library(${PROJECT_NAME} - src/script_span/fixunicodevalue.cc - ) - -+if (0) # Disable unit tests - # unit tests exec: - add_executable(language_identifier_main src/language_identifier_main.cc) - target_link_libraries(language_identifier_main cld3 ${Protobuf_LITE_LIBRARIES}) -@@ -67,3 +67,24 @@ target_link_libraries(getonescriptspan_test cld3 ${Protobuf_LITE_LIBRARIES}) - - add_executable(language_identifier_features_test src/language_identifier_features_test.cc) - target_link_libraries(language_identifier_features_test cld3 ${Protobuf_LITE_LIBRARIES}) -+endif() -+ -+if (MSVC) -+ add_compile_definitions(COMPILER_MSVC) -+endif() -+ -+target_link_libraries(${PROJECT_NAME} PUBLIC protobuf::libprotobuf-lite) -+ + target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) + target_link_libraries(${PROJECT_NAME} PUBLIC protobuf::libprotobuf-lite) +target_include_directories(${PROJECT_NAME} PUBLIC $) + +install(TARGETS ${PROJECT_NAME} @@ -43,3 +19,6 @@ index 2fa3908..d776dd1 100644 + NAMESPACE unofficial::cld3:: + DESTINATION share/unofficial-cld3 +) + + if(BUILD_TESTS) + # unit tests exec: diff --git a/ports/cld3/vcpkg.json b/ports/cld3/vcpkg.json index c8b367387bc1bd..7cd1f19da08d30 100644 --- a/ports/cld3/vcpkg.json +++ b/ports/cld3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cld3", "version": "3.0.14", - "port-version": 1, + "port-version": 2, "description": "Compact Language Detector v3", "homepage": "https://github.com/google/cld3", "license": "Apache-2.0", diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index 8b246bee6e816b..7224f1b260b489 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v2.4.0 - SHA512 21c6e7861c5b5481079f78fd1585c77c7c73dd8f06a58a673922ee12fa0ffd2ba6c485de427a4e4ee3e5d710b8dc9483e70da0dc2a67c46d3fd77ebdfe300f79 + REF "v${VERSION}" + SHA512 965290d09977672d3bc3c57ca4b89a88c2c09461da6e866b18217d702d4d5a0977588fcb8fef1a3c3804e61ad80d276029f47469cc83dbfdc7021ee35f6b7269 HEAD_REF main ) @@ -21,5 +21,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/CLI11) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/cli11/vcpkg.json b/ports/cli11/vcpkg.json index 7b48eb55debee9..b16e5867f44240 100644 --- a/ports/cli11/vcpkg.json +++ b/ports/cli11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cli11", - "version": "2.4.0", + "version": "2.4.1", "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.", "homepage": "https://github.com/CLIUtils/CLI11", "license": "BSD-3-Clause", diff --git a/ports/cnats/portfile.cmake b/ports/cnats/portfile.cmake index 66cabd10d71e04..a12e924327c634 100644 --- a/ports/cnats/portfile.cmake +++ b/ports/cnats/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nats-io/nats.c REF "v${VERSION}" - SHA512 0670a2b7fb70a49e2b1f5cbccf2406a3ecaf04b48b4147dc2ead9cb106f1673efa79b5e40d3bb557986ade35da2158b58b324603f98a58258a497dc57cb5d700 + SHA512 d32979a686420fe23af96b58efcf366ff9ff315531ca54962f2ae8ae7126174b5ca10a74152cc14f49be1143d0ad7dd5a68beeb31126410c76dbaa0468a45382 HEAD_REF main PATCHES fix-sodium-dep.patch diff --git a/ports/cnats/vcpkg.json b/ports/cnats/vcpkg.json index 1cbf12825a355d..5a99a99982d031 100644 --- a/ports/cnats/vcpkg.json +++ b/ports/cnats/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cnats", - "version": "3.7.0", - "port-version": 1, + "version": "3.8.0", "description": "A C client for the NATS messaging system", "homepage": "https://github.com/nats-io/nats.c", "license": "Apache-2.0", diff --git a/ports/correlation-vector-cpp/correlation-vector.patch b/ports/correlation-vector-cpp/correlation-vector.patch new file mode 100644 index 00000000000000..de1a2d5ab4b91c --- /dev/null +++ b/ports/correlation-vector-cpp/correlation-vector.patch @@ -0,0 +1,50 @@ +diff --git a/CorrelationVector/CMakeLists.txt b/CorrelationVector/CMakeLists.txt +index 2b32f8b..2c3a0ec 100644 +--- a/CorrelationVector/CMakeLists.txt ++++ b/CorrelationVector/CMakeLists.txt +@@ -9,7 +9,7 @@ include (CVOptions) + include (CVHelpers) + + add_global_definitions () +-set_global_compile_flags () ++#set_global_compile_flags () + + set(CORRELATION_VECTOR_VERSION_MAJOR 1) + set(CORRELATION_VECTOR_VERSION_MINOR 0) +diff --git a/CorrelationVector/cmake/correlation_vector-config.in.cmake b/CorrelationVector/cmake/correlation_vector-config.in.cmake +index 6b389d5..9c4fb5a 100644 +--- a/CorrelationVector/cmake/correlation_vector-config.in.cmake ++++ b/CorrelationVector/cmake/correlation_vector-config.in.cmake +@@ -1 +1,7 @@ ++# Optional dependency for Linux ++if(UNIX) ++ include(CMakeFindDependencyMacro) ++ find_dependency(unofficial-libuuid) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/correlation_vector-targets.cmake") +\ No newline at end of file +diff --git a/CorrelationVector/src/CMakeLists.txt b/CorrelationVector/src/CMakeLists.txt +index 00baa66..08f3fc9 100644 +--- a/CorrelationVector/src/CMakeLists.txt ++++ b/CorrelationVector/src/CMakeLists.txt +@@ -15,16 +15,9 @@ else() + if (WIN32) + target_compile_definitions(${TARGETNAME} PUBLIC GUID_WINDOWS) + elseif (UNIX) +- # apt-get install pkg-config uuid-dev +- find_package(PkgConfig REQUIRED) +- # TODO: move to FindUUID module +- pkg_check_modules(UUID uuid) +- if (UUID_FOUND) +- message("Found and using uuid.") +- target_include_directories(${TARGETNAME} PUBLIC ${UUID_INCLUDE_DIRS}) +- target_link_libraries(${TARGETNAME} PRIVATE ${UUID_LIBRARIES}) +- target_compile_definitions(${TARGETNAME} PUBLIC GUID_LIBUUID) +- endif() ++ find_package(unofficial-libuuid REQUIRED) ++ target_compile_definitions(${TARGETNAME} PUBLIC GUID_LIBUUID) ++ target_link_libraries(${TARGETNAME} PRIVATE unofficial::UUID::uuid) + endif() + endif() + diff --git a/ports/correlation-vector-cpp/portfile.cmake b/ports/correlation-vector-cpp/portfile.cmake new file mode 100644 index 00000000000000..99555c7bf408e3 --- /dev/null +++ b/ports/correlation-vector-cpp/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/CorrelationVector-Cpp + REF cf38d2b44baaf352509ad9980786bc49554c32e4 + SHA512 f97eaef649ffd010fb79bca0ae6cb7ce6792dcb38f6a5180d04dc6542589d0d727583455bbafb319982cfed1291384180d49c7f32ebe7560b444ec132c76d0c4 + HEAD_REF master + PATCHES + "correlation-vector.patch" +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME correlation_vector CONFIG_PATH lib/correlation_vector) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/correlation-vector-cpp/usage b/ports/correlation-vector-cpp/usage new file mode 100644 index 00000000000000..be0f91b33de6e1 --- /dev/null +++ b/ports/correlation-vector-cpp/usage @@ -0,0 +1,4 @@ +The package CorrelationVector-Cpp provides CMake targets: + + find_package(correlation_vector CONFIG REQUIRED) + target_link_libraries(main PRIVATE microsoft::correlation_vector) diff --git a/ports/correlation-vector-cpp/vcpkg.json b/ports/correlation-vector-cpp/vcpkg.json new file mode 100644 index 00000000000000..c7a602f99e7aa1 --- /dev/null +++ b/ports/correlation-vector-cpp/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "correlation-vector-cpp", + "version": "1.0", + "description": "CorrelationVector-Cpp provides a reference C++ implementation of the CorrelationVector protocol for tracing and correlation of events through a distributed system.", + "homepage": "https://github.com/microsoft/CorrelationVector-Cpp", + "license": "MIT", + "dependencies": [ + { + "name": "libuuid", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/cpptrace/portfile.cmake b/ports/cpptrace/portfile.cmake index 7ca2f6a405d22e..cccc7c0d54b247 100644 --- a/ports/cpptrace/portfile.cmake +++ b/ports/cpptrace/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jeremy-rifkin/cpptrace REF "v${VERSION}" - SHA512 f36f2aa6f94570eac5e01faafdf1fed98f7e308558726ed2499bcf58cb2e9e838fa928b3d32eaca93173976340f72534d340d662491c51ee75ed633b026c14bc + SHA512 ae2f9a317d70ce798c1a85d6898d073e65e21febc17c6c0127467ecb9d639f4df102cba37f2199a941a46201933fb75ae1b37cc3042d31f4c94e0279969e642a HEAD_REF main ) diff --git a/ports/cpptrace/vcpkg.json b/ports/cpptrace/vcpkg.json index 491106f0f12338..42a8bf7297da58 100644 --- a/ports/cpptrace/vcpkg.json +++ b/ports/cpptrace/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpptrace", - "version": "0.4.1", + "version": "0.5.1", "description": "Simple, portable, and self-contained stacktrace library for C++11 and newer", "homepage": "https://github.com/jeremy-rifkin/cpptrace", "license": "MIT", diff --git a/ports/cppwinrt/cppwinrt-config.cmake b/ports/cppwinrt/cppwinrt-config.cmake deleted file mode 100644 index c3e7575257e085..00000000000000 --- a/ports/cppwinrt/cppwinrt-config.cmake +++ /dev/null @@ -1,14 +0,0 @@ -set(CppWinRT_FOUND TRUE) - -if(NOT TARGET Microsoft::CppWinRT) - get_filename_component(cppwinrt_root "${CMAKE_CURRENT_LIST_DIR}" PATH) - get_filename_component(cppwinrt_root "${cppwinrt_root}" PATH) - - add_library(Microsoft::CppWinRT INTERFACE IMPORTED) - set_target_properties(Microsoft::CppWinRT PROPERTIES - INTERFACE_COMPILE_FEATURES cxx_std_17 - INTERFACE_INCLUDE_DIRECTORIES "${cppwinrt_root}/include" - INTERFACE_LINK_LIBRARIES "${cppwinrt_root}/lib/cppwinrt_fast_forwarder.lib" - ) - unset(cppwinrt_root) -endif() diff --git a/ports/cppwinrt/cppwinrt-config.cmake.in b/ports/cppwinrt/cppwinrt-config.cmake.in new file mode 100644 index 00000000000000..bacfdb6e657045 --- /dev/null +++ b/ports/cppwinrt/cppwinrt-config.cmake.in @@ -0,0 +1,24 @@ +get_filename_component(_cppwinrt_root "${CMAKE_CURRENT_LIST_DIR}" PATH) +get_filename_component(_cppwinrt_root "${_cppwinrt_root}" PATH) + +set(_cppwinrt_exe "${_cppwinrt_root}/@tool_path@") +if (EXISTS "${_cppwinrt_exe}") + + add_library(Microsoft::CppWinRT INTERFACE IMPORTED) + set_target_properties(Microsoft::CppWinRT PROPERTIES + INTERFACE_COMPILE_FEATURES cxx_std_17 + INTERFACE_INCLUDE_DIRECTORIES "${_cppwinrt_root}/include" + INTERFACE_LINK_LIBRARIES "${_cppwinrt_root}/lib/@lib_name@" + ) + + set(cppwinrt_FOUND TRUE) + set(CPPWINRT_TOOL ${_cppwinrt_exe}) + +else() + + set(cppwinrt_FOUND FALSE) + +endif() + +unset(_cppwinrt_root) +unset(_cppwinrt_exe) diff --git a/ports/cppwinrt/portfile.cmake b/ports/cppwinrt/portfile.cmake index 8353a8b65f5717..e75af26f6e7a89 100644 --- a/ports/cppwinrt/portfile.cmake +++ b/ports/cppwinrt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://www.nuget.org/api/v2/package/Microsoft.Windows.CppWinRT/${VERSION}" FILENAME "cppwinrt.${VERSION}.zip" - SHA512 6ce0764c3558d94b0ec72daa6d6d139df3942d33f51d1f3a670b888fbba2b556e35df831fa9eea42d4fc9a0a1f0ca94abef1c4013dcc9b51053bffe2af4dfd85 + SHA512 c6c38b81640d7d96d3ca76c321289d6f92eec9bb593a11824640c7dc3651dc69cce1e85ca0324396b4a4d55f790f2c16f835da261e7821137de1eb491b52ffc8 ) vcpkg_extract_source_archive( @@ -43,7 +43,8 @@ file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") file(WRITE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/cppwinrt.rsp" "${args}") #--- Generate headers -message(STATUS "Generating headers for Windows SDK $ENV{WindowsSDKVersion}") +string(REGEX MATCH "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+" SDKVersion $ENV{WindowsSDKVersion}) +message(STATUS "Generating headers for Windows SDK ${SDKVersion}") vcpkg_execute_required_process( COMMAND "${CPPWINRT_TOOL}" "@${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/cppwinrt.rsp" @@ -54,16 +55,18 @@ vcpkg_execute_required_process( ) set(CPPWINRT_LIB "${src}/build/native/lib/${CPPWINRT_ARCH}/cppwinrt_fast_forwarder.lib") -file(COPY "${CPPWINRT_LIB}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -if(NOT VCPKG_BUILD_TYPE) - file(COPY "${CPPWINRT_LIB}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +file(INSTALL "${CPPWINRT_LIB}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +if(NOT DEFINED VCPKG_BUILD_TYPE) + file(INSTALL "${CPPWINRT_LIB}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") endif() -file(COPY - "${CPPWINRT_TOOL}" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/cppwinrt") -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/cppwinrt-config.cmake" - "${CMAKE_CURRENT_LIST_DIR}/usage" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/cppwinrt") +file(INSTALL "${CPPWINRT_TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/cppwinrt") -configure_file("${src}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +set(tool_path "tools/cppwinrt/cppwinrt.exe") +set(lib_name "cppwinrt_fast_forwarder.lib") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/cppwinrt-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" + @ONLY) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${src}/LICENSE") diff --git a/ports/cppwinrt/usage b/ports/cppwinrt/usage index a83a44a7e4c6d8..fa7449e707b735 100644 --- a/ports/cppwinrt/usage +++ b/ports/cppwinrt/usage @@ -1,4 +1,6 @@ -cppwinrt provides CMake targets: +The C++/WinRT package provides CMake targets: find_package(cppwinrt CONFIG REQUIRED) target_link_libraries(main PRIVATE Microsoft::CppWinRT) + +The CMake variable CPPWINRT_TOOL is also set to point to the .winmd to header command-line tool. diff --git a/ports/cppwinrt/vcpkg.json b/ports/cppwinrt/vcpkg.json index e1051d1b79319f..df166dbdcb4beb 100644 --- a/ports/cppwinrt/vcpkg.json +++ b/ports/cppwinrt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppwinrt", - "version": "2.0.230207.1", + "version": "2.0.240111.5", "description": "C++/WinRT is a standard C++ language projection for the Windows Runtime.", "homepage": "https://github.com/microsoft/cppwinrt", "documentation": "https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/", diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch deleted file mode 100644 index 116321b0b2c583..00000000000000 --- a/ports/cpr/001-cpr-config.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index 52787f5..aa3687d 100644 ---- a/cpr/CMakeLists.txt -+++ b/cpr/CMakeLists.txt -@@ -46,6 +46,10 @@ set_target_properties(cpr - VERSION ${${PROJECT_NAME}_VERSION} - SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) - -+if (NOT DISABLE_INSTALL_HEADERS) -+ install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) -+endif() -+ - # Import GNU common install directory variables - include(GNUInstallDirs) - diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 1ccdc3f5cd9ac9..eca6d45f12856f 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_from_github( SHA512 5e2fe69d5b4dfaa67f636098c8da904b43a22b21cc78bc52446e572ea47f492ce1de0f47fdc2cf34207729ccf007449278f218d8cdeef21f0b98356bca2e5e49 HEAD_REF master PATCHES - 001-cpr-config.patch disable_werror.patch ) @@ -20,10 +19,14 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCPR_BUILD_TESTS=OFF - -DCPR_FORCE_USE_SYSTEM_CURL=ON + -DCPR_USE_SYSTEM_CURL=ON ${FEATURE_OPTIONS} - OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON + # skip test for unused sanitizer flags + -DTHREAD_SANITIZER_AVAILABLE=OFF + -DADDRESS_SANITIZER_AVAILABLE=OFF + -DLEAK_SANITIZER_AVAILABLE=OFF + -DUNDEFINED_BEHAVIOUR_SANITIZER_AVAILABLE=OFF + -DALL_SANITIZERS_AVAILABLE=OFF ) vcpkg_cmake_install() diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 3cdf6d02f6964d..6a7400895f8414 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpr", "version-semver": "1.10.5", - "port-version": 1, + "port-version": 2, "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", "license": "MIT", diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake index 7e9cbc843b3b8d..d2d966fd495de2 100644 --- a/ports/cpuid/portfile.cmake +++ b/ports/cpuid/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO anrieff/libcpuid - REF v0.6.2 - SHA512 36175387ae86e6f602544c516a875ac7fe0a3bde52e3e3c09f8852a804dd252694e17c638723aa3d36219d4588981cfd2261086bcf561d175e7c038e3a69e2ff + REF "v${VERSION}" + SHA512 855dab45ec12b817fb18948442cebc22abaf915a7230e3d1a3f0e2fc7d0e3fe4a39e7c5744be1f4c7e3cb7b082012e6b0b0677a967beba5d404c6c48467eedce HEAD_REF master PATCHES fix-build.patch @@ -23,4 +23,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json index c042ed6f610665..b70b15acf39f27 100644 --- a/ports/cpuid/vcpkg.json +++ b/ports/cpuid/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpuid", - "version": "0.6.2", + "version": "0.6.4", "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", "license": "MIT", diff --git a/ports/curl/cmake-project-include.cmake b/ports/curl/cmake-project-include.cmake index 093a09df2894b9..1089146da88842 100644 --- a/ports/curl/cmake-project-include.cmake +++ b/ports/curl/cmake-project-include.cmake @@ -67,6 +67,8 @@ function(vcpkg_curl_flatten input output) set(lib -l${CMAKE_MATCH_1}) elseif(lib MATCHES ".*/${CMAKE_STATIC_LIBRARY_PREFIX}([^/]*)${CMAKE_STATIC_LIBRARY_SUFFIX}") set(lib -l${CMAKE_MATCH_1}) + elseif(lib MATCHES ".*/${CMAKE_SHARED_LIBRARY_PREFIX}([^/]*)${CMAKE_SHARED_LIBRARY_SUFFIX}") + set(lib -l${CMAKE_MATCH_1}) endif() if(NOT "${lib}" IN_LIST output_libs) list(PREPEND output_libs "${lib}") @@ -79,3 +81,14 @@ if(USE_LIBIDN2) find_package(PkgConfig REQUIRED) pkg_check_modules(LIBIDN2 REQUIRED libidn2) endif() + +if(NOT CURL_DISABLE_LDAP AND NOT WIN32) + find_package(PkgConfig REQUIRED) + pkg_check_modules(LDAP REQUIRED ldap) + set(HAVE_LIBLDAP 1) + set(CMAKE_LDAP_INCLUDE_DIR "${LDAP_INCLUDE_DIRS}") + set(CMAKE_LDAP_LIB "${LDAP_LINK_LIBRARIES}" CACHE STRING "") + pkg_check_modules(LBER REQUIRED lber) + set(HAVE_LIBLBER 1) + set(CMAKE_LBER_LIB "${LBER_LINK_LIBRARIES}" CACHE STRING "") +endif() diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index ef0e56ba99510f..fe3cd4beb5f444 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -33,16 +33,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS sectransp CURL_USE_SECTRANSP idn2 USE_LIBIDN2 winidn USE_WIN32_IDN - winldap USE_WIN32_LDAP websockets ENABLE_WEBSOCKETS zstd CURL_ZSTD INVERTED_FEATURES + ldap CURL_DISABLE_LDAP + ldap CURL_DISABLE_LDAPS non-http HTTP_ONLY - winldap CURL_DISABLE_LDAP # Only WinLDAP support ATM ) set(OPTIONS "") -if("idn2" IN_LIST FEATURES) +if("idn2" IN_LIST FEATURES OR ("ldap" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS)) vcpkg_find_acquire_program(PKGCONFIG) list(APPEND OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") endif() @@ -71,7 +71,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} ${OPTIONS} -DBUILD_TESTING=OFF - -DENABLE_MANUAL=OFF + -DENABLE_CURL_MANUAL=OFF -DCURL_CA_FALLBACK=ON -DCURL_USE_LIBPSL=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 88acd187381643..00d693476cdaff 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "8.6.0", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": "curl AND ISC AND BSD-3-Clause", @@ -72,6 +73,23 @@ "libidn2" ] }, + "ldap": { + "description": "LDAP support", + "supports": "!uwp", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "non-http" + ] + }, + { + "name": "openldap", + "platform": "!windows" + } + ] + }, "mbedtls": { "description": "SSL support (mbedTLS)", "dependencies": [ @@ -169,14 +187,13 @@ "supports": "windows" }, "winldap": { - "description": "LDAP support (WinLDAP). This feature does not include LDAPS support.", - "supports": "windows & !uwp", + "description": "Obsolete. Use feature 'ldap' instead.", "dependencies": [ { "name": "curl", "default-features": false, "features": [ - "non-http" + "ldap" ] } ] diff --git a/ports/devil/0007-remove_register_keyword_cpp17.patch b/ports/devil/0007-remove_register_keyword_cpp17.patch new file mode 100644 index 00000000000000..5876fe3289b443 --- /dev/null +++ b/ports/devil/0007-remove_register_keyword_cpp17.patch @@ -0,0 +1,30 @@ +diff --git a/DevIL/src-IL/src/il_manip.cpp b/DevIL/src-IL/src/il_manip.cpp +index 79acc99..229a692 100644 +--- a/DevIL/src-IL/src/il_manip.cpp ++++ b/DevIL/src-IL/src/il_manip.cpp +@@ -37,9 +37,9 @@ ILushort ILAPIENTRY ilFloatToHalf(ILuint i) { + // of float and half (127 versus 15). + // + +- register int s = (i >> 16) & 0x00008000; +- register int e = ((i >> 23) & 0x000000ff) - (127 - 15); +- register int m = i & 0x007fffff; ++ int s = (i >> 16) & 0x00008000; ++ int e = ((i >> 23) & 0x000000ff) - (127 - 15); ++ int m = i & 0x007fffff; + + // + // Now reassemble s, e and m into a half: +diff --git a/DevIL/src-ILU/src/ilu_scaling.cpp b/DevIL/src-ILU/src/ilu_scaling.cpp +index c2893a3..ef35c13 100644 +--- a/DevIL/src-ILU/src/ilu_scaling.cpp ++++ b/DevIL/src-ILU/src/ilu_scaling.cpp +@@ -406,7 +406,7 @@ main(argc, argv) + int argc; + char *argv[]; + { +- register int c; ++ int c; + int optind; + char *optarg; + int xsize = 0, ysize = 0; diff --git a/ports/devil/portfile.cmake b/ports/devil/portfile.cmake index ecbf318894c717..fb0aca69716aaf 100644 --- a/ports/devil/portfile.cmake +++ b/ports/devil/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( 0005-fix-pkgconfig.patch 0006-fix-ilut-header.patch jasper-4.patch + 0007-remove_register_keyword_cpp17.patch ) file(REMOVE "${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake") diff --git a/ports/devil/vcpkg.json b/ports/devil/vcpkg.json index b37faa5e235bc6..813c4da39e279f 100644 --- a/ports/devil/vcpkg.json +++ b/ports/devil/vcpkg.json @@ -1,7 +1,7 @@ { "name": "devil", "version": "1.8.0", - "port-version": 11, + "port-version": 12, "description": "A full featured cross-platform image library", "homepage": "https://github.com/DentonW/DevIL", "supports": "!uwp", diff --git a/ports/directx-dxc/directx-dxc-config.cmake.in b/ports/directx-dxc/directx-dxc-config.cmake.in index 814ca9605d783b..a4d94f330add6c 100644 --- a/ports/directx-dxc/directx-dxc-config.cmake.in +++ b/ports/directx-dxc/directx-dxc-config.cmake.in @@ -1,31 +1,24 @@ - -get_filename_component(_dxc_root "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_dxc_root "${_dxc_root}" PATH) +get_filename_component(_dxc_root "${CMAKE_CURRENT_LIST_DIR}" PATH) get_filename_component(_dxc_root "${_dxc_root}" PATH) -set(_dxc_exe "${_dxc_root}/@tool_path@") -if (EXISTS "${_dxc_exe}") - - add_library(Microsoft::DirectXShaderCompiler SHARED IMPORTED) - set_target_properties(Microsoft::DirectXShaderCompiler PROPERTIES - IMPORTED_LOCATION_RELEASE "${_dxc_root}/@dll_dir@/@dll_name_dxc@; ${_dxc_root}/@dll_dir@/@dll_name_dxil@" - IMPORTED_LOCATION_DEBUG "${_dxc_root}/@dll_dir@/@dll_name_dxc@; ${_dxc_root}/@dll_dir@/@dll_name_dxil@" - IMPORTED_IMPLIB_RELEASE "${_dxc_root}/lib/@lib_name@" - IMPORTED_IMPLIB_DEBUG "${_dxc_root}/lib/@lib_name@" - IMPORTED_SONAME_RELEASE "@lib_name@" - IMPORTED_SONAME_DEBUG "@lib_name@" - INTERFACE_INCLUDE_DIRECTORIES "${_dxc_root}/include/directx-dxc" - IMPORTED_CONFIGURATIONS "Debug;Release" - IMPORTED_LINK_INTERFACE_LANGUAGES "C") - - set(directx-dxc_FOUND TRUE) - set(DIRECTX_DXC_TOOL ${_dxc_exe}) - -else() - - set(directx-dxc_FOUND FALSE) - -endif() +set(DIRECTX_DXC_TOOL "${_dxc_root}/@tool_path@" CACHE PATH "Location of the dxc tool") +mark_as_advanced(DIRECTX_DXC_TOOL) + +add_library(Microsoft::DirectXShaderCompiler SHARED IMPORTED) +set_target_properties(Microsoft::DirectXShaderCompiler PROPERTIES + IMPORTED_LOCATION "${_dxc_root}/@dll_dir@/@dll_name_dxc@" + IMPORTED_IMPLIB "${_dxc_root}/lib/@lib_name@" + IMPORTED_SONAME "@lib_name@" + INTERFACE_INCLUDE_DIRECTORIES "${_dxc_root}/include/directx-dxc" + INTERFACE_LINK_LIBRARIES "Microsoft::DXIL" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + +add_library(Microsoft::DXIL SHARED IMPORTED) +set_target_properties(Microsoft::DXIL PROPERTIES + IMPORTED_LOCATION "${_dxc_root}/@dll_dir@/@dll_name_dxil@" + IMPORTED_IMPLIB "${_dxc_root}/lib/@lib_name@" + IMPORTED_SONAME "@lib_name@" + INTERFACE_INCLUDE_DIRECTORIES "${_dxc_root}/include/directx-dxc" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") -unset(_dxc_exe) unset(_dxc_root) diff --git a/ports/directx-dxc/portfile.cmake b/ports/directx-dxc/portfile.cmake index 6b733877f817b4..42ebad456ea361 100644 --- a/ports/directx-dxc/portfile.cmake +++ b/ports/directx-dxc/portfile.cmake @@ -46,20 +46,23 @@ if (VCPKG_TARGET_IS_LINUX) "${PACKAGE_PATH}/lib/libdxcompiler.so" "${PACKAGE_PATH}/lib/libdxil.so" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL - "${PACKAGE_PATH}/lib/libdxcompiler.so" - "${PACKAGE_PATH}/lib/libdxil.so" - DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + if(NOT DEFINED VCPKG_BUILD_TYPE) + file(INSTALL + "${PACKAGE_PATH}/lib/libdxcompiler.so" + "${PACKAGE_PATH}/lib/libdxil.so" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() file(INSTALL "${PACKAGE_PATH}/bin/dxc" - DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") set(dll_name_dxc "libdxcompiler.so") set(dll_name_dxil "libdxil.so") set(dll_dir "lib") set(lib_name "libdxcompiler.so") - set(tool_path "bin/dxc") + set(tool_path "tools/${PORT}/dxc") else() # VCPKG_TARGET_IS_WINDOWS if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -78,16 +81,21 @@ else() DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") file(INSTALL "${PACKAGE_PATH}/lib/${DXC_ARCH}/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${PACKAGE_PATH}/lib/${DXC_ARCH}/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if(NOT DEFINED VCPKG_BUILD_TYPE) + file(INSTALL "${PACKAGE_PATH}/lib/${DXC_ARCH}/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() file(INSTALL "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxcompiler.dll" "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(INSTALL - "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxcompiler.dll" - "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll" - DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + + if(NOT DEFINED VCPKG_BUILD_TYPE) + file(INSTALL + "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxcompiler.dll" + "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") @@ -101,14 +109,14 @@ else() set(dll_name_dxil "dxil.dll") set(dll_dir "bin") set(lib_name "dxcompiler.lib") - set(tool_path "tools/directx-dxc/dxc.exe") + set(tool_path "tools/${PORT}/dxc.exe") endif() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/directx-dxc-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${LICENSE_TXT}") diff --git a/ports/directx-dxc/vcpkg.json b/ports/directx-dxc/vcpkg.json index 9386d4913b0d19..c77e1b82f64f52 100644 --- a/ports/directx-dxc/vcpkg.json +++ b/ports/directx-dxc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directx-dxc", "version-date": "2024-03-07", + "port-version": 1, "description": "DirectX Shader Compiler (LLVM/Clang)", "homepage": "https://github.com/microsoft/DirectXShaderCompiler", "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki", @@ -14,6 +15,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "zlib", + "platform": "linux & !static" } ] } diff --git a/ports/directx12-agility/directx12-config.cmake.in b/ports/directx12-agility/directx12-config.cmake.in new file mode 100644 index 00000000000000..413d2f0f5c7860 --- /dev/null +++ b/ports/directx12-agility/directx12-config.cmake.in @@ -0,0 +1,41 @@ +get_filename_component(_dx12_root "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_dx12_root "${_dx12_root}" PATH) +get_filename_component(_dx12_root "${_dx12_root}" PATH) + +if (EXISTS "${_dx12_root}/bin/D3D12Core.dll") + + find_library(D3D12_LIB NAMES d3d12) + + if("${D3D12_LIB}" STREQUAL "D3D12_LIB-NOTFOUND") + message(FATAL_ERROR "D3D12.LIB import library from the Windows SDK is required") + endif() + + add_library(Microsoft::DirectX12-Core SHARED IMPORTED) + set_target_properties(Microsoft::DirectX12-Core PROPERTIES + IMPORTED_LOCATION_RELEASE "${_dx12_root}/bin/D3D12Core.dll" + IMPORTED_LOCATION_DEBUG "${_dx12_root}/debug/bin/D3D12Core.dll" + IMPORTED_IMPLIB "${D3D12_LIB}" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::DirectX12-Layers SHARED IMPORTED) + set_target_properties(Microsoft::DirectX12-Layers PROPERTIES + IMPORTED_LOCATION_RELEASE "${_dx12_root}/debug/bin/d3d12SDKLayers.dll" + IMPORTED_LOCATION_DEBUG "${_dx12_root}/debug/bin/d3d12SDKLayers.dll" + IMPORTED_IMPLIB "${D3D12_LIB}" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") + + add_library(Microsoft::DirectX12-Agility INTERFACE IMPORTED) + set_target_properties(Microsoft::DirectX12-Agility PROPERTIES + INTERFACE_LINK_LIBRARIES "Microsoft::DirectX12-Core;Microsoft::DirectX12-Layers") + + set(directx12-agility_FOUND TRUE) + +else() + + set(directx12-agility_FOUND FALSE) + +endif() + +unset(_dx12_root) diff --git a/ports/directx12-agility/portfile.cmake b/ports/directx12-agility/portfile.cmake new file mode 100644 index 00000000000000..0d124ce21bf095 --- /dev/null +++ b/ports/directx12-agility/portfile.cmake @@ -0,0 +1,43 @@ +set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/${VERSION}" + FILENAME "Microsoft.Direct3D.D3D12.${VERSION}.zip" + SHA512 9703445beb09808f1edf1320605d870fdfbd74b728227df2c9c99a560400c653f38960b6f54f45dc36fcb2609acb412d30307391ee02df53bc636e2c4c89f22c +) + +vcpkg_extract_source_archive( + PACKAGE_PATH + ARCHIVE ${ARCHIVE} + NO_REMOVE_ONE_LEVEL +) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(REDIST_ARCH win32) +else() + set(REDIST_ARCH ${VCPKG_TARGET_ARCHITECTURE}) +endif() + +file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.dll" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + +file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.dll" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/D3D12Core.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3d12SDKLayers.dll" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3d12SDKLayers.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(COPY "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3dconfig.exe" "${PACKAGE_PATH}/build/native/bin/${REDIST_ARCH}/d3dconfig.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools//${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/directx12-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY) diff --git a/ports/directx12-agility/usage b/ports/directx12-agility/usage new file mode 100644 index 00000000000000..4ba03486390dd7 --- /dev/null +++ b/ports/directx12-agility/usage @@ -0,0 +1,14 @@ +The DirectX 12 Agility SDK package provides CMake targets: + + find_package(directx-headers CONFIG REQUIRED) + find_package(directx12-agility CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DirectX-Headers Microsoft::DirectX-Guids Microsoft::DirectX12-Agility) + + if(TARGET Microsoft::DirectX12-Agility) + file(MAKE_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/D3D12") + add_custom_command(TARGET main POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ $/D3D12 + COMMAND ${CMAKE_COMMAND} -E copy $ $/D3D12 + COMMAND_EXPAND_LISTS + ) + endif() diff --git a/ports/directx12-agility/vcpkg.json b/ports/directx12-agility/vcpkg.json new file mode 100644 index 00000000000000..ab15cd7d7ae942 --- /dev/null +++ b/ports/directx12-agility/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "directx12-agility", + "version": "1.613.0", + "description": "DirectX 12 Agility SDK", + "homepage": "https://aka.ms/directx12agility", + "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/", + "license": null, + "supports": "windows & !uwp & !xbox", + "dependencies": [ + "directx-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in b/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in index 039d0a3b0a2454..95cd1c2e1881c5 100644 --- a/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in +++ b/ports/dxsdk-d3dx/dxsdk-d3dx-config.cmake.in @@ -1,6 +1,5 @@ -get_filename_component(_d3dx_root "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_d3dx_root "${_d3dx_root}" PATH) +get_filename_component(_d3dx_root "${CMAKE_CURRENT_LIST_DIR}" PATH) get_filename_component(_d3dx_root "${_d3dx_root}" PATH) set(_d3dx_root_lib "${_d3dx_root}/lib/d3dx9.lib") diff --git a/ports/dxsdk-d3dx/portfile.cmake b/ports/dxsdk-d3dx/portfile.cmake index b406a6735f8a19..143bc9e51f6682 100644 --- a/ports/dxsdk-d3dx/portfile.cmake +++ b/ports/dxsdk-d3dx/portfile.cmake @@ -4,8 +4,7 @@ endif() message(WARNING "Use of ${PORT} is not recommended for new projects. See https://aka.ms/dxsdk for more information.") -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - +set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) set(VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT enabled) vcpkg_download_distfile(ARCHIVE @@ -26,15 +25,18 @@ file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT file(GLOB RELEASE_LIB_FILES "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib") file(INSTALL ${RELEASE_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/") -file(GLOB DEBUG_LIB_FILES "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib") -file(INSTALL ${DEBUG_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/") - file(GLOB RELEASE_DLL_FILES "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll") file(INSTALL ${RELEASE_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/") -file(GLOB DEBUG_DLL_FILES "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll") -file(INSTALL ${DEBUG_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/") +if(NOT DEFINED VCPKG_BUILD_TYPE) + file(GLOB DEBUG_LIB_FILES "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib") + file(INSTALL ${DEBUG_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/") + + file(GLOB DEBUG_DLL_FILES "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll") + file(INSTALL ${DEBUG_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/") +endif() -file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt") configure_file("${CMAKE_CURRENT_LIST_DIR}/dxsdk-d3dx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/ports/dxsdk-d3dx/usage b/ports/dxsdk-d3dx/usage new file mode 100644 index 00000000000000..da585a2c45ce1c --- /dev/null +++ b/ports/dxsdk-d3dx/usage @@ -0,0 +1,6 @@ +The legacy DirectX SDK D3DX package provides CMake targets: + + find_package(dxsdk-d3dx CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::D3DX9 Microsoft::D3DX10 Microsoft::D3DX11) + +NOTE: This port is not recommended for use in new projects and is incompatible with the deprecated directxsdk port. diff --git a/ports/dxsdk-d3dx/vcpkg.json b/ports/dxsdk-d3dx/vcpkg.json index 66641861475496..1b9a2171fe93ea 100644 --- a/ports/dxsdk-d3dx/vcpkg.json +++ b/ports/dxsdk-d3dx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", - "port-version": 6, + "port-version": 7, "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", "license": null, - "supports": "windows & !arm & !uwp & !xbox & !staticcrt" + "supports": "windows & !arm & !uwp & !xbox" } diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake index 5678e0b1c9356f..7af4a7c384725a 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -1,19 +1,11 @@ string(REPLACE "." "_" REF "R_${VERSION}") -vcpkg_download_distfile(CVE-2024-28757 - URLS "https://github.com/libexpat/libexpat/commit/5026213864ba1a11ef03ba2e8111af8654e9404d.diff?full_index=1" - FILENAME libexpat-CVE-2024-28757.patch - SHA512 0d697b26116c89dd72d946ad04eb8f02ace970a435bbd67ba31841a13309d6a43e2cfa2dea8f6e7d53b478a508f7642dd9ff8c8f367d0d0205e982041f62f849 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libexpat/libexpat REF "${REF}" - SHA512 cf6c64fc0ca55dd172ca8a6ca10d1fb2c915d0f941b0068f42cb90488022dea73e04119c49a1bd4ab9a5d425ddc132ae5f22260ff6d2e25204637a1169e7bd4f + SHA512 49b6be12bd6284106920abc61d86d441cba126615fc4019744fc56dc5e7c5efc72b02c09e5c7b491882a633c1c45dc4a03e92a96372ab62bcd70755f6878c6b6 HEAD_REF master - PATCHES - ${CVE-2024-28757} ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE) diff --git a/ports/expat/vcpkg.json b/ports/expat/vcpkg.json index 6895e3ccb32ef3..11a072065a8b67 100644 --- a/ports/expat/vcpkg.json +++ b/ports/expat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "expat", - "version": "2.6.1", + "version": "2.6.2", "description": "XML parser library written in C", "homepage": "https://github.com/libexpat/libexpat", "license": "MIT", diff --git a/ports/fast-float/portfile.cmake b/ports/fast-float/portfile.cmake index 214153650e63ec..c2a2a4646eda23 100644 --- a/ports/fast-float/portfile.cmake +++ b/ports/fast-float/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fastfloat/fast_float REF "v${VERSION}" - SHA512 43c21f8dbcb4524fb678b5d928d6edeefc84b6e356221696ffe0f3e8d49e97aa2c0325ca116541ec9ae2cec7d268d6720a49999e8daad52a5d7bf34377c970da + SHA512 934c98ecfc897abd4b36b2b03578d001046659c1499edc6a5bf7432b4e2b7a2425718c82793766c0e60b576e213c47419cf40de2eacfc83aedff2b209d91d742 HEAD_REF master ) diff --git a/ports/fast-float/vcpkg.json b/ports/fast-float/vcpkg.json index c7124461d7fd2e..cdba66f21cf6cd 100644 --- a/ports/fast-float/vcpkg.json +++ b/ports/fast-float/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fast-float", - "version": "6.1.0", + "version": "6.1.1", "description": "Fast and exact implementation of the C++ from_chars functions for float and double types: 4x faster than strtod", "homepage": "https://github.com/fastfloat/fast_float", "license": "Apache-2.0 OR BSL-1.0 OR MIT", diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 6d1f02db7f20a5..45095a06369c1d 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -32,6 +32,7 @@ file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake") file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake") file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake") file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibUnwind.cmake") file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake") file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 781c0502d5e7ad..75a9f3ccc95ab4 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,7 @@ { "name": "folly", "version-string": "2024.01.01.00", - "port-version": 1, + "port-version": 2, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/freerdp/dependencies.patch b/ports/freerdp/dependencies.patch index bbacce8094d971..b65a4cf6511fe2 100644 --- a/ports/freerdp/dependencies.patch +++ b/ports/freerdp/dependencies.patch @@ -1,15 +1,3 @@ -diff --git a/client/FreeRDP-ClientConfig.cmake.in b/client/FreeRDP-ClientConfig.cmake.in -index 35b74c1..a4e48c9 100644 ---- a/client/FreeRDP-ClientConfig.cmake.in -+++ b/client/FreeRDP-ClientConfig.cmake.in -@@ -1,6 +1,7 @@ - include(CMakeFindDependencyMacro) - find_dependency(WinPR @FREERDP_VERSION@) - find_dependency(FreeRDP @FREERDP_VERSION@) -+find_dependency(ZLIB) - - @PACKAGE_INIT@ - diff --git a/cmake/FindFeature.cmake b/cmake/FindFeature.cmake index bd25fd4..dd180a3 100644 --- a/cmake/FindFeature.cmake @@ -32,28 +20,3 @@ index bd25fd4..dd180a3 100644 if(${WITH_${_feature_upper}}) set(_feature_default "ON") message(STATUS "Finding ${_type_lower} feature ${_feature} for ${_purpose} (${_description})") -diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in -index 21ecd59..2613a59 100644 ---- a/libfreerdp/FreeRDPConfig.cmake.in -+++ b/libfreerdp/FreeRDPConfig.cmake.in -@@ -1,5 +1,7 @@ - include(CMakeFindDependencyMacro) - find_dependency(WinPR @FREERDP_VERSION@) -+find_dependency(cJSON) -+find_dependency(ZLIB) - - @PACKAGE_INIT@ - -diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in -index 21ea0c7..71b8e18 100644 ---- a/libfreerdp/freerdp.pc.in -+++ b/libfreerdp/freerdp.pc.in -@@ -14,7 +14,7 @@ Description: FreeRDP: A Remote Desktop Protocol Implementation - URL: http://www.freerdp.com/ - Version: @FREERDP_VERSION@ - Requires: --Requires.private: winpr@FREERDP_API_VERSION@ -+Requires.private: winpr@FREERDP_API_VERSION@ libcjson zlib - Libs: -L${libdir} ${libs} - Libs.private: -ldl -lpthread - Cflags: -I${includedir} diff --git a/ports/freerdp/mingw-tp.patch b/ports/freerdp/mingw-tp.patch deleted file mode 100644 index 79523b6ca23f4d..00000000000000 --- a/ports/freerdp/mingw-tp.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/winpr/libwinpr/pool/pool.c b/winpr/libwinpr/pool/pool.c -index 6c66b42..784f75a 100644 ---- a/winpr/libwinpr/pool/pool.c -+++ b/winpr/libwinpr/pool/pool.c -@@ -1,3 +1,8 @@ -+#ifdef __MINGW32__ -+#define _TP_CALLBACK_INSTANCE S_TP_CALLBACK_INSTANCE -+#define _TP_POOL S_TP_POOL -+#define _TP_WORK S_TP_WORK -+#endif - /** - * WinPR: Windows Portable Runtime - * Thread Pool API (Pool) -diff --git a/winpr/libwinpr/pool/work.c b/winpr/libwinpr/pool/work.c -index e83f417..423b998 100644 ---- a/winpr/libwinpr/pool/work.c -+++ b/winpr/libwinpr/pool/work.c -@@ -1,3 +1,8 @@ -+#ifdef __MINGW32__ -+#define _TP_CALLBACK_INSTANCE S_TP_CALLBACK_INSTANCE -+#define _TP_POOL S_TP_POOL -+#define _TP_WORK S_TP_WORK -+#endif - /** - * WinPR: Windows Portable Runtime - * Thread Pool API (Work) diff --git a/ports/freerdp/msvc-arm64.patch b/ports/freerdp/msvc-arm64.patch deleted file mode 100644 index dae80e97f9a348..00000000000000 --- a/ports/freerdp/msvc-arm64.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/winpr/include/winpr/intrin.h b/winpr/include/winpr/intrin.h -index 066f45f..0e61d4d 100644 ---- a/winpr/include/winpr/intrin.h -+++ b/winpr/include/winpr/intrin.h -@@ -22,7 +22,7 @@ - #ifndef WINPR_INTRIN_H - #define WINPR_INTRIN_H - --#if !defined(_WIN32) || defined(__MINGW32__) -+#if !defined(_WIN32) || defined(__MINGW32__) || defined(_M_ARM64) - - /** - * __lzcnt16, __lzcnt, __lzcnt64: diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index c80e60d9296dc7..754547e8795a10 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -2,17 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP REF "${VERSION}" - SHA512 6779d5d4098e0abf65c3c2a2321644a9c78bf7fb3cf0a692be7c88c7f04040c2fb54d63029a2771ead0453f3af17b64dd44136d387eb4a2a4586ccfb72a37c08 + SHA512 aa96ad2bf30dbe09849ecfb64ec6e60ba4fd3bc2d144c7d576b1e59476ef45d9d744da37806b1c00e3a0413390b35c6d3d4401b89c07c5663122280eca39e501 HEAD_REF master PATCHES dependencies.patch install-layout.patch keep-dup-libs.patch windows-linkage.patch - wfreerdp-server-cli.patch - wf-rdpsnd.patch - msvc-arm64.patch - mingw-tp.patch ) file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg") file(WRITE "${SOURCE_PATH}/CMakeCPack.cmake" "") @@ -94,13 +90,19 @@ elseif(VCPKG_TARGET_IS_OSX) list(APPEND tools mfreerdp-server) endif() endif() -if("winpr-tools" IN_LIST FEATURES) - list(APPEND tools winpr-hash winpr-makecert) -endif() if("server" IN_LIST FEATURES) list(APPEND tools freerdp-proxy freerdp-shadow-cli) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Proxy3 PACKAGE_NAME freerdp-Proxy3 DO_NOT_DELETE_PARENT_CONFIG_PATH) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Server3 PACKAGE_NAME freerdp-server3 DO_NOT_DELETE_PARENT_CONFIG_PATH) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Shadow3 PACKAGE_NAME freerdp-shadow3 DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/rdtk0 PACKAGE_NAME rdtk0 DO_NOT_DELETE_PARENT_CONFIG_PATH) +endif() +if("wayland" IN_LIST FEATURES) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/uwac0 PACKAGE_NAME uwac0 DO_NOT_DELETE_PARENT_CONFIG_PATH) +endif() +if("winpr-tools" IN_LIST FEATURES) + list(APPEND tools winpr-hash winpr-makecert) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR-tools3 PACKAGE_NAME winpr-tools3 DO_NOT_DELETE_PARENT_CONFIG_PATH) endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client3 PACKAGE_NAME freerdp-client3 DO_NOT_DELETE_PARENT_CONFIG_PATH) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR3 PACKAGE_NAME winpr3 DO_NOT_DELETE_PARENT_CONFIG_PATH) diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 6fd7dfa7e9da06..f94a60a217425e 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freerdp", - "version": "3.3.0", + "version": "3.4.0", + "port-version": 1, "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", diff --git a/ports/freerdp/wf-rdpsnd.patch b/ports/freerdp/wf-rdpsnd.patch deleted file mode 100644 index fb12440776a094..00000000000000 --- a/ports/freerdp/wf-rdpsnd.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/server/Windows/wf_rdpsnd.c b/server/Windows/wf_rdpsnd.c -index b313c35..cb961e5 100644 ---- a/server/Windows/wf_rdpsnd.c -+++ b/server/Windows/wf_rdpsnd.c -@@ -49,7 +49,8 @@ static void wf_peer_rdpsnd_activated(RdpsndServerContext* context) - wfi->agreed_format = NULL; - WLog_DBG(TAG, "Client supports the following %d formats:", context->num_client_formats); - -- for (size_t i = 0; i < context->num_client_formats; i++) -+ size_t i = 0; -+ for (; i < context->num_client_formats; i++) - { - // TODO: improve the way we agree on a format - for (size_t j = 0; j < context->num_server_formats; j++) diff --git a/ports/freerdp/wfreerdp-server-cli.patch b/ports/freerdp/wfreerdp-server-cli.patch deleted file mode 100644 index a995b4e44b27ac..00000000000000 --- a/ports/freerdp/wfreerdp-server-cli.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/server/Windows/cli/CMakeLists.txt b/server/Windows/cli/CMakeLists.txt -index e125ac3..f44d4a3 100644 ---- a/server/Windows/cli/CMakeLists.txt -+++ b/server/Windows/cli/CMakeLists.txt -@@ -16,7 +16,7 @@ - # limitations under the License. - - set(MODULE_NAME "wfreerdp-server-cli") --set(OUTPUT_NAME " wfreerdp-server") -+set(OUTPUT_NAME "wfreerdp-server") - set(MODULE_PREFIX "FREERDP_SERVER_WINDOWS_CLI") - - include_directories(..) -@@ -45,6 +45,7 @@ if (WITH_BINARY_VERSIONING) - set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${OUTPUT_NAME}${FREERDP_API_VERSION}") - else() - set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "${OUTPUT_NAME}") -+ set_target_properties(${MODULE_NAME} PROPERTIES PDB_NAME "${OUTPUT_NAME}.exe") - endif() - - set(${MODULE_PREFIX}_LIBS wfreerdp-server) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index ad4312ece7cbfc..e3a441ec1e68bc 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -16,6 +16,8 @@ vcpkg_check_features( FEATURES unwind WITH_UNWIND customprefix WITH_CUSTOM_PREFIX + INVERTED_FEATURES + unwind CMAKE_DISABLE_FIND_PACKAGE_Unwind ) file(REMOVE "${SOURCE_PATH}/glog-modules.cmake.in") @@ -40,5 +42,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/export.h" "#ifdef GLOG_STATIC_DEFINE" "#if 0") endif() - + +if("unwind" IN_LIST FEATURES) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +endif() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/glog/vcpkg-cmake-wrapper.cmake b/ports/glog/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..a7c80f00e544cf --- /dev/null +++ b/ports/glog/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(GLOG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${GLOG_PREV_MODULE_PATH}) diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index 71fa18a5cbccea..73f68dfa801ec0 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glog", "version": "0.7.0", + "port-version": 1, "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", "license": "BSD-3-Clause", @@ -21,7 +22,10 @@ }, "unwind": { "description": "Enable libunwind support", - "supports": "linux" + "supports": "linux", + "dependencies": [ + "libunwind" + ] } } } diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 647875acc37b68..8c6178875f796c 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -33,6 +33,10 @@ if ("dialogflow-es" IN_LIST FEATURES) list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "dialogflow-es") list(APPEND GOOGLE_CLOUD_CPP_ENABLE "dialogflow_es") endif () +if ("experimental-storage-grpc" IN_LIST FEATURES) + list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "experimental-storage-grpc") + list(APPEND GOOGLE_CLOUD_CPP_ENABLE "experimental-storage_grpc") +endif () vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index b429f3bda8190f..e3e56e6008fb0f 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "google-cloud-cpp", "version": "2.22.0", + "port-version": 1, "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake index 900c6f2b33e055..f8efb6335b9096 100644 --- a/ports/graphviz/portfile.cmake +++ b/ports/graphviz/portfile.cmake @@ -55,6 +55,7 @@ vcpkg_cmake_configure( -Dwith_gvedit=OFF -Dwith_smyrna=OFF -DCMAKE_DISABLE_FIND_PACKAGE_ANN=ON + -DCMAKE_DISABLE_FIND_PACKAGE_DevIL=ON -DCMAKE_REQUIRE_FIND_PACKAGE_CAIRO=ON -DCMAKE_REQUIRE_FIND_PACKAGE_EXPAT=ON -DCMAKE_REQUIRE_FIND_PACKAGE_GD=ON diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json index f3fe42d6feae99..13c643aa5b0a41 100644 --- a/ports/graphviz/vcpkg.json +++ b/ports/graphviz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "graphviz", "version-semver": "10.0.1", + "port-version": 1, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", "license": "EPL-1.0", diff --git a/ports/grpc/00016_add_header.patch b/ports/grpc/00016_add_header.patch new file mode 100644 index 00000000000000..ba166a5ee36bc7 --- /dev/null +++ b/ports/grpc/00016_add_header.patch @@ -0,0 +1,12 @@ +diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc +index 72e1b66..8dc1fd1 100644 +--- a/src/core/lib/iomgr/tcp_posix.cc ++++ b/src/core/lib/iomgr/tcp_posix.cc +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + + #include "src/core/lib/address_utils/sockaddr_utils.h" + #include "src/core/lib/debug/event_log.h" diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 09c669e55ef857..9653bb09561060 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_from_github( 00012-fix-use-cxx17.patch 00014-pkgconfig-upbdefs.patch 00015-disable-download-archive.patch + 00016_add_header.patch ) if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 35dd585098821d..e049598bec6243 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "grpc", "version-semver": "1.51.1", - "port-version": 1, + "port-version": 2, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 1fecbf681d730f..ae158ab13563c3 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz REF ${VERSION} - SHA512 3fe54adbdd457c7dd8186c897436982a43e195a62bc0e830fe2dd06ca2c52511b9a717c659a7e30d235ac964df071e8ba1d9f36ee20496a1a80945d7c63fce86 + SHA512 95450420922a96d20841c6ea3954ae5a720b9f5e8946409f698748735c4fa2399621c973e5a4cb5c672bf298788741e6b8f6d4fd190dcbdc79ac68e9b55181a1 HEAD_REF master PATCHES fix-win32-build.patch @@ -31,6 +31,7 @@ endif() if("glib" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -Dglib=enabled) # Enable GLib unicode functions list(APPEND FEATURE_OPTIONS -Dgobject=enabled) #Enable GObject bindings + list(APPEND FEATURE_OPTIONS -Dchafa=disabled) else() list(APPEND FEATURE_OPTIONS -Dglib=disabled) list(APPEND FEATURE_OPTIONS -Dgobject=disabled) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 575e7e89d44255..852856b51ea151 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", - "version": "8.3.0", - "port-version": 3, + "version": "8.3.1", + "port-version": 1, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 352a81c74ced48..8744c670002024 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_download_distfile( ARCHIVE URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz" FILENAME "icu4c-${VERSION2}-src.tgz" - SHA512 32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2 + SHA512 e6c7876c0f3d756f3a6969cad9a8909e535eeaac352f3a721338b9cbd56864bf7414469d29ec843462997815d2ca9d0dab06d38c37cdd4d8feb28ad04d8781b0 ) vcpkg_extract_source_archive(SOURCE_PATH diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 8fe00137a8ef05..1e9e284c1e67cd 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,6 +1,6 @@ { "name": "icu", - "version": "74.1", + "version": "74.2", "port-version": 1, "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", diff --git a/ports/ixwebsocket/fix-C2065-of-errorMsg.patch b/ports/ixwebsocket/fix-C2065-of-errorMsg.patch deleted file mode 100644 index 2435866c9bd4b9..00000000000000 --- a/ports/ixwebsocket/fix-C2065-of-errorMsg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ixwebsocket/IXSocketMbedTLS.cpp b/ixwebsocket/IXSocketMbedTLS.cpp -index f5c0cf6..0192dc7 100644 ---- a/ixwebsocket/IXSocketMbedTLS.cpp -+++ b/ixwebsocket/IXSocketMbedTLS.cpp -@@ -49,7 +49,7 @@ namespace ix - mbedtls_pk_init(&_pkey); - } - -- bool SocketMbedTLS::loadSystemCertificates(std::string& /* errorMsg */) -+ bool SocketMbedTLS::loadSystemCertificates(std::string& errorMsg) - { - #ifdef _WIN32 - DWORD flags = CERT_STORE_READONLY_FLAG | CERT_STORE_OPEN_EXISTING_FLAG | diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake index d0d88fff609232..52822939d05163 100644 --- a/ports/ixwebsocket/portfile.cmake +++ b/ports/ixwebsocket/portfile.cmake @@ -4,9 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO machinezone/IXWebSocket REF "v${VERSION}" - SHA512 698ad96f25f53bf48906201826008bad46c657f8043d3653988716ddd9fb5dfeb52cebc002b3af76b91d0561155607a5f38bbc2c808aa67f438432207da82a35 - PATCHES - fix-C2065-of-errorMsg.patch + SHA512 9a3b118ecec2ca39094ccbd7ec0610bbc59271a14c9e7ee0ac5d5e01a86111f33b722460ee5a32da60bfa31944acaf9a442d1655233ef252f35fd168d50ab471 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/ixwebsocket/vcpkg.json b/ports/ixwebsocket/vcpkg.json index 678eb3fc7f59b9..af1dc25ac8a52a 100644 --- a/ports/ixwebsocket/vcpkg.json +++ b/ports/ixwebsocket/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ixwebsocket", - "version-semver": "11.4.4", - "port-version": 2, + "version-semver": "11.4.5", "description": "Lightweight WebSocket Client and Server + HTTP Client and Server", "homepage": "https://github.com/machinezone/IXWebSocket", "license": "BSD-3-Clause", diff --git a/ports/jsoncpp/vcpkg.json b/ports/jsoncpp/vcpkg.json index fc31291aeea502..81133935e07a17 100644 --- a/ports/jsoncpp/vcpkg.json +++ b/ports/jsoncpp/vcpkg.json @@ -1,8 +1,8 @@ { "name": "jsoncpp", "version": "1.9.5", - "port-version": 2, - "description": "jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.", + "port-version": 3, + "description": "JsonCpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that is easy to parse and human-readable.", "homepage": "https://github.com/open-source-parsers/jsoncpp", "license": "MIT", "dependencies": [ diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index 1f181933aa1cab..b4d4a0151fd717 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ktx", "version-semver": "4.3.1", + "port-version": 1, "description": [ "The Khronos KTX library and tools.", "Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them." @@ -22,7 +23,7 @@ "features": { "tools": { "description": "Build tools", - "supports": "!android", + "supports": "!android & !uwp", "dependencies": [ "cxxopts", "fmt" diff --git a/ports/libassert/cpptrace-0.4.1.patch b/ports/libassert/cpptrace-0.4.1.patch deleted file mode 100644 index a9c6b00bf7509e..00000000000000 --- a/ports/libassert/cpptrace-0.4.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/assert.cpp b/src/assert.cpp -index 8d4bd24..bd4bc58 100644 ---- a/src/assert.cpp -+++ b/src/assert.cpp -@@ -1655,7 +1655,7 @@ namespace libassert::detail { - const size_t max_frame_width = n_digits(end - start); - // do the actual trace - for(size_t i = start; i <= end; i++) { -- const auto& [address, line, col, source_path, signature, is_inline] = trace.frames[i]; -+ const auto& [raw_address, obj_address, line, col, source_path, signature, is_inline] = trace.frames[i]; - const std::string line_number = line.has_value() ? std::to_string(line.value()) : "?"; - // look for repeats, i.e. recursion we can fold - size_t recursion_folded = 0; diff --git a/ports/libassert/include-dir.patch b/ports/libassert/include-dir.patch deleted file mode 100644 index 0202df2712f775..00000000000000 --- a/ports/libassert/include-dir.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c653d61..c9e599f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -43,7 +43,7 @@ target_include_directories( - assert - PUBLIC - $ -- $ -+ $ - ) - - #set(CMAKE_CXX_FLAGS_REL_WITH_ASSERTS "-O3") -@@ -119,7 +121,7 @@ if(NOT CMAKE_SKIP_INSTALL_RULES) - install( - FILES - include/assert.hpp -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/assert/assert -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/assert - ) - - install( diff --git a/ports/libassert/magic-enum.patch b/ports/libassert/magic-enum.patch deleted file mode 100644 index 1d6713ce84c438..00000000000000 --- a/ports/libassert/magic-enum.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c653d61..a5d9980 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,6 +94,8 @@ endif() - - if(ASSERT_USE_MAGIC_ENUM) - target_compile_definitions(assert PUBLIC ASSERT_USE_MAGIC_ENUM) -+ find_package(magic_enum CONFIG REQUIRED) -+ target_link_libraries(assert PUBLIC magic_enum::magic_enum) - endif() - - if(NOT "${ASSERT_FAIL}" STREQUAL "") -diff --git a/include/assert.hpp b/include/assert.hpp -index b49c633..299a47e 100644 ---- a/include/assert.hpp -+++ b/include/assert.hpp -@@ -34,7 +34,7 @@ - #ifdef ASSERT_USE_MAGIC_ENUM - // this is a temporary hack to make testing thing in compiler explorer quicker (it disallows simple relative includes) - #include \ -- "../third_party/magic_enum.hpp" -+ - #endif - - #define LIBASSERT_IS_CLANG 0 diff --git a/ports/libassert/portfile.cmake b/ports/libassert/portfile.cmake index d7a8e6d63263fe..e015653d1f5504 100644 --- a/ports/libassert/portfile.cmake +++ b/ports/libassert/portfile.cmake @@ -2,36 +2,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jeremy-rifkin/libassert REF "v${VERSION}" - SHA512 beba94e033f7e43c84123736a32725a333c915392d5dc57c26a63f832a507564d79f290a151cb136de8bded3d8d343dad3c4bf2efec9977d878df3c9a8677554 + SHA512 35fdf48cc157e0f269ccae66f9d000d3a1e01bdd8a23d04e1a0ddc9e6c962c6507702bb3494cbc4d06d59f1af27e1c053f8ae3167c2ae9efd2644df505058175 HEAD_REF main - PATCHES - runtime_destination.patch - magic-enum.patch - include-dir.patch - cpptrace-0.4.1.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DASSERT_USE_EXTERNAL_CPPTRACE=ON - -DASSERT_STATIC=${BUILD_STATIC} + -DLIBASSERT_USE_EXTERNAL_CPPTRACE=ON + -DLIBASSERT_USE_EXTERNAL_MAGIC_ENUM=ON + -DLIBASSERT_BUILD_SHARED=${BUILD_SHARED} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup( - PACKAGE_NAME assert - CONFIG_PATH lib/cmake/assert + PACKAGE_NAME libassert + CONFIG_PATH lib/cmake/libassert ) vcpkg_copy_pdbs() -file(APPEND "${CURRENT_PACKAGES_DIR}/share/assert/assert-config.cmake" "include(CMakeFindDependencyMacro) -find_dependency(magic_enum) -find_dependency(cpptrace)") +file(APPEND "${CURRENT_PACKAGES_DIR}/share/libassert/libassert-config.cmake" "find_dependency(magic_enum)") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/assert/third_party") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libassert/runtime_destination.patch b/ports/libassert/runtime_destination.patch deleted file mode 100644 index ae93937b7b6602..00000000000000 --- a/ports/libassert/runtime_destination.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ccc959e..d3e5d09 100644 ---- a/CMakeLists.txt 2023-11-13 15:53:51.177963300 -0500 -+++ b/CMakeLists.txt 2023-11-13 16:10:15.969939100 -0500 -@@ -112,7 +112,7 @@ - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION bin - ) - - install( diff --git a/ports/libassert/vcpkg.json b/ports/libassert/vcpkg.json index f3318b92a11647..0a551758c09a7c 100644 --- a/ports/libassert/vcpkg.json +++ b/ports/libassert/vcpkg.json @@ -1,8 +1,7 @@ { "name": "libassert", - "version": "1.2.2", - "port-version": 2, - "description": "The most over-engineered and overpowered C++ assertion library.", + "version": "2.0.0", + "description": "The most over-engineered C++ assertion library", "homepage": "https://github.com/jeremy-rifkin/libassert", "license": "MIT", "supports": "!uwp", diff --git a/ports/libcoro/0001-allow-shared-lib.patch b/ports/libcoro/0001-allow-shared-lib.patch deleted file mode 100644 index 47de8119bc6873..00000000000000 --- a/ports/libcoro/0001-allow-shared-lib.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,4 +92,4 @@ - endif() - --add_library(${PROJECT_NAME} STATIC ${LIBCORO_SOURCE_FILES}) -+add_library(${PROJECT_NAME} ${LIBCORO_SOURCE_FILES}) - set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX PREFIX "") diff --git a/ports/libcoro/0002-disable-git-config.patch b/ports/libcoro/0002-disable-git-config.patch deleted file mode 100644 index f25833ae0427c7..00000000000000 --- a/ports/libcoro/0002-disable-git-config.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,9 +7,9 @@ - - # Set the githooks directory to auto format and update the readme. --message("${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} -> git config --local core.hooksPath .githooks") --execute_process( -- COMMAND git config --local core.hooksPath .githooks -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} --) -+#message("${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} -> git config --local core.hooksPath .githooks") -+#execute_process( -+# COMMAND git config --local core.hooksPath .githooks -+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -+#) - - option(LIBCORO_EXTERNAL_DEPENDENCIES "Use Cmake find_package to resolve dependencies instead of embedded libraries, Default=OFF." OFF) diff --git a/ports/libcoro/0003-fix-pkgconfig-includedir.patch b/ports/libcoro/0003-fix-pkgconfig-includedir.patch deleted file mode 100644 index ed4cf30769e7bf..00000000000000 --- a/ports/libcoro/0003-fix-pkgconfig-includedir.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/libcoro.pc.in b/libcoro.pc.in ---- a/libcoro.pc.in -+++ b/libcoro.pc.in -@@ -1,5 +1,5 @@ - prefix="@CMAKE_INSTALL_PREFIX@" - libdir="${prefix}/lib" --includedir="@CMAKE_INSTALL_INCLUDEDIR@" -+includedir="${prefix}/include" - - Name: @PROJECT_NAME@ diff --git a/ports/libcoro/0004-fix-pkgconfig-on-windows.patch b/ports/libcoro/0004-fix-pkgconfig-on-windows.patch deleted file mode 100644 index 4adbad98144714..00000000000000 --- a/ports/libcoro/0004-fix-pkgconfig-on-windows.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -186,7 +186,11 @@ - - - # generate pc file for pkg-config --string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME}) -+if(MSVC) -+ set(target1 ${PROJECT_NAME}) -+else() -+ string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME}) -+endif() - configure_file(libcoro.pc.in libcoro.pc @ONLY) - - install(TARGETS libcoro) diff --git a/ports/libcoro/portfile.cmake b/ports/libcoro/portfile.cmake index c4a16fb68c8b69..d3512d5182b572 100644 --- a/ports/libcoro/portfile.cmake +++ b/ports/libcoro/portfile.cmake @@ -1,27 +1,19 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jbaldwin/libcoro REF "v${VERSION}" - SHA512 88d5954591493ad2942fa68ead65b67fa9ac26bcc260b3156844244968dd8477d62a3559a9d3b7b1175bf813e5f23ca2d288a72baeb3ebd774e756d3c06bfee8 + SHA512 fd3eb22a055db9567da482182a90d44c79ee8ccb641490945cb45b07686a32a31b7b37aa35b1f3f676a6ede366db01c9cd7b5f7ded899cb1133cdd1aac510154 HEAD_REF master - PATCHES - 0001-allow-shared-lib.patch - 0002-disable-git-config.patch - 0003-fix-pkgconfig-includedir.patch - 0004-fix-pkgconfig-on-windows.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES networking LIBCORO_FEATURE_NETWORKING - platform LIBCORO_FEATURE_PLATFORM - ssl LIBCORO_FEATURE_SSL + tls LIBCORO_FEATURE_TLS ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -29,6 +21,7 @@ vcpkg_cmake_configure( -DLIBCORO_EXTERNAL_DEPENDENCIES=ON -DLIBCORO_BUILD_TESTS=OFF -DLIBCORO_BUILD_EXAMPLES=OFF + -DLIBCORO_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ) vcpkg_cmake_install() @@ -38,3 +31,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() diff --git a/ports/libcoro/vcpkg.json b/ports/libcoro/vcpkg.json index 0746f37088182e..a436b804318d77 100644 --- a/ports/libcoro/vcpkg.json +++ b/ports/libcoro/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libcoro", - "version": "0.10", + "version": "0.11.1", "description": "C++20 coroutine library", "homepage": "https://github.com/jbaldwin/libcoro", "license": "Apache-2.0", @@ -10,22 +10,15 @@ "host": true } ], - "default-features": [ - "networking", - "ssl" - ], "features": { "networking": { "description": "Include networking features.", + "supports": "linux", "dependencies": [ "c-ares" ] }, - "platform": { - "description": "Include linux platform features.", - "supports": "linux" - }, - "ssl": { + "tls": { "description": "Include SSL features.", "dependencies": [ { diff --git a/ports/libdeflate/portfile.cmake b/ports/libdeflate/portfile.cmake index ae83dae067509e..d1888b8069cc72 100644 --- a/ports/libdeflate/portfile.cmake +++ b/ports/libdeflate/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ebiggers/libdeflate REF "v${VERSION}" - SHA512 fe57542a0d28ad61d70bef9b544bb6805f9f30930b16432712b3b1caab041f1f4e64315a4306a0635b96c2632239c5af0e45a3915581d0b89975729fc2e95613 + SHA512 5ebe6af9ce81872cba508d1f0aa087ddeb0e0f0c8e6360da66b8a9db2a76203dafbf3d3f6b3b791618ea9c6d0231fab5b4a55badb31a4480fb4174b9445c658b HEAD_REF master PATCHES remove_wrong_c_flags_modification.diff diff --git a/ports/libdeflate/vcpkg.json b/ports/libdeflate/vcpkg.json index b329492660d1f5..27d0f449bc3600 100644 --- a/ports/libdeflate/vcpkg.json +++ b/ports/libdeflate/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libdeflate", - "version": "1.19", - "port-version": 1, + "version": "1.20", "description": "libdeflate is a library for fast, whole-buffer DEFLATE-based compression and decompression.", "homepage": "https://github.com/ebiggers/libdeflate", "license": "MIT", diff --git a/ports/libfuse/portfile.cmake b/ports/libfuse/portfile.cmake new file mode 100644 index 00000000000000..2f7cdf1b96ddaf --- /dev/null +++ b/ports/libfuse/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libfuse/libfuse + REF "fuse-${VERSION}" + SHA512 e82581eec24f464bab7a2e2c18fa6b738e6f9f3f0a065c74a18727549159595d69e98772af87fa31fe1e632a6808cc40a788ad3d0330aba4937d4326b8bd5862 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dutils=false +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file diff --git a/ports/libfuse/vcpkg.json b/ports/libfuse/vcpkg.json new file mode 100644 index 00000000000000..508019e201789e --- /dev/null +++ b/ports/libfuse/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libfuse", + "version": "3.16.2", + "description": "The reference implementation of the Linux FUSE (Filesystem in Userspace) interface", + "homepage": "https://github.com/libfuse/libfuse", + "license": "LGPL-2.1 AND GPL-2.0", + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/ports/libjxl/fix-dependencies.patch b/ports/libjxl/fix-dependencies.patch index eeca99927e94d2..c399807a688008 100644 --- a/ports/libjxl/fix-dependencies.patch +++ b/ports/libjxl/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt -index 8ee9864..b8a22a5 100644 +index ea22103..bafb9b6 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt -@@ -47,7 +47,11 @@ endif() +@@ -48,7 +48,11 @@ endif() # brotli if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR JPEGXL_FORCE_SYSTEM_BROTLI) @@ -15,11 +15,11 @@ index 8ee9864..b8a22a5 100644 if (NOT Brotli_FOUND) message(FATAL_ERROR "Brotli not found, install brotli-dev or download brotli source code to" -@@ -111,7 +120,8 @@ if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) +@@ -106,7 +110,8 @@ if (JPEGXL_ENABLE_SKCMS) endif () - if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS) + if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" OR JPEGXL_FORCE_SYSTEM_LCMS2 ) -- find_package(LCMS2 2.13) +- find_package(LCMS2 2.12) + find_package(LCMS2 NAMES lcms2 REQUIRED) + add_library(lcms2 ALIAS lcms2::lcms2) if ( NOT LCMS2_FOUND ) diff --git a/ports/libjxl/fix-tools-build.patch b/ports/libjxl/fix-tools-build.patch new file mode 100644 index 00000000000000..8209d20cf5c8fd --- /dev/null +++ b/ports/libjxl/fix-tools-build.patch @@ -0,0 +1,13 @@ +diff --git a/lib/jxl_extras.cmake b/lib/jxl_extras.cmake +index 597f691..b1c184c 100644 +--- a/lib/jxl_extras.cmake ++++ b/lib/jxl_extras.cmake +@@ -151,7 +151,7 @@ endif() + + ### Library that does not depend on internal parts of jxl library. + ### Used by cjxl and djxl binaries. +-add_library(jxl_extras_codec ++add_library(jxl_extras_codec STATIC + $ + ) + target_link_libraries(jxl_extras_codec PRIVATE diff --git a/ports/libjxl/fix_static_suffix.patch b/ports/libjxl/fix_static_suffix.patch deleted file mode 100644 index ed441e611763af..00000000000000 --- a/ports/libjxl/fix_static_suffix.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/lib/jxl.cmake b/lib/jxl.cmake -index a42b6f0..77e850b 100644 ---- a/lib/jxl.cmake -+++ b/lib/jxl.cmake -@@ -627,6 +627,7 @@ foreach(target IN ITEMS jxl jxl_dec) - endif() - endforeach() - -+set(JXL_STATIC_SUFFIX "") - # Only install libjxl shared library. The libjxl_dec is not installed since it - # contains symbols also in libjxl which would conflict if programs try to use - # both. -@@ -637,6 +638,7 @@ install(TARGETS jxl - else() - add_library(jxl ALIAS jxl-static) - add_library(jxl_dec ALIAS jxl_dec-static) -+set(JXL_STATIC_SUFFIX "-static") - endif() # BUILD_SHARED_LIBS - - # Add a pkg-config file for libjxl. -diff --git a/lib/jxl/libjxl.pc.in b/lib/jxl/libjxl.pc.in -index 4a7af65..2d8d433 100644 ---- a/lib/jxl/libjxl.pc.in -+++ b/lib/jxl/libjxl.pc.in -@@ -7,7 +7,7 @@ Name: libjxl - Description: Loads and saves JPEG XL files - Version: @JPEGXL_LIBRARY_VERSION@ - Requires.private: @JPEGXL_LIBRARY_REQUIRES@ --Libs: -L${libdir} -ljxl -+Libs: -L${libdir} -ljxl@JXL_STATIC_SUFFIX@ - Libs.private: -lm - Cflags: -I${includedir} - Cflags.private: -DJXL_STATIC_DEFINE -diff --git a/lib/jxl_threads.cmake b/lib/jxl_threads.cmake -index b8ce66b..1634280 100644 ---- a/lib/jxl_threads.cmake -+++ b/lib/jxl_threads.cmake -@@ -100,6 +100,7 @@ target_compile_definitions(jxl_threads - generate_export_header(jxl_threads - BASE_NAME JXL_THREADS - EXPORT_FILE_NAME include/jxl/jxl_threads_export.h) -+set(THREAD_STATIC_SUFFIX "") - else() - add_library(jxl_threads ALIAS jxl_threads-static) - # When not building the shared library generate the jxl_threads_export.h header -@@ -107,6 +108,7 @@ add_library(jxl_threads ALIAS jxl_threads-static) - generate_export_header(jxl_threads-static - BASE_NAME JXL_THREADS - EXPORT_FILE_NAME include/jxl/jxl_threads_export.h) -+set(THREAD_STATIC_SUFFIX "-static") - endif() # BUILD_SHARED_LIBS - - -diff --git a/lib/threads/libjxl_threads.pc.in b/lib/threads/libjxl_threads.pc.in -index 50b937a..26cebbc 100644 ---- a/lib/threads/libjxl_threads.pc.in -+++ b/lib/threads/libjxl_threads.pc.in -@@ -7,7 +7,7 @@ Name: libjxl_threads - Description: JPEG XL multi-thread runner using std::threads. - Version: @JPEGXL_LIBRARY_VERSION@ - Requires.private: @JPEGXL_THREADS_LIBRARY_REQUIRES@ --Libs: -L${libdir} -ljxl_threads -+Libs: -L${libdir} -ljxl_threads@THREAD_STATIC_SUFFIX@ - Libs.private: -lm - Cflags: -I${includedir} - Cflags.private: -DJXL_THREADS_STATIC_DEFINE diff --git a/ports/libjxl/portfile.cmake b/ports/libjxl/portfile.cmake index 96a841b7daa1b9..fbb2a71a80232c 100644 --- a/ports/libjxl/portfile.cmake +++ b/ports/libjxl/portfile.cmake @@ -2,12 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjxl/libjxl REF "v${VERSION}" - SHA512 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887 + SHA512 1d19f30c0ae94e212326a15dc128612bce207e619c55c2a020401a27d01a933de71bb35e907521dc8fd853dd5578d74d74f7a5a282f0083fd22cf9cb07ccb96e HEAD_REF main PATCHES fix-dependencies.patch - trim-shared-build.patch - fix_static_suffix.patch #https://github.com/libjxl/libjxl/pull/2754 + fix-tools-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -61,6 +60,10 @@ if(JPEGXL_ENABLE_TOOLS) vcpkg_copy_tools(TOOL_NAMES cjxl djxl cjpeg_hdr jxlinfo AUTO_CLEAN) endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/jxl/jxl_export.h" "ifdef JXL_STATIC_DEFINE" "if 1") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libjxl/trim-shared-build.patch b/ports/libjxl/trim-shared-build.patch deleted file mode 100644 index e9620b5c160278..00000000000000 --- a/ports/libjxl/trim-shared-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/lib/jxl.cmake b/lib/jxl.cmake -index a8a96e1..a42b6f0 100644 ---- a/lib/jxl.cmake -+++ b/lib/jxl.cmake -@@ -556,8 +556,13 @@ if (NOT WIN32 OR MINGW) - set_target_properties(jxl-static PROPERTIES OUTPUT_NAME "jxl") - set_target_properties(jxl_dec-static PROPERTIES OUTPUT_NAME "jxl_dec") - endif() -+if(BUILD_SHARED_LIBS) -+ set_target_properties(jxl-static PROPERTIES EXCLUDE_FROM_ALL 1) -+ set_target_properties(jxl_dec-static PROPERTIES EXCLUDE_FROM_ALL 1) -+else() - install(TARGETS jxl-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(TARGETS jxl_dec-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+endif() - - if (BUILD_SHARED_LIBS) - -diff --git a/lib/jxl_threads.cmake b/lib/jxl_threads.cmake -index 006e71e..b8ce66b 100644 ---- a/lib/jxl_threads.cmake -+++ b/lib/jxl_threads.cmake -@@ -43,10 +43,14 @@ set_target_properties(${_target} PROPERTIES - if (NOT WIN32 OR MINGW) - set_target_properties(${_target} PROPERTIES OUTPUT_NAME "jxl_threads") - endif() -+if(BUILD_SHARED_LIBS AND _target MATCHES "-static") -+ set_target_properties(${_target} PROPERTIES EXCLUDE_FROM_ALL 1) -+else() - install(TARGETS ${_target} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+endif() - - endfunction() - diff --git a/ports/libjxl/vcpkg.json b/ports/libjxl/vcpkg.json index 8e28e0f7b0a38a..e1f6580d040770 100644 --- a/ports/libjxl/vcpkg.json +++ b/ports/libjxl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libjxl", - "version-semver": "0.8.2", - "port-version": 2, + "version-semver": "0.10.2", + "port-version": 1, "description": "JPEG XL image format reference implementation", "homepage": "https://github.com/libjxl/libjxl", "license": "BSD-3-Clause", diff --git a/ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch b/ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch index 5e070cc07fe0bf..e70c202d916bf3 100644 --- a/ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch +++ b/ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch @@ -16,7 +16,7 @@ index b05c334..dd4063c 100644 dnl Checks for libraries if test "$enable_zlib" != "no"; then - AC_CHECK_LIB(z, gzopen) -+ AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib = "yes", have_zlib = "no") ++ AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib="yes", have_zlib="no") fi if test "$enable_bzlib" != "no"; then AC_CHECK_LIB(bz2, BZ2_bzCompressInit) diff --git a/ports/libmagic/0017-Change-bzlib-name-to-match-CMake-output.patch b/ports/libmagic/0017-Change-bzlib-name-to-match-CMake-output.patch new file mode 100644 index 00000000000000..ba26f6cbcb7f75 --- /dev/null +++ b/ports/libmagic/0017-Change-bzlib-name-to-match-CMake-output.patch @@ -0,0 +1,27 @@ +diff --git a/configure.ac b/configure.ac +index 8b54efda..d043fb06 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -191,7 +191,7 @@ if test "$enable_zlib" != "no"; then + AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib="yes", have_zlib="no") + fi + if test "$enable_bzlib" != "no"; then +- AC_CHECK_LIB(bz2, BZ2_bzCompressInit) ++ AC_SEARCH_LIBS(BZ2_bzCompressInit, [bz2 bz2d], have_bzlib="yes", have_bzlib="no") + fi + if test "$enable_xzlib" != "no"; then + AC_CHECK_LIB(lzma, lzma_stream_decoder) +@@ -222,11 +222,11 @@ if test "$ac_cv_header_zlib_h$have_zlib" = "yesyes"; then + AC_DEFINE([ZLIBSUPPORT], 1, [Enable zlib compression support]) + fi + if test "$enable_bzlib" = "yes"; then +- if test "$ac_cv_header_bzlib_h$ac_cv_lib_bz2_BZ2_bzCompressInit" != "yesyes"; then ++ if test "$ac_cv_header_bzlib_h$have_bzlib" != "yesyes"; then + AC_MSG_ERROR([bzlib support requested but not found]) + fi + fi +-if test "$ac_cv_header_bzlib_h$ac_cv_lib_bz2_BZ2_bzCompressInit" = "yesyes"; then ++if test "$ac_cv_header_bzlib_h$have_bzlib" = "yesyes"; then + AC_DEFINE([BZLIBSUPPORT], 1, [Enable bzlib compression support]) + fi + if test "$enable_xzlib" = "yes"; then diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake index c1afade496b1a3..c6d775fda7d7b0 100644 --- a/ports/libmagic/portfile.cmake +++ b/ports/libmagic/portfile.cmake @@ -14,6 +14,7 @@ if(VCPKG_TARGET_IS_WINDOWS) "0013-Check-for-backslash-in-argv-0-on-Windows.patch" "0015-MSYS2-Remove-ioctl-call.patch" "0016-Fix-file_famagic-function.patch" + "0017-Change-bzlib-name-to-match-CMake-output.patch" ) endif() @@ -31,9 +32,30 @@ if(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") endif() +set(FEATURE_OPTIONS) + +macro(enable_feature feature switch) + if("${feature}" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "--enable-${switch}") + set(has_${feature} 1) + else() + list(APPEND FEATURE_OPTIONS "--disable-${switch}") + set(has_${feature} 0) + endif() +endmacro() + +enable_feature("bzip2" "bzlib") +enable_feature("zlib" "zlib") +enable_feature("lzma" "xzlib") +enable_feature("zstd" "zstdlib") + vcpkg_configure_make( AUTOCONFIG SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + "--disable-lzlib" + "--disable-libseccomp" ) if(VCPKG_CROSSCOMPILING) diff --git a/ports/libmagic/unofficial-libmagic-config.cmake.in b/ports/libmagic/unofficial-libmagic-config.cmake.in index 8f22d30f9a58d2..5cda560576de38 100644 --- a/ports/libmagic/unofficial-libmagic-config.cmake.in +++ b/ports/libmagic/unofficial-libmagic-config.cmake.in @@ -1,8 +1,27 @@ @PACKAGE_INIT@ -if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - include(CMakeFindDependencyMacro) - find_dependency(unofficial-tre) +include(CMakeFindDependencyMacro) + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + if(WIN32) + find_dependency(unofficial-tre) + endif() + + if(@has_zlib@) + find_dependency(ZLIB) + endif() + + if(@has_bzip2@) + find_dependency(BZip2) + endif() + + if(@has_lzma@) + find_dependency(LibLZMA) + endif() + + if(@has_zstd@) + find_dependency(zstd) + endif() endif() # Compute the installation prefix relative to this file. @@ -23,9 +42,14 @@ set_target_properties(unofficial::libmagic::libmagic PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" ) -if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") set_target_properties(unofficial::libmagic::libmagic PROPERTIES - INTERFACE_LINK_LIBRARIES "\$" + INTERFACE_LINK_LIBRARIES + "\$:unofficial::tre::tre>>" + "\$>" + "\$>" + "\$>" + "\$,zstd::libzstd_shared,zstd::libzstd_static>>>" ) endif() diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index a556d5d34dafdf..6197de48b4528c 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmagic", "version": "5.45", - "port-version": 1, + "port-version": 2, "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", "license": "BSD-2-Clause", @@ -22,5 +22,31 @@ "name": "tre", "platform": "windows | mingw" } - ] + ], + "features": { + "bzip2": { + "description": "Enable bzip2 support", + "dependencies": [ + "bzip2" + ] + }, + "lzma": { + "description": "Enable lzma support", + "dependencies": [ + "liblzma" + ] + }, + "zlib": { + "description": "Enable zlib support", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Enable zstd support", + "dependencies": [ + "zstd" + ] + } + } } diff --git a/ports/libmidi2/portfile.cmake b/ports/libmidi2/portfile.cmake new file mode 100644 index 00000000000000..6fd158ac9fb7c7 --- /dev/null +++ b/ports/libmidi2/portfile.cmake @@ -0,0 +1,21 @@ + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO midi2-dev/AM_MIDI2.0Lib + REF "v${VERSION}" + SHA512 663c2449b30a426fae0c4b57eae6e3c4d95a402ce72f175f39064f251420ff06ef6d58cf635614c27938284ae8b51793d53fa87426ac122318cddaa55b48ef02 + HEAD_REF main +) + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + diff --git a/ports/libmidi2/vcpkg.json b/ports/libmidi2/vcpkg.json new file mode 100644 index 00000000000000..13034f107d2093 --- /dev/null +++ b/ports/libmidi2/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libmidi2", + "version": "0.7", + "description": "General purpose Midi 2 library for bytestream conversions and midi-ci", + "homepage": "https://github.com/midi2-dev/AM_MIDI2.0Lib", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/liborigin/fix-installing-import-library-with-MSVC.patch b/ports/liborigin/fix-installing-import-library-with-MSVC.patch new file mode 100644 index 00000000000000..9f0c75c073e9fd --- /dev/null +++ b/ports/liborigin/fix-installing-import-library-with-MSVC.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 24ebee5..a0b88b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,7 +78,7 @@ if (BUILD_STATIC_LIBS) + add_library (origin_static STATIC $) + set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" ) + install( TARGETS origin_static +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + endif () +@@ -100,6 +100,7 @@ if (BUILD_SHARED_LIBS) + install( TARGETS origin_shared + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + endif () + diff --git a/ports/liborigin/portfile.cmake b/ports/liborigin/portfile.cmake index 4f5c5947f01334..fd902683fdb8c9 100644 --- a/ports/liborigin/portfile.cmake +++ b/ports/liborigin/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_sourceforge( REF liborigin/3.0 FILENAME liborigin-${VERSION}.tar.gz SHA512 9fb5ae6d8aa8fb54e659482f8f5dc581b8d0ace2ebca7bb9f092b7ec753049d497491eb47ad89b12c8ddf7e19dc47f76e76c51ace789366370bd056d99e091ee + PATCHES + fix-installing-import-library-with-MSVC.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -21,11 +23,6 @@ vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/origin.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/origin.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) -endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") else() diff --git a/ports/liborigin/vcpkg.json b/ports/liborigin/vcpkg.json index 6fc4fb5dbee1f4..ec49705bae7656 100644 --- a/ports/liborigin/vcpkg.json +++ b/ports/liborigin/vcpkg.json @@ -1,6 +1,7 @@ { "name": "liborigin", "version": "3.0.2", + "port-version": 1, "description": "A library for reading OriginLab OPJ project files.", "homepage": "https://sourceforge.net/projects/liborigin/", "license": "GPL-2.0-or-later", diff --git a/ports/libtorch/force-cuda-include.patch b/ports/libtorch/force-cuda-include.patch new file mode 100644 index 00000000000000..62ec1e065df282 --- /dev/null +++ b/ports/libtorch/force-cuda-include.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake +index e8e450d36c..8ba1778b4f 100644 +--- a/cmake/public/cuda.cmake ++++ b/cmake/public/cuda.cmake +@@ -60,6 +60,7 @@ find_package(CUDAToolkit REQUIRED) + + cmake_policy(POP) + ++set(CUDAToolkit_INCLUDE_DIR "${CUDA_INCLUDE_DIRS}") + if(NOT CMAKE_CUDA_COMPILER_VERSION STREQUAL CUDAToolkit_VERSION OR + NOT CUDA_INCLUDE_DIRS STREQUAL CUDAToolkit_INCLUDE_DIR) + message(FATAL_ERROR "Found two conflicting CUDA installs:\n" diff --git a/ports/libtorch/portfile.cmake b/ports/libtorch/portfile.cmake index a29cf0801893ef..b0da70bb14c443 100644 --- a/ports/libtorch/portfile.cmake +++ b/ports/libtorch/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_from_github( fix-glog.patch fix-msvc-ICE.patch fix-calculate-minloglevel.patch + force-cuda-include.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/caffe2/core/macros.h") # We must use generated header files diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json index 2b6477f58d37de..0bf479b8774ab9 100644 --- a/ports/libtorch/vcpkg.json +++ b/ports/libtorch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtorch", "version": "2.1.2", - "port-version": 1, + "port-version": 2, "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration", "homepage": "https://pytorch.org/", "license": null, diff --git a/ports/libunwind/portfile.cmake b/ports/libunwind/portfile.cmake index e41b242801234f..3e8f4a0125f2a8 100644 --- a/ports/libunwind/portfile.cmake +++ b/ports/libunwind/portfile.cmake @@ -2,13 +2,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "libunwind/libunwind" REF "v${VERSION}" - HEAD_REF "v1.8-stable" - SHA512 105bd4ff0f23f98046a4ed2cb58664083eba35154c92334a1f905ef13e1e92abbf87acb82556c9242c4209626f065d2519f3260e69d2146234a285b4ddd64470 + HEAD_REF master + SHA512 dd8332b7a2cbabb4716c01feea422f83b4a7020c1bee20551de139c3285ea0e0ceadfa4171c6f5187448c8ddc53e0ec4728697d0a985ee0c3ff4835b94f6af6f ) vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG + OPTIONS + --disable-tests ) vcpkg_install_make() vcpkg_fixup_pkgconfig() diff --git a/ports/libunwind/vcpkg.json b/ports/libunwind/vcpkg.json index f540904c3716d7..fbdf2d8efebe14 100644 --- a/ports/libunwind/vcpkg.json +++ b/ports/libunwind/vcpkg.json @@ -1,14 +1,8 @@ { "name": "libunwind", - "version": "1.8.0", + "version": "1.8.1", "description": "Unix libray for portable stack unwinding", "homepage": "https://www.nongnu.org/libunwind", "license": "MIT", - "supports": "linux", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ] + "supports": "linux" } diff --git a/ports/libxt/portfile.cmake b/ports/libxt/portfile.cmake index a6e3ceebb00940..7109c42a91dbdd 100644 --- a/ports/libxt/portfile.cmake +++ b/ports/libxt/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/xorg OUT_SOURCE_PATH SOURCE_PATH REPO lib/libxt - REF edd70bdfbbd16247e3d9564ca51d864f82626eb7 # 1.2.1 - SHA512 c49876253dfd187e7d56a098d3d992157daefa2c25ee732eaae5818ee04513bedd807d2f265085db2e82c0b1821e152a88fb4998c0002f6ac57204543fe18566 + REF "libXt-${VERSION}" + SHA512 7cb22be9706bd7d089e84c09a99597f730ca858a9f8134d2741916b28cd4786e236beaad568c8b7ab8cdcfdea1c49140cefac528244bab8c94d48dc4729267e8 HEAD_REF master PATCHES windows_build.patch diff --git a/ports/libxt/vcpkg.json b/ports/libxt/vcpkg.json index 99029921010212..1376103c4d016c 100644 --- a/ports/libxt/vcpkg.json +++ b/ports/libxt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libxt", - "version": "1.2.1", - "port-version": 1, + "version": "1.3.0", "description": "X Toolkit Intrinsics library", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxt", "license": null, diff --git a/ports/linenoise-ng/portfile.cmake b/ports/linenoise-ng/portfile.cmake deleted file mode 100644 index c85d8d31d16e74..00000000000000 --- a/ports/linenoise-ng/portfile.cmake +++ /dev/null @@ -1,21 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO arangodb/linenoise-ng - REF 4754bee2d8eb3c4511e6ac87cac62255b2011e2f - SHA512 080c6b4cde911a162885a2e6fc95143ab481b4dcc0f8b871a55a071ccb4ab868b19201ec17475a3c3ceef1b82325d757913383b3c46da6946ddc8bfc0d82d9ca - HEAD_REF master -) - - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/linenoise-ng/vcpkg.json b/ports/linenoise-ng/vcpkg.json deleted file mode 100644 index 8690f9deb078f8..00000000000000 --- a/ports/linenoise-ng/vcpkg.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "linenoise-ng", - "version-string": "4754bee2d8eb3", - "port-version": 3, - "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/llnl-units/portfile.cmake b/ports/llnl-units/portfile.cmake new file mode 100644 index 00000000000000..906ddd608f79b7 --- /dev/null +++ b/ports/llnl-units/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LLNL/units + REF "v${VERSION}" + SHA512 b0c40248a25adff97d3bd6eb6899bf7ed9a4622857a6eb0d62d040db6e60141fac201362710bbe417d8c284adcec89f8742815fcf17f30557e822d8f4e08fc4e + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUNITS_CMAKE_PROJECT_NAME=LLNL-UNITS + -DUNITS_ENABLE_TESTS=OFF + -DUNITS_BUILD_FUZZ_TARGETS=OFF + -DLLNL-UNITS_ENABLE_ERROR_ON_WARNINGS=OFF + -DLLNL-UNITS_ENABLE_EXTRA_COMPILER_WARNINGS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME llnl-units CONFIG_PATH lib/cmake/llnl-units) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/llnl-units/usage b/ports/llnl-units/usage new file mode 100644 index 00000000000000..47da448bdd007e --- /dev/null +++ b/ports/llnl-units/usage @@ -0,0 +1,4 @@ +llnl-units provides CMake targets: + + find_package(llnl-units CONFIG REQUIRED) + target_link_libraries(main PRIVATE llnl-units::units) diff --git a/ports/llnl-units/vcpkg.json b/ports/llnl-units/vcpkg.json new file mode 100644 index 00000000000000..cdbfd29fd891f8 --- /dev/null +++ b/ports/llnl-units/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "llnl-units", + "version": "0.9.1", + "description": "A run-time C++ library for working with units of measurement and conversions between them and with string representations of units and measurements", + "homepage": "https://github.com/LLNL/units", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 0cdc1203122976..41716fdcf680bf 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -158,17 +158,14 @@ if("mlir" IN_LIST FEATURES) endif() if("openmp" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "openmp") + # Perl is required for the OpenMP run-time + vcpkg_find_acquire_program(PERL) list(APPEND FEATURE_OPTIONS -DLIBOMP_INSTALL_ALIASES=OFF -DOPENMP_ENABLE_LIBOMPTARGET=OFF # Currently libomptarget cannot be compiled on Windows or MacOS X. -DOPENMP_ENABLE_OMPT_TOOLS=OFF # Currently tools are not tested well on Windows or MacOS X. + -DPERL_EXECUTABLE=${PERL} ) - # Perl is required for the OpenMP run-time - vcpkg_find_acquire_program(PERL) - get_filename_component(PERL_PATH ${PERL} DIRECTORY) - vcpkg_add_to_path(${PERL_PATH}) - # Skip post-build check - set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled) endif() if("polly" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "polly") diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 1313c98ffc789e..dfa1805d8239e8 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llvm", "version": "17.0.2", - "port-version": 3, + "port-version": 4, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", diff --git a/ports/luasec/vcpkg.json b/ports/luasec/vcpkg.json index 66878c48c55f2c..3fa5724902fca1 100644 --- a/ports/luasec/vcpkg.json +++ b/ports/luasec/vcpkg.json @@ -1,7 +1,7 @@ { "name": "luasec", "version": "1.3.2", - "port-version": 1, + "port-version": 2, "maintainers": "Stephen Baker ", "description": "LuaSec depends on OpenSSL, and integrates with LuaSocket to make it easy to add secure connections to any Lua applications or scripts.", "homepage": "https://github.com/lunarmodules/luasec", diff --git a/ports/luasocket/CMakeLists.txt b/ports/luasocket/CMakeLists.txt index 3ab763debc0259..b07f043217e6c3 100644 --- a/ports/luasocket/CMakeLists.txt +++ b/ports/luasocket/CMakeLists.txt @@ -1,14 +1,14 @@ -cmake_minimum_required(VERSION 3.0.2) +cmake_minimum_required(VERSION 3.10) project(luasocket) -if(NOT WIN32) - message(FATAL_ERROR "Written for windows only") +if(WIN32) + set(PLATFORM_LIBRARIES ws2_32) endif() find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua) find_library(LUA_LIBRARY lua) set(LUASOCKET_INCLUDES ${LUA_INCLUDE_DIR} src) -set(LUASOCKET_LIBRARIES ${LUA_LIBRARY} ws2_32) +set(LUASOCKET_LIBRARIES ${LUA_LIBRARY} ${PLATFORM_LIBRARIES}) add_library(socket.core src/luasocket.c @@ -22,33 +22,106 @@ add_library(socket.core src/select.c src/tcp.c src/udp.c - src/compat.c - src/wsocket.c) - -add_library(mime.core - src/mime.c src/compat.c) - +if(WIN32) + target_sources(socket.core PRIVATE + src/wsocket.c) +elseif (UNIX) + target_sources(socket.core PRIVATE + src/usocket.c) +endif() +set_target_properties(socket.core PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "socket" + LIBRARY_OUTPUT_DIRECTORY "socket" + PREFIX "" + RUNTIME_OUTPUT_NAME "core" + LIBRARY_OUTPUT_NAME "core") target_include_directories(socket.core PRIVATE ${LUASOCKET_INCLUDES}) target_link_libraries(socket.core PRIVATE ${LUASOCKET_LIBRARIES}) +add_library(mime.core + src/mime.c + src/compat.c) +set_target_properties(mime.core PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "mime" + LIBRARY_OUTPUT_DIRECTORY "mime" + PREFIX "" + RUNTIME_OUTPUT_NAME "core" + LIBRARY_OUTPUT_NAME "core") target_include_directories(mime.core PRIVATE ${LUASOCKET_INCLUDES}) target_link_libraries(mime.core PRIVATE ${LUASOCKET_LIBRARIES}) -add_definitions( - "-DLUASOCKET_API=__declspec(dllexport)" - "-DMIME_API=__declspec(dllexport)") +if(UNIX) + add_library(socket.unix + src/buffer.c + src/compat.c + src/auxiliar.c + src/options.c + src/timeout.c + src/io.c + src/usocket.c + src/unix.c + src/unixdgram.c + src/unixstream.c) + set_target_properties(socket.unix PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "socket" + LIBRARY_OUTPUT_DIRECTORY "socket" + PREFIX "" + RUNTIME_OUTPUT_NAME "unix" + LIBRARY_OUTPUT_NAME "unix") + target_include_directories(socket.unix PRIVATE ${LUASOCKET_INCLUDES}) + target_link_libraries(socket.unix PRIVATE ${LUASOCKET_LIBRARIES}) + + add_library(socket.serial + src/buffer.c + src/compat.c + src/auxiliar.c + src/options.c + src/timeout.c + src/io.c + src/usocket.c + src/serial.c) + set_target_properties(socket.serial PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "socket" + LIBRARY_OUTPUT_DIRECTORY "socket" + PREFIX "" + RUNTIME_OUTPUT_NAME "serial" + LIBRARY_OUTPUT_NAME "serial") + target_include_directories(socket.serial PRIVATE ${LUASOCKET_INCLUDES}) + target_link_libraries(socket.serial PRIVATE ${LUASOCKET_LIBRARIES}) +endif() + +if(WIN32) + if("${BUILD_TYPE}" STREQUAL "STATIC") + add_definitions( + "-DLUASOCKET_API=") + else() + add_definitions( + "-DLUASOCKET_API=__declspec(dllexport)") + endif() +endif() install(TARGETS socket.core RUNTIME DESTINATION bin/socket - LIBRARY DESTINATION lib + LIBRARY DESTINATION lib/socket ARCHIVE DESTINATION lib) install(TARGETS mime.core RUNTIME DESTINATION bin/mime - LIBRARY DESTINATION lib + LIBRARY DESTINATION lib/mime ARCHIVE DESTINATION lib) +if(UNIX) + install(TARGETS socket.unix + RUNTIME DESTINATION bin/socket + LIBRARY DESTINATION lib/socket + ARCHIVE DESTINATION lib) + install(TARGETS socket.serial + RUNTIME DESTINATION bin/socket + LIBRARY DESTINATION lib/socket + ARCHIVE DESTINATION lib) +endif() + install(FILES src/ltn12.lua src/socket.lua diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake index a2a126e8ad2ee2..1a56337a1e7ae7 100644 --- a/ports/luasocket/portfile.cmake +++ b/ports/luasocket/portfile.cmake @@ -7,8 +7,16 @@ vcpkg_from_github( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_TYPE SHARED) +else() + set(BUILD_TYPE STATIC) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TYPE=${BUILD_TYPE} ) vcpkg_cmake_install() @@ -19,19 +27,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright vcpkg_install_copyright(FILE_LIST ${SOURCE_PATH}/LICENSE) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") -# Handle socket dll name - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll" RESULT temp) - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb" RESULT temp) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll" RESULT temp) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb" RESULT temp) - -# Handle mime dll name - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll" RESULT temp) - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb" RESULT temp) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll" RESULT temp) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb" RESULT temp) -endif() # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/luasocket/vcpkg.json b/ports/luasocket/vcpkg.json index 719065696084d5..bfae0ba4e629b4 100644 --- a/ports/luasocket/vcpkg.json +++ b/ports/luasocket/vcpkg.json @@ -1,10 +1,10 @@ { "name": "luasocket", "version": "3.1.0", + "port-version": 1, "description": "LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.", "homepage": "https://lunarmodules.github.io/luasocket/", "license": "MIT", - "supports": "windows", "dependencies": [ "lua", { diff --git a/ports/mimalloc/fix-cmake.patch b/ports/mimalloc/fix-cmake.patch index 3164b1b3c0b5fa..bab29a433af3da 100644 --- a/ports/mimalloc/fix-cmake.patch +++ b/ports/mimalloc/fix-cmake.patch @@ -1,6 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2bcd1ef..351817c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -380,11 +380,11 @@ target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.lib) +@@ -297,6 +297,10 @@ if (MSVC AND MSVC_VERSION GREATER_EQUAL 1914) + list(APPEND mi_cflags /Zc:__cplusplus) + endif() + ++if(MINGW) ++ add_definitions(-D_WIN32_WINNT=0x600) ++endif() ++ + # extra needed libraries + if(WIN32) + list(APPEND mi_libraries psapi shell32 user32 advapi32 bcrypt) +@@ -412,10 +416,10 @@ if(MI_BUILD_SHARED) add_custom_command(TARGET mimalloc POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $ COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory") @@ -9,8 +22,7 @@ endif() - install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) -+ install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${mi_install_libdir} NAMELINK_SKIP) ++ install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION ${mi_install_libdir} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${mi_install_libdir}) install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) endif() - # static library diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 88f33916d0e7f7..500920c999492b 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -45,7 +45,7 @@ file(COPY ) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mimalloc) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/include/mimalloc.h" "!defined(MI_SHARED_LIB)" @@ -56,5 +56,16 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() +set(mi_basename "mimalloc") +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(APPEND mi_basename "-static") +endif() +if("secure" IN_LIST FEATURES) + string(APPEND mi_basename "-secure") +endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mimalloc.pc" " -lmimalloc" " -l${mi_basename}") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mimalloc.pc" " -lmimalloc" " -l${mi_basename}-debug") +endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/mimalloc/usage b/ports/mimalloc/usage index 45cd37e753dac9..8f54deab477528 100644 --- a/ports/mimalloc/usage +++ b/ports/mimalloc/usage @@ -2,3 +2,8 @@ mimalloc provides CMake targets: find_package(mimalloc CONFIG REQUIRED) target_link_libraries(main PRIVATE $,mimalloc-static,mimalloc) + +To ensure the mimalloc-override.dll is loaded at runtime on Windows with +dynamic linkage, it is suggested to insert some call to the mimalloc API +in the main function, eg. `mi_version()`. Cf. +https://github.com/microsoft/mimalloc/blob/dev/readme.md#dynamic-override-on-windows diff --git a/ports/mimalloc/vcpkg-cmake-wrapper.cmake b/ports/mimalloc/vcpkg-cmake-wrapper.cmake index 4e2a70c4b5e3b5..15ad8478258034 100644 --- a/ports/mimalloc/vcpkg-cmake-wrapper.cmake +++ b/ports/mimalloc/vcpkg-cmake-wrapper.cmake @@ -1,5 +1,17 @@ _find_package(${ARGS}) +if(CMAKE_CURRENT_LIST_DIR STREQUAL "${MIMALLOC_CMAKE_DIR}/${MIMALLOC_VERSION_DIR}") + set(MIMALLOC_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + # As in vcpkg.cmake + if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$") + set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib") + else() + set(MIMALLOC_LIBRARY_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib") + endif() + set(MIMALLOC_OBJECT_DIR "MIMALLOC_OBJECT_DIR-NOTFOUND") # not installed + set(MIMALLOC_TARGET_DIR "${MIMALLOC_LIBRARY_DIR}") +endif() + if(TARGET mimalloc AND NOT TARGET mimalloc-static) add_library(mimalloc-static INTERFACE IMPORTED) set_target_properties(mimalloc-static PROPERTIES INTERFACE_LINK_LIBRARIES mimalloc) diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 0a3c8e93a7048e..07172875c68d80 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mimalloc", "version": "2.1.2", - "port-version": 1, + "port-version": 2, "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/ports/mongo-cxx-driver/libbsoncxx-config.cmake b/ports/mongo-cxx-driver/libbsoncxx-config.cmake deleted file mode 100644 index 33a3e5aedade90..00000000000000 --- a/ports/mongo-cxx-driver/libbsoncxx-config.cmake +++ /dev/null @@ -1,9 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(libbsoncxx-static ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG) -set(LIBBSONCXX_VERSION_MAJOR "${LIBBSONCXX_STATIC_VERSION_MAJOR}") -set(LIBBSONCXX_VERSION_MINOR "${LIBBSONCXX_STATIC_VERSION_MINOR}") -set(LIBBSONCXX_VERSION_PATCH "${LIBBSONCXX_STATIC_VERSION_PATCH}") -set(LIBBSONCXX_PACKAGE_VERSION "${LIBBSONCXX_STATIC_PACKAGE_VERSION}") -set(LIBBSONCXX_DEFINITIONS "${LIBBSONCXX_STATIC_DEFINITIONS}") -set(LIBBSONCXX_INCLUDE_DIRS "${LIBBSONCXX_STATIC_INCLUDE_DIRS}") -set(LIBBSONCXX_LIBRARIES "${LIBBSONCXX_STATIC_LIBRARIES}") diff --git a/ports/mongo-cxx-driver/libmongocxx-config.cmake b/ports/mongo-cxx-driver/libmongocxx-config.cmake deleted file mode 100644 index faba20f2591f0d..00000000000000 --- a/ports/mongo-cxx-driver/libmongocxx-config.cmake +++ /dev/null @@ -1,9 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(libmongocxx-static ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG) -set(LIBMONGOCXX_VERSION_MAJOR "${LIBMONGOCXX_STATIC_VERSION_MAJOR}") -set(LIBMONGOCXX_VERSION_MINOR "${LIBMONGOCXX_STATIC_VERSION_MINOR}") -set(LIBMONGOCXX_VERSION_PATCH "${LIBMONGOCXX_STATIC_VERSION_PATCH}") -set(LIBMONGOCXX_PACKAGE_VERSION "${LIBMONGOCXX_STATIC_PACKAGE_VERSION}") -set(LIBMONGOCXX_DEFINITIONS "${LIBMONGOCXX_STATIC_DEFINITIONS}") -set(LIBMONGOCXX_INCLUDE_DIRS "${LIBMONGOCXX_STATIC_INCLUDE_DIRS}") -set(LIBMONGOCXX_LIBRARIES "${LIBMONGOCXX_STATIC_LIBRARIES}") diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index de8e1752e196a8..be7798ee3aae17 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-cxx-driver REF "r${VERSION}" - SHA512 34ff303d496dd2c9b8cada16dc215c40fddccfe660bdc7fe59c92449861876b820c3ea4e3e5c91029e0322411bbe98a11cb1f3fa046b028d92d3c9a3509ce988 + SHA512 cc09ccbb926b1f00ebd9ead5afda150d0d8a8619c2439f8a9bc01a1f49ebfc0cee91ca2019d97a883a469a8594961b5b74fcc06525dce38461e2003a9f1894c4 HEAD_REF master PATCHES fix-dependencies.patch @@ -38,16 +38,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(PACKAGE_NAME "bsoncxx" CONFIG_PATH "lib/cmake/bsoncxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(PACKAGE_NAME "mongocxx" CONFIG_PATH "lib/cmake/mongocxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_cmake_config_fixup(PACKAGE_NAME "libbsoncxx-static" CONFIG_PATH "lib/cmake/libbsoncxx-static-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libbsoncxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libbsoncxx") - vcpkg_cmake_config_fixup(PACKAGE_NAME "libmongocxx-static" CONFIG_PATH "lib/cmake/libmongocxx-static-${VERSION}") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libmongocxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libmongocxx") -else() - vcpkg_cmake_config_fixup(PACKAGE_NAME "libbsoncxx" CONFIG_PATH "lib/cmake/libbsoncxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) - vcpkg_cmake_config_fixup(PACKAGE_NAME "libmongocxx" CONFIG_PATH "lib/cmake/libmongocxx-${VERSION}") -endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME "mongocxx" CONFIG_PATH "lib/cmake/mongocxx-${VERSION}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 4cc9f79cf5f8a3..7fab486e765f9f 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-cxx-driver", - "version": "3.9.0", + "version": "3.10.1", "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "license": "Apache-2.0", diff --git a/ports/nanobind/find_dependency_python.patch b/ports/nanobind/find_dependency_python.patch new file mode 100644 index 00000000000000..9fcb019fcc8588 --- /dev/null +++ b/ports/nanobind/find_dependency_python.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 919ce1d..25956c7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -107,29 +107,11 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU") + add_compile_options(-Wall -Wextra -Wno-unused-local-typedefs) + endif() + +-# --------------------------------------------------------------------------- +-# Find the Python interpreter and development libraries +-# --------------------------------------------------------------------------- +- +-if (NOT TARGET Python::Module OR NOT TARGET Python::Interpreter) +- set(Python_FIND_FRAMEWORK LAST) # Prefer Brew/Conda to Apple framework python +- +- if (CMAKE_VERSION VERSION_LESS 3.18) +- set(NB_PYTHON_DEV_MODULE Development) +- else() +- set(NB_PYTHON_DEV_MODULE Development.Module) +- endif() +- +- find_package(Python 3.8 +- REQUIRED COMPONENTS Interpreter ${NB_PYTHON_DEV_MODULE} +- OPTIONAL_COMPONENTS Development.SABIModule) +-endif() +- + # --------------------------------------------------------------------------- + # Include nanobind cmake functionality + # --------------------------------------------------------------------------- + +-find_package(nanobind ++find_package(nanobind REQUIRED + PATHS ${CMAKE_CURRENT_SOURCE_DIR}/cmake + NO_DEFAULT_PATH) + +diff --git a/cmake/nanobind-config.cmake b/cmake/nanobind-config.cmake +index cb6cfb0..a456f3f 100644 +--- a/cmake/nanobind-config.cmake ++++ b/cmake/nanobind-config.cmake +@@ -1,9 +1,20 @@ + include_guard(GLOBAL) + +-if (NOT TARGET Python::Module) +- message(FATAL_ERROR "You must invoke 'find_package(Python COMPONENTS Interpreter Development REQUIRED)' prior to including nanobind.") ++# --------------------------------------------------------------------------- ++# Find the Python interpreter and development libraries ++# --------------------------------------------------------------------------- ++if (CMAKE_VERSION VERSION_LESS 3.18) ++ set(NB_PYTHON_DEV_MODULE Development) ++else() ++ set(NB_PYTHON_DEV_MODULE Development.Module) + endif() + ++include(CMakeFindDependencyMacro) ++find_dependency(Python 3.8 ++ COMPONENTS Interpreter ${NB_PYTHON_DEV_MODULE} ++ OPTIONAL_COMPONENTS Development.SABIModule ++) ++ + # Determine the right suffix for ordinary and stable ABI extensions. + + # We always need to know the extension diff --git a/ports/nanobind/move_include_dir.patch b/ports/nanobind/move_include_dir.patch new file mode 100644 index 00000000000000..7fdd1a02a55eaa --- /dev/null +++ b/ports/nanobind/move_include_dir.patch @@ -0,0 +1,129 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e8fda9f..b27dc07 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ if(NB_CREATE_INSTALL_RULES AND NOT CMAKE_SKIP_INSTALL_RULES) + + # Normally these would be configurable by the user, but we can't allow that + # because the lookup paths are hard-coded in 'cmake/nanobind-config.cmake' +- set(NB_INSTALL_INC_DIR "${NB_INSTALL_DATADIR}/include") ++ set(NB_INSTALL_INC_DIR "${NB_INSTALL_DATADIR}/../../include") + set(NB_INSTALL_SRC_DIR "${NB_INSTALL_DATADIR}/src") + set(NB_INSTALL_EXT_DIR "${NB_INSTALL_DATADIR}/ext") + set(NB_INSTALL_MODULE_DIR "${NB_INSTALL_DATADIR}") +diff --git a/cmake/nanobind-config.cmake b/cmake/nanobind-config.cmake +index a456f3f..92406dc 100644 +--- a/cmake/nanobind-config.cmake ++++ b/cmake/nanobind-config.cmake +@@ -113,54 +113,54 @@ function (nanobind_build_library TARGET_NAME) + + add_library(${TARGET_NAME} ${TARGET_TYPE} + EXCLUDE_FROM_ALL +- ${NB_DIR}/include/nanobind/make_iterator.h +- ${NB_DIR}/include/nanobind/nanobind.h +- ${NB_DIR}/include/nanobind/nb_accessor.h +- ${NB_DIR}/include/nanobind/nb_attr.h +- ${NB_DIR}/include/nanobind/nb_call.h +- ${NB_DIR}/include/nanobind/nb_cast.h +- ${NB_DIR}/include/nanobind/nb_class.h +- ${NB_DIR}/include/nanobind/nb_defs.h +- ${NB_DIR}/include/nanobind/nb_descr.h +- ${NB_DIR}/include/nanobind/nb_enums.h +- ${NB_DIR}/include/nanobind/nb_error.h +- ${NB_DIR}/include/nanobind/nb_func.h +- ${NB_DIR}/include/nanobind/nb_lib.h +- ${NB_DIR}/include/nanobind/nb_misc.h +- ${NB_DIR}/include/nanobind/nb_python.h +- ${NB_DIR}/include/nanobind/nb_traits.h +- ${NB_DIR}/include/nanobind/nb_tuple.h +- ${NB_DIR}/include/nanobind/nb_types.h +- ${NB_DIR}/include/nanobind/ndarray.h +- ${NB_DIR}/include/nanobind/trampoline.h +- ${NB_DIR}/include/nanobind/operators.h +- ${NB_DIR}/include/nanobind/stl/array.h +- ${NB_DIR}/include/nanobind/stl/bind_map.h +- ${NB_DIR}/include/nanobind/stl/bind_vector.h +- ${NB_DIR}/include/nanobind/stl/detail +- ${NB_DIR}/include/nanobind/stl/detail/nb_array.h +- ${NB_DIR}/include/nanobind/stl/detail/nb_dict.h +- ${NB_DIR}/include/nanobind/stl/detail/nb_list.h +- ${NB_DIR}/include/nanobind/stl/detail/nb_set.h +- ${NB_DIR}/include/nanobind/stl/detail/traits.h +- ${NB_DIR}/include/nanobind/stl/filesystem.h +- ${NB_DIR}/include/nanobind/stl/function.h +- ${NB_DIR}/include/nanobind/stl/list.h +- ${NB_DIR}/include/nanobind/stl/map.h +- ${NB_DIR}/include/nanobind/stl/optional.h +- ${NB_DIR}/include/nanobind/stl/pair.h +- ${NB_DIR}/include/nanobind/stl/set.h +- ${NB_DIR}/include/nanobind/stl/shared_ptr.h +- ${NB_DIR}/include/nanobind/stl/string.h +- ${NB_DIR}/include/nanobind/stl/string_view.h +- ${NB_DIR}/include/nanobind/stl/tuple.h +- ${NB_DIR}/include/nanobind/stl/unique_ptr.h +- ${NB_DIR}/include/nanobind/stl/unordered_map.h +- ${NB_DIR}/include/nanobind/stl/unordered_set.h +- ${NB_DIR}/include/nanobind/stl/variant.h +- ${NB_DIR}/include/nanobind/stl/vector.h +- ${NB_DIR}/include/nanobind/eigen/dense.h +- ${NB_DIR}/include/nanobind/eigen/sparse.h ++ ${NB_DIR}/../../include/nanobind/make_iterator.h ++ ${NB_DIR}/../../include/nanobind/nanobind.h ++ ${NB_DIR}/../../include/nanobind/nb_accessor.h ++ ${NB_DIR}/../../include/nanobind/nb_attr.h ++ ${NB_DIR}/../../include/nanobind/nb_call.h ++ ${NB_DIR}/../../include/nanobind/nb_cast.h ++ ${NB_DIR}/../../include/nanobind/nb_class.h ++ ${NB_DIR}/../../include/nanobind/nb_defs.h ++ ${NB_DIR}/../../include/nanobind/nb_descr.h ++ ${NB_DIR}/../../include/nanobind/nb_enums.h ++ ${NB_DIR}/../../include/nanobind/nb_error.h ++ ${NB_DIR}/../../include/nanobind/nb_func.h ++ ${NB_DIR}/../../include/nanobind/nb_lib.h ++ ${NB_DIR}/../../include/nanobind/nb_misc.h ++ ${NB_DIR}/../../include/nanobind/nb_python.h ++ ${NB_DIR}/../../include/nanobind/nb_traits.h ++ ${NB_DIR}/../../include/nanobind/nb_tuple.h ++ ${NB_DIR}/../../include/nanobind/nb_types.h ++ ${NB_DIR}/../../include/nanobind/ndarray.h ++ ${NB_DIR}/../../include/nanobind/trampoline.h ++ ${NB_DIR}/../../include/nanobind/operators.h ++ ${NB_DIR}/../../include/nanobind/stl/array.h ++ ${NB_DIR}/../../include/nanobind/stl/bind_map.h ++ ${NB_DIR}/../../include/nanobind/stl/bind_vector.h ++ ${NB_DIR}/../../include/nanobind/stl/detail ++ ${NB_DIR}/../../include/nanobind/stl/detail/nb_array.h ++ ${NB_DIR}/../../include/nanobind/stl/detail/nb_dict.h ++ ${NB_DIR}/../../include/nanobind/stl/detail/nb_list.h ++ ${NB_DIR}/../../include/nanobind/stl/detail/nb_set.h ++ ${NB_DIR}/../../include/nanobind/stl/detail/traits.h ++ ${NB_DIR}/../../include/nanobind/stl/filesystem.h ++ ${NB_DIR}/../../include/nanobind/stl/function.h ++ ${NB_DIR}/../../include/nanobind/stl/list.h ++ ${NB_DIR}/../../include/nanobind/stl/map.h ++ ${NB_DIR}/../../include/nanobind/stl/optional.h ++ ${NB_DIR}/../../include/nanobind/stl/pair.h ++ ${NB_DIR}/../../include/nanobind/stl/set.h ++ ${NB_DIR}/../../include/nanobind/stl/shared_ptr.h ++ ${NB_DIR}/../../include/nanobind/stl/string.h ++ ${NB_DIR}/../../include/nanobind/stl/string_view.h ++ ${NB_DIR}/../../include/nanobind/stl/tuple.h ++ ${NB_DIR}/../../include/nanobind/stl/unique_ptr.h ++ ${NB_DIR}/../../include/nanobind/stl/unordered_map.h ++ ${NB_DIR}/../../include/nanobind/stl/unordered_set.h ++ ${NB_DIR}/../../include/nanobind/stl/variant.h ++ ${NB_DIR}/../../include/nanobind/stl/vector.h ++ ${NB_DIR}/../../include/nanobind/eigen/dense.h ++ ${NB_DIR}/../../include/nanobind/eigen/sparse.h + + ${NB_DIR}/src/buffer.h + ${NB_DIR}/src/hash.h +@@ -230,7 +230,7 @@ function (nanobind_build_library TARGET_NAME) + + target_include_directories(${TARGET_NAME} PUBLIC + ${Python_INCLUDE_DIRS} +- ${NB_DIR}/include) ++ ${NB_DIR}/../../include) + + target_compile_features(${TARGET_NAME} PUBLIC cxx_std_17) + nanobind_set_visibility(${TARGET_NAME}) diff --git a/ports/nanobind/portfile.cmake b/ports/nanobind/portfile.cmake new file mode 100644 index 00000000000000..dd8eefc39732bb --- /dev/null +++ b/ports/nanobind/portfile.cmake @@ -0,0 +1,28 @@ +# nanobind distributes source code to build on-demand. +# The source code is installed into the 'share/${PORT}' directory with +# subdirectories for source `src` and header `include` files +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +set(VCPKG_BUILD_TYPE release) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wjakob/nanobind + REF "v${VERSION}" + SHA512 40311f6416b9fdce764bf80baf156b42e1f00e03f3427b9f9db401fa4eeeb9db83b79c04ebefec2f6ed185419d1b22065f8f12eba3ad57056d2e0f825444b785 + HEAD_REF master + PATCHES + find_dependency_python.patch + move_include_dir.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNB_USE_SUBMODULE_DEPS:BOOL=OFF + -DNB_TEST:BOOL=OFF +) + +vcpkg_cmake_install() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/nanobind/usage b/ports/nanobind/usage new file mode 100644 index 00000000000000..81a3259d31375d --- /dev/null +++ b/ports/nanobind/usage @@ -0,0 +1,8 @@ +The package nanobind provides CMake functions and source code rather than +libraries: + + find_package(nanobind REQUIRED) + nanobind_add_module(my_ext source.cpp) + + # See docs for more configuration options + # https://nanobind.readthedocs.io/en/latest/api_cmake.html diff --git a/ports/nanobind/vcpkg.json b/ports/nanobind/vcpkg.json new file mode 100644 index 00000000000000..58318e377860cc --- /dev/null +++ b/ports/nanobind/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "nanobind", + "version-semver": "1.9.2", + "description": "Tiny and efficient C++/Python bindings", + "homepage": "https://nanobind.readthedocs.io/en/latest/", + "license": "BSD-3-Clause", + "dependencies": [ + "python3", + "robin-map", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/nanomsg/portfile.cmake b/ports/nanomsg/portfile.cmake index 20f6856132ea85..3ffb04ee00dfcf 100644 --- a/ports/nanomsg/portfile.cmake +++ b/ports/nanomsg/portfile.cmake @@ -53,7 +53,7 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string( ${CURRENT_PACKAGES_DIR}/share/${PORT}/nanomsg-config.cmake - "set_and_check(nanomsg_BINDIR \${PACKAGE_PREFIX_DIR}/bin)" + "set_and_check(nanomsg_BINDIR \${VCPKG_IMPORT_PREFIX}/bin)" "" ) endif() diff --git a/ports/nanomsg/vcpkg.json b/ports/nanomsg/vcpkg.json index a752280770edb5..45a4da0ecd0719 100644 --- a/ports/nanomsg/vcpkg.json +++ b/ports/nanomsg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nanomsg", "version-semver": "1.2.1", + "port-version": 1, "description": [ "A simple high-performance implementation of several \"scalability protocols\".", "These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket." diff --git a/ports/neargye-semver/portfile.cmake b/ports/neargye-semver/portfile.cmake index 6d461c589e1488..c2e79987db7e3e 100644 --- a/ports/neargye-semver/portfile.cmake +++ b/ports/neargye-semver/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/semver REF v${VERSION} - SHA512 b620a27d31ca2361e243e4def890ddfc4dfb65a507187c918fabc332d48c420fb10b0e6fb38c83c4c3998a047201e81b70a164c66675351cf4ff9475defc6287 + SHA512 4757043fe7395d8167fccaf1c1ef91cc321348e21cd5503a05af8cfa57b93d256071f80527545ebc48aad572a90ffb2ad80b613d913b4c3ec7efe0b197c6c669 HEAD_REF master ) diff --git a/ports/neargye-semver/vcpkg.json b/ports/neargye-semver/vcpkg.json index fa713fccb64131..d2255e66ed7fca 100644 --- a/ports/neargye-semver/vcpkg.json +++ b/ports/neargye-semver/vcpkg.json @@ -1,7 +1,6 @@ { "name": "neargye-semver", - "version": "0.3.0", - "port-version": 2, + "version": "0.3.1", "description": "C++17 header-only dependency-free versioning library complying with Semantic Versioning 2.0.0", "homepage": "https://github.com/Neargye/semver", "license": "MIT", diff --git a/ports/nghttp2/no-tests.patch b/ports/nghttp2/no-tests.patch new file mode 100644 index 00000000000000..184e3612f96836 --- /dev/null +++ b/ports/nghttp2/no-tests.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 58ae48c7..fc3b38a5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -432,7 +432,6 @@ add_subdirectory(lib) + add_subdirectory(third-party) + add_subdirectory(src) + add_subdirectory(examples) +-add_subdirectory(tests) + #add_subdirectory(tests/testdata) + add_subdirectory(integration-tests) + if(ENABLE_DOC) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 211c8e43..94e688d4 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -66,6 +66,7 @@ if(BUILD_SHARED_LIBS) + endif() + + # Static library (for unittests because of symbol visibility) ++if(BUILD_STATIC_LIBS) + add_library(${STATIC_LIB} STATIC ${NGHTTP2_SOURCES}) + + set_target_properties(${STATIC_LIB} PROPERTIES +@@ -82,7 +83,6 @@ target_include_directories(${STATIC_LIB} INTERFACE + + target_compile_definitions(${STATIC_LIB} PUBLIC "-DNGHTTP2_STATICLIB") + +-if(BUILD_STATIC_LIBS) + install(TARGETS ${STATIC_LIB} EXPORT ${EXPORT_SET}) + list(APPEND nghttp2_exports ${STATIC_LIB}) + endif() diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index e09622d8ae675b..30d3010cab54cd 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,36 +1,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 - REF v${VERSION} - SHA512 bcb53ff45afae003f11a9feaa21dd80a3abfcde9b3a7fd1f04fc4382d71b5d4430e2d015765a7ae8d68454fcf06e4560c4cb585133aefb237d6ea526f61a8ebd + REF "v${VERSION}" + SHA512 1526418b0cf8e065f00589c5abd0b4ebd32a3128fbedd7c1f8fc9a76b8b2ad9713a8f4b056d29fce454559fe9227392c59dcdffaa665249df94a1fcf85fcfc53 HEAD_REF master + PATCHES + no-tests.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" ENABLE_STATIC_CRT) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIB) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIB) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_LIB_ONLY=ON + -DENABLE_DOC=OFF "-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}" - "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" - "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" + "-DBUILD_STATIC_LIBS=${ENABLE_STATIC_LIB}" + -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON -DCMAKE_DISABLE_FIND_PACKAGE_OpenSSL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Libcares=ON - -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libngtcp2=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_openssl=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Libngtcp2_crypto_quictls=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON -DCMAKE_DISABLE_FIND_PACKAGE_Systemd=ON -DCMAKE_DISABLE_FIND_PACKAGE_Jansson=ON -DCMAKE_DISABLE_FIND_PACKAGE_Libevent=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=ON -DCMAKE_DISABLE_FIND_PACKAGE_Jemalloc=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Threads=ON - -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON + MAYBE_UNUSED_VARIABLES + ENABLE_STATIC_CRT ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -39,15 +38,12 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/share/man" "${CURRENT_PACKAGES_DIR}/share/doc" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/lib/cmake" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/bin" - "${CURRENT_PACKAGES_DIR}/debug/bin" - ) file(APPEND "${CURRENT_PACKAGES_DIR}/include/nghttp2/nghttp2ver.h" [[ #ifndef NGHTTP2_STATICLIB # define NGHTTP2_STATICLIB @@ -55,4 +51,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) ]]) endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index ea675d46c09c81..7f337a52058105 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.59.0", + "version": "1.60.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "license": "MIT", diff --git a/ports/nss/03-use-debug-crt-for-debug.patch b/ports/nss/03-use-debug-crt-for-debug.patch new file mode 100644 index 00000000000000..513dc3996ede3c --- /dev/null +++ b/ports/nss/03-use-debug-crt-for-debug.patch @@ -0,0 +1,13 @@ +diff --git a/nss/coreconf/config.gypi b/nss/coreconf/config.gypi +index ae4c708..42633fc 100644 +--- a/nss/coreconf/config.gypi ++++ b/nss/coreconf/config.gypi +@@ -622,7 +622,7 @@ + 'VCCLCompilerTool': { + 'Optimization': '<(debug_optimization_level)', + 'BasicRuntimeChecks': '3', +- 'RuntimeLibrary': '2', # /MD ++ 'RuntimeLibrary': '3', # /MDd + 'DebugInformationFormat': '3', + }, + 'VCLinkerTool': { diff --git a/ports/nss/portfile.cmake b/ports/nss/portfile.cmake index b626c1c609ff10..bef866ed2faffc 100644 --- a/ports/nss/portfile.cmake +++ b/ports/nss/portfile.cmake @@ -4,7 +4,7 @@ string(REPLACE "." "_" V_URL ${VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${VERSION}.tar.gz" FILENAME "nss-${VERSION}.tar.gz" - SHA512 4f335c5c284eff6424745cc15e32037715a915f6f61687ec36a8ffaef0e45d152602a1be275bbb2f14650c7d258d6488430cdcf512b18ba7cb73cd43ac625681 + SHA512 8ae032f3cb8eadfe524505d20e430b90ed25af2b4732b2cf286c435b0fcd5701d2f5c48bd2cfb3f9aa0bfdf503c1f3d5394cf34f860f51a1141cc4a7586bba32 ) vcpkg_extract_source_archive( @@ -14,6 +14,7 @@ vcpkg_extract_source_archive( PATCHES "01-nspr-no-lib-prefix.patch" "02-gen-debug-info-for-release.patch" + "03-use-debug-crt-for-debug.patch" # See https://learn.microsoft.com/dotnet/api/microsoft.visualstudio.vcprojectengine.runtimelibraryoption ) # setup mozbuild for windows diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json index 35cddb2e55d201..97fce7a1d4bcf2 100644 --- a/ports/nss/vcpkg.json +++ b/ports/nss/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nss", - "version": "3.98", + "version": "3.99", "description": "Network Security Services from Mozilla", "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", "license": "MPL-2.0", diff --git a/ports/ogre-next/fix-dependencies.patch b/ports/ogre-next/fix-dependencies.patch index 06014fef87122f..df65fe426d937e 100644 --- a/ports/ogre-next/fix-dependencies.patch +++ b/ports/ogre-next/fix-dependencies.patch @@ -40,8 +40,8 @@ index 74cb0f4..2cad26a 100644 if (ZLIB_FOUND) # Find zziplib - find_package(ZZip) -+ find_package(ZZip NAMES unofficial-zziplib CONFIG REQUIRED) -+ set(ZZip_LIBRARIES unofficial::zziplib::libzzip) ++ find_package(ZZip NAMES zziplib CONFIG REQUIRED) ++ set(ZZip_LIBRARIES zziplib::libzzip) macro_log_feature(ZZip_FOUND "zziplib" "Extract data from zip archives" "http://zziplib.sourceforge.net" FALSE "" "") endif () diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index 07cd697c7be77b..53528721c27af0 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre-next", "version": "2.3.3", - "port-version": 2, + "port-version": 3, "description": "Ogre Next - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "license": "MIT", diff --git a/ports/ogre/fix-dependencies.patch b/ports/ogre/fix-dependencies.patch index 5c8d3ef98cc176..fed4db8b85aafe 100644 --- a/ports/ogre/fix-dependencies.patch +++ b/ports/ogre/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake -index b0c5ba3..27d7bd2 100644 +index 804602e0f..e7b665004 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake -@@ -194,11 +194,14 @@ endif() +@@ -210,11 +210,14 @@ endif() ####################################################################### # Find FreeImage @@ -19,7 +19,7 @@ index b0c5ba3..27d7bd2 100644 macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org") # Find X11 -@@ -254,13 +257,17 @@ endif () +@@ -270,13 +273,17 @@ endif () macro_log_feature(ENV{VULKAN_SDK} "Vulkan SDK" "Vulkan RenderSystem, glslang Plugin. Alternatively use system packages" "https://vulkan.lunarg.com/") # OpenEXR @@ -40,7 +40,7 @@ index b0c5ba3..27d7bd2 100644 macro_log_feature(PYTHONLIBS_FOUND "Python" "Language bindings to use OGRE from Python" "http://www.python.org/") # SWIG -@@ -268,7 +275,7 @@ find_package(SWIG 3.0.8 QUIET) +@@ -284,7 +291,7 @@ find_package(SWIG 3.0.8 QUIET) macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OGRE" "http://www.swig.org/") # pugixml @@ -49,7 +49,7 @@ index b0c5ba3..27d7bd2 100644 macro_log_feature(pugixml_FOUND "pugixml" "Needed for XMLConverter and DotScene Plugin" "https://pugixml.org/") # Find zlib -@@ -276,7 +283,7 @@ find_package(ZLIB) +@@ -292,7 +299,7 @@ find_package(ZLIB) macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net") # Assimp @@ -58,7 +58,7 @@ index b0c5ba3..27d7bd2 100644 macro_log_feature(assimp_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/") # Bullet -@@ -284,6 +291,8 @@ find_package(Bullet QUIET) +@@ -300,6 +307,8 @@ find_package(Bullet QUIET) macro_log_feature(BULLET_FOUND "Bullet" "Bullet physics" "https://pybullet.org") if(assimp_FOUND) @@ -67,7 +67,7 @@ index b0c5ba3..27d7bd2 100644 # workaround horribly broken assimp cmake, fixed with assimp 5.1 add_library(fix::assimp INTERFACE IMPORTED) set_target_properties(fix::assimp PROPERTIES -@@ -302,7 +311,7 @@ endif() +@@ -318,7 +327,7 @@ endif() # Find sdl2 if(NOT ANDROID AND NOT EMSCRIPTEN) # find script does not work in cross compilation environment @@ -77,7 +77,7 @@ index b0c5ba3..27d7bd2 100644 if(SDL2_FOUND AND NOT TARGET SDL2::SDL2) add_library(SDL2::SDL2 INTERFACE IMPORTED) diff --git a/CMake/Templates/OGREConfig.cmake.in b/CMake/Templates/OGREConfig.cmake.in -index 2047f66..a5c7cd0 100644 +index 2047f6648..a5c7cd006 100644 --- a/CMake/Templates/OGREConfig.cmake.in +++ b/CMake/Templates/OGREConfig.cmake.in @@ -35,6 +35,25 @@ set(OGRE_LIBRARIES) @@ -107,24 +107,24 @@ index 2047f66..a5c7cd0 100644 list(APPEND OGRE_INCLUDE_DIRS @Boost_INCLUDE_DIRS@) endif() diff --git a/Components/Bites/CMakeLists.txt b/Components/Bites/CMakeLists.txt -index 8f96cef..045e288 100644 +index 59756c148..9d7cc07ca 100644 --- a/Components/Bites/CMakeLists.txt +++ b/Components/Bites/CMakeLists.txt -@@ -171,6 +171,12 @@ elseif(NOT EMSCRIPTEN) +@@ -177,6 +177,12 @@ if(SDL2_FOUND) + elseif(NOT EMSCRIPTEN) message(WARNING "SDL2 not found - no input handling and reduced window creation capabilites") endif() - ++ +if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) + find_package(imgui CONFIG REQUIRED) + find_path(IMGUI_DIR NAMES imgui.h) + target_link_libraries(OgreBites PRIVATE imgui::imgui) +endif() -+ + generate_export_header(OgreBites EXPORT_MACRO_NAME _OgreBitesExport - EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreBitesPrerequisites.h) diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt -index 0c74ce2..a302b1c 100644 +index 257a30c0c..cdeb6e129 100644 --- a/Components/Overlay/CMakeLists.txt +++ b/Components/Overlay/CMakeLists.txt @@ -19,6 +19,8 @@ list(APPEND HEADER_FILES @@ -133,7 +133,7 @@ index 0c74ce2..a302b1c 100644 if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) + find_package(imgui CONFIG REQUIRED) +elseif(0) - set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.89.7" CACHE PATH "") + set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.90.4" CACHE PATH "") if(NOT EXISTS ${IMGUI_DIR}) message(STATUS "Downloading imgui") @@ -63,6 +65,8 @@ elseif(UNIX) @@ -146,7 +146,7 @@ index 0c74ce2..a302b1c 100644 PUBLIC "$" PRIVATE "$") diff --git a/PlugIns/EXRCodec/src/OgreEXRCodec.cpp b/PlugIns/EXRCodec/src/OgreEXRCodec.cpp -index 0822081..a22841c 100644 +index efd4b32de..1e3ea2316 100644 --- a/PlugIns/EXRCodec/src/OgreEXRCodec.cpp +++ b/PlugIns/EXRCodec/src/OgreEXRCodec.cpp @@ -36,6 +36,9 @@ THE SOFTWARE. @@ -160,7 +160,7 @@ index 0822081..a22841c 100644 #include #include diff --git a/PlugIns/STBICodec/CMakeLists.txt b/PlugIns/STBICodec/CMakeLists.txt -index 10283f5..e7edfd3 100644 +index 10283f51e..e7edfd32e 100644 --- a/PlugIns/STBICodec/CMakeLists.txt +++ b/PlugIns/STBICodec/CMakeLists.txt @@ -19,8 +19,10 @@ endif() @@ -175,10 +175,10 @@ index 10283f5..e7edfd3 100644 if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/PlugIns/STBICodec/src/OgreSTBICodec.cpp b/PlugIns/STBICodec/src/OgreSTBICodec.cpp -index 663a1c3..e1452cb 100644 +index f89e9a16c..df648d700 100644 --- a/PlugIns/STBICodec/src/OgreSTBICodec.cpp +++ b/PlugIns/STBICodec/src/OgreSTBICodec.cpp -@@ -39,7 +39,7 @@ THE SOFTWARE. +@@ -40,7 +40,7 @@ THE SOFTWARE. #define STBI_NO_STDIO #define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_STATIC @@ -187,7 +187,7 @@ index 663a1c3..e1452cb 100644 #ifdef HAVE_ZLIB #include -@@ -62,7 +62,7 @@ static Ogre::uchar* custom_zlib_compress(Ogre::uchar* data, int data_len, int* o +@@ -63,7 +63,7 @@ static Ogre::uchar* custom_zlib_compress(Ogre::uchar* data, int data_len, int* o #define STB_IMAGE_WRITE_IMPLEMENTATION #define STBI_WRITE_NO_STDIO @@ -196,7 +196,7 @@ index 663a1c3..e1452cb 100644 namespace Ogre { -@@ -73,7 +73,7 @@ namespace Ogre { +@@ -74,7 +74,7 @@ namespace Ogre { stbi_convert_iphone_png_to_rgb(1); stbi_set_unpremultiply_on_load(1); @@ -206,10 +206,10 @@ index 663a1c3..e1452cb 100644 // Register codecs String exts = "jpeg,jpg,png,bmp,psd,tga,gif,pic,ppm,pgm,hdr"; diff --git a/Components/Bites/src/OgreImGuiInputListener.cpp b/Components/Bites/src/OgreImGuiInputListener.cpp -index 2fce0dd0b..631735fb2 100644 +index 3cb237946..5629bb5d7 100644 --- a/Components/Bites/src/OgreImGuiInputListener.cpp +++ b/Components/Bites/src/OgreImGuiInputListener.cpp -@@ -112,7 +112,7 @@ static bool keyEvent(const KeyboardEvent& arg) +@@ -116,7 +116,7 @@ static bool keyEvent(const KeyboardEvent& arg) if (key == ImGuiKey_None) return io.WantCaptureKeyboard; diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index dd39a0f8d80041..1471d1e0257e1a 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre REF "v${VERSION}" - SHA512 adadf0ce8510515c7519b87b502090c4a8d6694af0850ebd4a030d2dda497978eeb811746c74aa0cd1dc41adc0bf5f04fe38d02eb4ff03a56999c6635efe1e0e + SHA512 8c204aaf9be4e6c8ffcccc9361a3cd7962ac068fc2d88755c2983c821076427b3b0197d2a30f72636c2e35a86bfb89e43ea6f3efae6bd45b061bb64bfceae779 HEAD_REF master PATCHES fix-dependencies.patch @@ -57,9 +57,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS if("java" IN_LIST FEATURES OR "python" IN_LIST FEATURES OR "csharp" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_SWIG=ON") -endif() - -if(CMAKE_REQUIRE_FIND_PACKAGE_SWIG) vcpkg_find_acquire_program(SWIG) vcpkg_list(APPEND FEATURE_OPTIONS "-DSWIG_EXECUTABLE=${SWIG}") endif() diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index fa466b82de3fe2..413303532ca099 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ogre", - "version": "14.0.1", - "port-version": 2, + "version": "14.2.2", "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index a739b707b8b507..9d86f8e50793b6 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -64,6 +64,10 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ONNX) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/ONNXConfig.cmake" "# import targets" +[[# import targets +include(CMakeFindDependencyMacro) +find_dependency(protobuf CONFIG)]]) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index 69d003f9c42f1f..4bff31b70a4210 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "onnx", "version-semver": "1.15.0", + "port-version": 1, "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", "license": "Apache-2.0", diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 840c7fe25ad129..06a9de36e344b0 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,6 +1,6 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO xianyi/OpenBLAS + REPO OpenMathLib/OpenBLAS REF "v${VERSION}" SHA512 01d3a536fbfa62f276fd6b1ad0e218fb3d91f41545fc83ddc74979fa26372d8389f0baa20334badfe0adacd77bd944c50a47ac920577373fcc1d495553084373 HEAD_REF develop @@ -16,7 +16,7 @@ find_program(GIT NAMES git git.cmd) get_filename_component(GIT_EXE_PATH "${GIT}" DIRECTORY) set(SED_EXE_PATH "${GIT_EXE_PATH}/../usr/bin") -# openblas require perl to generate .def for exports +# openblas requires perl to generate .def for exports vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY) set(PATH_BACKUP "$ENV{PATH}") @@ -44,8 +44,7 @@ if(VCPKG_TARGET_IS_ANDROID) endif() set(OPENBLAS_EXTRA_OPTIONS) -# for UWP version, must build non uwp first for helper -# binaries. +# For UWP version, must build non-UWP first for helper binaries if(VCPKG_TARGET_IS_UWP) list(APPEND OPENBLAS_EXTRA_OPTIONS "-DBLASHELPER_BINARY_DIR=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") elseif(NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)) @@ -53,7 +52,7 @@ elseif(NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)) string(APPEND VCPKG_CXX_FLAGS " -DNEEDBUNDERSCORE") list(APPEND OPENBLAS_EXTRA_OPTIONS -DNOFORTRAN=ON - -DBU=_ #required for all blas functions to append extra _ using NAME + -DBU=_ # Required for all BLAS functions to append extra _ using NAME ) endif() @@ -99,11 +98,12 @@ if(EXISTS "${pcfile}") #file(CREATE_LINK "${pcfile}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/blas.pc" COPY_ON_ERROR) endif() vcpkg_fixup_pkgconfig() -#maybe we need also to write a wrapper inside share/blas to search implicitly for openblas, whenever we feel it's ready for its own -config.cmake file +# Maybe we need also to write a wrapper inside share/blas to search implicitly for openblas, +# whenever we feel it's ready for its own -config.cmake file. -# openblas do not make the config file , so I manually made this -# but I think in most case, libraries will not include these files, they define their own used function prototypes -# this is only to quite vcpkg +# openblas does not have a config file, so I manually made this. +# But I think in most cases, libraries will not include these files, they define their own used function prototypes. +# This is only to quite vcpkg. file(COPY "${CMAKE_CURRENT_LIST_DIR}/openblas_common.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") vcpkg_replace_string( diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 25f9a6b7cab7e4..aeb836cf23ec30 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,9 +1,9 @@ { "name": "openblas", "version": "0.3.26", - "port-version": 1, + "port-version": 3, "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", - "homepage": "https://github.com/xianyi/OpenBLAS", + "homepage": "https://github.com/OpenMathLib/OpenBLAS", "license": "BSD-3-Clause", "supports": "!arm | arm64 | !uwp", "dependencies": [ diff --git a/ports/opencsg/CMakeLists.txt b/ports/opencsg/CMakeLists.txt index 683529ddcc9ace..e8300a7fa384e2 100644 --- a/ports/opencsg/CMakeLists.txt +++ b/ports/opencsg/CMakeLists.txt @@ -21,9 +21,6 @@ set(SRCS src/renderSCS.cpp src/scissorMemo.cpp src/settings.cpp - src/stencilManager.cpp - src/pBufferTexture.cpp - RenderTexture/RenderTexture.cpp ) diff --git a/ports/opencsg/portfile.cmake b/ports/opencsg/portfile.cmake index da7f498be50b0c..266bf76c613c69 100644 --- a/ports/opencsg/portfile.cmake +++ b/ports/opencsg/portfile.cmake @@ -1,23 +1,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +string(REPLACE "." "-" VERSION_CSG "${VERSION}") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO floriankirsch/OpenCSG - REF "opencsg-1-4-2-release" - SHA512 df117a1b7153a95332d236918d1547b0afe6f3ead46af2733c5feee6e25cec984b21affc41fd8320a45be9292bd3b32e21ed8bb3d08371ddd657f659b9bb932a + REF "opencsg-${VERSION_CSG}-release" + SHA512 531dda97fbbcfca9bd57eb2d62b34ed382788bafffff05aa4007cf6dd7093c478e6364020e58cda8adcc1bc45485c22e3a94dbc52916da6a8b418412ce7712c6 HEAD_REF master - PATCHES illegal_char.patch + PATCHES + illegal_char.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DUNICODE=1 -D_UNICODE=1 - # OPTIONS_RELEASE -DOPTIMIZE=1 - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON ) vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/license/gpl-2.0.txt" "${SOURCE_PATH}/doc/license/gpl-3.0.txt") diff --git a/ports/opencsg/vcpkg.json b/ports/opencsg/vcpkg.json index d6f1d6f997bd96..7fc4e3df4fa570 100644 --- a/ports/opencsg/vcpkg.json +++ b/ports/opencsg/vcpkg.json @@ -1,17 +1,14 @@ { "name": "opencsg", - "version": "1.4.2", - "port-version": 4, + "version": "1.6.0", "description": "OpenCSG is a library that does image-based CSG rendering using OpenGL. OpenCSG is written in C++ and supports most modern graphics hardware using Microsoft Windows or the Linux operating system.", + "homepage": "https://github.com/floriankirsch/OpenCSG", + "license": "GPL-2.0-or-later", "dependencies": [ "glew", { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/ports/openexr/fix-cmake-package.patch b/ports/openexr/fix-cmake-package.patch new file mode 100644 index 00000000000000..f40ab285ffe578 --- /dev/null +++ b/ports/openexr/fix-cmake-package.patch @@ -0,0 +1,21 @@ +diff --git a/cmake/OpenEXRConfig.cmake.in b/cmake/OpenEXRConfig.cmake.in +index fbb98c0a..37073a69 100644 +--- a/cmake/OpenEXRConfig.cmake.in ++++ b/cmake/OpenEXRConfig.cmake.in +@@ -8,11 +8,12 @@ include(CMakeFindDependencyMacro) + set(openexr_needthreads @OPENEXR_ENABLE_THREADING@) + if (openexr_needthreads) + set(THREADS_PREFER_PTHREAD_FLAG ON) +- find_dependency(Threads REQUIRED) ++ find_dependency(Threads) + endif() + unset(openexr_needthreads) + +-find_dependency(Imath REQUIRED) ++find_dependency(Imath) ++find_dependency(libdeflate) + + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") + check_required_components("@PROJECT_NAME@") + + diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index 80946fb412853e..876dfaf1ee1a48 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 6e0a6fdcfae57c6e8b060d9aeed57140d96d39bffe5e40edd6ea5beb06e569323833d07906316ffca05f48e8409d0ea4174e2cd84d554404a4ee432e07d7b5e6 HEAD_REF main + PATCHES + fix-cmake-package.patch # https://github.com/AcademySoftwareFoundation/openexr/pull/1674 ) vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index ddbb6e19a51436..8a3d8308da0754 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openexr", "version": "3.2.3", + "port-version": 1, "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "license": "BSD-3-Clause", diff --git a/ports/openssl/command-line-length.patch b/ports/openssl/command-line-length.patch new file mode 100644 index 00000000000000..08fb51be53171e --- /dev/null +++ b/ports/openssl/command-line-length.patch @@ -0,0 +1,13 @@ +diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl +index 8ddb128..52b9ad6 100644 +--- a/Configurations/unix-Makefile.tmpl ++++ b/Configurations/unix-Makefile.tmpl +@@ -1961,7 +1961,7 @@ EOF + my @objs = map { platform->obj($_) } @{$args{objs}}; + my $deps = join(" \\\n" . ' ' x (length($lib) + 2), + fill_lines(' ', $COLUMNS - length($lib) - 2, @objs)); +- my $max_per_call = 500; ++ my $max_per_call = ($^O eq 'msys') ? 80 : 500; + my @objs_grouped; + push @objs_grouped, join(" ", splice @objs, 0, $max_per_call) while @objs; + my $fill_lib = diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 61b046c6d3cda4..c945991e3455f8 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_github( REF "openssl-${VERSION}" SHA512 3eed5903f37ac728522cbb0ea0081f1d5a62d9420366d487f838dc22c31813c58584838400bd3d09518608e1e71bafcb1ff83713d351e4876da6625d5543fef6 PATCHES + command-line-length.patch script-prefix.patch windows/install-layout.patch windows/install-pdbs.patch diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake index 02e62732d5f034..72b04e16a82c00 100644 --- a/ports/openssl/unix/portfile.cmake +++ b/ports/openssl/unix/portfile.cmake @@ -6,7 +6,7 @@ openssl requires Linux kernel headers from the system package manager. ]]) endif() -if(CMAKE_HOST_WIN32) +if(VCPKG_HOST_IS_WINDOWS) vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl) set(MAKE "${MSYS_ROOT}/usr/bin/make.exe") set(PERL "${MSYS_ROOT}/usr/bin/perl.exe") @@ -88,6 +88,7 @@ elseif(VCPKG_TARGET_IS_MINGW) set(OPENSSL_ARCH mingw) endif() elseif(VCPKG_TARGET_IS_EMSCRIPTEN) + set(OPENSSL_ARCH linux-x32) vcpkg_list(APPEND CONFIGURE_OPTIONS threads no-engine diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 03a5a1827c98b6..68a67599bf7c84 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version": "3.2.1", + "port-version": 1, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index b9c99ca7c93a20..aabe5bb8074bda 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_from_github( fix-sdl.patch fix-nvtt-squish.patch plugin-pdb-install.patch - use-boost-asio.patch osgdb_zip_nozip.patch # This is fix symbol clashes with other libs when built in static-lib mode openexr3.patch unofficial-export.patch @@ -66,9 +65,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS openexr BUILD_OSG_PLUGIN_EXR openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR rest-http-device BUILD_OSG_PLUGIN_RESTHTTPDEVICE + rest-http-device CMAKE_REQUIRE_FIND_PACKAGE_Boost sdl1 BUILD_OSG_PLUGIN_SDL INVERTED_FEATURES sdl1 CMAKE_DISABLE_FIND_PACKAGE_SDL # for apps and examples + rest-http-device CMAKE_DISABLE_FIND_PACKAGE_Boost ) # The package osg can be configured to use different OpenGL profiles via a custom triplet file: diff --git a/ports/osg/use-boost-asio.patch b/ports/osg/use-boost-asio.patch deleted file mode 100644 index 4d804973c0b45a..00000000000000 --- a/ports/osg/use-boost-asio.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/CMakeModules/FindAsio.cmake b/CMakeModules/FindAsio.cmake -index 433d5c7..04a0edf 100644 ---- a/CMakeModules/FindAsio.cmake -+++ b/CMakeModules/FindAsio.cmake -@@ -1,22 +1,7 @@ - # Locate ASIO-headers (http://think-async.com/Asio) --# This module defines --# ASIO_FOUND, if false, do not try to link to gdal --# ASIO_INCLUDE_DIR, where to find the headers --# - # Created by Stephan Maximilian Huber - --FIND_PATH(ASIO_INCLUDE_DIR -- NAMES -- asio.hpp -- PATHS -- /usr/include -- /usr/local/include --) -- --SET(ASIO_FOUND "NO") --IF(ASIO_INCLUDE_DIR) -- FIND_PACKAGE( Boost 1.37 ) -- IF(Boost_FOUND) -- SET(ASIO_FOUND "YES") -- ENDIF() -+FIND_PACKAGE( Boost 1.37 COMPONENTS asio ) -+IF(Boost_FOUND) -+ SET(ASIO_FOUND "YES") - ENDIF() -diff --git a/src/osgPlugins/RestHttpDevice/CMakeLists.txt b/src/osgPlugins/RestHttpDevice/CMakeLists.txt -index 8464b9d..073e8ed 100644 ---- a/src/osgPlugins/RestHttpDevice/CMakeLists.txt -+++ b/src/osgPlugins/RestHttpDevice/CMakeLists.txt -@@ -1,5 +1,4 @@ - INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) --INCLUDE_DIRECTORIES(${ASIO_INCLUDE_DIR}) - - SET(TARGET_SRC - connection.cpp -diff --git a/src/osgPlugins/RestHttpDevice/connection.hpp b/src/osgPlugins/RestHttpDevice/connection.hpp -index 99f3a93..b205759 100644 ---- a/src/osgPlugins/RestHttpDevice/connection.hpp -+++ b/src/osgPlugins/RestHttpDevice/connection.hpp -@@ -11,7 +11,7 @@ - #ifndef HTTP_SERVER_CONNECTION_HPP - #define HTTP_SERVER_CONNECTION_HPP - --#include -+#include - #include - #include - #include -diff --git a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp -index 1d363a8..b6e7195 100644 ---- a/src/osgPlugins/RestHttpDevice/io_service_pool.hpp -+++ b/src/osgPlugins/RestHttpDevice/io_service_pool.hpp -@@ -11,7 +11,7 @@ - #ifndef HTTP_SERVER_IO_SERVICE_POOL_HPP - #define HTTP_SERVER_IO_SERVICE_POOL_HPP - --#include -+#include - #include - #include - #include -diff --git a/src/osgPlugins/RestHttpDevice/reply.hpp b/src/osgPlugins/RestHttpDevice/reply.hpp -index 89f264a..b63d0b9 100644 ---- a/src/osgPlugins/RestHttpDevice/reply.hpp -+++ b/src/osgPlugins/RestHttpDevice/reply.hpp -@@ -13,7 +13,7 @@ - - #include - #include --#include -+#include - #include "header.hpp" - - namespace http { -diff --git a/src/osgPlugins/RestHttpDevice/server.hpp b/src/osgPlugins/RestHttpDevice/server.hpp -index a14f263..91c4b62 100644 ---- a/src/osgPlugins/RestHttpDevice/server.hpp -+++ b/src/osgPlugins/RestHttpDevice/server.hpp -@@ -11,7 +11,7 @@ - #ifndef HTTP_SERVER_SERVER_HPP - #define HTTP_SERVER_SERVER_HPP - --#include -+#include - #include - #include - #include diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 30a3d86f9e780d..1f01fd6db92e6d 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version": "3.6.5", - "port-version": 22, + "port-version": 23, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://www.openscenegraph.com/", "license": null, @@ -50,14 +50,6 @@ ], "platform": "!uwp" }, - { - "name": "osg", - "default-features": false, - "features": [ - "rest-http-device" - ], - "platform": "!windows" - }, { "name": "osg", "default-features": false, @@ -170,20 +162,6 @@ } ] }, - "rest-http-device": { - "description": "Build RestHttpDevice plugin", - "supports": "!windows", - "dependencies": [ - "boost-array", - "boost-asio", - "boost-bind", - "boost-core", - "boost-lexical-cast", - "boost-logic", - "boost-smart-ptr", - "boost-tuple" - ] - }, "sdl1": { "description": "Build SDL 1 plugin, and enable SDL 1 app features", "dependencies": [ diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index 058e76a389f1d2..cf5ba5c6eac15a 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap REF "v${VERSION}" - SHA512 2b9445ecf71d3b5705304e970dea1db314c80b4ee112436939bffeaac43db6199ed566bec0e68f95a4dfab415cfe6aaecd7083ef9d7b8f6b6c612e4f24612f43 + SHA512 cf7892194b518cc207558bc024469bb3c345e427b71f4ecaaa7ec5ba30cd23005d005d80295edc7bf3a0805a4c1c747d6eec855fdc4828ccdc3adb5ffa1d8c6b HEAD_REF master ) diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index 463ab880328708..cea514f06801ce 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "parallel-hashmap", - "version": "1.3.11", + "version": "1.3.12", "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", "license": "Apache-2.0", "dependencies": [ diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 189311d7fe29ab..737b8658552932 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -107,6 +107,7 @@ vcpkg_cmake_configure( ${ADDITIONAL_OPTIONS} #-DPARAVIEW_ENABLE_FFMPEG:BOOL=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Graphviz=ON ) if(CMAKE_HOST_UNIX) # ParaView runs Qt tools so LD_LIBRARY_PATH must be set correctly for them to find *.so files diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json index 2292f60c9db0c4..e09ec8f134256d 100644 --- a/ports/paraview/vcpkg.json +++ b/ports/paraview/vcpkg.json @@ -1,7 +1,7 @@ { "name": "paraview", "version": "5.11.0", - "port-version": 4, + "port-version": 5, "description": "VTK-based Data Analysis and Visualization Application", "homepage": "https://www.paraview.org/", "license": "BSD-3-Clause", diff --git a/ports/pe-parse/portfile.cmake b/ports/pe-parse/portfile.cmake index 0ba01c1b6a7dba..8abd4e87a14748 100644 --- a/ports/pe-parse/portfile.cmake +++ b/ports/pe-parse/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO trailofbits/pe-parse - REF v2.1.0 - SHA512 2589e4049b9edb5aa733684405f77a7d0c2a36c44a9473ff286fa387468600453c908770d6c2b9d635553bfb0fb2a547326c0aa2e4db5ca1f824de64ec3f61d0 + REF "v${VERSION}" + SHA512 fae9060c48e2cebdfbb742c52bc39c36335c1ad4fc7e6bc75a7da012f59d16497630d40ca814c8da71acc44dcce82983ebe13da3a0d389cc53032261fcd1f6bb HEAD_REF master PATCHES arm64-windows-fix.patch diff --git a/ports/pe-parse/vcpkg.json b/ports/pe-parse/vcpkg.json index d68ea6844f27fb..45761d0376e848 100644 --- a/ports/pe-parse/vcpkg.json +++ b/ports/pe-parse/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pe-parse", - "version": "2.1.0", - "port-version": 1, + "version": "2.1.1", "description": "pe-parse is a principled, lightweight C/C++ PE parser", "homepage": "https://github.com/trailofbits/pe-parse", "supports": "!uwp", diff --git a/ports/pipewire/portfile.cmake b/ports/pipewire/portfile.cmake index e3f72f7c4d814d..b54d7aaf2471f9 100644 --- a/ports/pipewire/portfile.cmake +++ b/ports/pipewire/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO pipewire/pipewire REF "${VERSION}" - SHA512 3884a64ce4d467665d34ee39e84ab394e4fe7c24bc006efe1f6ba78649e9fe3693c65f2173a4b0bf0979786309a5b12bc8b90aab3f6cbc223db596c44d00f4cc + SHA512 4ef85f17b0364fe1ef994bf58fe9232fb201002b9fd6644542f58f91595cca48dc70a6a17b50713809c618998626b18e7f1436a090fea826a80b41df9418e2bf HEAD_REF master # branch name ) diff --git a/ports/pipewire/vcpkg.json b/ports/pipewire/vcpkg.json index 38d3accc090e17..49ee8377918a24 100644 --- a/ports/pipewire/vcpkg.json +++ b/ports/pipewire/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pipewire", - "version": "1.0.3", + "version": "1.0.4", "description": "Low-latency audio/video router and processor. This port only builds the client library, not the server.", "homepage": "https://pipewire.org", "license": "MIT", diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index d899a453faac1c..f10b299e97fdad 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -46,8 +46,8 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH GITLAB_URL https://gitlab.freedesktop.org REPO pixman/pixman - REF 91b8526c1eeb2b45c21f091e890cb74cf6989ff6 # 0.43.2 - SHA512 cd4ea905a2287ae1ec25720ac90a72b2812dfeb6a5a82e3bbfcfeba91461229cde61b8bc6a5dfe5711f6b2937b3d3d4ade2b0c9a0290880c7d0cc4859344b542 + REF "pixman-${VERSION}" + SHA512 daeb25d91e9cb8d450a6f050cbec1d91e239a03188e993ceb6286605c5ed33d97e08d6f57efaf1d5c6a8a1eedb1ebe6c113849a80d9028d5ea189c54601be424 PATCHES no-host-cpu-checks.patch fix_clang-cl.patch diff --git a/ports/pixman/vcpkg.json b/ports/pixman/vcpkg.json index cf6859c463ce30..2b6bf493b7f701 100644 --- a/ports/pixman/vcpkg.json +++ b/ports/pixman/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pixman", - "version": "0.43.2", + "version": "0.43.4", "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", "homepage": "https://www.cairographics.org/releases", "license": "MIT", diff --git a/ports/plf-queue/portfile.cmake b/ports/plf-queue/portfile.cmake new file mode 100644 index 00000000000000..d4b4dd7bf2cc67 --- /dev/null +++ b/ports/plf-queue/portfile.cmake @@ -0,0 +1,13 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mattreecebentley/plf_queue + REF 1fb9d87a210f7813450ee54a469f9f79ea4ec872 + SHA512 bca6662f5b0c4dfad4b9c1192aced83cf379ed2f115b498ad98003b7201fa80cf00ee697c7c8f9a8f9fe7c979207a8e99dd58549e124ea041af25c9217d7ae6f + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/plf_queue.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/plf-queue/vcpkg.json b/ports/plf-queue/vcpkg.json new file mode 100644 index 00000000000000..1575d8250b21e5 --- /dev/null +++ b/ports/plf-queue/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "plf-queue", + "version": "2.2", + "description": "A data container replicating std::queue functionality but with better performance than standard library containers in a queue context. C++98/03/11/14/etc-compatible.", + "homepage": "https://plflib.org/queue.htm" +} diff --git a/ports/presentmon/portfile.cmake b/ports/presentmon/portfile.cmake index 51736bbd7c9ad9..5e866d942ca252 100644 --- a/ports/presentmon/portfile.cmake +++ b/ports/presentmon/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GameTechDev/PresentMon - REF 47669ad0efaddc9787772d5e4900734417b2c07c # 1.7.0 - SHA512 fac2e2ca4d8476e2cdde7c3f77cf1881b7d7a9208387f12dbf07f3ea7f4012ce79602f4fedbf1e778871fd9ce898b101659a6f192de29dc6a4404213aee444be + REF "v${VERSION}" + SHA512 d593a4066e3087abd02df5bd049bb1cbe1a91ac07a4efb53bae7a44bcb98dc67f7e2f2688dd339292eeaf9b96f35d5790a86d355faacad5cf61dafa0fa584edc HEAD_REF main ) diff --git a/ports/presentmon/vcpkg.json b/ports/presentmon/vcpkg.json index 02a942a865e672..98beb1aec6a060 100644 --- a/ports/presentmon/vcpkg.json +++ b/ports/presentmon/vcpkg.json @@ -1,7 +1,6 @@ { "name": "presentmon", - "version-semver": "1.7.0", - "port-version": 2, + "version-semver": "1.10.0", "description": "PresentMon is a tool to capture and analyze ETW events related to swap chain presentation on Windows.", "supports": "windows & !uwp", "dependencies": [ diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 0191ed18498743..fba1e484d56166 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt", "version": "6.6.1", - "description": "Qt", + "port-version": 1, + "description": "A cross-platform application and UI framework.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index e850305c14221b..e236c398f01aae 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-3d", "version": "5.15.13", - "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", + "port-version": 1, + "description": "Qt 3D provides functionality for near-realtime simulation systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applications.", "license": null, "dependencies": [ "assimp", diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json index a9e1e87acde848..799e4114a3a893 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-activeqt", "version": "5.15.13", - "description": "Qt5 ActiveQt Module - ActiveX components", + "port-version": 1, + "description": "Active Qt is a helper framework that enables the developer to access and use ActiveX controls and COM objects provided by any ActiveX server. It also makes it possible to make the developer's own Qt applications available as COM servers on Windows.", "license": null, "supports": "windows", "dependencies": [ diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json index 7a78eb19181799..c4e40520cf0883 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-androidextras", "version": "5.15.13", - "description": "Qt5 androidextras Module;", + "port-version": 1, + "description": "The Qt Android Extras module provided a set of classes and functions that were specific to Android applications written with Qt. This module helped developers to integrate various Android-specific features and services into their Qt applications.", "license": null, "supports": "android", "dependencies": [ diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 8c9820596c4213..9caaec15be7fb4 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-base", "version": "5.15.13", - "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", + "port-version": 1, + "description": "Qt Base provides the basic non-GUI functionality required by all Qt applications.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qt5-canvas3d/vcpkg.json b/ports/qt5-canvas3d/vcpkg.json index 9b66bfbaffd21b..3a01931f25358c 100644 --- a/ports/qt5-canvas3d/vcpkg.json +++ b/ports/qt5-canvas3d/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qt5-canvas3d", "version": "0", - "port-version": 2, - "description": "Qt5 Canvas 3d Module;", + "port-version": 3, + "description": "Qt Canvas3D offers a low level OpenGL-like API that enables you to execute 3D drawing commands from JavaScript.", "dependencies": [ { "name": "qt5-base", diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json index 660593141f85ad..aaecfef62d143e 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-charts", "version": "5.15.13", - "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", + "port-version": 1, + "description": "The Qt Charts module provides a set of easy to use chart components.", "license": null, "dependencies": [ { diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json index 1bfaba6ccba5d4..fd655c10bb2aa7 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-connectivity", "version": "5.15.13", - "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", + "port-version": 1, + "description": "The Qt Connectivity module provides access to Bluetooth and NFC hardware.", "license": null, "dependencies": [ { diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json index b950e4273cb64a..87c1a17597af2e 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-datavis3d", "version": "5.15.13", - "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", + "port-version": 1, + "description": "The Qt Data Visualization module provides a way to visualize data in 3D as bar, scatter, and surface graphs.", "license": null, "dependencies": [ { diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index a197efd65496ff..d87be63859b31d 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-declarative", "version": "5.15.13", - "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", + "port-version": 1, + "description": "Qt Declarative (Quick 2)", "license": null, "dependencies": [ { diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json index 8cf572daa3bd08..cad232450990dd 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-doc", "version": "5.15.13", - "description": "Qt5 doc Module;", + "port-version": 1, + "description": "The Qt documentation.", "license": null, "supports": "linux", "dependencies": [ diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index 0ea91cc1c3563f..2a70e7e36e100c 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-gamepad", "version": "5.15.13", - "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", + "port-version": 1, + "description": "Qt Gamepad is an add-on library that enables Qt applications to support the use of gamepad hardware and in some cases remote control equipment.", "license": null, "dependencies": [ { diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json index ef5a997efd0e99..587bf23e734e2a 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-graphicaleffects", "version": "5.15.13", - "description": "Qt5 GraphicalEffects Module.", + "port-version": 1, + "description": "The Qt Graphical Effects module provides a set of QML types for adding visually impressive and configurable effects to user interfaces.", "license": null, "dependencies": [ { diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index f202f621ce04ae..78b9f5630c45ff 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-imageformats", "version": "5.15.13", - "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", + "port-version": 1, + "description": "The Qt Image Formats add-on module provides optional support for other image file formats.", "license": null, "dependencies": [ { diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 1f3c8c4fd87413..363d7ec016cac7 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-location", "version": "5.15.13", - "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", + "port-version": 1, + "description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.", "license": null, "dependencies": [ { diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json index 92b1d97cd9bc82..b7acb9fa7d46d5 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-macextras", "version": "5.15.13", - "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", + "port-version": 1, + "description": "Qt Mac Extras provide classes and functions that enable you to use miscellaneous functionality specific to the macOS and iOS operating systems.", "license": null, "supports": "osx", "dependencies": [ diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json index b25b08a1cdc5ec..abafa33748af6c 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-mqtt", "version": "5.15.13", - "description": "Qt5 MQTT module.", + "port-version": 1, + "description": "Qt MQTT enables you to create applications and devices that can communicate over the MQ telemetry transport (MQTT) protocol.", "license": null, "dependencies": [ { diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index 3633c92408d4e5..6440f167692464 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-multimedia", "version": "5.15.13", - "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", + "port-version": 1, + "description": "Qt Multimedia is an essential module that provides a rich set of QML types and C++ classes to handle multimedia content. It also provides necessary APIs to access the camera and radio functionality.", "license": null, "dependencies": [ { diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json index 80c4348b748d05..6d9e29f877c54f 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-networkauth", "version": "5.15.13", - "description": "Qt5 Network Authorization Module", + "port-version": 1, + "description": "Qt Network Authorization provides a set of APIs that enable Qt applications to obtain limited access to online accounts and HTTP services without exposing users' passwords.", "license": null, "dependencies": [ { diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index 95cfbb07281fd4..be15dbd8ae0418 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-purchasing", "version": "5.15.13", - "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", + "port-version": 1, + "description": "Qt Purchasing is an add-on library that enables Qt applications to support in-app purchases. It is a cross-platform library that currently supports purchases made to the Mac App Store on OS X, App Store on iOS, and Google Play on Android.", "license": null, "dependencies": [ { diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json index 88b22eaf574c40..8532b37284c658 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-quickcontrols", "version": "5.15.13", - "description": "Qt5 QuickControls Module.", + "port-version": 1, + "description": "The Qt Quick Controls module provides a set of controls that can be used to build complete interfaces in Qt Quick.", "license": null, "dependencies": [ { diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index f2eda99834120d..f39d04e3fe9434 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-quickcontrols2", "version": "5.15.13", - "description": "Qt5 QuickControls2 Module.", + "port-version": 1, + "description": "Qt Quick Controls provides a set of controls that can be used to build complete interfaces in Qt Quick.", "license": null, "dependencies": [ { diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index 0b0a8cd65a547f..4c2018073652c0 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-remoteobjects", "version": "5.15.13", - "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", + "port-version": 1, + "description": "Qt Remote Objects (QtRO) is an Inter-Process Communication (IPC) module developed for Qt. This module extends Qt's existing functionalities to enable information exchange between processes or computers, easily.", "license": null, "dependencies": [ { diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json index ac6454434edc12..8742fd209cf1df 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-script", "version": "5.15.13", - "description": "Qt5 Script Module.", + "port-version": 1, + "description": "Qt Script provides support for application scripting with ECMAScript.", "license": null, "dependencies": [ { diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index eb270340eebfae..01a7a29315ef35 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-scxml", "version": "5.15.13", - "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", + "port-version": 1, + "description": "The Qt SCXML module provides classes for embedding state machines created from State Chart XML (SCXML) files in Qt applications.", "license": null, "dependencies": [ { diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json index 76ec446d6833c8..3a8f03ef82d9f1 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-sensors", "version": "5.15.13", - "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", + "port-version": 1, + "description": "The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices.", "license": null, "dependencies": [ { diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json index 9e4abcd7b8aeda..01bb00065a79ca 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-serialbus", "version": "5.15.13", - "description": "Qt5 Serialbus Module;", + "port-version": 1, + "description": "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, and others.", "license": null, "dependencies": [ { diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json index 12f926ae6deb0e..cde0db57271642 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-speech", "version": "5.15.13", - "description": "Qt5 Speech Module", + "port-version": 1, + "description": "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users who are visually challenged or cannot access the application for whatever reason.", "license": null, "dependencies": [ { diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 34b3fa6675a6b1..9153b635571d62 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-svg", "version": "5.15.13", - "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", + "port-version": 1, + "description": "Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices.", "license": null, "dependencies": [ { diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index 06326dd7da1e25..a80506cb973110 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-tools", "version": "5.15.13", - "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", + "port-version": 1, + "description": "A collection of tools and utilities that come with the Qt framework to assist developers in the creation, management, and deployment of Qt applications.", "license": null, "dependencies": [ { diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json index 7648871441e6f8..7c33033c5cd389 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-translations", "version": "5.15.13", - "description": "Qt5 translations module", + "port-version": 1, + "description": "Qt translations.", "license": null, "dependencies": [ { diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index a989f8b6a09013..5a6d42f20217a9 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-virtualkeyboard", "version": "5.15.13", - "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", + "port-version": 1, + "description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 5 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.", "license": null, "dependencies": [ "qt5-multimedia", diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index 102a1219c2aeac..2950075699f410 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-wayland", "version": "5.15.13", - "description": "Qt5 wayland Module;", + "port-version": 1, + "description": "QtWayland is a Qt 5 module that wraps the functionality of Wayland.", "license": null, "supports": "linux", "dependencies": [ diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index c53d79d5ef3a95..eeaf77a83021fd 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-webchannel", "version": "5.15.13", - "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", + "port-version": 1, + "description": "Qt WebChannel enables peer-to-peer communication between a server (QML/C++ application) and a client (HTML/JavaScript or QML application).", "license": null, "dependencies": [ { diff --git a/ports/qt5-webengine/0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch b/ports/qt5-webengine/0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch new file mode 100644 index 00000000000000..34869c40ff5bd3 --- /dev/null +++ b/ports/qt5-webengine/0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch @@ -0,0 +1,24 @@ +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/layout_svg_resource_paint_server.cc b/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/layout_svg_resource_paint_server.cc +index 99ba54e790c..abf8467912d 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/layout_svg_resource_paint_server.cc ++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/layout/svg/layout_svg_resource_paint_server.cc +@@ -94,7 +94,7 @@ void SVGPaintServer::PrependTransform(const AffineTransform& transform) { + transform_ = transform * transform_; + } + +-static base::Optional ResolveColor(const ComputedStyle& style, ++static base::Optional ResolveColorSvgPaintServer(const ComputedStyle& style, + const SVGPaint& paint, + const SVGPaint& visited_paint) { + if (!paint.HasColor()) +@@ -122,7 +122,7 @@ static SVGPaintDescription RequestPaint(const LayoutObject& object, + const SVGPaint& visited_paint = apply_to_fill + ? svg_style.InternalVisitedFillPaint() + : svg_style.InternalVisitedStrokePaint(); +- base::Optional color = ResolveColor(style, paint, visited_paint); ++ base::Optional color = ResolveColorSvgPaintServer(style, paint, visited_paint); + + if (paint.HasUrl()) { + LayoutSVGResourcePaintServer* uri_resource = nullptr; +-- +2.39.3 diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index 29719ff771f0fc..91c392f4acafc6 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -51,6 +51,7 @@ set(PATCHES common.pri.patch build_2.patch 0001-Support-ICU-74-in-LazyTextBreakIterator.patch workaround-protobuf-issue.patch + 0001-Fix-jumbo-build-error-due-to-ResolveColor-redefiniti.patch ) set(OPTIONS) diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 1131d9161d9788..a068a4c333d97d 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,12 +1,13 @@ { "name": "qt5-webengine", "version": "5.15.13", - "description": "Qt5 webengine Module;", + "port-version": 3, + "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", "license": null, "supports": "!static", "dependencies": [ { - "name": "atlmfc", + "name": "atl", "platform": "windows" }, { diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 65785f7230fccc..24e9fc9fea187b 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-webglplugin", "version": "5.15.13", - "description": "Qt5 Webglplugin Module", + "port-version": 1, + "description": "The Qt WebGL Plugin module enables Qt applications to be run in web browsers through WebGL streaming.", "license": null, "dependencies": [ { diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index afd30f28e7bf2a..0cf84b97ded3f3 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-websockets", "version": "5.15.13", - "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", + "port-version": 1, + "description": "The Qt WebSockets module provides C++ and QML interfaces that enable Qt applications to act as a server that can process WebSocket requests, or a client that can consume data received from the server, or both.", "license": null, "dependencies": [ { diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json index ec69f9926a19a2..78746bae2b1e60 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-webview", "version": "5.15.13", - "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", + "port-version": 1, + "description": "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", "license": null, "dependencies": [ "qt5-declarative" diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json index 0a3935fe4a4074..96ff7d4ffa1224 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-winextras", "version": "5.15.13", - "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", + "port-version": 1, + "description": "Qt Windows Extras provide classes and functions that enable you to use miscellaneous Windows-specific functions. For example, you can convert Qt objects to Windows object handles and manipulate DWM glass frames.", "license": null, "supports": "windows", "dependencies": [ diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json index bbf4683eeea376..9c1e9da207c033 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-x11extras", "version": "5.15.13", - "description": "Qt5 x11extras Module;", + "port-version": 1, + "description": "Qt X11 Extras enables the Qt programmer to write applications for the Linux/X11 platform.", "license": null, "supports": "!windows", "dependencies": [ diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index e023e63a81bd86..67731289c1eff1 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5-xmlpatterns", "version": "5.15.13", - "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", + "port-version": 1, + "description": "The Qt XML Patterns module provides support for XPath, XQuery, XSLT, and XML Schema validation.", "license": null, "dependencies": [ { diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json index e2e264a91e3b9f..eacba33cb5c0ce 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5", "version": "5.15.13", - "description": "Qt5 Application Framework", + "port-version": 1, + "description": "A cross-platform application and UI framework.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 7a084edd150e18..22bbc181f06582 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qt5compat", "version": "6.6.1", - "description": "The module contains unsupported Qt 5 APIs", + "port-version": 1, + "description": "The Qt 5 Core Compat module contains the Qt 5 Core APIs that were removed in Qt 6. The module facilitates the transition to Qt 6.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 2b0f6057379d69..ae42726a6c27fd 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qtbase", "version": "6.6.1", - "port-version": 10, - "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", + "port-version": 11, + "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, "supports": "!uwp", diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 60b23d828e5cf0..51dbc89cdd247d 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtcharts", "version": "6.6.1", - "description": "QtCharts module", + "port-version": 1, + "description": "The Qt Charts module provides a set of easy-to-use chart components. It uses the Qt Graphics View Framework to integrate charts with modern user interfaces.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 16632785cc3dcd..ef394b70983eac 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtcoap", "version": "6.6.1", - "description": "Qt CoAP client module", + "port-version": 1, + "description": "Qt CoAP implements the client side of CoAP.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index e67dffa2c8fe74..cf5f44d63d7757 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtconnectivity", "version": "6.6.1", - "description": "Qt Connectivity", + "port-version": 1, + "description": "The Qt Connectivity module provides access to Bluetooth and NFC hardware.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 2ebba253bb7ae2..d0fe9775521262 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtdatavis3d", "version": "6.6.1", - "description": "Qt 3D data visualization framework", + "port-version": 1, + "description": "The Qt Data Visualization module enables you to visualize data in 3D as bar, scatter, and surface graphs.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index fb678f1d68c048..b10ee745c5af9a 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtdeviceutilities", "version": "6.6.1", - "description": "Utils for Boot2Qt", + "port-version": 1, + "description": "Qt Device Utilities provides functionality that is useful for controlling settings in embedded applications.", "homepage": "https://www.qt.io/", "license": null, "supports": "linux", diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 07f3c4e3fd09d0..cc39d376d05eb4 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtdoc", "version": "6.6.1", - "description": "Qt Documentation", + "port-version": 1, + "description": "The Qt documentation.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtgraphs/vcpkg.json b/ports/qtgraphs/vcpkg.json index 24557853d69314..a43f53a5a8d5eb 100644 --- a/ports/qtgraphs/vcpkg.json +++ b/ports/qtgraphs/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtgraphs", "version": "6.6.1", - "description": "Qt Location", + "port-version": 1, + "description": "The Qt Graphs module enables you to visualize data in 3D as bar, scatter, and surface graphs.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtgrpc/vcpkg.json b/ports/qtgrpc/vcpkg.json index 9b7c898a881518..e3e723a693af7e 100644 --- a/ports/qtgrpc/vcpkg.json +++ b/ports/qtgrpc/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtgrpc", "version": "6.6.1", - "description": "Qt framework based gRPC clients and services.", + "port-version": 1, + "description": "The Qt GRPC and Qt Protobuf modules together allow you to define data and messages in proto files, and then use the code generators, which generate client code allowing accessors for fields and gRPC services in the Qt framework.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json index d98f678e920edc..120f46074945d6 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qthttpserver", "version": "6.6.1", - "description": "Qt Extension: Qt HTTP Server", + "port-version": 1, + "description": "Qt HTTP Server supports building HTTP server functionality into an application.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index a3eb0ca620b353..4cb182e435bf88 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtimageformats", "version": "6.6.1", - "description": "Additional Image Format plugins for Qt", + "port-version": 1, + "description": "The Qt Image Formats add-on module provides optional support for other image file formats.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index 358ed4d3eb571f..04ba60f669e2a1 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtinterfaceframework", "version": "6.6.1", - "description": "Qt Interface Framework", + "port-version": 1, + "description": "The Qt Interface Framework module provides both the tools and the core APIs, for you to implement Middleware APIs, Middleware Back ends, and Middleware Services.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json index e29490e373b8f5..16cc0376825f83 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtlanguageserver", "version": "6.6.1", - "description": "An implementation of the Language Server Protocol", + "port-version": 1, + "description": "An implementation of the Language Server Protocol.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index 357ebfa2e61a5b..fa3036363951d0 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtlocation", "version": "6.6.1", - "description": "Qt Location", + "port-version": 1, + "description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 93f0adb160d54e..fd9b9d0bf58f29 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtmqtt", "version": "6.6.1", - "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", + "port-version": 1, + "description": "The Qt MQTT module provides a standard compliant implementation of the MQTT protocol specification.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index ccf1a2e11c4be1..58d4e6d5972a73 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qtmultimedia", "version": "6.6.1", - "port-version": 1, - "description": "Qt Multimedia", + "port-version": 2, + "description": "Qt Multimedia is an add-on module that provides a rich set of QML types and C++ classes to handle multimedia content.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 355a7e835bda32..b5b47714758d0f 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtnetworkauth", "version": "6.6.1", - "description": "Qt Network Authenticators; QtOAuth in particular", + "port-version": 1, + "description": "Qt Network Authorization provides a set of APIs that enable Qt applications to obtain limited access to online accounts and HTTP services without exposing users' passwords.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 040afb1c91f870..1b022ad272bdb2 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qtopcua", "version": "6.6.1", - "port-version": 1, - "description": "Qt wrapper for existing OPC UA stacks", + "port-version": 2, + "description": "The Qt OPC UA module implements a Qt API to interact with OPC UA on top of a 3rd party OPC UA stack.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index e7aa4b48029cd4..d4183e3a7470f8 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qtpositioning", "version": "6.6.1", - "port-version": 2, - "description": "Qt Positioning", + "port-version": 3, + "description": "The Qt Positioning API provides positioning information via QML and C++ interfaces.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 2d37322ea251e7..b083f9cb86b6da 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtquick3d", "version": "6.6.1", - "description": "A new module and API for defining 3D content in Qt Quick.", + "port-version": 1, + "description": "Qt Quick 3D provides a high-level API for creating 3D content and 3D user interfaces based on Qt Quick.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json index 8a7a4e3b799153..bf00c151ae8e1e 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtquick3dphysics", "version": "6.6.1", - "description": "Physics engine integration for Qt Quick 3D", + "port-version": 1, + "description": "Qt Quick 3D Physics provides a high-level API for physics simulation.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtquickcontrols2/vcpkg.json b/ports/qtquickcontrols2/vcpkg.json index 786eedf22fc157..8fe533d09fcaa6 100644 --- a/ports/qtquickcontrols2/vcpkg.json +++ b/ports/qtquickcontrols2/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtquickcontrols2", "version-string": "deprecated", - "description": "Qt Quick Controls 2 (deprecated). Included in qtdeclarative", + "port-version": 1, + "description": "Qt Quick Controls provides a set of controls that can be used to build complete interfaces in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtquickeffectmaker/vcpkg.json b/ports/qtquickeffectmaker/vcpkg.json index cce441e9cefc86..21f4d962a4ded2 100644 --- a/ports/qtquickeffectmaker/vcpkg.json +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtquickeffectmaker", "version": "6.6.1", - "description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.", + "port-version": 1, + "description": "Qt Quick Effect Maker is a tool for creating shader effects for Qt Quick with high productivity and performance.", "homepage": "https://www.qt.io/", "license": null, "supports": "native", diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 09e9ad4b47b706..faa37054622a4b 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtquicktimeline", "version": "6.6.1", - "description": "Module for keyframe-based timeline construction.", + "port-version": 1, + "description": "The Qt Quick Timeline module enables keyframe-based animations and parameterization.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 497b0b3ce2ceb5..b5d9d66bca8886 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtremoteobjects", "version": "6.6.1", - "description": "Qt distributed object system", + "port-version": 1, + "description": "Qt Remote Objects (QtRO) is an Inter-Process Communication (IPC) module developed for Qt. This module extends Qt's existing functionalities to enable information exchange between processes or computers, easily.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index afbc4c278d25e8..69e4a58e7f1561 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtscxml", "version": "6.6.1", - "description": "SCXML (state machine notation) compiler and related tools", + "port-version": 1, + "description": "The Qt SCXML module provides functionality to create state machines from SCXML files.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index 889ac9765f6fe1..5149d7a3e8a596 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtsensors", "version": "6.6.1", - "description": "Qt Sensors", + "port-version": 1, + "description": "The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index fd3633b86b8ebd..9088b799726c77 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtserialbus", "version": "6.6.1", - "description": "Support for CAN and potentially other serial buses.", + "port-version": 1, + "description": "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, and others.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index 248f08783ed1b4..860ee206187eba 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,8 +1,8 @@ { "name": "qtserialport", "version": "6.6.1", - "port-version": 1, - "description": "Qt Serial Port support", + "port-version": 2, + "description": "Qt Serial Port provides basic functionality for configuration, I/O operations, and getting and setting the control signals of the RS-232 pinouts.", "homepage": "https://www.qt.io/", "license": null, "supports": "!ios", diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 5b3d840cc35c9c..475747f4e8286a 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtshadertools", "version": "6.6.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.", + "port-version": 1, + "description": "The Qt Shader Tools module is designed to provide a set of tools and utilities to work with graphics shaders.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtspeech/vcpkg.json b/ports/qtspeech/vcpkg.json index 33f4e84cb4681a..dfa8eca4113a6a 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtspeech", "version": "6.6.1", - "description": "Qt Speech support", + "port-version": 1, + "description": "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users who are visually challenged or cannot access the application for whatever reason.", "homepage": "https://www.qt.io/", "license": null, "supports": "!(windows & x86)", diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index d78ce89752debf..4351d2b2115c18 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtsvg", "version": "6.6.1", - "description": "Qt SVG", + "port-version": 1, + "description": "Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index b7b032a03fe00e..c9ed4806bed097 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qttools", "version": "6.6.1", - "description": "Qt Tools", + "port-version": 1, + "description": "A collection of tools and utilities that come with the Qt framework to assist developers in the creation, management, and deployment of Qt applications.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 43a325e5fa3fab..27ee313b1fff5c 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qttranslations", "version": "6.6.1", - "description": "Qt Translations", + "port-version": 1, + "description": "Qt translations.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index c9e5cd1665798b..eda41fde36a01e 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtwebchannel", "version": "6.6.1", - "description": "Qt WebChannel", + "port-version": 1, + "description": "Qt WebChannel enables peer-to-peer communication between a server (QML/C++ application) and a client (HTML/JavaScript or QML application).", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 11800b39e67af1..1a0cf959fd620e 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,8 +2,8 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.6.1", - "port-version": 3, - "description": "Qt WebEngine", + "port-version": 4, + "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", "homepage": "https://www.qt.io/", "license": null, "supports": "!static & !((x86 | arm) & windows)", diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index f9112418d5d033..af4556b61bb055 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtwebsockets", "version": "6.6.1", - "description": "Qt WebSockets", + "port-version": 1, + "description": "The Qt WebSockets module provides C++ and QML interfaces that enable Qt applications to act as a server that can process WebSocket requests, or a client that can consume data received from the server, or both.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 4b8c019eaffad1..1fbacbd0fd4603 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,7 +1,8 @@ { "name": "qtwebview", "version": "6.6.1", - "description": "Qt Web View", + "port-version": 1, + "description": "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 528e416db9e97e..c87ba4a2757939 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 65aa38c0c279916b6a861587834deff393fd2d7bdbcdc9b91de922a72e90d813581db20a822d47c3c4ee2c46da09a10ed4020d06fc2bf456c54e1469f3ce66ef + SHA512 6f35a58cadafa1c8ca5704bf71d6bb46ce290fc35c292c5cf742ac208ce9d1f5b81645ea211be947095398a89cd6c59b971061172bc347b4137d2d2abf737ff9 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 711981f2c727d9..b3cd271d41f427 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "3.6.0", + "version": "3.8.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/ports/robin-map/portfile.cmake b/ports/robin-map/portfile.cmake index c3e3a8355184b0..585796eea0144e 100644 --- a/ports/robin-map/portfile.cmake +++ b/ports/robin-map/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tessil/robin-map - REF v1.2.1 - SHA512 9e08c6b5b06d26e18d85b36c79ec855bc3220843bc358f53f3eb269bd8d20350871a9686ad77b2b462ca104e4cc62a0745a71d62bd1f69c8f50d29788eac63e1 + REF "v${VERSION}" + SHA512 50e68afc5d24e9c963336a2e4dba6e2656d2046278679bc081fc66dae1ffb0ee75176699bde79340346e538ced15a7072dc298e6be7e4d3e80f9df5163e09396 HEAD_REF master ) diff --git a/ports/robin-map/vcpkg.json b/ports/robin-map/vcpkg.json index f4bfc62cdd4bc7..a509b992e27b92 100644 --- a/ports/robin-map/vcpkg.json +++ b/ports/robin-map/vcpkg.json @@ -1,6 +1,6 @@ { "name": "robin-map", - "version-semver": "1.2.1", + "version-semver": "1.2.2", "description": "A C++ implementation of a fast hash map and hash set using robin hood hashing", "homepage": "https://github.com/Tessil/robin-map", "license": "MIT", diff --git a/ports/robotraconteur/portfile.cmake b/ports/robotraconteur/portfile.cmake index c398789486f952..c149fc7171c843 100644 --- a/ports/robotraconteur/portfile.cmake +++ b/ports/robotraconteur/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO robotraconteur/robotraconteur - REF v1.0.0 - SHA512 c21dd0af579272c565dd66ca935aababfa3742db524fae66fe82c929561680608e5759ce954f31a8bbcb4ffb7c4e5314f2050b513ccddb8fb49a005c6cfa6d74 + REF "v${VERSION}" + SHA512 b9ebfb0803bf0efe46bbb8dd2c8d63837141f6f416256d2edcf4e78e4658e2d6c028a2fbd200b13571cfe08d6045273147144da4bcdafc6375b670713ba4f5f6 HEAD_REF master ) diff --git a/ports/robotraconteur/vcpkg.json b/ports/robotraconteur/vcpkg.json index 0f61608fbd6afa..f7d67287c1d7e1 100644 --- a/ports/robotraconteur/vcpkg.json +++ b/ports/robotraconteur/vcpkg.json @@ -1,6 +1,6 @@ { "name": "robotraconteur", - "version-semver": "1.0.0", + "version-semver": "1.1.1", "description": "The Robot Raconteur communication framework core library", "homepage": "http://robotraconteur.com", "license": "Apache-2.0", diff --git a/ports/rocksdb/0001-fix-dependencies.patch b/ports/rocksdb/0001-fix-dependencies.patch index 7c16654413d7ae..510d2b41c5eb51 100644 --- a/ports/rocksdb/0001-fix-dependencies.patch +++ b/ports/rocksdb/0001-fix-dependencies.patch @@ -3,10 +3,10 @@ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 23a4014bc..045f5a36d 100644 +index 5cfc1b480..a18af5817 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -87,7 +87,7 @@ endif() +@@ -82,7 +82,7 @@ endif() include(CMakeDependentOption) @@ -15,7 +15,7 @@ index 23a4014bc..045f5a36d 100644 option(WITH_GFLAGS "build with GFlags" OFF) option(WITH_XPRESS "build with windows built in compression" OFF) option(ROCKSDB_SKIP_THIRDPARTY "skip thirdparty.inc" OFF) -@@ -136,10 +136,7 @@ else() +@@ -131,10 +131,7 @@ else() endif() if(WITH_SNAPPY) @@ -27,7 +27,7 @@ index 23a4014bc..045f5a36d 100644 add_definitions(-DSNAPPY) list(APPEND THIRDPARTY_LIBS Snappy::snappy) endif() -@@ -163,16 +160,19 @@ else() +@@ -158,16 +155,19 @@ else() endif() if(WITH_LZ4) @@ -41,7 +41,7 @@ index 23a4014bc..045f5a36d 100644 - find_package(zstd REQUIRED) + find_package(zstd CONFIG REQUIRED) add_definitions(-DZSTD) -- include_directories(${ZSTD_INCLUDE_DIR}) +- include_directories(${ZSTD_INCLUDE_DIRS}) - list(APPEND THIRDPARTY_LIBS zstd::zstd) + if(TARGET zstd::libzstd_shared) + list(APPEND THIRDPARTY_LIBS zstd::libzstd_shared) @@ -51,7 +51,7 @@ index 23a4014bc..045f5a36d 100644 endif() endif() -@@ -312,11 +312,10 @@ int main() { +@@ -307,11 +307,10 @@ int main() { endif() if (WITH_LIBURING) @@ -67,7 +67,7 @@ index 23a4014bc..045f5a36d 100644 endif() # Reset the required flags -@@ -382,9 +381,9 @@ endif() +@@ -377,9 +376,9 @@ endif() option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF) if(WITH_TBB) @@ -79,7 +79,7 @@ index 23a4014bc..045f5a36d 100644 endif() # Stall notifications eat some performance from inserts -@@ -1202,8 +1201,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) +@@ -1197,8 +1196,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) endforeach() endforeach() diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 694199c7da7197..c75e76b1ec53db 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb REF "v${VERSION}" - SHA512 df701e8f3a94efe351c5dfec691635b6cff9b5902e8d5bd714caa7389bbbfd8ce7f7e91f1549978b47b934449fb3b77581dfcc2811a7727be049709a330ca71e + SHA512 b1a37784db800e571b1ed6529bebdb452d6c8e495bd51401f021d1a2e07bae3b3be9ed0e69a8798b6ebce16e4af3e7cf83c73842d2eb4c9fd2d11d9528026ffd HEAD_REF main PATCHES 0001-fix-dependencies.patch diff --git a/ports/rocksdb/vcpkg.json b/ports/rocksdb/vcpkg.json index e2b78a9b0e2893..0dcdb9acd8c811 100644 --- a/ports/rocksdb/vcpkg.json +++ b/ports/rocksdb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rocksdb", - "version": "8.11.3", + "version": "9.0.0", "description": "A library that provides an embeddable, persistent key-value store for fast storage", "homepage": "https://github.com/facebook/rocksdb", "license": "GPL-2.0-only OR Apache-2.0", diff --git a/ports/rttr/disable-werrorr.patch b/ports/rttr/disable-werrorr.patch new file mode 100644 index 00000000000000..8e9d944114fa43 --- /dev/null +++ b/ports/rttr/disable-werrorr.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/utility.cmake b/CMake/utility.cmake +index 8e7a0c6..ac5e305 100644 +--- a/CMake/utility.cmake ++++ b/CMake/utility.cmake +@@ -395,7 +395,7 @@ function( set_compiler_warnings target) + set(WARNINGS "-Werror" + "-Wall") + elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(WARNINGS "-Werror" ++ set(WARNINGS + "-Wall") + elseif(MSVC) + set(WARNINGS "/WX" diff --git a/ports/rttr/portfile.cmake b/ports/rttr/portfile.cmake index 92d426ac7646b5..cbb9a155564817 100644 --- a/ports/rttr/portfile.cmake +++ b/ports/rttr/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( Fix-depends.patch remove-owner-read-perms.patch disable-unsupport-header.patch + disable-werrorr.patch ) if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static" AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") diff --git a/ports/rttr/vcpkg.json b/ports/rttr/vcpkg.json index d662479d8db8e3..26be709d0a1c36 100644 --- a/ports/rttr/vcpkg.json +++ b/ports/rttr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rttr", "version": "0.9.6+20210811", + "port-version": 1, "description": "an easy and intuitive way to use reflection in C++", "homepage": "https://github.com/rttrorg/rttr", "license": "MIT", diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake index c541249bd85599..6f30422bb5a4f0 100644 --- a/ports/sdl2-image/portfile.cmake +++ b/ports/sdl2-image/portfile.cmake @@ -40,6 +40,10 @@ endif() vcpkg_fixup_pkgconfig() +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/SDL2_image.pc" "-lSDL2_image" "-lSDL2_imaged") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index 9e85351f15779b..2d775ee1bcbace 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2-image", "version": "2.8.2", + "port-version": 1, "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", "homepage": "https://github.com/libsdl-org/SDL_image", "license": "Zlib", diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index f0ca49a2dbf6d9..7e6fbc17a5c20a 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -18,9 +18,9 @@ vcpkg_check_features( libmodplug SDL2MIXER_MOD_MODPLUG mpg123 SDL2MIXER_MP3 mpg123 SDL2MIXER_MP3_MPG123 + wavpack SDL2MIXER_WAVPACK + wavpack SDL2MIXER_WAVPACK_DSD opusfile SDL2MIXER_OPUS - MAYBE_UNUSED_VARIABLES - SDL2MIXER_MP3_DRMP3 ) if("fluidsynth" IN_LIST FEATURES) @@ -46,6 +46,8 @@ vcpkg_cmake_configure( -DSDL2MIXER_MIDI_TIMIDITY=OFF -DSDL2MIXER_MP3_DRMP3=OFF -DSDL2MIXER_MOD_XMP_SHARED=${BUILD_SHARED} + MAYBE_UNUSED_VARIABLES + SDL2MIXER_MP3_DRMP3 ) vcpkg_cmake_install() @@ -56,6 +58,10 @@ vcpkg_cmake_config_fixup( ) vcpkg_fixup_pkgconfig() +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/SDL2_mixer.pc" "-lSDL2_mixer" "-lSDL2_mixerd") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index 76bb310bf686bf..b3c9034ea11512 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-mixer", "version": "2.8.0", - "port-version": 1, + "port-version": 3, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://github.com/libsdl-org/SDL_mixer", "license": "Zlib", @@ -18,7 +18,9 @@ { "name": "vcpkg-cmake-config", "host": true - }, + } + ], + "default-features": [ "wavpack" ], "features": { @@ -52,6 +54,12 @@ "dependencies": [ "opusfile" ] + }, + "wavpack": { + "description": "Enable WavPack music.", + "dependencies": [ + "wavpack" + ] } } } diff --git a/ports/sdl2-ttf/portfile.cmake b/ports/sdl2-ttf/portfile.cmake index a1d47276f812c9..1f080e1caa5414 100644 --- a/ports/sdl2-ttf/portfile.cmake +++ b/ports/sdl2-ttf/portfile.cmake @@ -28,6 +28,10 @@ endif() vcpkg_fixup_pkgconfig() +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/SDL2_ttf.pc" "-lSDL2_ttf" "-lSDL2_ttfd") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/licenses") diff --git a/ports/sdl2-ttf/vcpkg.json b/ports/sdl2-ttf/vcpkg.json index 0d8a49caa1fbd2..2c8ec7ffa87861 100644 --- a/ports/sdl2-ttf/vcpkg.json +++ b/ports/sdl2-ttf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2-ttf", "version": "2.22.0", + "port-version": 1, "description": "A library for rendering TrueType fonts with SDL", "homepage": "https://www.libsdl.org/projects/SDL_ttf/", "license": "Zlib", diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 22685e6a1d737a..194b3c6c65cf62 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL REF "release-${VERSION}" - SHA512 c7635a83a52f3970a372b804a8631f0a7e6b8d89aed1117bcc54a2040ad0928122175004cf2b42cf84a4fd0f86236f779229eaa63dfa6ca9c89517f999c5ff1c + SHA512 0a774a321a6f2834c198cbb9515a0df9fa0515c10520da5be3ab8f336fadd554fefd0f59518be3c7edc3b269966b7b1e44c0e530714209e381fe455478926bf8 HEAD_REF main PATCHES deps.patch diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 1f46037546d673..2ae6366581b3b7 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sdl2", - "version": "2.30.0", + "version": "2.30.1", "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", diff --git a/ports/simd/portfile.cmake b/ports/simd/portfile.cmake index e219cefc494652..efd4da4a5e1bc4 100644 --- a/ports/simd/portfile.cmake +++ b/ports/simd/portfile.cmake @@ -8,11 +8,11 @@ vcpkg_from_github( if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(SIMD_PLATFORM "Win32") + set(SIMD_PLATFORM "Win32") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(SIMD_PLATFORM "x64") + set(SIMD_PLATFORM "x64") endif() - + if(VCPKG_PLATFORM_TOOLSET MATCHES "v140") set(SOLUTION_TYPE vs2015) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") @@ -22,37 +22,38 @@ if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPK else() set(SOLUTION_TYPE vs2022) endif() - + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${SOURCE_PATH}/src/Simd/SimdConfig.h" - "//#define SIMD_STATIC" - "#define SIMD_STATIC") + "//#define SIMD_STATIC" + "#define SIMD_STATIC") vcpkg_replace_string("${SOURCE_PATH}/prj/${SOLUTION_TYPE}/Simd.vcxproj" - "DynamicLibrary" - "StaticLibrary") + "DynamicLibrary" + "StaticLibrary") file(GLOB_RECURSE PROJ_FILES "${SOURCE_PATH}/prj/${SOLUTION_TYPE}/*.vcxproj") foreach(PROJ_FILE ${PROJ_FILES}) vcpkg_replace_string(${PROJ_FILE} " " " OldStyle\n ") endforeach() - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - file(GLOB_RECURSE PROJ_FILES "${SOURCE_PATH}/prj/${SOLUTION_TYPE}/*.vcxproj") - foreach(PROJ_FILE ${PROJ_FILES}) + endif() + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + file(GLOB_RECURSE PROJ_FILES "${SOURCE_PATH}/prj/${SOLUTION_TYPE}/*.vcxproj") + foreach(PROJ_FILE ${PROJ_FILES}) vcpkg_replace_string(${PROJ_FILE} - " " - " MultiThreadedDebugDLL\n MultiThreadedDLL\n ") - endforeach() - endif() + " " + " MultiThreadedDebugDLL\n MultiThreadedDLL\n ") + endforeach() endif() - + vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH "/prj/${SOLUTION_TYPE}/Simd.sln" - PLATFORM ${SIMD_PLATFORM} - TARGET Simd - RELEASE_CONFIGURATION "Release" - DEBUG_CONFIGURATION "Debug" + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH "/prj/${SOLUTION_TYPE}/Simd.sln" + PLATFORM ${SIMD_PLATFORM} + TARGET Simd + RELEASE_CONFIGURATION "Release" + DEBUG_CONFIGURATION "Debug" ) vcpkg_copy_pdbs() file(GLOB SIMD_HEADERS "${SOURCE_PATH}/src/Simd/*.hpp" "${SOURCE_PATH}/src/Simd/*.h") @@ -63,13 +64,13 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") else() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/prj/cmake" - OPTIONS - -DSIMD_TARGET="aarch64" + OPTIONS + -DSIMD_TARGET="aarch64" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() - + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") endif() else() @@ -79,9 +80,8 @@ else() vcpkg_cmake_install() vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() - + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") endif() -# Handle copyright vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/simd/vcpkg.json b/ports/simd/vcpkg.json index 0bd28b8747de7e..a952f3d4b71e71 100644 --- a/ports/simd/vcpkg.json +++ b/ports/simd/vcpkg.json @@ -1,6 +1,7 @@ { "name": "simd", "version": "5.3.128", + "port-version": 1, "description": "Simd image processing and machine learning library, designed for C and C++ programmers", "homepage": "https://github.com/ermig1979/Simd", "license": "MIT", diff --git a/ports/simde/portfile.cmake b/ports/simde/portfile.cmake index 2901a1fe81e613..8add03342ea917 100644 --- a/ports/simde/portfile.cmake +++ b/ports/simde/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simd-everywhere/simde REF "v${VERSION}" - SHA512 de17fca563c4db6766881e1c73142ad129a57febe55fa8ea1ae780226e60a84891b13d387e75574f2722d77e4013176e3c7dfaf17bccd8682b7d3d3ec8e92a54 + SHA512 b0667583565ea9e59d18a07c7a3cb46710868c9572663e314278ca2004747e337e34f6b927c9c5d29e161caba8ec0428e5299b6e878e226b9f33597a1584b91d HEAD_REF master ) diff --git a/ports/simde/vcpkg.json b/ports/simde/vcpkg.json index 5d1bb54481268d..d88d73f67a4bd9 100644 --- a/ports/simde/vcpkg.json +++ b/ports/simde/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simde", - "version": "0.7.6", + "version": "0.8.0", "description": "Implementations of SIMD instruction sets for systems which don't natively support them", "homepage": "https://github.com/simd-everywhere/simde", "license": "MIT" diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 581b1d7f15ace8..e44b72485ea506 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO simdjson/simdjson REF "v${VERSION}" HEAD_REF master - SHA512 370a2e37dd08f6df2720f94beddc14ce3a04e8216fe1fbd5c2119166a2bd070daad80d193da1ee683bb4a320f446f3bb38cc100928d534df0a28a48ad8fb6137 + SHA512 861993414db004079427f2246cee920e4e152e2b2d82ba153db762c9bbe14df4e495e49de35cde70d0980301df2e2c856ddb142ce618e392077d815a4f30fa7e ) vcpkg_check_features( diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 4693cb8ca384d5..5622b77e2ba2bf 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "simdjson", - "version": "3.6.2", - "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", + "version": "3.8.0", + "description": "An extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", "dependencies": [ @@ -31,7 +31,7 @@ "description": "Link with thread support" }, "utf8-validation": { - "description": "Enable UTF8 validation" + "description": "Enable UTF-8 validation" } } } diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 7afe3956b9018e..ff623170920b36 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -3,8 +3,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/skia-functions.cmake") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/skia - REF "c3feddb877388498cc9a491e9504268a53607b15" - SHA512 33238a6d8db4d60edd4ca1255d42ce97f084145e3bc7520ae4723a584c8f99bea0404ff505d6a9be077c0a3cc42be557e00dab3ca572b5803a2453ce363cd8f5 + REF "aeae2261c7d380404fb8e53eb6062338c4ba0367" + SHA512 74eabf6a7cc0ac0cc49a1075bf4ffcee4f006ebe67c02a76a4dc734da1fa430ddd7f3cb070cb0b1ed3ac99cf59d02dc0c8852f3487614ca851673984117ca612 PATCHES disable-msvc-env-setup.patch disable-dev-test.patch @@ -31,7 +31,7 @@ declare_external_from_git(d3d12allocator ) declare_external_from_git(dawn URL "https://dawn.googlesource.com/dawn.git" - REF "5b45794c2c24c3fa40dc480af92c5284a95423ef" + REF "d3e0bd4770cc8115d1342a8dc051a36e50e8bd26" LICENSE_FILE LICENSE ) declare_external_from_git(dng_sdk @@ -61,17 +61,17 @@ declare_external_from_git(sfntly ) declare_external_from_git(spirv-cross URL "https://github.com/KhronosGroup/SPIRV-Cross" - REF "b82536766d1b81631b126d1ddbe49baf42929bd3" + REF "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3" LICENSE_FILE LICENSE ) declare_external_from_git(spirv-headers URL "https://github.com/KhronosGroup/SPIRV-Headers.git" - REF "7b0309708da5126b89e4ce6f19835f36dc912f2f" + REF "05cc486580771e4fa7ddc89f5c9ee1e97382689a" LICENSE_FILE LICENSE ) declare_external_from_git(spirv-tools URL "https://github.com/KhronosGroup/SPIRV-Tools.git" - REF "3e6bdd0f99655b1bc6a54aa73e5bfaaa4252198b" + REF "dc6676445be97ab19d8191fee019af62e2aaf774" LICENSE_FILE LICENSE ) declare_external_from_git(wuffs diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index cd15b5410bba18..00f9ce70d8b7ee 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "skia", - "version": "122", + "version": "123", "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", diff --git a/ports/skia/vulkan-headers.patch b/ports/skia/vulkan-headers.patch index 1194a2f298cea9..28f9c687cf7339 100644 --- a/ports/skia/vulkan-headers.patch +++ b/ports/skia/vulkan-headers.patch @@ -4,34 +4,27 @@ index 04ab422..5ae82e5 100644 +++ b/BUILD.gn @@ -913,6 +913,7 @@ optional("gpu_shared") { } - + if (skia_use_vulkan) { + public_deps += [ "//third_party/externals/vulkan-headers:vulkan_headers" ] public_defines += [ "SK_VULKAN" ] sources += skia_shared_vk_sources if (skia_enable_vulkan_debug_layers) { diff --git a/include/private/gpu/vk/SkiaVulkan.h b/include/private/gpu/vk/SkiaVulkan.h -index ca4bcf1..8a52200 100644 +index 412dbf535f..93608dc2be 100644 --- a/include/private/gpu/vk/SkiaVulkan.h +++ b/include/private/gpu/vk/SkiaVulkan.h -@@ -13,7 +13,7 @@ +@@ -12,6 +12,10 @@ + // IWYU pragma: begin_exports - - #if SKIA_IMPLEMENTATION || !defined(SK_VULKAN) --#include "include/third_party/vulkan/vulkan/vulkan_core.h" -+#include "vulkan/vulkan_core.h" - #else - // For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan - // headers stay up to date for our needs -@@ -23,7 +23,7 @@ - #ifdef SK_BUILD_FOR_ANDROID - // This is needed to get android extensions for external memory - #if SKIA_IMPLEMENTATION || !defined(SK_VULKAN) --#include "include/third_party/vulkan/vulkan/vulkan_android.h" -+#include "vulkan/vulkan_android.h" + ++#ifndef SK_USE_EXTERNAL_VULKAN_HEADERS ++# define SK_USE_EXTERNAL_VULKAN_HEADERS ++#endif ++ + #if (SKIA_IMPLEMENTATION || !defined(SK_VULKAN)) && !defined(SK_USE_EXTERNAL_VULKAN_HEADERS) + #include "include/third_party/vulkan/vulkan/vulkan_core.h" #else - // For google3 builds we don't set SKIA_IMPLEMENTATION so we need to make sure that the vulkan - // headers stay up to date for our needs diff --git a/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h b/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h index 487ea7c..9662c8c 100644 --- a/src/gpu/vk/vulkanmemoryallocator/VulkanMemoryAllocatorWrapper.h diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index bd41024ef72b3b..b9e20c845470d4 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer REF "v.${VERSION}" - SHA512 2121c33660ed9866527533a4cce660762d2c92e4224a7d1ef3130e26fd9015664fa0190b673cea89568314a4fa4cbb9414be9c86983ae87d07cacc122ced79bf + SHA512 74c4cc8ae670b53df347d9158005285c4ee2bfea09feab0ac88e43b3161dcc8b38072bb6f3f7c17d9b5341cde82c5ed71835f4abd1c28f151b5370128dc250b2 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 9b2b75dfd56f00..2b2c706f3ea444 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.8.1.1", + "version": "5.8.2", "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.", "homepage": "https://github.com/Stiffstream/sobjectizer", "license": "BSD-3-Clause", diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake index d12800dce8018a..cd7c729470ef3d 100644 --- a/ports/sqlcipher/portfile.cmake +++ b/ports/sqlcipher/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sqlcipher/sqlcipher REF "v${VERSION}" - SHA512 deb592d6f27e7cc02bd641bb8f6e07b242f0dc6c7d8732e7a1e70e457eadd487add7d95c881fe9afbff516f4641a6e603473e47c63afa8396a0ddf007a5818fd + SHA512 656206cd6f8eaec15a8c409c47c1c2ca7fa3d30f3b124f89ceeff3c0c8772e0b3cc942ef93a18a4ce4dee12b1d9bd94d7e4132cea35707871fe8c08b13f87797 HEAD_REF master ) @@ -78,7 +78,7 @@ configure_file( @ONLY ) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index c1ce2b94524c62..877f9de39adb72 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlcipher", - "version": "4.5.4", + "version": "4.5.6", "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", "homepage": "https://www.zetetic.net/sqlcipher", "license": null, diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index e539df53ab0677..fca399e4223640 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -4,7 +4,7 @@ string(REGEX REPLACE "^([0-9]+),0*([0-9][0-9]),0*([0-9][0-9]),0*([0-9][0-9])," " vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2024/sqlite-autoconf-${SQLITE_VERSION}.tar.gz" FILENAME "sqlite-autoconf-${SQLITE_VERSION}.zip" - SHA512 c6bd4eaa67cada28528d1ac31aec1662c0a11048247a1bb148c1842fb0252934e2096843b56fea94bfb96c4eaaa598ec70ac31f2a5e910388f24f152b9fc4211 + SHA512 7a15feab6319d8718b0ec3fc2077f50e87bbbe0deb5689c3318d5283bbdd72e16f2b2fa8fcf9b1331d8eaffa75c479db044a3c452d1ec09744648a3930505eff ) vcpkg_extract_source_archive( diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index 72fe44ee068c03..fa5e99caac77b7 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlite3", - "version": "3.45.1", - "port-version": 1, + "version": "3.45.2", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", diff --git a/ports/theia/vcpkg.json b/ports/theia/vcpkg.json index 19788cbb3fde04..01d31a55d90446 100644 --- a/ports/theia/vcpkg.json +++ b/ports/theia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "theia", "version": "0.8", - "port-version": 9, + "port-version": 10, "description": "An open source library for multiview geometry and structure from motion", "homepage": "https://github.com/sweeneychris/TheiaSfM", "license": "BSD-3-Clause", diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index 15ee282ac5a899..1501782254b423 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/thrift REF "${VERSION}" - SHA512 f9bfaf149dde4da1f5353e540b862c2088465115564d981bf02cd89e8c1f84ca53143ca0091b63d24f8f515425d9163af52ec6122245b59810a2b98292a71650 + SHA512 5e4ee9870b30fe5ba484d39781c435716f7f3903793dc8aae96594ca813b1a5a73363b84719038ca8fa3ab8ef0a419a28410d936ff7b3bbadf36fc085a6883ae HEAD_REF master PATCHES "correct-paths.patch" diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json index 86418421a8f4c9..2d5a85464b812f 100644 --- a/ports/thrift/vcpkg.json +++ b/ports/thrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "thrift", - "version": "0.19.0", + "version": "0.20.0", "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.", "homepage": "https://github.com/apache/thrift", "license": "Apache-2.0", diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 81066f2a5ab2b8..81b966b9335258 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES on-demand TRACY_ON_DEMAND + fibers TRACY_FIBERS INVERTED_FEATURES crash-handler TRACY_NO_CRASH_HANDLER ) diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index d133f7cd99feb7..1c40d36f157856 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tracy", "version-semver": "0.10.0", - "port-version": 1, + "port-version": 2, "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", @@ -45,6 +45,9 @@ "crash-handler": { "description": "Enable crash handler" }, + "fibers": { + "description": "Enable fibers support" + }, "gui-tools": { "description": "Build Tracy GUI tool: `profiler` (aka `Tracy` executable)", "supports": "!(windows & x86)", diff --git a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake index 959055ea016ae2..e9c83e43b9e80b 100644 --- a/ports/vcpkg-tool-meson/vcpkg-port-config.cmake +++ b/ports/vcpkg-tool-meson/vcpkg-port-config.cmake @@ -41,22 +41,25 @@ if(NOT SCRIPT_MESON) FILENAME "${download_filename}" ) - file(REMOVE_RECURSE "${path_to_search}-tmp/../") - file(MAKE_DIRECTORY "${path_to_search}-tmp/../") + file(REMOVE_RECURSE "${path_to_search}") + file(REMOVE_RECURSE "${path_to_search}-tmp") + file(MAKE_DIRECTORY "${path_to_search}-tmp") file(ARCHIVE_EXTRACT INPUT "${archive_path}" - DESTINATION "${path_to_search}-tmp/../" + DESTINATION "${path_to_search}-tmp" #PATTERNS "**/mesonbuild/*" "**/*.py" ) z_vcpkg_apply_patches( - SOURCE_PATH "${path_to_search}-tmp/../meson-${ref}/" + SOURCE_PATH "${path_to_search}-tmp/meson-${ref}" PATCHES "${CMAKE_CURRENT_LIST_DIR}/adjust-args.patch" "${CMAKE_CURRENT_LIST_DIR}/meson-intl.patch" "${CMAKE_CURRENT_LIST_DIR}/adjust-python-dep.patch" "${CMAKE_CURRENT_LIST_DIR}/remove-freebsd-pcfile-specialization.patch" ) - file(COPY "${path_to_search}-tmp/../meson-${ref}/meson.py" "${path_to_search}-tmp/../meson-${ref}/mesonbuild" DESTINATION "${path_to_search}") - file(REMOVE_RECURSE "${path_to_search}-tmp/../meson-${ref}") + file(MAKE_DIRECTORY "${path_to_search}") + file(RENAME "${path_to_search}-tmp/meson-${ref}/meson.py" "${path_to_search}/meson.py") + file(RENAME "${path_to_search}-tmp/meson-${ref}/mesonbuild" "${path_to_search}/mesonbuild") + file(REMOVE_RECURSE "${path_to_search}-tmp") set(SCRIPT_MESON "${path_to_search}/meson.py") endif() diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index b4d24a4ebd557a..a0f292ed724d67 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vcpkg-tool-meson", "version": "1.3.2", + "port-version": 1, "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", diff --git a/ports/velodyne-decoder/vcpkg.json b/ports/velodyne-decoder/vcpkg.json index 7c1fe9a0a07c63..95de2e5a1bad6d 100644 --- a/ports/velodyne-decoder/vcpkg.json +++ b/ports/velodyne-decoder/vcpkg.json @@ -1,6 +1,7 @@ { "name": "velodyne-decoder", "version": "3.0.0", + "port-version": 1, "description": "A decoder library for raw Velodyne data and telemetry info", "homepage": "https://github.com/valgur/velodyne_decoder", "license": "BSD-3-Clause", @@ -16,7 +17,7 @@ }, { "name": "yaml-cpp", - "version>=": "0.7" + "version>=": "0.7.0" } ] } diff --git a/ports/vtk/pegtl.patch b/ports/vtk/pegtl.patch index 3b66d39f6660a8..bf7d77bde9d25b 100644 --- a/ports/vtk/pegtl.patch +++ b/ports/vtk/pegtl.patch @@ -58,7 +58,7 @@ diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake index 73eee02f7..22d8bc159 100644 --- a/CMake/FindPEGTL.cmake +++ b/CMake/FindPEGTL.cmake -@@ -19,31 +19,43 @@ +@@ -19,31 +19,46 @@ # Copyright (c) 2009 Benoit Jacob # Redistribution and use is allowed according to the terms of the 2-clause BSD license. @@ -71,7 +71,10 @@ index 73eee02f7..22d8bc159 100644 +find_package(PEGTL CONFIG REQUIRED) +if(TARGET taocpp::pegtl) + message(STATUS "Searching for PEGTL - found target taocpp::pegtl") -+ set_target_properties(taocpp::pegtl PROPERTIES IMPORTED_GLOBAL TRUE) ++ get_target_property(TARGET_IMPORTED_GLOBAL taocpp::pegtl IMPORTED_GLOBAL) ++ if(NOT TARGET_IMPORTED_GLOBAL) ++ set_target_properties(taocpp::pegtl PROPERTIES IMPORTED_GLOBAL TRUE) ++ endif() + if(NOT TARGET PEGTL::PEGTL) + add_library(PEGTL::PEGTL IMPORTED INTERFACE) + target_link_libraries(PEGTL::PEGTL INTERFACE taocpp::pegtl) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 79cec81ca488dc..7a14688316d7fb 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.2.0-pv5.11.0", - "port-version": 10, + "port-version": 11, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake index 807e9aea151f64..59c25432eb6087 100644 --- a/ports/wolfssl/portfile.cmake +++ b/ports/wolfssl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolfssl - REF v5.6.6-stable - SHA512 d664ab1cd84d7c33d1b34eb934843292b7ffc07b922b4c483b45deeeeda5c425b673640e3049f731bfff364bd7e7c0c14e236afce36622a7d03242d3be0c7382 + REF v5.7.0-stable + SHA512 52cc7bdda7e3cfbea7c60fad1e2b1565d7057607bbb66014ef03643a75e78777d10d53799fba314bab37e245b7e8a60e29c6f4177070ed44536a898e04b27b44 HEAD_REF master PATCHES ) diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json index 3b72985a862c48..1987efb5bb5594 100644 --- a/ports/wolfssl/vcpkg.json +++ b/ports/wolfssl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wolfssl", - "version": "5.6.6", + "version": "5.7.0", "description": "TLS and Cryptographic library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/ports/xaudio2redist/portfile.cmake b/ports/xaudio2redist/portfile.cmake index 9c8151904d7046..5d7be988b75ba7 100644 --- a/ports/xaudio2redist/portfile.cmake +++ b/ports/xaudio2redist/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} + set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) vcpkg_download_distfile(ARCHIVE @@ -17,21 +17,32 @@ file(GLOB HEADER_FILES "${PACKAGE_PATH}/build/native/include/*.h") file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") set(lib_suffix "_md") else() file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") set(lib_suffix "") endif() -file(COPY "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -file(COPY "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +file(INSTALL "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + +if(NOT DEFINED VCPKG_BUILD_TYPE) + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + else() + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + + file(INSTALL "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() -file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/xaudio2redist-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" + @ONLY) -configure_file("${CMAKE_CURRENT_LIST_DIR}/xaudio2redist-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt") diff --git a/ports/xaudio2redist/usage b/ports/xaudio2redist/usage new file mode 100644 index 00000000000000..6c0f1c23f77974 --- /dev/null +++ b/ports/xaudio2redist/usage @@ -0,0 +1,4 @@ +The XAudio2 redistributable package provides CMake targets + + find_package(xaudio2redist CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::XAudio2Redist) diff --git a/ports/xaudio2redist/vcpkg.json b/ports/xaudio2redist/vcpkg.json index 6e703249c2fdf7..73ff55325c09bf 100644 --- a/ports/xaudio2redist/vcpkg.json +++ b/ports/xaudio2redist/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xaudio2redist", "version": "1.2.11", - "port-version": 1, + "port-version": 2, "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", "documentation": "https://aka.ms/XAudio2Redist", diff --git a/ports/xaudio2redist/xaudio2redist-config.cmake.in b/ports/xaudio2redist/xaudio2redist-config.cmake.in index 033e2f6b01a51a..4829ec4947f33d 100644 --- a/ports/xaudio2redist/xaudio2redist-config.cmake.in +++ b/ports/xaudio2redist/xaudio2redist-config.cmake.in @@ -1,6 +1,5 @@ -get_filename_component(_xaudio2_root "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_xaudio2_root "${_xaudio2_root}" PATH) +get_filename_component(_xaudio2_root "${CMAKE_CURRENT_LIST_DIR}" PATH) get_filename_component(_xaudio2_root "${_xaudio2_root}" PATH) set(_xaudio2_root_lib "${_xaudio2_root}/lib/xaudio2_9redist.lib") diff --git a/ports/xmlsec/portfile.cmake b/ports/xmlsec/portfile.cmake index eb879f938f0f74..63a55734aad514 100644 --- a/ports/xmlsec/portfile.cmake +++ b/ports/xmlsec/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lsh123/xmlsec REF "${release_tag}" - SHA512 c7b867edc23cb6cf08228f9737fc50e3bd08ac7baedc43e26d3cfd113ea54256ff357335b23aea7b5e49cd24809c3de9da1c9314eb5ab90727aa821530b72ef8 + SHA512 32f297fe47c1b79fb8b58dd12ce49aacb408c9361c140567eda6a49e892025fc227efdc7f85c12fe36b79e658e26ee7b0a1fd770bd6ee5b20e4aa5f9fd0e5288 HEAD_REF master PATCHES pkgconfig_fixes.patch diff --git a/ports/xmlsec/vcpkg.json b/ports/xmlsec/vcpkg.json index 17faf2ef15790b..3fd5016fa7fa53 100644 --- a/ports/xmlsec/vcpkg.json +++ b/ports/xmlsec/vcpkg.json @@ -1,7 +1,6 @@ { "name": "xmlsec", - "version": "1.3.1", - "port-version": 2, + "version": "1.3.3", "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", "homepage": "https://www.aleksey.com/xmlsec/", "license": "X11 AND MPL-1.1", diff --git a/ports/zziplib/export-targets.patch b/ports/zziplib/export-targets.patch deleted file mode 100644 index 7d6bea4e20f6b4..00000000000000 --- a/ports/zziplib/export-targets.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt -index 1883272..16d4380 100644 ---- a/zzip/CMakeLists.txt -+++ b/zzip/CMakeLists.txt -@@ -175,7 +175,7 @@ set(libzzipmmapped_HDRS mmapped.h memdisk.h) - - add_library(libzzip ${libzzip_SRCS} ) - target_link_libraries(libzzip ZLIB::ZLIB ) --target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) -+target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} PUBLIC "$") - - if(ZZIPFSEEKO) - add_library(libzzipfseeko ${libzzipfseeko_SRCS} ) -@@ -255,14 +255,14 @@ install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko - endif() - - install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) --install(TARGETS libzzip -+install(TARGETS libzzip EXPORT unofficial-zziplibTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(ZZIPFSEEKO) - install(FILES ${libzzipfseeko_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) --install(TARGETS libzzipfseeko -+install(TARGETS libzzipfseeko EXPORT unofficial-zziplibTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -@@ -270,12 +270,28 @@ endif() - - if(ZZIPMMAPPED) - install(FILES ${libzzipmmapped_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) --install(TARGETS libzzipmmapped -+install(TARGETS libzzipmmapped EXPORT unofficial-zziplibTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - -+install(EXPORT unofficial-zziplibTargets -+ NAMESPACE unofficial::zziplib:: -+ DESTINATION share/unofficial-zziplib -+) -+ -+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in" -+[[include(CMakeFindDependencyMacro) -+find_dependency(ZLIB) -+file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/*Targets.cmake") -+foreach (TARGET_FILE ${TARGET_FILES}) -+ include("${TARGET_FILE}") -+endforeach() -+]]) -+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake" @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake DESTINATION share/unofficial-zziplib) -+ - if(ZZIP_COMPAT) - install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt -index ea7ea93..2d41f70 100644 ---- a/zzipwrap/CMakeLists.txt -+++ b/zzipwrap/CMakeLists.txt -@@ -83,7 +83,7 @@ install(FILES ${outdir}/zzipwrap.pc - endif() - - install(FILES ${libzzipwrap_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) --install(TARGETS libzzipwrap -+install(TARGETS libzzipwrap EXPORT unofficial-zziplibTargets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake index 5ed79da3c05977..d5522e5f093fd3 100644 --- a/ports/zziplib/portfile.cmake +++ b/ports/zziplib/portfile.cmake @@ -1,39 +1,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gdraheim/zziplib - REF v0.13.72 - SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 + REF "v${VERSION}" + SHA512 95557147d374d0e9074b83319350db9085b8ae98ff7cf7ab96a3209564597744252504adfaf4d17b0243ffb118adf2afabe7dd736e6514a7e74360cd0955e4f5 PATCHES no-release-postfix.patch - export-targets.patch ) string(COMPARE EQUAL VCPKG_CRT_LINKAGE "static" MSVC_STATIC_RUNTIME) string(COMPARE EQUAL VCPKG_LIBRARY_LINKAGE "static" BUILD_STATIC_LIBS) -# on Windows hosts, the UnixCommands are not available; disable options that use them -if(VCPKG_HOST_IS_WINDOWS) - set(ZZIPLIB_OPTIONS "-DZZIP_COMPAT=OFF;-DZZIP_PKGCONFIG=OFF") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" - -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME} - -DZZIPMMAPPED=OFF + -DZZIP_COMPAT=OFF + -DZZIP_LIBLATEST=OFF + -DZZIP_LIBTOOL=OFF + -DZZIP_TESTCVE=OFF + -DZZIPBINS=OFF + -DZZIPDOCS=OFF -DZZIPFSEEKO=OFF - -DZZIPWRAP=OFF + -DZZIPMMAPPED=OFF -DZZIPSDL=OFF - -DZZIPBINS=OFF -DZZIPTEST=OFF - -DZZIPDOCS=OFF - ${ZZIPLIB_OPTIONS} + -DZZIPWRAP=OFF ) vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-zziplib) +vcpkg_cmake_config_fixup(PACKAGE_NAME zziplib) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" @@ -43,19 +39,16 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipmmapped.pc" ) -vcpkg_fixup_pkgconfig() +file(STRINGS "${CURRENT_PACKAGES_DIR}/include/zzip/_config.h" have_stdint_h REGEX "^#define ZZIP_HAVE_STDINT_H 1") +if(have_stdint_h) + file(REMOVE "${CURRENT_PACKAGES_DIR}/include/zzip/stdint.h") +endif() -file(READ "${SOURCE_PATH}/docs/COPYING.LIB" lgpl) -file(READ "${SOURCE_PATH}/docs/COPYING.MPL" mpl) -file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" -"${PORT} is shipping under a dual MPL / LGPL license where each of them +vcpkg_install_copyright(COMMENT [[ +zziplib is shipping under a dual MPL / LGPL license where each of them is separate and restrictions apply alternatively. - ---- - -${lgpl} - ---- - -${mpl} -") +]] + FILE_LIST + "${SOURCE_PATH}/docs/COPYING.LIB" + "${SOURCE_PATH}/docs/COPYING.MPL" +) diff --git a/ports/zziplib/vcpkg.json b/ports/zziplib/vcpkg.json index a5766847ef7da3..57494121c1a4d9 100644 --- a/ports/zziplib/vcpkg.json +++ b/ports/zziplib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zziplib", - "version": "0.13.72", - "port-version": 3, + "version": "0.13.73", "description": "library providing read access on ZIP-archives", "homepage": "https://github.com/gdraheim/zziplib", "license": "LGPL-2.0-or-later OR MPL-1.1", diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index adbf1241900126..2a5ff462557bf1 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry" -FROM ubuntu:focal-20240123 +FROM ubuntu:focal-20240216 ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip @@ -13,10 +13,10 @@ ENV APT_PACKAGES="git curl zip unzip tar" ## Common build prereqs ENV APT_PACKAGES="$APT_PACKAGES g++ vim pkg-config cmake ca-certificates" -ENV APT_PACKAGES="$APT_PACKAGES autoconf nasm bison python2 flex build-essential libtool libtool-bin gettext automake autoconf-archive" +ENV APT_PACKAGES="$APT_PACKAGES autoconf nasm bison python2 flex build-essential libtool libtool-bin libltdl-dev gettext automake autoconf-archive" ## Python related -ENV APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-pip python3-venv" +ENV APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-pip python3-venv python3-mako python3-jinja2" ## freeglut ENV APT_PACKAGES="$APT_PACKAGES libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev" diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 4290e6e4222d3a..b5b8692d4f5b6c 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -3,10 +3,10 @@ # variables: linux-pool: 'PrLin-1ES-Pool' - windows-pool: 'PrWin-2024-02-16' + windows-pool: 'PrWin-1ES' osx-pool: 'PrOsx-2024-01-18' osx-arm64-pool: 'PrOsx-2024-01-22-arm64' - linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-02-14' + linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-03-14' parameters: - name: vcpkgToolSha diff --git a/scripts/azure-pipelines/create-vmss-helpers.psm1 b/scripts/azure-pipelines/create-vmss-helpers.psm1 index 8ebe8070ef7127..96ceb066d56f5c 100755 --- a/scripts/azure-pipelines/create-vmss-helpers.psm1 +++ b/scripts/azure-pipelines/create-vmss-helpers.psm1 @@ -55,60 +55,6 @@ function Find-ResourceGroupName { return $result } -<# -.SYNOPSIS -Returns whether there's a name collision for an image in the resource group. - -.DESCRIPTION -Find-ImageNameCollision takes a list of images, and checks if $Test -collides names with any of the image names. - -.PARAMETER Test -The name to test. - -.PARAMETER Images -The list of images. -#> -function Find-ImageNameCollision { - [CmdletBinding()] - Param([string]$Test, $Images) - - foreach ($resource in $Images) { - if ($resource.Name -eq $Test) { - return $true - } - } - - return $false -} - -<# -.SYNOPSIS -Attempts to find a name that does not collide with any images in the resource group. - -.DESCRIPTION -Find-ResourceGroupName takes a set of resources from Get-AzResourceGroup, and finds the -first name in {$Prefix, $Prefix-1, $Prefix-2, ...} such that the name doesn't collide with -any of the resources in the resource group. - -.PARAMETER Prefix -The prefix of the final name; the returned name will be of the form "$Prefix(-[1-9][0-9]*)?" -#> -function Find-ImageName { - [CmdLetBinding()] - Param([string]$ResourceGroupName, [string]$Prefix) - - $images = Get-AzImage -ResourceGroupName $ResourceGroupName - $result = $Prefix - $suffix = 0 - while (Find-ImageNameCollision -Test $result -Images $images) { - $suffix++ - $result = "$Prefix-$suffix" - } - - return $result -} - <# .SYNOPSIS Generates a random password. @@ -233,6 +179,20 @@ function Create-LockedDownNetwork { [string]$Location ) + $publicIp = New-AzPublicIpAddress ` + -Name "$ResourceGroupName-ip" ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Sku 'Standard' ` + -AllocationMethod 'Static' + + $natGateway = New-AzNatGateway ` + -Name "$ResourceGroupName-nat" ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Sku 'Standard' ` + -PublicIpAddress $publicIp + $allFirewallRules = @() $allFirewallRules += New-AzNetworkSecurityRuleConfig ` @@ -307,7 +267,8 @@ function Create-LockedDownNetwork { -Name $SubnetName ` -AddressPrefix "10.0.0.0/16" ` -NetworkSecurityGroup $NetworkSecurityGroup ` - -ServiceEndpoint "Microsoft.Storage" + -ServiceEndpoint "Microsoft.Storage" ` + -NatGateway $natGateway $VirtualNetworkName = $ResourceGroupName + 'Network' $VirtualNetwork = New-AzVirtualNetwork ` @@ -344,7 +305,6 @@ function Invoke-AzVMRunCommandWithRetries { } Export-ModuleMember -Function Find-ResourceGroupName -Export-ModuleMember -Function Find-ImageName Export-ModuleMember -Function New-Password Export-ModuleMember -Function Wait-Shutdown Export-ModuleMember -Function Sanitize-Name diff --git a/scripts/azure-pipelines/linux/managed-image.json b/scripts/azure-pipelines/linux/managed-image.json index 1f4696f1edefd1..d9075eb08e9e0d 100644 --- a/scripts/azure-pipelines/linux/managed-image.json +++ b/scripts/azure-pipelines/linux/managed-image.json @@ -3,7 +3,7 @@ { "name": "linux-install-packages", "parameters": { - "packages": "git curl zip unzip tar at libxt-dev gperf libxaw7-dev cifs-utils build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full pkg-config meson nasm cmake ninja-build libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-dri3-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-cursor-dev libkrb5-dev libxcb-res0-dev libxcb-keysyms1-dev libxcb-xkb-dev libxcb-record0-dev python3-setuptools python3-mako python3-pip python3-venv nodejs libwayland-dev python-is-python3 guile-2.2-dev libxdamage-dev libdbus-1-dev libxtst-dev haskell-stack golang-go wayland-protocols" + "packages": "git curl zip unzip tar at libxt-dev gperf libxaw7-dev cifs-utils build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin libltdl-dev flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full pkg-config meson nasm cmake ninja-build libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-dri3-dev libxcb-present-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-cursor-dev libkrb5-dev libxcb-res0-dev libxcb-keysyms1-dev libxcb-xkb-dev libxcb-record0-dev python3-setuptools python3-mako python3-pip python3-venv python3-jinja2 nodejs libwayland-dev python-is-python3 guile-2.2-dev libxdamage-dev libdbus-1-dev libxtst-dev haskell-stack golang-go wayland-protocols libbluetooth-dev" } }, { diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index ddcfbddba42c67..b2e8d888c961c8 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -31,7 +31,7 @@ APT_PACKAGES="git curl zip unzip tar" APT_PACKAGES="$APT_PACKAGES at libxt-dev gperf libxaw7-dev cifs-utils \ build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev \ libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \ - libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin \ + libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin libltdl-dev \ flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ pkg-config meson nasm cmake ninja-build" @@ -59,10 +59,10 @@ APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" APT_PACKAGES="$APT_PACKAGES libxcb-keysyms1-dev libxcb-xkb-dev libxcb-record0-dev" ## required by mesa -APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako libxcb-dri3-dev" +APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako libxcb-dri3-dev libxcb-present-dev" ## required by some packages to install additional python packages -APT_PACKAGES="$APT_PACKAGES python3-pip python3-venv" +APT_PACKAGES="$APT_PACKAGES python3-pip python3-venv python3-jinja2" ## required by qtwebengine APT_PACKAGES="$APT_PACKAGES nodejs" @@ -94,6 +94,9 @@ APT_PACKAGES="$APT_PACKAGES golang-go" ## required by libdecor and mesa APT_PACKAGES="$APT_PACKAGES wayland-protocols" +## required by robotraconteur +APT_PACKAGES="$APT_PACKAGES libbluetooth-dev" + ## CUDA APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-1 cuda-libraries-dev-12-1 cuda-driver-dev-12-1 \ cuda-cudart-dev-12-1 libcublas-12-1 libcurand-dev-12-1 cuda-nvml-dev-12-1 libcudnn8-dev libnccl2 \ diff --git a/scripts/azure-pipelines/windows/create-image.ps1 b/scripts/azure-pipelines/windows/create-image.ps1 index ad08615895aae0..68f7afddbe7668 100644 --- a/scripts/azure-pipelines/windows/create-image.ps1 +++ b/scripts/azure-pipelines/windows/create-image.ps1 @@ -15,39 +15,29 @@ or are running from Azure Cloud Shell. #> $Location = 'westus3' -$Prefix = 'Win-' -$Prefix += (Get-Date -Format 'yyyy-MM-dd') +$DatePrefixComponent = Get-Date -Format 'yyyy-MM-dd' +$Prefix = "Win-$DatePrefixComponent" +$GalleryImageVersion = $DatePrefixComponent.Replace('-','.') $VMSize = 'Standard_D8ads_v5' $ProtoVMName = 'PROTOTYPE' $WindowsServerSku = '2022-datacenter-azure-edition' $ErrorActionPreference = 'Stop' -$CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-8.8.1.3_cuda12-archive.zip' $ProgressActivity = 'Creating Windows Image' -$TotalProgress = 18 +$TotalProgress = 17 $CurrentProgress = 1 -Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking +# Assigning this to another variable helps when running the commands in this script manually for +# debugging +$Root = $PSScriptRoot -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating resource group' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) +Import-Module "$Root/../create-vmss-helpers.psm1" -DisableNameChecking -Force -$ResourceGroupName = Find-ResourceGroupName $Prefix $AdminPW = New-Password -New-AzResourceGroup -Name $ResourceGroupName -Location $Location $AdminPWSecure = ConvertTo-SecureString $AdminPW -AsPlainText -Force $Credential = New-Object System.Management.Automation.PSCredential ("AdminUser", $AdminPWSecure) -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating virtual network' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location +$VirtualNetwork = Get-AzVirtualNetwork -ResourceGroupName 'vcpkg-image-minting' -Name 'vcpkg-image-mintingNetwork' #################################################################################################### Write-Progress ` @@ -55,14 +45,15 @@ Write-Progress ` -Status 'Creating prototype VM' ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) -$NicName = $ResourceGroupName + 'NIC' +$NicName = $Prefix + 'NIC' $Nic = New-AzNetworkInterface ` -Name $NicName ` - -ResourceGroupName $ResourceGroupName ` + -ResourceGroupName 'vcpkg-image-minting' ` -Location $Location ` - -Subnet $VirtualNetwork.Subnets[0] + -Subnet $VirtualNetwork.Subnets[0] ` + -EnableAcceleratedNetworking -$VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -SecurityType Standard +$VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -SecurityType TrustedLaunch -IdentityType SystemAssigned $VM = Set-AzVMOperatingSystem ` -VM $VM ` -Windows ` @@ -81,10 +72,27 @@ $VM = Set-AzVMSourceImage ` $VM = Set-AzVMBootDiagnostic -VM $VM -Disable New-AzVm ` - -ResourceGroupName $ResourceGroupName ` + -ResourceGroupName 'vcpkg-image-minting' ` -Location $Location ` -VM $VM +$VMCreated = Get-AzVM -ResourceGroupName 'vcpkg-image-minting' -Name $ProtoVMName +$VMCreatedOsDisk = $VMCreated.StorageProfile.OsDisk.Name + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Granting permissions to use vcpkg-image-minting storage account' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$VcpkgImageMintingAccount = Get-AzStorageAccount -ResourceGroupName 'vcpkg-image-minting' -Name 'vcpkgimageminting' + +# Grant 'Storage Blob Data Reader' (RoleDefinitionId 2a2b9908-6ea1-4ae2-8e65-a410df84e7d1) to the VM +New-AzRoleAssignment ` + -Scope $VcpkgImageMintingAccount.ID ` + -RoleDefinitionId '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1' ` + -ObjectId $VMCreated.Identity.PrincipalId + #################################################################################################### Write-Progress ` -Activity $ProgressActivity ` @@ -92,10 +100,10 @@ Write-Progress ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) $ProvisionImageResult = Invoke-AzVMRunCommandWithRetries ` - -ResourceGroupName $ResourceGroupName ` + -ResourceGroupName 'vcpkg-image-minting' ` -VMName $ProtoVMName ` -CommandId 'RunPowerShellScript' ` - -ScriptPath "$PSScriptRoot\deploy-tlssettings.ps1" + -ScriptPath "$Root\deploy-tlssettings.ps1" Write-Host "deploy-tlssettings.ps1 output: $($ProvisionImageResult.value.Message)" Write-Host 'Waiting 1 minute for VM to reboot...' @@ -108,10 +116,10 @@ Write-Progress ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) $DeployPsExecResult = Invoke-AzVMRunCommandWithRetries ` - -ResourceGroupName $ResourceGroupName ` + -ResourceGroupName 'vcpkg-image-minting' ` -VMName $ProtoVMName ` -CommandId 'RunPowerShellScript' ` - -ScriptPath "$PSScriptRoot\deploy-psexec.ps1" + -ScriptPath "$Root\deploy-psexec.ps1" Write-Host "deploy-psexec.ps1 output: $($DeployPsExecResult.value.Message)" @@ -119,8 +127,7 @@ Write-Host "deploy-psexec.ps1 output: $($DeployPsExecResult.value.Message)" function Invoke-ScriptWithPrefix { param( [string]$ScriptName, - [switch]$AddAdminPw, - [string]$CudnnUrl + [switch]$AddAdminPw ) Write-Progress ` @@ -128,20 +135,16 @@ function Invoke-ScriptWithPrefix { -Status "Running provisioning script $ScriptName in VM" ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - $DropToAdminUserPrefix = Get-Content "$PSScriptRoot\drop-to-admin-user-prefix.ps1" -Encoding utf8NoBOM -Raw - $UtilityPrefixContent = Get-Content "$PSScriptRoot\utility-prefix.ps1" -Encoding utf8NoBOM -Raw + $DropToAdminUserPrefix = Get-Content "$Root\drop-to-admin-user-prefix.ps1" -Encoding utf8NoBOM -Raw + $UtilityPrefixContent = Get-Content "$Root\utility-prefix.ps1" -Encoding utf8NoBOM -Raw - $tempScriptFilename = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() + ".txt" + $tempScriptFilename = "$env:TEMP\temp-script.txt" try { - $script = Get-Content "$PSScriptRoot\$ScriptName" -Encoding utf8NoBOM -Raw + $script = Get-Content "$Root\$ScriptName" -Encoding utf8NoBOM -Raw if ($AddAdminPw) { $script = $script.Replace('# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1', $DropToAdminUserPrefix) } - if (-Not ([string]::IsNullOrWhiteSpace($CudnnUrl))) { - $script = $script.Replace('# REPLACE WITH $CudnnUrl', "`$CudnnUrl = '$CudnnUrl'") - } - $script = $script.Replace('# REPLACE WITH UTILITY-PREFIX.ps1', $UtilityPrefixContent); Set-Content -Path $tempScriptFilename -Value $script -Encoding utf8NoBOM @@ -151,7 +154,7 @@ function Invoke-ScriptWithPrefix { } $InvokeResult = Invoke-AzVMRunCommandWithRetries ` - -ResourceGroupName $ResourceGroupName ` + -ResourceGroupName 'vcpkg-image-minting' ` -VMName $ProtoVMName ` -CommandId 'RunPowerShellScript' ` -ScriptPath $tempScriptFilename ` @@ -163,6 +166,9 @@ function Invoke-ScriptWithPrefix { } } +Invoke-ScriptWithPrefix -ScriptName 'deploy-azcopy.ps1' + +#################################################################################################### Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-sdks.ps1' -AddAdminPw #################################################################################################### @@ -172,27 +178,7 @@ Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw Invoke-ScriptWithPrefix -ScriptName 'deploy-mpi.ps1' -AddAdminPw #################################################################################################### -$StorageAccountKeys = Get-AzStorageAccountKey ` - -ResourceGroupName 'vcpkg-image-minting' ` - -Name 'vcpkgimageminting' - -$StorageContext = New-AzStorageContext ` - -StorageAccountName 'vcpkgimageminting' ` - -StorageAccountKey $StorageAccountKeys[0].Value - -$StartTime = [DateTime]::Now -$ExpiryTime = $StartTime.AddDays(1) - -$SetupSasToken = New-AzStorageAccountSASToken ` - -Service Blob ` - -Permission "r" ` - -Context $StorageContext ` - -StartTime $StartTime ` - -ExpiryTime $ExpiryTime ` - -ResourceType Object ` - -Protocol HttpsOnly - -Invoke-ScriptWithPrefix -ScriptName 'deploy-cuda.ps1' -AddAdminPw -CudnnUrl ($CudnnBaseUrl + $SetupSasToken) +Invoke-ScriptWithPrefix -ScriptName 'deploy-cuda.ps1' -AddAdminPw #################################################################################################### Invoke-ScriptWithPrefix -ScriptName 'deploy-inteloneapi.ps1' -AddAdminPw @@ -207,13 +193,13 @@ Write-Progress ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) $ProvisionImageResult = Invoke-AzVMRunCommandWithRetries ` - -ResourceGroupName $ResourceGroupName ` + -ResourceGroupName 'vcpkg-image-minting' ` -VMName $ProtoVMName ` -CommandId 'RunPowerShellScript' ` - -ScriptPath "$PSScriptRoot\deploy-settings.txt" + -ScriptPath "$Root\deploy-settings.txt" Write-Host "deploy-settings.txt output: $($ProvisionImageResult.value.Message)" -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +Restart-AzVM -ResourceGroupName 'vcpkg-image-minting' -Name $ProtoVMName #################################################################################################### Write-Progress ` @@ -222,10 +208,10 @@ Write-Progress ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) $SysprepResult = Invoke-AzVMRunCommandWithRetries ` - -ResourceGroupName $ResourceGroupName ` + -ResourceGroupName 'vcpkg-image-minting' ` -VMName $ProtoVMName ` -CommandId 'RunPowerShellScript' ` - -ScriptPath "$PSScriptRoot\sysprep.ps1" + -ScriptPath "$Root\sysprep.ps1" Write-Host "sysprep.ps1 output: $($SysprepResult.value.Message)" @@ -235,7 +221,7 @@ Write-Progress ` -Status 'Waiting for VM to shut down' ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) -Wait-Shutdown -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +Wait-Shutdown -ResourceGroupName 'vcpkg-image-minting' -Name $ProtoVMName #################################################################################################### Write-Progress ` @@ -244,19 +230,25 @@ Write-Progress ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) Stop-AzVM ` - -ResourceGroupName $ResourceGroupName ` + -ResourceGroupName 'vcpkg-image-minting' ` -Name $ProtoVMName ` -Force Set-AzVM ` - -ResourceGroupName $ResourceGroupName ` + -ResourceGroupName 'vcpkg-image-minting' ` -Name $ProtoVMName ` -Generalized -$VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName -$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -HyperVGeneration V2 -$ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix -New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting' +New-AzGalleryImageVersion ` + -ResourceGroupName 'vcpkg-image-minting' ` + -GalleryName 'vcpkg_gallery_wus3' ` + -GalleryImageDefinitionName 'PrWinWus3-TrustedLaunch' ` + -Name $GalleryImageVersion ` + -Location $Location ` + -SourceImageId $VMCreated.ID ` + -ReplicaCount 1 ` + -StorageAccountType 'Premium_LRS' ` + -PublishingProfileExcludeFromLatest #################################################################################################### Write-Progress ` @@ -264,9 +256,16 @@ Write-Progress ` -Status 'Deleting unused temporary resources' ` -PercentComplete (100 / $TotalProgress * $CurrentProgress++) -Remove-AzResourceGroup $ResourceGroupName -Force +Remove-AzRoleAssignment ` + -Scope $VcpkgImageMintingAccount.ID ` + -RoleDefinitionId '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1' ` + -ObjectId $VMCreated.Identity.PrincipalId + +Remove-AzVM -Id $VMCreated.ID -Force +Remove-AzDisk -ResourceGroupName 'vcpkg-image-minting' -Name $VMCreatedOsDisk -Force +Remove-AzNetworkInterface -ResourceGroupName 'vcpkg-image-minting' -Name $NicName -Force #################################################################################################### Write-Progress -Activity $ProgressActivity -Completed -Write-Host "Generated Image: $ImageName" +Write-Host "Generated Image: $GalleryImageVersion" Write-Host 'Finished!' diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1 deleted file mode 100644 index 5b873661117b8e..00000000000000 --- a/scripts/azure-pipelines/windows/create-vmss.ps1 +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright (c) Microsoft Corporation. -# SPDX-License-Identifier: MIT -# - -<# -.SYNOPSIS -Creates a Windows virtual machine scale set, set up for vcpkg's CI. - -.DESCRIPTION -create-vmss.ps1 creates an Azure Windows VM scale set, set up for vcpkg's CI -system. See https://docs.microsoft.com/en-us/azure/virtual-machine-scale-sets/overview -for more information. - -This script assumes you have installed Azure tools into PowerShell by following the instructions -at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1 -or are running from Azure Cloud Shell. - -.PARAMETER ImageName -The name of the image to deploy into the scale set. -#> - -[CmdLetBinding()] -Param( - [parameter(Mandatory=$true)] - [string]$ImageName -) - -$Location = 'westus3' -$Prefix = 'PrWin-' -$Prefix += (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D32ads_v5' -$LiveVMPrefix = 'BUILD' -$ErrorActionPreference = 'Stop' - -Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking - -$ResourceGroupName = Find-ResourceGroupName $Prefix -$AdminPW = New-Password -$Image = Get-AzImage -ResourceGroupName 'vcpkg-image-minting' -ImageName $ImageName - -New-AzResourceGroup -Name $ResourceGroupName -Location $Location - -$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location -$VmssIpConfigName = $ResourceGroupName + 'VmssIpConfig' -$VmssIpConfig = New-AzVmssIpConfig -SubnetId $VirtualNetwork.Subnets[0].Id -Primary -Name $VmssIpConfigName -$VmssName = $ResourceGroupName + 'Vmss' -$Vmss = New-AzVmssConfig ` - -Location $Location ` - -SkuCapacity 0 ` - -SkuName $VMSize ` - -SkuTier 'Standard' ` - -Overprovision $false ` - -UpgradePolicyMode Automatic ` - -EvictionPolicy Delete ` - -Priority Spot ` - -MaxPrice -1 ` - -SecurityType Standard - -$NicName = $ResourceGroupName + 'NIC' -New-AzNetworkInterface ` - -Name $NicName ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -Subnet $VirtualNetwork.Subnets[0] - -$Vmss = Add-AzVmssNetworkInterfaceConfiguration ` - -VirtualMachineScaleSet $Vmss ` - -Primary $true ` - -IpConfiguration $VmssIpConfig ` - -NetworkSecurityGroupId $VirtualNetwork.Subnets[0].NetworkSecurityGroup.Id ` - -Name $NicName - -$Vmss = Set-AzVmssOsProfile ` - -VirtualMachineScaleSet $Vmss ` - -ComputerNamePrefix $LiveVMPrefix ` - -AdminUsername 'AdminUser' ` - -AdminPassword $AdminPW ` - -WindowsConfigurationProvisionVMAgent $true ` - -WindowsConfigurationEnableAutomaticUpdate $false - -$Vmss = Set-AzVmssStorageProfile ` - -VirtualMachineScaleSet $Vmss ` - -OsDiskCreateOption 'FromImage' ` - -OsDiskCaching ReadOnly ` - -DiffDiskSetting Local ` - -ImageReferenceId $Image.Id - -$Vmss = Set-AzVmssBootDiagnostic ` - -VirtualMachineScaleSet $Vmss ` - -Enabled $false - -$VmssCreated = New-AzVmss ` - -ResourceGroupName $ResourceGroupName ` - -Name $VmssName ` - -VirtualMachineScaleSet $Vmss - -# Grant 'Virtual Machine Contributor' (RoleDefinitionId 9980e02c-c2be-4d73-94e8-173b1dc7cf3c) to -# 'dev-azure-com-vcpkg-scale-set-management' (ObjectId e4fe677f-f905-4f3c-b5c3-d8a2d6812a5b) -New-AzRoleAssignment ` - -Scope $VmssCreated.Id ` - -RoleDefinitionId '9980e02c-c2be-4d73-94e8-173b1dc7cf3c' ` - -ObjectId 'e4fe677f-f905-4f3c-b5c3-d8a2d6812a5b' - -Write-Host "Location: $Location" -Write-Host "Resource group name: $ResourceGroupName" -Write-Host 'Finished!' diff --git a/scripts/azure-pipelines/windows/deploy-azcopy.ps1 b/scripts/azure-pipelines/windows/deploy-azcopy.ps1 new file mode 100644 index 00000000000000..4d1eb9b660d9d0 --- /dev/null +++ b/scripts/azure-pipelines/windows/deploy-azcopy.ps1 @@ -0,0 +1,4 @@ +$azcopyZipPath = "$PSScriptRoot\azcopyv10.zip" +& curl.exe -L -o $azcopyZipPath 'https://azcopyvnext.azureedge.net/releases/release-10.23.0-20240129/azcopy_windows_amd64_10.23.0.zip' +Expand-Archive -LiteralPath $azcopyZipPath -DestinationPath $env:PROGRAMFILES +Remove-Item -LiteralPath $azcopyZipPath -Force diff --git a/scripts/azure-pipelines/windows/deploy-cuda.ps1 b/scripts/azure-pipelines/windows/deploy-cuda.ps1 index 42f292a5bc62cb..a3249d06c9e0bc 100644 --- a/scripts/azure-pipelines/windows/deploy-cuda.ps1 +++ b/scripts/azure-pipelines/windows/deploy-cuda.ps1 @@ -5,7 +5,9 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -# REPLACE WITH $CudnnUrl +# If you are running this script outside of our Azure VMs, you will need to download cudnn from NVIDIA and place +# it next to this script. +$CudnnUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-8.8.1.3_cuda12-archive.zip' $CudnnLocalZipPath = "$PSScriptRoot\cudnn-windows-x86_64-8.8.1.3_cuda12-archive.zip" @@ -82,16 +84,16 @@ catch { } try { - if ([string]::IsNullOrWhiteSpace($CudnnUrl)) { - if (-Not (Test-Path $CudnnLocalZipPath)) { - throw "CUDNN zip ($CudnnLocalZipPath) was missing, please download from NVidia and place next to this script." - } - + if (Test-Path $CudnnLocalZipPath) { $cudnnZipPath = $CudnnLocalZipPath } else { - Write-Host 'Downloading CUDNN...' + Write-Host 'Attempting to download cudnn. If this fails, you need to agree to NVidia''s EULA, download cudnn, and place it next to this script.' $cudnnZipPath = Get-TempFilePath -Extension 'zip' - curl.exe -L -o $cudnnZipPath -s -S $CudnnUrl + $env:AZCOPY_AUTO_LOGIN_TYPE = 'MSI' + & "$env:PROGRAMFILES\azcopy_windows_amd64_10.23.0\azcopy.exe" copy $CudnnUrl $cudnnZipPath + if ($LASTEXITCODE -ne 0) { + throw 'Failed to download cudnn!' + } } Write-Host "Installing CUDNN to $destination..." diff --git a/scripts/azure-pipelines/windows/provision-entire-image.ps1 b/scripts/azure-pipelines/windows/provision-entire-image.ps1 index 00c2d28cac0068..80062dd7977b15 100644 --- a/scripts/azure-pipelines/windows/provision-entire-image.ps1 +++ b/scripts/azure-pipelines/windows/provision-entire-image.ps1 @@ -4,6 +4,7 @@ . "$PSScriptRoot\utility-prefix.ps1" . "$PSScriptRoot\deploy-tlssettings.ps1" -RebootIfRequired 0 +. "$PSScriptRoot\deploy-azcopy.ps1" . "$PSScriptRoot\deploy-windows-sdks.ps1" . "$PSScriptRoot\deploy-visual-studio.ps1" . "$PSScriptRoot\deploy-mpi.ps1" diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index bd8e449afe7d4c..3db38054554dcd 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -27,7 +27,7 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1") # Clear this array when moving to a new boost version $defaultPortVersion = 0 $portVersions = @{ - 'boost-modular-build-helper' = 2; + 'boost-modular-build-helper' = 3; } function Get-PortVersion { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e5b84d3bba7f6e..f7f33498e9ee16 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -97,6 +97,10 @@ boringssl:x64-windows=skip boringssl:x64-windows-static=skip boringssl:x64-windows-static-md=skip boringssl:x86-windows=skip +# Broken with NDK r25 and fixed in NDK r26 +botan:arm-neon-android=fail +botan:arm64-android=fail +botan:x64-android=fail brpc:x64-android=fail buck-yeh-bux:x64-android=fail c4core:arm-neon-android=fail @@ -262,6 +266,7 @@ dcmtk:x64-uwp=fail # legacy directxsdk which conflicts with dxsdk-d3dx directxsdk:x86-windows=skip directxsdk:x64-windows=skip +directxsdk:x64-windows-static=skip directxsdk:x64-windows-static-md=skip discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail @@ -990,9 +995,6 @@ rest-rpc:arm64-windows=skip rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip rest-rpc:arm64-osx=skip -# Missing system libraries -robotraconteur:x64-linux=fail -robotraconteur-companion:x64-linux=fail rpclib:arm64-windows=fail rpclib:arm64-uwp=fail rpclib:x64-uwp=fail @@ -1005,9 +1007,6 @@ rply:arm64-windows=skip rply:x64-linux=skip rply:x64-osx=skip rply:x64-windows-static-md=skip -rttr:arm-neon-android=fail -rttr:arm64-android=fail -rttr:x64-android=fail salome-medcoupling:x64-linux=fail scintilla:arm-neon-android=fail scintilla:arm64-android=fail @@ -1260,6 +1259,17 @@ vcpkg-ci-boost:x64-windows-static-md=pass vcpkg-ci-boost:x64-windows-static=pass vcpkg-ci-boost:x64-windows=pass vcpkg-ci-boost:x86-windows=pass +vcpkg-ci-curl:arm-neon-android=pass +vcpkg-ci-curl:arm64-android=pass +vcpkg-ci-curl:x64-android=pass +vcpkg-ci-curl:x64-linux=pass +vcpkg-ci-curl:arm64-osx=pass +vcpkg-ci-curl:x64-osx=pass +vcpkg-ci-curl:arm64-windows=pass +vcpkg-ci-curl:x64-windows-static-md=pass +vcpkg-ci-curl:x64-windows-static=pass +vcpkg-ci-curl:x64-windows=pass +vcpkg-ci-curl:x86-windows=pass vcpkg-ci-ffmpeg:arm64-uwp=pass vcpkg-ci-ffmpeg:arm64-windows=pass vcpkg-ci-ffmpeg:x64-linux=pass diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 3ef7278dd49532..3a3a6ed3a34578 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -356,7 +356,7 @@ function(vcpkg_configure_meson) set(meson_input_file_${buildname} "${CURRENT_BUILDTREES_DIR}/meson-${TARGET_TRIPLET}-${suffix_${buildname}}.log") endif() - vcpkg_list(APPEND arg_OPTIONS --backend ninja --wrap-mode nodownload -Dbuildtype=plain -Doptimization=plain) + vcpkg_list(APPEND arg_OPTIONS --backend ninja --wrap-mode nodownload -Dbuildtype=plain) z_vcpkg_get_build_and_host_system(MESON_HOST_MACHINE MESON_BUILD_MACHINE IS_CROSS) diff --git a/scripts/test_ports/vcpkg-ci-curl/portfile.cmake b/scripts/test_ports/vcpkg-ci-curl/portfile.cmake new file mode 100644 index 00000000000000..065116c276adcf --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-curl/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/test_ports/vcpkg-ci-curl/vcpkg.json b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json new file mode 100644 index 00000000000000..87315e1dbaa173 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-curl/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "vcpkg-ci-curl", + "version-date": "2024-03-05", + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "license": "MIT", + "dependencies": [ + { + "name": "curl", + "features": [ + "http2", + "zstd" + ] + }, + { + "$comment": "Known to break aws-sdk-cpp.", + "name": "curl", + "features": [ + "brotli" + ], + "platform": "!osx" + }, + { + "$comment": "Known to be fixed by libidn2 update.", + "name": "curl", + "features": [ + "idn" + ], + "platform": "!android" + }, + { + "name": "curl", + "features": [ + "ldap", + "tool" + ], + "platform": "!android & !uwp" + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-mimalloc/portfile.cmake b/scripts/test_ports/vcpkg-ci-mimalloc/portfile.cmake new file mode 100644 index 00000000000000..c6a99afd4f2151 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mimalloc/portfile.cmake @@ -0,0 +1,33 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/mimalloc + REF "v${VERSION}" + SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1 + HEAD_REF master + PATCHES + vcpkg-tests.patch +) +# Ensure that the test uses the installed mimalloc only +file(REMOVE_RECURSE + "${SOURCE_PATH}/bin" + "${SOURCE_PATH}/include" + "${SOURCE_PATH}/src" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/test" + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + "-DVCPKG_TESTS=${CURRENT_PORT_DIR}/vcpkg-tests.cmake" +) +vcpkg_cmake_install(ADD_BIN_TO_PATH) + +vcpkg_copy_tools(TOOL_NAMES pkgconfig-override-cxx AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/scripts/test_ports/vcpkg-ci-mimalloc/vcpkg-tests.cmake b/scripts/test_ports/vcpkg-ci-mimalloc/vcpkg-tests.cmake new file mode 100644 index 00000000000000..d8e122cf358ada --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mimalloc/vcpkg-tests.cmake @@ -0,0 +1,47 @@ +find_package(PkgConfig REQUIRED) + +# Legacy variables + +message(STATUS "MIMALLOC_INCLUDE_DIR: ${MIMALLOC_INCLUDE_DIR}") +message(STATUS "MIMALLOC_LIBRARY_DIR: ${MIMALLOC_LIBRARY_DIR}") +find_file(mimalloc_h NAMES mimalloc.h PATHS "${MIMALLOC_INCLUDE_DIR}" NO_DEFAULT_PATH REQUIRED) +set(names + mimalloc + mimalloc-secure + mimalloc-static + mimalloc-static-secure + mimalloc-debug + mimalloc-secure-debug + mimalloc-static-debug + mimalloc-static-secure-debug +) +find_library(mimalloc_lib NAMES ${names} PATHS "${MIMALLOC_LIBRARY_DIR}" NO_DEFAULT_PATH REQUIRED) + +# pkgconfig + +pkg_check_modules(PC_MIMALLOC mimalloc IMPORTED_TARGET REQUIRED) + +if(EXPECTED_FAILURE_DUE_TO_CXX_LINKAGE_OF_MIMALLOC) +add_executable(pkgconfig-override $,main-override.c,main-override-static.c>) +target_link_libraries(pkgconfig-override PRIVATE PkgConfig::PC_MIMALLOC) +endif() + +add_executable(pkgconfig-override-cxx main-override.cpp) +target_link_libraries(pkgconfig-override-cxx PRIVATE PkgConfig::PC_MIMALLOC Threads::Threads) + +# Runtime + +if(NOT CMAKE_CROSSCOMPILING) + if(BUILD_SHARED_LIBS) + add_custom_target(run-dynamic-override ALL COMMAND $) + add_custom_target(run-dynamic-override-cxx ALL COMMAND $) + else() + add_custom_target(run-static-override ALL COMMAND $) + add_custom_target(run-static-override-cxx ALL COMMAND $) + endif() + add_custom_target(run-pkgconfig-override-cxx ALL COMMAND $) +endif() + +# Deployment + +install(TARGETS pkgconfig-override-cxx) diff --git a/scripts/test_ports/vcpkg-ci-mimalloc/vcpkg-tests.patch b/scripts/test_ports/vcpkg-ci-mimalloc/vcpkg-tests.patch new file mode 100644 index 00000000000000..6a464e30120735 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mimalloc/vcpkg-tests.patch @@ -0,0 +1,65 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index e76ffa6..a925a37 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.5) + project(mimalloc-test C CXX) + + set(CMAKE_C_STANDARD 11) +@@ -19,21 +19,30 @@ endif() + find_package(mimalloc 2.0 REQUIRED NO_SYSTEM_ENVIRONMENT_PATH) + message(STATUS "Found mimalloc installed at: ${MIMALLOC_LIBRARY_DIR} (${MIMALLOC_VERSION_DIR})") + ++set(THREADS_PREFER_PTHREAD_FLAG 1) ++find_package(Threads REQUIRED) ++ ++if(BUILD_SHARED_LIBS) + # overriding with a dynamic library + add_executable(dynamic-override main-override.c) + target_link_libraries(dynamic-override PUBLIC mimalloc) + + add_executable(dynamic-override-cxx main-override.cpp) + target_link_libraries(dynamic-override-cxx PUBLIC mimalloc) ++target_link_libraries(dynamic-override-cxx PRIVATE Threads::Threads) ++endif() + + ++if(0) + # overriding with a static object file works reliable as the symbols in the + # object file have priority over those in library files + add_executable(static-override-obj main-override.c ${MIMALLOC_OBJECT_DIR}/mimalloc.o) + target_include_directories(static-override-obj PUBLIC ${MIMALLOC_INCLUDE_DIR}) + target_link_libraries(static-override-obj PUBLIC pthread) ++endif() + + ++if(NOT BUILD_SHARED_LIBS) + # overriding with a static library works too if using the `mimalloc-override.h` + # header to redefine malloc/free. (the library already overrides new/delete) + add_executable(static-override-static main-override-static.c) +@@ -47,6 +56,10 @@ target_link_libraries(static-override PUBLIC mimalloc-static) + + add_executable(static-override-cxx main-override.cpp) + target_link_libraries(static-override-cxx PUBLIC mimalloc-static) ++target_link_libraries(static-override-cxx PRIVATE Threads::Threads) ++endif() ++ ++include("${VCPKG_TESTS}") + + + ## test memory errors +diff --git a/test/main-override.cpp b/test/main-override.cpp +index c1607b6..9e9824c 100644 +--- a/test/main-override.cpp ++++ b/test/main-override.cpp +@@ -19,7 +19,7 @@ + #endif + + #ifdef _WIN32 +-#include ++#include + static void msleep(unsigned long msecs) { Sleep(msecs); } + #else + #include diff --git a/scripts/test_ports/vcpkg-ci-mimalloc/vcpkg.json b/scripts/test_ports/vcpkg-ci-mimalloc/vcpkg.json new file mode 100644 index 00000000000000..2a0047a270c83c --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-mimalloc/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "vcpkg-ci-mimalloc", + "version": "2.1.2", + "description": "Validates mimalloc", + "dependencies": [ + "mimalloc", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-nanobind/portfile.cmake b/scripts/test_ports/vcpkg-ci-nanobind/portfile.cmake new file mode 100644 index 00000000000000..c8d43663ddbb32 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-nanobind/portfile.cmake @@ -0,0 +1,25 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +# This test does not support cross-compilation due to nanobind's usage of the +# Python interpreter to figure out Python module suffix. +if(VCPKG_CROSSCOMPILING) + message(WARNING "Skipping vcpkg-ci-nanobind because it is not expected to work when cross-compiling") + return() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wjakob/nanobind_example + REF 4b5c9bd484dec77e085a188dcefc536aed69aae9 + SHA512 ec7eeb25b5c5ee2e8bbcc48e78719dc6e5211cf54794dd3c370ad3e8d685fbc8b79435890da3b9481656169efaa87b77e3ea55ce864efd670dd9ea0600dee77d + HEAD_REF master +) + +# This is needed to correctly build/link against a debug build of Python on +# Windows +string(APPEND VCPKG_CXX_FLAGS_DEBUG " -DPy_DEBUG") +string(APPEND VCPKG_C_FLAGS_DEBUG " -DPy_DEBUG") + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-nanobind/vcpkg.json b/scripts/test_ports/vcpkg-ci-nanobind/vcpkg.json new file mode 100644 index 00000000000000..5cd7db5522cd97 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-nanobind/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-ci-nanobind", + "version": "0.0.1", + "description": "A nanobind example project", + "homepage": "https://nanobind.readthedocs.io/en/latest/", + "license": "BSD-3-Clause", + "dependencies": [ + "nanobind", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} + diff --git a/scripts/toolchains/freebsd.cmake b/scripts/toolchains/freebsd.cmake index 016b2f1522a911..22cb5eefdb7409 100644 --- a/scripts/toolchains/freebsd.cmake +++ b/scripts/toolchains/freebsd.cmake @@ -5,6 +5,18 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") endif() set(CMAKE_SYSTEM_NAME FreeBSD CACHE STRING "") +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR arm64 CACHE STRING "") + else() + set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "") + endif() +endif() + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") diff --git a/scripts/toolchains/openbsd.cmake b/scripts/toolchains/openbsd.cmake index d606e8307d65f8..8046628a1e59c8 100644 --- a/scripts/toolchains/openbsd.cmake +++ b/scripts/toolchains/openbsd.cmake @@ -1,18 +1,30 @@ if(NOT _VCPKG_OPENBSD_TOOLCHAIN) set(_VCPKG_OPENBSD_TOOLCHAIN 1) - + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") endif() set(CMAKE_SYSTEM_NAME OpenBSD CACHE STRING "") +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(CMAKE_SYSTEM_PROCESSOR x86_64 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(CMAKE_SYSTEM_PROCESSOR x86 CACHE STRING "") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CMAKE_SYSTEM_PROCESSOR arm64 CACHE STRING "") + else() + set(CMAKE_SYSTEM_PROCESSOR "${CMAKE_HOST_SYSTEM_PROCESSOR}" CACHE STRING "") + endif() +endif() + if(NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_CXX_COMPILER "/usr/bin/clang++") endif() if(NOT DEFINED CMAKE_C_COMPILER) set(CMAKE_C_COMPILER "/usr/bin/clang") endif() - + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index 79d8a0e6576782..2244c01eeac714 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2024-02-07 -VCPKG_MACOS_SHA=c50da3ecce49c7ec4dd2e1f487d5c501ecd7e6799e480a88866545c5c93dbe1019abb8cbe63a442277d521874c0dec33337ee8f12f2643b99ff01ea18d6c70a9 -VCPKG_MUSLC_SHA=5f09fae7cd1410b4ab4ea20a33135c2d2401b08e4f67b96bad3a96d0c0d24da8cd661e900047f06aa5d8c4092423cbbdf5034e7f2000d3be38741be61c9b78e5 -VCPKG_GLIBC_SHA=ee0bc610703e8e7f39f1382590f25787c99f723fb02fb994a03a709a78277f8f1ad3188b23b99fb21551234d9f57e1caf706c82968e082d2fe8298e286c36461 -VCPKG_TOOL_SOURCE_SHA=47b2e6f401d5504240f15067c3f21947a029577dc46ed88354ced5e177523bfef13ad129a0d228ddf42e534474bf746f7fa0b11104ad6a35fd8783b1229a2c79 +VCPKG_TOOL_RELEASE_TAG=2024-03-14 +VCPKG_MACOS_SHA=d9acaea52a459fffd64e5fddda0364e229480379995baab5839d15b0d7b75870d1b50f62127ccc2a02a6056408dc4af2258f0cafa399ed52fe7dbf2e944e4693 +VCPKG_MUSLC_SHA=5f54a8a29ce12e717fb29593ca8377f3c0460cd8112b41ec21333064add8844be45e34ff9bb58db5fec46abe1f436b88bcd1d90b5d416dad01bfd9719a353134 +VCPKG_GLIBC_SHA=73abdb955030dee962d5b964d8c44a3621a92764518b23d3022e97cbb888b1eed66c944036b04fba84f0556dab11279a51f3ae1cfc46687cbab6ded22b259b55 +VCPKG_TOOL_SOURCE_SHA=d28da01818043a84060a0964d0b7849b425e488f90076408c28b5366aa95c8f688b1917059e59ac5b95420bbd9e4b6e7c9a2a24cee1366476e366f9e9b0025f2 diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index a7162858563b1d..0f1119c727d918 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,25 +15,25 @@ python-3.11.8.nupkg.zip - 3.27.1 - cmake-3.27.1-windows-i386/bin/cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-i386.zip - a847f636fb27ba41ba9e6eaafa56937c614bcb39c6d0c9723241c229a9b0a77b4d00ebee88639561035d43f9aa64895f387eab56c628990c01191da57839cda0 - cmake-3.27.1-windows-i386.zip + 3.29.0 + cmake-3.29.0-windows-i386/bin/cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-windows-i386.zip + 70cdd5e13ac40cd1a1e2faf0cb0c3e937734c70751bf804af999bcf01b562e34b9f4fbe7da160604278d7cea7cf8676190013ae9b50f198275da2b78d0e3da64 + cmake-3.29.0-windows-i386.zip - 3.27.1 - cmake-3.27.1-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-macos-universal.tar.gz - 78e639b93786eb994bdbc6263afc48267d42d9305c1cb1cb9482adf012e7b4f45934e744a98eaf93d8361f154e642cada13398cca064c1700f009a7795746fe7 - cmake-3.27.1-macos-universal.tar.gz + 3.29.0 + cmake-3.29.0-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-macos-universal.tar.gz + 0d4c6958ce88bd2ebbb3f3a1e6c9cf4f67017c195009b43bb2418a1b4f1068ab750c781a6eb6f43531a8423c8518957312dbf9234e1a8a5e32a350e775c884eb + cmake-3.29.0-macos-universal.tar.gz - 3.27.1 - cmake-3.27.1-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz - 192374a68e2971f04974a194645726196d9b8ee7abd650d1e6f65f7aa2ccc9b186c3edb473bb4958c764532edcdd42f4182ee1fcb86b17d78b0bcd6305ce3df1 - cmake-3.27.1-linux-x86_64.tar.gz + 3.29.0 + cmake-3.29.0-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-linux-x86_64.tar.gz + 8bbcb45315f95e678fb559f11578c632028b1c69730db840db888d5e254f79b614b134b1b414a6f85d9d1e735965cb69fbfe1b692ccd6f1b9f3cee296b5d56b1 + cmake-3.29.0-linux-x86_64.tar.gz 2.7.4 diff --git a/versions/a-/ableton-link.json b/versions/a-/ableton-link.json index 475a3506bacc4b..4f56a33d742e62 100644 --- a/versions/a-/ableton-link.json +++ b/versions/a-/ableton-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e486a5e643aafc9810b1e4c2d9c3da1d3e2d156", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "4827f8ad0a42e763cffae490000a08bbd52d7cdf", "version": "3.1.0", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 2a280e9f4a15f2..9f134daf4a29d9 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8b26862556884ff981430b54b130d4b1ef6eef7", + "version": "20240116.1", + "port-version": 0 + }, { "git-tree": "49a35a30915907a4e46b57bb33b8aa1f2185e757", "version": "20230802.1", diff --git a/versions/a-/ada-url.json b/versions/a-/ada-url.json index 27017672ae269f..46b3277a8e9ed4 100644 --- a/versions/a-/ada-url.json +++ b/versions/a-/ada-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71bc8577d2e9a0e2be09fd775ab224a28f9c9e0e", + "version": "2.7.7", + "port-version": 0 + }, { "git-tree": "bb2fecfc860c0e8a6483de55069b826d8c556004", "version": "2.7.6", diff --git a/versions/a-/alsa.json b/versions/a-/alsa.json index 4d0e4799cb904d..897a37e0670d43 100644 --- a/versions/a-/alsa.json +++ b/versions/a-/alsa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78ad470e54eac71113219036519aa55ff3489294", + "version": "1.2.11", + "port-version": 1 + }, { "git-tree": "1ea8f5d1e2f27c55e80e1bcce24aacc37849074e", "version": "1.2.11", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 5a12980bdb80fe..a25cf4daebb685 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28965b502b1501b7832c506ea728e37924902909", + "version": "15.0.2", + "port-version": 0 + }, { "git-tree": "874763622bfd5b5d118109e44f25460c4b34af57", "version": "15.0.1", diff --git a/versions/a-/aws-c-auth.json b/versions/a-/aws-c-auth.json index a3b56b83a32ea5..90d2726d8fc766 100644 --- a/versions/a-/aws-c-auth.json +++ b/versions/a-/aws-c-auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "349597b752292dcaf8e16d76e4dd231891c74491", + "version": "0.7.16", + "port-version": 0 + }, { "git-tree": "d2b36610b15f3007dcdc328c29b4db5c0862f27f", "version": "0.7.14", diff --git a/versions/a-/aws-c-cal.json b/versions/a-/aws-c-cal.json index f2ce100b5341db..5fc551cc505069 100644 --- a/versions/a-/aws-c-cal.json +++ b/versions/a-/aws-c-cal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd087ffda02ff69b1ce404a3e6247220c1c4c62f", + "version": "0.6.10", + "port-version": 0 + }, { "git-tree": "43c961d933d7a928c15cdfb7c5f7a6c16875bed5", "version": "0.6.9", diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index 2117c1be71cc0b..00b07fa10a8214 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ce002157d2a45f99a99d4eeb35323b2db108a12", + "version": "0.9.14", + "port-version": 0 + }, { "git-tree": "21a8991014f0f7b8678c4e8c4d6958a214b1f04b", "version": "0.9.12", diff --git a/versions/a-/aws-c-compression.json b/versions/a-/aws-c-compression.json index 3d01df7bd6edcc..6135637e0c912f 100644 --- a/versions/a-/aws-c-compression.json +++ b/versions/a-/aws-c-compression.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9374b8a4edeeba54be2e5807b04cf38cb1f37919", + "version": "0.2.18", + "port-version": 0 + }, { "git-tree": "a0373f54fe747cd91672c56b2d86ce0e8d9e4491", "version": "0.2.17", diff --git a/versions/a-/aws-c-event-stream.json b/versions/a-/aws-c-event-stream.json index a3a42431a5273a..84602abddad191 100644 --- a/versions/a-/aws-c-event-stream.json +++ b/versions/a-/aws-c-event-stream.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "374935a2dfbf1c2a47bbf33b7e8fe3ad0f64c4ee", + "version": "0.4.2", + "port-version": 0 + }, { "git-tree": "26154860990d45f57dc53a6e7ce291112af3c4e3", "version": "0.4.1", diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json index 763cbd53391635..365ce9a68abc86 100644 --- a/versions/a-/aws-c-io.json +++ b/versions/a-/aws-c-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e76d4b5c9d39008952070b235a34f8df72ef72f", + "version": "0.14.6", + "port-version": 0 + }, { "git-tree": "a8cf3e80c656857ed3959d2d2088c2bd590eceb3", "version": "0.14.3", diff --git a/versions/a-/aws-c-mqtt.json b/versions/a-/aws-c-mqtt.json index 4109de747b61b6..ac7459ccaaa7a3 100644 --- a/versions/a-/aws-c-mqtt.json +++ b/versions/a-/aws-c-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d9ad24f654f54f40250744fc34a83f1436eb9c7", + "version": "0.10.3", + "port-version": 0 + }, { "git-tree": "e288b3c65ad4a03bbadfc763aa362a4bce51ea25", "version": "0.10.1", diff --git a/versions/a-/aws-c-s3.json b/versions/a-/aws-c-s3.json index 8e4efc0170c679..02344927c9b872 100644 --- a/versions/a-/aws-c-s3.json +++ b/versions/a-/aws-c-s3.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "a03f35d3bbb734a7eebc2ab2250d223bde4a27e8", + "version": "0.5.3", + "port-version": 0 + }, + { + "git-tree": "6c2914666b48d3f75905048129f3576eecf0206c", + "version": "0.5.2", + "port-version": 0 + }, { "git-tree": "078a6a0fb48d0f7051c34811347b5e93a647c368", "version": "0.5.0", diff --git a/versions/a-/aws-c-sdkutils.json b/versions/a-/aws-c-sdkutils.json index e7aebe6d879f30..b0efa17e805eb0 100644 --- a/versions/a-/aws-c-sdkutils.json +++ b/versions/a-/aws-c-sdkutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "059bddb8a37a8cabda35680b9c212e9a0bdb1134", + "version": "0.1.15", + "port-version": 0 + }, { "git-tree": "40dbafcbc75133f129ea11d38162703f40dadd86", "version": "0.1.14", diff --git a/versions/a-/aws-checksums.json b/versions/a-/aws-checksums.json index 166da7bcca9726..f363ec9540b15f 100644 --- a/versions/a-/aws-checksums.json +++ b/versions/a-/aws-checksums.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdd532188960eea676777a12e5ad822be4167e51", + "version": "0.1.18", + "port-version": 0 + }, { "git-tree": "05e17cee2b7d221bb49bebe55e8801f9cea99014", "version": "0.1.17", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json index 6fe1379c3a6bcc..426864051bf4c4 100644 --- a/versions/a-/aws-crt-cpp.json +++ b/versions/a-/aws-crt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e12f07da72d8c435c8a68fae965c42cff40661ad", + "version": "0.26.4", + "port-version": 0 + }, { "git-tree": "110c01a23de8f129c041243ea29a8d9483665ec8", "version": "0.26.1", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 1337d87eea9fcc..37defc29965974 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0cace4e0dad7294b503c00b96658252e827c3ec", + "version": "1.11.285", + "port-version": 0 + }, { "git-tree": "192340da352851921d2c706648ce973435657d35", "version": "1.11.255", diff --git a/versions/b-/backward-cpp.json b/versions/b-/backward-cpp.json index 79ddd53858ffaf..72ea57f89c3443 100644 --- a/versions/b-/backward-cpp.json +++ b/versions/b-/backward-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25c84663d7fe9c5010bfc7baf2ad7c1c70c5c429", + "version-date": "2023-11-24", + "port-version": 1 + }, { "git-tree": "7b8009fe2173eac9490fd50428585a19cd85b043", "version-date": "2023-11-24", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index 410c95ce319aa6..fd084d1cfa538e 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bce3afb1f6d5fee73e4c7cd0f952df85f4f54de2", + "version": "3.10.0", + "port-version": 0 + }, { "git-tree": "7b7cfa061bebae8f9628f0d56ca21de4ec1c68fa", "version": "3.9.0", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 24c7e6238d3ce2..ac6706c668a754 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "972e4eaa795c412ca6dd9868073b2281c4f55ced", + "version": "8.0.0", + "port-version": 0 + }, { "git-tree": "b49e9a16d262cfdde45934d7a3c9a6aebf391225", "version": "7.24.3", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index f1eddf016e1884..c86c0fed877c97 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04390ecd44200648eb89147cb4e11b196d2dc515", + "version": "1.84.0", + "port-version": 3 + }, { "git-tree": "b3eb3e3fdc08ffe6e8f9e19e761e583790aaf308", "version": "1.84.0", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 3f411eabd45e80..fb1a553fea2fd5 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "559118768851fefb7f0bbcbf363863d907fd6a12", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "4c689678282e82a42d29348c05a022f237e54700", "version": "3.2.0", diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index 4036d7dd4b95e7..bac2351560d663 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4aa97cf4dfb7c0ff2537a3b0e324daa97940d2c5", + "version": "1.6.1", + "port-version": 3 + }, { "git-tree": "3fd0bfb30a96852a7a92e0526c411ef9f95bed83", "version": "1.6.1", diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index 9cc090985906b9..d90058ddd4e147 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7abe89f1cf1c33f953c027825b6861abccc4beb7", + "version": "4.1.0", + "port-version": 0 + }, { "git-tree": "eedda7057a9359ec30cec22194f7a5da5320ac16", "version": "4.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index 50485607d59536..0a7e02a1777236 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -13,11 +13,11 @@ "port-version": 2 }, "ableton-link": { - "baseline": "3.1.0", + "baseline": "3.1.1", "port-version": 0 }, "abseil": { - "baseline": "20230802.1", + "baseline": "20240116.1", "port-version": 0 }, "absent": { @@ -37,7 +37,7 @@ "port-version": 15 }, "ada-url": { - "baseline": "2.7.6", + "baseline": "2.7.7", "port-version": 0 }, "ade": { @@ -94,7 +94,7 @@ }, "alsa": { "baseline": "1.2.11", - "port-version": 0 + "port-version": 1 }, "amd-adl-sdk": { "baseline": "17.1", @@ -241,7 +241,7 @@ "port-version": 5 }, "arrow": { - "baseline": "15.0.1", + "baseline": "15.0.2", "port-version": 0 }, "arsenalgear": { @@ -365,23 +365,23 @@ "port-version": 0 }, "aws-c-auth": { - "baseline": "0.7.14", + "baseline": "0.7.16", "port-version": 0 }, "aws-c-cal": { - "baseline": "0.6.9", + "baseline": "0.6.10", "port-version": 0 }, "aws-c-common": { - "baseline": "0.9.12", + "baseline": "0.9.14", "port-version": 0 }, "aws-c-compression": { - "baseline": "0.2.17", + "baseline": "0.2.18", "port-version": 0 }, "aws-c-event-stream": { - "baseline": "0.4.1", + "baseline": "0.4.2", "port-version": 0 }, "aws-c-http": { @@ -389,27 +389,27 @@ "port-version": 0 }, "aws-c-io": { - "baseline": "0.14.3", + "baseline": "0.14.6", "port-version": 0 }, "aws-c-mqtt": { - "baseline": "0.10.1", + "baseline": "0.10.3", "port-version": 0 }, "aws-c-s3": { - "baseline": "0.5.0", + "baseline": "0.5.3", "port-version": 0 }, "aws-c-sdkutils": { - "baseline": "0.1.14", + "baseline": "0.1.15", "port-version": 0 }, "aws-checksums": { - "baseline": "0.1.17", + "baseline": "0.1.18", "port-version": 0 }, "aws-crt-cpp": { - "baseline": "0.26.1", + "baseline": "0.26.4", "port-version": 0 }, "aws-lambda-cpp": { @@ -417,7 +417,7 @@ "port-version": 0 }, "aws-sdk-cpp": { - "baseline": "1.11.255", + "baseline": "1.11.285", "port-version": 0 }, "azmq": { @@ -530,10 +530,10 @@ }, "backward-cpp": { "baseline": "2023-11-24", - "port-version": 0 + "port-version": 1 }, "baresip-libre": { - "baseline": "3.9.0", + "baseline": "3.10.0", "port-version": 0 }, "basisu": { @@ -689,7 +689,7 @@ "port-version": 0 }, "boinc": { - "baseline": "7.24.3", + "baseline": "8.0.0", "port-version": 0 }, "bond": { @@ -1010,7 +1010,7 @@ }, "boost-modular-build-helper": { "baseline": "1.84.0", - "port-version": 2 + "port-version": 3 }, "boost-move": { "baseline": "1.84.0", @@ -1325,8 +1325,8 @@ "port-version": 0 }, "botan": { - "baseline": "3.2.0", - "port-version": 1 + "baseline": "3.3.0", + "port-version": 0 }, "box2d": { "baseline": "2.4.1", @@ -1350,7 +1350,7 @@ }, "brpc": { "baseline": "1.6.1", - "port-version": 2 + "port-version": 3 }, "brunocodutra-metal": { "baseline": "2.1.4", @@ -1361,7 +1361,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "4.0.1", + "baseline": "4.1.0", "port-version": 0 }, "bsio": { @@ -1505,8 +1505,8 @@ "port-version": 5 }, "cctz": { - "baseline": "2.3", - "port-version": 7 + "baseline": "2.4", + "port-version": 0 }, "cdt": { "baseline": "1.4.0", @@ -1533,8 +1533,8 @@ "port-version": 5 }, "cgal": { - "baseline": "5.6", - "port-version": 1 + "baseline": "5.6.1", + "port-version": 0 }, "cgicc": { "baseline": "3.2.20", @@ -1642,7 +1642,7 @@ }, "cld3": { "baseline": "3.0.14", - "port-version": 1 + "port-version": 2 }, "clfft": { "baseline": "2.12.2", @@ -1653,7 +1653,7 @@ "port-version": 0 }, "cli11": { - "baseline": "2.4.0", + "baseline": "2.4.1", "port-version": 0 }, "clickhouse-cpp": { @@ -1701,8 +1701,8 @@ "port-version": 3 }, "cnats": { - "baseline": "3.7.0", - "port-version": 1 + "baseline": "3.8.0", + "port-version": 0 }, "cnl": { "baseline": "1.1.7", @@ -1824,6 +1824,10 @@ "baseline": "2020.06", "port-version": 8 }, + "correlation-vector-cpp": { + "baseline": "1.0", + "port-version": 0 + }, "cpp-async": { "baseline": "1.1.0", "port-version": 0 @@ -1925,7 +1929,7 @@ "port-version": 4 }, "cpptrace": { - "baseline": "0.4.1", + "baseline": "0.5.1", "port-version": 0 }, "cppunit": { @@ -1937,7 +1941,7 @@ "port-version": 3 }, "cppwinrt": { - "baseline": "2.0.230207.1", + "baseline": "2.0.240111.5", "port-version": 0 }, "cppxaml": { @@ -1950,14 +1954,14 @@ }, "cpr": { "baseline": "1.10.5", - "port-version": 1 + "port-version": 2 }, "cpu-features": { "baseline": "0.9.0", "port-version": 0 }, "cpuid": { - "baseline": "0.6.2", + "baseline": "0.6.4", "port-version": 0 }, "cpuinfo": { @@ -2062,7 +2066,7 @@ }, "curl": { "baseline": "8.6.0", - "port-version": 0 + "port-version": 1 }, "curlpp": { "baseline": "2018-06-15", @@ -2198,7 +2202,7 @@ }, "devil": { "baseline": "1.8.0", - "port-version": 11 + "port-version": 12 }, "dimcli": { "baseline": "7.2.0", @@ -2206,12 +2210,16 @@ }, "directx-dxc": { "baseline": "2024-03-07", - "port-version": 0 + "port-version": 1 }, "directx-headers": { "baseline": "1.613.0", "port-version": 0 }, + "directx12-agility": { + "baseline": "1.613.0", + "port-version": 0 + }, "directxmath": { "baseline": "2024-02-14", "port-version": 1 @@ -2358,7 +2366,7 @@ }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 6 + "port-version": 7 }, "dxut": { "baseline": "11.31", @@ -2533,7 +2541,7 @@ "port-version": 1 }, "expat": { - "baseline": "2.6.1", + "baseline": "2.6.2", "port-version": 0 }, "expected-lite": { @@ -2585,7 +2593,7 @@ "port-version": 2 }, "fast-float": { - "baseline": "6.1.0", + "baseline": "6.1.1", "port-version": 0 }, "fastcdr": { @@ -2762,7 +2770,7 @@ }, "folly": { "baseline": "2024.01.01.00", - "port-version": 1 + "port-version": 2 }, "font-chef": { "baseline": "1.1.0", @@ -2817,8 +2825,8 @@ "port-version": 7 }, "freerdp": { - "baseline": "3.3.0", - "port-version": 0 + "baseline": "3.4.0", + "port-version": 1 }, "freetds": { "baseline": "1.3.10", @@ -3066,7 +3074,7 @@ }, "glog": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "gloo": { "baseline": "20201203", @@ -3106,7 +3114,7 @@ }, "google-cloud-cpp": { "baseline": "2.22.0", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", @@ -3162,7 +3170,7 @@ }, "graphviz": { "baseline": "10.0.1", - "port-version": 0 + "port-version": 1 }, "greatest": { "baseline": "1.5.0", @@ -3170,7 +3178,7 @@ }, "grpc": { "baseline": "1.51.1", - "port-version": 1 + "port-version": 2 }, "grppi": { "baseline": "0.4.0", @@ -3321,8 +3329,8 @@ "port-version": 1 }, "harfbuzz": { - "baseline": "8.3.0", - "port-version": 3 + "baseline": "8.3.1", + "port-version": 1 }, "hash-library": { "baseline": "8", @@ -3437,7 +3445,7 @@ "port-version": 0 }, "icu": { - "baseline": "74.1", + "baseline": "74.2", "port-version": 1 }, "ideviceinstaller": { @@ -3665,8 +3673,8 @@ "port-version": 0 }, "ixwebsocket": { - "baseline": "11.4.4", - "port-version": 2 + "baseline": "11.4.5", + "port-version": 0 }, "jack2": { "baseline": "1.9.22", @@ -3754,7 +3762,7 @@ }, "jsoncpp": { "baseline": "1.9.5", - "port-version": 2 + "port-version": 3 }, "jsonifier": { "baseline": "0.9.94", @@ -3788,10 +3796,6 @@ "baseline": "1.7", "port-version": 0 }, - "kd-soap": { - "baseline": "2.1.1", - "port-version": 1 - }, "kdalgorithms": { "baseline": "1.2", "port-version": 0 @@ -4014,7 +4018,7 @@ }, "ktx": { "baseline": "4.3.1", - "port-version": 0 + "port-version": 1 }, "kubazip": { "baseline": "0.2.6", @@ -4149,8 +4153,8 @@ "port-version": 0 }, "libassert": { - "baseline": "1.2.2", - "port-version": 2 + "baseline": "2.0.0", + "port-version": 0 }, "libassuan": { "baseline": "2.5.7", @@ -4217,7 +4221,7 @@ "port-version": 0 }, "libcoro": { - "baseline": "0.10", + "baseline": "0.11.1", "port-version": 0 }, "libcorrect": { @@ -4265,8 +4269,8 @@ "port-version": 0 }, "libdeflate": { - "baseline": "1.19", - "port-version": 1 + "baseline": "1.20", + "port-version": 0 }, "libdisasm": { "baseline": "0.23", @@ -4384,6 +4388,10 @@ "baseline": "1.5", "port-version": 4 }, + "libfuse": { + "baseline": "3.16.2", + "port-version": 0 + }, "libgcrypt": { "baseline": "1.10.2", "port-version": 0 @@ -4525,8 +4533,8 @@ "port-version": 1 }, "libjxl": { - "baseline": "0.8.2", - "port-version": 2 + "baseline": "0.10.2", + "port-version": 1 }, "libkeyfinder": { "baseline": "2.2.8", @@ -4586,7 +4594,7 @@ }, "libmagic": { "baseline": "5.45", - "port-version": 1 + "port-version": 2 }, "libmariadb": { "baseline": "3.3.1", @@ -4612,6 +4620,10 @@ "baseline": "1.0.1", "port-version": 1 }, + "libmidi2": { + "baseline": "0.7", + "port-version": 0 + }, "libmikmod": { "baseline": "3.3.11.1", "port-version": 12 @@ -4726,7 +4738,7 @@ }, "liborigin": { "baseline": "3.0.2", - "port-version": 0 + "port-version": 1 }, "libosip2": { "baseline": "5.3.1", @@ -5014,7 +5026,7 @@ }, "libtorch": { "baseline": "2.1.2", - "port-version": 1 + "port-version": 2 }, "libtorrent": { "baseline": "2.0.10", @@ -5061,7 +5073,7 @@ "port-version": 0 }, "libunwind": { - "baseline": "1.8.0", + "baseline": "1.8.1", "port-version": 0 }, "liburing": { @@ -5253,8 +5265,8 @@ "port-version": 3 }, "libxt": { - "baseline": "1.2.1", - "port-version": 1 + "baseline": "1.3.0", + "port-version": 0 }, "libxtst": { "baseline": "1.2.4", @@ -5308,10 +5320,6 @@ "baseline": "2.2", "port-version": 0 }, - "linenoise-ng": { - "baseline": "4754bee2d8eb3", - "port-version": 3 - }, "linmath": { "baseline": "2022-07-30", "port-version": 0 @@ -5344,9 +5352,13 @@ "baseline": "9.2.0", "port-version": 0 }, + "llnl-units": { + "baseline": "0.9.1", + "port-version": 0 + }, "llvm": { "baseline": "17.0.2", - "port-version": 3 + "port-version": 4 }, "lmdb": { "baseline": "0.9.31", @@ -5434,11 +5446,11 @@ }, "luasec": { "baseline": "1.3.2", - "port-version": 1 + "port-version": 2 }, "luasocket": { "baseline": "3.1.0", - "port-version": 0 + "port-version": 1 }, "luminoengine": { "baseline": "0.10.1", @@ -5682,7 +5694,7 @@ }, "mimalloc": { "baseline": "2.1.2", - "port-version": 1 + "port-version": 2 }, "minc": { "baseline": "2.4.03", @@ -5773,7 +5785,7 @@ "port-version": 0 }, "mongo-cxx-driver": { - "baseline": "3.9.0", + "baseline": "3.10.1", "port-version": 0 }, "mongoose": { @@ -5964,6 +5976,10 @@ "baseline": "4.3.11", "port-version": 0 }, + "nanobind": { + "baseline": "1.9.2", + "port-version": 0 + }, "nanodbc": { "baseline": "2.13.0", "port-version": 8 @@ -5982,7 +5998,7 @@ }, "nanomsg": { "baseline": "1.2.1", - "port-version": 0 + "port-version": 1 }, "nanopb": { "baseline": "0.4.7", @@ -6033,8 +6049,8 @@ "port-version": 0 }, "neargye-semver": { - "baseline": "0.3.0", - "port-version": 2 + "baseline": "0.3.1", + "port-version": 0 }, "ned14-internal-quickcpplib": { "baseline": "2023-11-22", @@ -6069,7 +6085,7 @@ "port-version": 4 }, "nghttp2": { - "baseline": "1.59.0", + "baseline": "1.60.0", "port-version": 0 }, "nghttp2-asio": { @@ -6157,7 +6173,7 @@ "port-version": 4 }, "nss": { - "baseline": "3.98", + "baseline": "3.99", "port-version": 0 }, "nsync": { @@ -6281,12 +6297,12 @@ "port-version": 0 }, "ogre": { - "baseline": "14.0.1", - "port-version": 2 + "baseline": "14.2.2", + "port-version": 0 }, "ogre-next": { "baseline": "2.3.3", - "port-version": 2 + "port-version": 3 }, "ois": { "baseline": "1.5.1", @@ -6314,7 +6330,7 @@ }, "onnx": { "baseline": "1.15.0", - "port-version": 0 + "port-version": 1 }, "onnx-optimizer": { "baseline": "0.3.18", @@ -6346,7 +6362,7 @@ }, "openblas": { "baseline": "0.3.26", - "port-version": 1 + "port-version": 3 }, "opencascade": { "baseline": "7.8.0", @@ -6369,8 +6385,8 @@ "port-version": 1 }, "opencsg": { - "baseline": "1.4.2", - "port-version": 4 + "baseline": "1.6.0", + "port-version": 0 }, "openctm": { "baseline": "1.0.3", @@ -6398,7 +6414,7 @@ }, "openexr": { "baseline": "3.2.3", - "port-version": 0 + "port-version": 1 }, "openfbx": { "baseline": "2022-07-18", @@ -6466,7 +6482,7 @@ }, "openssl": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "deprecated", @@ -6488,10 +6504,6 @@ "baseline": "1.14.2", "port-version": 0 }, - "opentelemetry-fluentd": { - "baseline": "2.0.0", - "port-version": 2 - }, "opentracing": { "baseline": "1.6.0", "port-version": 4 @@ -6550,7 +6562,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 22 + "port-version": 23 }, "osg-qt": { "baseline": "Qt5", @@ -6609,7 +6621,7 @@ "port-version": 3 }, "parallel-hashmap": { - "baseline": "1.3.11", + "baseline": "1.3.12", "port-version": 0 }, "parallelstl": { @@ -6618,7 +6630,7 @@ }, "paraview": { "baseline": "5.11.0", - "port-version": 4 + "port-version": 5 }, "parmetis": { "baseline": "2022-07-27", @@ -6677,8 +6689,8 @@ "port-version": 2 }, "pe-parse": { - "baseline": "2.1.0", - "port-version": 1 + "baseline": "2.1.1", + "port-version": 0 }, "pegtl": { "baseline": "3.2.7", @@ -6729,7 +6741,7 @@ "port-version": 2 }, "pipewire": { - "baseline": "1.0.3", + "baseline": "1.0.4", "port-version": 0 }, "pistache": { @@ -6741,7 +6753,7 @@ "port-version": 1 }, "pixman": { - "baseline": "0.43.2", + "baseline": "0.43.4", "port-version": 0 }, "pkgconf": { @@ -6772,6 +6784,10 @@ "baseline": "2019-08-10", "port-version": 2 }, + "plf-queue": { + "baseline": "2.2", + "port-version": 0 + }, "plf-stack": { "baseline": "2019-08-10", "port-version": 2 @@ -6901,8 +6917,8 @@ "port-version": 0 }, "presentmon": { - "baseline": "1.7.0", - "port-version": 2 + "baseline": "1.10.0", + "port-version": 0 }, "proj": { "baseline": "9.3.1", @@ -7050,7 +7066,7 @@ }, "qt": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qt-advanced-docking-system": { "baseline": "4.2.1", @@ -7062,67 +7078,67 @@ }, "qt5": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-3d": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-activeqt": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-androidextras": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-base": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-canvas3d": { "baseline": "0", - "port-version": 2 + "port-version": 3 }, "qt5-charts": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-connectivity": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-datavis3d": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-declarative": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-doc": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-gamepad": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-graphicaleffects": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-imageformats": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-location": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-macextras": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-modularscripts": { "baseline": "deprecated", @@ -7130,47 +7146,47 @@ }, "qt5-mqtt": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-multimedia": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-networkauth": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-purchasing": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-quickcontrols": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-quickcontrols2": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-remoteobjects": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-script": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-scxml": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-sensors": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-serialbus": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-serialport": { "baseline": "5.15.13", @@ -7178,63 +7194,63 @@ }, "qt5-speech": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-svg": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-tools": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-translations": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-virtualkeyboard": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-wayland": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-webchannel": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-webengine": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 3 }, "qt5-webglplugin": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-websockets": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-webview": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-winextras": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-x11extras": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5-xmlpatterns": { "baseline": "5.15.13", - "port-version": 0 + "port-version": 1 }, "qt5compat": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtactiveqt": { "baseline": "6.6.1", @@ -7246,23 +7262,23 @@ }, "qtbase": { "baseline": "6.6.1", - "port-version": 10 + "port-version": 11 }, "qtcharts": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtcoap": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtconnectivity": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtdatavis3d": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtdeclarative": { "baseline": "6.6.1", @@ -7270,31 +7286,31 @@ }, "qtdeviceutilities": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtdoc": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtgraphs": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtgrpc": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qthttpserver": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtimageformats": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtinterfaceframework": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtkeychain": { "baseline": "0.14.1", @@ -7306,11 +7322,11 @@ }, "qtlanguageserver": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtlocation": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtlottie": { "baseline": "6.6.1", @@ -7318,83 +7334,83 @@ }, "qtmqtt": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtmultimedia": { "baseline": "6.6.1", - "port-version": 1 + "port-version": 2 }, "qtnetworkauth": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtopcua": { "baseline": "6.6.1", - "port-version": 1 + "port-version": 2 }, "qtpositioning": { "baseline": "6.6.1", - "port-version": 2 + "port-version": 3 }, "qtquick3d": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtquick3dphysics": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtquickcontrols2": { "baseline": "deprecated", - "port-version": 0 + "port-version": 1 }, "qtquickeffectmaker": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtquicktimeline": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtremoteobjects": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtscxml": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtsensors": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtserialbus": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtserialport": { "baseline": "6.6.1", - "port-version": 1 + "port-version": 2 }, "qtshadertools": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtspeech": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtsvg": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qttools": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qttranslations": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtvirtualkeyboard": { "baseline": "6.6.1", @@ -7406,19 +7422,19 @@ }, "qtwebchannel": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtwebengine": { "baseline": "6.6.1", - "port-version": 3 + "port-version": 4 }, "qtwebsockets": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtwebview": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "quadtree": { "baseline": "2022-04-24", @@ -7445,7 +7461,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.6.0", + "baseline": "3.8.0", "port-version": 0 }, "quirc": { @@ -7673,11 +7689,11 @@ "port-version": 0 }, "robin-map": { - "baseline": "1.2.1", + "baseline": "1.2.2", "port-version": 0 }, "robotraconteur": { - "baseline": "1.0.0", + "baseline": "1.1.1", "port-version": 0 }, "robotraconteur-companion": { @@ -7685,7 +7701,7 @@ "port-version": 0 }, "rocksdb": { - "baseline": "8.11.3", + "baseline": "9.0.0", "port-version": 0 }, "rpclib": { @@ -7742,7 +7758,7 @@ }, "rttr": { "baseline": "0.9.6+20210811", - "port-version": 0 + "port-version": 1 }, "rubberband": { "baseline": "3.3.0", @@ -7885,7 +7901,7 @@ "port-version": 6 }, "sdl2": { - "baseline": "2.30.0", + "baseline": "2.30.1", "port-version": 0 }, "sdl2-gfx": { @@ -7894,11 +7910,11 @@ }, "sdl2-image": { "baseline": "2.8.2", - "port-version": 0 + "port-version": 1 }, "sdl2-mixer": { "baseline": "2.8.0", - "port-version": 1 + "port-version": 3 }, "sdl2-mixer-ext": { "baseline": "2.6.0", @@ -7910,7 +7926,7 @@ }, "sdl2-ttf": { "baseline": "2.22.0", - "port-version": 0 + "port-version": 1 }, "sdl2pp": { "baseline": "0.16.1", @@ -8042,14 +8058,14 @@ }, "simd": { "baseline": "5.3.128", - "port-version": 0 + "port-version": 1 }, "simde": { - "baseline": "0.7.6", + "baseline": "0.8.0", "port-version": 0 }, "simdjson": { - "baseline": "3.6.2", + "baseline": "3.8.0", "port-version": 0 }, "simdutf": { @@ -8085,7 +8101,7 @@ "port-version": 0 }, "skia": { - "baseline": "122", + "baseline": "123", "port-version": 0 }, "skyr-url": { @@ -8141,7 +8157,7 @@ "port-version": 0 }, "sobjectizer": { - "baseline": "5.8.1.1", + "baseline": "5.8.2", "port-version": 0 }, "soci": { @@ -8289,7 +8305,7 @@ "port-version": 3 }, "sqlcipher": { - "baseline": "4.5.4", + "baseline": "4.5.6", "port-version": 0 }, "sqlite-modern-cpp": { @@ -8301,8 +8317,8 @@ "port-version": 1 }, "sqlite3": { - "baseline": "3.45.1", - "port-version": 1 + "baseline": "3.45.2", + "port-version": 0 }, "sqlitecpp": { "baseline": "3.3.1", @@ -8542,7 +8558,7 @@ }, "theia": { "baseline": "0.8", - "port-version": 9 + "port-version": 10 }, "think-cell-range": { "baseline": "2023.1", @@ -8565,7 +8581,7 @@ "port-version": 3 }, "thrift": { - "baseline": "0.19.0", + "baseline": "0.20.0", "port-version": 0 }, "tidy-html5": { @@ -8726,7 +8742,7 @@ }, "tracy": { "baseline": "0.10.0", - "port-version": 1 + "port-version": 2 }, "transwarp": { "baseline": "2.2.2", @@ -9026,7 +9042,7 @@ }, "vcpkg-tool-meson": { "baseline": "1.3.2", - "port-version": 0 + "port-version": 1 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", @@ -9054,7 +9070,7 @@ }, "velodyne-decoder": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "verdict": { "baseline": "1.4.0", @@ -9118,7 +9134,7 @@ }, "vtk": { "baseline": "9.2.0-pv5.11.0", - "port-version": 10 + "port-version": 11 }, "vtk-dicom": { "baseline": "0.8.14", @@ -9281,7 +9297,7 @@ "port-version": 0 }, "wolfssl": { - "baseline": "5.6.6", + "baseline": "5.7.0", "port-version": 0 }, "wolftpm": { @@ -9350,7 +9366,7 @@ }, "xaudio2redist": { "baseline": "1.2.11", - "port-version": 1 + "port-version": 2 }, "xbitmaps": { "baseline": "1.1.2", @@ -9417,8 +9433,8 @@ "port-version": 0 }, "xmlsec": { - "baseline": "1.3.1", - "port-version": 2 + "baseline": "1.3.3", + "port-version": 0 }, "xnnpack": { "baseline": "2022-12-22", @@ -9641,8 +9657,8 @@ "port-version": 5 }, "zziplib": { - "baseline": "0.13.72", - "port-version": 3 + "baseline": "0.13.73", + "port-version": 0 } } } diff --git a/versions/c-/cctz.json b/versions/c-/cctz.json index 5a2d1989a9a75c..50a975f6176ae4 100644 --- a/versions/c-/cctz.json +++ b/versions/c-/cctz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd30239fce330035db98ca313f5cebaa4b76da8d", + "version": "2.4", + "port-version": 0 + }, { "git-tree": "527442456bc48c0fd960541f6489dd0ac2add02c", "version": "2.3", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index 7f7f147eb657df..608d1a9a3a14d5 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b207625af76c42809d62b804390364ea872392b5", + "version": "5.6.1", + "port-version": 0 + }, { "git-tree": "daf7cc06ce0247101d1f713013a1a12416da5111", "version": "5.6", diff --git a/versions/c-/cld3.json b/versions/c-/cld3.json index 23422054041cac..6a64aeac70f21d 100644 --- a/versions/c-/cld3.json +++ b/versions/c-/cld3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41fd2fe36358570f0bdbfaf689bf12132af99a6f", + "version": "3.0.14", + "port-version": 2 + }, { "git-tree": "a9553fd0c6e8053c54c83a51d8e93bdfab419c8e", "version": "3.0.14", diff --git a/versions/c-/cli11.json b/versions/c-/cli11.json index 3bec075409e523..82886cca6c046e 100644 --- a/versions/c-/cli11.json +++ b/versions/c-/cli11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05a104e144c6cfa16b0a896502ef96f3ccbbdddc", + "version": "2.4.1", + "port-version": 0 + }, { "git-tree": "396b497f39aff89e8cbfec62a6e2ed8bd5df73a0", "version": "2.4.0", diff --git a/versions/c-/cnats.json b/versions/c-/cnats.json index f04424341b9fb2..90b093994b514e 100644 --- a/versions/c-/cnats.json +++ b/versions/c-/cnats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "963d6b12fba8001c650cc6d56a21a1a5122cf845", + "version": "3.8.0", + "port-version": 0 + }, { "git-tree": "cce27b1efc5af15e4222a5fdc5502959f24e9d03", "version": "3.7.0", diff --git a/versions/c-/correlation-vector-cpp.json b/versions/c-/correlation-vector-cpp.json new file mode 100644 index 00000000000000..28205c47e6eee6 --- /dev/null +++ b/versions/c-/correlation-vector-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "004b3aeae78d35b82ed9672a0d94340a82bfdc06", + "version": "1.0", + "port-version": 0 + } + ] +} diff --git a/versions/c-/cpptrace.json b/versions/c-/cpptrace.json index 08512700add3d8..5737291019fe1e 100644 --- a/versions/c-/cpptrace.json +++ b/versions/c-/cpptrace.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f262cd71efd35dba535e0c2e3a447760f06f5593", + "version": "0.5.1", + "port-version": 0 + }, + { + "git-tree": "e9f72095acc3125b572269e30506eaf670cfd089", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "366e041c6686ceaee1053bacaacc3343ac716fab", "version": "0.4.1", diff --git a/versions/c-/cppwinrt.json b/versions/c-/cppwinrt.json index 993245d657f037..539f87a2b2d549 100644 --- a/versions/c-/cppwinrt.json +++ b/versions/c-/cppwinrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2cf04c5162520cb5b3784e0cf09da9416929ab4", + "version": "2.0.240111.5", + "port-version": 0 + }, { "git-tree": "a3c57356ebb8b59a5f12468f180728751d16581b", "version": "2.0.230207.1", diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 79a0fd5c985f70..cbe6fb3b1acdb0 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25dbacaabb8b12e7032cbad5e03434c983732f2a", + "version-semver": "1.10.5", + "port-version": 2 + }, { "git-tree": "83379af62bd0d170537dd4ee3abba017d4a54659", "version-semver": "1.10.5", diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json index 505c7a0634e855..6d9f94e25d34f8 100644 --- a/versions/c-/cpuid.json +++ b/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe355f57cd08fb6530cd893d7d3c130a15f2ce13", + "version": "0.6.4", + "port-version": 0 + }, { "git-tree": "38d8b8a97510236c2a41d0f903b609be0d3cf580", "version": "0.6.2", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 7565cfc630d59f..fa17b055bd4d7a 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e5908adb574672dfc7a65baa8523ae184f5c0b7", + "version": "8.6.0", + "port-version": 1 + }, { "git-tree": "dba7665cff5bd6f1a31ad0aa864fd83049eac93e", "version": "8.6.0", diff --git a/versions/d-/devil.json b/versions/d-/devil.json index 515f850430ddd5..9b5a55f5cb6d14 100644 --- a/versions/d-/devil.json +++ b/versions/d-/devil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e22a47b75583772a690e6e361fcbb3739838282", + "version": "1.8.0", + "port-version": 12 + }, { "git-tree": "03010167ad1849c5f1a8e5bc044115b3c84478a3", "version": "1.8.0", diff --git a/versions/d-/directx-dxc.json b/versions/d-/directx-dxc.json index b845b068164172..d4ccab3c0382ee 100644 --- a/versions/d-/directx-dxc.json +++ b/versions/d-/directx-dxc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf2f80689d803678032f2a8d2b8c8deff4952bb9", + "version-date": "2024-03-07", + "port-version": 1 + }, { "git-tree": "353096a360b10503e2e749b99155ba4ed6751340", "version-date": "2024-03-07", diff --git a/versions/d-/directx12-agility.json b/versions/d-/directx12-agility.json new file mode 100644 index 00000000000000..852d5754aecc16 --- /dev/null +++ b/versions/d-/directx12-agility.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9ff3410dacd22191327748dd1949cfcaf8e337f4", + "version": "1.613.0", + "port-version": 0 + } + ] +} diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index d3961809445959..6494cb3638d298 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e71fae4b2d12e35a21d5963aa8c59c8ebf5d6586", + "version": "9.29.952.8", + "port-version": 7 + }, { "git-tree": "bca406e04cfde4f63d430a5f2f10273701747f31", "version": "9.29.952.8", diff --git a/versions/e-/expat.json b/versions/e-/expat.json index 18b88e5e27e3cf..f98c8810f21ba0 100644 --- a/versions/e-/expat.json +++ b/versions/e-/expat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e75ed0e0697a3049343ccfb52fd11eea6cebc30a", + "version": "2.6.2", + "port-version": 0 + }, { "git-tree": "8deb84860eca4c337d83da3051340336d01dc57f", "version": "2.6.1", diff --git a/versions/f-/fast-float.json b/versions/f-/fast-float.json index 3b1aadbbc819d8..fb35d28169bbca 100644 --- a/versions/f-/fast-float.json +++ b/versions/f-/fast-float.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "9d389e2d9f9d9e4649f6f6d687c1b3df8cf84f70", + "version": "6.1.1", + "port-version": 0 + }, + { + "git-tree": "d4497207f1849689b21f19a9eb3e9eca03c65d57", + "version": "6.1.0", + "port-version": 1 + }, { "git-tree": "2e8d7fb4197ee346ad2f53b3028759a60d13af46", "version": "6.1.0", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 6a5a85450d6101..1776c1e4cf081f 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6498cc8e72c9193c4aacedadf34ad4477de5c657", + "version-string": "2024.01.01.00", + "port-version": 2 + }, { "git-tree": "d9bc612fada471c0339350d455290614c57027ac", "version-string": "2024.01.01.00", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index 27944753e04335..72f0c14180030e 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f85a10d88842fb71133557fba557094a71ea94c7", + "version": "3.4.0", + "port-version": 1 + }, + { + "git-tree": "dfe269a54d8d6efd00e1e5fae29381084ba5f6d4", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "f1fe757a2b2afeb57dc797fec8afe8b75b3af57d", "version": "3.3.0", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 8ff02844f13dee..f1dfcd95bd7d1a 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ee5ba62e54f65fa70bd4e1a75dc47e974ef668f", + "version": "0.7.0", + "port-version": 1 + }, { "git-tree": "156f77e07786151f8e405514ce79c0865ad13788", "version": "0.7.0", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 3bd88bc832115f..ccdd3962cb3370 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "671453ab8dafcf8bb0bbfa87a3649c26c6236942", + "version": "2.22.0", + "port-version": 1 + }, { "git-tree": "6a57a0d679af7122244a1d5180c8d43a96f297b7", "version": "2.22.0", diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json index 79f70c6892af9e..0cf4fb978adc48 100644 --- a/versions/g-/graphviz.json +++ b/versions/g-/graphviz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a91bdf5090ac2d8f9153475cf94e2df03a40c31b", + "version-semver": "10.0.1", + "port-version": 1 + }, { "git-tree": "efcf0cb433b9d901fd6aeb10a85f674352373e6f", "version-semver": "10.0.1", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 789caf91bfec85..1ed10a1378d149 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d904c97eca4bce7c1a9a0293b9101b831d0bb03f", + "version-semver": "1.51.1", + "port-version": 2 + }, { "git-tree": "cb74de57b43021aafda930876608035b03eb80a8", "version-semver": "1.51.1", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 7701af112cf656..b6fae75bed453b 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1526ee7fd00ec5ec6eac90cc5c8b0c007d25f0f4", + "version": "8.3.1", + "port-version": 1 + }, + { + "git-tree": "872c170e285bef0254f027a2064b0b6e1151b939", + "version": "8.3.1", + "port-version": 0 + }, { "git-tree": "f22f35a345a42b356292d5c480208c6c395ed5a0", "version": "8.3.0", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 69924c9675b1b5..9bfa49599c8800 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd30ff59dbfac290a1547dccc5ba44646fffa018", + "version": "74.2", + "port-version": 1 + }, { "git-tree": "8fda8f4d0ca5b0a97ac61432d85ad0449995a763", "version": "74.1", diff --git a/versions/i-/ixwebsocket.json b/versions/i-/ixwebsocket.json index f30b384472f6e9..3ed9119778f400 100644 --- a/versions/i-/ixwebsocket.json +++ b/versions/i-/ixwebsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ed140846f1bcff7c1abd98f10d8e28a7e458d1a", + "version-semver": "11.4.5", + "port-version": 0 + }, { "git-tree": "f0154088c4d12066bd00f7794ccb90feaa1f3d92", "version-semver": "11.4.4", diff --git a/versions/j-/jsoncpp.json b/versions/j-/jsoncpp.json index 2fe36b86ea1c20..cfab3a3065c0a5 100644 --- a/versions/j-/jsoncpp.json +++ b/versions/j-/jsoncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b5b553b7c2c140b4aae6ef80a37cad727f62461", + "version": "1.9.5", + "port-version": 3 + }, { "git-tree": "203c873c5425a71cb8a0d0ada6e5263a3bd13ff4", "version": "1.9.5", diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index 83b02ef992c9ff..50f5f2de11c423 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "665cd07792ee19ad6c1c2582a75c996ac93639c2", + "version-semver": "4.3.1", + "port-version": 1 + }, { "git-tree": "61e81d296c64a64fb9c8d217d763fd61bd012b2a", "version-semver": "4.3.1", diff --git a/versions/l-/libassert.json b/versions/l-/libassert.json index 3ae110170271c4..ee993251f36891 100644 --- a/versions/l-/libassert.json +++ b/versions/l-/libassert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13ac309aa7d3056f9e42c5298157f0c6a1f4c164", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "9cdcc4bae068fc3645319ee08faba34d533dfec8", "version": "1.2.2", diff --git a/versions/l-/libcoro.json b/versions/l-/libcoro.json index 197233ad9db086..f3c35167a0f55b 100644 --- a/versions/l-/libcoro.json +++ b/versions/l-/libcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b518fbd7c395e04a3a720c1aba78a3a9a94930e9", + "version": "0.11.1", + "port-version": 0 + }, { "git-tree": "da37665bbdb4cdb391d48037308acb4db271aacf", "version": "0.10", diff --git a/versions/l-/libdeflate.json b/versions/l-/libdeflate.json index 8f30f6ce2264d5..9a75513276d621 100644 --- a/versions/l-/libdeflate.json +++ b/versions/l-/libdeflate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "021898704c19afd68d49fb56f26db8061e3c7957", + "version": "1.20", + "port-version": 0 + }, { "git-tree": "76f16e38faecc95d0dc0c1a4a2ac32a4983f4775", "version": "1.19", diff --git a/versions/l-/libfuse.json b/versions/l-/libfuse.json new file mode 100644 index 00000000000000..c3905c23649763 --- /dev/null +++ b/versions/l-/libfuse.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "587b231c6c0041d8dfb96e08c8b8686870d829e2", + "version": "3.16.2", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libjxl.json b/versions/l-/libjxl.json index abd2b435c32afa..3e7d341d3b413f 100644 --- a/versions/l-/libjxl.json +++ b/versions/l-/libjxl.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "bbc18681ca0b5dafd7e10b4f8cda55d004b62e9a", + "version-semver": "0.10.2", + "port-version": 1 + }, + { + "git-tree": "4a0c70d1ff8967afd670855a24154ccb04321de1", + "version-semver": "0.10.2", + "port-version": 0 + }, { "git-tree": "dd6af6fdf8e082629d672d105607c51bc70b07c7", "version-semver": "0.8.2", diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json index a1d52c3b1924f2..10b99fc9bfc77b 100644 --- a/versions/l-/libmagic.json +++ b/versions/l-/libmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c845ff89796041876594f8b6ef8691e8debb1c82", + "version": "5.45", + "port-version": 2 + }, { "git-tree": "65715ba20e3afecd46e0fb81326503257174585f", "version": "5.45", diff --git a/versions/l-/libmidi2.json b/versions/l-/libmidi2.json new file mode 100644 index 00000000000000..5d1ac74d893f23 --- /dev/null +++ b/versions/l-/libmidi2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1a288e500ac20489d8b7033b879f2be655959855", + "version": "0.7", + "port-version": 0 + } + ] +} diff --git a/versions/l-/liborigin.json b/versions/l-/liborigin.json index 5a32102420048e..df52796512c4dc 100644 --- a/versions/l-/liborigin.json +++ b/versions/l-/liborigin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1af8619df06f9a9519e035cd59b7bfe89f25b59d", + "version": "3.0.2", + "port-version": 1 + }, { "git-tree": "4ad9ef1e0eddb7bc93dbf08548d7daead3c5d73d", "version": "3.0.2", diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json index 2823d5d4213e82..1516ddaf0d833e 100644 --- a/versions/l-/libtorch.json +++ b/versions/l-/libtorch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc47289cdf640ce30bdd1039a49264c8381c2b19", + "version": "2.1.2", + "port-version": 2 + }, { "git-tree": "19855d043442630ea2d8060e49c66cc50c0c9d7a", "version": "2.1.2", diff --git a/versions/l-/libunwind.json b/versions/l-/libunwind.json index 2075580294ae49..98a63bf81a6943 100644 --- a/versions/l-/libunwind.json +++ b/versions/l-/libunwind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fa5d5fa4e60c42c059eb26e5b34650b8bdf6b0e", + "version": "1.8.1", + "port-version": 0 + }, { "git-tree": "3e1ae4e9ac079e529efa51416aef23cb20246e3d", "version": "1.8.0", diff --git a/versions/l-/libxt.json b/versions/l-/libxt.json index 50aec8bc7c5039..876e57b15d753b 100644 --- a/versions/l-/libxt.json +++ b/versions/l-/libxt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bb02545da1d28c209ba8d237070b61239f3a6cb", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "f31aa9aa9e1f86b0f2ca59be16b76ceb156696e1", "version": "1.2.1", diff --git a/versions/l-/llnl-units.json b/versions/l-/llnl-units.json new file mode 100644 index 00000000000000..12d2b1bad978d8 --- /dev/null +++ b/versions/l-/llnl-units.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b74d9e624d6529738d4d2bb97541dfb2b4097033", + "version": "0.9.1", + "port-version": 0 + } + ] +} diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index c4039fd6a51202..bbbe27eabfe03e 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b38326a02fb44545071f8a4ee72ca3e2bc9bd8e", + "version": "17.0.2", + "port-version": 4 + }, { "git-tree": "ce44a7977e6376d53613ed81224eb992a0b82a98", "version": "17.0.2", diff --git a/versions/l-/luasec.json b/versions/l-/luasec.json index 946180f7a751f4..d6a8986e6bc7b1 100644 --- a/versions/l-/luasec.json +++ b/versions/l-/luasec.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "705c7509f95eca94f8541a579d7c43f121ecfa6f", + "git-tree": "7274433449f340b73ab11cf6339bc54e3e96b1be", + "version": "1.3.2", + "port-version": 2 + }, + { + "git-tree": "f2a73d4b729a49aede6db4b11d904bb12224fad6", "version": "1.3.2", "port-version": 1 }, diff --git a/versions/l-/luasocket.json b/versions/l-/luasocket.json index 93873451e97ffc..4162c0089d3950 100644 --- a/versions/l-/luasocket.json +++ b/versions/l-/luasocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f28657f71683263f3eff43ee33ee55d8570737d", + "version": "3.1.0", + "port-version": 1 + }, { "git-tree": "faad47eddfeeb72b135a34c713c20f821ab0261b", "version": "3.1.0", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index 8c46547423fdfa..abd3452cf47b98 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4b6f2a9a4e1e46eb83fe8ce48b36baa58af4977", + "version": "2.1.2", + "port-version": 2 + }, { "git-tree": "db19c496e6855e8aeb3a8666ffae862910b403c4", "version": "2.1.2", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index fe043b3f171e5f..1b3bda65b27838 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1cb201479398cab55eb19e2010472c4f35b1fa50", + "version": "3.10.1", + "port-version": 0 + }, { "git-tree": "9682855a28fdd67511a8b454e361f4a7841584a8", "version": "3.9.0", diff --git a/versions/n-/nanobind.json b/versions/n-/nanobind.json new file mode 100644 index 00000000000000..4f6f7114bf62b7 --- /dev/null +++ b/versions/n-/nanobind.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "14a09776a3248629b8efbf096dcb787c01abcfe9", + "version-semver": "1.9.2", + "port-version": 0 + } + ] +} diff --git a/versions/n-/nanomsg.json b/versions/n-/nanomsg.json index 3cf18d743d9bda..b740d8395752ad 100644 --- a/versions/n-/nanomsg.json +++ b/versions/n-/nanomsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af9d00f361245784a9b5f81fc7a87d1598173dd5", + "version-semver": "1.2.1", + "port-version": 1 + }, { "git-tree": "f153ee28346c2ba03410c8845959d1d549322ecb", "version-semver": "1.2.1", diff --git a/versions/n-/neargye-semver.json b/versions/n-/neargye-semver.json index 3aa37d193f3269..051a62d58155b9 100644 --- a/versions/n-/neargye-semver.json +++ b/versions/n-/neargye-semver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "428a2c943e4edc7e3689d1975a9bf80689ceb0dc", + "version": "0.3.1", + "port-version": 0 + }, { "git-tree": "8a0361995070a733294c3533d5401a074be6f366", "version": "0.3.0", diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 15722e376fdad7..6eba5ea847558d 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31de6aa7aa2d2e068717f30e8949570bdfd53bf6", + "version": "1.60.0", + "port-version": 0 + }, { "git-tree": "3b5a94a4eb9a90dcd3b34534bd14768d94e7e538", "version": "1.59.0", diff --git a/versions/n-/nss.json b/versions/n-/nss.json index 163a4991b8fe72..09248284fd60f2 100644 --- a/versions/n-/nss.json +++ b/versions/n-/nss.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "ea00c7a5c7a405e00c94f4bf162bb5a616c2956c", + "version": "3.99", + "port-version": 0 + }, + { + "git-tree": "4ce5ce6e94d2b9179b2f316bce89214afc31e303", + "version": "3.98", + "port-version": 1 + }, { "git-tree": "92c9d14f27941f9b37f719a0a16f571e69dd5c88", "version": "3.98", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 9cc87644b90da1..efc529f4a2a61f 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "047ac9285440f0328e3bfc6e40946af616c585cd", + "version": "2.3.3", + "port-version": 3 + }, { "git-tree": "1563ee76136a49e438bd5229b68635ce8fdc347a", "version": "2.3.3", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index a8b9511de714ae..7c303b6c9a8b38 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b511cd10a4794ac25d7d8ca997697d25427e483", + "version": "14.2.2", + "port-version": 0 + }, { "git-tree": "a445b3c7be57d018422e139945ff622292cd5cff", "version": "14.0.1", diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index cf05c47567c7b3..014174c60c042d 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69ad297b15bb801f74d50be6e5d290eab7573be4", + "version-semver": "1.15.0", + "port-version": 1 + }, { "git-tree": "c143b899cbe396d82182568746203a3375fc23df", "version-semver": "1.15.0", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 5f405923f7326b..4f70b42caf6142 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "f97eabf45b244d0c7cc374e23b818627fc82ffae", + "version": "0.3.26", + "port-version": 3 + }, + { + "git-tree": "e4543de7cb4becef05c5da248b647730031bd0c1", + "version": "0.3.26", + "port-version": 2 + }, { "git-tree": "162536c889250c48f1c0aaa8c7cae66806f467b3", "version": "0.3.26", diff --git a/versions/o-/opencsg.json b/versions/o-/opencsg.json index d6e513e33cedba..2880a8bf323537 100644 --- a/versions/o-/opencsg.json +++ b/versions/o-/opencsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6979934362ae4a808ccef45ee20545d7422c8e0f", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "48c6aea4f747325a26bec13cf9a93f94c21f4fd2", "version": "1.4.2", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index a2bdf9be222e59..ea4e02503baf4b 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99e1e8599b1c2601a39f94b511b623ac51878793", + "version": "3.2.3", + "port-version": 1 + }, { "git-tree": "ccd582f25f0177e879cd408487d541865569dd3a", "version": "3.2.3", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 91bddacc262414..65854dcbd501fd 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dc6df970a3aff9c977032299e481fd9872e0970", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "53fb72a19981a3439cd569f58b722ca6cd26e23d", "version": "3.2.1", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 40d4e8d9844b22..02e47a455b371b 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63d5d70476050457412d48f466d6215430c8ba64", + "version": "3.6.5", + "port-version": 23 + }, { "git-tree": "27f28ccf9745bc2ca1757d5fa32b92373c176e2a", "version": "3.6.5", diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index 3f13fcb1fb99fe..6d7dcaa37cebfa 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4e2fc2791da985acdc7214048c247a151d5b492", + "version": "1.3.12", + "port-version": 0 + }, { "git-tree": "48536bee28b7473d0e838f70946ddfe8afdba2e2", "version": "1.3.11", diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json index d6876c736b8c7c..ba5847899886eb 100644 --- a/versions/p-/paraview.json +++ b/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2dbdde07d29c13b69e83fb0a022568b3c20c4b4c", + "version": "5.11.0", + "port-version": 5 + }, { "git-tree": "2aa3d8185a319a76c7961608ecce8b2f03c08cd7", "version": "5.11.0", diff --git a/versions/p-/pe-parse.json b/versions/p-/pe-parse.json index c70d96a2bc2b38..495af662ad6418 100644 --- a/versions/p-/pe-parse.json +++ b/versions/p-/pe-parse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20bff5e992991e9824bfbcd42ea6a52313cb5446", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "d3e0e5dcb11738632d8eba03e22e4f0530ae5445", "version": "2.1.0", diff --git a/versions/p-/pipewire.json b/versions/p-/pipewire.json index f444034e17555c..d79fcb929630ae 100644 --- a/versions/p-/pipewire.json +++ b/versions/p-/pipewire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bb52f74312866063db30d304e9991779e574e61", + "version": "1.0.4", + "port-version": 0 + }, { "git-tree": "7bc7a0a813fb6a8e867d028bfdaf12d3f56a3893", "version": "1.0.3", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 488d8ec75d61b6..313c0fb8d0251a 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7e1a97a6af1ad657489f901a6ca14db24652eff", + "version": "0.43.4", + "port-version": 0 + }, { "git-tree": "2818a78546de0d60e38b89011073ff7ae398796e", "version": "0.43.2", diff --git a/versions/p-/plf-queue.json b/versions/p-/plf-queue.json new file mode 100644 index 00000000000000..81c4a117aa1674 --- /dev/null +++ b/versions/p-/plf-queue.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b0c79130ac83677dbf3cab43a5a8f17b0e5b1307", + "version": "2.2", + "port-version": 0 + } + ] +} diff --git a/versions/p-/presentmon.json b/versions/p-/presentmon.json index 0c09d35d5d749f..afc9c10fd6502f 100644 --- a/versions/p-/presentmon.json +++ b/versions/p-/presentmon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "417fbf81c84e94583e4e8b852412d15e799cfd99", + "version-semver": "1.10.0", + "port-version": 0 + }, { "git-tree": "a0ec5e22d9a5d03756ac641d8ff2430beae43080", "version-semver": "1.7.0", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 9fa4f9fe30582f..9b9986f79ddcee 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb6dde32780fc4b189c12148057083b4c01dd936", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "cd6a0c4b4f56e81db4ba5fedc5e07b8b2b896780", "version": "6.6.1", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index ba1b4ff6df2237..c7e1d299c7f6f4 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40f41c50f42a8c28161eafd2d71221d022e2b4a0", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "920720dacbd54815ea9eba023787665002d80269", "version": "5.15.13", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index 10a4eafc748a62..be3866a0865eb3 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a130d6cfe8f5c8bc2c50c9c57b40a3d5e7b28e4", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "0c82721fd67fa6bd970284211188c2861c4313f6", "version": "5.15.13", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index f77a4b2eaba9de..1529ab5026dfd1 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "375d6f1120fa00a552ebd11e93c94d95238bb39a", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "28b06b7abffcddf201952919aae9397213a4345c", "version": "5.15.13", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 9c745d6fd2596d..7cfe841e5384df 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a70734eb07533aeba97b75a928fdf8a47d1e1d3", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "ad1dffea8d188fbaf56e7d2564455b96bbce57bb", "version": "5.15.13", diff --git a/versions/q-/qt5-canvas3d.json b/versions/q-/qt5-canvas3d.json index cee8affb1702bb..b6e1b63b0342a6 100644 --- a/versions/q-/qt5-canvas3d.json +++ b/versions/q-/qt5-canvas3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6eabe120e34d802212e8de6796e94394cdbed7ee", + "version": "0", + "port-version": 3 + }, { "git-tree": "335184e95b862a3548cd14e4336e870082fde3d1", "version": "0", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index b219fb2c165b50..f1056b717ef723 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65e3230f587989f947f60f62b71864c81d6bd30a", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "24b198d23e7dcbb9a1916ebcfd5b81bcdbef5875", "version": "5.15.13", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 9e1b64b996a429..7117881b304950 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19bb2b3181001464cf27869c3831dacc816e876d", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "bc90db932309d5ebd204c1a30bf0472c2fe3be9e", "version": "5.15.13", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 21e06e313941d1..26da00e068b096 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cfa9580cf5f5d29ccd61c28bb9953affc9456ec", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "3eba515f1c990d7fd69cbd6397059d56ed9e3a18", "version": "5.15.13", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index dde0f7b2b7775d..499ecb41bcfb20 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c8f405906dcc3851dc4f0e7adeefada55f409cc", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "3bdbddea018d175d898cc81dd37f1a4f8d61175c", "version": "5.15.13", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index 0910172a6815cd..f225f383c14666 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7747518fca79a6ab60ee215c73e5e4d3850b0694", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "1877940a1e172665b2287d83216c6ced80476bfe", "version": "5.15.13", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index 7665a67d5def82..54392dc51b8533 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12953a0ff2b94f56e649d6e21de059cd43d186a7", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "f50823e53543d711efe3b2a33f8bdbb690d0791d", "version": "5.15.13", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 4a9d16d84bc3e1..6921953552f569 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5e7474e7d7ad22084bbeb7088ab7113c28ba274", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "886bdb135e50dc31ce6234f0631af2f33be99921", "version": "5.15.13", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 4da9d469d56c90..f28b91d692b516 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0550d47da0ca6e1944634ea33d3cfd1c0fcc644", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "524ec23c474d0de593698dc3f63281eb2cc8bfc5", "version": "5.15.13", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 715a4541f46fd6..683ec203207351 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79da70b83292374a09bc6ea61323ae0cf2c32c4c", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "2c1137ae40b2917b10223eaa2600a547bc313a97", "version": "5.15.13", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index 3ad6b909a9d493..129a0ef5c730fb 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c2e4efcd96bfb18b4d3cdae9a6011dbd21a7f9d", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "2e48fad784046b957d98272b803c255c22208e48", "version": "5.15.13", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index 4e22da3c0084af..a3d3e1d6765821 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6bc46f3ea62b6bd94d34c2f7272b0fe57d660ee", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "a8c3a2f3d282ccc596c339d8a5c5fe543215e801", "version": "5.15.13", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index 4023b577d92de5..587fe1a2786a3d 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b86c9499d398deb129644bc82d467850135be8ad", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "ffe874b0b45c9f257b487b960e17fd21e3fa2ee3", "version": "5.15.13", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index 4cc1b1f99fc8f6..b6f15892f3b816 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2516c53ca2fd773a8995dc6f14599515336ee08", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "b9f58d29ce83acfb07a3a932d5b01d0385dfd07d", "version": "5.15.13", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index 1ae0d6329228fc..e6aa7d2e5f793c 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cddbc37874945361670fc45fbd2811d5eb2d28f5", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "4371bc4cf906924ed77c0e651fd2e9b5a1c96aee", "version": "5.15.13", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index 9aff5dde9e59da..bbea3fdfd54093 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b447abbe0f7bb140e91e562de4b26bd36b09aeb1", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "c1b99bdf7e6457509e5d334d3d5c50d8a15447ac", "version": "5.15.13", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index 2b29132a49d29d..647d1a94abde94 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2498ccd771f2a709abfc72099db0928d20e178ca", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "c03c44f1db5faa1c16ac3b9a603790c901c0a499", "version": "5.15.13", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index d59e69a0b4e03f..c97aa655ee2da5 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ef451e0c39e315bd0e4e27a068587119e7a972a", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "621f7d70212c06f6c9af11a509856362f81f8569", "version": "5.15.13", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index 548297cbf6bc04..a98aa0da8828cc 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e68a59e08e0a2da169c8b6b72fe52ce980d0d471", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "2d874a5459cfc43e0b64f4977682df651d36ca2c", "version": "5.15.13", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index 8d777913e17318..a1d825bc9d0235 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7af091bc3daa565fdc46a0a8dbda3fdf58fba6a", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "86c8999645ca845a082741917d719497e7350475", "version": "5.15.13", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 2e72cdd655de8e..616849f5968ad9 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58affe223cf8fa973829b45110e731c021ad0339", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "7c300f7d2ae5260e4e7e858be6863f1dc2f0dfa7", "version": "5.15.13", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index ee2f9bb55635c4..31ffa2c4e7374a 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e20e90150a61429cb4c0aba17da3382cf431c025", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "cd325f2c71cd8a32d292c9bd3b7cc5f04f96c5dc", "version": "5.15.13", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 81abd71edbc374..3d198130d6f661 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8e9da74ac1e561758ff70d80a4e0b8514365f4d", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "72dcb5db8787e879e6d1964091806e5401f63e55", "version": "5.15.13", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index b28519bde9da43..29219d2fc9bef8 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "546a13d568e272c2d2d953c36ddbaccdc55405dc", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "f97c1715e4239f661c3c8ddd296f09757efc1cac", "version": "5.15.13", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index 58b30671031b02..76e43f10e8ba0c 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "166f2eb6325bf183cd42449b1ac97dc47d8528b5", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "f8920d20da6df3f53f7d1aa625a8c5100eebe2e8", "version": "5.15.13", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index b5c7fb615897af..a7f7c0462403a4 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a1274dd5db76e90f790450ddb12fdd278f24274", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "43e74504e1043a3ffc451dd97de5b62fecc40ad1", "version": "5.15.13", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index 58dedb63cfafbb..0bcb7ade3fc13d 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d686082b7f012670dcb7495b48a42313850a0feb", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "a196bda4c5a9871354ad65207fe7d0568baeabbb", "version": "5.15.13", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 12a4ffd75ecc46..0f57437cfa4cc0 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "166158a3a6c2673b41805de95d2bc8e3a43c47e7", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "0a52aff690b9816afe0790ba18047f3d2e6b115a", "version": "5.15.13", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index c8ed853b8e77df..7853c9ff2eb823 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4910b1e32c56d7e0e334017d6be340737f694e95", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "fdc6cc42c7c04faaf48faffbdd865f2761966512", "version": "5.15.13", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index a3c999fc305859..71960d52839b60 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,20 @@ { "versions": [ + { + "git-tree": "58ef6b79a9cfe23e3a196d3a38970c5c48b1a15b", + "version": "5.15.13", + "port-version": 3 + }, + { + "git-tree": "91b4cbf2c91549380aa26377330c142a6e408414", + "version": "5.15.13", + "port-version": 2 + }, + { + "git-tree": "0214bdc43ab8f108c976e57f4ae394032671d123", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "ed4c5992bb51331d2a5c27612b74bd3894682220", "version": "5.15.13", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index fa95016cc11406..3248a9a03c3462 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "467935b4645825b1aa486f5f29cb3771a109ee5f", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "7e89c0ef3ec287561568f4ffa7a82ed8c50e6c86", "version": "5.15.13", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index e405bf20d0237d..f5ae20986eae4f 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6faa38f9a8564149884c1695ff49decc57df534e", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "036b9318534e9f37e31ef44a86500cf9807a0a73", "version": "5.15.13", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index 8e9c318a928a07..7c5ad835c070e1 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d20b00e191cfefb9d9dea3cdbe0d18afe346139", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "7263c6930cff830c14124e00b5709b1bb422fe6e", "version": "5.15.13", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 60133690096917..03c3561aa01e8f 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14982aa9dad227454c1c989bb1349e38fd6bf781", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "c88ea2c4ef0a7d9643831c4f4a62a3aa072f4b85", "version": "5.15.13", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index 79efa4d34b5cbb..6cbe215ad29515 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3e8637f570dc0c2a5e5085b118e72bc1eaa1d95", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "ecd842a58462f72e689d6dfa6f47b4d3d713b9f2", "version": "5.15.13", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index cd064fa154628c..266717b93c5209 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "786fa91be5c33fbfae7705d4ad23714b384c8bb9", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "3735031c6e2d227ccfb265442feb1f7e9c2c3f0f", "version": "5.15.13", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index dd2d48e84f6957..223bfb801a8e2c 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7256778e43dd4f8b09a2192ce5ca10b9d1050ed", + "version": "5.15.13", + "port-version": 1 + }, { "git-tree": "3d2166fa5cbb5cee46f8726e103c82d7a61ff9dd", "version": "5.15.13", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 02836c8234d473..d58072c3085a34 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b51b1cb0195c77f67d21740b2accd483a13612bc", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "31c729a2bff1118d75ed9a363b40ac1aac61fe54", "version": "6.6.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 246953346bd1f5..5d8d48aa7160eb 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e811ae376e4bc28336b62caaad1d59c277db3b98", + "version": "6.6.1", + "port-version": 11 + }, { "git-tree": "697f89ff528ad2e1e71821f9c549855dd62a2531", "version": "6.6.1", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index ba0a6090435c65..03f78e91ca9ffa 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb28c3d2743cec145f3de4828b968dfe68e4c023", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "95a1151d8a815110f6641a373411d5b2783fe89b", "version": "6.6.1", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 7ce0a499012391..e89df3037df5e6 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bfd17e64447b838615c8040de79dd4da35e3912", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "0a696a475ba2d214cb228b5b83ae06a875a342b9", "version": "6.6.1", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index 469a036dd65054..80893784ce215a 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c49aab0054c4071531e96e1631482922ecb02103", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "83b610993d47952dc7cf1a117899d35d1232eaf0", "version": "6.6.1", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 7c4d23c73487d1..63f04524d51da3 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6c2195cbcebc43f3b1a8a2fcf825dcf9a5b9795", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "22f5db80fc03af7c934a4f48d79e9df63514383f", "version": "6.6.1", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index d55180ce22ebed..7ea0ba3a8660c9 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b48df79f10863863c9644dc3a5d48261e1741399", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "4d4936a7676dacfd1954ccab4ab56cf66fc29d12", "version": "6.6.1", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 148cce57cfb708..33cb08567f112d 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe32740c67fae0c711b7a08cc21dcad8ba78a1c7", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "5c1caa1eb1ce53c8e7096dc477c0878a885157b6", "version": "6.6.1", diff --git a/versions/q-/qtgraphs.json b/versions/q-/qtgraphs.json index 77a4b750f196bf..300bda31f68f4c 100644 --- a/versions/q-/qtgraphs.json +++ b/versions/q-/qtgraphs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "392fc5d8111b46250ba14fabae8b4e1cc56ca452", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "ae9bcc804f472bd60275ad1f73a8cf12574390ea", "version": "6.6.1", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json index e9f15ec4abd1e7..25022f942c1941 100644 --- a/versions/q-/qtgrpc.json +++ b/versions/q-/qtgrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "440431e6c48d25cb7b488459e1ca7427ead655a0", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "4abad64b5fbebe9eff491e26fe91212b0c55e094", "version": "6.6.1", diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index 7398cdf068e5de..c73120ea87e93e 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da6cdbb80bdb3a2d5090ebab4073ad48b76c99c7", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "5f14429d07fb8ad95b822c2a330f11cb3423e67d", "version": "6.6.1", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 7d98d1e72773ec..751d86e2685a78 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0956fc6353f26780b3a6acfee4e971ac47e50841", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "7fc433dbdd7a4f8151de5219b08d18f9a3296f8a", "version": "6.6.1", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 21da0609b66887..4bd2c3f175a7de 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "286528d88ab9726631948dc257a9c2e4b0634cdf", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "1bcb4f2fd5111908f77a8b70692b935ec23c2d27", "version": "6.6.1", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index 804fe0ee349404..cb4c3ad067e66b 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48a26193906717732192fe55d75108fab2bd05f7", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "6f636ad4c9bb289cd9ea0eaa1e876a7189670736", "version": "6.6.1", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index f58e03d3bb3144..69c1e4948b77be 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75ec4c5f6560016efb9a889f0de1b94c3c64ac56", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "b7cf327c103531729a525c4260e10f49ee99cbb6", "version": "6.6.1", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 4dc3b8c5aa3919..02824ecd226a5a 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9443cb1765eedb89f4b857e8ff2ecd46b66b524", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "c2551a8b3a525cabea535ca067c247df902082fb", "version": "6.6.1", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 6db5e28c77c200..9a93ba2eac4868 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d5afb73f54a208a59182700309c9fbe8078f22d", + "version": "6.6.1", + "port-version": 2 + }, { "git-tree": "52e73bfd242a271f6147df96f811412a325e2bb7", "version": "6.6.1", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 0fe51427250b30..01a5960a210a39 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "348245444fca45b4bc4f7682c5ff0fd158bbdde7", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "89ef84d21ebae8cf3d9270e70ec6cc31ce053df7", "version": "6.6.1", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 89e2d60274bfdf..18dbdcedc564cb 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c54446992c9eaa1ba5d8ddfa6c825fdf96664119", + "version": "6.6.1", + "port-version": 2 + }, { "git-tree": "158f8110a6d3d504c64bf24e2ec68552b8e34097", "version": "6.6.1", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index fd0e3668b5527a..66ea07462e01fc 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39f7f1e1b515138796da0d1a653cb3aff5b999b7", + "version": "6.6.1", + "port-version": 3 + }, { "git-tree": "40a0c9a9db2b270e73edaae7f96073f764ad2078", "version": "6.6.1", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index c6d16e50c0baed..49791bbfbbffd8 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ed7f8cc1d148f88c13248aafa35a41c3ee47b75", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "1fa6e34d1ad27b721739dd6c25b6bc7af7280ba4", "version": "6.6.1", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index 6e4770babf62ef..b3239fcb5a3e29 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d5b862d7570339bf38b27f2566d3180b14d6941", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "975bb448a0623c02d5fd2334d5febe0dfa7603e3", "version": "6.6.1", diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json index 2ac3400b97a874..e457909c85ad4a 100644 --- a/versions/q-/qtquickcontrols2.json +++ b/versions/q-/qtquickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae7b20296147550e9f140a1ee26dbfc6a75cb0a1", + "version-string": "deprecated", + "port-version": 1 + }, { "git-tree": "8f018726e72742c98506b024d91adef2e4b95c6e", "version-string": "deprecated", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json index 916fa90666fd19..b5e8756e97462f 100644 --- a/versions/q-/qtquickeffectmaker.json +++ b/versions/q-/qtquickeffectmaker.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a46d4169bde5a8e080944b869213abea6e620439", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "1862d1d3e018b1e69bf86a2f404e7f94a4ab5213", "version": "6.6.1", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index b98789bbf5752f..1b793b28855dc2 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24944c4ccccfe09fa7d3041261c22066601282f4", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "4efff9158d154e6277cbab103862ac4ba8d0ffb2", "version": "6.6.1", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index abee2b81f8307f..ba36f7618651f2 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9315ff28f5558aeb5b7c4dbc07107df65c41c02b", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "c76d00e0a4811d4854281c90e35c122470fc179d", "version": "6.6.1", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 09094298fc9754..01b42d8613e283 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd5932be8eab58855045ed91779259b9723ab7fb", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "02277a0edef829aa3f48719ea0fc080230eeb7d3", "version": "6.6.1", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 7d202ad0f9d346..4a6e9559ab413d 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2631b05732a594e197be6a8d4962f799819330e", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "4b3f793528f4f59df67bcd9598c4d5878402ac6b", "version": "6.6.1", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index cda4c1f6d43004..10908cb9613c89 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "877011d7cd0542605b81ed883848f5b76ef1ebef", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "2eaae9870e669397b0ae6da75224f99fb23b6005", "version": "6.6.1", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 4c3e9664aae8db..bdc9fd67bc0757 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9ef0814224312e9d2a244a44bb4152bd70de926", + "version": "6.6.1", + "port-version": 2 + }, { "git-tree": "5bfa96397e62f539b329016ceeb31a4c7fa1b9ed", "version": "6.6.1", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 3856b9516a61ec..482c97d226d1fe 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8264a57d51022b91d8e0770b71e385f3de696b4", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "bf2116fb4c0cdd945db89589094443e4304e043f", "version": "6.6.1", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index 78aa66c18b314c..defc4ed6b88f27 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79aadd005de023714474d850e447f069a007c17f", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "3be7b2606212665cabee66d33b125a452ab18b26", "version": "6.6.1", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index f7fc4c1518a3ca..7e5e6eeb6dbcea 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc657fa717eb7a0f3b91bc9a224a61f2690c1e3e", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "654797512930b598c214eea4834db531b1bba48c", "version": "6.6.1", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index e69cebdf19b532..ead6cf78c94f83 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2af13e635fe64a3289630e5e1415b36ea1aa88ec", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "727534f61f2786b70ed0ba51c56fc9dcf2191fb4", "version": "6.6.1", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index 2da31ed8fa1965..be8604caad297b 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8133254a0073834da07baa3f633c6001d0da7ea9", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "c6e6d58f96b90b6fca92cabacdd98fbb9d79585b", "version": "6.6.1", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index cea94ca5fb09f1..606b264cbc5687 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80ab9f441d73bb81000237272aae0a1bf3a4e0c0", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "0ee9cba56e75f0dab9bc3118345e48ae39beef3c", "version": "6.6.1", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index b08a904993fc76..4aeedeb9b3d8ec 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b32543bf2cc03efefb300a8df2c3a43b3b46928", + "version": "6.6.1", + "port-version": 4 + }, { "git-tree": "d2585496a5eec4f9f08df3a69483157640acb3cf", "version": "6.6.1", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 656a51b5ede896..629b2bb85407a8 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8819ac46bcd0b16223ff27ef1702f5431b16b55d", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "381d32890ac07fd2b095bcd55d9954e962c6b3b6", "version": "6.6.1", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 0618f133eb03f8..703595cd5abb8b 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a9fb29b722202dd1dbf6e3da5bc3b54e8dc6f65", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "6d46010ea6deab96d673fa42dfa126641472a808", "version": "6.6.1", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 6e1875f3711eb7..f8594d2b258e87 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "1baadc387cdf462b4cb8d5982f15127cf8ee5ed1", + "version": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "81e17cd69f71a64d4847ab108ed917613cc53d2b", + "version": "3.7.0", + "port-version": 0 + }, { "git-tree": "b89cd42d5b7c6ea3fb7ca7daa2469d661b9f4b94", "version": "3.6.0", diff --git a/versions/r-/robin-map.json b/versions/r-/robin-map.json index 3aabec38fc785d..272bcea326d8ce 100644 --- a/versions/r-/robin-map.json +++ b/versions/r-/robin-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "061efd5e82a37c4e5a2d196c9e8370b2c3893f73", + "version-semver": "1.2.2", + "port-version": 0 + }, { "git-tree": "1f0de8df8eb08609cbc9eeb91cca774b0664b588", "version-semver": "1.2.1", diff --git a/versions/r-/robotraconteur.json b/versions/r-/robotraconteur.json index b66d8f4aabb3bc..fb51315c369deb 100644 --- a/versions/r-/robotraconteur.json +++ b/versions/r-/robotraconteur.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da6a4cf1a0949a70ff94feb0df9241b73c88a249", + "version-semver": "1.1.1", + "port-version": 0 + }, { "git-tree": "3c14da3e3dcf13b70904a04d988437c786032398", "version-semver": "1.0.0", diff --git a/versions/r-/rocksdb.json b/versions/r-/rocksdb.json index 123eaa7ed8e9f8..9b822c89648cc5 100644 --- a/versions/r-/rocksdb.json +++ b/versions/r-/rocksdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cb8ef91306fda868ede38beecc64af96d804923", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "83270ff433858db27ac486fe2cf6f9c1e96b5576", "version": "8.11.3", diff --git a/versions/r-/rttr.json b/versions/r-/rttr.json index 7149a6df7a557d..6c0bdeb3fd5a2e 100644 --- a/versions/r-/rttr.json +++ b/versions/r-/rttr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "942efa7d91154b3d9841608a015b1c216ca0f251", + "version": "0.9.6+20210811", + "port-version": 1 + }, { "git-tree": "efee986c87a05c8b3257d2aa4d793441af9e970f", "version": "0.9.6+20210811", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index f6d94d3422b371..b3fcf8b70499d7 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3635f81751369912771ffb2bcafe46edec201fa5", + "version": "2.8.2", + "port-version": 1 + }, { "git-tree": "849a6f697c249f583d942ce2ce08ba3e4a9c195c", "version": "2.8.2", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index ee49538cc352a3..46d62ab1db76b9 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "dd4194d58e9c97835f6d38257f1af245e659e2de", + "version": "2.8.0", + "port-version": 3 + }, + { + "git-tree": "6c3753de43f2caf437f28a171665f37abe890109", + "version": "2.8.0", + "port-version": 2 + }, { "git-tree": "b28cae64adf73bec946de9f037724763eb2ef1b2", "version": "2.8.0", diff --git a/versions/s-/sdl2-ttf.json b/versions/s-/sdl2-ttf.json index 3c75ee4daa6cba..b072d1a7fde2b6 100644 --- a/versions/s-/sdl2-ttf.json +++ b/versions/s-/sdl2-ttf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f37d3fd61ea556591921d6faca01c9e309e4a091", + "version": "2.22.0", + "port-version": 1 + }, { "git-tree": "51a85aefcfb3e578904f1cbd72a9f49ff836b928", "version": "2.22.0", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index f936da00108ef1..a1c778f0ef2e9e 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71b609d356d21c9479ddeb27f4737ab70982f4a5", + "version": "2.30.1", + "port-version": 0 + }, { "git-tree": "4ab64007873e4e383360819f5227ad0747c649d1", "version": "2.30.0", diff --git a/versions/s-/septag-sx.json b/versions/s-/septag-sx.json index b520a31674a099..07dba42385f0c1 100644 --- a/versions/s-/septag-sx.json +++ b/versions/s-/septag-sx.json @@ -29,11 +29,6 @@ "git-tree": "b3ce911c8e33a6b93f67b77676b8b52ebafc9d8d", "version-string": "2019-05-07", "port-version": 0 - }, - { - "git-tree": "b9e21c1d4135ab98fcecc9970d8520afb9b39743", - "version-string": "2019-04-27", - "port-version": 0 } ] } diff --git a/versions/s-/simd.json b/versions/s-/simd.json index cc7f40901a3424..9cbe12138ce769 100644 --- a/versions/s-/simd.json +++ b/versions/s-/simd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffd162c11ab46810863df261f1f373ad008af239", + "version": "5.3.128", + "port-version": 1 + }, { "git-tree": "a2b30d3025f099db089990aed91ded39c41ffccd", "version": "5.3.128", diff --git a/versions/s-/simde.json b/versions/s-/simde.json index 3f860fd31085e3..f75793ba68aeb2 100644 --- a/versions/s-/simde.json +++ b/versions/s-/simde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3587acebc7192f6263ece74c3bcf801b86d3cb49", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "3776be38dc5cf963db0a97cbb5b043488c43b79c", "version": "0.7.6", diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 0cebaef7750fef..c162302c66b3e5 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "7f48b617fe3a457c9e73141e9e382529a558e820", + "version": "3.8.0", + "port-version": 0 + }, + { + "git-tree": "2adb8c3282818e83fe032201eb62deabdcaa44ae", + "version": "3.6.2", + "port-version": 1 + }, { "git-tree": "85480e0db4ff161c74400267ba3567d038fb15c7", "version": "3.6.2", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 6d623350a811c2..d758ba3c9da983 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e107ca309d637ff07344abd1f1a73b58e36ca152", + "version": "123", + "port-version": 0 + }, { "git-tree": "24ac468e6d009a532784555a2b2cb466683ca914", "version": "122", diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index 84ff0173af267f..53b7ca2714c6b9 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76f1250dd3467c2c7d30a4871fcfcde9950ec82d", + "version": "5.8.2", + "port-version": 0 + }, { "git-tree": "19bcadb4abff7ed5b5423eca7280259ab6b3045a", "version": "5.8.1.1", diff --git a/versions/s-/sqlcipher.json b/versions/s-/sqlcipher.json index 715ef7ea632d7a..20d525d182e017 100644 --- a/versions/s-/sqlcipher.json +++ b/versions/s-/sqlcipher.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd71e0db4fe329a414dd99173f358d4bfe3eb847", + "version": "4.5.6", + "port-version": 0 + }, { "git-tree": "81b4c14ac8275c922f1a972db7452c98b002526b", "version": "4.5.4", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 8504a9dc179e1a..a33bdbcc600ddb 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f835055a43b1f593986f816f564614ae5a8c3c73", + "version": "3.45.2", + "port-version": 0 + }, { "git-tree": "4e2ae6bc4849b52c6cd2e2d51c110f69ac3901d0", "version": "3.45.1", diff --git a/versions/t-/theia.json b/versions/t-/theia.json index de8ab5f9cef438..095657ad09030a 100644 --- a/versions/t-/theia.json +++ b/versions/t-/theia.json @@ -1,12 +1,12 @@ { "versions": [ { - "git-tree": "244b1ee4928a23a5394691a642a1b56125198228", + "git-tree": "e0486585337480c0d2d32a30cebbbc14be00eec4", "version": "0.8", "port-version": 10 }, { - "git-tree": "f33100aa143474a7207ee0f2ec7daf0fda3a74a5", + "git-tree": "244b1ee4928a23a5394691a642a1b56125198228", "version": "0.8", "port-version": 9 }, diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json index 97acd53979a50c..3db38c52235c04 100644 --- a/versions/t-/thrift.json +++ b/versions/t-/thrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6855be1ce96497811d4eb0a9879baf6cf1b3610c", + "version": "0.20.0", + "port-version": 0 + }, { "git-tree": "a85bec1a50438e0a5d4edbfb7d507a26ace7f010", "version": "0.19.0", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 61fd22f1215653..b3f77617247b4c 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6be8e3b56374cde0053ca09807520831c97f4441", + "version-semver": "0.10.0", + "port-version": 2 + }, { "git-tree": "a85cd6613805e9be8538768a8b03e5f04dabe490", "version-semver": "0.10.0", diff --git a/versions/t-/try-catcher.json b/versions/t-/try-catcher.json index 741ef4487322a3..95be6d512f5702 100644 --- a/versions/t-/try-catcher.json +++ b/versions/t-/try-catcher.json @@ -4,11 +4,6 @@ "git-tree": "d1059d2b27b1ec41ff2c734707359af6f2f1aba3", "version": "1.0.1", "port-version": 0 - }, - { - "git-tree": "df67c1225008bf10a22e3da1aa5a27a42e38e223", - "version": "1.0.0", - "port-version": 0 } ] } diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index fc498441de5876..c50df4297f1075 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17b86f3a18ad63659d4dfbafc194969279a7a4f0", + "version": "1.3.2", + "port-version": 1 + }, { "git-tree": "7b3bad7cb3eec367da9a8f2c6593b25e00720c66", "version": "1.3.2", diff --git a/versions/v-/velodyne-decoder.json b/versions/v-/velodyne-decoder.json index 1d861cc2e57523..ba3fdd22dbfe26 100644 --- a/versions/v-/velodyne-decoder.json +++ b/versions/v-/velodyne-decoder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "750a76436e6efb88a97b30a3a4c17ccafe869f2a", + "version": "3.0.0", + "port-version": 1 + }, { "git-tree": "14057817c4d38c4c315e12a837213035d5f8eed0", "version": "3.0.0", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index b927e043ae3c1d..c6a3761f6f46d0 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e887b758153039453976be1e5d0bc54d537b0417", + "version-semver": "9.2.0-pv5.11.0", + "port-version": 11 + }, { "git-tree": "6365f197946995803914141a82c1830d165427b3", "version-semver": "9.2.0-pv5.11.0", diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json index 4202269162fe26..0f8f2d57b67a1e 100644 --- a/versions/w-/wolfssl.json +++ b/versions/w-/wolfssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45cca8d8dd8cf4b0310f1c4bbb84c9332cdba032", + "version": "5.7.0", + "port-version": 0 + }, { "git-tree": "c03fac0a968b9bdba85d3baba48695e82e1e297d", "version": "5.6.6", diff --git a/versions/x-/xaudio2redist.json b/versions/x-/xaudio2redist.json index 1200b508cdeb1b..eac07c946dfff9 100644 --- a/versions/x-/xaudio2redist.json +++ b/versions/x-/xaudio2redist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6cb8fa89efa0d50385ddfb245b02ea67197b0d6", + "version": "1.2.11", + "port-version": 2 + }, { "git-tree": "ea44b309cb33ba705034f328310347d43680d0ee", "version": "1.2.11", diff --git a/versions/x-/xmlsec.json b/versions/x-/xmlsec.json index d52bf06ce1ae32..97949083ffb469 100644 --- a/versions/x-/xmlsec.json +++ b/versions/x-/xmlsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61ac924bc037a2bf6e8afdc898b6d21f0a25c519", + "version": "1.3.3", + "port-version": 0 + }, { "git-tree": "66d4ee9a9a576f6af80a2b830becab2f6ee7beb7", "version": "1.3.1", diff --git a/versions/z-/zziplib.json b/versions/z-/zziplib.json index 591e6049a8350c..e15236c7a01a96 100644 --- a/versions/z-/zziplib.json +++ b/versions/z-/zziplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a525f08ad4196f5324f29cd4f77b50ad7d39af58", + "version": "0.13.73", + "port-version": 0 + }, { "git-tree": "4408845ee5c914b49838db10b1e7dec234ee5981", "version": "0.13.72",