From ffe14b97c25717b1dd680227b04386332974e95f Mon Sep 17 00:00:00 2001 From: "Craig Edwards (Brain)" Date: Mon, 21 Oct 2024 07:05:13 +0100 Subject: [PATCH 01/21] [DPP] Bump to version 10.0.33 (#41688) --- ports/dpp/portfile.cmake | 2 +- ports/dpp/vcpkg.json | 3 +-- versions/baseline.json | 2 +- versions/d-/dpp.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index 1302502ed9f6a6..bc77cbaef3d5a4 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP REF "v${VERSION}" - SHA512 0aac06f8ee67e3b4c430c9844beb6bdc3e31adebfcb2c077d18be8a8295451d70735f96dd5316d299df30b4cc4229180ffbad5095e51b49adf182290a8133a90 + SHA512 69fe3323aceb4ad52ec1fcfb38a8770e88c03ae0b6cb49768441b603e13659625720d984b992311fcca8ef863d40b8b7fb082996fae2d396e785b637b673a328 ) vcpkg_cmake_configure( diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index cc9cc114f34bd5..eb86f373fe8258 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,12 +1,11 @@ { "name": "dpp", - "version": "10.0.31", + "version": "10.0.33", "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", "supports": "(windows & !static & !uwp) | linux | osx", "dependencies": [ - "libsodium", "nlohmann-json", "openssl", "opus", diff --git a/versions/baseline.json b/versions/baseline.json index 3253b3b73bb7da..2f5f3619371f4d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2381,7 +2381,7 @@ "port-version": 0 }, "dpp": { - "baseline": "10.0.31", + "baseline": "10.0.33", "port-version": 0 }, "draco": { diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index a9e40299c5b771..11230705c71de7 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58fffa3b78cf2a0c2e28b5abdd40931a4b0a5c40", + "version": "10.0.33", + "port-version": 0 + }, { "git-tree": "190a206eddf272472a4668d756e0293096341f97", "version": "10.0.31", From b8d688b979bd54f0269ea1c6101e6a977613175f Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:06:22 +0800 Subject: [PATCH 02/21] [srpc] update to 0.10.3 (#41661) --- ports/srpc/portfile.cmake | 2 +- ports/srpc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/srpc.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/srpc/portfile.cmake b/ports/srpc/portfile.cmake index 3e3b4f3a636647..d6b29890be6ad9 100644 --- a/ports/srpc/portfile.cmake +++ b/ports/srpc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sogou/srpc REF v${VERSION} - SHA512 12816755ba94d1d006d5bbbbba14b0589258f6a79b3fef16b722e7a9f5375a6f69a513f203b27eef305358ec28d07a0553a40b1aaebf467326f14e4b6bfc4a01 + SHA512 55c0ebbf30c24fdb40885792d5d3f1e183f27fcf13df6217053bec13cf9ed6359888351b20a792607b1f49df674b88bd148cf4c8addb1f610b1c59dd4eeba0f2 HEAD_REF master PATCHES protobuf.patch diff --git a/ports/srpc/vcpkg.json b/ports/srpc/vcpkg.json index 8b2b963464d706..12c0a322b8fe8b 100644 --- a/ports/srpc/vcpkg.json +++ b/ports/srpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "srpc", - "version-semver": "0.10.1", + "version-semver": "0.10.3", "description": "RPC based on Sogou C++ Workflow", "homepage": "https://github.com/sogou/srpc", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2f5f3619371f4d..6b55a1761d367a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8605,7 +8605,7 @@ "port-version": 0 }, "srpc": { - "baseline": "0.10.1", + "baseline": "0.10.3", "port-version": 0 }, "sse2neon": { diff --git a/versions/s-/srpc.json b/versions/s-/srpc.json index a1700e756146b5..74e3bef1942438 100644 --- a/versions/s-/srpc.json +++ b/versions/s-/srpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73c36edb18eee3aaf83b3fb489efdca9c93368fd", + "version-semver": "0.10.3", + "port-version": 0 + }, { "git-tree": "cab44b93cf32daf3a535c14426eb9b5c780e94ea", "version-semver": "0.10.1", From d7ee9f67d0b335f5c2cbf4972626330b6276f818 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Tue, 22 Oct 2024 02:43:50 +0800 Subject: [PATCH 03/21] [conjure-enum] update to 1.1.0 (#41686) --- ports/conjure-enum/portfile.cmake | 2 +- ports/conjure-enum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/conjure-enum.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/conjure-enum/portfile.cmake b/ports/conjure-enum/portfile.cmake index 0d33613755951c..b43cbf676b4b82 100644 --- a/ports/conjure-enum/portfile.cmake +++ b/ports/conjure-enum/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fix8mt/conjure_enum REF "v${VERSION}" - SHA512 b9054a62ba10dd7b27b0fa6d2fd6a0c03eaea0f39fc0ba954e12351face02969fccd393278a9e29fa3f8af52b285b16e5ca6d0bc00a05a6ad08d7482bc1c587c + SHA512 af8127f2d958227a7168a7d808d7ff7f699b250c04b4a079f6ef9e034ee6d165e4d51054c2ec4dcec64291d3e11c507d73937dbee22e9bc5fcbdb73e127e0275 HEAD_REF master ) diff --git a/ports/conjure-enum/vcpkg.json b/ports/conjure-enum/vcpkg.json index d959bddb45b19b..0dbbfb07f70781 100644 --- a/ports/conjure-enum/vcpkg.json +++ b/ports/conjure-enum/vcpkg.json @@ -1,6 +1,6 @@ { "name": "conjure-enum", - "version": "1.0.1", + "version": "1.1.0", "description": "Lightweight header-only C++20 enum and typename reflection.", "homepage": "https://github.com/fix8mt/conjure_enum", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 6b55a1761d367a..a52173c82c5782 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1841,7 +1841,7 @@ "port-version": 0 }, "conjure-enum": { - "baseline": "1.0.1", + "baseline": "1.1.0", "port-version": 0 }, "console-bridge": { diff --git a/versions/c-/conjure-enum.json b/versions/c-/conjure-enum.json index 7fe00dec8e44cc..06e932429a8de7 100644 --- a/versions/c-/conjure-enum.json +++ b/versions/c-/conjure-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdcabd848476256a49a36322bc7e6c4fefc6abd0", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "78574a0113c4bcf9bad05d2fcef406d0bc1d0891", "version": "1.0.1", From 7c4513f602e581b4f041d9cb14b314f864caa5d2 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 22 Oct 2024 01:44:11 +0700 Subject: [PATCH 04/21] [libuv] Update to 1.49.2 (#41672) --- ports/libuv/portfile.cmake | 2 +- ports/libuv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libuv.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 066802196f9d76..1fb8040faae642 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv REF "v${VERSION}" - SHA512 aaaff8a609f8d8e40ce863f05b443d73ea85c5cda2756e8d05db9b31bf704573ed8788319fed195874fb5e20f4aa947e6af8a78f8284d6719b9fc791d03c7a6e + SHA512 e90680128bfaac215e5eebd9c8e5ce08e5fe68a7258f65bfcf56377756e9dbf527a232dfaf9d217c7374e713660ec99eeaae05d6fee2b8c5c9b71ad1b0b4dd72 HEAD_REF v1.x PATCHES fix-build-type.patch diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index ae58dfbcb4d945..9839ed4ec9157b 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libuv", - "version-semver": "1.49.1", + "version-semver": "1.49.2", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a52173c82c5782..a5b30a83cc18e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5261,7 +5261,7 @@ "port-version": 14 }, "libuv": { - "baseline": "1.49.1", + "baseline": "1.49.2", "port-version": 0 }, "libuvc": { diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 960f07fc2327b6..0e0fed6c411735 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e894cf3c8d353e40f1822b8fe302b720a705f6d8", + "version-semver": "1.49.2", + "port-version": 0 + }, { "git-tree": "81bdbea50fcae6cbb7589016444ef5d7eb0cd00b", "version-semver": "1.49.1", From 2b43a78934980d8f1fd8f1a2b22865197c44cc16 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 22 Oct 2024 02:44:43 +0800 Subject: [PATCH 05/21] [stringzilla] update to 3.10.5 (#41662) --- ports/stringzilla/portfile.cmake | 2 +- ports/stringzilla/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/stringzilla.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/stringzilla/portfile.cmake b/ports/stringzilla/portfile.cmake index 2e4324d702b122..cedadf2aa802c6 100644 --- a/ports/stringzilla/portfile.cmake +++ b/ports/stringzilla/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ashvardanian/StringZilla REF "v${VERSION}" - SHA512 b42acd6f1a06f8c5519f3093ac155b6caea95ca4a5618bfc24b9028353c78ae47c53f37cd498ce9d652ede323b96d38d044faa45f6c4ef58d71d748c071cbd21 + SHA512 a97ed147be78164b01e61ff4aeae8efb8eba23204edf48ed7701786cbc85b8c6d09f1802aa3cf0f65ca140bdccb4e8c3518a56b2b910466fc8d040f2b0293716 HEAD_REF master ) diff --git a/ports/stringzilla/vcpkg.json b/ports/stringzilla/vcpkg.json index 684c9c02269e6e..892400210e7006 100644 --- a/ports/stringzilla/vcpkg.json +++ b/ports/stringzilla/vcpkg.json @@ -1,6 +1,6 @@ { "name": "stringzilla", - "version": "3.7.0", + "version": "3.10.5", "description": "StringZilla is the GodZilla of string libraries, using SIMD and SWAR to accelerate string operations on modern CPUs.", "homepage": "https://github.com/ashvardanian/StringZilla", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a5b30a83cc18e6..be1b73b3b31a84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8673,7 +8673,7 @@ "port-version": 1 }, "stringzilla": { - "baseline": "3.7.0", + "baseline": "3.10.5", "port-version": 0 }, "strong-type": { diff --git a/versions/s-/stringzilla.json b/versions/s-/stringzilla.json index 288c7cf7f326b7..d7ab6771d7239c 100644 --- a/versions/s-/stringzilla.json +++ b/versions/s-/stringzilla.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19c1fcc087b436864ea6093cd182a5df96dcd408", + "version": "3.10.5", + "port-version": 0 + }, { "git-tree": "6acf96d1a37889967709ff6e334922689171f10e", "version": "3.7.0", From a73c889be74ece2c6654b580133e0e267e879255 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 21 Oct 2024 13:45:42 -0700 Subject: [PATCH 06/21] Update vcpkg-tool to 2024-10-18. (#41650) --- scripts/update-vcpkg-tool-metadata.ps1 | 31 -------------------------- scripts/vcpkg-tool-metadata.txt | 10 ++++----- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/scripts/update-vcpkg-tool-metadata.ps1 b/scripts/update-vcpkg-tool-metadata.ps1 index aafcc6141c0887..bc1cce9698e228 100644 --- a/scripts/update-vcpkg-tool-metadata.ps1 +++ b/scripts/update-vcpkg-tool-metadata.ps1 @@ -5,26 +5,7 @@ Param( [string]$Date ) -function Get-Sha256 { - Param([string]$File) - $content = [System.IO.File]::ReadAllBytes($File) - $shaHasher = $null - [string]$shaHash = '' - try { - $shaHasher = [System.Security.Cryptography.SHA256]::Create() - $hashBytes = $shaHasher.ComputeHash($content) - $shaHash = [System.BitConverter]::ToString($hashBytes).Replace('-', '').ToLowerInvariant() - } finally { - if ($shaHasher -ne $null) { - $shaHasher.Dispose(); - } - } - - return $shaHash -} - [string]$metadata = "VCPKG_TOOL_RELEASE_TAG=$Date`n" -$vsCodeHashes = [ordered]@{} Set-Content -LiteralPath "$PSScriptRoot\vcpkg-tool-metadata.txt" -Value $metadata -NoNewline -Encoding utf8NoBOM & "$PSScriptRoot\bootstrap.ps1" [string]$vcpkg = "$PSScriptRoot\..\vcpkg.exe" @@ -32,7 +13,6 @@ Set-Content -LiteralPath "$PSScriptRoot\vcpkg-tool-metadata.txt" -Value $metadat # Windows arm64 (VS Code only) & $vcpkg x-download "$PSScriptRoot\vcpkg-arm64.exe" ` "--url=https://github.com/microsoft/vcpkg-tool/releases/download/$Date/vcpkg-arm64.exe" --skip-sha512 -$vsCodeHashes["vcpkg-arm64.exe"] = Get-Sha256 "$PSScriptRoot\vcpkg-arm64.exe" # Linux Binaries foreach ($binary in @('macos', 'muslc', 'glibc')) { @@ -41,12 +21,8 @@ foreach ($binary in @('macos', 'muslc', 'glibc')) { "--url=https://github.com/microsoft/vcpkg-tool/releases/download/$Date/vcpkg-$binary" --skip-sha512 $sha512 = & $vcpkg hash "$PSScriptRoot\vcpkg-$binary" $metadata += "VCPKG_$($caps)_SHA=$sha512`n" - $vsCodeHashes["vcpkg-$binary"] = Get-Sha256 "$PSScriptRoot\vcpkg-$binary" } -# Windows x64 (assumed to be host) -$vsCodeHashes["vcpkg.exe"] = Get-Sha256 "$vcpkg" - # Source $sourceName = "$Date.tar.gz" & $vcpkg x-download "$PSScriptRoot\$sourceName" ` @@ -66,10 +42,3 @@ Remove-Item @( Set-Content -LiteralPath "$PSScriptRoot\vcpkg-tool-metadata.txt" -Value $metadata -NoNewline -Encoding utf8NoBOM Write-Host "Metadata Written" -Write-Host "VS Code Block" -$vsCodeOverall = [ordered]@{ - version = $Date; - hashes = $vsCodeHashes; -} - -Write-Host (ConvertTo-Json $vsCodeOverall) diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index 43d74622d0375f..e78b10e3aa9fae 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2024-09-30 -VCPKG_MACOS_SHA=de9f4088783ab34c217121e7529594b56c3909992088290f59fab145be1255957524de0ecbd63ed51d60710212521f64c016f37a679dcec58f73bfbdf56606bc -VCPKG_MUSLC_SHA=d3996b0291b5d42ef0431cc60e500848f8a0c28a0d6608eec28a04eca2594b926f58a1bdb82767fdd68023fae53ca67f41bd25662400592223b8c1b57f6ea10a -VCPKG_GLIBC_SHA=e1ebdacf87bf747be57e345ff40ab41df9c8b88bd4789fde8fe1ecf8af9037ba7c123ff7d2766ae7091a6182445cedc87d01d233fc01490fe17b4e1dde218948 -VCPKG_TOOL_SOURCE_SHA=23bca9955e20fb6c0a4140ee3dea069f654be3fb15ca3e7e5f4d0446592ba1dd4afcee8b9ef9f82e28dfe715b7fe966d9f2a8e412583b7fc5a1993142c378755 +VCPKG_TOOL_RELEASE_TAG=2024-10-18 +VCPKG_MACOS_SHA=50f41ed37fb1772da4f9d4ddf05875b6bf53eb3fbc56f47060cb9dcedacfe9628f1c87d0df49f8cc204c546e07fd89b0f7efe89511e61232503e63684631304f +VCPKG_MUSLC_SHA=008a0263d3e128c50eb682d33f0d337e590c1e6cc5e0f9788d5c534848359e80d1515304f7bc5e15fdf9699b0692fa0e1cf3bfb295f1d011ce0bc380fb4f147a +VCPKG_GLIBC_SHA=47536d30e8ba854bc283776d5be67401e230aca55054ce439f712c2e7b21f5d05b86aa64438252e91390601eefe26710bfc83c5fb154d6737940f334c6c932a0 +VCPKG_TOOL_SOURCE_SHA=35bb6b95746a9c567fb5a5ad6d8d0c637093745c2487f3def6f84b1d3a7ae4753d7e41efde44fd34bc4f9c72e9bbecf1d042cda9542f734728f3f8d94d4f35e7 From 7f74e01712b168e50152e7177d5fd6c4231410e3 Mon Sep 17 00:00:00 2001 From: Mengna-Li <543250287@qq.com> Date: Mon, 21 Oct 2024 22:32:08 +0000 Subject: [PATCH 07/21] [directx-dxc] fix error location path (#41554) Co-authored-by: Mengna-Li --- ports/directx-dxc/directx-dxc-config.cmake.in | 4 ++-- ports/directx-dxc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/directx-dxc.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/directx-dxc/directx-dxc-config.cmake.in b/ports/directx-dxc/directx-dxc-config.cmake.in index 50b78338702ace..a0c2d382a6d9f1 100644 --- a/ports/directx-dxc/directx-dxc-config.cmake.in +++ b/ports/directx-dxc/directx-dxc-config.cmake.in @@ -15,9 +15,9 @@ set_target_properties(Microsoft::DirectXShaderCompiler PROPERTIES add_library(Microsoft::DXIL SHARED IMPORTED) set_target_properties(Microsoft::DXIL PROPERTIES - IMPORTED_LOCATION "${CURRENT_INSTALLED_DIR}/@dll_dir@/@dll_name_dxil@" + IMPORTED_LOCATION "${_dxc_root}/@dll_dir@/@dll_name_dxil@" IMPORTED_IMPLIB "${_dxc_root}/lib/@lib_name@" - IMPORTED_SONAME "@lib_name@" + IMPORTED_NO_SONAME TRUE INTERFACE_INCLUDE_DIRECTORIES "${_dxc_root}/include/directx-dxc" IMPORTED_LINK_INTERFACE_LANGUAGES "C") diff --git a/ports/directx-dxc/vcpkg.json b/ports/directx-dxc/vcpkg.json index 07ea7b8d96a236..4363ab61cd0408 100644 --- a/ports/directx-dxc/vcpkg.json +++ b/ports/directx-dxc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "directx-dxc", "version-date": "2024-07-31", - "port-version": 1, + "port-version": 2, "description": "DirectX Shader Compiler (LLVM/Clang)", "homepage": "https://github.com/microsoft/DirectXShaderCompiler", "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki", diff --git a/versions/baseline.json b/versions/baseline.json index be1b73b3b31a84..50feedd6fe8e49 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2282,7 +2282,7 @@ }, "directx-dxc": { "baseline": "2024-07-31", - "port-version": 1 + "port-version": 2 }, "directx-headers": { "baseline": "1.614.1", diff --git a/versions/d-/directx-dxc.json b/versions/d-/directx-dxc.json index ea8fce67c47538..bae7e2dfcdc7e0 100644 --- a/versions/d-/directx-dxc.json +++ b/versions/d-/directx-dxc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31adbee92ae8d9b17303da6c5cb3e276c34a2b51", + "version-date": "2024-07-31", + "port-version": 2 + }, { "git-tree": "b338248d2d23bf37932394facc59075f4ad1d7a1", "version-date": "2024-07-31", From 249388493aa124e9fdeaa9ed467c14d501d0f442 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 22 Oct 2024 06:33:18 +0800 Subject: [PATCH 08/21] [oniguruma] update to 6.9.9 (#41527) --- ports/oniguruma/portfile.cmake | 29 ++++++++++++++++++++--------- ports/oniguruma/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/oniguruma.json | 5 +++++ 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake index 86e9f97c741b4c..6579f1deed96aa 100644 --- a/ports/oniguruma/portfile.cmake +++ b/ports/oniguruma/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kkos/oniguruma - REF v6.9.7.1 - SHA512 CE22050E04E51843E894D2D534D062FDD23CC2BAAC9BA43DA1843EC928F6CE5ED3D4407FE945F4D34ADADF3167DFD943CD81AE4556F7C5EC51E7331C35EAD479 + REF "v${VERSION}" + SHA512 7c89247d8504c635687dc61b39b39b5afefa4851b24409a8eab31273f1cbc88f3db89095ae4b135bd034147d2616c2e18fc74887300b89532eedeab75677f437 HEAD_REF master - PATCHES fix-uwp.patch + PATCHES + fix-uwp.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -30,11 +31,15 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" -) + +vcpkg_fixup_pkgconfig() + +# Note that onig-config is a shell script, not CMake configs, so +# vcpkg_cmake_config_fixup would be inappropriate +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/onig-config") +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config") +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h" @@ -51,4 +56,10 @@ endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include/") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/oniguruma/vcpkg.json b/ports/oniguruma/vcpkg.json index 7247d3036ce378..a50a06aee02786 100644 --- a/ports/oniguruma/vcpkg.json +++ b/ports/oniguruma/vcpkg.json @@ -1,7 +1,6 @@ { "name": "oniguruma", - "version": "6.9.7.1", - "port-version": 1, + "version": "6.9.9", "description": "Modern and flexible regular expressions library", "homepage": "https://github.com/kkos/oniguruma", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 50feedd6fe8e49..295e002b2ee1db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6533,8 +6533,8 @@ "port-version": 1 }, "oniguruma": { - "baseline": "6.9.7.1", - "port-version": 1 + "baseline": "6.9.9", + "port-version": 0 }, "onnx": { "baseline": "1.16.2", diff --git a/versions/o-/oniguruma.json b/versions/o-/oniguruma.json index 32d80a4245e00e..d9c70cdeda044c 100644 --- a/versions/o-/oniguruma.json +++ b/versions/o-/oniguruma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40c77d00a3c02948a2c252bcb75fed36bcd1a0c5", + "version": "6.9.9", + "port-version": 0 + }, { "git-tree": "107a3e6619a149a76b52ef9c9f4dbb1b7343a456", "version": "6.9.7.1", From 5f7b3d83df38f3f1be0b3fea3f10bc1e55f4c124 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 22 Oct 2024 06:36:16 +0800 Subject: [PATCH 09/21] [spglib] update to 2.5.0 (#41658) --- ports/spglib/portfile.cmake | 2 +- ports/spglib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/spglib.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/spglib/portfile.cmake b/ports/spglib/portfile.cmake index 8a9a9f0660427c..37f40239107cf6 100644 --- a/ports/spglib/portfile.cmake +++ b/ports/spglib/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO spglib/spglib REF "v${VERSION}" - SHA512 15c0ced6168a436468d1f9db28bb93f3ff130467cd1f0b966cb9731d36be3d9877b3452561dbace3242351b7c9b41d41930a76ca2278f00c1b45620c06ee93e0 + SHA512 123b08ba7174a792c84bad42f94cced5ad213b50ef8dfd58a9301ebf8b66cbedb3ce037d25b748d579d0b2ee2a594c1134a463e179bfd09757fb3c98445160ac HEAD_REF develop ) diff --git a/ports/spglib/vcpkg.json b/ports/spglib/vcpkg.json index 94f4da8f929725..a21db823926b9a 100644 --- a/ports/spglib/vcpkg.json +++ b/ports/spglib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spglib", - "version-semver": "2.4.0", + "version-semver": "2.5.0", "description": "C library for finding and handling crystal symmetries", "homepage": "https://spglib.readthedocs.io/en/latest/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 295e002b2ee1db..3cf868f7292e71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8521,7 +8521,7 @@ "port-version": 1 }, "spglib": { - "baseline": "2.4.0", + "baseline": "2.5.0", "port-version": 0 }, "spine-runtimes": { diff --git a/versions/s-/spglib.json b/versions/s-/spglib.json index 2c72c423a1b3be..c09bd2ec0eaf5a 100644 --- a/versions/s-/spglib.json +++ b/versions/s-/spglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9031cd868388e837c1b0658e5fdf560b17b3a50c", + "version-semver": "2.5.0", + "port-version": 0 + }, { "git-tree": "72a361224c8e7cc3dd14810ae402a410aad4c0bb", "version-semver": "2.4.0", From 3a747a4fc9210d87bb40e0d9b8a3588f046c914d Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 22 Oct 2024 07:17:37 +0800 Subject: [PATCH 10/21] [libspatialindex] update to 2.0.0 (#41657) --- ports/libspatialindex/mingw.patch | 12 ----- ports/libspatialindex/portfile.cmake | 10 ++-- ports/libspatialindex/static.patch | 77 ---------------------------- ports/libspatialindex/vcpkg.json | 7 ++- versions/baseline.json | 4 +- versions/l-/libspatialindex.json | 5 ++ 6 files changed, 16 insertions(+), 99 deletions(-) delete mode 100644 ports/libspatialindex/mingw.patch delete mode 100644 ports/libspatialindex/static.patch diff --git a/ports/libspatialindex/mingw.patch b/ports/libspatialindex/mingw.patch deleted file mode 100644 index 28c1c2904e02e0..00000000000000 --- a/ports/libspatialindex/mingw.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --color -ur a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2022-07-19 15:21:35.950966519 +0200 -+++ b/src/CMakeLists.txt 2022-07-19 15:21:50.251002371 +0200 -@@ -208,7 +208,7 @@ - PROPERTIES VERSION "${SIDX_LIB_VERSION}" - SOVERSION "${SIDX_LIB_SOVERSION}" ) - --if(WIN32) -+if(MSVC) - target_compile_options(${SIDX_LIB_NAME} PRIVATE "/wd4068") - target_compile_options(${SIDX_C_LIB_NAME} PRIVATE "/wd4068") - diff --git a/ports/libspatialindex/portfile.cmake b/ports/libspatialindex/portfile.cmake index 5ab8185d953e18..cef6ecf051336f 100644 --- a/ports/libspatialindex/portfile.cmake +++ b/ports/libspatialindex/portfile.cmake @@ -1,12 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libspatialindex/libspatialindex - REF 1.9.3 - SHA512 d4c608abbd631dc163b7b4fb6bf09dee3e85ce692a5f8875d51f05a26e09c75cd17dff1ed9d2c232a071f0f5864d21d877b4cbc252f3416896db24dfa3fa18cb + REF "${VERSION}" + SHA512 a508a9ed4019641bdaaa53533505531f3db440b046a9c7d9f78ed480293200c51796c2d826a6bb9b4f9543d60bb0fef9e4c885ec3f09326cfa4d2fb81c1593aa HEAD_REF master - PATCHES - static.patch - mingw.patch ) vcpkg_cmake_configure( @@ -18,7 +15,8 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() - +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() #Debug diff --git a/ports/libspatialindex/static.patch b/ports/libspatialindex/static.patch deleted file mode 100644 index 1ce2b9d6a1e3f7..00000000000000 --- a/ports/libspatialindex/static.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c34ee8d71..84e4a9247 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -43,7 +43,7 @@ SET(SIDX_VERSION_MINOR "9") - SET(SIDX_VERSION_PATCH "3") - SET(SIDX_LIB_VERSION "6.1.1") - SET(SIDX_LIB_SOVERSION "6") --SET(BUILD_SHARED_LIBS ON) -+option(BUILD_SHARED_LIBS "Build shared libs" ON) - - - set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_PATCH}") - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 90f4501bc..aad327181 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -188,9 +188,13 @@ set(SIDX_SOURCES - #endif() - - --add_library(${SIDX_LIB_NAME} ${SIDX_SOURCES}) -- --add_library(${SIDX_C_LIB_NAME} ${SIDX_CAPI_CPP}) -+if(BUILD_SHARED_LIBS) -+ add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES}) -+ add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP}) -+else(BUILD_SHARED_LIBS) -+ add_library(${SIDX_LIB_NAME} STATIC ${SIDX_SOURCES}) -+ add_library(${SIDX_C_LIB_NAME} STATIC ${SIDX_CAPI_CPP}) -+endif(BUILD_SHARED_LIBS) - - target_link_libraries(${SIDX_C_LIB_NAME} - ${SIDX_LIB_NAME} -@@ -208,9 +212,10 @@ if(WIN32) - target_compile_options(${SIDX_LIB_NAME} PRIVATE "/wd4068") - target_compile_options(${SIDX_C_LIB_NAME} PRIVATE "/wd4068") - -- target_compile_definitions(${SIDX_C_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1") -- target_compile_definitions(${SIDX_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1") -- if (NOT WITH_STATIC_SIDX) -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(${SIDX_C_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1") -+ target_compile_definitions(${SIDX_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1") -+ else() - target_compile_definitions(${SIDX_LIB_NAME} PRIVATE "-DSIDX_DLL_IMPORT=1") - target_compile_definitions(${SIDX_C_LIB_NAME} PRIVATE "-DSIDX_DLL_IMPORT=1") - endif() - -diff --git a/include/spatialindex/capi/sidx_export.h b/include/spatialindex/capi/sidx_export.h -index b6c84f1ef..7b0a39364 100644 ---- a/include/spatialindex/capi/sidx_export.h -+++ b/include/spatialindex/capi/sidx_export.h -@@ -29,7 +29,7 @@ - #pragma once - - #ifndef SIDX_C_DLL --#if defined(_MSC_VER) -+#if defined(_MSC_VER) && defined(SIDX_DLL_EXPORT) - # define SIDX_C_DLL __declspec(dllexport) - # define SIDX_DLL __declspec(dllexport) - #else - -diff --git a/include/spatialindex/tools/Tools.h b/include/spatialindex/tools/Tools.h -index 322bc819e..46b62fa00 100644 ---- a/include/spatialindex/tools/Tools.h -+++ b/include/spatialindex/tools/Tools.h -@@ -46,7 +46,7 @@ - #ifdef SIDX_DLL_EXPORT - #define SIDX_DLL __declspec(dllexport) - #else -- #define SIDX_DLL __declspec(dllimport) -+ #define SIDX_DLL - #endif - - // Nuke this annoying warning. See http://www.unknownroad.com/rtfm/VisualStudio/warningC4251.html diff --git a/ports/libspatialindex/vcpkg.json b/ports/libspatialindex/vcpkg.json index d8180d74470967..d8235a2c0e0009 100644 --- a/ports/libspatialindex/vcpkg.json +++ b/ports/libspatialindex/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libspatialindex", - "version": "1.9.3", - "port-version": 3, + "version": "2.0.0", "description": "C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.", "homepage": "http://libspatialindex.github.com", "license": "MIT", @@ -10,6 +9,10 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 3cf868f7292e71..37725166f36ffe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5101,8 +5101,8 @@ "port-version": 0 }, "libspatialindex": { - "baseline": "1.9.3", - "port-version": 3 + "baseline": "2.0.0", + "port-version": 0 }, "libspatialite": { "baseline": "5.1.0", diff --git a/versions/l-/libspatialindex.json b/versions/l-/libspatialindex.json index a981065ef2ea1e..60e6b15fdedf41 100644 --- a/versions/l-/libspatialindex.json +++ b/versions/l-/libspatialindex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "add2a4242b540d512b39c2f69746304f29ee8bdc", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "97b36055483a86131a19e83cde29ec1fbd0e87c3", "version": "1.9.3", From 84d50131d5c520c598f3904db859b7845e94a69b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 22 Oct 2024 03:34:34 +0200 Subject: [PATCH 11/21] [libxmlpp] Update to 5.4.0 (#41674) --- ports/libxmlpp/portfile.cmake | 17 +++++++---------- ports/libxmlpp/vcpkg.json | 13 ++++++++----- versions/baseline.json | 4 ++-- versions/l-/libxmlpp.json | 5 +++++ 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ports/libxmlpp/portfile.cmake b/ports/libxmlpp/portfile.cmake index 011bc5f48abd29..7a8861a313d263 100644 --- a/ports/libxmlpp/portfile.cmake +++ b/ports/libxmlpp/portfile.cmake @@ -1,10 +1,9 @@ -#..\src\libxml++-5-7c4d4a4cea.clean\meson.build:278:4: ERROR: Problem encountered: Static builds are not supported by MSVC-style builds -set(LIBXMLPP_VERSION 5.0.0) - +string(REGEX MATCH "^([0-9]*[.][0-9]*)" MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/5.0/libxml++-${LIBXMLPP_VERSION}.tar.xz" - FILENAME "libxml++-${LIBXMLPP_VERSION}.tar.xz" - SHA512 ae8d7a178e7a3b48a9f0e1ea303e8a4e4d879d0d9367124ede3783d0c31e31c862b98e5d28d72edc4c0b19c6b457ead2d25664efd33d65e44fd52c5783ec3091 + URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/${MAJOR_MINOR}/libxml++-${VERSION}.tar.xz" + "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/libxml++/${MAJOR_MINOR}/libxml++-${VERSION}.tar.xz" + FILENAME "libxml++-${VERSION}.tar.xz" + SHA512 bba28edf40c60ac186ff1b704d9f4f41f73c1be3126cfb345005283b32bb5c9a596b8def64be8ad8e295e1e169bed91d120d5105cbbb6cecc4675d10b897dfe6 ) vcpkg_extract_source_archive( @@ -16,16 +15,14 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dbuild-documentation=false + -Dbuild-manual=false -Dvalidation=false # Validate the tutorial XML file -Dbuild-examples=false -Dbuild-tests=false - -Dmsvc14x-parallel-installable=false # Use separate DLL and LIB filenames for Visual Studio 2017 and 2019 -Dbuild-deprecated-api=true # Build deprecated API and include it in the library ) vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# Handle copyright and readme -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/libxmlpp) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json index 517ba3f2d9d756..7cae0a468625b2 100644 --- a/ports/libxmlpp/vcpkg.json +++ b/ports/libxmlpp/vcpkg.json @@ -1,12 +1,15 @@ { "name": "libxmlpp", - "version": "5.0.0", - "port-version": 3, - "description": "a C++ wrapper for the libxml XML parser library.", - "supports": "!(windows & static)", + "version": "5.4.0", + "description": "A C++ wrapper for the libxml XML parser library.", + "homepage": "https://libxmlplusplus.github.io/libxmlplusplus/", + "license": "LGPL-2.1-or-later", "dependencies": [ "glibmm", - "libxml2", + { + "name": "libxml2", + "default-features": false + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 37725166f36ffe..380adfe27b915f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5393,8 +5393,8 @@ "port-version": 3 }, "libxmlpp": { - "baseline": "5.0.0", - "port-version": 3 + "baseline": "5.4.0", + "port-version": 0 }, "libxmp": { "baseline": "4.6.0", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index a9e868cad0c550..ef79a6fada5336 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d40381a24a7875d4cdd254d277963cb9ccbecbd", + "version": "5.4.0", + "port-version": 0 + }, { "git-tree": "361ec896634a0f947949dcf71e2dbf991c066d44", "version": "5.0.0", From b69d0c41c17193f382f5f0ac915a77d7a3a9f0fe Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Tue, 22 Oct 2024 09:35:39 +0800 Subject: [PATCH 12/21] [mimicpp] new port (#41684) --- ports/mimicpp/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/mimicpp/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/m-/mimicpp.json | 9 +++++++++ 4 files changed, 56 insertions(+) create mode 100644 ports/mimicpp/portfile.cmake create mode 100644 ports/mimicpp/vcpkg.json create mode 100644 versions/m-/mimicpp.json diff --git a/ports/mimicpp/portfile.cmake b/ports/mimicpp/portfile.cmake new file mode 100644 index 00000000000000..21e2576076b255 --- /dev/null +++ b/ports/mimicpp/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DNKpp/mimicpp + REF "v${VERSION}" + SHA512 a1c9496c28ad7940a91e6491d9a5992533c72fe3dcd19a3397ae40bc0de363bc796db1168a3caf66c8fc6718a100ab83cb0458e2b68e564efd2cf146db45b221 + HEAD_REF main +) + +set(VCPKG_BUILD_TYPE release) # header-only port + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMIMICPP_BUILD_TESTS=OFF + -DMIMICPP_BUILD_EXAMPLES=OFF + -DMIMICPP_CONFIGURE_DOXYGEN=OFF + -DMIMICPP_ENABLE_AMALGAMATE_HEADERS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/mimipp/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") diff --git a/ports/mimicpp/vcpkg.json b/ports/mimicpp/vcpkg.json new file mode 100644 index 00000000000000..7bfec60ea21570 --- /dev/null +++ b/ports/mimicpp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "mimicpp", + "version": "3", + "description": "mimic++, a modern and (mostly) macro free mocking framework.", + "homepage": "https://github.com/DNKpp/mimicpp", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 380adfe27b915f..5b77ce78d98074 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5892,6 +5892,10 @@ "baseline": "2.1.7", "port-version": 0 }, + "mimicpp": { + "baseline": "3", + "port-version": 0 + }, "minc": { "baseline": "2.4.03", "port-version": 3 diff --git a/versions/m-/mimicpp.json b/versions/m-/mimicpp.json new file mode 100644 index 00000000000000..ce60038e6c03cf --- /dev/null +++ b/versions/m-/mimicpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ef648806009c754d8077dad2e1fd9e434616f427", + "version": "3", + "port-version": 0 + } + ] +} From 81a21c5440ec6769cd9d11987f30fbec76b424bf Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 22 Oct 2024 03:36:48 +0200 Subject: [PATCH 13/21] [freerdp] Update to 3.8.0 (#41667) --- ports/freerdp/install-layout.patch | 73 +++--------------------------- ports/freerdp/keep-dup-libs.patch | 37 --------------- ports/freerdp/portfile.cmake | 22 +++------ ports/freerdp/vcpkg.json | 3 +- ports/freerdp/winpr_strerror.patch | 12 ----- versions/baseline.json | 4 +- versions/f-/freerdp.json | 5 ++ 7 files changed, 21 insertions(+), 135 deletions(-) delete mode 100644 ports/freerdp/keep-dup-libs.patch delete mode 100644 ports/freerdp/winpr_strerror.patch diff --git a/ports/freerdp/install-layout.patch b/ports/freerdp/install-layout.patch index 7ae08cbe1a7f23..f4e9bb71dd8c01 100644 --- a/ports/freerdp/install-layout.patch +++ b/ports/freerdp/install-layout.patch @@ -1,17 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1633656..db346d3 100644 +index 0a44b35..49e987a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -149,7 +149,7 @@ message(STATUS "Git Revision ${GIT_REVISION}") - set(FREERDP_DEFAULT_PROJECT_VERSION ${FREERDP_VERSION} CACHE STRING INTERNAL) - - set(FREERDP_MAJOR_DIR "freerdp${FREERDP_VERSION_MAJOR}") --set(FREERDP_INCLUDE_DIR "include/${FREERDP_MAJOR_DIR}/") -+set(FREERDP_INCLUDE_DIR "include/") - - option(WITH_SMARTCARD_EMULATE "Emulate smartcards instead of redirecting readers" ON) - if (WITH_SMARTCARD_EMULATE) -@@ -711,6 +711,9 @@ else() +@@ -666,6 +666,9 @@ else() set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/${FREERDP_MAJOR_DIR}") endif() endif() @@ -22,67 +13,15 @@ index 1633656..db346d3 100644 # Path to put extensions diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt -index cc94b99..0423242 100644 +index 72d3ca6..9e2bc12 100644 --- a/client/Windows/CMakeLists.txt +++ b/client/Windows/CMakeLists.txt -@@ -107,7 +107,7 @@ endif() - target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS}) +@@ -77,7 +77,7 @@ target_link_libraries(${MODULE_NAME} PUBLIC ${PUB_LIBS}) + target_link_libraries(${MODULE_NAME} PRIVATE ${PRIV_LIBS}) if(WITH_CLIENT_INTERFACE) - install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) + install(TARGETS ${MODULE_NAME} COMPONENT libraries) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) - install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols) - endif() -diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in -index 7555957..21ea0c7 100644 ---- a/libfreerdp/freerdp.pc.in -+++ b/libfreerdp/freerdp.pc.in -@@ -4,7 +4,7 @@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ - includedir=${prefix}/@FREERDP_INCLUDE_DIR@ - libs=-lfreerdp@FREERDP_API_VERSION@ - datarootdir=${prefix}/share --datadir=${datarootdir}/@FREERDP_MAJOR_DIR@ -+datadir=${datarootdir}/freerdp - plugindir=${libdir}/@FREERDP_MAJOR_DIR@ - proxy_plugindir=${plugindir}/proxy - extensiondir=${plugindir}/extensions -diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt -index 4769741..eb3fe11 100644 ---- a/winpr/CMakeLists.txt -+++ b/winpr/CMakeLists.txt -@@ -320,7 +320,7 @@ endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) - include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) - --set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}") -+set(WINPR_INCLUDE_DIR "include") - - - add_subdirectory(libwinpr) -diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt -index 4be2015..00c64e0 100644 ---- a/winpr/libwinpr/CMakeLists.txt -+++ b/winpr/libwinpr/CMakeLists.txt -@@ -195,7 +195,7 @@ else() endif() - target_link_options(${MODULE_NAME} ${LINK_OPTS_MODE} ${WINPR_LINK_OPTIONS}) - target_include_directories(${MODULE_NAME} PRIVATE ${WINPR_INCLUDES}) --target_include_directories(${MODULE_NAME} INTERFACE $) -+target_include_directories(${MODULE_NAME} INTERFACE $) - target_link_directories(${MODULE_NAME} PRIVATE ${WINPR_LINK_DIRS}) - target_compile_options(${MODULE_NAME} PRIVATE ${WINPR_COMPILE_OPTIONS}) - target_compile_definitions(${MODULE_NAME} PRIVATE ${WINPR_DEFINITIONS}) -diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt -index e995172..f612718 100644 ---- a/winpr/tools/CMakeLists.txt -+++ b/winpr/tools/CMakeLists.txt -@@ -110,7 +110,7 @@ if (WITH_LIBRARY_VERSIONING) - endif() - - add_definitions(${WINPR_DEFINITIONS}) --target_include_directories(${MODULE_NAME} INTERFACE $) -+target_include_directories(${MODULE_NAME} INTERFACE $) - target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_TOOLS_LIBS}) + add_subdirectory(cli) - install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPR-toolsTargets diff --git a/ports/freerdp/keep-dup-libs.patch b/ports/freerdp/keep-dup-libs.patch deleted file mode 100644 index 7336ad59b3b474..00000000000000 --- a/ports/freerdp/keep-dup-libs.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt -index 2ce9c42..bbd202a 100644 ---- a/libfreerdp/CMakeLists.txt -+++ b/libfreerdp/CMakeLists.txt -@@ -415,7 +415,6 @@ endif() - list(APPEND LIBFREERDP_PUB_LIBS winpr) - - list(REMOVE_DUPLICATES LIBFREERDP_DEFINITIONS) --list(REMOVE_DUPLICATES LIBFREERDP_LIBS) - list(REMOVE_DUPLICATES LIBFREERDP_PUB_LIBS) - list(REMOVE_DUPLICATES LIBFREERDP_INCLUDES) - include_directories(${LIBFREERDP_INCLUDES}) -diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt -index 4be2015..f1266f3 100644 ---- a/winpr/libwinpr/CMakeLists.txt -+++ b/winpr/libwinpr/CMakeLists.txt -@@ -157,8 +157,6 @@ list(REMOVE_DUPLICATES WINPR_DEFINITIONS) - list(REMOVE_DUPLICATES WINPR_COMPILE_OPTIONS) - list(REMOVE_DUPLICATES WINPR_LINK_OPTIONS) - list(REMOVE_DUPLICATES WINPR_LINK_DIRS) --list(REMOVE_DUPLICATES WINPR_LIBS_PRIVATE) --list(REMOVE_DUPLICATES WINPR_LIBS_PUBLIC) - list(REMOVE_DUPLICATES WINPR_INCLUDES) - - # On windows create dll version information. -diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt -index e995172..90c4e58 100644 ---- a/winpr/tools/CMakeLists.txt -+++ b/winpr/tools/CMakeLists.txt -@@ -82,7 +82,6 @@ add_subdirectory(makecert) - - set(MODULE_NAME winpr-tools) - list(REMOVE_DUPLICATES WINPR_TOOLS_DEFINITIONS) --list(REMOVE_DUPLICATES WINPR_TOOLS_LIBS) - list(REMOVE_DUPLICATES WINPR_TOOLS_INCLUDES) - include_directories(${WINPR_TOOLS_INCLUDES}) - diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index f3f26a4cfb1f22..d23c75483d7050 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -2,14 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP REF "${VERSION}" - SHA512 aa96ad2bf30dbe09849ecfb64ec6e60ba4fd3bc2d144c7d576b1e59476ef45d9d744da37806b1c00e3a0413390b35c6d3d4401b89c07c5663122280eca39e501 + SHA512 72d978326a3641e69706c158cd5c4b1a4138dedbe1bf8c0f1c02fbb03291c1a49ff36afdaf8cf432fee84952bbaecf8801efa3f1afb50f600490e36ec3d577ef HEAD_REF master PATCHES dependencies.patch install-layout.patch - keep-dup-libs.patch windows-linkage.patch - winpr_strerror.patch ) file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg") file(WRITE "${SOURCE_PATH}/CMakeCPack.cmake" "") @@ -84,7 +82,7 @@ vcpkg_fixup_pkgconfig() vcpkg_list(SET tools) if(VCPKG_TARGET_IS_WINDOWS) if("server" IN_LIST FEATURES) - list(APPEND tools wfreerdp-server) + list(APPEND tools wfreerdp-server-cli) endif() elseif(VCPKG_TARGET_IS_OSX) if("server" IN_LIST FEATURES) @@ -113,27 +111,21 @@ if(tools) vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "." IGNORE_UNCHANGED) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}/" "" IGNORE_UNCHANGED) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}" "" IGNORE_UNCHANGED) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp3/freerdp/build-config.h" "\"${CURRENT_PACKAGES_DIR}" "/* vcpkg redacted */ \"" IGNORE_UNCHANGED) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") # They build static with dllexport, so it must be used with dllexport. Proper fix needs invasive patching. - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/api.h" "#ifdef FREERDP_EXPORTS" "#if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp3/freerdp/api.h" "#ifdef FREERDP_EXPORTS" "#if 1") if(WITH_SERVER) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/rdtk0/rdtk/api.h" "#ifdef RDTK_EXPORTS" "#if 1") endif() endif() +file(GLOB cmakefiles "${CURRENT_PACKAGES_DIR}/include/*/CMakeFiles") file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/include/config" - "${CURRENT_PACKAGES_DIR}/include/CMakeFiles" + ${cmakefiles} + "${CURRENT_PACKAGES_DIR}/include/winpr3/config" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) -file(GLOB cmakefiles "${CURRENT_PACKAGES_DIR}/include/*/CMakeFiles") -if(cmakefiles) - file(REMOVE_RECURSE ${cmakefiles}) -endif() - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index a1da8721c10088..974c49696e0790 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "freerdp", - "version": "3.4.0", - "port-version": 3, + "version": "3.8.0", "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/winpr_strerror.patch b/ports/freerdp/winpr_strerror.patch deleted file mode 100644 index 39f95937dfc714..00000000000000 --- a/ports/freerdp/winpr_strerror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c -index d43b588..854c93a 100644 ---- a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c -+++ b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c -@@ -73,6 +73,7 @@ - #include - #include - #include -+#include - - static pthread_once_t g_once; - static int g_inited; diff --git a/versions/baseline.json b/versions/baseline.json index 5b77ce78d98074..4101b584e3a1df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2897,8 +2897,8 @@ "port-version": 7 }, "freerdp": { - "baseline": "3.4.0", - "port-version": 3 + "baseline": "3.8.0", + "port-version": 0 }, "freetds": { "baseline": "1.3.10", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index f74db2707c2c66..80c2330d52aa71 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29289f0bc351348dce1ddfff4630e85fd33cbb2e", + "version": "3.8.0", + "port-version": 0 + }, { "git-tree": "440881d33c525ec8f3d832776f021e847f677c17", "version": "3.4.0", From 10b7a178346f3f0abef60cecd5130e295afd8da4 Mon Sep 17 00:00:00 2001 From: Mengna-Li <543250287@qq.com> Date: Tue, 22 Oct 2024 01:39:53 +0000 Subject: [PATCH 14/21] [simsimd] update to 5.7.3 (#41638) Co-authored-by: Mengna-Li --- ports/simsimd/portfile.cmake | 2 +- ports/simsimd/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simsimd.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/simsimd/portfile.cmake b/ports/simsimd/portfile.cmake index 592c905654683c..86661bf87da806 100644 --- a/ports/simsimd/portfile.cmake +++ b/ports/simsimd/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ashvardanian/SimSIMD REF "v${VERSION}" - SHA512 abddc3522f28602c0bfbdcdf3f045b3ffbb88cc9182741333df7a7e6d8fcf523dbd876b30381cdc741b712c42665f65796477ec3c458cdd9ef4ac4e4038b9052 + SHA512 ab78d4415ed0f2964470ccd36d3d737a2715b1a5a4222613d2f0f4be6a516da0e339329cbd421c6b7f6a1bc701da6ec2f3937cba5a8ea1f632beea8000d90c8f HEAD_REF main PATCHES export-target.patch diff --git a/ports/simsimd/vcpkg.json b/ports/simsimd/vcpkg.json index 0bc8262b566724..452399ba0e02d4 100644 --- a/ports/simsimd/vcpkg.json +++ b/ports/simsimd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simsimd", - "version": "5.4.4", + "version": "5.7.3", "description": "Fastest similarity-measures and distance functions on the Wild West – vectors, strings, short molecules, and even DNA sequences. All with a pinch of SIMD for both x86 and ARM.", "homepage": "https://github.com/ashvardanian/SimSIMD", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4101b584e3a1df..52acfc192ae13d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8341,7 +8341,7 @@ "port-version": 0 }, "simsimd": { - "baseline": "5.4.4", + "baseline": "5.7.3", "port-version": 0 }, "sjpeg": { diff --git a/versions/s-/simsimd.json b/versions/s-/simsimd.json index d9728ba2dfa08f..f44c4b344a9a68 100644 --- a/versions/s-/simsimd.json +++ b/versions/s-/simsimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5f06e761acc5b1adf55c5495b5eb113f0fda049", + "version": "5.7.3", + "port-version": 0 + }, { "git-tree": "a1620e76488c7d67a53aa3ebe9d894e495bf5176", "version": "5.4.4", From 7916e2b2e0e9d427ea026d06e665d565f8f75627 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 22 Oct 2024 06:30:05 +0200 Subject: [PATCH 15/21] [baseline] Temporarily skip vcpkg-ci-msys2 (#41691) --- scripts/ci.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f503a1ac1a3d35..5bf3614a8e17db 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -36,6 +36,9 @@ ## x86-windows ## +# Temporary +vcpkg-ci-msys2:x64-windows=fail + # Add new items alphabetically 7zip:arm-neon-android=fail From d5db75704afe8029249bbcf4d83d990dc2b77370 Mon Sep 17 00:00:00 2001 From: Oleg Derevenetz Date: Tue, 22 Oct 2024 07:30:23 +0300 Subject: [PATCH 16/21] [fluidsynth] Update to 2.3.7 (#41706) --- ports/fluidsynth/portfile.cmake | 2 +- ports/fluidsynth/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fluidsynth.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index f6e5d3e5d1f6b6..ee1562aea9363e 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth REF "v${VERSION}" - SHA512 521e103e49c281ab7a44a2a275f614894062c1be6eb4df776b11e3756803c6b4b73d1e9596d364959c81b37dff4798d56798f9262c486e098f072ae1e7bef1c1 + SHA512 f5fd5ddbc4d30ded258ae3d04ba5981ce8da1132c5d93faf1e8745a9d9f89c9fb3365f0447b94e0fe0e9b032c789fcbd6e647a65a50d1f76179b53a76683d004 HEAD_REF master PATCHES gentables.patch diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index e18291e72abae7..7a042723fdeebe 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fluidsynth", - "version": "2.3.6", + "version": "2.3.7", "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 52acfc192ae13d..393b3e7f6b037c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2821,7 +2821,7 @@ "port-version": 0 }, "fluidsynth": { - "baseline": "2.3.6", + "baseline": "2.3.7", "port-version": 0 }, "flux": { diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 4c4d29de713cf7..19f4aa2480e3c3 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d1d73e0677d9043b340490e8d4aa34dd5d07ccc", + "version": "2.3.7", + "port-version": 0 + }, { "git-tree": "cf13356ad9581efb282fd17c61be1bdc43648155", "version": "2.3.6", From 61b201283907855a961059c5c5b091a77a227956 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 22 Oct 2024 06:30:48 +0200 Subject: [PATCH 17/21] [asio-grpc] Update to 3.2.1 (#41705) --- ports/asio-grpc/portfile.cmake | 4 +++- ports/asio-grpc/vcpkg.json | 2 +- versions/a-/asio-grpc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index 1b328ceccb1bda..b58571fd7eba06 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -1,8 +1,10 @@ +set(VCPKG_BUILD_TYPE release) # header-only + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc REF "v${VERSION}" - SHA512 c94ffd8270728d15e60a2605413ec703fa8426088b0b0fea152e462fb7016eac3309deeb830ef7251a024b05884f7c8268974c84233701da0aeecd325aa42344 + SHA512 4736b5e4e3e891417391374e21f06a51b135791ced82f7f1c4c0f0d6ead275ea81f8f97812a9570376463f4a18c8a43b73d6f75db624c19337b6553cedf8f2b3 HEAD_REF master ) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index 340e2ae2697533..67e3712e4807af 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "3.2.0", + "version": "3.2.1", "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", "license": "Apache-2.0", diff --git a/versions/a-/asio-grpc.json b/versions/a-/asio-grpc.json index 86fae41098e5fe..486ee9b9768836 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81996396008f6d7bef70f363e9fcbc04d46665f8", + "version": "3.2.1", + "port-version": 0 + }, { "git-tree": "e7b658f361294340b82054d2dac6ac7f654f8447", "version": "3.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 393b3e7f6b037c..d74289c58d02ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -261,7 +261,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "3.2.0", + "baseline": "3.2.1", "port-version": 0 }, "asiochan": { From 314700af63365179819abe72d3714ab495941d43 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:37:37 +0800 Subject: [PATCH 18/21] [sqlite-orm] update to 1.9 (#41660) --- ports/sqlite-orm/fix-uwp.patch | 16 ---------------- ports/sqlite-orm/portfile.cmake | 5 ++--- ports/sqlite-orm/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sqlite-orm.json | 5 +++++ 5 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 ports/sqlite-orm/fix-uwp.patch diff --git a/ports/sqlite-orm/fix-uwp.patch b/ports/sqlite-orm/fix-uwp.patch deleted file mode 100644 index 736fee7a4606c2..00000000000000 --- a/ports/sqlite-orm/fix-uwp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 945d275..8ca2de4 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -162,6 +162,11 @@ if (MSVC) - # C4458: declaration of 'symbol' hides class member - /wd4458) - endif() -+ if (CMAKE_CXX_FLAGS MATCHES "/D_UNICODE") -+ # explicitly set the entry point of the executable file, -+ # otherwise for some reason the linker will not pick up `wmain`, which is provided by the static Catch2 library -+ target_link_options(unit_tests PRIVATE "/ENTRY:wmainCRTStartup") -+ endif() - endif() - - target_precompile_headers(unit_tests PRIVATE diff --git a/ports/sqlite-orm/portfile.cmake b/ports/sqlite-orm/portfile.cmake index b6b1898509be02..94c5a1e4cfc39e 100644 --- a/ports/sqlite-orm/portfile.cmake +++ b/ports/sqlite-orm/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fnc12/sqlite_orm - REF v1.8.2 - SHA512 65479c02246d96bfa0a6a5ed749e15650e71114c1145d17bd48f1a57560c9f494148253064f720dd43773ac9971a85635c9d4927f3b336590188339b3d656b33 + REF "v${VERSION}" + SHA512 a9a31b534d9374364672d698a1d08ba3d0b2c06d91a3fc38c3fcf73eb2efc272f118bb05c5b4ea720ceac01f54ee02debd86de31cad645001ed2b8db943ebe33 HEAD_REF master PATCHES fix-dependency.patch - fix-uwp.patch #https://github.com/fnc12/sqlite_orm/pull/1295 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/sqlite-orm/vcpkg.json b/ports/sqlite-orm/vcpkg.json index 35b9dae65e96a9..8a46f21f9f8e65 100644 --- a/ports/sqlite-orm/vcpkg.json +++ b/ports/sqlite-orm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlite-orm", - "version": "1.8.2", - "port-version": 2, + "version": "1.9", "description": "SQLite ORM light header only library for modern C++", "homepage": "https://github.com/fnc12/sqlite_orm", "license": "AGPL-3.0-or-later OR MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d74289c58d02ae..9ecd0e0140ab89 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8573,8 +8573,8 @@ "port-version": 0 }, "sqlite-orm": { - "baseline": "1.8.2", - "port-version": 2 + "baseline": "1.9", + "port-version": 0 }, "sqlite3": { "baseline": "3.46.1", diff --git a/versions/s-/sqlite-orm.json b/versions/s-/sqlite-orm.json index 1fa0c678c569b4..6df750a67270c7 100644 --- a/versions/s-/sqlite-orm.json +++ b/versions/s-/sqlite-orm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "199d90fac299fcdcb22eaaeb3aaceea4490da339", + "version": "1.9", + "port-version": 0 + }, { "git-tree": "bcff94e1b22d04049a76d0a46dc0fbda9ca5bae7", "version": "1.8.2", From 8c2f2d0dc7675d1a6ba945ca2cdcc0d3cb110b6a Mon Sep 17 00:00:00 2001 From: c8ef Date: Tue, 22 Oct 2024 12:42:19 +0800 Subject: [PATCH 19/21] [folly related] update to 10.14 (#41673) --- ...02-fix-dependency.patch => fix-deps.patch} | 25 +++++++++++-------- ports/fbthrift/fix-glog.patch | 14 ----------- ports/fbthrift/portfile.cmake | 9 ++++--- ports/fbthrift/vcpkg.json | 3 ++- ports/fizz/portfile.cmake | 2 +- ports/fizz/vcpkg.json | 2 +- ports/folly/portfile.cmake | 2 +- ports/folly/vcpkg.json | 2 +- ports/mvfst/fix-cmake.patch | 25 ------------------- ports/mvfst/portfile.cmake | 3 +-- ports/mvfst/vcpkg.json | 2 +- ports/proxygen/portfile.cmake | 2 +- ports/proxygen/vcpkg.json | 2 +- ports/wangle/portfile.cmake | 2 +- ports/wangle/vcpkg.json | 2 +- versions/baseline.json | 12 ++++----- versions/f-/fbthrift.json | 5 ++++ versions/f-/fizz.json | 5 ++++ versions/f-/folly.json | 5 ++++ versions/m-/mvfst.json | 5 ++++ versions/p-/proxygen.json | 5 ++++ versions/w-/wangle.json | 5 ++++ 22 files changed, 67 insertions(+), 72 deletions(-) rename ports/fbthrift/{0002-fix-dependency.patch => fix-deps.patch} (78%) delete mode 100644 ports/fbthrift/fix-glog.patch delete mode 100644 ports/mvfst/fix-cmake.patch diff --git a/ports/fbthrift/0002-fix-dependency.patch b/ports/fbthrift/fix-deps.patch similarity index 78% rename from ports/fbthrift/0002-fix-dependency.patch rename to ports/fbthrift/fix-deps.patch index 6740a2a41427bd..14b6107358b4ef 100644 --- a/ports/fbthrift/0002-fix-dependency.patch +++ b/ports/fbthrift/fix-deps.patch @@ -1,16 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5eea37c..145e5b6 100644 +index c6b2b2a810..787a83bb1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -96,23 +96,25 @@ endif () +@@ -105,24 +105,26 @@ endif () # Find required dependencies for thrift/lib if (THRIFT_LIB_ONLY OR build_all) - find_package(Gflags REQUIRED) +- find_package(Glog REQUIRED) + find_package(gflags CONFIG REQUIRED) + set(LIBGFLAGS_LIBRARY gflags::gflags) - find_package(glog CONFIG REQUIRED) - set (GLOG_LIBRARIES glog::glog) ++ find_package(glog CONFIG REQUIRED) ++ set(GLOG_LIBRARIES glog::glog) find_package(folly CONFIG REQUIRED) find_package(fizz CONFIG REQUIRED) find_package(wangle CONFIG REQUIRED) @@ -22,6 +23,7 @@ index 5eea37c..145e5b6 100644 + elseif(TARGET zstd::libzstd_static) + set(ZSTD_LIBRARIES zstd::libzstd_static) + endif() + find_package(Xxhash REQUIRED) find_package(mvfst CONFIG REQUIRED) # https://cmake.org/cmake/help/v3.9/module/FindThreads.html set(THREADS_PREFER_PTHREAD_FLAG ON) @@ -31,14 +33,15 @@ index 5eea37c..145e5b6 100644 - ${GLOG_INCLUDE_DIRS} - ${OPENSSL_INCLUDE_DIR} - ${ZSTD_INCLUDE_DIRS} +- ${Xxhash_INCLUDE_DIR} ) add_definitions("-DTHRIFT_HAVE_LIBSNAPPY=0") if (THRIFT_LIB_ONLY) diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in -index 1d38221..ab96215 100644 +index 057015258c..f0c6692246 100644 --- a/thrift/cmake/FBThriftConfig.cmake.in +++ b/thrift/cmake/FBThriftConfig.cmake.in -@@ -28,8 +28,15 @@ else() +@@ -29,8 +29,15 @@ else() set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") endif() @@ -46,12 +49,12 @@ index 1d38221..ab96215 100644 -find_package(mvfst CONFIG REQUIRED) +find_dependency(ZLIB) +find_dependency(mvfst CONFIG) -+find_dependency(fizz CONFIG ) -+find_dependency(fmt CONFIG ) -+find_dependency(folly CONFIG ) ++find_dependency(fizz CONFIG) ++find_dependency(fmt CONFIG) ++find_dependency(folly CONFIG) +find_dependency(gflags CONFIG) -+find_dependency(glog CONFIG ) -+find_dependency(wangle CONFIG ) ++find_dependency(glog CONFIG) ++find_dependency(wangle CONFIG) +find_dependency(zstd CONFIG) if (NOT TARGET FBThrift::thriftcpp2) diff --git a/ports/fbthrift/fix-glog.patch b/ports/fbthrift/fix-glog.patch deleted file mode 100644 index 362e1d1eed09a2..00000000000000 --- a/ports/fbthrift/fix-glog.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7d9a1e7..d2b69ad 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -97,7 +97,8 @@ endif () - # Find required dependencies for thrift/lib - if (THRIFT_LIB_ONLY OR build_all) - find_package(Gflags REQUIRED) -- find_package(Glog REQUIRED) -+ find_package(glog CONFIG REQUIRED) -+ set (GLOG_LIBRARIES glog::glog) - find_package(folly CONFIG REQUIRED) - find_package(fizz CONFIG REQUIRED) - find_package(wangle CONFIG REQUIRED) diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 42d0af7f7bd2f1..3dcf217e70c1ed 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift REF "v${VERSION}" - SHA512 b1a880a922e5823ec6c87d1540651978d895a2d0389158865011198ca80034342f39f7b2c1a104745ccb1cb3cb8d355cb0afb5b08c38fb8187a285ea37071f26 + SHA512 5018dd3e062489633c6e6fdef867656bc8ae6717dd74808a29ce5066fd5d0d69d3038a1a0326ed4df2139590dce6b99381cdaaecae0af5ef37d26a5903be1e7e HEAD_REF main - PATCHES - fix-glog.patch - 0002-fix-dependency.patch + PATCHES + fix-deps.patch ) file(REMOVE "${SOURCE_PATH}/thrift/cmake/FindGMock.cmake") @@ -34,6 +33,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/transport/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp/util/test" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/async/metadata/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/debug_thrift_data_difference/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/detail/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/folly_dynamic/test" @@ -42,6 +42,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/detail/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/protocol/tool" + "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/demo" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/runtime/test" "${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/security/extensions/test" diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 0930517bbbdc6d..8a9dc45da71198 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", @@ -28,6 +28,7 @@ "host": true }, "wangle", + "xxhash", "zlib", "zstd" ] diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index f4d58365334f43..e9101b811a673b 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz REF "v${VERSION}" - SHA512 e20ecda20f0a4dce306cddfbdcf990212067aa4d3df551ee9d0b4a9a17f0509aba0c38bc9945ba2ba039a60f51a9cd5ea3e6fe6f97ba7d1c80e76238301bd283 + SHA512 5c18e5f66df1fd87a656212a2c4ffa2fd314f82318911e67831e979b2ea2695eec5ef5f61cebeaef954f55c904a5410d49a04cbea6549ba6ee8804db441efcc2 HEAD_REF main PATCHES fix-build.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index faa8361765d58c..a3058d461e25c3 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 82911402083731..23293e9024dbe4 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly REF "v${VERSION}" - SHA512 cb8feb35e51072555b910613e87f079acd1f97892df0e6f3888bd9a8a336ca6183d552bfb4e16cfafbf8f5a7ec3f2a85dda686c74528e23e4bc821b2f67bfa77 + SHA512 d402a2ebdff0c56e23e020823a040ef409b5c7834f598a75248126ca554f622806154d7aabc11ae65c9c2f16907a8a3589ad50e833c359714c4c5b1525cd1ba5 HEAD_REF main PATCHES disable-non-underscore-posix-names.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index ccc71c028086eb..3d81a790bbb3d6 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/mvfst/fix-cmake.patch b/ports/mvfst/fix-cmake.patch deleted file mode 100644 index 4828d189b3c7a0..00000000000000 --- a/ports/mvfst/fix-cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/quic/api/CMakeLists.txt b/quic/api/CMakeLists.txt -index 5522347c5..a0a34761e 100644 ---- a/quic/api/CMakeLists.txt -+++ b/quic/api/CMakeLists.txt -@@ -47,6 +47,7 @@ add_library( - QuicPacketScheduler.cpp - QuicStreamAsyncTransport.cpp - QuicTransportBase.cpp -+ QuicTransportBaseLite.cpp - QuicTransportFunctions.cpp - ) - - -diff --git a/quic/state/CMakeLists.txt b/quic/state/CMakeLists.txt -index 0916546fe..14297bb30 100644 ---- a/quic/state/CMakeLists.txt -+++ b/quic/state/CMakeLists.txt -@@ -55,6 +55,7 @@ add_library( - mvfst_state_ack_handler - AckEvent.cpp - AckHandlers.cpp -+ AckedPacketIterator.cpp - ) - - set_property(TARGET mvfst_state_ack_handler PROPERTY VERSION ${PACKAGE_VERSION}) diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index e9b6374bc77d05..91709b01770296 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -2,9 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/mvfst REF "v${VERSION}" - SHA512 8ec9e7daf1c259f31e90eaa32cfa29d377e279f93c2072528447455f4f8ea897ab17f2759222a2ea9a73fdafe96b7d8223cf1efbadad2e8ea180b23832090aa7 + SHA512 54ab3eeee94bbe5721ca79d365a44d91ad491bd7a3026bcd2c7f603281350a0226d5192879d9d24fb518e6ce97415c2c572835ac0283873e5731056eff2e360a HEAD_REF main - PATCHES fix-cmake.patch ) vcpkg_cmake_configure( diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index b3257e9b170ee7..95c1477fbf8470 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.00", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebook/mvfst", "license": "MIT", diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index f33be86c1f99d0..fc8ef501281cd5 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen REF "v${VERSION}" - SHA512 929a4010277bdf7ac7950e1f37b946328ef3da59dafa283db3841236833bde4cb2b734545e7bad8fd104bf4d083f3b50dc4a07d6e07a9fcdde78eda24e20b458 + SHA512 72b71ec08a40a7c037feee9d33a4b1cecaf44fc24d7b3896bd75ef920576d8413051e7fa0b7d5d4470c516850739127f269439af875d982a8d0420d06e2764c1 HEAD_REF main PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index e76852e54e2b3d..f5b0fed4d2de36 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "license": "BSD-3-Clause", diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 5036dc4156027e..b66719e2ca2ecb 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle REF "v${VERSION}" - SHA512 cb64738645c5af63bd4a06112d3ddcee557ca426127f569fc360183fc5893c88049a9ac60212f6187f283f02911e48ef718fb1b5ba41b665ab2bdc312aeb4356 + SHA512 b84419d7035b4599959cc7be9a9253a386ecab7e78c1d9d620afcb537ac178c1172a8f5465cf8769f45ed083d2aa9ba4324c08775fcc83c5ee017b1abec6b3dc HEAD_REF main PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index 47fc0ee65ac483..43adf8b6356a62 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2024.10.07.00", + "version-string": "2024.10.14.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9ecd0e0140ab89..6707a0ffdb2ba0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2713,7 +2713,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "fcl": { @@ -2761,7 +2761,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "flagpp": { @@ -2845,7 +2845,7 @@ "port-version": 1 }, "folly": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "font-chef": { @@ -6153,7 +6153,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "mygui": { @@ -7189,7 +7189,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "psimd": { @@ -9501,7 +9501,7 @@ "port-version": 5 }, "wangle": { - "baseline": "2024.10.07.00", + "baseline": "2024.10.14.00", "port-version": 0 }, "wasmedge": { diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index daa8f1f2731b4a..422d29cfb6e7c4 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e93b8851f4d130c0516f0d3f7ea7cd11645c5ea2", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "bc4c75751db768dfccfdf9dc0cd45b5f38e3ab18", "version-string": "2024.10.07.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 25305e8994440c..3cacba9a2b8d3b 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a980fe04f8d156378c1e0cfe32427c1271a8798a", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "0f9b145acd04fdea428cd27b7fca22d37b2f1e80", "version-string": "2024.10.07.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 730de528282725..d001122260cb52 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cd7435de58f63add1ed638ac479505fbbc3a26d", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "c1728c51eda0e3195c97dfdb580113f5a29d267c", "version-string": "2024.10.07.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index cd56cba4695055..e59b04be916015 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d08f8641593a028f20af63bfe7cacfe0ac10dfa", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "884696ea9ad9078cb5235e9bae639fc789ce7a1c", "version-string": "2024.10.07.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index a807e3b642f8fc..75872c8a078f6a 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "119f91bb8ac023671e37d0e47c5fed7c961b0ff2", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "bf5f1d578553c2ec1665a45b4e34bcf3229c3e6f", "version-string": "2024.10.07.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 0a0f2b51371968..b4acedeaa29cb2 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd0245e857537422c82545bc8f1f2c1a51fb1f42", + "version-string": "2024.10.14.00", + "port-version": 0 + }, { "git-tree": "dce0e6d225710b3ecd5811bb83d804ea740281c0", "version-string": "2024.10.07.00", From 6a4359c5c12c1a406eb481d2e7783307791ec44b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 22 Oct 2024 07:05:39 +0200 Subject: [PATCH 20/21] [libssh2] Update to 1.11.1 (#41652) Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> --- ports/cppfs/ssh-dependencies.diff | 4 ++-- ports/cppfs/vcpkg.json | 2 +- ports/curl/dependencies.patch | 16 ++++++---------- ports/curl/vcpkg-cmake-wrapper.cmake | 2 +- ports/curl/vcpkg.json | 1 + ports/libssh2/portfile.cmake | 9 +++------ ports/libssh2/usage | 4 ++-- ports/libssh2/vcpkg.json | 3 +-- versions/baseline.json | 8 ++++---- versions/c-/cppfs.json | 5 +++++ versions/c-/curl.json | 5 +++++ versions/l-/libssh2.json | 5 +++++ 12 files changed, 36 insertions(+), 28 deletions(-) diff --git a/ports/cppfs/ssh-dependencies.diff b/ports/cppfs/ssh-dependencies.diff index 28d9e92e381ad5..24cd8ef13d82d6 100644 --- a/ports/cppfs/ssh-dependencies.diff +++ b/ports/cppfs/ssh-dependencies.diff @@ -20,7 +20,7 @@ index aa37eda..d29176a 100644 -find_package(LibSSH2) -find_package(LibCrypto) -+find_package(LibSSH2 NAMES Libssh2) ++find_package(LibSSH2 NAMES libssh2) find_package(ZLIB) find_package(OpenSSL) +set(LibCrypto_FOUND "${OpenSSL_FOUND}") @@ -36,7 +36,7 @@ index aa37eda..d29176a 100644 - ${LIBCRYPTO_LIBRARY} - ${ZLIB_LIBRARY} + OpenSSL::SSL -+ $,Libssh2::libssh2_shared,Libssh2::libssh2_static> ++ libssh2::libssh2 + OpenSSL::Crypto + ZLIB::ZLIB ) diff --git a/ports/cppfs/vcpkg.json b/ports/cppfs/vcpkg.json index a86f0d82c438b8..c9f69100e0d622 100644 --- a/ports/cppfs/vcpkg.json +++ b/ports/cppfs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppfs", "version": "1.3.0", - "port-version": 3, + "port-version": 4, "description": "Cross-platform C++ file system library supporting multiple backends", "license": "MIT", "supports": "!uwp", diff --git a/ports/curl/dependencies.patch b/ports/curl/dependencies.patch index 2422b974d4f7cb..118d7e47b0dbb4 100644 --- a/ports/curl/dependencies.patch +++ b/ports/curl/dependencies.patch @@ -10,7 +10,7 @@ index 7dc1f99..e83617e 100644 + find_dependency(c-ares CONFIG) +endif() +if("@USE_LIBSSH2@") -+ find_dependency(Libssh2 CONFIG) ++ find_dependency(libssh2 CONFIG) +endif() +if("@HAVE_BROTLI@") + find_dependency(unofficial-brotli CONFIG) @@ -112,22 +112,18 @@ index dbb0bf4..f1a18d1 100644 if(LIBPSL_FOUND) list(APPEND CURL_LIBS ${LIBPSL_LIBRARIES}) list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libpsl") -@@ -1072,7 +1084,13 @@ mark_as_advanced(CURL_USE_LIBSSH2) +@@ -1072,7 +1084,9 @@ mark_as_advanced(CURL_USE_LIBSSH2) set(USE_LIBSSH2 OFF) if(CURL_USE_LIBSSH2) - find_package(Libssh2) -+ find_package(LIBSSH2 NAMES Libssh2 REQUIRED) -+ if(TARGET Libssh2::libssh2_shared) -+ set(LIBSSH2_LIBRARIES Libssh2::libssh2_shared) -+ else() -+ set(LIBSSH2_LIBRARIES Libssh2::libssh2_static) -+ endif() ++ find_package(LIBSSH2 NAMES libssh2 REQUIRED) ++ set(LIBSSH2_LIBRARIES libssh2::libssh2) + get_target_property(LIBSSH2_INCLUDE_DIRS "${LIBSSH2_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES) if(LIBSSH2_FOUND) list(APPEND CURL_LIBS ${LIBSSH2_LIBRARIES}) list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "libssh2") -@@ -1121,7 +1139,8 @@ endif() +@@ -1121,7 +1135,8 @@ endif() option(CURL_USE_GSASL "Use libgsasl" OFF) mark_as_advanced(CURL_USE_GSASL) if(CURL_USE_GSASL) @@ -137,7 +133,7 @@ index dbb0bf4..f1a18d1 100644 if(LIBGSASL_FOUND) list(APPEND CURL_LIBS ${LIBGSASL_LIBRARIES}) list(APPEND CURL_LIBDIRS ${LIBGSASL_LIBRARY_DIRS}) -@@ -1139,7 +1158,10 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF) +@@ -1139,7 +1154,10 @@ option(CURL_USE_GSSAPI "Use GSSAPI implementation" OFF) mark_as_advanced(CURL_USE_GSSAPI) if(CURL_USE_GSSAPI) diff --git a/ports/curl/vcpkg-cmake-wrapper.cmake b/ports/curl/vcpkg-cmake-wrapper.cmake index 5e64ef762af3e0..9ff5a7b9541519 100644 --- a/ports/curl/vcpkg-cmake-wrapper.cmake +++ b/ports/curl/vcpkg-cmake-wrapper.cmake @@ -28,7 +28,7 @@ if(CURL_FOUND) if(_curl_link_libraries MATCHES "OpenSSL::") string(REGEX REPLACE "([\$]<[^;]*)?OpenSSL::(SSL|Crypto)([^;]*>)?" "${OPENSSL_LIBRARIES}" _curl_link_libraries "${_curl_link_libraries}") endif() - if(_curl_link_libraries MATCHES "Libssh2::libssh2_(shared|static)") + if(_curl_link_libraries MATCHES "libssh2::libssh2") # TODO: move find_dependency(Libssh2 CONFIG) into CURL config set(_libssh2_target "${CMAKE_MATCH_0}") find_package(Libssh2 CONFIG QUIET) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index a6a644fab4d3e6..7b346c0197f9fd 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "8.10.1", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": "curl AND ISC AND BSD-3-Clause", diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index bfbf2bc99c2765..0781394d8b471e 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libssh2/libssh2 REF "libssh2-${VERSION}" - SHA512 8ae38d76e7fae82843c7c6990760ad5827cb55e2aba096f684b832016614d76983d1871ae0857ba28efcb9fd65018ae0b34420f6841da6bb6c6ccebd9689ec0f + SHA512 616efcd7f5c1fb1046104ebce70549e4756e2a55150efa2df5bb7123051d3bf336023cedcbfe932cd7c690a0b4d1f1a93c760ea39f1dba50c2b06d0945dca958 HEAD_REF master ) @@ -42,11 +42,8 @@ vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libssh2) if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef LIBSSH2_WIN32" "if 1") - if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 1" IGNORE_UNCHANGED) - else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "ifdef _WINDLL" "if 0" IGNORE_UNCHANGED) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libssh2.h" "defined(_WINDLL)" "1") endif() if(VCPKG_TARGET_STATIC_LIBRARY_PREFIX STREQUAL "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libssh2.pc" " -lssh2" " -llibssh2") diff --git a/ports/libssh2/usage b/ports/libssh2/usage index 19cb7519821b82..796dd2f47a0c4f 100644 --- a/ports/libssh2/usage +++ b/ports/libssh2/usage @@ -1,4 +1,4 @@ libssh2 provides CMake targets: - find_package(Libssh2 CONFIG REQUIRED) - target_link_libraries(main PRIVATE $,Libssh2::libssh2_shared,Libssh2::libssh2_static>) + find_package(libssh2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE libssh2::libssh2) diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index 5cb2fe932a028f..de18cb551f20bf 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libssh2", - "version": "1.11.0", - "port-version": 2, + "version": "1.11.1", "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 6707a0ffdb2ba0..8f99c531a33ea5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1950,7 +1950,7 @@ }, "cppfs": { "baseline": "1.3.0", - "port-version": 3 + "port-version": 4 }, "cppgraphqlgen": { "baseline": "4.5.7", @@ -2126,7 +2126,7 @@ }, "curl": { "baseline": "8.10.1", - "port-version": 0 + "port-version": 1 }, "curlcpp": { "baseline": "3.1", @@ -5133,8 +5133,8 @@ "port-version": 0 }, "libssh2": { - "baseline": "1.11.0", - "port-version": 2 + "baseline": "1.11.1", + "port-version": 0 }, "libstemmer": { "baseline": "2021.2.2.0", diff --git a/versions/c-/cppfs.json b/versions/c-/cppfs.json index 9284ea9b8cb5ed..4cf9035221890f 100644 --- a/versions/c-/cppfs.json +++ b/versions/c-/cppfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e705e7775f54232e723bcf5bb8fefb55ed4e715f", + "version": "1.3.0", + "port-version": 4 + }, { "git-tree": "effae8e598d06cff2d1c7b0a084e6394ff1ee6ed", "version": "1.3.0", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index fa051069e3c021..be743a017b2fc1 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31d4981751582248fd2983bcadc540584a906a9a", + "version": "8.10.1", + "port-version": 1 + }, { "git-tree": "9fa54a801b36fad7852cd4174d00fd3e5675abdb", "version": "8.10.1", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index aeb994924a5658..db8fcd8a4218c4 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0711b8dc1f6946f612076f4b60a60fa022e8e8e7", + "version": "1.11.1", + "port-version": 0 + }, { "git-tree": "6963d92a0f19203e7f8d4369b089cc4d1b613782", "version": "1.11.0", From c8582b4d83dbd36e1bebc08bf166b5eb807996b0 Mon Sep 17 00:00:00 2001 From: Jan Wilczek <24981875+JanWilczek@users.noreply.github.com> Date: Tue, 22 Oct 2024 07:21:43 +0200 Subject: [PATCH 21/21] [asyncplusplus] Update asyncplusplus to v1.2 (#41420) --- ports/asyncplusplus/portfile.cmake | 4 ++-- ports/asyncplusplus/vcpkg.json | 3 +-- versions/a-/asyncplusplus.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/asyncplusplus/portfile.cmake b/ports/asyncplusplus/portfile.cmake index cd8bf8b615d43e..db287ce739d5d2 100644 --- a/ports/asyncplusplus/portfile.cmake +++ b/ports/asyncplusplus/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Amanieu/asyncplusplus - REF 172ca3f8e0df1b3f7f5ee8b8244e4ac67258b0d8 # v1.1 - SHA512 fd95b3349ceed4cab5cb0e146d2ccfe77c85318303015cf513037fc69c1ade7cfdb3dc81de8a90846c4387c5e31f5a70a64da770547c201dfe24d2c181be1933 + REF v1.2 + SHA512 4b59ef805d4683631ef2ba51039deb210d9ba28b35021489560b0f2da6f75a68da8cb676807f9831047c997673556f69fdca0ae2081996274015e708fd6ff55e HEAD_REF master ) diff --git a/ports/asyncplusplus/vcpkg.json b/ports/asyncplusplus/vcpkg.json index 6b59776559240d..413f125062cc86 100644 --- a/ports/asyncplusplus/vcpkg.json +++ b/ports/asyncplusplus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "asyncplusplus", - "version": "1.1", - "port-version": 2, + "version": "1.2", "description": "Async++ is a lightweight concurrency framework for C++11", "license": "MIT", "supports": "!uwp", diff --git a/versions/a-/asyncplusplus.json b/versions/a-/asyncplusplus.json index f11d1aab0774dd..0e1fb0bbb9511c 100644 --- a/versions/a-/asyncplusplus.json +++ b/versions/a-/asyncplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c34412bc47db8ec8e11e9c8569791d5da5199cc", + "version": "1.2", + "port-version": 0 + }, { "git-tree": "454f29e635dba103d5d48a5b1e9ba9842fb4864e", "version": "1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 8f99c531a33ea5..320fa9467fb86f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -301,8 +301,8 @@ "port-version": 3 }, "asyncplusplus": { - "baseline": "1.1", - "port-version": 2 + "baseline": "1.2", + "port-version": 0 }, "at-spi2-atk": { "baseline": "2.38.0",