From 358f3893843c9d0d1b2e594183481fb68e3aa963 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Mon, 16 Dec 2024 16:51:38 -0800 Subject: [PATCH 01/44] Migrate tool metadata from XML to JSON format Add arm64 entries for CMake. --- scripts/vcpkg-tools.json | 299 +++++++++++++++++++++++++++++++++++++++ scripts/vcpkgTools.xml | 216 ---------------------------- 2 files changed, 299 insertions(+), 216 deletions(-) create mode 100644 scripts/vcpkg-tools.json delete mode 100644 scripts/vcpkgTools.xml diff --git a/scripts/vcpkg-tools.json b/scripts/vcpkg-tools.json new file mode 100644 index 00000000000000..65fdba3dce1082 --- /dev/null +++ b/scripts/vcpkg-tools.json @@ -0,0 +1,299 @@ +{ + "schema-version": 1, + "tools": [ + { + "name": "python3", + "os": "windows", + "version": "3.12.7", + "executable": "python.exe", + "url": "https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-win32.zip", + "sha512": "15542080e0cc25c574391218107fe843006e8c5a7161d1cd48cf14a3c47155c0244587273d9c747f35b15ea17676869ecce079214824214c1a62abfc86ad9f9b", + "archive": "python-3.12.7-embed-win32.zip" + }, + { + "name": "python3_with_venv", + "os": "windows", + "version": "3.12.7", + "executable": "tools/python.exe", + "url": "https://www.nuget.org/api/v2/package/python/3.12.7", + "sha512": "6d5cac329808e31d4d8d593da6eeaa9ea4ec0296679335e7b7811f6c6fa6cbb96948d2f7845071798c6f73f83852dd731dc2b0fda48c520b9bec8a86cc56134e", + "archive": "python-3.12.7.nupkg.zip" + }, + { + "name": "cmake", + "os": "windows", + "arch": "amd64", + "version": "3.30.1", + "executable": "cmake-3.30.1-windows-i386/bin/cmake.exe", + "url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-i386.zip", + "sha512": "0b74bd4222064cfb6e42838987704eb21d57ad5f7bbd87714ab570f1d107fa19bd2f14316475338518292bc377bf38b581a07c73267a775cd385bbd1800879b4", + "archive": "cmake-3.30.1-windows-i386.zip" + }, + { + "name": "cmake", + "os": "windows", + "arch": "arm64", + "version": "3.30.1", + "executable": "cmake-3.30.1-windows-arm64/bin/cmake.exe", + "url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-arm64.zip", + "sha512": "40bcdeff5ff40044629f49e0effc958a719353330ea39876b919fb7c2d441885c884acf43e644ab5dedcb95503d211c895da1c0b6360e71449bea6a981f8e128", + "archive": "cmake-3.30.1-windows-arm64.zip" + }, + { + "name": "cmake", + "os": "osx", + "version": "3.30.1", + "executable": "cmake-3.30.1-macos-universal/CMake.app/Contents/bin/cmake", + "url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-macos-universal.tar.gz", + "sha512": "71290d3b5e51724711e8784f5b21100cb0cffdbb889da7572a26dd171d9052601496de8d39c42d76ef3a9245af2ab35a590bf53ad68d7bb8a2047b64272d2647", + "archive": "cmake-3.30.1-macos-universal.tar.gz" + }, + { + "name": "cmake", + "os": "linux", + "arch": "arm64", + "version": "3.30.1", + "executable": "cmake-3.30.1-linux-aarch64/bin/cmake", + "url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-aarch64.tar.gz", + "sha512": "ec6c1c682dda2381aa5ebef98a2597e4ab6b4563639c28b2f30c20360694b902a7b33c175c796169a9f99ed139f053916042caed58d83298680894c2840dbb87", + "archive": "cmake-3.30.1-linux-aarch64.tar.gz" + }, + { + "name": "cmake", + "os": "linux", + "version": "3.30.1", + "executable": "cmake-3.30.1-linux-x86_64/bin/cmake", + "url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-x86_64.tar.gz", + "sha512": "84ce1333ed696a1736986fba2853c5d8db0e4c9addaf4a4723911248c6d49ecf545adf8bd46091d198fc7bd1e6c896798661463aa1ce3a726a093883aaa19adf", + "archive": "cmake-3.30.1-linux-x86_64.tar.gz" + }, + { + "name": "git", + "os": "windows", + "version": "2.7.4", + "executable": "mingw64/bin/git.exe", + "url": "https://github.com/git-for-windows/git/releases/download/v2.43.0.windows.1/PortableGit-2.43.0-64-bit.7z.exe", + "sha512": "02ec40f55a6de18f305530e9415b6ce0a597359ebb9a58cf727ac84eceb0003b0f437941b76872b6568157a333c8e6e8d865a36faf874fd5f04774deb6a9387a", + "archive": "PortableGit-2.43.0-32-bit.7z.exe" + }, + { + "name": "git", + "os": "linux", + "version": "2.7.4", + "executable": "" + }, + { + "name": "git", + "os": "osx", + "version": "2.7.4", + "executable": "" + }, + { + "name": "git", + "os": "freebsd", + "version": "2.7.4", + "executable": "" + }, + { + "name": "gsutil", + "os": "windows", + "version": "4.65", + "executable": "google-cloud-sdk/bin/gsutil.cmd", + "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip", + "sha512": "e2792e17b132aad77f7c0b9fd26faf415e9437923d9227a9e6d253554e6843d29a6ddad0a7fb5e9aea4a130fd4c521e6ece8844fd4a4f9e8d580348775425389", + "archive": "google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip" + }, + { + "name": "gsutil", + "os": "osx", + "version": "4.65", + "executable": "gsutil/gsutil", + "url": "https://storage.googleapis.com/pub/gsutil_4.65.tar.gz", + "sha512": "2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8", + "archive": "gsutil_4.65.tar.gz" + }, + { + "name": "gsutil", + "os": "linux", + "version": "4.65", + "executable": "gsutil/gsutil", + "url": "https://storage.googleapis.com/pub/gsutil_4.65.tar.gz", + "sha512": "2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8", + "archive": "gsutil_4.65.tar.gz" + }, + { + "name": "vswhere", + "os": "windows", + "version": "3.1.7", + "executable": "vswhere.exe", + "url": "https://github.com/microsoft/vswhere/releases/download/3.1.7/vswhere.exe", + "sha512": "40c534eb27f079c15c9782f53f82c12dabfede4d3d85f0edf8a855c2b0d5e12921a96506b37c210beab3c33220f8ff098447ad054e82d8c2603964975fc12076" + }, + { + "name": "nuget", + "os": "windows", + "version": "6.10.0", + "executable": "nuget.exe", + "url": "https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe", + "sha512": "71d7307bb89de2df3811419c561efa00618a4c68e6ce481b0bdfc94c7c6c6d126a54eb26a0015686fabf99f109744ca41fead99e97139cdc86dde16a5ec3e7cf" + }, + { + "name": "nuget", + "os": "linux", + "version": "6.10.0", + "executable": "nuget.exe", + "url": "https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe", + "sha512": "71d7307bb89de2df3811419c561efa00618a4c68e6ce481b0bdfc94c7c6c6d126a54eb26a0015686fabf99f109744ca41fead99e97139cdc86dde16a5ec3e7cf" + }, + { + "name": "nuget", + "os": "osx", + "version": "6.10.0", + "executable": "nuget.exe", + "url": "https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe", + "sha512": "71d7307bb89de2df3811419c561efa00618a4c68e6ce481b0bdfc94c7c6c6d126a54eb26a0015686fabf99f109744ca41fead99e97139cdc86dde16a5ec3e7cf" + }, + { + "name": "coscli", + "os": "windows", + "version": "0.11.0", + "executable": "coscli-windows.exe", + "url": "https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-windows.exe", + "sha512": "38a521ec80cdb6944124f4233d7e71eed8cc9f9be2c0c736269915d21c3718ea8131e4516bb6eeada6df331f5fa8f47a299907e50ee9edbe0114444520974d06" + }, + { + "name": "coscli", + "os": "linux", + "version": "0.11.0", + "executable": "coscli-linux", + "url": "https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-linux", + "sha512": "9c930a1d308e9581a0e2fdfe3751ea7fe13d6068df90ca6465740ec3eda034202ef71ec54c99e90015ff81aa68aa1489567db5e411e222eb7258704bdac7e924" + }, + { + "name": "coscli", + "os": "osx", + "version": "0.11.0", + "executable": "coscli-mac", + "url": "https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-mac", + "sha512": "9556335bfc8bc14bace6dfced45fa77fb07c80f08aa975e047a54efda1d19852aae0ea68a5bc7f04fbd88e3edce5a73512a61216b1c5ff4cade224de4a9ab8db" + }, + { + "name": "installerbase", + "os": "windows", + "version": "4.4.0", + "executable": "QtInstallerFramework-win-x86/bin/installerbase.exe", + "url": "https://download.qt.io/official_releases/qt-installer-framework/4.4.0/installer-framework-opensource-src-4.4.0.zip", + "sha512": "fc713f54bfe2781cb232cd0ae8eddb96833ec178d53a55ec0b01886aa048b13441eb49a1f33282e8eab7259cfe512c890d50b8e632d3dbf501a0bf1fd83de947", + "archive": "installer-framework-opensource-src-4.4.0.zip" + }, + { + "name": "7zip_msi", + "os": "windows", + "version": "24.08", + "executable": "Files/7-Zip/7z.exe", + "url": "https://github.com/ip7z/7zip/releases/download/24.08/7z2408-x64.msi", + "sha512": "3259bf5e251382333c9d18a3fc01d83491fb41bc4ac4ddb25a02918494594c1074482b6608189a8a89e343d78e34d57420cdeff1d7ace5acfdcaacc8776f1be8", + "archive": "7z2408-x64.msi" + }, + { + "name": "7zip", + "os": "windows", + "version": "24.09", + "executable": "7z.exe", + "url": "https://github.com/ip7z/7zip/releases/download/24.09/7z2409.exe", + "sha512": "a39a84b13b383ac5fca20eb6d92ec6b8bc85f1b6a545c441efdbe054d8d12c9ebe97d366235bdf1383bbdb2a9666d18d0145b10b6e589180502c0c2dfa26ef14", + "archive": "7z2409.7z.exe" + }, + { + "name": "7zr", + "os": "windows", + "version": "24.09", + "executable": "7zr.exe", + "url": "https://github.com/ip7z/7zip/releases/download/24.09/7zr.exe", + "sha512": "44d8504a693ad4d6b79631b653fc19b572de6bbe38713b53c45d9c9d5d3710aa8df93ee867a2a24419ebe883b8255fd18f30f8cf374b2242145fd6acb2189659" + }, + { + "name": "aria2", + "os": "windows", + "version": "1.37.0", + "executable": "aria2-1.37.0-win-64bit-build1/aria2c.exe", + "url": "https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0-win-64bit-build1.zip", + "sha512": "6d78405da9cf5639dbe8174787002161b8124d73880fb57cc8c0a3a63982f84e46df4e626990c58f23452965ad925f0d37cb9147e99b25c3d7ca0ea49602f34d", + "archive": "aria2-1.37.0-win-64bit-build1.zip" + }, + { + "name": "aria2", + "os": "osx", + "version": "1.35.0", + "executable": "aria2-1.35.0/bin/aria2c", + "url": "https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-osx-darwin.tar.bz2", + "sha512": "3bb32b7d55347d1af37c6f4ebf0e20b38ce51c37a1baf92f7ad1762000539a03413dd679a6d902fdb1805fa71917300c9692aceee012eb06ecdff10491137aec", + "archive": "aria2-1.35.0-osx-darwin.tar.bz2" + }, + { + "name": "ninja", + "os": "windows", + "arch": "x64", + "version": "1.11.1", + "executable": "ninja.exe", + "url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip", + "sha512": "a700e794c32eb67b9f87040db7f1ba3a8e891636696fc54d416b01661c2421ff46fa517c97fd904adacdf8e621df3e68ea380105b909ae8b6651a78ae7eb3199", + "archive": "ninja-win-1.11.1.zip" + }, + { + "name": "ninja", + "os": "linux", + "arch": "x64", + "version": "1.11.1", + "executable": "ninja", + "url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip", + "sha512": "6403dac9196baffcff614fa73ea530752997c8db6bbfbaa0446b4b09d7327e2aa6e8615d1283c961d3bf0df497e85ba86604149f1505ee75f89d600245a45dde", + "archive": "ninja-linux-1.11.1.zip" + }, + { + "name": "ninja", + "os": "osx", + "version": "1.11.1", + "executable": "ninja", + "url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip", + "sha512": "dad33b0918c60bbf5107951a936175b1610b4894a408f4ba4b47a2f5b328fc982a52a2aed6a0cb75028ee4765af5083bea66611c37516826eb0c851366bb4427", + "archive": "ninja-mac-1.11.1.zip" + }, + { + "name": "powershell-core", + "os": "windows", + "version": "7.2.24", + "executable": "pwsh.exe", + "url": "https://github.com/PowerShell/PowerShell/releases/download/v7.2.24/PowerShell-7.2.24-win-x64.zip", + "sha512": "a08b72958f5a552240d3f68c581d8c8cb580468a71f5e55ca54a1dd0c0fcd81da9df11036653e2300fc4a5778a77c0147832ca06f7837f03417e9795e577a76f", + "archive": "PowerShell-7.2.24-win-x64.zip" + }, + { + "name": "node", + "os": "windows", + "version": "16.15.1", + "executable": "node-v16.15.1-win-x64/node.exe", + "url": "https://nodejs.org/dist/v16.15.1/node-v16.15.1-win-x64.7z", + "sha512": "7ec4bfe2ea6034e1461e306b6372d62c0c5d1060c453ba76a73a5cec38ac26b5952a744caa9071455329caa58eb0a96d26c68854c8915c17610ff27b0cf2c1cf", + "archive": "node-v16.15.1-win-x64.7z" + }, + { + "name": "node", + "os": "linux", + "version": "16.15.1", + "executable": "node-v16.15.1-linux-x64/bin/node", + "url": "https://nodejs.org/dist/v16.15.1/node-v16.15.1-linux-x64.tar.gz", + "sha512": "5ad3b4b9caeaa8d31503efa99f5a593118a267dec9d4181d019732126ba248ce9a901207115b3f6b899eb5b3f0373c7f77ea95cc92ac625cddf437ee9b8b8919", + "archive": "node-v16.15.1-linux-x64.tar.gz" + }, + { + "name": "node", + "os": "osx", + "version": "16.15.1", + "executable": "node-v16.15.1-darwin-x64/bin/node", + "url": "https://nodejs.org/dist/v16.15.1/node-v16.15.1-darwin-x64.tar.gz", + "sha512": "90d0612bbe5467b6cf385c91a68b8daad0057e3e0ccacea44567f5b95b14f7481cb79784185ab1463b4bd990e092ff0f9109576d1a1934b84e1c816582929611", + "archive": "node-v16.15.1-darwin-x64.tar.gz" + } + ] +} diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml deleted file mode 100644 index aae13ff05526ba..00000000000000 --- a/scripts/vcpkgTools.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - 3.12.7 - python.exe - https://www.python.org/ftp/python/3.12.7/python-3.12.7-embed-win32.zip - 15542080e0cc25c574391218107fe843006e8c5a7161d1cd48cf14a3c47155c0244587273d9c747f35b15ea17676869ecce079214824214c1a62abfc86ad9f9b - python-3.12.7-embed-win32.zip - - - 3.12.7 - tools\python.exe - https://www.nuget.org/api/v2/package/python/3.12.7 - 6d5cac329808e31d4d8d593da6eeaa9ea4ec0296679335e7b7811f6c6fa6cbb96948d2f7845071798c6f73f83852dd731dc2b0fda48c520b9bec8a86cc56134e - python-3.12.7.nupkg.zip - - - 3.30.1 - cmake-3.30.1-windows-i386/bin/cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-windows-i386.zip - 0b74bd4222064cfb6e42838987704eb21d57ad5f7bbd87714ab570f1d107fa19bd2f14316475338518292bc377bf38b581a07c73267a775cd385bbd1800879b4 - cmake-3.30.1-windows-i386.zip - - - 3.30.1 - cmake-3.30.1-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-macos-universal.tar.gz - 71290d3b5e51724711e8784f5b21100cb0cffdbb889da7572a26dd171d9052601496de8d39c42d76ef3a9245af2ab35a590bf53ad68d7bb8a2047b64272d2647 - cmake-3.30.1-macos-universal.tar.gz - - - 3.30.1 - cmake-3.30.1-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-x86_64.tar.gz - 84ce1333ed696a1736986fba2853c5d8db0e4c9addaf4a4723911248c6d49ecf545adf8bd46091d198fc7bd1e6c896798661463aa1ce3a726a093883aaa19adf - cmake-3.30.1-linux-x86_64.tar.gz - - - 2.7.4 - mingw64\bin\git.exe - https://github.com/git-for-windows/git/releases/download/v2.43.0.windows.1/PortableGit-2.43.0-64-bit.7z.exe - 02ec40f55a6de18f305530e9415b6ce0a597359ebb9a58cf727ac84eceb0003b0f437941b76872b6568157a333c8e6e8d865a36faf874fd5f04774deb6a9387a - PortableGit-2.43.0-32-bit.7z.exe - - - 2.7.4 - - - - - - 2.7.4 - - - - - - 2.7.4 - - - - - - 4.65 - google-cloud-sdk\bin\gsutil.cmd - https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip - e2792e17b132aad77f7c0b9fd26faf415e9437923d9227a9e6d253554e6843d29a6ddad0a7fb5e9aea4a130fd4c521e6ece8844fd4a4f9e8d580348775425389 - google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip - - - 4.65 - gsutil/gsutil - https://storage.googleapis.com/pub/gsutil_4.65.tar.gz - 2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8 - gsutil_4.65.tar.gz - - - 4.65 - gsutil/gsutil - https://storage.googleapis.com/pub/gsutil_4.65.tar.gz - 2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8 - gsutil_4.65.tar.gz - - - 3.1.7 - vswhere.exe - https://github.com/microsoft/vswhere/releases/download/3.1.7/vswhere.exe - 40c534eb27f079c15c9782f53f82c12dabfede4d3d85f0edf8a855c2b0d5e12921a96506b37c210beab3c33220f8ff098447ad054e82d8c2603964975fc12076 - - - 6.10.0 - nuget.exe - https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe - 71d7307bb89de2df3811419c561efa00618a4c68e6ce481b0bdfc94c7c6c6d126a54eb26a0015686fabf99f109744ca41fead99e97139cdc86dde16a5ec3e7cf - - - 6.10.0 - nuget.exe - https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe - 71d7307bb89de2df3811419c561efa00618a4c68e6ce481b0bdfc94c7c6c6d126a54eb26a0015686fabf99f109744ca41fead99e97139cdc86dde16a5ec3e7cf - - - 6.10.0 - nuget.exe - https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe - 71d7307bb89de2df3811419c561efa00618a4c68e6ce481b0bdfc94c7c6c6d126a54eb26a0015686fabf99f109744ca41fead99e97139cdc86dde16a5ec3e7cf - - - 0.11.0 - coscli-windows.exe - https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-windows.exe - 38a521ec80cdb6944124f4233d7e71eed8cc9f9be2c0c736269915d21c3718ea8131e4516bb6eeada6df331f5fa8f47a299907e50ee9edbe0114444520974d06 - - - 0.11.0 - coscli-linux - https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-linux - 9c930a1d308e9581a0e2fdfe3751ea7fe13d6068df90ca6465740ec3eda034202ef71ec54c99e90015ff81aa68aa1489567db5e411e222eb7258704bdac7e924 - - - 0.11.0 - coscli-mac - https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-mac - 9556335bfc8bc14bace6dfced45fa77fb07c80f08aa975e047a54efda1d19852aae0ea68a5bc7f04fbd88e3edce5a73512a61216b1c5ff4cade224de4a9ab8db - - - 4.4.0 - QtInstallerFramework-win-x86\bin\installerbase.exe - https://download.qt.io/official_releases/qt-installer-framework/4.4.0/installer-framework-opensource-src-4.4.0.zip - fc713f54bfe2781cb232cd0ae8eddb96833ec178d53a55ec0b01886aa048b13441eb49a1f33282e8eab7259cfe512c890d50b8e632d3dbf501a0bf1fd83de947 - installer-framework-opensource-src-4.4.0.zip - - - 24.09 - Files\7-Zip\7z.exe - https://github.com/ip7z/7zip/releases/download/24.09/7z2409-x64.msi - a3396a70b739f3a80b25fe64103d1e98ea584dcdbdba740884ea10e00edfb37966ceb85f5cca995865fe90371eadff9df8132124d3dc2598a2d78bf86f6ddd6e - 7z2409-x64.msi - - - 24.09 - 7z.exe - https://github.com/ip7z/7zip/releases/download/24.09/7z2409.exe - a39a84b13b383ac5fca20eb6d92ec6b8bc85f1b6a545c441efdbe054d8d12c9ebe97d366235bdf1383bbdb2a9666d18d0145b10b6e589180502c0c2dfa26ef14 - 7z2409.7z.exe - - - 24.09 - 7zr.exe - https://github.com/ip7z/7zip/releases/download/24.09/7zr.exe - 44d8504a693ad4d6b79631b653fc19b572de6bbe38713b53c45d9c9d5d3710aa8df93ee867a2a24419ebe883b8255fd18f30f8cf374b2242145fd6acb2189659 - - - 1.37.0 - aria2-1.37.0-win-64bit-build1\aria2c.exe - https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0-win-64bit-build1.zip - 6d78405da9cf5639dbe8174787002161b8124d73880fb57cc8c0a3a63982f84e46df4e626990c58f23452965ad925f0d37cb9147e99b25c3d7ca0ea49602f34d - aria2-1.37.0-win-64bit-build1.zip - - - 1.35.0 - aria2-1.35.0/bin/aria2c - https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-osx-darwin.tar.bz2 - 3bb32b7d55347d1af37c6f4ebf0e20b38ce51c37a1baf92f7ad1762000539a03413dd679a6d902fdb1805fa71917300c9692aceee012eb06ecdff10491137aec - aria2-1.35.0-osx-darwin.tar.bz2 - - - 1.11.1 - ninja.exe - https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip - a700e794c32eb67b9f87040db7f1ba3a8e891636696fc54d416b01661c2421ff46fa517c97fd904adacdf8e621df3e68ea380105b909ae8b6651a78ae7eb3199 - ninja-win-1.11.1.zip - - - 1.11.1 - ninja - https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip - 6403dac9196baffcff614fa73ea530752997c8db6bbfbaa0446b4b09d7327e2aa6e8615d1283c961d3bf0df497e85ba86604149f1505ee75f89d600245a45dde - ninja-linux-1.11.1.zip - - - 1.11.1 - ninja - https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip - dad33b0918c60bbf5107951a936175b1610b4894a408f4ba4b47a2f5b328fc982a52a2aed6a0cb75028ee4765af5083bea66611c37516826eb0c851366bb4427 - ninja-mac-1.11.1.zip - - - 7.2.24 - pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.2.24/PowerShell-7.2.24-win-x64.zip - a08b72958f5a552240d3f68c581d8c8cb580468a71f5e55ca54a1dd0c0fcd81da9df11036653e2300fc4a5778a77c0147832ca06f7837f03417e9795e577a76f - PowerShell-7.2.24-win-x64.zip - - - 16.15.1 - node-v16.15.1-win-x64\node.exe - https://nodejs.org/dist/v16.15.1/node-v16.15.1-win-x64.7z - 7ec4bfe2ea6034e1461e306b6372d62c0c5d1060c453ba76a73a5cec38ac26b5952a744caa9071455329caa58eb0a96d26c68854c8915c17610ff27b0cf2c1cf - node-v16.15.1-win-x64.7z - - - 16.15.1 - node-v16.15.1-linux-x64/bin/node - https://nodejs.org/dist/v16.15.1/node-v16.15.1-linux-x64.tar.gz - 5ad3b4b9caeaa8d31503efa99f5a593118a267dec9d4181d019732126ba248ce9a901207115b3f6b899eb5b3f0373c7f77ea95cc92ac625cddf437ee9b8b8919 - node-v16.15.1-linux-x64.tar.gz - - - 16.15.1 - node-v16.15.1-darwin-x64/bin/node - https://nodejs.org/dist/v16.15.1/node-v16.15.1-darwin-x64.tar.gz - 90d0612bbe5467b6cf385c91a68b8daad0057e3e0ccacea44567f5b95b14f7481cb79784185ab1463b4bd990e092ff0f9109576d1a1934b84e1c816582929611 - node-v16.15.1-darwin-x64.tar.gz - - From d15d9e4623bf2f78fc4e6599752fd8c80e906b28 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 10 Jan 2025 18:04:57 -0800 Subject: [PATCH 02/44] Update vcpkg-tool to 2025-01-11. https://github.com/microsoft/vcpkg-tool/releases/tag/2025-01-11 --- scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 | 247 --------------------- scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 | 254 ---------------------- scripts/posh-vcpkg/posh-vcpkg.psd1 | 250 ++++++++++++++++++++++ scripts/posh-vcpkg/posh-vcpkg.psm1 | 259 +++++++++++++++++++++++ scripts/vcpkg-tool-metadata.txt | 10 +- 5 files changed, 514 insertions(+), 506 deletions(-) delete mode 100644 scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 delete mode 100644 scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 create mode 100644 scripts/posh-vcpkg/posh-vcpkg.psd1 create mode 100644 scripts/posh-vcpkg/posh-vcpkg.psm1 diff --git a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 deleted file mode 100644 index c0e473278a0433..00000000000000 --- a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 +++ /dev/null @@ -1,247 +0,0 @@ -@{ - -# Script module or binary module file associated with this manifest. -ModuleToProcess = 'posh-vcpkg.psm1' - -# Version number of this module. -ModuleVersion = '0.0.1' - -# ID used to uniquely identify this module -GUID = '948f02ab-fc99-4a53-8335-b6556eef129b' - -# Minimum version of the Windows PowerShell engine required by this module -PowerShellVersion = '5.0' - -FunctionsToExport = @('TabExpansion') -CmdletsToExport = @() -VariablesToExport = @() -AliasesToExport = @() - -# Private data to pass to the module specified in RootModule/ModuleToProcess. -# This may also contain a PSData hashtable with additional module metadata used by PowerShell. -PrivateData = -@{ - PSData = - @{ - # Tags applied to this module. These help with module discovery in online galleries. - Tags = @('vcpkg', 'tab', 'tab-completion', 'tab-expansion', 'tabexpansion') - } -} - -} - -# SIG # Begin signature block -# MIInwgYJKoZIhvcNAQcCoIInszCCJ68CAQExDzANBglghkgBZQMEAgEFADB5Bgor -# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG -# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBYE6inmMu4GUDW -# YzA0tBl6KrgaRsHoV8qqK61IVt/pfKCCDXYwggX0MIID3KADAgECAhMzAAADrzBA -# DkyjTQVBAAAAAAOvMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD -# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy -# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p -# bmcgUENBIDIwMTEwHhcNMjMxMTE2MTkwOTAwWhcNMjQxMTE0MTkwOTAwWjB0MQsw -# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u -# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy -# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -# AQDOS8s1ra6f0YGtg0OhEaQa/t3Q+q1MEHhWJhqQVuO5amYXQpy8MDPNoJYk+FWA -# hePP5LxwcSge5aen+f5Q6WNPd6EDxGzotvVpNi5ve0H97S3F7C/axDfKxyNh21MG -# 0W8Sb0vxi/vorcLHOL9i+t2D6yvvDzLlEefUCbQV/zGCBjXGlYJcUj6RAzXyeNAN -# xSpKXAGd7Fh+ocGHPPphcD9LQTOJgG7Y7aYztHqBLJiQQ4eAgZNU4ac6+8LnEGAL -# go1ydC5BJEuJQjYKbNTy959HrKSu7LO3Ws0w8jw6pYdC1IMpdTkk2puTgY2PDNzB -# tLM4evG7FYer3WX+8t1UMYNTAgMBAAGjggFzMIIBbzAfBgNVHSUEGDAWBgorBgEE -# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQURxxxNPIEPGSO8kqz+bgCAQWGXsEw -# RQYDVR0RBD4wPKQ6MDgxHjAcBgNVBAsTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEW -# MBQGA1UEBRMNMjMwMDEyKzUwMTgyNjAfBgNVHSMEGDAWgBRIbmTlUAXTgqoXNzci -# tW2oynUClTBUBgNVHR8ETTBLMEmgR6BFhkNodHRwOi8vd3d3Lm1pY3Jvc29mdC5j -# b20vcGtpb3BzL2NybC9NaWNDb2RTaWdQQ0EyMDExXzIwMTEtMDctMDguY3JsMGEG -# CCsGAQUFBwEBBFUwUzBRBggrBgEFBQcwAoZFaHR0cDovL3d3dy5taWNyb3NvZnQu -# Y29tL3BraW9wcy9jZXJ0cy9NaWNDb2RTaWdQQ0EyMDExXzIwMTEtMDctMDguY3J0 -# MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggIBAISxFt/zR2frTFPB45Yd -# mhZpB2nNJoOoi+qlgcTlnO4QwlYN1w/vYwbDy/oFJolD5r6FMJd0RGcgEM8q9TgQ -# 2OC7gQEmhweVJ7yuKJlQBH7P7Pg5RiqgV3cSonJ+OM4kFHbP3gPLiyzssSQdRuPY -# 1mIWoGg9i7Y4ZC8ST7WhpSyc0pns2XsUe1XsIjaUcGu7zd7gg97eCUiLRdVklPmp -# XobH9CEAWakRUGNICYN2AgjhRTC4j3KJfqMkU04R6Toyh4/Toswm1uoDcGr5laYn -# TfcX3u5WnJqJLhuPe8Uj9kGAOcyo0O1mNwDa+LhFEzB6CB32+wfJMumfr6degvLT -# e8x55urQLeTjimBQgS49BSUkhFN7ois3cZyNpnrMca5AZaC7pLI72vuqSsSlLalG -# OcZmPHZGYJqZ0BacN274OZ80Q8B11iNokns9Od348bMb5Z4fihxaBWebl8kWEi2O -# PvQImOAeq3nt7UWJBzJYLAGEpfasaA3ZQgIcEXdD+uwo6ymMzDY6UamFOfYqYWXk -# ntxDGu7ngD2ugKUuccYKJJRiiz+LAUcj90BVcSHRLQop9N8zoALr/1sJuwPrVAtx -# HNEgSW+AKBqIxYWM4Ev32l6agSUAezLMbq5f3d8x9qzT031jMDT+sUAoCw0M5wVt -# CUQcqINPuYjbS1WgJyZIiEkBMIIHejCCBWKgAwIBAgIKYQ6Q0gAAAAAAAzANBgkq -# hkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24x -# EDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlv -# bjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5 -# IDIwMTEwHhcNMTEwNzA4MjA1OTA5WhcNMjYwNzA4MjEwOTA5WjB+MQswCQYDVQQG -# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG -# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQg -# Q29kZSBTaWduaW5nIFBDQSAyMDExMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -# CgKCAgEAq/D6chAcLq3YbqqCEE00uvK2WCGfQhsqa+laUKq4BjgaBEm6f8MMHt03 -# a8YS2AvwOMKZBrDIOdUBFDFC04kNeWSHfpRgJGyvnkmc6Whe0t+bU7IKLMOv2akr -# rnoJr9eWWcpgGgXpZnboMlImEi/nqwhQz7NEt13YxC4Ddato88tt8zpcoRb0Rrrg -# OGSsbmQ1eKagYw8t00CT+OPeBw3VXHmlSSnnDb6gE3e+lD3v++MrWhAfTVYoonpy -# 4BI6t0le2O3tQ5GD2Xuye4Yb2T6xjF3oiU+EGvKhL1nkkDstrjNYxbc+/jLTswM9 -# sbKvkjh+0p2ALPVOVpEhNSXDOW5kf1O6nA+tGSOEy/S6A4aN91/w0FK/jJSHvMAh -# dCVfGCi2zCcoOCWYOUo2z3yxkq4cI6epZuxhH2rhKEmdX4jiJV3TIUs+UsS1Vz8k -# A/DRelsv1SPjcF0PUUZ3s/gA4bysAoJf28AVs70b1FVL5zmhD+kjSbwYuER8ReTB -# w3J64HLnJN+/RpnF78IcV9uDjexNSTCnq47f7Fufr/zdsGbiwZeBe+3W7UvnSSmn -# Eyimp31ngOaKYnhfsi+E11ecXL93KCjx7W3DKI8sj0A3T8HhhUSJxAlMxdSlQy90 -# lfdu+HggWCwTXWCVmj5PM4TasIgX3p5O9JawvEagbJjS4NaIjAsCAwEAAaOCAe0w -# ggHpMBAGCSsGAQQBgjcVAQQDAgEAMB0GA1UdDgQWBBRIbmTlUAXTgqoXNzcitW2o -# ynUClTAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYD -# VR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRyLToCMZBDuRQFTuHqp8cx0SOJNDBa -# BgNVHR8EUzBRME+gTaBLhklodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL2Ny -# bC9wcm9kdWN0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3JsMF4GCCsG -# AQUFBwEBBFIwUDBOBggrBgEFBQcwAoZCaHR0cDovL3d3dy5taWNyb3NvZnQuY29t -# L3BraS9jZXJ0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3J0MIGfBgNV -# HSAEgZcwgZQwgZEGCSsGAQQBgjcuAzCBgzA/BggrBgEFBQcCARYzaHR0cDovL3d3 -# dy5taWNyb3NvZnQuY29tL3BraW9wcy9kb2NzL3ByaW1hcnljcHMuaHRtMEAGCCsG -# AQUFBwICMDQeMiAdAEwAZQBnAGEAbABfAHAAbwBsAGkAYwB5AF8AcwB0AGEAdABl -# AG0AZQBuAHQALiAdMA0GCSqGSIb3DQEBCwUAA4ICAQBn8oalmOBUeRou09h0ZyKb -# C5YR4WOSmUKWfdJ5DJDBZV8uLD74w3LRbYP+vj/oCso7v0epo/Np22O/IjWll11l -# hJB9i0ZQVdgMknzSGksc8zxCi1LQsP1r4z4HLimb5j0bpdS1HXeUOeLpZMlEPXh6 -# I/MTfaaQdION9MsmAkYqwooQu6SpBQyb7Wj6aC6VoCo/KmtYSWMfCWluWpiW5IP0 -# wI/zRive/DvQvTXvbiWu5a8n7dDd8w6vmSiXmE0OPQvyCInWH8MyGOLwxS3OW560 -# STkKxgrCxq2u5bLZ2xWIUUVYODJxJxp/sfQn+N4sOiBpmLJZiWhub6e3dMNABQam -# ASooPoI/E01mC8CzTfXhj38cbxV9Rad25UAqZaPDXVJihsMdYzaXht/a8/jyFqGa -# J+HNpZfQ7l1jQeNbB5yHPgZ3BtEGsXUfFL5hYbXw3MYbBL7fQccOKO7eZS/sl/ah -# XJbYANahRr1Z85elCUtIEJmAH9AAKcWxm6U/RXceNcbSoqKfenoi+kiVH6v7RyOA -# 9Z74v2u3S5fi63V4GuzqN5l5GEv/1rMjaHXmr/r8i+sLgOppO6/8MO0ETI7f33Vt -# Y5E90Z1WTk+/gFcioXgRMiF670EKsT/7qMykXcGhiJtXcVZOSEXAQsmbdlsKgEhr -# /Xmfwb1tbWrJUnMTDXpQzTGCGaIwghmeAgEBMIGVMH4xCzAJBgNVBAYTAlVTMRMw -# EQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVN -# aWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNp -# Z25pbmcgUENBIDIwMTECEzMAAAOvMEAOTKNNBUEAAAAAA68wDQYJYIZIAWUDBAIB -# BQCgga4wGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGCNwIBCzEO -# MAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkEMSIEIFTY42VJoIbcXCvhXSegqyHn -# WnSge1fxGMSxdzCWpdk1MEIGCisGAQQBgjcCAQwxNDAyoBSAEgBNAGkAYwByAG8A -# cwBvAGYAdKEagBhodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20wDQYJKoZIhvcNAQEB -# BQAEggEACzg6jSvqGazTryaR5pelgFqzLRMhvBcXclK0Z775v0JONZxKstblEs0b -# 6jjy0VIPDcA0xGMrdw5kzQyppg1KYkyw48vvh29XJx6W6d/UmSTcsh+uKIFFZN6i -# vXnJ3KtTLhLMBYUIg+gQ343x5x6cahVCsrg4Ru2qhiNB+JHrU7XKOS8AASkY/0nK -# o5j3SH7HsKLjOYURbJJzUK+EOfLBqqT1buCgGq527NlfRc/0hh6tY9m0pL3+I81S -# kjOWsV28mmuN9EMiPDpjRW9TQSUgJ1pqbezGZV0nG9UTG7MD44+oZlRn/Uh9N6Fx -# NhxOcoY5fnQnFzypymQ6vGGx8WRaCqGCFywwghcoBgorBgEEAYI3AwMBMYIXGDCC -# FxQGCSqGSIb3DQEHAqCCFwUwghcBAgEDMQ8wDQYJYIZIAWUDBAIBBQAwggFZBgsq -# hkiG9w0BCRABBKCCAUgEggFEMIIBQAIBAQYKKwYBBAGEWQoDATAxMA0GCWCGSAFl -# AwQCAQUABCCNJjQCR8aKbOfW2eR2p6kr3Fc2KD3N4N6GG7BkJJp1IgIGZnMS6RGt -# GBMyMDI0MDcwOTIzMzkzMC44NzhaMASAAgH0oIHYpIHVMIHSMQswCQYDVQQGEwJV -# UzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UE -# ChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQgSXJl -# bGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1MgRVNO -# OkQwODItNEJGRC1FRUJBMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBT -# ZXJ2aWNloIIRezCCBycwggUPoAMCAQICEzMAAAHcweCMwl9YXo4AAQAAAdwwDQYJ -# KoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24x -# EDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlv -# bjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwHhcNMjMx -# MDEyMTkwNzA2WhcNMjUwMTEwMTkwNzA2WjCB0jELMAkGA1UEBhMCVVMxEzARBgNV -# BAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jv -# c29mdCBDb3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9zb2Z0IElyZWxhbmQgT3Bl -# cmF0aW9ucyBMaW1pdGVkMSYwJAYDVQQLEx1UaGFsZXMgVFNTIEVTTjpEMDgyLTRC -# RkQtRUVCQTElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2VydmljZTCC -# AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIvIsyA1sjg9kSKJzelrUWF5 -# ShqYWL83amn3SE5JyIVPUC7F6qTcLphhHZ9idf21f0RaGrU8EHydF8NxPMR2KVNi -# AtCGPJa8kV1CGvn3beGB2m2ltmqJanG71mAywrkKATYniwKLPQLJ00EkXw5TSwfm -# JXbdgQLFlHyfA5Kg+pUsJXzqumkIvEr0DXPvptAGqkdFLKwo4BTlEgnvzeTfXukz -# X8vQtTALfVJuTUgRU7zoP/RFWt3WagahZ6UloI0FC8XlBQDVDX5JeMEsx7jgJDdE -# nK44Y8gHuEWRDq+SG9Xo0GIOjiuTWD5uv3vlEmIAyR/7rSFvcLnwAqMdqcy/iqQP -# MlDOcd0AbniP8ia1BQEUnfZT3UxyK9rLB/SRiKPyHDlg8oWwXyiv3+bGB6dmdM61 -# ur6nUtfDf51lPcKhK4Vo83pOE1/niWlVnEHQV9NJ5/DbUSqW2RqTUa2O2KuvsyRG -# MEgjGJA12/SqrRqlvE2fiN5ZmZVtqSPWaIasx7a0GB+fdTw+geRn6Mo2S6+/bZEw -# S/0IJ5gcKGinNbfyQ1xrvWXPtXzKOfjkh75iRuXourGVPRqkmz5UYz+R5ybMJWj+ -# mfcGqz2hXV8iZnCZDBrrnZivnErCMh5Flfg8496pT0phjUTH2GChHIvE4SDSk2hw -# WP/uHB9gEs8p/9Pe/mt9AgMBAAGjggFJMIIBRTAdBgNVHQ4EFgQU6HPSBd0OfEX3 -# uNWsdkSraUGe3dswHwYDVR0jBBgwFoAUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXwYD -# VR0fBFgwVjBUoFKgUIZOaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9j -# cmwvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3JsMGwG -# CCsGAQUFBwEBBGAwXjBcBggrBgEFBQcwAoZQaHR0cDovL3d3dy5taWNyb3NvZnQu -# Y29tL3BraW9wcy9jZXJ0cy9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIw -# MjAxMCgxKS5jcnQwDAYDVR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcD -# CDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggIBANnrb8Ewr8eX/H1s -# Kt3rnwTDx4AqgHbkMNQo+kUGwCINXS3y1GUcdqsK/R1g6Tf7tNx1q0NpKk1JTupU -# JfHdExKtkuhHA+82lT7yISp/Y74dqJ03RCT4Q+8ooQXTMzxiewfErVLt8Wefebnc -# ST0i6ypKv87pCYkxM24bbqbM/V+M5VBppCUs7R+cETiz/zEA1AbZL/viXtHmryA0 -# CGd+Pt9c+adsYfm7qe5UMnS0f/YJmEEMkEqGXCzyLK+dh+UsFi0d4lkdcE+Zq5JN -# jIHesX1wztGVAtvX0DYDZdN2WZ1kk+hOMblUV/L8n1YWzhP/5XQnYl03AfXErn+1 -# Eatylifzd3ChJ1xuGG76YbWgiRXnDvCiwDqvUJevVRY1qy4y4vlVKaShtbdfgPyG -# eeJ/YcSBONOc0DNTWbjMbL50qeIEC0lHSpL2rRYNVu3hsHzG8n5u5CQajPwx9Pzp -# sZIeFTNHyVF6kujI4Vo9NvO/zF8Ot44IMj4M7UX9Za4QwGf5B71x57OjaX53gxT4 -# vzoHvEBXF9qCmHRgXBLbRomJfDn60alzv7dpCVQIuQ062nyIZKnsXxzuKFb0TjXW -# w6OFpG1bsjXpOo5DMHkysribxHor4Yz5dZjVyHANyKo0bSrAlVeihcaG5F74SZT8 -# FtyHAW6IgLc5w/3D+R1obDhKZ21WMIIHcTCCBVmgAwIBAgITMwAAABXF52ueAptJ -# mQAAAAAAFTANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgT -# Cldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29m -# dCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNh -# dGUgQXV0aG9yaXR5IDIwMTAwHhcNMjEwOTMwMTgyMjI1WhcNMzAwOTMwMTgzMjI1 -# WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH -# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQD -# Ex1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDCCAiIwDQYJKoZIhvcNAQEB -# BQADggIPADCCAgoCggIBAOThpkzntHIhC3miy9ckeb0O1YLT/e6cBwfSqWxOdcjK -# NVf2AX9sSuDivbk+F2Az/1xPx2b3lVNxWuJ+Slr+uDZnhUYjDLWNE893MsAQGOhg -# fWpSg0S3po5GawcU88V29YZQ3MFEyHFcUTE3oAo4bo3t1w/YJlN8OWECesSq/XJp -# rx2rrPY2vjUmZNqYO7oaezOtgFt+jBAcnVL+tuhiJdxqD89d9P6OU8/W7IVWTe/d -# vI2k45GPsjksUZzpcGkNyjYtcI4xyDUoveO0hyTD4MmPfrVUj9z6BVWYbWg7mka9 -# 7aSueik3rMvrg0XnRm7KMtXAhjBcTyziYrLNueKNiOSWrAFKu75xqRdbZ2De+JKR -# Hh09/SDPc31BmkZ1zcRfNN0Sidb9pSB9fvzZnkXftnIv231fgLrbqn427DZM9itu -# qBJR6L8FA6PRc6ZNN3SUHDSCD/AQ8rdHGO2n6Jl8P0zbr17C89XYcz1DTsEzOUyO -# ArxCaC4Q6oRRRuLRvWoYWmEBc8pnol7XKHYC4jMYctenIPDC+hIK12NvDMk2ZItb -# oKaDIV1fMHSRlJTYuVD5C4lh8zYGNRiER9vcG9H9stQcxWv2XFJRXRLbJbqvUAV6 -# bMURHXLvjflSxIUXk8A8FdsaN8cIFRg/eKtFtvUeh17aj54WcmnGrnu3tz5q4i6t -# AgMBAAGjggHdMIIB2TASBgkrBgEEAYI3FQEEBQIDAQABMCMGCSsGAQQBgjcVAgQW -# BBQqp1L+ZMSavoKRPEY1Kc8Q/y8E7jAdBgNVHQ4EFgQUn6cVXQBeYl2D9OXSZacb -# UzUZ6XIwXAYDVR0gBFUwUzBRBgwrBgEEAYI3TIN9AQEwQTA/BggrBgEFBQcCARYz -# aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9Eb2NzL1JlcG9zaXRvcnku -# aHRtMBMGA1UdJQQMMAoGCCsGAQUFBwMIMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIA -# QwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNX2 -# VsuP6KJcYmjRPZSQW9fOmhjEMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwu -# bWljcm9zb2Z0LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dF8yMDEw -# LTA2LTIzLmNybDBaBggrBgEFBQcBAQROMEwwSgYIKwYBBQUHMAKGPmh0dHA6Ly93 -# d3cubWljcm9zb2Z0LmNvbS9wa2kvY2VydHMvTWljUm9vQ2VyQXV0XzIwMTAtMDYt -# MjMuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQCdVX38Kq3hLB9nATEkW+Geckv8qW/q -# XBS2Pk5HZHixBpOXPTEztTnXwnE2P9pkbHzQdTltuw8x5MKP+2zRoZQYIu7pZmc6 -# U03dmLq2HnjYNi6cqYJWAAOwBb6J6Gngugnue99qb74py27YP0h1AdkY3m2CDPVt -# I1TkeFN1JFe53Z/zjj3G82jfZfakVqr3lbYoVSfQJL1AoL8ZthISEV09J+BAljis -# 9/kpicO8F7BUhUKz/AyeixmJ5/ALaoHCgRlCGVJ1ijbCHcNhcy4sa3tuPywJeBTp -# kbKpW99Jo3QMvOyRgNI95ko+ZjtPu4b6MhrZlvSP9pEB9s7GdP32THJvEKt1MMU0 -# sHrYUP4KWN1APMdUbZ1jdEgssU5HLcEUBHG/ZPkkvnNtyo4JvbMBV0lUZNlz138e -# W0QBjloZkWsNn6Qo3GcZKCS6OEuabvshVGtqRRFHqfG3rsjoiV5PndLQTHa1V1QJ -# sWkBRH58oWFsc/4Ku+xBZj1p/cvBQUl+fpO+y/g75LcVv7TOPqUxUYS8vwLBgqJ7 -# Fx0ViY1w/ue10CgaiQuPNtq6TPmb/wrpNPgkNWcr4A245oyZ1uEi6vAnQj0llOZ0 -# dFtq0Z4+7X6gMTN9vMvpe784cETRkPHIqzqKOghif9lwY1NNje6CbaUFEMFxBmoQ -# tB1VM1izoXBm8qGCAtcwggJAAgEBMIIBAKGB2KSB1TCB0jELMAkGA1UEBhMCVVMx -# EzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoT -# FU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9zb2Z0IElyZWxh -# bmQgT3BlcmF0aW9ucyBMaW1pdGVkMSYwJAYDVQQLEx1UaGFsZXMgVFNTIEVTTjpE -# MDgyLTRCRkQtRUVCQTElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2Vy -# dmljZaIjCgEBMAcGBSsOAwIaAxUAHDn/cz+3yRkIUCJfSbL3djnQEqaggYMwgYCk -# fjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH -# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQD -# Ex1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDANBgkqhkiG9w0BAQUFAAIF -# AOo37UUwIhgPMjAyNDA3MTAwMTA5MjVaGA8yMDI0MDcxMTAxMDkyNVowdzA9Bgor -# BgEEAYRZCgQBMS8wLTAKAgUA6jftRQIBADAKAgEAAgIJFQIB/zAHAgEAAgIR5zAK -# AgUA6jk+xQIBADA2BgorBgEEAYRZCgQCMSgwJjAMBgorBgEEAYRZCgMCoAowCAIB -# AAIDB6EgoQowCAIBAAIDAYagMA0GCSqGSIb3DQEBBQUAA4GBAJjt1s+AY13cKwcI -# 8wpH2g4w1SlTPBWsItrbWmI1lKsWOLvAB1xaY3eNT4oRuwvjUUlOOGAFjzItP0xj -# nXRJxWIZtEG55mLi0CJ0h3BQoB6P3WshfvdN/IC+EvXDPL4ifbfwf7YeRgBWjcbt -# HK9FMCXZ6qFhyopoRIHnLMHqj20lMYIEDTCCBAkCAQEwgZMwfDELMAkGA1UEBhMC -# VVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNV -# BAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRp -# bWUtU3RhbXAgUENBIDIwMTACEzMAAAHcweCMwl9YXo4AAQAAAdwwDQYJYIZIAWUD -# BAIBBQCgggFKMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0BCRABBDAvBgkqhkiG9w0B -# CQQxIgQgoGQZ92Ebdf3N0YEeeLdsRLgB5KhLacrznR6pEj+CszswgfoGCyqGSIb3 -# DQEJEAIvMYHqMIHnMIHkMIG9BCBTpxeKatlEP4y8qZzjuWL0Ou0IqxELDhX2TLyl -# xIINNzCBmDCBgKR+MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9u -# MRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRp -# b24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwAhMzAAAB -# 3MHgjMJfWF6OAAEAAAHcMCIEIDIzbwG+kPBEsHJf0vH/P/Jza5TAf/uumFGtmvqT -# bcvjMA0GCSqGSIb3DQEBCwUABIICAD8lMZctIdP8ebljIdtF0pjejMufYn3Wozzn -# HG6GGPRom9odNW84FDXRLGaQLGHFvYFnSZM8BXJxYxZO5RfPxzKnk6OzO83uSvsh -# YdapjD3i6BvGAhrTUbp3OQO3CzJ0gPldKf+WhZe6hCyKbu4SXLJ6TIvAHJq2/Qmr -# AYBfTe3RKETgjIPN2XfR84jBjpL7YKoO2WC5kyX2aO4hYHqFEtYPg0VWciRVSMfG -# AEPnpkZVpV+uYnbQxB0sa31GWHhcXAG5XeQ4CQL43kLemixIHRJGyBdUCyA6UAhS -# JCoWBse8r3mK5Z306KGLwb59VbRSC92406YmwK+HQOX0K3ztwV1bhQIB9zXXpVTH -# h62epoyPOTK3JL2JyBOEsnFpVJV7h5N9NGMlXWHahH2kWVSOc3lEblwbCm/vYlNW -# iuN5v6rrKJ3EgBWUXgZGFVS8TYPbiap1LPPmp5dudj9yPdWJtW199nkqwByKHT6X -# Lk6hYzreJgnupQ67TkVsVij5ExeaxI2j3Niy94OklhuVCDLWwZjoZqUmIVzT6LgM -# 010dqRIBlcdD2b/daRDt5vLPxAfLjrYcOHIAr0GLA8m+x4dED0dy3M3f1ga7eWGD -# TcUwyQNdqSapL+w2f+Q1Qra6n9t5ZenOuvYxSMtKkeSODaav2vrJVZ8ZH1uyzfbW -# E/TJNInS -# SIG # End signature block diff --git a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 deleted file mode 100644 index 1c142c84f04ad2..00000000000000 --- a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 +++ /dev/null @@ -1,254 +0,0 @@ -param() - -if (Get-Module posh-vcpkg) { return } - -if ($PSVersionTable.PSVersion.Major -lt 5) { - Write-Warning ("posh-vcpkg does not support PowerShell versions before 5.0.") - return -} - -if (Test-Path Function:\TabExpansion) { - Rename-Item Function:\TabExpansion VcpkgTabExpansionBackup -} - -function TabExpansion($line, $lastWord) { - $lastBlock = [regex]::Split($line, '[|;]')[-1].TrimStart() - - switch -regex ($lastBlock) { - "^(?(\./|\.\\|)vcpkg(\.exe|)) (?.*)$" - { - & $matches['vcpkgexe'] autocomplete $matches['remaining'] - return - } - - # Fall back on existing tab expansion - default { - if (Test-Path Function:\VcpkgTabExpansionBackup) { - VcpkgTabExpansionBackup $line $lastWord - } - } - } -} - -$exportModuleMemberParams = @{ - Function = @( - 'TabExpansion' - ) -} - -Export-ModuleMember @exportModuleMemberParams - -# SIG # Begin signature block -# MIInugYJKoZIhvcNAQcCoIInqzCCJ6cCAQExDzANBglghkgBZQMEAgEFADB5Bgor -# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG -# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDHZjpMevSjAPcs -# /aTP8aVTWBuPE0L4AxomP0cA936m/KCCDYEwggX/MIID56ADAgECAhMzAAACUosz -# qviV8znbAAAAAAJSMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD -# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy -# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p -# bmcgUENBIDIwMTEwHhcNMjEwOTAyMTgzMjU5WhcNMjIwOTAxMTgzMjU5WjB0MQsw -# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u -# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy -# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -# AQDQ5M+Ps/X7BNuv5B/0I6uoDwj0NJOo1KrVQqO7ggRXccklyTrWL4xMShjIou2I -# sbYnF67wXzVAq5Om4oe+LfzSDOzjcb6ms00gBo0OQaqwQ1BijyJ7NvDf80I1fW9O -# L76Kt0Wpc2zrGhzcHdb7upPrvxvSNNUvxK3sgw7YTt31410vpEp8yfBEl/hd8ZzA -# v47DCgJ5j1zm295s1RVZHNp6MoiQFVOECm4AwK2l28i+YER1JO4IplTH44uvzX9o -# RnJHaMvWzZEpozPy4jNO2DDqbcNs4zh7AWMhE1PWFVA+CHI/En5nASvCvLmuR/t8 -# q4bc8XR8QIZJQSp+2U6m2ldNAgMBAAGjggF+MIIBejAfBgNVHSUEGDAWBgorBgEE -# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQUNZJaEUGL2Guwt7ZOAu4efEYXedEw -# UAYDVR0RBEkwR6RFMEMxKTAnBgNVBAsTIE1pY3Jvc29mdCBPcGVyYXRpb25zIFB1 -# ZXJ0byBSaWNvMRYwFAYDVQQFEw0yMzAwMTIrNDY3NTk3MB8GA1UdIwQYMBaAFEhu -# ZOVQBdOCqhc3NyK1bajKdQKVMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly93d3cu -# bWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY0NvZFNpZ1BDQTIwMTFfMjAxMS0w -# Ny0wOC5jcmwwYQYIKwYBBQUHAQEEVTBTMFEGCCsGAQUFBzAChkVodHRwOi8vd3d3 -# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY0NvZFNpZ1BDQTIwMTFfMjAx -# MS0wNy0wOC5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAgEAFkk3 -# uSxkTEBh1NtAl7BivIEsAWdgX1qZ+EdZMYbQKasY6IhSLXRMxF1B3OKdR9K/kccp -# kvNcGl8D7YyYS4mhCUMBR+VLrg3f8PUj38A9V5aiY2/Jok7WZFOAmjPRNNGnyeg7 -# l0lTiThFqE+2aOs6+heegqAdelGgNJKRHLWRuhGKuLIw5lkgx9Ky+QvZrn/Ddi8u -# TIgWKp+MGG8xY6PBvvjgt9jQShlnPrZ3UY8Bvwy6rynhXBaV0V0TTL0gEx7eh/K1 -# o8Miaru6s/7FyqOLeUS4vTHh9TgBL5DtxCYurXbSBVtL1Fj44+Od/6cmC9mmvrti -# yG709Y3Rd3YdJj2f3GJq7Y7KdWq0QYhatKhBeg4fxjhg0yut2g6aM1mxjNPrE48z -# 6HWCNGu9gMK5ZudldRw4a45Z06Aoktof0CqOyTErvq0YjoE4Xpa0+87T/PVUXNqf -# 7Y+qSU7+9LtLQuMYR4w3cSPjuNusvLf9gBnch5RqM7kaDtYWDgLyB42EfsxeMqwK -# WwA+TVi0HrWRqfSx2olbE56hJcEkMjOSKz3sRuupFCX3UroyYf52L+2iVTrda8XW -# esPG62Mnn3T8AuLfzeJFuAbfOSERx7IFZO92UPoXE1uEjL5skl1yTZB3MubgOA4F -# 8KoRNhviFAEST+nG8c8uIsbZeb08SeYQMqjVEmkwggd6MIIFYqADAgECAgphDpDS -# AAAAAAADMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYDVQQGEwJVUzETMBEGA1UECBMK -# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 -# IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3NvZnQgUm9vdCBDZXJ0aWZpY2F0 -# ZSBBdXRob3JpdHkgMjAxMTAeFw0xMTA3MDgyMDU5MDlaFw0yNjA3MDgyMTA5MDla -# MH4xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdS -# ZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMT -# H01pY3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTEwggIiMA0GCSqGSIb3DQEB -# AQUAA4ICDwAwggIKAoICAQCr8PpyEBwurdhuqoIQTTS68rZYIZ9CGypr6VpQqrgG -# OBoESbp/wwwe3TdrxhLYC/A4wpkGsMg51QEUMULTiQ15ZId+lGAkbK+eSZzpaF7S -# 35tTsgosw6/ZqSuuegmv15ZZymAaBelmdugyUiYSL+erCFDPs0S3XdjELgN1q2jz -# y23zOlyhFvRGuuA4ZKxuZDV4pqBjDy3TQJP4494HDdVceaVJKecNvqATd76UPe/7 -# 4ytaEB9NViiienLgEjq3SV7Y7e1DkYPZe7J7hhvZPrGMXeiJT4Qa8qEvWeSQOy2u -# M1jFtz7+MtOzAz2xsq+SOH7SnYAs9U5WkSE1JcM5bmR/U7qcD60ZI4TL9LoDho33 -# X/DQUr+MlIe8wCF0JV8YKLbMJyg4JZg5SjbPfLGSrhwjp6lm7GEfauEoSZ1fiOIl -# XdMhSz5SxLVXPyQD8NF6Wy/VI+NwXQ9RRnez+ADhvKwCgl/bwBWzvRvUVUvnOaEP -# 6SNJvBi4RHxF5MHDcnrgcuck379GmcXvwhxX24ON7E1JMKerjt/sW5+v/N2wZuLB -# l4F77dbtS+dJKacTKKanfWeA5opieF+yL4TXV5xcv3coKPHtbcMojyyPQDdPweGF -# RInECUzF1KVDL3SV9274eCBYLBNdYJWaPk8zhNqwiBfenk70lrC8RqBsmNLg1oiM -# CwIDAQABo4IB7TCCAekwEAYJKwYBBAGCNxUBBAMCAQAwHQYDVR0OBBYEFEhuZOVQ -# BdOCqhc3NyK1bajKdQKVMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1Ud -# DwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFHItOgIxkEO5FAVO -# 4eqnxzHRI4k0MFoGA1UdHwRTMFEwT6BNoEuGSWh0dHA6Ly9jcmwubWljcm9zb2Z0 -# LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y -# Mi5jcmwwXgYIKwYBBQUHAQEEUjBQME4GCCsGAQUFBzAChkJodHRwOi8vd3d3Lm1p -# Y3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dDIwMTFfMjAxMV8wM18y -# Mi5jcnQwgZ8GA1UdIASBlzCBlDCBkQYJKwYBBAGCNy4DMIGDMD8GCCsGAQUFBwIB -# FjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2RvY3MvcHJpbWFyeWNw -# cy5odG0wQAYIKwYBBQUHAgIwNB4yIB0ATABlAGcAYQBsAF8AcABvAGwAaQBjAHkA -# XwBzAHQAYQB0AGUAbQBlAG4AdAAuIB0wDQYJKoZIhvcNAQELBQADggIBAGfyhqWY -# 4FR5Gi7T2HRnIpsLlhHhY5KZQpZ90nkMkMFlXy4sPvjDctFtg/6+P+gKyju/R6mj -# 82nbY78iNaWXXWWEkH2LRlBV2AySfNIaSxzzPEKLUtCw/WvjPgcuKZvmPRul1LUd -# d5Q54ulkyUQ9eHoj8xN9ppB0g430yyYCRirCihC7pKkFDJvtaPpoLpWgKj8qa1hJ -# Yx8JaW5amJbkg/TAj/NGK978O9C9Ne9uJa7lryft0N3zDq+ZKJeYTQ49C/IIidYf -# wzIY4vDFLc5bnrRJOQrGCsLGra7lstnbFYhRRVg4MnEnGn+x9Cf43iw6IGmYslmJ -# aG5vp7d0w0AFBqYBKig+gj8TTWYLwLNN9eGPfxxvFX1Fp3blQCplo8NdUmKGwx1j -# NpeG39rz+PIWoZon4c2ll9DuXWNB41sHnIc+BncG0QaxdR8UvmFhtfDcxhsEvt9B -# xw4o7t5lL+yX9qFcltgA1qFGvVnzl6UJS0gQmYAf0AApxbGbpT9Fdx41xtKiop96 -# eiL6SJUfq/tHI4D1nvi/a7dLl+LrdXga7Oo3mXkYS//WsyNodeav+vyL6wuA6mk7 -# r/ww7QRMjt/fdW1jkT3RnVZOT7+AVyKheBEyIXrvQQqxP/uozKRdwaGIm1dxVk5I -# RcBCyZt2WwqASGv9eZ/BvW1taslScxMNelDNMYIZjzCCGYsCAQEwgZUwfjELMAkG -# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx -# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEoMCYGA1UEAxMfTWljcm9z -# b2Z0IENvZGUgU2lnbmluZyBQQ0EgMjAxMQITMwAAAlKLM6r4lfM52wAAAAACUjAN -# BglghkgBZQMEAgEFAKCBrjAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgor -# BgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAvBgkqhkiG9w0BCQQxIgQgXfYXu2P9 -# Xl5soetYGYSmu5lwyqTv6FS3BnPtgTQd11AwQgYKKwYBBAGCNwIBDDE0MDKgFIAS -# AE0AaQBjAHIAbwBzAG8AZgB0oRqAGGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbTAN -# BgkqhkiG9w0BAQEFAASCAQB0AjnChoWv+UO2eEgknT4P1WMsswzSKL9O1ucsOUJ2 -# TIE8ioVKds7PwtQY5YfxAbjgWl2NF/B6dEZjIBvvJB3B6qGvXyU6APj+yE6LRFnm -# YX4Z/u8MXWuDnMX6HF/UMDFlzFpmK5hee585P5sJzVJpVkviMKDNK3mNNg6jMSI1 -# k0MB2tN7oJViiS/9S7l81p/9mulUKlTcyoy3lzZLSH1iXbF80oT2vv18AT6bCOAP -# TFVW0E6pjatJdjL40WHN+MZ076QhdzYMhiCD/rOPBAaO5ymcT7i94gp43GlkjcVb -# x2jNCCP4NGF4Zd3OujlwIyNc/I50upsaZMXmcuYbKm42oYIXGTCCFxUGCisGAQQB -# gjcDAwExghcFMIIXAQYJKoZIhvcNAQcCoIIW8jCCFu4CAQMxDzANBglghkgBZQME -# AgEFADCCAVkGCyqGSIb3DQEJEAEEoIIBSASCAUQwggFAAgEBBgorBgEEAYRZCgMB -# MDEwDQYJYIZIAWUDBAIBBQAEIINYetTs4pGQvctdg51u+7aIG0JApdU1hE1hgt0m -# co6dAgZiF5hMAQQYEzIwMjIwMzMwMjE1MjEwLjY2OVowBIACAfSggdikgdUwgdIx -# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt -# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1p -# Y3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhh -# bGVzIFRTUyBFU046RkM0MS00QkQ0LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBU -# aW1lLVN0YW1wIFNlcnZpY2WgghFoMIIHFDCCBPygAwIBAgITMwAAAY5Z20YAqBCU -# zAABAAABjjANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK -# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 -# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg -# MjAxMDAeFw0yMTEwMjgxOTI3NDVaFw0yMzAxMjYxOTI3NDVaMIHSMQswCQYDVQQG -# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG -# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQg -# SXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJjAkBgNVBAsTHVRoYWxlcyBUU1Mg -# RVNOOkZDNDEtNEJENC1EMjIwMSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFt -# cCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqiMCq6OM -# zLa5wrtcf7Bf9f1WXW9kpqbOBzgPJvaGLrZG7twgwqTRWf1FkjpJKBOG5QPIRy7a -# 6IFVAy0W+tBaFX4In4DbBf2tGubyY9+hRU+hRewPJH5CYOvpPh77FfGM63+OlwRX -# p5YER6tC0WRKn3mryWpt4CwADuGv0LD2QjnhhgtRVidsiDnn9+aLjMuNapUhstGq -# Cr7JcQZt0ZrPUHW/TqTJymeU1eqgNorEbTed6UQyLaTVAmhXNQXDChfa526nW7RQ -# 7L4tXX9Lc0oguiCSkPlu5drNA6NM8z+UXQOAHxVfIQXmi+Y3SV2hr2dcxby9nlTz -# Yvf4ZDr5Wpcwt7tTdRIJibXHsXWMKrmOziliGDToLx34a/ctZE4NOLnlrKQWN9ZG -# +Ox5zRarK1EhShahM0uQNhb6BJjp3+c0eNzMFJ2qLZqDp2/3Yl5Q+4k+MDHLTipP -# 6VBdxcdVfd4mgrVTx3afO5KNfgMngGGfhSawGraRW28EhrLOspmIxii92E7vjncJ -# 2tcjhLCjBArVpPh3cZG5g3ZVy5iiAaoDaswpNgnMFAK5Un1reK+MFhPi9iMnvUPw -# tTDDJt5YED5DAT3mBUxp5QH3t7RhZwAJNLWLtpTeGF7ub81sSKYv2ardazAe9XLS -# 10tV2oOPrcniGJzlXW7VPvxqQNxe8lCDA20CAwEAAaOCATYwggEyMB0GA1UdDgQW -# BBTsQfkz9gT44N/5G8vNHayep+aV5DAfBgNVHSMEGDAWgBSfpxVdAF5iXYP05dJl -# pxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jvc29mdC5j -# b20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAx -# MCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRwOi8vd3d3 -# Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRpbWUtU3Rh -# bXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBMGA1UdJQQMMAoG -# CCsGAQUFBwMIMA0GCSqGSIb3DQEBCwUAA4ICAQA1UK9xzIeTlKhSbLn0bekR5gYh -# 6bB1XQpluCqCA15skZ37UilaFJw8+GklDLzlNhSP2mOiOzVyCq8kkpqnfUc01ZaB -# ezQxg77qevj2iMyg39YJfeiCIhxYOFugwepYrPO8MlB/oue/VhIiDb1eNYTlPSmv -# 3palsgtkrb0oo0F0uWmX4EQVGKRo0UENtZetVIxa0J9DpUdjQWPeEh9cEM+RgE26 -# 5w5WAVb+WNx0iWiF4iTbCmrWaVEOX92dNqBm9bT1U7nGwN5CygpNAgEaYnrTMx1N -# 4AjxObACDN5DdvGlu/O0DfMWVc6qk6iKDFC6WpXQSkMlrlXII/Nhp+0+noU6tfEp -# HKLt7fYm9of5i/QomcCwo/ekiOCjYktp393ovoC1O2uLtbLnMVlE5raBLBNSbINZ -# 6QLxiA41lXnVVLIzDihUL8MU9CMvG4sdbhk2FX8zvrsP5PeBIw1faenMZuz0V3UX -# CtU5Okx5fmioWiiLZSCi1ljaxX+BEwQiinCi+vE59bTYI5FbuR8tDuGLiVu/JSpV -# FXrzWMP2Kn11sCLAGEjqJYUmO1tRY29Kd7HcIj2niSB0PQOCjYlnCnywnDinqS1C -# XvRsisjVlS1Rp4Tmuks+pGxiMGzF58zcb+hoFKyONuL3b+tgxTAz3sF3BVX9uk9M -# 5F+OEoeyLyGfLekNAjCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUw -# DQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n -# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y -# YXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhv -# cml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkG -# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx -# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z -# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw -# ggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg -# 4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aO -# RmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41 -# JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5 -# LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL -# 64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9 -# QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj -# 0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqE -# UUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0 -# kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435 -# UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB -# 3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTE -# mr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwG -# A1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93 -# d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNV -# HSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNV -# HQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo -# 0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29m -# dC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5j -# cmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jv -# c29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDAN -# BgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4 -# sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th54 -# 2DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRX -# ud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBew -# VIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0 -# DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+Cljd -# QDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFr -# DZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFh -# bHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7n -# tdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+ -# oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6Fw -# ZvKhggLXMIICQAIBATCCAQChgdikgdUwgdIxCzAJBgNVBAYTAlVTMRMwEQYDVQQI -# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv -# ZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh -# dGlvbnMgTGltaXRlZDEmMCQGA1UECxMdVGhhbGVzIFRTUyBFU046RkM0MS00QkQ0 -# LUQyMjAxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoB -# ATAHBgUrDgMCGgMVAD1iK+pPThHqgpa5xsPmiYruWVuMoIGDMIGApH4wfDELMAkG -# A1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx -# HjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9z -# b2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQEFBQACBQDl7udOMCIY -# DzIwMjIwMzMwMjIyNzI2WhgPMjAyMjAzMzEyMjI3MjZaMHcwPQYKKwYBBAGEWQoE -# ATEvMC0wCgIFAOXu504CAQAwCgIBAAICEPsCAf8wBwIBAAICH6MwCgIFAOXwOM4C -# AQAwNgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEK -# MAgCAQACAwGGoDANBgkqhkiG9w0BAQUFAAOBgQDRvkQ+8tl/rST6Q19W3HCLiL76 -# 5jAlwfOPE9qK2auMHZnHWlcofAenCxyLoB0QAqj3UFflJ0bGic1xRb+OsKq+X/dz -# CPN2ik0cRkqUh8p3qjwRLquQ3HQp5BNxlyvdMNKSk+YdcK8SAGiO2HsnNE3LWwXP -# lko3/5Oq0+Oz7mdtpDGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYD -# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy -# b3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1w -# IFBDQSAyMDEwAhMzAAABjlnbRgCoEJTMAAEAAAGOMA0GCWCGSAFlAwQCAQUAoIIB -# SjAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIL3n -# o4olI1N5U/f6eBrubu/yvZtoslP7/FdMYNVskLVDMIH6BgsqhkiG9w0BCRACLzGB -# 6jCB5zCB5DCBvQQgvQWPITvigaUuV5+f/lWs3BXZwJ/l1mf+yelu5nXmxCUwgZgw -# gYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UE -# BxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYD -# VQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAY5Z20YAqBCU -# zAABAAABjjAiBCDoji5HoyFgeYnb2i9yFZjrBiELTJNC0CmqBLawXNEDPjANBgkq -# hkiG9w0BAQsFAASCAgCgDJqUfA65UksIsoC921eUPYQZsrbCZS1SpU7D6Pyn/xQ4 -# zbNu8vgxPpYqUz5/wdl0GnNMU6HkJWpYW0oT9PzsSIquvXlisaydTrEl6Q2t8z1c -# +kpJ0+Hm+ULHl1iRQc1sVfl7Zfzl2jy4OMZCO2lCLybDHMqeLSjx4bcRceTjPT0P -# TmFspYmlGxzh4V2snGcR4vkXYp3G7k7vcKgkI5rePj5re5Pp1AytGSK6AyNJ+Tm3 -# T6TWjaeiN+uzapzvbThNEwFMhad5yHe0xaTCYACT0XE9rULziUJk22kZrJ9UucNj -# s3GBxsLyv3T5RhNwpwGtMWhahc1lM01Xggw/bpodaRf2hWhl3ngJzEUysXPz4H+h -# HV713DUGIvfY5P6J1MA50Nufjv2MXeGKVbdD7jeEye0KFiz8uCin3uS5v4lny0t6 -# wddkWe4faFc0lPscDewubi2hQqUucGMVRt/lj120Bq0OUiLUNlQ0pucTC9NhQmCx -# eqlxR3tDVleAq5WI/VDUSVaNp9MBqT2RBpA3Ur1+kzE7lHL+WT/vmfcuoeXxsn9e -# 5tq9KwsTXctJWJrRrE9j9O94VR1G6isOYthtNOFXcN8kdT7vK/eyVJrQYKEj71xH -# efYWPLvRhkzisRAiYfC/cTlbkR2y8BvPhjtXTjcyFyyA57rsnpLb7IEvQbqn7g== -# SIG # End signature block diff --git a/scripts/posh-vcpkg/posh-vcpkg.psd1 b/scripts/posh-vcpkg/posh-vcpkg.psd1 new file mode 100644 index 00000000000000..33a0765297c655 --- /dev/null +++ b/scripts/posh-vcpkg/posh-vcpkg.psd1 @@ -0,0 +1,250 @@ +@{ + +# Script module or binary module file associated with this manifest. +RootModule = 'posh-vcpkg.psm1' + +# Version number of this module. +ModuleVersion = '0.0.2' + +# ID used to uniquely identify this module +GUID = '948f02ab-fc99-4a53-8335-b6556eef129b' + +# Minimum version of the PowerShell engine required by this module +PowerShellVersion = '5.1' + +FunctionsToExport = @() +CmdletsToExport = @() +VariablesToExport = @() +AliasesToExport = @() + +# Private data to pass to the module specified in RootModule/ModuleToProcess. +# This may also contain a PSData hashtable with additional module metadata used by PowerShell. +PrivateData = +@{ + PSData = + @{ + # Tags applied to this module. These help with module discovery in online galleries. + Tags = @('vcpkg', 'tab', 'tab-completion', 'Register-ArgumentCompleter') + } +} + +} + +# SIG # Begin signature block +# MIIoVQYJKoZIhvcNAQcCoIIoRjCCKEICAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCBhs5lsXR9slHzB +# kYzN1OwRfrUUbZwdFarIAd9OllzrdaCCDYUwggYDMIID66ADAgECAhMzAAAEA73V +# lV0POxitAAAAAAQDMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjQwOTEyMjAxMTEzWhcNMjUwOTExMjAxMTEzWjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQCfdGddwIOnbRYUyg03O3iz19XXZPmuhEmW/5uyEN+8mgxl+HJGeLGBR8YButGV +# LVK38RxcVcPYyFGQXcKcxgih4w4y4zJi3GvawLYHlsNExQwz+v0jgY/aejBS2EJY +# oUhLVE+UzRihV8ooxoftsmKLb2xb7BoFS6UAo3Zz4afnOdqI7FGoi7g4vx/0MIdi +# kwTn5N56TdIv3mwfkZCFmrsKpN0zR8HD8WYsvH3xKkG7u/xdqmhPPqMmnI2jOFw/ +# /n2aL8W7i1Pasja8PnRXH/QaVH0M1nanL+LI9TsMb/enWfXOW65Gne5cqMN9Uofv +# ENtdwwEmJ3bZrcI9u4LZAkujAgMBAAGjggGCMIIBfjAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQU6m4qAkpz4641iK2irF8eWsSBcBkw +# VAYDVR0RBE0wS6RJMEcxLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJh +# dGlvbnMgTGltaXRlZDEWMBQGA1UEBRMNMjMwMDEyKzUwMjkyNjAfBgNVHSMEGDAW +# gBRIbmTlUAXTgqoXNzcitW2oynUClTBUBgNVHR8ETTBLMEmgR6BFhkNodHRwOi8v +# d3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NybC9NaWNDb2RTaWdQQ0EyMDExXzIw +# MTEtMDctMDguY3JsMGEGCCsGAQUFBwEBBFUwUzBRBggrBgEFBQcwAoZFaHR0cDov +# L3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNDb2RTaWdQQ0EyMDEx +# XzIwMTEtMDctMDguY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggIB +# AFFo/6E4LX51IqFuoKvUsi80QytGI5ASQ9zsPpBa0z78hutiJd6w154JkcIx/f7r +# EBK4NhD4DIFNfRiVdI7EacEs7OAS6QHF7Nt+eFRNOTtgHb9PExRy4EI/jnMwzQJV +# NokTxu2WgHr/fBsWs6G9AcIgvHjWNN3qRSrhsgEdqHc0bRDUf8UILAdEZOMBvKLC +# rmf+kJPEvPldgK7hFO/L9kmcVe67BnKejDKO73Sa56AJOhM7CkeATrJFxO9GLXos +# oKvrwBvynxAg18W+pagTAkJefzneuWSmniTurPCUE2JnvW7DalvONDOtG01sIVAB +# +ahO2wcUPa2Zm9AiDVBWTMz9XUoKMcvngi2oqbsDLhbK+pYrRUgRpNt0y1sxZsXO +# raGRF8lM2cWvtEkV5UL+TQM1ppv5unDHkW8JS+QnfPbB8dZVRyRmMQ4aY/tx5x5+ +# sX6semJ//FbiclSMxSI+zINu1jYerdUwuCi+P6p7SmQmClhDM+6Q+btE2FtpsU0W +# +r6RdYFf/P+nK6j2otl9Nvr3tWLu+WXmz8MGM+18ynJ+lYbSmFWcAj7SYziAfT0s +# IwlQRFkyC71tsIZUhBHtxPliGUu362lIO0Lpe0DOrg8lspnEWOkHnCT5JEnWCbzu +# iVt8RX1IV07uIveNZuOBWLVCzWJjEGa+HhaEtavjy6i7MIIHejCCBWKgAwIBAgIK +# YQ6Q0gAAAAAAAzANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNV +# BAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jv +# c29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlm +# aWNhdGUgQXV0aG9yaXR5IDIwMTEwHhcNMTEwNzA4MjA1OTA5WhcNMjYwNzA4MjEw +# OTA5WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UE +# BxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYD +# VQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMIICIjANBgkqhkiG +# 9w0BAQEFAAOCAg8AMIICCgKCAgEAq/D6chAcLq3YbqqCEE00uvK2WCGfQhsqa+la +# UKq4BjgaBEm6f8MMHt03a8YS2AvwOMKZBrDIOdUBFDFC04kNeWSHfpRgJGyvnkmc +# 6Whe0t+bU7IKLMOv2akrrnoJr9eWWcpgGgXpZnboMlImEi/nqwhQz7NEt13YxC4D +# dato88tt8zpcoRb0RrrgOGSsbmQ1eKagYw8t00CT+OPeBw3VXHmlSSnnDb6gE3e+ +# lD3v++MrWhAfTVYoonpy4BI6t0le2O3tQ5GD2Xuye4Yb2T6xjF3oiU+EGvKhL1nk +# kDstrjNYxbc+/jLTswM9sbKvkjh+0p2ALPVOVpEhNSXDOW5kf1O6nA+tGSOEy/S6 +# A4aN91/w0FK/jJSHvMAhdCVfGCi2zCcoOCWYOUo2z3yxkq4cI6epZuxhH2rhKEmd +# X4jiJV3TIUs+UsS1Vz8kA/DRelsv1SPjcF0PUUZ3s/gA4bysAoJf28AVs70b1FVL +# 5zmhD+kjSbwYuER8ReTBw3J64HLnJN+/RpnF78IcV9uDjexNSTCnq47f7Fufr/zd +# sGbiwZeBe+3W7UvnSSmnEyimp31ngOaKYnhfsi+E11ecXL93KCjx7W3DKI8sj0A3 +# T8HhhUSJxAlMxdSlQy90lfdu+HggWCwTXWCVmj5PM4TasIgX3p5O9JawvEagbJjS +# 4NaIjAsCAwEAAaOCAe0wggHpMBAGCSsGAQQBgjcVAQQDAgEAMB0GA1UdDgQWBBRI +# bmTlUAXTgqoXNzcitW2oynUClTAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTAL +# BgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRyLToCMZBD +# uRQFTuHqp8cx0SOJNDBaBgNVHR8EUzBRME+gTaBLhklodHRwOi8vY3JsLm1pY3Jv +# c29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFf +# MDNfMjIuY3JsMF4GCCsGAQUFBwEBBFIwUDBOBggrBgEFBQcwAoZCaHR0cDovL3d3 +# dy5taWNyb3NvZnQuY29tL3BraS9jZXJ0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFf +# MDNfMjIuY3J0MIGfBgNVHSAEgZcwgZQwgZEGCSsGAQQBgjcuAzCBgzA/BggrBgEF +# BQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9kb2NzL3ByaW1h +# cnljcHMuaHRtMEAGCCsGAQUFBwICMDQeMiAdAEwAZQBnAGEAbABfAHAAbwBsAGkA +# YwB5AF8AcwB0AGEAdABlAG0AZQBuAHQALiAdMA0GCSqGSIb3DQEBCwUAA4ICAQBn +# 8oalmOBUeRou09h0ZyKbC5YR4WOSmUKWfdJ5DJDBZV8uLD74w3LRbYP+vj/oCso7 +# v0epo/Np22O/IjWll11lhJB9i0ZQVdgMknzSGksc8zxCi1LQsP1r4z4HLimb5j0b +# pdS1HXeUOeLpZMlEPXh6I/MTfaaQdION9MsmAkYqwooQu6SpBQyb7Wj6aC6VoCo/ +# KmtYSWMfCWluWpiW5IP0wI/zRive/DvQvTXvbiWu5a8n7dDd8w6vmSiXmE0OPQvy +# CInWH8MyGOLwxS3OW560STkKxgrCxq2u5bLZ2xWIUUVYODJxJxp/sfQn+N4sOiBp +# mLJZiWhub6e3dMNABQamASooPoI/E01mC8CzTfXhj38cbxV9Rad25UAqZaPDXVJi +# hsMdYzaXht/a8/jyFqGaJ+HNpZfQ7l1jQeNbB5yHPgZ3BtEGsXUfFL5hYbXw3MYb +# BL7fQccOKO7eZS/sl/ahXJbYANahRr1Z85elCUtIEJmAH9AAKcWxm6U/RXceNcbS +# oqKfenoi+kiVH6v7RyOA9Z74v2u3S5fi63V4GuzqN5l5GEv/1rMjaHXmr/r8i+sL +# gOppO6/8MO0ETI7f33VtY5E90Z1WTk+/gFcioXgRMiF670EKsT/7qMykXcGhiJtX +# cVZOSEXAQsmbdlsKgEhr/Xmfwb1tbWrJUnMTDXpQzTGCGiYwghoiAgEBMIGVMH4x +# CzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRt +# b25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01p +# Y3Jvc29mdCBDb2RlIFNpZ25pbmcgUENBIDIwMTECEzMAAAQDvdWVXQ87GK0AAAAA +# BAMwDQYJYIZIAWUDBAIBBQCgga4wGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQw +# HAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkEMSIEIJ0/ +# ZM9udgTkgpNbuGSile8N73r9dgtBvFoCknZZBy2SMEIGCisGAQQBgjcCAQwxNDAy +# oBSAEgBNAGkAYwByAG8AcwBvAGYAdKEagBhodHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20wDQYJKoZIhvcNAQEBBQAEggEAVK8HY/qznmz34buAnokKc8De3neutGBfsOGw +# +8rb1bunIu6t/DksKZxGsOxc8sEl91vicxYg2ZJNtJQh1r2rkP4GobzG7P2jqa6X +# mfXwA9A+jIg16pHQ3e4nCJWIIwUhoivjxQabp2DpFKaJ/duy2swnvqfmlafBubRn +# uy8/7MNEq/fz3NCxaGwCUpTSXTCpquUrF9sgRsGFoRzXJRzAfH9aFdjjdyioEbw7 +# TYEYTvURpAgde6LRs+pZW9i7FZ2JucxFbDkTBs58a2/rmQ5RSMz5yw9ekAusD6cB +# +n3daXIn+4sDUXF6WQnCA8Tk8IWEpzKSHWaH+VBSQVbB/xaoOKGCF7AwghesBgor +# BgEEAYI3AwMBMYIXnDCCF5gGCSqGSIb3DQEHAqCCF4kwgheFAgEDMQ8wDQYJYIZI +# AWUDBAIBBQAwggFaBgsqhkiG9w0BCRABBKCCAUkEggFFMIIBQQIBAQYKKwYBBAGE +# WQoDATAxMA0GCWCGSAFlAwQCAQUABCBJqcIg3GEg1MGCxdkjylr/ZBLgvL1Pn0C2 +# 2IVSgDpNfwIGZ2LWE0XzGBMyMDI1MDExMTAwMjQ1Ni42NTVaMASAAgH0oIHZpIHW +# MIHTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQL +# EyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJzAlBgNVBAsT +# Hm5TaGllbGQgVFNTIEVTTjo0QzFBLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgU2VydmljZaCCEf4wggcoMIIFEKADAgECAhMzAAAB/xI4 +# fPfBZdahAAEAAAH/MA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1w +# IFBDQSAyMDEwMB4XDTI0MDcyNTE4MzExOVoXDTI1MTAyMjE4MzExOVowgdMxCzAJ +# BgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25k +# MR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jv +# c29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVs +# ZCBUU1MgRVNOOjRDMUEtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGlt +# ZS1TdGFtcCBTZXJ2aWNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA +# yeiV0pB7bg8/qc/mkiDdJXnzJWPYgk9mTGeI3pzQpsyrRJREWcKYHd/9db+g3z4d +# U4VCkAZEXqvkxP5QNTtBG5Ipexpph4PhbiJKwvX+US4KkSFhf1wflDAY1tu9CQqh +# hxfHFV7vhtmqHLCCmDxhZPmCBh9/XfFJQIUwVZR8RtUkgzmN9bmWiYgfX0R+bDAn +# ncUdtp1xjGmCpdBMygk/K0h3bUTUzQHb4kPf2ylkKPoWFYn2GNYgWw8PGBUO0vTM +# KjYD6pLeBP0hZDh5P3f4xhGLm6x98xuIQp/RFnzBbgthySXGl+NT1cZAqGyEhT7L +# 0SdR7qQlv5pwDNerbK3YSEDKk3sDh9S60hLJNqP71iHKkG175HAyg6zmE5p3fONr +# 9/fIEpPAlC8YisxXaGX4RpDBYVKpGj0FCZwisiZsxm0X9w6ZSk8OOXf8JxTYWIqf +# RuWzdUir0Z3jiOOtaDq7XdypB4gZrhr90KcPTDRwvy60zrQca/1D1J7PQJAJObbi +# aboi12usV8axtlT/dCePC4ndcFcar1v+fnClhs9u3Fn6LkHDRZfNzhXgLDEwb6dA +# 4y3s6G+gQ35o90j2i6amaa8JsV/cCF+iDSGzAxZY1sQ1mrdMmzxfWzXN6sPJMy49 +# tdsWTIgZWVOSS9uUHhSYkbgMxnLeiKXeB5MB9QMcOScCAwEAAaOCAUkwggFFMB0G +# A1UdDgQWBBTD+pXk/rT/d7E/0QE7hH0wz+6UYTAfBgNVHSMEGDAWgBSfpxVdAF5i +# XYP05dJlpxtTNRnpcjBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8vd3d3Lm1pY3Jv +# c29mdC5jb20vcGtpb3BzL2NybC9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENB +# JTIwMjAxMCgxKS5jcmwwbAYIKwYBBQUHAQEEYDBeMFwGCCsGAQUFBzAChlBodHRw +# Oi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMFRp +# bWUtU3RhbXAlMjBQQ0ElMjAyMDEwKDEpLmNydDAMBgNVHRMBAf8EAjAAMBYGA1Ud +# JQEB/wQMMAoGCCsGAQUFBwMIMA4GA1UdDwEB/wQEAwIHgDANBgkqhkiG9w0BAQsF +# AAOCAgEAOSNN5MpLiyunm866frWIi0hdazKNLgRp3WZPfhYgPC3K/DNMzLliYQUA +# p6WtgolIrativXjOG1lIjayG9r6ew4H1n5XZdDfJ12DLjopap5e1iU/Yk0eutPyf +# OievfbsIzTk/G51+uiUJk772nVzau6hI2KGyGBJOvAbAVFR0g8ppZwLghT4z3mkG +# Zjq/O4Z/PcmVGtjGps2TCtI4rZjPNW8O4c/4aJRmYQ/NdW91JRrOXRpyXrTKUPe3 +# kN8N56jpl9kotLhdvd89RbOsJNf2XzqbAV7XjV4caCglA2btzDxcyffwXhLu9HMU +# 3dLYTAI91gTNUF7BA9q1EvSlCKKlN8N10Y4iU0nyIkfpRxYyAbRyq5QPYPJHGA0T +# y0PD83aCt79Ra0IdDIMSuwXlpUnyIyxwrDylgfOGyysWBwQ/js249bqQOYPdpyOd +# gRe8tXdGrgDoBeuVOK+cRClXpimNYwr61oZ2/kPMzVrzRUYMkBXe9WqdSezh8tyt +# uulYYcRK95qihF0irQs6/WOQJltQX79lzFXE9FFln9Mix0as+C4HPzd+S0bBN3A3 +# XRROwAv016ICuT8hY1InyW7jwVmN+OkQ1zei66LrU5RtAz0nTxx5OePyjnTaItTS +# Y4OGuGU1SXaH49JSP3t8yGYA/vorbW4VneeD721FgwaJToHFkOIwggdxMIIFWaAD +# AgECAhMzAAAAFcXna54Cm0mZAAAAAAAVMA0GCSqGSIb3DQEBCwUAMIGIMQswCQYD +# VQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEe +# MBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTIwMAYDVQQDEylNaWNyb3Nv +# ZnQgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgMjAxMDAeFw0yMTA5MzAxODIy +# MjVaFw0zMDA5MzAxODMyMjVaMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNo +# aW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29y +# cG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEw +# MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA5OGmTOe0ciELeaLL1yR5 +# vQ7VgtP97pwHB9KpbE51yMo1V/YBf2xK4OK9uT4XYDP/XE/HZveVU3Fa4n5KWv64 +# NmeFRiMMtY0Tz3cywBAY6GB9alKDRLemjkZrBxTzxXb1hlDcwUTIcVxRMTegCjhu +# je3XD9gmU3w5YQJ6xKr9cmmvHaus9ja+NSZk2pg7uhp7M62AW36MEBydUv626GIl +# 3GoPz130/o5Tz9bshVZN7928jaTjkY+yOSxRnOlwaQ3KNi1wjjHINSi947SHJMPg +# yY9+tVSP3PoFVZhtaDuaRr3tpK56KTesy+uDRedGbsoy1cCGMFxPLOJiss254o2I +# 5JasAUq7vnGpF1tnYN74kpEeHT39IM9zfUGaRnXNxF803RKJ1v2lIH1+/NmeRd+2 +# ci/bfV+AutuqfjbsNkz2K26oElHovwUDo9Fzpk03dJQcNIIP8BDyt0cY7afomXw/ +# TNuvXsLz1dhzPUNOwTM5TI4CvEJoLhDqhFFG4tG9ahhaYQFzymeiXtcodgLiMxhy +# 16cg8ML6EgrXY28MyTZki1ugpoMhXV8wdJGUlNi5UPkLiWHzNgY1GIRH29wb0f2y +# 1BzFa/ZcUlFdEtsluq9QBXpsxREdcu+N+VLEhReTwDwV2xo3xwgVGD94q0W29R6H +# XtqPnhZyacaue7e3PmriLq0CAwEAAaOCAd0wggHZMBIGCSsGAQQBgjcVAQQFAgMB +# AAEwIwYJKwYBBAGCNxUCBBYEFCqnUv5kxJq+gpE8RjUpzxD/LwTuMB0GA1UdDgQW +# BBSfpxVdAF5iXYP05dJlpxtTNRnpcjBcBgNVHSAEVTBTMFEGDCsGAQQBgjdMg30B +# ATBBMD8GCCsGAQUFBwIBFjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3Bz +# L0RvY3MvUmVwb3NpdG9yeS5odG0wEwYDVR0lBAwwCgYIKwYBBQUHAwgwGQYJKwYB +# BAGCNxQCBAweCgBTAHUAYgBDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQFMAMB +# Af8wHwYDVR0jBBgwFoAU1fZWy4/oolxiaNE9lJBb186aGMQwVgYDVR0fBE8wTTBL +# oEmgR4ZFaHR0cDovL2NybC5taWNyb3NvZnQuY29tL3BraS9jcmwvcHJvZHVjdHMv +# TWljUm9vQ2VyQXV0XzIwMTAtMDYtMjMuY3JsMFoGCCsGAQUFBwEBBE4wTDBKBggr +# BgEFBQcwAoY+aHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraS9jZXJ0cy9NaWNS +# b29DZXJBdXRfMjAxMC0wNi0yMy5jcnQwDQYJKoZIhvcNAQELBQADggIBAJ1Vffwq +# reEsH2cBMSRb4Z5yS/ypb+pcFLY+TkdkeLEGk5c9MTO1OdfCcTY/2mRsfNB1OW27 +# DzHkwo/7bNGhlBgi7ulmZzpTTd2YurYeeNg2LpypglYAA7AFvonoaeC6Ce5732pv +# vinLbtg/SHUB2RjebYIM9W0jVOR4U3UkV7ndn/OOPcbzaN9l9qRWqveVtihVJ9Ak +# vUCgvxm2EhIRXT0n4ECWOKz3+SmJw7wXsFSFQrP8DJ6LGYnn8AtqgcKBGUIZUnWK +# NsIdw2FzLixre24/LAl4FOmRsqlb30mjdAy87JGA0j3mSj5mO0+7hvoyGtmW9I/2 +# kQH2zsZ0/fZMcm8Qq3UwxTSwethQ/gpY3UA8x1RtnWN0SCyxTkctwRQEcb9k+SS+ +# c23Kjgm9swFXSVRk2XPXfx5bRAGOWhmRaw2fpCjcZxkoJLo4S5pu+yFUa2pFEUep +# 8beuyOiJXk+d0tBMdrVXVAmxaQFEfnyhYWxz/gq77EFmPWn9y8FBSX5+k77L+Dvk +# txW/tM4+pTFRhLy/AsGConsXHRWJjXD+57XQKBqJC4822rpM+Zv/Cuk0+CQ1Zyvg +# DbjmjJnW4SLq8CdCPSWU5nR0W2rRnj7tfqAxM328y+l7vzhwRNGQ8cirOoo6CGJ/ +# 2XBjU02N7oJtpQUQwXEGahC0HVUzWLOhcGbyoYIDWTCCAkECAQEwggEBoYHZpIHW +# MIHTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMH +# UmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQL +# EyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJzAlBgNVBAsT +# Hm5TaGllbGQgVFNTIEVTTjo0QzFBLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9z +# b2Z0IFRpbWUtU3RhbXAgU2VydmljZaIjCgEBMAcGBSsOAwIaAxUAqROMbMS8JcUl +# cnPkwRLFRPXFspmggYMwgYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2Fz +# aGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENv +# cnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAx +# MDANBgkqhkiG9w0BAQsFAAIFAOsrpfMwIhgPMjAyNTAxMTAxMzU4MTFaGA8yMDI1 +# MDExMTEzNTgxMVowdzA9BgorBgEEAYRZCgQBMS8wLTAKAgUA6yul8wIBADAKAgEA +# AgIJbgIB/zAHAgEAAgISkzAKAgUA6yz3cwIBADA2BgorBgEEAYRZCgQCMSgwJjAM +# BgorBgEEAYRZCgMCoAowCAIBAAIDB6EgoQowCAIBAAIDAYagMA0GCSqGSIb3DQEB +# CwUAA4IBAQCLcCh9bX/RVDwfc4POERjOC1r/Ho89VmopgSIl+ggY/t9oREd7iFUS +# 7W5bnIzOPkrxBaLkPWfPsUxqce740pZbzekTDig7ZD7rqMfr808JH170+Xn+3WIo +# Lt9QV/hA/UP/sZ7qxdUtRy4DsG21+81VBjlBc4op/TrZ1pPmubA6Qcxlppo8/6cu +# /hByjdtwg4DPxIR3+VDkugZJrRqwYL0+3HcH1r5tBBJN0eyvJ3I2Kf1DEQQz5LH/ +# yWpkym9Tcwan5QNpMyYAJ6XHty8cHL1+GYpahsmPNeGNR4zhS2w1folAn8sHo7AN +# qnQ1KYjL3eQ1cxG5jVLSgoSAZGlYL1pOMYIEDTCCBAkCAQEwgZMwfDELMAkGA1UE +# BhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAc +# BgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0 +# IFRpbWUtU3RhbXAgUENBIDIwMTACEzMAAAH/Ejh898Fl1qEAAQAAAf8wDQYJYIZI +# AWUDBAIBBQCgggFKMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0BCRABBDAvBgkqhkiG +# 9w0BCQQxIgQgHXg8G5FNNrrsFotPLEkfAWyBk3gE/USEfpsP+TXINb8wgfoGCyqG +# SIb3DQEJEAIvMYHqMIHnMIHkMIG9BCDkMu++yQJ3aaycIuMT6vA7JNuMaVOI3qDj +# SEV8upyn/TCBmDCBgKR+MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5n +# dG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9y +# YXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwAhMz +# AAAB/xI4fPfBZdahAAEAAAH/MCIEIFdFxcHPft5K+RC1+sYiGsEw1ZL+Smew4S1G +# tAZ3nEH/MA0GCSqGSIb3DQEBCwUABIICAF7rF3CCuiqOAATvQkeKDX2HWaLxaGhF +# EkvYsYeuAbMHb2gSkXlDq0lEM8dYW13csCNzVAOcE4oETrsto+HGaUvSbbNFrtb6 +# gd6cOUd4xci3qAViaLBLK6VJBC6TIkmLCrik/41Mv667uh4xcNPaOiIf0hy2onkK +# ski4E7rAYSUvctrtHrcfTT/YYk/vWmefqYipq0/7k836xYGVTzLj98pBld5k4xGn +# gWKvHaX609hbwQMXIjfnqFnbGiSyPbP/FZu1Nb9ABFm2zt9E4+3/P0DfZ+A1aeU/ +# jo/Fj7A+HL7dAUAX5JIwFZu8rrLgAtaGl+uBf5qF8+7ezM3e7+YeZ8CSS6UYj8t2 +# CSWt75n35SLleXFJUzBekdkmBArcJj6YZsxGzRfa0BWt+bGcPGs+wgX2QotaivME +# ujDxyXoClWJM73WHyLklcm+rpqOdvuODKibLR3nyC6XmJl57wI7QEjpr2eNrig1k +# Zn7onGbhpAVKG5OyIwfYqy4T/aTlNysq3kSwjnIl24UcLT3ycC2kVUYze62zB5ku +# 0h53wDarhDAznUziBj9hKv5BRIWTt//grtfOAG7Rb9ZaJOP5z+kHiHoHLlWBedAK +# h/RuqoTxm53e7Ap3WN9gfUQKzP/4LHD9qQHmbv+wsvxbkV0KtdtGinVb6bWowq4s +# eXgi5lClk+l9 +# SIG # End signature block diff --git a/scripts/posh-vcpkg/posh-vcpkg.psm1 b/scripts/posh-vcpkg/posh-vcpkg.psm1 new file mode 100644 index 00000000000000..8a3a08a000b5af --- /dev/null +++ b/scripts/posh-vcpkg/posh-vcpkg.psm1 @@ -0,0 +1,259 @@ +Register-ArgumentCompleter -Native -CommandName vcpkg -ScriptBlock { + param( + [string]$wordToComplete, + [System.Management.Automation.Language.CommandAst]$commandAst, + [int]$cursorPosition + ) + + if ($cursorPosition -lt $commandAst.CommandElements[0].Extent.EndOffset) { + return + } + + [string]$commandText = $commandAst.CommandElements[0].Value + + [string[]]$textsBeforeCursor = $commandAst.CommandElements | + Select-Object -Skip 1 | ForEach-Object { + if ($_.Extent.EndOffset -le $cursorPosition) { + $_.Extent.Text + } + elseif ($_.Extent.StartOffset -lt $cursorPosition) { + $_.Extent.Text.Substring(0, $cursorPosition - $_.Extent.StartOffset) + } + } + + $spaceToComplete = if ($wordToComplete -ne '') { $null } + elseif ($PSNativeCommandArgumentPassing -in 'Standard', 'Windows') { '' } + else { '""' } + + [PowerShell]$cmd = [PowerShell]::Create().AddScript{ + Set-Location $args[0] + & $args[1] autocomplete @($args[2]) + }.AddParameters(($PWD, $commandText, @($textsBeforeCursor + $spaceToComplete))) + + [string[]]$completions = $cmd.Invoke() + + if ($cmd.HadErrors -or $completions.Count -eq 0) { + return + } + else { + return $completions + } +} + +# SIG # Begin signature block +# MIIoRQYJKoZIhvcNAQcCoIIoNjCCKDICAQExDzANBglghkgBZQMEAgEFADB5Bgor +# BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCD3lp9tM1D1Aouy +# vkIi4UIH5pxBs6VEvfzAYqoThk7yzaCCDXYwggX0MIID3KADAgECAhMzAAAEBGx0 +# Bv9XKydyAAAAAAQEMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAlVTMRMwEQYD +# VQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNpZ25p +# bmcgUENBIDIwMTEwHhcNMjQwOTEyMjAxMTE0WhcNMjUwOTExMjAxMTE0WjB0MQsw +# CQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9u +# ZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMR4wHAYDVQQDExVNaWNy +# b3NvZnQgQ29ycG9yYXRpb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +# AQC0KDfaY50MDqsEGdlIzDHBd6CqIMRQWW9Af1LHDDTuFjfDsvna0nEuDSYJmNyz +# NB10jpbg0lhvkT1AzfX2TLITSXwS8D+mBzGCWMM/wTpciWBV/pbjSazbzoKvRrNo +# DV/u9omOM2Eawyo5JJJdNkM2d8qzkQ0bRuRd4HarmGunSouyb9NY7egWN5E5lUc3 +# a2AROzAdHdYpObpCOdeAY2P5XqtJkk79aROpzw16wCjdSn8qMzCBzR7rvH2WVkvF +# HLIxZQET1yhPb6lRmpgBQNnzidHV2Ocxjc8wNiIDzgbDkmlx54QPfw7RwQi8p1fy +# 4byhBrTjv568x8NGv3gwb0RbAgMBAAGjggFzMIIBbzAfBgNVHSUEGDAWBgorBgEE +# AYI3TAgBBggrBgEFBQcDAzAdBgNVHQ4EFgQU8huhNbETDU+ZWllL4DNMPCijEU4w +# RQYDVR0RBD4wPKQ6MDgxHjAcBgNVBAsTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEW +# MBQGA1UEBRMNMjMwMDEyKzUwMjkyMzAfBgNVHSMEGDAWgBRIbmTlUAXTgqoXNzci +# tW2oynUClTBUBgNVHR8ETTBLMEmgR6BFhkNodHRwOi8vd3d3Lm1pY3Jvc29mdC5j +# b20vcGtpb3BzL2NybC9NaWNDb2RTaWdQQ0EyMDExXzIwMTEtMDctMDguY3JsMGEG +# CCsGAQUFBwEBBFUwUzBRBggrBgEFBQcwAoZFaHR0cDovL3d3dy5taWNyb3NvZnQu +# Y29tL3BraW9wcy9jZXJ0cy9NaWNDb2RTaWdQQ0EyMDExXzIwMTEtMDctMDguY3J0 +# MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggIBAIjmD9IpQVvfB1QehvpC +# Ge7QeTQkKQ7j3bmDMjwSqFL4ri6ae9IFTdpywn5smmtSIyKYDn3/nHtaEn0X1NBj +# L5oP0BjAy1sqxD+uy35B+V8wv5GrxhMDJP8l2QjLtH/UglSTIhLqyt8bUAqVfyfp +# h4COMRvwwjTvChtCnUXXACuCXYHWalOoc0OU2oGN+mPJIJJxaNQc1sjBsMbGIWv3 +# cmgSHkCEmrMv7yaidpePt6V+yPMik+eXw3IfZ5eNOiNgL1rZzgSJfTnvUqiaEQ0X +# dG1HbkDv9fv6CTq6m4Ty3IzLiwGSXYxRIXTxT4TYs5VxHy2uFjFXWVSL0J2ARTYL +# E4Oyl1wXDF1PX4bxg1yDMfKPHcE1Ijic5lx1KdK1SkaEJdto4hd++05J9Bf9TAmi +# u6EK6C9Oe5vRadroJCK26uCUI4zIjL/qG7mswW+qT0CW0gnR9JHkXCWNbo8ccMk1 +# sJatmRoSAifbgzaYbUz8+lv+IXy5GFuAmLnNbGjacB3IMGpa+lbFgih57/fIhamq +# 5VhxgaEmn/UjWyr+cPiAFWuTVIpfsOjbEAww75wURNM1Imp9NJKye1O24EspEHmb +# DmqCUcq7NqkOKIG4PVm3hDDED/WQpzJDkvu4FrIbvyTGVU01vKsg4UfcdiZ0fQ+/ +# V0hf8yrtq9CkB8iIuk5bBxuPMIIHejCCBWKgAwIBAgIKYQ6Q0gAAAAAAAzANBgkq +# hkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24x +# EDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlv +# bjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5 +# IDIwMTEwHhcNMTEwNzA4MjA1OTA5WhcNMjYwNzA4MjEwOTA5WjB+MQswCQYDVQQG +# EwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwG +# A1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQg +# Q29kZSBTaWduaW5nIFBDQSAyMDExMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC +# CgKCAgEAq/D6chAcLq3YbqqCEE00uvK2WCGfQhsqa+laUKq4BjgaBEm6f8MMHt03 +# a8YS2AvwOMKZBrDIOdUBFDFC04kNeWSHfpRgJGyvnkmc6Whe0t+bU7IKLMOv2akr +# rnoJr9eWWcpgGgXpZnboMlImEi/nqwhQz7NEt13YxC4Ddato88tt8zpcoRb0Rrrg +# OGSsbmQ1eKagYw8t00CT+OPeBw3VXHmlSSnnDb6gE3e+lD3v++MrWhAfTVYoonpy +# 4BI6t0le2O3tQ5GD2Xuye4Yb2T6xjF3oiU+EGvKhL1nkkDstrjNYxbc+/jLTswM9 +# sbKvkjh+0p2ALPVOVpEhNSXDOW5kf1O6nA+tGSOEy/S6A4aN91/w0FK/jJSHvMAh +# dCVfGCi2zCcoOCWYOUo2z3yxkq4cI6epZuxhH2rhKEmdX4jiJV3TIUs+UsS1Vz8k +# A/DRelsv1SPjcF0PUUZ3s/gA4bysAoJf28AVs70b1FVL5zmhD+kjSbwYuER8ReTB +# w3J64HLnJN+/RpnF78IcV9uDjexNSTCnq47f7Fufr/zdsGbiwZeBe+3W7UvnSSmn +# Eyimp31ngOaKYnhfsi+E11ecXL93KCjx7W3DKI8sj0A3T8HhhUSJxAlMxdSlQy90 +# lfdu+HggWCwTXWCVmj5PM4TasIgX3p5O9JawvEagbJjS4NaIjAsCAwEAAaOCAe0w +# ggHpMBAGCSsGAQQBgjcVAQQDAgEAMB0GA1UdDgQWBBRIbmTlUAXTgqoXNzcitW2o +# ynUClTAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYD +# VR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRyLToCMZBDuRQFTuHqp8cx0SOJNDBa +# BgNVHR8EUzBRME+gTaBLhklodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL2Ny +# bC9wcm9kdWN0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3JsMF4GCCsG +# AQUFBwEBBFIwUDBOBggrBgEFBQcwAoZCaHR0cDovL3d3dy5taWNyb3NvZnQuY29t +# L3BraS9jZXJ0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3J0MIGfBgNV +# HSAEgZcwgZQwgZEGCSsGAQQBgjcuAzCBgzA/BggrBgEFBQcCARYzaHR0cDovL3d3 +# dy5taWNyb3NvZnQuY29tL3BraW9wcy9kb2NzL3ByaW1hcnljcHMuaHRtMEAGCCsG +# AQUFBwICMDQeMiAdAEwAZQBnAGEAbABfAHAAbwBsAGkAYwB5AF8AcwB0AGEAdABl +# AG0AZQBuAHQALiAdMA0GCSqGSIb3DQEBCwUAA4ICAQBn8oalmOBUeRou09h0ZyKb +# C5YR4WOSmUKWfdJ5DJDBZV8uLD74w3LRbYP+vj/oCso7v0epo/Np22O/IjWll11l +# hJB9i0ZQVdgMknzSGksc8zxCi1LQsP1r4z4HLimb5j0bpdS1HXeUOeLpZMlEPXh6 +# I/MTfaaQdION9MsmAkYqwooQu6SpBQyb7Wj6aC6VoCo/KmtYSWMfCWluWpiW5IP0 +# wI/zRive/DvQvTXvbiWu5a8n7dDd8w6vmSiXmE0OPQvyCInWH8MyGOLwxS3OW560 +# STkKxgrCxq2u5bLZ2xWIUUVYODJxJxp/sfQn+N4sOiBpmLJZiWhub6e3dMNABQam +# ASooPoI/E01mC8CzTfXhj38cbxV9Rad25UAqZaPDXVJihsMdYzaXht/a8/jyFqGa +# J+HNpZfQ7l1jQeNbB5yHPgZ3BtEGsXUfFL5hYbXw3MYbBL7fQccOKO7eZS/sl/ah +# XJbYANahRr1Z85elCUtIEJmAH9AAKcWxm6U/RXceNcbSoqKfenoi+kiVH6v7RyOA +# 9Z74v2u3S5fi63V4GuzqN5l5GEv/1rMjaHXmr/r8i+sLgOppO6/8MO0ETI7f33Vt +# Y5E90Z1WTk+/gFcioXgRMiF670EKsT/7qMykXcGhiJtXcVZOSEXAQsmbdlsKgEhr +# /Xmfwb1tbWrJUnMTDXpQzTGCGiUwghohAgEBMIGVMH4xCzAJBgNVBAYTAlVTMRMw +# EQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVN +# aWNyb3NvZnQgQ29ycG9yYXRpb24xKDAmBgNVBAMTH01pY3Jvc29mdCBDb2RlIFNp +# Z25pbmcgUENBIDIwMTECEzMAAAQEbHQG/1crJ3IAAAAABAQwDQYJYIZIAWUDBAIB +# BQCgga4wGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGCNwIBCzEO +# MAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkEMSIEIBSdnuz9beOL1XZFf6XEgbeF +# TIiv3265cxy0vW0PGSA/MEIGCisGAQQBgjcCAQwxNDAyoBSAEgBNAGkAYwByAG8A +# cwBvAGYAdKEagBhodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20wDQYJKoZIhvcNAQEB +# BQAEggEANo6T+xCuafTYJYFSUnxmvREkGtL4fdEsZtD8PJsm1MQozZDm/5XkdfZB +# hGtaUSKZyleya9rPMf+ofjOim6P3cZ7iLP8QUgC4vFpG2jACnVc8XT0bY+sVf9Ry +# 7XP37hEqNm6Bq9+UUiBaCuyG1UXsdzOpiPBWdisM37ckhd3fwF0BfBnaXtK0Tpup +# Aq/SIEy2UvhvcMLP9cAP1A5MRzfZqKsBjYNk1rKNbCeWyXvXRCOcNcpVdW5jFcvW +# TRmuPvI1z7M8l4BEUeMm7FdXPlbvlfXOTANX3M+u3iUhw8Rl+uCczI5HmIUz/TOj +# TBIlY1wypJ2o/sOt/fS3csmuFhmnVqGCF68wgherBgorBgEEAYI3AwMBMYIXmzCC +# F5cGCSqGSIb3DQEHAqCCF4gwgheEAgEDMQ8wDQYJYIZIAWUDBAIBBQAwggFZBgsq +# hkiG9w0BCRABBKCCAUgEggFEMIIBQAIBAQYKKwYBBAGEWQoDATAxMA0GCWCGSAFl +# AwQCAQUABCD7a/cqGHLI/6Hw5hYBmJPAhNWA+oOxzSwqnZj2d8Z9RQIGZ2KydTkU +# GBIyMDI1MDExMTAwMjQ1NC44M1owBIACAfSggdmkgdYwgdMxCzAJBgNVBAYTAlVT +# MRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQK +# ExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVs +# YW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNO +# OjZCMDUtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBT +# ZXJ2aWNloIIR/jCCBygwggUQoAMCAQICEzMAAAH2gy8malRdIsEAAQAAAfYwDQYJ +# KoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24x +# EDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlv +# bjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwHhcNMjQw +# NzI1MTgzMTA0WhcNMjUxMDIyMTgzMTA0WjCB0zELMAkGA1UEBhMCVVMxEzARBgNV +# BAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jv +# c29mdCBDb3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9zb2Z0IElyZWxhbmQgT3Bl +# cmF0aW9ucyBMaW1pdGVkMScwJQYDVQQLEx5uU2hpZWxkIFRTUyBFU046NkIwNS0w +# NUUwLUQ5NDcxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2Uw +# ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRQl4sxH831Y8FmG4pUUX5 +# 5Ylnrxa6N2PhfolHTlzE7kJ6k1ejXutVrPBYuSbkCNpWHX1lWMMKEfOKbGyhpfE2 +# 7wgOCArCle+kAAi2/hTHnR71La5XB8q/nun0kob5DtU41KG6OXU0IyRyBKs92Z3/ +# zNyyaHNw2hsuiasIAg5FnwjCFjLiyJVCV/U0qGXIDOaRYkPQ37rQiKiAUHODfIhK +# y+ug7HTHXFKLY+JEhCVNcTvgyCBkMgMqof+Fv0VPaQr+dX9peO6j0syutGafjihh +# gAN7+s73kX5Ibe666F/4fgiuJevSH2m0DpLAck9LZWZs1YKNBarkbhiStyps8xrH +# u81dTC7tPrkTx8U93Ui4T1GwbhMwBXteRcGimY81+8vSGPGDjiSlCffzhXjqj7N1 +# CrLkr10OVab8nq9m2nnIDU/IPfD4dsa5tLSeIRDUvrAY6s9/MibQV06f7EWjjwRG +# X4XHD/c69czkJjUSqfMTOc+PMlzs4nCElVHdVAMeMFwQVM69L0TR2I27V6hzD5kK +# TPg+7+hC/6CpT5t/Evx7s8WS19EOUzoXI7OM/jO4jbmAPy073MmDqDp9Glplzjf2 +# YBuSXfMJXNMsOByG/pLFBqMm2++hBpnFB/S1GI9xuvYdZ8yiqp326JDSFNQSEbjg +# UFJN5Q9l4R6dEJZp0JbgbwIDAQABo4IBSTCCAUUwHQYDVR0OBBYEFEjBmwm45wl9 +# Jw9Zxdm4EDgHz0ryMB8GA1UdIwQYMBaAFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMF8G +# A1UdHwRYMFYwVKBSoFCGTmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMv +# Y3JsL01pY3Jvc29mdCUyMFRpbWUtU3RhbXAlMjBQQ0ElMjAyMDEwKDEpLmNybDBs +# BggrBgEFBQcBAQRgMF4wXAYIKwYBBQUHMAKGUGh0dHA6Ly93d3cubWljcm9zb2Z0 +# LmNvbS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUy +# MDIwMTAoMSkuY3J0MAwGA1UdEwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUH +# AwgwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUAA4ICAQDXeQGKsfVwe7VZ +# hHXKyPXbmiYa1DQ9pCQTPAZvvTG2pKgj6y9CKGyB1NjFo9+nYhUV2CNoxoGLzXAH +# z+e7zroV8Uop2F2nfCcxn3U+k/g6h7s1x/qogKSBK7CB0h1C+oTSHxVDlBbmwNXh +# DQmePh/sodjHg2IzwLiNPDxJC2y7FaJMfYeKR/dBgHvVrt0H3OAc6RbSGBQR5Y72 +# aHbBaphL9DjwBKM6pjD+FrnihU59/bZZqgf78fF301MRT/i+W+xEgxZPSOyc0jvW +# NUCtPhD0G3pVKFbPKqtoTpIpShmsTAGlWwjQsyDZfeE4tuULW/Ezf7AzI6H3toU6 +# zuwWe56a0jYx+PyqDXoFlMnFeWk+6tasb44GPgGhMOQL0DFdgHfIS27AyzulFYvL +# EjHD/BX1McpQab7H5UTQ84vCStIyCO6VJeSl8QsdZaIJWyUlsUggH/gCW/6NAlIo +# Am6j0IStubap4OT/OMliVhpUYzIq5hn65JFUoHaqQQ9wTMbV073MhrUynfYn7PNb +# c/uy4l+PDrazeEM4uT7qUxA5HTjH7ajXsbctx4uSTEmbjUSt2JOMCZ0KV6f3KXoe +# AykZLiiSMUIlf4Kk4VfuAEDc9XFBa5uKwBBsvkeBMUG1A0TNwJ2HUZjD/qfPM023 +# 7QZCeehsF1184CKqTO8i2peO8bIrVDCCB3EwggVZoAMCAQICEzMAAAAVxedrngKb +# SZkAAAAAABUwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQI +# EwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3Nv +# ZnQgQ29ycG9yYXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmlj +# YXRlIEF1dGhvcml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIy +# NVowfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcT +# B1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UE +# AxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEB +# AQUAA4ICDwAwggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXI +# yjVX9gF/bErg4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjo +# YH1qUoNEt6aORmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1y +# aa8dq6z2Nr41JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v +# 3byNpOORj7I5LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pG +# ve2krnopN6zL64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viS +# kR4dPf0gz3N9QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYr +# bqgSUei/BQOj0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlM +# jgK8QmguEOqEUUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSL +# W6CmgyFdXzB0kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AF +# emzFER1y7435UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIu +# rQIDAQABo4IB3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIE +# FgQUKqdS/mTEmr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWn +# G1M1GelyMFwGA1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEW +# M2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5 +# Lmh0bTATBgNVHSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBi +# AEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV +# 9lbLj+iiXGJo0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3Js +# Lm1pY3Jvc29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAx +# MC0wNi0yMy5jcmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8v +# d3d3Lm1pY3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2 +# LTIzLmNydDANBgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv +# 6lwUtj5OR2R4sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZn +# OlNN3Zi6th542DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1 +# bSNU5HhTdSRXud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4 +# rPf5KYnDvBewVIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU +# 6ZGyqVvfSaN0DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDF +# NLB62FD+CljdQDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/ +# HltEAY5aGZFrDZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdU +# CbFpAUR+fKFhbHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKi +# excdFYmNcP7ntdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTm +# dHRbatGePu1+oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZq +# ELQdVTNYs6FwZvKhggNZMIICQQIBATCCAQGhgdmkgdYwgdMxCzAJBgNVBAYTAlVT +# MRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQK +# ExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVs +# YW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNO +# OjZCMDUtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBT +# ZXJ2aWNloiMKAQEwBwYFKw4DAhoDFQAVT15Kl3GzRrTokUi4YUciP8j7fqCBgzCB +# gKR+MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQH +# EwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNV +# BAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwMA0GCSqGSIb3DQEBCwUA +# AgUA6ywrEzAiGA8yMDI1MDExMDIzMjYxMVoYDzIwMjUwMTExMjMyNjExWjB3MD0G +# CisGAQQBhFkKBAExLzAtMAoCBQDrLCsTAgEAMAoCAQACAglJAgH/MAcCAQACAhJQ +# MAoCBQDrLXyTAgEAMDYGCisGAQQBhFkKBAIxKDAmMAwGCisGAQQBhFkKAwKgCjAI +# AgEAAgMHoSChCjAIAgEAAgMBhqAwDQYJKoZIhvcNAQELBQADggEBAL+LJZgrakLD +# eDWAOC6zw3pF6nMPU7y9UIAHgCxa8O1/OGcF261k98S/EHvL1Q9kHrgnFqA+6uSq +# VroQXeR4HBXCsMvdmsgeyIXjIxu8LJmLgkqNH03KjJeHLcqXs8IOiRIYVKajOJPA +# rkZ/79+7ovJckIYWtPHjMky4M6v5CG5ngAX8ja5FcYzU3lKfshau5mO9taRDXs2H +# akdwxm037yFAP9m1YQvszZdMsY5IpnBG/MyburgvCAiz9Mc2go/fWJ/AQnMuYpp2 +# 9vfRzzGmSuOYh6Hq6iRDUY3l4fzftJWauBGon7zyJGjXwauPqbkhIGuE3Gl3/xSd +# T7oiHYZkTp8xggQNMIIECQIBATCBkzB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMK +# V2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0 +# IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0Eg +# MjAxMAITMwAAAfaDLyZqVF0iwQABAAAB9jANBglghkgBZQMEAgEFAKCCAUowGgYJ +# KoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEEMC8GCSqGSIb3DQEJBDEiBCC7BfAbtu7L +# NhZD+LBoXPUD61Q3zYpGMszQh6YcYypYvDCB+gYLKoZIhvcNAQkQAi8xgeowgecw +# geQwgb0EICthTPGUXqblRItLh/w1cv/xqg0RV2wJlGYX4uVCMbaiMIGYMIGApH4w +# fDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1Jl +# ZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMd +# TWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTACEzMAAAH2gy8malRdIsEAAQAA +# AfYwIgQgJpA8sGCojR8TK5VZYo7CnBq41SnmOgCOIksZcp+/9G0wDQYJKoZIhvcN +# AQELBQAEggIAiyem0a23Sz8inCm9PHLmtJcc/+e+Dv7nhQtw87LgRpPlinjWejdM +# kJZN+8ZlWftQeJjrlsaKwdZ/qO1tJYegiHyVOCVqXzbP2bLvz1E1zbIk0AyB8Uw7 +# Ms0PzPJxjrJgNpot+aDMk4HtFG9wmHsAHv2PIjtJxkbJa/W67hi9SADXDVtOXSVg +# yjBYwuC9XvPDlgVg07Kn87jNwoGSqVad4MO0bCVZhHEmrDaSKsJ59ld+cdFNL31x +# FCkxhXkxtzklytDYBu6QPt0WTANZwZFtJ3LhGOi+eCc1BWCMtnItbOSeBoJkIODf +# oOjchNwMNHPrzoUqmQjClKGRMsuovziJYvEQuiyx9nmupsws1ZbZb5Tu0gz5hpjH +# CNIrq2MsMBT7TP541V+si6l40Rodp+UzZxjGM4nJHIPW9YQXGqCb2JBeC9Ac2pL6 +# ZA4aPy9fXG6YNeYweBle6jOgFF0gN0LcOfRywZI2Cl0O845cLXZ5GrktLJ0+wqea +# pWG2PRVislBWGUIgACyr9OuHiyOH/jxH7+STiu/Go5kVTc9cgSmpVfXGpjjIiefN +# +sL2i9ehKSBR4bytpnnn3/nPRfll7vhdqc2TAfJ8ETwaGa+gwb0Bgkt/O4AOZqRt +# 5dUckjdIOpeuxv6Nt/h+5jb84y9MW4oQ8CRQ3J54M7hHseOQh6YhxGE= +# SIG # End signature block diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index 60d48270d7444d..88a6bf7e13cd36 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2024-12-09 -VCPKG_MACOS_SHA=771f18188cbfd312b833a88a2dfe91bffefe54f7c264e6d3ce8f5b477d98d3a144e9e228e33a5c58de205be970fa701b34acdd08354935926b3a6f485ef630e8 -VCPKG_MUSLC_SHA=1240c124f82c679f2deb5fd3485ccec9540474776146711b3c8637391fbb2b75534e3bf8a3572c5a6c0f3789fc9f8461989f56ffdb5781fa89f19e8e6d5c91bb -VCPKG_GLIBC_SHA=1084ea358d00d23795d7ea8359001fd72b0cb09ff7edc29f722d5ba6b8949e9ea32d5755b270fe7f4eef1d16361594962ab38445ea67e772ddd2408d72ab2c95 -VCPKG_TOOL_SOURCE_SHA=d93f45ce2aa1d2226927553378bda869f8933206aeda83db5785cba0217c790f309e5596b878e21f94bda7bf280f817aee41eb704da3bb015b69fc5e565d0fea +VCPKG_TOOL_RELEASE_TAG=2025-01-11 +VCPKG_MACOS_SHA=7de78a432f0a93dd0dd62605cccb44ecded27dd18c535ee26943135adf973e964be3994ef369ef10a925b6e4d995c8e897e26717c679b35c3f3df75102b5face +VCPKG_MUSLC_SHA=e225cc606793f47e6e041ecec6eade60050c59ffbad62fae6b757c83eac939b99cd83a9a2b266cd853e83ebe4fe5d8bfbe88ea39f5c16f9013c379c1b03fa045 +VCPKG_GLIBC_SHA=c650f7afe3d6e2f7eb52264fa953fa5e30b371b85c85d5f33b184239ce41087d2ead76980b3448af0112c3a9c06388c8a2dcb83fd89e7f0399376ec0cb94d361 +VCPKG_TOOL_SOURCE_SHA=f4449167e6294aa38541f2c82c19c0afad3f883e9b53d884650d73e4f3918b2d1e6000c28e869a44189e0a3bf90f05972f9fd13e1832f65de2566037bcb41899 From 34a89202ac3615bcbf7776c8dae3406593d630a6 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 10 Jan 2025 18:13:45 -0800 Subject: [PATCH 03/44] Don't use parent hashes when the tool version changes. --- scripts/azure-pipelines/test-modified-ports.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 3978ce0d3f90ec..c060bfc5685580 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -132,6 +132,7 @@ $parentHashes = @() if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) { $headBaseline = Get-Content "$PSScriptRoot/../ci.baseline.txt" -Raw + $headTool = Get-Content "$PSScriptRoot/../vcpkg-tool-metadata.txt" -Raw # Prefetch tools for better output foreach ($tool in @('cmake', 'ninja', 'git')) { @@ -154,7 +155,8 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) } $parentBaseline = Get-Content "$PSScriptRoot/../ci.baseline.txt" -Raw - if ($parentBaseline -eq $headBaseline) + $parentTool = Get-Content "$PSScriptRoot/../vcpkg-tool-metadata.txt" -Raw + if (($parentBaseline -eq $headBaseline) -and ($parentTool -eq $headTool)) { Write-Host "CI baseline unchanged, determining parent hashes" $parentHashesFile = Join-Path $ArtifactStagingDirectory 'parent-hashes.json' @@ -173,7 +175,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) } else { - Write-Host "CI baseline was modified, not using parent hashes" + Write-Host "Tool or baseline modified, not using parent hashes" } Write-Host "Running CI for HEAD" From 3afe35f6cbda2ae6b6fbc4f1b7f67efbb25e4b12 Mon Sep 17 00:00:00 2001 From: eao197 Date: Tue, 14 Jan 2025 10:53:11 +0300 Subject: [PATCH 04/44] [sobjectizer] Update to 5.8.4 (#43254) --- ports/sobjectizer/portfile.cmake | 2 +- ports/sobjectizer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sobjectizer.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 71ff22b68a2960..63ec043ffabf6a 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 f8fe128b4534ad1f7324d6b7f2b290f4c6bb8bfd2acc055b6daa429f14d797aad071630ada3dcc64bc9d337b3f36c88531d162e8caa7fdbff85a27cbcac7dd45 + SHA512 8598f28ebfda5b44cd7d283d16d872890afa89901f18dbba126d9939f32e0cbf7d7ff593383752bfe853b70043ef890f9785686ddd80ebe3241fddfdf569c916 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 557bc1268c7b80..83c5a88abef942 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.8.3", + "version": "5.8.4", "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/versions/baseline.json b/versions/baseline.json index ae7edec66224fa..6cb14aeb5d4f88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8517,7 +8517,7 @@ "port-version": 0 }, "sobjectizer": { - "baseline": "5.8.3", + "baseline": "5.8.4", "port-version": 0 }, "soci": { diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index 054b8576fe44e5..16bf3bac71fec7 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "083a9ece447927d6cbe0018a4e6133a6ff9f10c1", + "version": "5.8.4", + "port-version": 0 + }, { "git-tree": "1230863522bb2c770a8eaa5defa1cffcb4bc373f", "version": "5.8.3", From 676f1291dbe74015d59c72bf7d69e325473a1281 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 14 Jan 2025 09:06:11 +0100 Subject: [PATCH 05/44] [autodock-vina] update to 1.2.6 (#43250) Signed-off-by: Vitalii Koshura --- ports/autodock-vina/CMakeLists.txt | 2 +- .../fix-compatibility-with-boost-1.83.patch | 46 ------------------- .../fix-compatibility-with-boost-1.85.patch | 30 ------------ ports/autodock-vina/portfile.cmake | 5 +- ports/autodock-vina/vcpkg.json | 5 +- versions/a-/autodock-vina.json | 5 ++ versions/baseline.json | 4 +- 7 files changed, 11 insertions(+), 86 deletions(-) delete mode 100644 ports/autodock-vina/fix-compatibility-with-boost-1.83.patch delete mode 100644 ports/autodock-vina/fix-compatibility-with-boost-1.85.patch diff --git a/ports/autodock-vina/CMakeLists.txt b/ports/autodock-vina/CMakeLists.txt index 251ce5119f7b2e..a1e1dec05d59de 100644 --- a/ports/autodock-vina/CMakeLists.txt +++ b/ports/autodock-vina/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_policy(VERSION 3.11) project(autodock-vina) -set(GIT_VERSION v1.2.5) +set(GIT_VERSION v1.2.6) set(CMAKE_CXX_STANDARD 11) find_package(Boost REQUIRED COMPONENTS diff --git a/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch b/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch deleted file mode 100644 index e6af7c477482f7..00000000000000 --- a/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4a7935e1f8d1756cbeafb2564066551f9bd766f0 Mon Sep 17 00:00:00 2001 -From: jjll -Date: Wed, 6 Sep 2023 14:25:30 +0200 -Subject: [PATCH] compatibility boost >= 1.83 - ---- - src/lib/parallel_progress.h | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/lib/parallel_progress.h b/src/lib/parallel_progress.h -index 958b170..ee938d9 100755 ---- a/src/lib/parallel_progress.h -+++ b/src/lib/parallel_progress.h -@@ -23,7 +23,14 @@ - #ifndef VINA_PARALLEL_PROGRESS_H - #define VINA_PARALLEL_PROGRESS_H - -+#include -+#if BOOST_VERSION < 107200 - #include -+typedef boost::progress_display boost_progress; -+#else -+#include -+typedef boost::timer::progress_display boost_progress; -+#endif - #include - - #include -@@ -34,7 +41,7 @@ struct parallel_progress : public incrementable { - parallel_progress(std::function* c = NULL) : p(NULL), callback(c) {} - void init(unsigned long n) { - count = n; -- p = new boost::progress_display(count); -+ p = new boost_progress(count); - } - void operator++() { - if(p) { -@@ -47,7 +54,7 @@ struct parallel_progress : public incrementable { - virtual ~parallel_progress() { delete p; } - private: - boost::mutex self; -- boost::progress_display* p; -+ boost_progress* p; - std::function* callback; - unsigned long count; - }; diff --git a/ports/autodock-vina/fix-compatibility-with-boost-1.85.patch b/ports/autodock-vina/fix-compatibility-with-boost-1.85.patch deleted file mode 100644 index bfe452eb58dd19..00000000000000 --- a/ports/autodock-vina/fix-compatibility-with-boost-1.85.patch +++ /dev/null @@ -1,30 +0,0 @@ - src/lib/vina.h | 2 +- - src/split/split.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/vina.h b/src/lib/vina.h -index a44cf9b..daed498 100644 ---- a/src/lib/vina.h -+++ b/src/lib/vina.h -@@ -35,7 +35,7 @@ - #include - #include - #include --#include // filesystem::basename -+#include // filesystem::basename - #include // hardware_concurrency // FIXME rm ? - #include - //#include -diff --git a/src/split/split.cpp b/src/split/split.cpp -index b42e78a..daee547 100644 ---- a/src/split/split.cpp -+++ b/src/split/split.cpp -@@ -30,7 +30,7 @@ - #include - #include - #include --#include // filesystem::basename -+#include // filesystem::basename - - #include "file.h" - #include "parse_error.h" diff --git a/ports/autodock-vina/portfile.cmake b/ports/autodock-vina/portfile.cmake index 367c377e77ccf2..a96e6e9f8a7f07 100644 --- a/ports/autodock-vina/portfile.cmake +++ b/ports/autodock-vina/portfile.cmake @@ -4,11 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ccsb-scripps/AutoDock-Vina REF v${VERSION} - SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9 + SHA512 8f974aa5772575af950e90206e98a9ac29f5ddaed2db47b3756df4cb7a79d38eb21384e14dc2359ad3c2d4957df5a5d120fc117223d0ee312012323d834ba654 HEAD_REF develop - PATCHES - fix-compatibility-with-boost-1.83.patch - fix-compatibility-with-boost-1.85.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/autodock-vina/vcpkg.json b/ports/autodock-vina/vcpkg.json index 44f683ce12374a..8d3ac81b002c33 100644 --- a/ports/autodock-vina/vcpkg.json +++ b/ports/autodock-vina/vcpkg.json @@ -1,9 +1,8 @@ { "name": "autodock-vina", - "version-semver": "1.2.5", - "port-version": 3, + "version-semver": "1.2.6", "description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.", - "homepage": "http://vina.scripps.edu/", + "homepage": "https://vina.scripps.edu/", "dependencies": [ "boost-algorithm", "boost-array", diff --git a/versions/a-/autodock-vina.json b/versions/a-/autodock-vina.json index 470fc0d3e5a995..51d3a275cd7ee3 100644 --- a/versions/a-/autodock-vina.json +++ b/versions/a-/autodock-vina.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe9bac99748f92bed5428087d5db7c6457f7e7da", + "version-semver": "1.2.6", + "port-version": 0 + }, { "git-tree": "17529fd4b800ef3453f99cf2607e64fea59f6481", "version-semver": "1.2.5", diff --git a/versions/baseline.json b/versions/baseline.json index 6cb14aeb5d4f88..ae51f39c2b3b22 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -365,8 +365,8 @@ "port-version": 2 }, "autodock-vina": { - "baseline": "1.2.5", - "port-version": 3 + "baseline": "1.2.6", + "port-version": 0 }, "avcpp": { "baseline": "2.4.0", From 289a69379604112a433874fe8b9812dad3103341 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:07:57 +0100 Subject: [PATCH 06/44] [boost-function] fix dependencies (#43239) --- ports/boost-function/vcpkg.json | 5 +++++ scripts/boost/generate-ports.ps1 | 6 ++++-- versions/b-/boost-function.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index dc3dc9feb82e0f..cd249169a49475 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-function", "version": "1.86.0", + "port-version": 1, "description": "Boost function module", "homepage": "https://www.boost.org/libs/function", "license": "BSL-1.0", @@ -33,6 +34,10 @@ { "name": "boost-throw-exception", "version>=": "1.86.0" + }, + { + "name": "boost-type-traits", + "version>=": "1.86.0" } ] } diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 3efa59efcb5417..6f7636a269fca1 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -30,7 +30,8 @@ $defaultPortVersion = 0 $portVersions = @{ 'boost' = 1; 'boost-build' = 1; - 'boost-cobalt' = 1 + 'boost-cobalt' = 1; + 'boost-function' = 1 } function Get-PortVersion { @@ -55,7 +56,7 @@ $portData = @{ }; "cobalt" = @{ "description" = "Build boost-cobalt"; - "dependencies" = @("boost-cobalt"); + "dependencies" = @(@{ "name" = "boost-cobalt"; "platform" = "!osx & !ios & !android & !uwp" }); } } }; @@ -80,6 +81,7 @@ $portData = @{ } }; "boost-filesystem" = @{ "supports" = "!uwp" }; + "boost-function" = @{ "dependencies" = @("boost-type-traits"); }; "boost-graph-parallel" = @{ "dependencies" = @("mpi"); }; "boost-iostreams" = @{ "default-features" = @("bzip2", "lzma", "zlib", "zstd"); diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 0b5826e9c6fc1b..ca0a2f88faf1b4 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1673fa911493ef1eb8a444dcb65b3e66fa338695", + "version": "1.86.0", + "port-version": 1 + }, { "git-tree": "6c633bb26db4be00c4d2aaacbb36493cce90edae", "version": "1.86.0", diff --git a/versions/baseline.json b/versions/baseline.json index ae51f39c2b3b22..e8f647278485d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -930,7 +930,7 @@ }, "boost-function": { "baseline": "1.86.0", - "port-version": 0 + "port-version": 1 }, "boost-function-types": { "baseline": "1.86.0", From e573d2a0ccfb35fa791241d4b3700cb556874913 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:09:01 +0100 Subject: [PATCH 07/44] [range-v3-vs2015] fix build (#43245) --- ports/range-v3-vs2015/portfile.cmake | 1 - ports/range-v3-vs2015/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/range-v3-vs2015.json | 5 +++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/range-v3-vs2015/portfile.cmake b/ports/range-v3-vs2015/portfile.cmake index 2630bf805912c3..d0a807db2738aa 100644 --- a/ports/range-v3-vs2015/portfile.cmake +++ b/ports/range-v3-vs2015/portfile.cmake @@ -10,6 +10,5 @@ vcpkg_from_github( ) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") -file(RENAME ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/range-v3-vs2015/copyright) file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp") vcpkg_copy_pdbs() diff --git a/ports/range-v3-vs2015/vcpkg.json b/ports/range-v3-vs2015/vcpkg.json index 4b9c4ab80f1909..7dca2d69defb54 100644 --- a/ports/range-v3-vs2015/vcpkg.json +++ b/ports/range-v3-vs2015/vcpkg.json @@ -1,7 +1,7 @@ { "name": "range-v3-vs2015", "version": "20151130-vcpkg5", - "port-version": 3, + "port-version": 4, "description": "Range library for C++11/14/17.", "homepage": "https://github.com/Microsoft/Range-V3-VS2015" } diff --git a/versions/baseline.json b/versions/baseline.json index e8f647278485d3..7adb5aa13cd8ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7818,7 +7818,7 @@ }, "range-v3-vs2015": { "baseline": "20151130-vcpkg5", - "port-version": 3 + "port-version": 4 }, "rapidcheck": { "baseline": "2023-12-14", diff --git a/versions/r-/range-v3-vs2015.json b/versions/r-/range-v3-vs2015.json index 7e99d8155e31e8..0c55423881ae33 100644 --- a/versions/r-/range-v3-vs2015.json +++ b/versions/r-/range-v3-vs2015.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "835ff46e7392da24a81e2d4784959154ab930f51", + "version": "20151130-vcpkg5", + "port-version": 4 + }, { "git-tree": "ad11ff1674f1db018ff9b5001fea3c95ef62cc16", "version": "20151130-vcpkg5", From 2991904af41d6d559152b2453040f2c1dfdf6426 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:10:12 +0100 Subject: [PATCH 08/44] [seacas]: fix dependencies (#43238) --- ports/seacas/vcpkg.json | 7 ++----- versions/baseline.json | 2 +- versions/s-/seacas.json | 5 +++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index 29e95ca10f14fd..1ba3637369348d 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "seacas", "version-date": "2022-11-22", - "port-version": 7, + "port-version": 8, "description": "The Sandia Engineering Analysis Code Access System (SEACAS) is a suite of preprocessing, postprocessing, translation, and utility applications supporting finite element analysis software using the Exodus database file format.", "homepage": "https://github.com/sandialabs/seacas", "license": null, @@ -43,10 +43,7 @@ "dependencies": [ { "name": "matio", - "default-features": false, - "features": [ - "hdf5" - ] + "default-features": false } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index 7adb5aa13cd8ae..c641c2597f6047 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8286,7 +8286,7 @@ }, "seacas": { "baseline": "2022-11-22", - "port-version": 7 + "port-version": 8 }, "seal": { "baseline": "4.1.2", diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index 22abaa2b33a163..b1b9f3186d6018 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b34ab268c818a03016c980c6ccd8d6f7b3e5a4c", + "version-date": "2022-11-22", + "port-version": 8 + }, { "git-tree": "405532a89129aa97af0759ecf8e4da3ee4d8a543", "version-date": "2022-11-22", From 6159d3e7bc40b410b9377082f906b00e935509be Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:10:55 +0100 Subject: [PATCH 09/44] [cpuid] Update option ENABLE_DOCS to LIBCPUID_ENABLE_DOCS (#43244) --- ports/cpuid/portfile.cmake | 2 +- ports/cpuid/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cpuid.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake index 9344316e3c80c4..ecc135571b7b93 100644 --- a/ports/cpuid/portfile.cmake +++ b/ports/cpuid/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DENABLE_DOCS=OFF + -DLIBCPUID_ENABLE_DOCS=OFF ) vcpkg_cmake_install() diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json index 08d8f4745b2284..748be11ba07f45 100644 --- a/ports/cpuid/vcpkg.json +++ b/ports/cpuid/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpuid", "version": "0.7.0", + "port-version": 1, "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c641c2597f6047..6bec31defca351 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2030,7 +2030,7 @@ }, "cpuid": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "cpuinfo": { "baseline": "2022-07-19", diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json index 4b3fc0558a9590..b465d365fdc1e7 100644 --- a/versions/c-/cpuid.json +++ b/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12033f70664a516b6f698d62ee473395daba302b", + "version": "0.7.0", + "port-version": 1 + }, { "git-tree": "af4cf6558e28039e5074af69e24747dfe46bd43f", "version": "0.7.0", From 60215b1a4d7998f6ac5f9b04a70024de412bee02 Mon Sep 17 00:00:00 2001 From: Oliver <50930405+Olli1080@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:15:43 +0100 Subject: [PATCH 10/44] [poco] Fix consumption (#43228) --- ports/poco/0003-fix-dependency.patch | 12 ++++++++++++ ports/poco/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/poco.json | 5 +++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ports/poco/0003-fix-dependency.patch b/ports/poco/0003-fix-dependency.patch index b2055ff14092fd..e694aee39b203b 100644 --- a/ports/poco/0003-fix-dependency.patch +++ b/ports/poco/0003-fix-dependency.patch @@ -190,3 +190,15 @@ index 173eacd..90f68fc 100644 foreach(module ${Poco_FIND_COMPONENTS}) find_package(Poco${module} +diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake +index 82c5788..739adef 100644 +--- a/Foundation/cmake/PocoFoundationConfig.cmake ++++ b/Foundation/cmake/PocoFoundationConfig.cmake +@@ -3,6 +3,7 @@ if(@POCO_UNBUNDLED@) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + find_dependency(ZLIB REQUIRED) + find_dependency(PCRE2 REQUIRED) ++ find_dependency(unofficial-utf8proc REQUIRED) + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index a7254d3a4c95be..bf27110a3c7946 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,6 +1,7 @@ { "name": "poco", "version": "1.14.0", + "port-version": 1, "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6bec31defca351..a18249a9145e08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7134,7 +7134,7 @@ }, "poco": { "baseline": "1.14.0", - "port-version": 0 + "port-version": 1 }, "podofo": { "baseline": "0.10.4", diff --git a/versions/p-/poco.json b/versions/p-/poco.json index 1208585e7cf7e9..01ded956cb72c8 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efeff2dbe665e581fb0d034e2d87824d0622419e", + "version": "1.14.0", + "port-version": 1 + }, { "git-tree": "a430ad2f694fb8af957b599850f63786485f98a2", "version": "1.14.0", From 1743897b6e7fab5c7465b02be3c9711b390bfaf9 Mon Sep 17 00:00:00 2001 From: mtmk Date: Tue, 14 Jan 2025 08:24:23 +0000 Subject: [PATCH 11/44] [cnats] Update to 3.9.2 (#43172) --- ports/cnats/fix-sodium-dep.patch | 14 ++--- ports/cnats/fix_install_path.patch | 56 ++++++++++---------- ports/cnats/fix_test_backtrace_warning.patch | 40 ++++++++++++++ ports/cnats/lowercase_ws2_32.patch | 19 ------- ports/cnats/portfile.cmake | 4 +- ports/cnats/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cnats.json | 5 ++ 8 files changed, 85 insertions(+), 57 deletions(-) create mode 100644 ports/cnats/fix_test_backtrace_warning.patch delete mode 100644 ports/cnats/lowercase_ws2_32.patch diff --git a/ports/cnats/fix-sodium-dep.patch b/ports/cnats/fix-sodium-dep.patch index b43822dfd1b17b..be8c74914d3fb0 100644 --- a/ports/cnats/fix-sodium-dep.patch +++ b/ports/cnats/fix-sodium-dep.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 02adc2e..ccd5492 100644 +index 305198f..0b559b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,6 +110,11 @@ if(NATS_BUILD_STREAMING) @@ -15,25 +15,27 @@ index 02adc2e..ccd5492 100644 SET(NATS_SODIUM_DIR "$ENV{NATS_SODIUM_DIR}") ENDIF() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ea536de..6198776 100644 +index 971ddf0..65fee5a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -63,7 +63,7 @@ if(NATS_BUILD_LIB_SHARED) +@@ -65,7 +65,7 @@ if(NATS_BUILD_LIB_SHARED) install(TARGETS nats EXPORT cnats-targets DESTINATION ${NATS_LIBDIR}) install(EXPORT cnats-targets NAMESPACE cnats:: - FILE cnats-config.cmake + FILE cnats-targets.cmake DESTINATION ${NATS_LIBDIR}/cmake/cnats) - endif(NATS_BUILD_LIB_SHARED) - -@@ -75,10 +75,14 @@ if(NATS_BUILD_LIB_STATIC) + install(FILES "${PROJECT_BINARY_DIR}/cnats-config-version.cmake" + DESTINATION ${NATS_LIBDIR}/cmake/cnats) +@@ -79,12 +79,16 @@ if(NATS_BUILD_LIB_STATIC) install(TARGETS nats_static EXPORT cnats-targets ARCHIVE DESTINATION ${NATS_LIBDIR}) install(EXPORT cnats-targets NAMESPACE cnats:: - FILE cnats-config.cmake + FILE cnats-targets.cmake DESTINATION ${NATS_LIBDIR}/cmake/cnats) + install(FILES "${PROJECT_BINARY_DIR}/cnats-config-version.cmake" + DESTINATION ${NATS_LIBDIR}/cmake/cnats) endif(NATS_BUILD_LIB_STATIC) +include(CMakePackageConfigHelpers) diff --git a/ports/cnats/fix_install_path.patch b/ports/cnats/fix_install_path.patch index 15c8ab24b272cd..cb47ec63757a83 100644 --- a/ports/cnats/fix_install_path.patch +++ b/ports/cnats/fix_install_path.patch @@ -1,28 +1,28 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b3f376c..8e6d06a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -60,7 +60,10 @@ if(NATS_BUILD_LIB_SHARED) - target_include_directories(nats PUBLIC - $ - $) -- install(TARGETS nats EXPORT cnats-targets DESTINATION ${NATS_LIBDIR}) -+ install(TARGETS nats EXPORT cnats-targets -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin) - install(EXPORT cnats-targets - NAMESPACE cnats:: - FILE cnats-targets.cmake -@@ -72,7 +75,10 @@ if(NATS_BUILD_LIB_STATIC) - target_include_directories(nats_static PUBLIC - $ - $) -- install(TARGETS nats_static EXPORT cnats-targets ARCHIVE DESTINATION ${NATS_LIBDIR}) -+ install(TARGETS nats_static EXPORT cnats-targets -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin) - install(EXPORT cnats-targets - NAMESPACE cnats:: - FILE cnats-targets.cmake +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 65fee5a..3731b86 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -62,7 +62,10 @@ if(NATS_BUILD_LIB_SHARED) + target_include_directories(nats PUBLIC + $ + $) +- install(TARGETS nats EXPORT cnats-targets DESTINATION ${NATS_LIBDIR}) ++ install(TARGETS nats EXPORT cnats-targets ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) + install(EXPORT cnats-targets + NAMESPACE cnats:: + FILE cnats-targets.cmake +@@ -76,7 +79,10 @@ if(NATS_BUILD_LIB_STATIC) + target_include_directories(nats_static PUBLIC + $ + $) +- install(TARGETS nats_static EXPORT cnats-targets ARCHIVE DESTINATION ${NATS_LIBDIR}) ++ install(TARGETS nats_static EXPORT cnats-targets ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) + install(EXPORT cnats-targets + NAMESPACE cnats:: + FILE cnats-targets.cmake diff --git a/ports/cnats/fix_test_backtrace_warning.patch b/ports/cnats/fix_test_backtrace_warning.patch new file mode 100644 index 00000000000000..9e997783ff2ee3 --- /dev/null +++ b/ports/cnats/fix_test_backtrace_warning.patch @@ -0,0 +1,40 @@ +Subject: [PATCH] [FIXED] Build: failure with Android NDK + +When building against Android NDK testsuit compilation fails due to +missing execinfo.h/backtrace implementation in platforms with id less +than 33. Because this is only in tests just checking for Android should +be enough to keep things simple. +--- + test/test.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/test/test.c b/test/test.c +index 1919af2..9b20774 100644 +--- a/test/test.c ++++ b/test/test.c +@@ -37025,12 +37025,22 @@ void test_StanSubTimeout(void) + + #ifndef _WIN32 + static void _sigsegv_handler(int sig) { ++ ++// Android doesn't support backtrace before API Level 33. ++// Because this is for tests it's good enough to check ++// for Android only, until there is need for a better solution. ++#ifndef ANDROID + void *array[20]; + int size = backtrace(array, 20); ++#endif // ANDROID + + // print out all the frames to stderr + fprintf(stderr, "Error: signal %d:\n", sig); ++ ++#ifndef ANDROID + backtrace_symbols_fd(array, size, STDERR_FILENO); ++#endif // ANDROID ++ + exit(1); + } + #endif // _WIN32 +-- +2.45.2.windows.1 + diff --git a/ports/cnats/lowercase_ws2_32.patch b/ports/cnats/lowercase_ws2_32.patch deleted file mode 100644 index 02c1b0eb962161..00000000000000 --- a/ports/cnats/lowercase_ws2_32.patch +++ /dev/null @@ -1,19 +0,0 @@ -Subject: [PATCH] Change "Ws2_32" to "ws2_32" for MinGW compatibility with no adverse effect for native Windows build. ---- -Index: CMakeLists.txt -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (revision 1cb8d8cacec14bb9760a50f712b5f62d16ddc91e) -+++ b/CMakeLists.txt (revision c1d98cd1d3484e3d41b7236fbd272295e9ef72ce) -@@ -196,7 +196,7 @@ - elseif(WIN32) - set(NATS_LIBDIR "lib") - set(NATS_INCLUDE_DIR "include") -- set(NATS_EXTRA_LIB "Ws2_32") -+ set(NATS_EXTRA_LIB "ws2_32") - set(NATS_OS "_WIN32") - set(NATS_PLATFORM_INCLUDE "win") - if(sodium_USE_STATIC_LIBS) diff --git a/ports/cnats/portfile.cmake b/ports/cnats/portfile.cmake index 9c4727e491e5d5..cb0fe68033aed8 100644 --- a/ports/cnats/portfile.cmake +++ b/ports/cnats/portfile.cmake @@ -2,12 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nats-io/nats.c REF "v${VERSION}" - SHA512 4cc127a461a5074d8a49d8cee633577951152cd54f57b4118ff6e4a8c0da73e2f61e9e54546a34c9e79a4557165a80bedc7e9cf6ed0fde28134019eb59a241b9 + SHA512 4d6ddb23733ca4dd7a4a54ea72d83f5bfce5e5634b3ea91a99610886e5e5ad99a119af8dba87665cb1d6cc1af25bfca41e533d9653e862ce281bd38ed588b94b HEAD_REF main PATCHES fix-sodium-dep.patch fix_install_path.patch - lowercase_ws2_32.patch + fix_test_backtrace_warning.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/cnats/vcpkg.json b/ports/cnats/vcpkg.json index 711d0a1c8ee0d5..81e56a7d384234 100644 --- a/ports/cnats/vcpkg.json +++ b/ports/cnats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cnats", - "version": "3.8.2", + "version": "3.9.2", "description": "A C client for the NATS messaging system", "homepage": "https://github.com/nats-io/nats.c", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a18249a9145e08..152746b152bcb3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1753,7 +1753,7 @@ "port-version": 3 }, "cnats": { - "baseline": "3.8.2", + "baseline": "3.9.2", "port-version": 0 }, "cnl": { diff --git a/versions/c-/cnats.json b/versions/c-/cnats.json index 75a6adbe56bd99..078680242189b0 100644 --- a/versions/c-/cnats.json +++ b/versions/c-/cnats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a2319bfe5bc7b053e9ff322d23c866a6aa80119", + "version": "3.9.2", + "port-version": 0 + }, { "git-tree": "a521d9641d065db79cce09b63daef612a0a34c41", "version": "3.8.2", From 4d752d34f1b1cfd088524665eeaca7034dfb455f Mon Sep 17 00:00:00 2001 From: talregev Date: Tue, 14 Jan 2025 10:53:04 +0200 Subject: [PATCH 12/44] [liboqs] New port (#43225) Signed-off-by: Tal Regev --- ports/liboqs/portfile.cmake | 23 +++++++++++++++++++++++ ports/liboqs/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/liboqs.json | 9 +++++++++ 4 files changed, 55 insertions(+) create mode 100644 ports/liboqs/portfile.cmake create mode 100644 ports/liboqs/vcpkg.json create mode 100644 versions/l-/liboqs.json diff --git a/ports/liboqs/portfile.cmake b/ports/liboqs/portfile.cmake new file mode 100644 index 00000000000000..8cb6db9630dbe4 --- /dev/null +++ b/ports/liboqs/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO open-quantum-safe/liboqs + REF ${VERSION} + SHA512 93260f15c02108157fa595e252685c49c5fb6433d04b989c381da4e27169577f3011d9174b2ec0c110fff15d2d3c640a9833bf28aa53949e8f33c0e674b6e781 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DOQS_BUILD_ONLY_LIB=ON + -DOQS_PERMIT_UNSUPPORTED_ARCHITECTURE=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/liboqs/vcpkg.json b/ports/liboqs/vcpkg.json new file mode 100644 index 00000000000000..487aeb17fe2fec --- /dev/null +++ b/ports/liboqs/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "liboqs", + "version": "0.12.0", + "description": "open source C library for quantum-safe cryptographic algorithms.", + "homepage": "https://openquantumsafe.org/", + "license": "MIT", + "supports": "!uwp & !(windows & static)", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 152746b152bcb3..9b43a62a85f9dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4940,6 +4940,10 @@ "baseline": "0.2.1", "port-version": 3 }, + "liboqs": { + "baseline": "0.12.0", + "port-version": 0 + }, "liborigin": { "baseline": "3.0.3", "port-version": 0 diff --git a/versions/l-/liboqs.json b/versions/l-/liboqs.json new file mode 100644 index 00000000000000..080c691d0256dc --- /dev/null +++ b/versions/l-/liboqs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4b6d23279893db529e42f9ca6cb62020b707d790", + "version": "0.12.0", + "port-version": 0 + } + ] +} From 7f42ebd479abbf357887a77df2988bd3c995097d Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 14 Jan 2025 12:53:50 +0400 Subject: [PATCH 13/44] [level-zero] version 1.20.1 (#43224) --- ports/level-zero/portfile.cmake | 2 +- ports/level-zero/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/level-zero.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/level-zero/portfile.cmake b/ports/level-zero/portfile.cmake index b33e7efed384f3..19dd4c07da61f6 100644 --- a/ports/level-zero/portfile.cmake +++ b/ports/level-zero/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/level-zero REF "v${VERSION}" - SHA512 7fa4eed3b23bdbc4b1a2b4cb48e57c29c3fdf8920eda7ce2daad0bd04a72f31cdbe6722114926c1180cb07939424e6db8ce2605851ca365bfda1df3958ef1aa6 + SHA512 09743eb45f37ffb824dfe837064e5d5a94563f1c45febe54578ca5e220a83a1c07bb06b83c0ea65e688d3dcac44eebb7dd9d3920c23993c6f789329d7fb90c08 HEAD_REF master ) diff --git a/ports/level-zero/vcpkg.json b/ports/level-zero/vcpkg.json index 3110dfd2216491..117cb960ddecfc 100644 --- a/ports/level-zero/vcpkg.json +++ b/ports/level-zero/vcpkg.json @@ -1,6 +1,6 @@ { "name": "level-zero", - "version": "1.20.0", + "version": "1.20.1", "description": "oneAPI Level Zero Specification Headers and Loader.", "homepage": "https://github.com/oneapi-src/level-zero", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 9b43a62a85f9dd..7b0b13e3b424f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4261,7 +4261,7 @@ "port-version": 0 }, "level-zero": { - "baseline": "1.20.0", + "baseline": "1.20.1", "port-version": 0 }, "leveldb": { diff --git a/versions/l-/level-zero.json b/versions/l-/level-zero.json index 4426ac564d3661..3acf06223f7b15 100644 --- a/versions/l-/level-zero.json +++ b/versions/l-/level-zero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71aadae181367f09bb1e9c32d93a739eec4a6b88", + "version": "1.20.1", + "port-version": 0 + }, { "git-tree": "b3504b7af61885023255d5004bfdf152aa8eda1f", "version": "1.20.0", From adc4d3d67e8a20a5afdea632987c99463eb406bf Mon Sep 17 00:00:00 2001 From: Christian Panov Date: Tue, 14 Jan 2025 11:03:14 +0200 Subject: [PATCH 14/44] [lwlog] Added new library (#43047) Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Co-authored-by: Cheney-Wang <850426846@qq.com> --- ports/lwlog/portfile.cmake | 19 +++++++++++++++++++ ports/lwlog/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/lwlog.json | 9 +++++++++ 4 files changed, 49 insertions(+) create mode 100644 ports/lwlog/portfile.cmake create mode 100644 ports/lwlog/vcpkg.json create mode 100644 versions/l-/lwlog.json diff --git a/ports/lwlog/portfile.cmake b/ports/lwlog/portfile.cmake new file mode 100644 index 00000000000000..7604e1346331c8 --- /dev/null +++ b/ports/lwlog/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ChristianPanov/lwlog + REF "v${VERSION}" + SHA512 d331b1fb64180370c0c5cdd3b292cc27430fa4bf83d47ad69ad5aba9ee1605657b457d899bc71a779f4ef397f9f4e8c1b91c296deae1fa616de853d52deef8ed + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME lwlog_lib CONFIG_PATH lib/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/lwlog/vcpkg.json b/ports/lwlog/vcpkg.json new file mode 100644 index 00000000000000..bef2c135235933 --- /dev/null +++ b/ports/lwlog/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lwlog", + "version": "1.3.0", + "description": "Very fast synchronous and asynchronous C++17 logging library", + "homepage": "https://github.com/ChristianPanov/lwlog", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7b0b13e3b424f8..d46a60b7c98e2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5716,6 +5716,10 @@ "baseline": "1.18.10", "port-version": 1 }, + "lwlog": { + "baseline": "1.3.0", + "port-version": 0 + }, "lz4": { "baseline": "1.10.0", "port-version": 0 diff --git a/versions/l-/lwlog.json b/versions/l-/lwlog.json new file mode 100644 index 00000000000000..88b989395b9bc4 --- /dev/null +++ b/versions/l-/lwlog.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "397eb522ff5cab01e993bde4d0f3b3d3aa86feaf", + "version": "1.3.0", + "port-version": 0 + } + ] +} From a1e66734f8a6806cc69bd9754fb30eceefdb3c65 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Tue, 14 Jan 2025 01:05:52 -0800 Subject: [PATCH 15/44] [openal-soft] Update to 1.24.2 (#43219) --- ports/openal-soft/portfile.cmake | 2 +- ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 01a1847162b368..566dae26b7532f 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kcat/openal-soft REF ${VERSION} - SHA512 a60e1969bb5678219d8a7ae036d7081d61faa176689ac444802a45f4081aff07a6315575c02784bfce2ec6149c160270082ae076be668f32d79a6fac06513be0 + SHA512 e0b1cb08fe65e71ffd49a1dd90a1b1d2119a1dd8e5d1e10850d6c5bf04eea3335cc3051636a0479617ee5af95536a09fcad2a80d8009a10bc1fbe35a42cfe611 HEAD_REF master ) diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 91ffbc02e610e7..774f972a23d839 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openal-soft", - "version": "1.24.1", + "version": "1.24.2", "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "license": "LGPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index d46a60b7c98e2e..a757b873cf0ad0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6649,7 +6649,7 @@ "port-version": 0 }, "openal-soft": { - "baseline": "1.24.1", + "baseline": "1.24.2", "port-version": 0 }, "openblas": { diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 1bb7b4453c2dba..65c824b1a9caf3 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "368c76c235972804893059e75da4584486a8a0d0", + "version": "1.24.2", + "port-version": 0 + }, { "git-tree": "a204aed6d6c40cb7978806f705a7bde193b275e6", "version": "1.24.1", From 14f6f66ed145b9612121a3af3379dbac198adb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Sch=C3=A4fer?= Date: Tue, 14 Jan 2025 10:06:36 +0100 Subject: [PATCH 16/44] [sdl3] Update to 3.1.8-preview (#43207) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sebastian Schäfer <6412444+Agorath@users.noreply.github.com> --- ports/sdl3/portfile.cmake | 12 +++--------- ports/sdl3/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sdl3.json | 5 +++++ 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ports/sdl3/portfile.cmake b/ports/sdl3/portfile.cmake index 010771b0fd6d38..07ed32e2c760de 100644 --- a/ports/sdl3/portfile.cmake +++ b/ports/sdl3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL - REF "preview-3.1.6" - SHA512 a0ca7263cd2f1b883829c39ae0ee2ea18d814f8dde768c8be9a49487193bc856bb45870764fd70169e75d2ec80457e5b45811c07a926479f1ac4f9d3157f40a4 + REF "preview-3.1.8" + SHA512 5a40cf838fce3a0ddd895269c5ad51fc4ca63bf9919f23c45b04218ae55096708b8f24027056256e69f9b4ae730b967c8ba3b77a24f7771a0770cf45fddaeb34 HEAD_REF main ) @@ -48,13 +48,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() - -# Subject to https://github.com/libsdl-org/SDL/pull/11492 -set(config_path "share/${PORT}/SDL3") -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(config_path "share/${PORT}") -endif() -vcpkg_cmake_config_fixup(CONFIG_PATH "${config_path}") +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/sdl3/vcpkg.json b/ports/sdl3/vcpkg.json index a0fec63d84041c..c50f8e24fa17bc 100644 --- a/ports/sdl3/vcpkg.json +++ b/ports/sdl3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl3", - "version": "3.1.6-preview", - "port-version": 2, + "version": "3.1.8-preview", "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", "license": "Zlib AND MIT AND Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a757b873cf0ad0..da28a73152f662 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8289,8 +8289,8 @@ "port-version": 11 }, "sdl3": { - "baseline": "3.1.6-preview", - "port-version": 2 + "baseline": "3.1.8-preview", + "port-version": 0 }, "seacas": { "baseline": "2022-11-22", diff --git a/versions/s-/sdl3.json b/versions/s-/sdl3.json index c0b7608fb4e30a..5a2c182aae27ac 100644 --- a/versions/s-/sdl3.json +++ b/versions/s-/sdl3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31c0ca3780c2a32d05a4820441e62c7cfcc780d6", + "version": "3.1.8-preview", + "port-version": 0 + }, { "git-tree": "696763312883c589e3a9b07f42b7293de4dcf2b1", "version": "3.1.6-preview", From cb305ea52925259bea0792a22eab9c90a3a0df58 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Tue, 14 Jan 2025 17:08:00 +0800 Subject: [PATCH 17/44] [mimicpp] update to v6 (#43222) --- ports/mimicpp/portfile.cmake | 2 +- ports/mimicpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mimicpp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/mimicpp/portfile.cmake b/ports/mimicpp/portfile.cmake index cf17aa9e368609..a4e2ab8499d35f 100644 --- a/ports/mimicpp/portfile.cmake +++ b/ports/mimicpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DNKpp/mimicpp REF "v${VERSION}" - SHA512 e713c9d6accc2d1b4cf5b87f46537ec6fe0827b4b3ab9c3bcf437616b51859b229a8abc1fe1dbe41a76992289c4c5160a888a5e5a193cb43f8c6297a5700b529 + SHA512 facdf604ce481d291b7f265c7c5dbbb348a8623cf8ee1bb873b70988c8e7d3b0b170fd81f1bc297c28ba6ee09510b50a0f790c5473d6a9c1ad9633304f8c0124 HEAD_REF main ) diff --git a/ports/mimicpp/vcpkg.json b/ports/mimicpp/vcpkg.json index 42213ee950a2dd..2a0a8f95fbe742 100644 --- a/ports/mimicpp/vcpkg.json +++ b/ports/mimicpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mimicpp", - "version": "5", + "version": "6", "description": "mimic++, a modern and (mostly) macro free mocking framework.", "homepage": "https://github.com/DNKpp/mimicpp", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index da28a73152f662..279c7360f8ae52 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5973,7 +5973,7 @@ "port-version": 1 }, "mimicpp": { - "baseline": "5", + "baseline": "6", "port-version": 0 }, "minc": { diff --git a/versions/m-/mimicpp.json b/versions/m-/mimicpp.json index e1c46b6cf3a3ef..5b34343a2c85a7 100644 --- a/versions/m-/mimicpp.json +++ b/versions/m-/mimicpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fac71166d9f5b94c97fda39a97ebe3ecbd9c87fc", + "version": "6", + "port-version": 0 + }, { "git-tree": "d95758234f92448a39a0a2e666e7601f95ae7e91", "version": "5", From 186d3a85ba0251f2690ede1c5512a40c082b0896 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 14 Jan 2025 16:08:51 +0700 Subject: [PATCH 18/44] [harfbuzz] Update to 10.2.0 (#43221) --- ports/harfbuzz/fix-win32-build.patch | 2 +- ports/harfbuzz/portfile.cmake | 2 +- ports/harfbuzz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/harfbuzz/fix-win32-build.patch b/ports/harfbuzz/fix-win32-build.patch index f8551e3aff1c4a..84c6e766702a40 100644 --- a/ports/harfbuzz/fix-win32-build.patch +++ b/ports/harfbuzz/fix-win32-build.patch @@ -13,7 +13,7 @@ index 87e8962..bdfa797 100644 + hb_subset_headers = files( 'hb-subset.h', - 'hb-subset-repacker.h' + 'hb-subset-serialize.h' @@ -559,8 +564,7 @@ defs_list = [harfbuzz_def] version = '0.@0@.0'.format(hb_version_int) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 12ad92b937ebf6..9aea693fe8f4da 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 47817eaecaf987f8aa67dc9eb7f87c0cfc00705b192245063322a1c360501e47be20f745907302b8c497ab7d15f423fbf6d7766e437cf9871cf5c617b1590407 + SHA512 697205a571bb3d52d83598e8511e2e21e7cd15630aac32d8deb4354e462efda6a5ce46510cf4a1c18365dffe935cf2e4f1fda65d1779f17c9bb60c503315bf5c HEAD_REF master PATCHES fix-win32-build.patch diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 92b1bd95f399e7..dae3ed42f0e546 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version": "10.1.0", + "version": "10.2.0", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index 279c7360f8ae52..596b0b84a395f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3437,7 +3437,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "10.1.0", + "baseline": "10.2.0", "port-version": 0 }, "hash-library": { diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index f50d560482c97c..0b5f040d4f323f 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d1a67e6f25f5a73ebcb436e7b78710a29d40072", + "version": "10.2.0", + "port-version": 0 + }, { "git-tree": "0bf3419dd2362d61aa7b93eceba27acf0a7b826c", "version": "10.1.0", From de5f311234c09f2bd2cccde267e5551e1d8e0bcb Mon Sep 17 00:00:00 2001 From: Pavel Kisliak Date: Tue, 14 Jan 2025 12:12:26 +0300 Subject: [PATCH 19/44] [BitSerializer] Delist deprecated aliases (#43206) --- .../bitserializer-cpprestjson/portfile.cmake | 1 - ports/bitserializer-cpprestjson/vcpkg.json | 14 --------- ports/bitserializer-pugixml/portfile.cmake | 1 - ports/bitserializer-pugixml/vcpkg.json | 14 --------- ports/bitserializer-rapidjson/portfile.cmake | 1 - ports/bitserializer-rapidjson/vcpkg.json | 14 --------- ports/bitserializer-rapidyaml/portfile.cmake | 1 - ports/bitserializer-rapidyaml/vcpkg.json | 14 --------- versions/b-/bitserializer-cpprestjson.json | 24 --------------- versions/b-/bitserializer-pugixml.json | 19 ------------ versions/b-/bitserializer-rapidjson.json | 24 --------------- versions/b-/bitserializer-rapidyaml.json | 29 ------------------- versions/baseline.json | 16 ---------- 13 files changed, 172 deletions(-) delete mode 100644 ports/bitserializer-cpprestjson/portfile.cmake delete mode 100644 ports/bitserializer-cpprestjson/vcpkg.json delete mode 100644 ports/bitserializer-pugixml/portfile.cmake delete mode 100644 ports/bitserializer-pugixml/vcpkg.json delete mode 100644 ports/bitserializer-rapidjson/portfile.cmake delete mode 100644 ports/bitserializer-rapidjson/vcpkg.json delete mode 100644 ports/bitserializer-rapidyaml/portfile.cmake delete mode 100644 ports/bitserializer-rapidyaml/vcpkg.json delete mode 100644 versions/b-/bitserializer-cpprestjson.json delete mode 100644 versions/b-/bitserializer-pugixml.json delete mode 100644 versions/b-/bitserializer-rapidjson.json delete mode 100644 versions/b-/bitserializer-rapidyaml.json diff --git a/ports/bitserializer-cpprestjson/portfile.cmake b/ports/bitserializer-cpprestjson/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/ports/bitserializer-cpprestjson/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/bitserializer-cpprestjson/vcpkg.json b/ports/bitserializer-cpprestjson/vcpkg.json deleted file mode 100644 index e12e04f042e611..00000000000000 --- a/ports/bitserializer-cpprestjson/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "bitserializer-cpprestjson", - "version-string": "alias", - "port-version": 1, - "description": "Deprecated alias for bitserializer-cpprestjson", - "dependencies": [ - { - "name": "bitserializer", - "features": [ - "cpprestjson-archive" - ] - } - ] -} diff --git a/ports/bitserializer-pugixml/portfile.cmake b/ports/bitserializer-pugixml/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/ports/bitserializer-pugixml/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/bitserializer-pugixml/vcpkg.json b/ports/bitserializer-pugixml/vcpkg.json deleted file mode 100644 index 8e705da12b69f1..00000000000000 --- a/ports/bitserializer-pugixml/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "bitserializer-pugixml", - "version-string": "alias", - "port-version": 1, - "description": "Deprecated alias for bitserializer-pugixml", - "dependencies": [ - { - "name": "bitserializer", - "features": [ - "pugixml-archive" - ] - } - ] -} diff --git a/ports/bitserializer-rapidjson/portfile.cmake b/ports/bitserializer-rapidjson/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/ports/bitserializer-rapidjson/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/bitserializer-rapidjson/vcpkg.json b/ports/bitserializer-rapidjson/vcpkg.json deleted file mode 100644 index 2da6054e393980..00000000000000 --- a/ports/bitserializer-rapidjson/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "bitserializer-rapidjson", - "version-string": "alias", - "port-version": 1, - "description": "Deprecated alias for bitserializer-rapidjson", - "dependencies": [ - { - "name": "bitserializer", - "features": [ - "rapidjson-archive" - ] - } - ] -} diff --git a/ports/bitserializer-rapidyaml/portfile.cmake b/ports/bitserializer-rapidyaml/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/ports/bitserializer-rapidyaml/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/bitserializer-rapidyaml/vcpkg.json b/ports/bitserializer-rapidyaml/vcpkg.json deleted file mode 100644 index 9d548ea4206eb9..00000000000000 --- a/ports/bitserializer-rapidyaml/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "bitserializer-rapidyaml", - "version-string": "alias", - "port-version": 3, - "description": "Deprecated alias for bitserializer-rapidyaml", - "dependencies": [ - { - "name": "bitserializer", - "features": [ - "rapidyaml-archive" - ] - } - ] -} diff --git a/versions/b-/bitserializer-cpprestjson.json b/versions/b-/bitserializer-cpprestjson.json deleted file mode 100644 index 20e6cf747d0273..00000000000000 --- a/versions/b-/bitserializer-cpprestjson.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "versions": [ - { - "git-tree": "cb2e0fef9d95a7f2bcd99cb537caf0570ee50866", - "version-string": "alias", - "port-version": 1 - }, - { - "git-tree": "af219f0644caccabb3d8fc0908c70c6f216c6c7e", - "version-string": "alias", - "port-version": 0 - }, - { - "git-tree": "13b3133dcffccb176ecba66be6a09df4917ab6d1", - "version-string": "0.9", - "port-version": 0 - }, - { - "git-tree": "27d06b8e4fbcd8f39f90426559acebaf106925b5", - "version-string": "0.8", - "port-version": 0 - } - ] -} diff --git a/versions/b-/bitserializer-pugixml.json b/versions/b-/bitserializer-pugixml.json deleted file mode 100644 index 1b1a08aeb5d4be..00000000000000 --- a/versions/b-/bitserializer-pugixml.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "versions": [ - { - "git-tree": "a8379fe5b2d97c381221f455978920f44ab932ee", - "version-string": "alias", - "port-version": 1 - }, - { - "git-tree": "35575e8e78a65d2ebecd065cdae32ad51b03cee3", - "version-string": "alias", - "port-version": 0 - }, - { - "git-tree": "046159738ddc292978f666bd4836f5c4beed1fbf", - "version-string": "0.9", - "port-version": 0 - } - ] -} diff --git a/versions/b-/bitserializer-rapidjson.json b/versions/b-/bitserializer-rapidjson.json deleted file mode 100644 index f55c9cda889ae3..00000000000000 --- a/versions/b-/bitserializer-rapidjson.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "versions": [ - { - "git-tree": "990030f46f43de41fdb5ccd57d29de178edcb8c5", - "version-string": "alias", - "port-version": 1 - }, - { - "git-tree": "6039c5207e9aef672cb2d9250761419d2e937e8d", - "version-string": "alias", - "port-version": 0 - }, - { - "git-tree": "c4e4b7defc05f1a2061a6882c2773f0670af7f82", - "version-string": "0.9", - "port-version": 0 - }, - { - "git-tree": "6366f9629d1a06de7b12a72b3bbaf9a4e60f1b4a", - "version-string": "0.8", - "port-version": 0 - } - ] -} diff --git a/versions/b-/bitserializer-rapidyaml.json b/versions/b-/bitserializer-rapidyaml.json deleted file mode 100644 index 945d41310efc61..00000000000000 --- a/versions/b-/bitserializer-rapidyaml.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "versions": [ - { - "git-tree": "a3dbe01a4244088fa34e2dae25ebcfbe67a35fad", - "version-string": "alias", - "port-version": 3 - }, - { - "git-tree": "08097fe26fb2b85b77ee6df81ba666201b1dd991", - "version-string": "alias", - "port-version": 2 - }, - { - "git-tree": "7680ebf3a5a68b67ce532cb52faae1c37535c69a", - "version-string": "alias", - "port-version": 1 - }, - { - "git-tree": "146cc1679c8fa5e740a3ef71cfbf2b3bf67e7647", - "version-string": "alias", - "port-version": 0 - }, - { - "git-tree": "6628759322670c36cee1164b50561e5b61d7c581", - "version-string": "0.9", - "port-version": 0 - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index 596b0b84a395f5..76bf65f014b397 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -668,22 +668,6 @@ "baseline": "0.75", "port-version": 0 }, - "bitserializer-cpprestjson": { - "baseline": "alias", - "port-version": 1 - }, - "bitserializer-pugixml": { - "baseline": "alias", - "port-version": 1 - }, - "bitserializer-rapidjson": { - "baseline": "alias", - "port-version": 1 - }, - "bitserializer-rapidyaml": { - "baseline": "alias", - "port-version": 3 - }, "bitsery": { "baseline": "5.2.4", "port-version": 0 From af034933ad18eca891fa0fd8ef3b692ac769d708 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 14 Jan 2025 13:12:59 +0400 Subject: [PATCH 20/44] [pugixml] update to v.1.15 (#43217) --- ports/pugixml/portfile.cmake | 2 +- ports/pugixml/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pugixml.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 5f32c2cf3599d1..f4e434801165b2 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml REF "v${VERSION}" - SHA512 730d203829eb24d6e1c873f9b921ae97cf7a157fd45504151bc2e61adea5c536eaf33ff38c5ad61629b54a6686135ff1834a61102b4660fbb9ead4ecf20dfd34 + SHA512 b8a70f1f230b0902b719346ce0a551eafe534f81262280dceeb92d5ad90ea4e635173e08e225bf66eb5f4724ac4568bd40dc923f184571f02502dac49bc0b7f5 HEAD_REF master ) diff --git a/ports/pugixml/vcpkg.json b/ports/pugixml/vcpkg.json index 4f81e3a62f5813..4f88a052fc6a05 100644 --- a/ports/pugixml/vcpkg.json +++ b/ports/pugixml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pugixml", - "version": "1.14", + "version": "1.15", "description": "Light-weight, simple and fast XML parser for C++ with XPath support", "homepage": "https://github.com/zeux/pugixml", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 76bf65f014b397..71bd61bbb07c61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7297,7 +7297,7 @@ "port-version": 0 }, "pugixml": { - "baseline": "1.14", + "baseline": "1.15", "port-version": 0 }, "pulsar-client-cpp": { diff --git a/versions/p-/pugixml.json b/versions/p-/pugixml.json index dccc7cd1c1bfb9..cd111f19086667 100644 --- a/versions/p-/pugixml.json +++ b/versions/p-/pugixml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3181de4dee35567b45611a938eb0f44f5ee016d", + "version": "1.15", + "port-version": 0 + }, { "git-tree": "6e38344aea6e7529afde3895e0885ed5cb0c0542", "version": "1.14", From cd783062c46e4e09d2e49a8cdfe831f720387d7a Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 14 Jan 2025 17:14:26 +0800 Subject: [PATCH 21/44] [sbp] Update to 6.2.1 (#43196) Co-authored-by: Monica --- ports/sbp/portfile.cmake | 14 +++++++------- ports/sbp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sbp.json | 5 +++++ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ports/sbp/portfile.cmake b/ports/sbp/portfile.cmake index d345735fc2e8f0..68f10b3546f4bf 100644 --- a/ports/sbp/portfile.cmake +++ b/ports/sbp/portfile.cmake @@ -7,24 +7,24 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO swift-nav/libsbp - REF v3.4.10 - SHA512 bbdcefad9ff8995759b577790bcffb94355bd0ee29f259fa8d51f54907e252b55871dc5a841e21d23e661fd5b33109761eb20b66c2fb73e9e7de8a34cc8d6528 + REF "v${VERSION}" + SHA512 9894f212631bc884ff1a586332bd7a11741a4331a90da4909badd382deb08d415ddf2d38b3cee35a6a0bb66f3308f0db072bbc6b9165da704b51637b4825fd58 HEAD_REF master - PATCHES - "win32-install-fix.patch" ) vcpkg_from_github( OUT_SOURCE_PATH CMAKE_EXTRA_MODS REPO swift-nav/cmake - REF 373d4fcafbbc0c208dc9ecb278d36ed8c9448eda - SHA512 afefc8c7a3fb43ee65b9b8733968a5836938460abbf1bc9e8330f83c3ac4a5819f71a36dcb034004296161c592f4d61545ba10016d6666e7eaf1dca556d99e2e + REF 65c9a396568701c382ca5a5515e6bb598f7d61b2 + SHA512 e8b1b1e48c7f6d71b156668ba6e0c0898d6a9b6c9e86bc63cb2b5a4cffa844a0a9a175699db8417bcb70bc4c6b278d32327f5c709e7db7b69ab2a81e7c398b23 HEAD_REF master ) # Copy cmake files to expected location file(INSTALL "${CMAKE_EXTRA_MODS}/CCache.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") file(INSTALL "${CMAKE_EXTRA_MODS}/SwiftCmakeOptions.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/SwiftTargets.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/ListTargets.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") file(INSTALL "${CMAKE_EXTRA_MODS}/CompileOptions.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") file(INSTALL "${CMAKE_EXTRA_MODS}/LanguageStandards.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") file(INSTALL "${CMAKE_EXTRA_MODS}/ClangFormat.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") @@ -40,6 +40,6 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/sbp/vcpkg.json b/ports/sbp/vcpkg.json index ca94345d428677..538e11b4a37dea 100644 --- a/ports/sbp/vcpkg.json +++ b/ports/sbp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sbp", - "version-semver": "3.4.10", - "port-version": 1, + "version-semver": "6.2.1", "description": "Swift Navigation Binary Protocol (SBP) is a binary protocol for communicating GNSS data used by Piksi devices.", "homepage": "https://github.com/swift-nav/libsbp", "documentation": "https://support.swiftnav.com/support/solutions/articles/44001850782-swift-binary-protocol", diff --git a/versions/baseline.json b/versions/baseline.json index 71bd61bbb07c61..0f21ad0751c899 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8161,8 +8161,8 @@ "port-version": 1 }, "sbp": { - "baseline": "3.4.10", - "port-version": 1 + "baseline": "6.2.1", + "port-version": 0 }, "scenepic": { "baseline": "1.1.1", diff --git a/versions/s-/sbp.json b/versions/s-/sbp.json index 1a8b87acacef39..55982e18f6621a 100644 --- a/versions/s-/sbp.json +++ b/versions/s-/sbp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f1b2248608d862914a49566c9f5ebb8681c5695", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "ef46c718c23128379c5050d907d0a90d335206b3", "version-semver": "3.4.10", From ad5e1134853bbec3978a34b827837c92f035c6b3 Mon Sep 17 00:00:00 2001 From: c8ef Date: Tue, 14 Jan 2025 17:18:30 +0800 Subject: [PATCH 22/44] [libpng] update to 1.6.45 (#43200) --- ports/libpng/cmake.patch | 81 ++++++++++++++++++++- ports/libpng/fix-msa-support-for-mips.patch | 28 ------- ports/libpng/fix-tools-static.patch | 16 ---- ports/libpng/libm.patch | 17 ----- ports/libpng/pkgconfig.patch | 32 -------- ports/libpng/portfile.cmake | 10 +-- ports/libpng/vcpkg.json | 4 +- versions/baseline.json | 2 +- versions/l-/libpng.json | 5 ++ 9 files changed, 90 insertions(+), 105 deletions(-) delete mode 100644 ports/libpng/fix-msa-support-for-mips.patch delete mode 100644 ports/libpng/fix-tools-static.patch delete mode 100644 ports/libpng/libm.patch delete mode 100644 ports/libpng/pkgconfig.patch diff --git a/ports/libpng/cmake.patch b/ports/libpng/cmake.patch index 66a3731160e069..ae48b74d3219af 100644 --- a/ports/libpng/cmake.patch +++ b/ports/libpng/cmake.patch @@ -1,8 +1,45 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e355e4d..6dfe543 100644 +index f10f489..28ce98a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -632,7 +632,7 @@ else() +@@ -119,6 +119,12 @@ find_package(ZLIB REQUIRED) + if(UNIX + AND NOT (APPLE OR BEOS OR HAIKU) + AND NOT EMSCRIPTEN) ++ block(SCOPE_FOR VARIABLES) ++ if(VCPKG_CRT_LINKAGE STREQUAL "static") ++ list(PREPEND CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_STATIC_LIBRARY_SUFFIX}") ++ endif() ++ find_library(M_LIBRARY m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) ++ endblock() + find_library(M_LIBRARY m) + if(M_LIBRARY) + set(M_LIBRARY m) +@@ -208,8 +214,8 @@ if(PNG_HARDWARE_OPTIMIZATIONS) + + # Set definitions and sources for MIPS. + if(PNG_TARGET_ARCHITECTURE MATCHES "^(mipsel|mips64el)") +- set(PNG_MIPS_MSA_POSSIBLE_VALUES on off) +- set(PNG_MIPS_MSA "on" ++ set(PNG_MIPS_MSA_POSSIBLE_VALUES on off check) ++ set(PNG_MIPS_MSA "check" + CACHE STRING "Enable MIPS_MSA optimizations: on|off; on is default") + set_property(CACHE PNG_MIPS_MSA + PROPERTY STRINGS ${PNG_MIPS_MSA_POSSIBLE_VALUES}) +@@ -241,6 +247,12 @@ if(PNG_HARDWARE_OPTIMIZATIONS) + mips/filter_msa_intrinsics.c) + add_definitions(-DPNG_MIPS_MSA_OPT=2) + add_definitions(-DPNG_MIPS_MMI_OPT=0) ++ elseif(PNG_MIPS_MSA STREQUAL "check") ++ set(libpng_mips_sources ++ mips/mips_init.c ++ mips/filter_msa_intrinsics.c) ++ add_definitions(-DPNG_MIPS_MSA_CHECK_SUPPORTED) ++ add_definitions(-DPNG_MIPS_MMI_CHECK_SUPPORTED) + elseif(PNG_MIPS_MMI STREQUAL "on") + set(libpng_mips_sources + mips/mips_init.c +@@ -594,7 +606,7 @@ else() # We also need to use a custom suffix, in order to distinguish between the # shared import library name and the static library name. set(PNG_SHARED_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}") @@ -11,3 +48,43 @@ index e355e4d..6dfe543 100644 endif() if(PNG_SHARED) +@@ -858,9 +870,9 @@ if(PNG_TESTS AND PNG_SHARED) + FILES ${PNGSUITE_PNGS}) + endif() + +-if(PNG_SHARED AND PNG_TOOLS) ++if(PNG_TOOLS) + add_executable(pngfix ${pngfix_sources}) +- target_link_libraries(pngfix PRIVATE png_shared) ++ target_link_libraries(pngfix PRIVATE $ $) # in vcpkg there's only one + set(PNG_BIN_TARGETS pngfix) + + add_executable(png-fix-itxt ${png_fix_itxt_sources}) +@@ -944,12 +956,15 @@ endif() + # We use the same files like ./configure, so we have to set its vars. + # Only do this on Windows for Cygwin - the files don't make much sense + # outside of a UNIX look-alike. +-if(NOT WIN32 OR CYGWIN OR MINGW) ++if(1) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix ${CMAKE_INSTALL_PREFIX}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) +- set(LIBS "-lz -lm") ++ set(LIBS "") ++ if(M_LIBRARY) ++ string(APPEND LIBS "-lm") ++ endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc + @ONLY) +@@ -1008,6 +1023,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL) + endif() + + if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++elseif(0) + # Install the man pages. + install(FILES libpng.3 libpngpf.3 + DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) diff --git a/ports/libpng/fix-msa-support-for-mips.patch b/ports/libpng/fix-msa-support-for-mips.patch deleted file mode 100644 index 7b6e6d18b66f64..00000000000000 --- a/ports/libpng/fix-msa-support-for-mips.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3857b82..4c68989 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -221,8 +221,8 @@ endif() - - # Set definitions and sources for MIPS. - if(PNG_TARGET_ARCHITECTURE MATCHES "^(mipsel|mips64el)") -- set(PNG_MIPS_MSA_POSSIBLE_VALUES on off) -- set(PNG_MIPS_MSA "on" -+ set(PNG_MIPS_MSA_POSSIBLE_VALUES on off check) -+ set(PNG_MIPS_MSA "check" - CACHE STRING "Enable MIPS_MSA optimizations: on|off; on is default") - set_property(CACHE PNG_MIPS_MSA - PROPERTY STRINGS ${PNG_MIPS_MSA_POSSIBLE_VALUES}) -@@ -254,6 +254,12 @@ if(TARGET_ARCH MATCHES "^(mipsel|mips64el)") - mips/filter_msa_intrinsics.c) - add_definitions(-DPNG_MIPS_MSA_OPT=2) - add_definitions(-DPNG_MIPS_MMI_OPT=0) -+ elseif(PNG_MIPS_MSA STREQUAL "check") -+ set(libpng_mips_sources -+ mips/mips_init.c -+ mips/filter_msa_intrinsics.c) -+ add_definitions(-DPNG_MIPS_MSA_CHECK_SUPPORTED) -+ add_definitions(-DPNG_MIPS_MMI_CHECK_SUPPORTED) - elseif(PNG_MIPS_MMI STREQUAL "on") - set(libpng_mips_sources - mips/mips_init.c diff --git a/ports/libpng/fix-tools-static.patch b/ports/libpng/fix-tools-static.patch deleted file mode 100644 index 74ff71dd7b8db5..00000000000000 --- a/ports/libpng/fix-tools-static.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3857b82..4c68989 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -963,9 +963,9 @@ - FILES ${PNGSUITE_PNGS}) - endif() - --if(PNG_SHARED AND PNG_TOOLS) -+if(PNG_TOOLS) - add_executable(pngfix ${pngfix_sources}) -- target_link_libraries(pngfix PRIVATE png_shared) -+ target_link_libraries(pngfix PRIVATE $ $) # in vcpkg there's only one - set(PNG_BIN_TARGETS pngfix) - - add_executable(png-fix-itxt ${png_fix_itxt_sources}) diff --git a/ports/libpng/libm.patch b/ports/libpng/libm.patch deleted file mode 100644 index 6960021905bc33..00000000000000 --- a/ports/libpng/libm.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dbd31d7..7deb6c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -109,6 +109,12 @@ elseif(POLICY CMP0074) - endif() - - if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU AND NOT EMSCRIPTEN) -+ block(SCOPE_FOR VARIABLES) -+ if(VCPKG_CRT_LINKAGE STREQUAL "static") -+ list(PREPEND CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_STATIC_LIBRARY_SUFFIX}") -+ endif() -+ find_library(M_LIBRARY m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -+ endblock() - find_library(M_LIBRARY m) - if(M_LIBRARY) - set(M_LIBRARY m) diff --git a/ports/libpng/pkgconfig.patch b/ports/libpng/pkgconfig.patch deleted file mode 100644 index ed92a94f1d4aee..00000000000000 --- a/ports/libpng/pkgconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e355e4d..b5b9172 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -960,12 +960,15 @@ endif() - # We use the same files like ./configure, so we have to set its vars. - # Only do this on Windows for Cygwin - the files don't make much sense - # outside of a UNIX look-alike. --if(NOT WIN32 OR CYGWIN OR MINGW) -+if(1) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix ${CMAKE_INSTALL_PREFIX}) - set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) - set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) -- set(LIBS "-lz -lm") -+ set(LIBS "") -+ if(M_LIBRARY) -+ string(APPEND LIBS "-lm") -+ endif() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc - @ONLY) -@@ -1030,6 +1033,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL) - endif() - - if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+elseif(0) - # Install the man pages. - install(FILES libpng.3 libpngpf.3 - DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index f653b153d65ae1..fc134d14540d56 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -12,7 +12,7 @@ if ("apng" IN_LIST FEATURES) vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${VERSION}/${LIBPNG_APNG_PATCH_NAME}.gz" FILENAME "${LIBPNG_APNG_PATCH_NAME}.gz" - SHA512 ea89018a02ed171b82af9644ec2ff658c8a288e99b5470c7a3fd142c6fa95bbe19cd34c4fae654bc8783b41c3eb3b2d15b486bda3b0307ec3090e99f34465e20 + SHA512 60a0b3072f4d1fddcce79eaa89f461d27c32e4c1a4cf3e6dc30ff1091aeceeb2fbfacf830bdb59bad98e39091fdd47458589411b59f94e2d4fc9c121b0545291 ) set(LIBPNG_APNG_PATCH_PATH "${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APNG_PATCH_NAME}") if (NOT EXISTS "${LIBPNG_APNG_PATCH_PATH}") @@ -28,17 +28,13 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO glennrp/libpng + REPO pnggroup/libpng REF v${VERSION} - SHA512 c023bc7dcf3d0ea045a63204f2266b2c53b601b99d7c5f5a7b547bc9a48b205a277f699eefa47f136483f495175b226527097cd447d6b0fbceb029eb43638f63 + SHA512 b999c241ce5d95dfae5bb2c71e8b686a1c4af69b67262bda309a58c83967b5f3eacd7987d6990f71ebc16aa89f4f7a59c846857d56c80bca7e9ec657caff62c7 HEAD_REF master PATCHES "${LIBPNG_APNG_PATCH_PATH}" cmake.patch - libm.patch - pkgconfig.patch - fix-msa-support-for-mips.patch - fix-tools-static.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PNG_SHARED) diff --git a/ports/libpng/vcpkg.json b/ports/libpng/vcpkg.json index 39f2b499510396..188352ff918e74 100644 --- a/ports/libpng/vcpkg.json +++ b/ports/libpng/vcpkg.json @@ -1,8 +1,8 @@ { "name": "libpng", - "version": "1.6.44", + "version": "1.6.45", "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files", - "homepage": "https://github.com/glennrp/libpng", + "homepage": "https://github.com/pnggroup/libpng", "license": "libpng-2.0", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 0f21ad0751c899..d12454b860c1cc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4977,7 +4977,7 @@ "port-version": 1 }, "libpng": { - "baseline": "1.6.44", + "baseline": "1.6.45", "port-version": 0 }, "libpopt": { diff --git a/versions/l-/libpng.json b/versions/l-/libpng.json index 26a79377e51549..6e8bcc7d1f73ed 100644 --- a/versions/l-/libpng.json +++ b/versions/l-/libpng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "081166e70f56cd851b212f93a9ee5531d58fb9b9", + "version": "1.6.45", + "port-version": 0 + }, { "git-tree": "bda480fe3c3cef1113fe8bfdecda127a5b3b2a77", "version": "1.6.44", From 55e01fc3f7cda29e3960166ff19c00d1c7a2a0ae Mon Sep 17 00:00:00 2001 From: paperchalice Date: Tue, 14 Jan 2025 17:23:48 +0800 Subject: [PATCH 23/44] [librtmp] Update to 2024-03-01 (#43197) --- ports/librtmp/CMakeLists.txt | 25 +++++-- ports/librtmp/dh.patch | 136 ---------------------------------- ports/librtmp/handshake.patch | 35 --------- ports/librtmp/hashswf.patch | 28 ------- ports/librtmp/pkgconfig.patch | 15 ++++ ports/librtmp/portfile.cmake | 10 +-- ports/librtmp/usage | 5 ++ ports/librtmp/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/librtmp.json | 5 ++ 10 files changed, 52 insertions(+), 214 deletions(-) delete mode 100644 ports/librtmp/dh.patch delete mode 100644 ports/librtmp/handshake.patch delete mode 100644 ports/librtmp/hashswf.patch create mode 100644 ports/librtmp/pkgconfig.patch create mode 100644 ports/librtmp/usage diff --git a/ports/librtmp/CMakeLists.txt b/ports/librtmp/CMakeLists.txt index c9f77f16bbf63d..c4c12d7f030600 100644 --- a/ports/librtmp/CMakeLists.txt +++ b/ports/librtmp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.10) project(librtmp C) @@ -43,13 +43,26 @@ if(MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") endif() -add_library(librtmp ${SRCS} ${HEADERS} ${SRCS_MSVC}) +add_library(rtmp ${SRCS} ${HEADERS} ${SRCS_MSVC}) -target_include_directories(librtmp PRIVATE ./librtmp) -target_link_libraries(librtmp PRIVATE ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES}) -target_link_libraries(librtmp PRIVATE Ws2_32.lib Winmm.lib) +target_include_directories(rtmp PRIVATE ./librtmp) +target_link_libraries(rtmp PRIVATE ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES}) +if(MSVC OR MINGW) + target_link_libraries(rtmp PRIVATE Ws2_32.lib Winmm.lib) +endif() + +set(libdir [[${prefix}/lib]]) +set(VERSION 2.6) # from ChangeLog +set(CRYPTO_REQ "libssl,libcrypto") +if(MSVC OR MINGW) + set(PRIVATE_LIBS "-lWS2_32 -lWinMM") +endif() +configure_file(librtmp/librtmp.pc.in librtmp.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/librtmp.pc + DESTINATION lib/pkgconfig +) -install(TARGETS librtmp +install(TARGETS rtmp RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) diff --git a/ports/librtmp/dh.patch b/ports/librtmp/dh.patch deleted file mode 100644 index 4b03453547ed39..00000000000000 --- a/ports/librtmp/dh.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff --git a/librtmp/dh.h b/librtmp/dh.h -index 8e285a60c..ea562d200 100644 ---- a/librtmp/dh.h -+++ b/librtmp/dh.h -@@ -139,11 +139,14 @@ typedef BIGNUM * MP_t; - #define MP_setbin(u,buf,len) BN_bn2bin(u,buf) - #define MP_getbin(u,buf,len) u = BN_bin2bn(buf,len,0) - -+ - #define MDH DH - #define MDH_new() DH_new() - #define MDH_free(dh) DH_free(dh) - #define MDH_generate_key(dh) DH_generate_key(dh) - #define MDH_compute_key(secret, seclen, pub, dh) DH_compute_key(secret, pub, dh) -+#define MPH_set_pqg(dh, p, q, g, res) res = DH_set0_pqg(dh, p, q, g) -+#define MPH_set_length(dh, len, res) res = DH_set_length(dh,len) - - #endif - -@@ -152,7 +155,7 @@ typedef BIGNUM * MP_t; - - /* RFC 2631, Section 2.1.5, http://www.ietf.org/rfc/rfc2631.txt */ - static int --isValidPublicKey(MP_t y, MP_t p, MP_t q) -+isValidPublicKey(const MP_t y,const MP_t p, MP_t q) - { - int ret = TRUE; - MP_t bn; -@@ -211,20 +214,33 @@ DHInit(int nKeyBits) - if (!dh) - goto failed; - -- MP_new(dh->g); -+ MP_t g,p; -+ MP_new(g); - -- if (!dh->g) -+ if (!g) -+ { - goto failed; -+ } - -- MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */ -+ DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL); -+ MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */ - if (!res) - { - goto failed; - } - -- MP_set_w(dh->g, 2); /* base 2 */ -- -- dh->length = nKeyBits; -+ MP_set_w(g, 2); /* base 2 */ -+ MPH_set_pqg(dh,p,NULL,g, res); -+ if (!res) -+ { -+ MP_free(g); -+ goto failed; -+ } -+ MPH_set_length(dh,nKeyBits, res); -+ if (!res) -+ { -+ goto failed; -+ } - return dh; - - failed: -@@ -250,14 +267,11 @@ DHGenerateKey(MDH *dh) - - MP_gethex(q1, Q1024, res); - assert(res); -- -- res = isValidPublicKey(dh->pub_key, dh->p, q1); -+ res = isValidPublicKey(DH_get0_pub_key(dh), DH_get0_p(dh), q1); - if (!res) -- { -- MP_free(dh->pub_key); -- MP_free(dh->priv_key); -- dh->pub_key = dh->priv_key = 0; -- } -+ { -+ MDH_free(dh); // Cannot set priv_key to nullptr so there is no way to generate a new pub/priv key pair in openssl 1.1.1. -+ } - - MP_free(q1); - } -@@ -272,15 +286,16 @@ static int - DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen) - { - int len; -- if (!dh || !dh->pub_key) -+ MP_t pub = DH_get0_pub_key(dh); -+ if (!dh || !pub) - return 0; - -- len = MP_bytes(dh->pub_key); -+ len = MP_bytes(pub); - if (len <= 0 || len > (int) nPubkeyLen) - return 0; - - memset(pubkey, 0, nPubkeyLen); -- MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len); -+ MP_setbin(pub, pubkey + (nPubkeyLen - len), len); - return 1; - } - -@@ -288,15 +303,16 @@ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen) - static int - DHGetPrivateKey(MDH *dh, uint8_t *privkey, size_t nPrivkeyLen) - { -- if (!dh || !dh->priv_key) -+ MP_t priv = DH_get0_priv_key(dh); -+ if (!dh || !priv) - return 0; - -- int len = MP_bytes(dh->priv_key); -+ int len = MP_bytes(priv); - if (len <= 0 || len > (int) nPrivkeyLen) - return 0; - - memset(privkey, 0, nPrivkeyLen); -- MP_setbin(dh->priv_key, privkey + (nPrivkeyLen - len), len); -+ MP_setbin(priv, privkey + (nPrivkeyLen - len), len); - return 1; - } - #endif -@@ -322,7 +338,7 @@ DHComputeSharedSecretKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen, - MP_gethex(q1, Q1024, len); - assert(len); - -- if (isValidPublicKey(pubkeyBn, dh->p, q1)) -+ if (isValidPublicKey(pubkeyBn, DH_get0_p(dh), q1)) - res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh); - else - res = -1; diff --git a/ports/librtmp/handshake.patch b/ports/librtmp/handshake.patch deleted file mode 100644 index 88f5d245855564..00000000000000 --- a/ports/librtmp/handshake.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/librtmp/handshake.h b/librtmp/handshake.h -index 98bf3c877..0819152bd 100644 ---- a/librtmp/handshake.h -+++ b/librtmp/handshake.h -@@ -66,9 +66,9 @@ typedef gcry_cipher_hd_t RC4_handle; - #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH) - #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256 - #endif --#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0) --#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len) --#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx) -+#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0) -+#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, buf, len) -+#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx) - - typedef RC4_KEY * RC4_handle; - #define RC4_alloc(h) *h = malloc(sizeof(RC4_KEY)) -@@ -114,7 +114,7 @@ static void InitRC4Encryption - { - uint8_t digest[SHA256_DIGEST_LENGTH]; - unsigned int digestLen = 0; -- HMAC_CTX ctx; -+ HMAC_CTX *ctx; - - RC4_alloc(rc4keyIn); - RC4_alloc(rc4keyOut); -@@ -263,7 +263,7 @@ HMACsha256(const uint8_t *message, size_t messageLen, const uint8_t *key, - size_t keylen, uint8_t *digest) - { - unsigned int digestLen; -- HMAC_CTX ctx; -+ HMAC_CTX *ctx; - - HMAC_setup(ctx, key, keylen); - HMAC_crunch(ctx, message, messageLen); diff --git a/ports/librtmp/hashswf.patch b/ports/librtmp/hashswf.patch deleted file mode 100644 index fb29549f3d12f6..00000000000000 --- a/ports/librtmp/hashswf.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c -index 3c56b6922..964a64d01 100644 ---- a/librtmp/hashswf.c -+++ b/librtmp/hashswf.c -@@ -57,10 +57,10 @@ - #include - #include - #include --#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0) --#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, (unsigned char *)buf, len) --#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, (unsigned char *)dig, &dlen); --#define HMAC_close(ctx) HMAC_CTX_cleanup(&ctx) -+#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0) -+#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, (unsigned char *)buf, len) -+#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, (unsigned char *)dig, &dlen); -+#define HMAC_close(ctx) HMAC_CTX_free(ctx) - #endif - - extern void RTMP_TLS_Init(); -@@ -289,7 +289,7 @@ leave: - struct info - { - z_stream *zs; -- HMAC_CTX ctx; -+ HMAC_CTX *ctx; - int first; - int zlib; - int size; diff --git a/ports/librtmp/pkgconfig.patch b/ports/librtmp/pkgconfig.patch new file mode 100644 index 00000000000000..c5be81d12dbc0c --- /dev/null +++ b/ports/librtmp/pkgconfig.patch @@ -0,0 +1,15 @@ +diff --git a/librtmp/librtmp.pc.in b/librtmp/librtmp.pc.in +--- a/librtmp/librtmp.pc.in ++++ b/librtmp/librtmp.pc.in +@@ -5,9 +5,9 @@ + + Name: librtmp + Description: RTMP implementation + Version: @VERSION@ +-Requires: @CRYPTO_REQ@ ++Requires: zlib,@CRYPTO_REQ@ + URL: http://rtmpdump.mplayerhq.hu +-Libs: -L${libdir} -lrtmp -lz @PUBLIC_LIBS@ ++Libs: -L${libdir} -lrtmp @PUBLIC_LIBS@ + Libs.private: @PRIVATE_LIBS@ + Cflags: -I${incdir} diff --git a/ports/librtmp/portfile.cmake b/ports/librtmp/portfile.cmake index 657517efa05e25..1e717e28049ee1 100644 --- a/ports/librtmp/portfile.cmake +++ b/ports/librtmp/portfile.cmake @@ -1,14 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mirror/rtmpdump - REF c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 - SHA512 d97ac38672898a96412baa5f03d1e64d512ccefe15ead0a055ca039dc6057e2e620e046c28f4d7468e132b0b5a9eb9bd171250c1afa14da53760a0d7aae3c9e9 + REF 6f6bb1353fc84f4cc37138baa99f586750028a01 + SHA512 e6c108576fdd3430d81e2f72b343864eee5d6be396c9378a2ae2bfc871e9464e20d7bd057a47ef2449a301d933b29265e7ffd3383631b24fc035f5483337bbce PATCHES - dh.patch #Openssl 1.1.1 patch - handshake.patch #Openssl 1.1.1 patch - hashswf.patch #Openssl 1.1.1 patch fix_strncasecmp.patch hide_netstackdump.patch + pkgconfig.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") @@ -19,11 +17,13 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # License and man file(INSTALL "${SOURCE_PATH}/librtmp/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/librtmp/librtmp.3.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_copy_pdbs() diff --git a/ports/librtmp/usage b/ports/librtmp/usage new file mode 100644 index 00000000000000..abf5c3e3bfcba2 --- /dev/null +++ b/ports/librtmp/usage @@ -0,0 +1,5 @@ +librtmp can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig REQUIRED) + pkg_check_modules(librtmp REQUIRED IMPORTED_TARGET librtmp) + target_link_libraries(main PkgConfig::librtmp) diff --git a/ports/librtmp/vcpkg.json b/ports/librtmp/vcpkg.json index 7998d955a8b30a..b1a89fadd399a7 100644 --- a/ports/librtmp/vcpkg.json +++ b/ports/librtmp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "librtmp", - "version-date": "2019-11-11", - "port-version": 4, + "version-date": "2024-03-01", "description": "RTMPDump Real-Time Messaging Protocol API", "homepage": "https://rtmpdump.mplayerhq.hu", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d12454b860c1cc..cf27be3a1eacbc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5057,8 +5057,8 @@ "port-version": 0 }, "librtmp": { - "baseline": "2019-11-11", - "port-version": 4 + "baseline": "2024-03-01", + "port-version": 0 }, "librtpi": { "baseline": "1.0.1", diff --git a/versions/l-/librtmp.json b/versions/l-/librtmp.json index 37256ae5728698..f0456cdc276f84 100644 --- a/versions/l-/librtmp.json +++ b/versions/l-/librtmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9aeaa03f258c206742ae8f295d76d4d3d22f2f64", + "version-date": "2024-03-01", + "port-version": 0 + }, { "git-tree": "dffe604262f6902df5c0beeb5e67650804ae2479", "version-date": "2019-11-11", From 7cba54ea7e54d550e1f879410a352e1afe893792 Mon Sep 17 00:00:00 2001 From: tartanpaint <35690467+tartanpaint@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:28:12 +0000 Subject: [PATCH 24/44] [neon2sse] Update to 2024-11-24 (#43205) --- ports/neon2sse/portfile.cmake | 7 ++++--- ports/neon2sse/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/n-/neon2sse.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/neon2sse/portfile.cmake b/ports/neon2sse/portfile.cmake index 477e109a016913..0e7ce9d2003c4f 100644 --- a/ports/neon2sse/portfile.cmake +++ b/ports/neon2sse/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/ARM_NEON_2_x86_SSE - REF a1652fd5253afbf3e39357b012974f93511f6108 - SHA512 9f8aa283e48eb3b615da3d89ec4165d1ec9599e8e181059c2b9acb2921ce753ce0f29b8c321d7d6661f10eb67e234c629df75853b87c4139a9bb137dbb3f4fc1 + REF eb8b80b28f956275e291ea04a7beb5ed8289e872 + SHA512 56aa1c886993b8ab0f5939acd53081e4d23373bab19858397a1a668e130a68423b521c4613f2db4e0f108fd2c9133a529575dba14e5e0046a3bb9f11f96ce2bf HEAD_REF master ) @@ -12,7 +12,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME NEON_2_SSE CONFIG_PATH lib/cmake/NEON_2_SSE) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib" ) diff --git a/ports/neon2sse/vcpkg.json b/ports/neon2sse/vcpkg.json index c705b9ededdee8..3ff1f84113eb65 100644 --- a/ports/neon2sse/vcpkg.json +++ b/ports/neon2sse/vcpkg.json @@ -1,7 +1,7 @@ { "name": "neon2sse", - "version-date": "2021-09-16", - "description": "Open standard for machine learning interoperability", + "version-date": "2024-11-24", + "description": "The platform independent header allowing to compile any C/C++ code containing ARM NEON intrinsic functions for x86 target systems using SIMD up to AVX2 intrinsic functions", "homepage": "https://github.com/intel/ARM_NEON_2_x86_SSE", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index cf27be3a1eacbc..277b51717dc847 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6325,7 +6325,7 @@ "port-version": 0 }, "neon2sse": { - "baseline": "2021-09-16", + "baseline": "2024-11-24", "port-version": 0 }, "netcdf-c": { diff --git a/versions/n-/neon2sse.json b/versions/n-/neon2sse.json index e3590ae1a1671d..dde3e295814b94 100644 --- a/versions/n-/neon2sse.json +++ b/versions/n-/neon2sse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c507f8eff09bf65ab71aae5c676684e95d445ce", + "version-date": "2024-11-24", + "port-version": 0 + }, { "git-tree": "02bae7681d6c8c026a5f49dd3b4b37a430ea6878", "version-date": "2021-09-16", From 8ae262d570f0c0a91da88f2d12bc82fa1271e106 Mon Sep 17 00:00:00 2001 From: talregev Date: Tue, 14 Jan 2025 11:29:39 +0200 Subject: [PATCH 25/44] [dartsim] Update to 6.15.0 (#43198) Signed-off-by: Tal Regev --- .../disable_unit_tests_examples_and_tutorials.patch | 13 ++++++++----- ports/dartsim/fix-pc-dependencies.patch | 8 -------- ports/dartsim/portfile.cmake | 5 ++--- ports/dartsim/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 2 +- versions/baseline.json | 4 ++-- versions/d-/dartsim.json | 5 +++++ 7 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 ports/dartsim/fix-pc-dependencies.patch diff --git a/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch index 5836b28434eb1d..a3b9af6226afab 100644 --- a/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch +++ b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 100bfb8b59be..b0779885c788 100644 +index fc5249444a5c..39c29e92bb33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -292,7 +292,7 @@ add_subdirectory(dart) +@@ -376,7 +376,7 @@ add_subdirectory(dart) set(DART_IN_SOURCE_BUILD TRUE) @@ -10,12 +10,12 @@ index 100bfb8b59be..b0779885c788 100644 +if(0) # Add a "tests" target to build unit tests. - enable_testing() + include(CTest) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt -index 08ef983cdcfa..7092d89bb17d 100644 +index 37cadf4f8de1..fcfbd13cf793 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt -@@ -1,6 +1,8 @@ +@@ -22,9 +22,11 @@ endif() set(DART_DARTPY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/dartpy") add_subdirectory(dartpy) @@ -24,3 +24,6 @@ index 08ef983cdcfa..7092d89bb17d 100644 add_subdirectory(examples) add_subdirectory(tutorials) +endif() + + message(STATUS "") + message(STATUS "[ dartpy ]") diff --git a/ports/dartsim/fix-pc-dependencies.patch b/ports/dartsim/fix-pc-dependencies.patch deleted file mode 100644 index f2b4d82c81088a..00000000000000 --- a/ports/dartsim/fix-pc-dependencies.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,3 +70,3 @@ - set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.") --set(DART_PKG_EXTERNAL_DEPS "eigen, ccd, fcl, assimp, boost") -+set(DART_PKG_EXTERNAL_DEPS "assimp, ccd, eigen3, fcl, octomap") - diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake index 7086f3f86b364c..4519651239ed0f 100644 --- a/ports/dartsim/portfile.cmake +++ b/ports/dartsim/portfile.cmake @@ -5,11 +5,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dartsim/dart REF v${VERSION} - SHA512 6d04da37d0eb40a35a3aaec583af024e2edf71d68bb38b6832760de21a349221387644ed9be0cc1e451c669bbf48eb53d8d0cd3be1b1b265a30be2aa17c7e48b + SHA512 3c621245c5dc1bf26932c33c940e2b09aaebd1a15f3620616c60296f18a67e1044728543b4f640f92caf8f98295e350679b70eb11aecadea9e4a28aaf370ea75 HEAD_REF main PATCHES disable_unit_tests_examples_and_tutorials.patch - fix-pc-dependencies.patch ) vcpkg_cmake_configure( @@ -41,7 +40,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_ROOT_PATH \"${SOURCE_PATH}/\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_PATH \"${SOURCE_PATH}/data/\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_LOCAL_PATH \"${SOURCE_PATH}/data/\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_GLOBAL_PATH \"${CURRENT_PACKAGES_DIR}/share/doc/dart/data/\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_GLOBAL_PATH \\\n \"${CURRENT_PACKAGES_DIR}/share/doc/dart/data/\"" "") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json index a0f8610cb019c3..f0a034cb601cff 100644 --- a/ports/dartsim/vcpkg.json +++ b/ports/dartsim/vcpkg.json @@ -1,10 +1,10 @@ { "name": "dartsim", - "version": "6.12.2", - "port-version": 3, + "version": "6.15.0", "description": "Dynamic Animation and Robotics Toolkit", "homepage": "https://dartsim.github.io/", "license": "BSD-2-Clause", + "supports": "!x86", "dependencies": [ "assimp", "boost-algorithm", @@ -24,6 +24,7 @@ "octomap", "ode", "opengl", + "osg", "tinyxml2", "urdfdom", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5459faf7c1f149..68387e7585f346 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -374,7 +374,7 @@ gamenetworkingsockets:x64-android=fail # There is an open PR that try to fix that. gazebo:x64-windows=fail gazebo:x64-windows-static-md=fail -gazebo:x86-windows=fail +gazebo:x86-windows=skip gazebo:x64-linux=fail gdk-pixbuf:arm-neon-android=fail gdk-pixbuf:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 277b51717dc847..b40265de5fd02a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2189,8 +2189,8 @@ "port-version": 3 }, "dartsim": { - "baseline": "6.12.2", - "port-version": 3 + "baseline": "6.15.0", + "port-version": 0 }, "dataframe": { "baseline": "3.4.0", diff --git a/versions/d-/dartsim.json b/versions/d-/dartsim.json index a9dbbddca54b6b..2361fa95d5b3b4 100644 --- a/versions/d-/dartsim.json +++ b/versions/d-/dartsim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76bb71f86f7f9f4d34e002e65db4ccff572f6a1d", + "version": "6.15.0", + "port-version": 0 + }, { "git-tree": "4d586df3f633aafc829fd66b18ad22120a9bbed2", "version": "6.12.2", From 7b3e0a29e2756de867dd68d473eba82593890a07 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Jan 2025 10:31:48 +0100 Subject: [PATCH 26/44] [libassuan] Update to 3.0.1 (#43214) --- ports/libassuan/portfile.cmake | 16 ++++++++++------ ports/libassuan/upstream-69069bc.diff | 14 ++++++++++++++ ports/libassuan/vcpkg.json | 8 ++++++-- versions/baseline.json | 2 +- versions/l-/libassuan.json | 5 +++++ 5 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 ports/libassuan/upstream-69069bc.diff diff --git a/ports/libassuan/portfile.cmake b/ports/libassuan/portfile.cmake index 5b72798911ad33..49256d5b4de8c8 100644 --- a/ports/libassuan/portfile.cmake +++ b/ports/libassuan/portfile.cmake @@ -4,32 +4,35 @@ vcpkg_download_distfile(tarball "https://mirrors.dotsrc.org/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2" "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libassuan/libassuan-${VERSION}.tar.bz2" FILENAME "libassuan-${VERSION}.tar.bz2" - SHA512 ca33bd0325bbebccb63b6a84cc0aa5c85b25c6275a68df83aeb3f3729b2cd38220198a941c3479bd461f16b7ddb6b558c0664697ca3153c7fb430544303d773f + SHA512 6914a02c20053bae0fc4c29c5c40655f1cec711983d57fa85e46df34e90b10e33d31256dd50ae7c7faa8d8d750a529bf9072da0cda3bdd77ebfedbc0e26e5e16 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${tarball}" PATCHES cross-tools.patch + upstream-69069bc.diff ) if(VCPKG_CROSSCOMPILING) set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}") endif() -vcpkg_configure_make( +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/libgpg-error/aclocal/\"") +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG + AUTORECONF OPTIONS --disable-doc - "GPG_ERROR_CONFIG=no" OPTIONS_RELEASE + "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config gpg-error" "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config" OPTIONS_DEBUG + "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config gpg-error" "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config" ) -vcpkg_install_make() +vcpkg_make_install() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() @@ -52,4 +55,5 @@ if(NOT VCPKG_CROSSCOMPILING) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LIB") diff --git a/ports/libassuan/upstream-69069bc.diff b/ports/libassuan/upstream-69069bc.diff new file mode 100644 index 00000000000000..07a249a399ea66 --- /dev/null +++ b/ports/libassuan/upstream-69069bc.diff @@ -0,0 +1,14 @@ +diff --git a/src/assuan-defs.h b/src/assuan-defs.h +index faf9aae..5052e8e 100644 +--- a/src/assuan-defs.h ++++ b/src/assuan-defs.h +@@ -431,9 +431,6 @@ char *stpcpy (char *dest, const char *src); + #define clearenv _assuan_clearenv + int setenv (const char *name, const char *value, int replace); + #endif +-#ifndef HAVE_PUTC_UNLOCKED +-int putc_unlocked (int c, FILE *stream); +-#endif + + + #define DIM(v) (sizeof(v)/sizeof((v)[0])) diff --git a/ports/libassuan/vcpkg.json b/ports/libassuan/vcpkg.json index ee96b4a0c9c439..f9905a01fde951 100644 --- a/ports/libassuan/vcpkg.json +++ b/ports/libassuan/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libassuan", - "version": "2.5.7", + "version": "3.0.1", "description": "A library implementing the so-called Assuan protocol", "homepage": "https://gnupg.org/software/libassuan/index.html", "license": "LGPL-2.1-or-later", @@ -10,6 +10,10 @@ "name": "libassuan", "host": true }, - "libgpg-error" + "libgpg-error", + { + "name": "vcpkg-make", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index b40265de5fd02a..19721c6c7f3519 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4317,7 +4317,7 @@ "port-version": 0 }, "libassuan": { - "baseline": "2.5.7", + "baseline": "3.0.1", "port-version": 0 }, "libatomic-ops": { diff --git a/versions/l-/libassuan.json b/versions/l-/libassuan.json index 5e6354fc52e142..9b09efa82fd74b 100644 --- a/versions/l-/libassuan.json +++ b/versions/l-/libassuan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0462cb4466ccdb69468f11ee9af018b8581ecc64", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "9f619f927aa36d89e928f02b815690fe87164ff9", "version": "2.5.7", From 2968c141e31261d374f93b3dae9e6ea1d30004bf Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 14 Jan 2025 16:32:19 +0700 Subject: [PATCH 27/44] [flecs] Update to 4.0.4 (#43220) --- ports/flecs/portfile.cmake | 2 +- ports/flecs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flecs.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 1bbd2de2c0f731..1dbc59538e5ea0 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 da4986002e0b57619a349665fff0531053159b7c4775d1ba39b81095e9df91bc3ada7a3c7bf03f4ee1dadd0b5a1065bea2806c9fb9e8b51425662a67cb24b212 + SHA512 aa2062b188bf1cf35c1323f133541d414d542b73bf3c1f587dcbeda97419f92df2a6e07642e2f92b21b7044b24d82837f7f488c4ce840323715043d589ad217d HEAD_REF master ) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index e36477505e9025..c009ee11ec545c 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "4.0.3", + "version": "4.0.4", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "documentation": "https://www.flecs.dev/flecs/", diff --git a/versions/baseline.json b/versions/baseline.json index 19721c6c7f3519..fa0752076eb410 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2813,7 +2813,7 @@ "port-version": 0 }, "flecs": { - "baseline": "4.0.3", + "baseline": "4.0.4", "port-version": 0 }, "flint": { diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index e717e66ef7e77d..6ec4d9851c9a90 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffee4975e340c798eccc00d7e1b5f7d3fc6b674d", + "version": "4.0.4", + "port-version": 0 + }, { "git-tree": "3d11e64c0c51f661e4c748c536f95354d919dfa9", "version": "4.0.3", From 761becd13ff3765b63d62dd12896fe8ff1193c25 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Jan 2025 10:32:52 +0100 Subject: [PATCH 28/44] [libgcrypt] Update to 1.11.0 (#43212) --- ports/libgcrypt/cross-tools.patch | 16 ++++++++-------- ports/libgcrypt/portfile.cmake | 25 ++++++++++++++----------- ports/libgcrypt/upstream-fa21ddc1.patch | 20 -------------------- ports/libgcrypt/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libgcrypt.json | 5 +++++ 6 files changed, 30 insertions(+), 42 deletions(-) delete mode 100644 ports/libgcrypt/upstream-fa21ddc1.patch diff --git a/ports/libgcrypt/cross-tools.patch b/ports/libgcrypt/cross-tools.patch index fa65294e091a34..ab3555bf82af02 100644 --- a/ports/libgcrypt/cross-tools.patch +++ b/ports/libgcrypt/cross-tools.patch @@ -1,5 +1,5 @@ diff --git a/cipher/Makefile.am b/cipher/Makefile.am -index 264b3d3..254d946 100644 +index ea9014c..8aeedb7 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -19,6 +19,13 @@ @@ -16,14 +16,14 @@ index 264b3d3..254d946 100644 # Need to include ../src in addition to top_srcdir because gcrypt.h is # a built header. AM_CPPFLAGS = -I../src -I$(top_srcdir)/src -I../mpi -I$(top_srcdir)/mpi -@@ -144,8 +151,8 @@ EXTRA_libcipher_la_SOURCES = \ - blake2b-amd64-avx2.S blake2s-amd64-avx.S +@@ -160,8 +167,8 @@ EXTRA_libcipher_la_SOURCES = \ + blake2s-amd64-avx.S blake2s-amd64-avx512.S gost28147.lo: gost-sb.h --gost-sb.h: gost-s-box -- ./gost-s-box $@ -+gost-sb.h: $(HOST_TOOLS_PREFIX)/gost-s-box -+ $(HOST_TOOLS_PREFIX)/gost-s-box $@ +-gost-sb.h: gost-s-box$(EXEEXT_FOR_BUILD) +- ./gost-s-box$(EXEEXT_FOR_BUILD) $@ ++gost-sb.h: $(HOST_TOOLS_PREFIX)/gost-s-box$(EXEEXT_FOR_BUILD) ++ $(HOST_TOOLS_PREFIX)/gost-s-box$(EXEEXT_FOR_BUILD) $@ - gost-s-box: gost-s-box.c + gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake index 37e7271d5fbf2b..b292c871d9cc8b 100644 --- a/ports/libgcrypt/portfile.cmake +++ b/ports/libgcrypt/portfile.cmake @@ -4,38 +4,41 @@ vcpkg_download_distfile(tarball "https://mirrors.dotsrc.org/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2" "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${VERSION}.tar.bz2" FILENAME "libgcrypt-${VERSION}.tar.bz2" - SHA512 3a850baddfe8ffe8b3e96dc54af3fbb9e1dab204db1f06b9b90b8fbbfb7fb7276260cd1e61ba4dde5a662a2385385007478834e62e95f785d2e3d32652adb29e + SHA512 8e093e69e3c45d30838625ca008e995556f0d5b272de1c003d44ef94633bcc0d0ef5d95e8725eb531bfafb4490ac273488633e0c801200d4666194f86c3e270e +) +vcpkg_download_distfile(osx_asm_patch + URLS "https://github.com/gpg/libgcrypt/commit/bb0895bbb7c6d2b9502cbbf03da14d4ecf27a183.patch?full_index=1" + FILENAME "libgcrypt-1.11.0-bb0895b.diff" + SHA512 dc9a0f0c13b08bdc6e28b966c61f5a8695bc58a7bf5ea5a8376f3b293bde729f485342eabbc84e78ab37afaf12ba1ac4385f0baff0f5f4b31bc1d3b764893522 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${tarball}" PATCHES cross-tools.patch - upstream-fa21ddc1.patch + "${osx_asm_patch}" ) if(VCPKG_CROSSCOMPILING) set(ENV{HOST_TOOLS_PREFIX} "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}") endif() -vcpkg_list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS "-DVCPKG_LANGUAGES=ASM;C") -vcpkg_cmake_get_vars(cmake_vars_file) -include("${cmake_vars_file}") - -vcpkg_configure_make( - AUTOCONFIG +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/libgpg-error/aclocal/\"") +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" + AUTORECONF + LANGUAGES C ASM OPTIONS --disable-doc - "AS=${VCPKG_DETECTED_CMAKE_ASM_COMPILER}" - "GPG_ERROR_CONFIG=no" OPTIONS_RELEASE + "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config gpg-error" "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config" OPTIONS_DEBUG + "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config gpg-error" "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config" ) -vcpkg_install_make(OPTIONS "CCAS=${VCPKG_DETECTED_CMAKE_ASM_COMPILER}") +vcpkg_make_install() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() diff --git a/ports/libgcrypt/upstream-fa21ddc1.patch b/ports/libgcrypt/upstream-fa21ddc1.patch deleted file mode 100644 index b70408defa2845..00000000000000 --- a/ports/libgcrypt/upstream-fa21ddc1.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/random/rndgetentropy.c b/random/rndgetentropy.c -index 513da0b95..a6f3c4ab1 100644 ---- a/random/rndgetentropy.c -+++ b/random/rndgetentropy.c -@@ -81,6 +81,7 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t, - do - { - _gcry_pre_syscall (); -+#ifdef GRND_RANDOM - if (fips_mode ()) - { - /* DRBG chaining defined in SP 800-90A (rev 1) specify -@@ -98,6 +99,7 @@ _gcry_rndgetentropy_gather_random (void (*add)(const void*, size_t, - ret = getrandom (buffer, nbytes, GRND_RANDOM); - } - else -+#endif - { - nbytes = length < sizeof (buffer) ? length : sizeof (buffer); - ret = getentropy (buffer, nbytes); diff --git a/ports/libgcrypt/vcpkg.json b/ports/libgcrypt/vcpkg.json index 522c600be4a35d..a5600b42c94a5c 100644 --- a/ports/libgcrypt/vcpkg.json +++ b/ports/libgcrypt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libgcrypt", - "version": "1.10.2", + "version": "1.11.0", "description": "A general purpose cryptographic library", "homepage": "https://gnupg.org/software/libgcrypt/index.html", "license": null, @@ -12,7 +12,7 @@ }, "libgpg-error", { - "name": "vcpkg-cmake-get-vars", + "name": "vcpkg-make", "host": true } ] diff --git a/versions/baseline.json b/versions/baseline.json index fa0752076eb410..222a77363729d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4577,7 +4577,7 @@ "port-version": 0 }, "libgcrypt": { - "baseline": "1.10.2", + "baseline": "1.11.0", "port-version": 0 }, "libgd": { diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json index 3e9265716b62e7..9ec469eca83d95 100644 --- a/versions/l-/libgcrypt.json +++ b/versions/l-/libgcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ef0287faf9a058810b2eb5378b3a66ea6adcf69", + "version": "1.11.0", + "port-version": 0 + }, { "git-tree": "fb85f5dab3e4cacb5da45cf352ca23a25d7c4d18", "version": "1.10.2", From d320630b28aeb59b24424eb2a7ef3905314107a1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Jan 2025 10:36:14 +0100 Subject: [PATCH 29/44] [libjuice] Update to 1.5.8 (#43211) --- ports/libjuice/library-linkage.diff | 25 ------------------------- ports/libjuice/portfile.cmake | 3 +-- ports/libjuice/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libjuice.json | 5 +++++ 5 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 ports/libjuice/library-linkage.diff diff --git a/ports/libjuice/library-linkage.diff b/ports/libjuice/library-linkage.diff deleted file mode 100644 index 620dde1672902b..00000000000000 --- a/ports/libjuice/library-linkage.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dd6c669..18e4166 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -148,11 +148,20 @@ add_library(LibJuice::LibJuice ALIAS juice) - set_target_properties(juice-static PROPERTIES EXPORT_NAME LibJuiceStatic) - add_library(LibJuice::LibJuiceStatic ALIAS juice-static) - -+if(BUILD_SHARED_LIBS) - install(TARGETS juice EXPORT LibJuiceTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+else() -+ set_target_properties(juice PROPERTIES EXCLUDE_FROM_ALL 1) -+ set_target_properties(juice PROPERTIES OUTPUT_NAME juice-shared) -+ set_target_properties(juice-static PROPERTIES EXCLUDE_FROM_ALL 0) -+ set_target_properties(juice-static PROPERTIES OUTPUT_NAME juice) -+ set_target_properties(juice-static PROPERTIES EXPORT_NAME LibJuice) -+ install(TARGETS juice-static EXPORT LibJuiceTargets) -+endif() - - install(FILES ${LIBJUICE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/juice) - diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index e554ace0aa222d..1c65a3534b112d 100644 --- a/ports/libjuice/portfile.cmake +++ b/ports/libjuice/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice REF "v${VERSION}" - SHA512 694a316b7e9f33be45ace1d35a32e6a4ec74b7038c6268d0d35efcbf7a3c7abc9d2823dae789d849f37f0399d9da779a54bf6e9db5477df326aa185be92657b2 + SHA512 ae68b0589e4ef822d707ff9d147dcf918eccbb38d73edfcb8665d5c263ad1063c12c828933d6884accf9553d3bbe4bf2e57379c2c8b66ea9a51cfbd11b2217b7 HEAD_REF master PATCHES dependencies.diff - library-linkage.diff ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index 1ddf24ec3fc7bc..5f202e28e684e2 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "1.5.4", + "version": "1.5.8", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 222a77363729d8..3e1647c75c49d0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4709,7 +4709,7 @@ "port-version": 1 }, "libjuice": { - "baseline": "1.5.4", + "baseline": "1.5.8", "port-version": 0 }, "libjxl": { diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index 26f5f3d3761e49..30a7a6d6224eb7 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cf411fe3981a94e84fb9e41a48fd65066896648", + "version": "1.5.8", + "port-version": 0 + }, { "git-tree": "da160ff2e0cae0f099762e681e164969db091894", "version": "1.5.4", From d4f3e122069912636c123b7ece673f6e01513cea Mon Sep 17 00:00:00 2001 From: tartanpaint <35690467+tartanpaint@users.noreply.github.com> Date: Tue, 14 Jan 2025 21:26:15 +0000 Subject: [PATCH 30/44] [rapidxml] Fix gcc and clang build issue (#43199) --- ...-gcc-that-won-t-let-rapidxml-compile.patch | 37 +++++++++++++++++++ ports/rapidxml/portfile.cmake | 31 ++++++++-------- ports/rapidxml/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rapidxml.json | 5 +++ 5 files changed, 60 insertions(+), 17 deletions(-) create mode 100644 ports/rapidxml/0001-fix-for-a-bug-in-gcc-that-won-t-let-rapidxml-compile.patch diff --git a/ports/rapidxml/0001-fix-for-a-bug-in-gcc-that-won-t-let-rapidxml-compile.patch b/ports/rapidxml/0001-fix-for-a-bug-in-gcc-that-won-t-let-rapidxml-compile.patch new file mode 100644 index 00000000000000..ee62a79fb28a19 --- /dev/null +++ b/ports/rapidxml/0001-fix-for-a-bug-in-gcc-that-won-t-let-rapidxml-compile.patch @@ -0,0 +1,37 @@ +From 2cf47bb8fb1de71bb2d2e059c15a30ffa4ca4cd6 Mon Sep 17 00:00:00 2001 +From: Ferdinand Niedermann +Date: Sat, 21 Sep 2013 01:55:58 +0200 +Subject: [PATCH] fix for a bug in gcc that won't let rapidxml compile on clang + +--- + rapidxml_print.hpp | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/rapidxml_print.hpp b/rapidxml_print.hpp +index d03d5f5..7ef305e 100755 +--- a/rapidxml_print.hpp ++++ b/rapidxml_print.hpp +@@ -102,6 +102,20 @@ namespace rapidxml + /////////////////////////////////////////////////////////////////////////// + // Internal printing operations + ++ // ===================================== ++ // fix for clang for this bug in gcc and others: http://sourceforge.net/p/rapidxml/bugs/16/ ++ ++ template inline OutIt print_children(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_element_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_data_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_cdata_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_declaration_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_comment_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_doctype_node(OutIt out, const xml_node *node, int flags, int indent); ++ template inline OutIt print_pi_node(OutIt out, const xml_node *node, int flags, int indent); ++ ++ // ===================================== ++ + // Print node + template + inline OutIt print_node(OutIt out, const xml_node *node, int flags, int indent) +-- +1.8.4 + diff --git a/ports/rapidxml/portfile.cmake b/ports/rapidxml/portfile.cmake index b13d1a2bc86e49..534bfe72665fa5 100644 --- a/ports/rapidxml/portfile.cmake +++ b/ports/rapidxml/portfile.cmake @@ -1,15 +1,16 @@ -#header-only library -vcpkg_from_sourceforge( - OUT_SOURCE_PATH SOURCE_PATH - REPO rapidxml/rapidxml - REF rapidxml%201.13 - FILENAME "rapidxml-1.13.zip" - SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265 -) - -# Handle copyright -file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/rapidxml) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/rapidxml/license.txt ${CURRENT_PACKAGES_DIR}/share/rapidxml/copyright) - -# Copy the header files -file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/rapidxml FILES_MATCHING PATTERN "*.hpp") +#header-only library +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO rapidxml/rapidxml + REF rapidxml%20${VERSION} + FILENAME "rapidxml-${VERSION}.zip" + SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265 + PATCHES + 0001-fix-for-a-bug-in-gcc-that-won-t-let-rapidxml-compile.patch # https://sourceforge.net/p/rapidxml/bugs/16/ +) + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt") + +# Copy the header files +file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/rapidxml FILES_MATCHING PATTERN "*.hpp") diff --git a/ports/rapidxml/vcpkg.json b/ports/rapidxml/vcpkg.json index 3b6225ce5ecf3e..d8b796f320a83a 100644 --- a/ports/rapidxml/vcpkg.json +++ b/ports/rapidxml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rapidxml", "version": "1.13", - "port-version": 6, + "port-version": 7, "description": "RapidXml is an attempt to create the fastest XML parser possible, while retaining useability, portability and reasonable W3C compatibility.", "homepage": "https://sourceforge.net/projects/rapidxml" } diff --git a/versions/baseline.json b/versions/baseline.json index 3e1647c75c49d0..779450899b4ef3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7834,7 +7834,7 @@ }, "rapidxml": { "baseline": "1.13", - "port-version": 6 + "port-version": 7 }, "rapidxml-ns": { "baseline": "1.13.2", diff --git a/versions/r-/rapidxml.json b/versions/r-/rapidxml.json index feeda9e74c0b94..3e221262da20ac 100644 --- a/versions/r-/rapidxml.json +++ b/versions/r-/rapidxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "465505477fa97594a58e69f34a0c1a7fdccd9c59", + "version": "1.13", + "port-version": 7 + }, { "git-tree": "a460282de022af98f967771cdecab3efee97bc5d", "version": "1.13", From 12e2bbe0592c7d0c2eddc25ce0027da26bbb8b03 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:25:43 +0800 Subject: [PATCH 31/44] [nng] Update to 1.10.0 (#43277) --- ports/nng/portfile.cmake | 2 +- ports/nng/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nng.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nng/portfile.cmake b/ports/nng/portfile.cmake index cb1631d2d8500f..eea50e8ddcaa77 100644 --- a/ports/nng/portfile.cmake +++ b/ports/nng/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanomsg/nng REF "v${VERSION}" - SHA512 d334264981ce6648537ed1b7fb469fd35fbbf0bea9a276ee23f12e04d1c9b0b4aa3008715a4774b51e9e46fabecf54dd4da95ac10194ed1099cbfbe524747272 + SHA512 44c53e86d764ff860fd007fe21adee166e25e9e0668b49f830da9f350fb3a91d52424623d556d1d6050d5baea80cf448275cc5c5e647ebc4ee0d0800cafaab73 HEAD_REF master ) diff --git a/ports/nng/vcpkg.json b/ports/nng/vcpkg.json index f73e374c71d317..723e90f8fb1e64 100644 --- a/ports/nng/vcpkg.json +++ b/ports/nng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nng", - "version-semver": "1.9.0", + "version-semver": "1.10.0", "description": "nanomsg-next-gen, lightweight messaging library", "homepage": "https://nng.nanomsg.org", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 779450899b4ef3..810c9eb04a6a84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6401,7 +6401,7 @@ "port-version": 1 }, "nng": { - "baseline": "1.9.0", + "baseline": "1.10.0", "port-version": 0 }, "nngpp": { diff --git a/versions/n-/nng.json b/versions/n-/nng.json index 2ee8dec2b3e101..98256b9713949c 100644 --- a/versions/n-/nng.json +++ b/versions/n-/nng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d629a2e798d0ac8429b18eeafeae40821e5afbf", + "version-semver": "1.10.0", + "port-version": 0 + }, { "git-tree": "ae629b17cceaf01bcfdcfc8a991b4631744167cc", "version-semver": "1.9.0", From 1afbd4aa9a93cfc6c8eb09aefa66004c6abc607f Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:26:51 +0800 Subject: [PATCH 32/44] [x-plane] Fix download address (#43272) Co-authored-by: Monica --- ports/x-plane/portfile.cmake | 2 +- ports/x-plane/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/x-/x-plane.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake index eebc06d6c178a0..e05274bffde0c4 100644 --- a/ports/x-plane/portfile.cmake +++ b/ports/x-plane/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(XPSDK_VERSION "401") vcpkg_download_distfile( XPLANE_SDK_ZIP - URLS "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK${XPSDK_VERSION}.zip" + URLS "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK${XPSDK_VERSION}.zip" FILENAME "XPSDK${XPSDK_VERSION}.zip" SHA512 8e00789befd15f5b1cb4f426ddf9c3f7f021c5fba50b907e8af5fbf09abbc362804b5d1543332855d01e8ae91b9c50a55933e63df6e11e88e58c10ca8f949bf4 ) diff --git a/ports/x-plane/vcpkg.json b/ports/x-plane/vcpkg.json index 9dbb8e9e9835ea..cec500250c49f5 100644 --- a/ports/x-plane/vcpkg.json +++ b/ports/x-plane/vcpkg.json @@ -1,6 +1,7 @@ { "name": "x-plane", "version": "4.0.1", + "port-version": 1, "description": "The X-Plane Plugin SDK", "homepage": "https://developer.x-plane.com/sdk/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 810c9eb04a6a84..b7ff38ef4b92c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9770,7 +9770,7 @@ }, "x-plane": { "baseline": "4.0.1", - "port-version": 0 + "port-version": 1 }, "x264": { "baseline": "0.164.3108", diff --git a/versions/x-/x-plane.json b/versions/x-/x-plane.json index 572bc3d7894af7..359a7b683b4b31 100644 --- a/versions/x-/x-plane.json +++ b/versions/x-/x-plane.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "605d085f1c9ef0cf423d20a5dc574003b42a4e2e", + "version": "4.0.1", + "port-version": 1 + }, { "git-tree": "be6ff276d2a18e64a2cf91a50ef1a53d26a33fa8", "version": "4.0.1", From 6e3cfdf6abe3c0bdc4146ffcdee08425d1565adb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 15 Jan 2025 10:37:03 +0100 Subject: [PATCH 33/44] [libgwenhywfar] Update to 5.12.0 (#43216) --- ports/libgwenhywfar/control-openssl.diff | 20 ++++++ ports/libgwenhywfar/pkgconfig.diff | 11 ++++ ports/libgwenhywfar/portfile.cmake | 61 ++++++++++++------- ports/libgwenhywfar/static-link-order.diff | 17 ++++++ ports/libgwenhywfar/vcpkg.json | 31 ++++++---- .../vcpkg-ci-libgwenhywfar/portfile.cmake | 10 +++ .../project/CMakeLists.txt | 11 ++++ .../vcpkg-ci-libgwenhywfar/project/main.c | 8 +++ .../vcpkg-ci-libgwenhywfar/vcpkg.json | 49 +++++++++++++++ versions/baseline.json | 4 +- versions/l-/libgwenhywfar.json | 5 ++ 11 files changed, 190 insertions(+), 37 deletions(-) create mode 100644 ports/libgwenhywfar/control-openssl.diff create mode 100644 ports/libgwenhywfar/pkgconfig.diff create mode 100644 ports/libgwenhywfar/static-link-order.diff create mode 100644 scripts/test_ports/vcpkg-ci-libgwenhywfar/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-libgwenhywfar/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-libgwenhywfar/project/main.c create mode 100644 scripts/test_ports/vcpkg-ci-libgwenhywfar/vcpkg.json diff --git a/ports/libgwenhywfar/control-openssl.diff b/ports/libgwenhywfar/control-openssl.diff new file mode 100644 index 00000000000000..191293c0defa9d --- /dev/null +++ b/ports/libgwenhywfar/control-openssl.diff @@ -0,0 +1,20 @@ +diff --git a/configure.ac b/configure.ac +index 4e43f5c..7ce9511 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -709,7 +709,14 @@ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.9.8]) + # + # check for OpenSSL + # +-PKG_CHECK_MODULES([OPENSSL], [openssl], [ssl_available=yes], [ssl_available=no]) ++AC_ARG_WITH(openssl, [ --with-openssl=yes enable OpenSSL in gct-tool], ++ [with_openssl="$withval"], ++ [with_openssl="no"]) ++if test "x$with_openssl" = "xyes"; then ++ PKG_CHECK_MODULES([OPENSSL], [openssl], [ssl_available=yes], [AC_MSG_ERROR([unable to find OpenSSL (pkg-config)])]) ++else ++ ssl_available=no ++fi + if test "$ssl_available" = "yes"; then + AC_DEFINE_UNQUOTED(HAVE_OPENSSL, 1, [Defined if OpenSSL is available]) + fi diff --git a/ports/libgwenhywfar/pkgconfig.diff b/ports/libgwenhywfar/pkgconfig.diff new file mode 100644 index 00000000000000..c07b5558740f42 --- /dev/null +++ b/ports/libgwenhywfar/pkgconfig.diff @@ -0,0 +1,11 @@ +diff --git a/gwenhywfar.pc.in b/gwenhywfar.pc.in +index d4c61d8..72a4ef4 100644 +--- a/gwenhywfar.pc.in ++++ b/gwenhywfar.pc.in +@@ -31,3 +31,6 @@ Version: @VERSION@ + Libs: @gwenhywfar_ldflags@ @gwenhywfar_libs@ + Cflags: -I@gwenhywfar_headerdir@ + ++Libs.private: @all_libraries@ ++@WITH_LIBXML2_CODE_FALSE@Requires.private: libgcrypt, gnutls ++@WITH_LIBXML2_CODE_TRUE@Requires.private: libgcrypt, gnutls, libxml-2.0 diff --git a/ports/libgwenhywfar/portfile.cmake b/ports/libgwenhywfar/portfile.cmake index a0ffa609e2ab14..a824c30637fc3f 100644 --- a/ports/libgwenhywfar/portfile.cmake +++ b/ports/libgwenhywfar/portfile.cmake @@ -1,13 +1,24 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://www.aquamaniac.de/rdm/attachments/download/364/gwenhywfar-${VERSION}.tar.gz" + URLS "https://www.aquamaniac.de/rdm/attachments/download/529/gwenhywfar-5.12.0.tar.gz" FILENAME "gwenhywfar-${VERSION}.tar.gz" - SHA512 9875d677f49fc0a46f371fd1954d15d99c7d5994e90b16f1be7a5b8a1cbcd74ae9733e4541afd6d8251a2ba1a0a37c28e0f248952b7c917313fbf5b38b1d8d11 + SHA512 0075eb626f0022ecd4ffdd59de7f0817d2def685e1d2cfbca9a32faa4b8d4d213bea631f24c5385da0b8c7743fd6d1887a46f08afa371195d911409ec7655791 +) + +vcpkg_download_distfile(osx_patch + URLS "https://www.aquamaniac.de/rdm/projects/gwenhywfar/repository/revisions/55d4b7b526df30e4003c92e2f504f480c01021f0/diff?format=diff" + FILENAME "gwenhywfar-5.12.0-55d4b7b.diff" + SHA512 87fa9ff3e9027c5a6839f800990b420a824efbd115ed67eeaef3c909b14c59c0b9bae41c539d400166862c0353ad730313ee4f9366928c333883d41429912731 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" SOURCE_BASE "${VERSION}" + PATCHES + control-openssl.diff + pkgconfig.diff + static-link-order.diff + ${osx_patch} ) vcpkg_list(SET options) @@ -24,50 +35,54 @@ endif() list(JOIN FEATURES_GUI " " GUIS) vcpkg_list(APPEND options "--with-guis=${GUIS}") -if(VCPKG_TARGET_IS_OSX) - vcpkg_list(APPEND options "LDFLAGS=\$LDFLAGS -framework CoreFoundation -framework Security") +if ("openssl" IN_LIST FEATURES) + vcpkg_list(APPEND options "--with-openssl=yes") endif() -vcpkg_configure_make( +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/libgpg-error/aclocal/\" -I \"${CURRENT_INSTALLED_DIR}/share/libgcrypt/aclocal/\" -I \"${CURRENT_HOST_INSTALLED_DIR}/share/gettext/aclocal/\"") +set(ENV{AUTOPOINT} true) +vcpkg_make_configure( SOURCE_PATH "${SOURCE_PATH}" + AUTORECONF OPTIONS --disable-binreloc + --disable-network-checks + --disable-nls ${options} OPTIONS_RELEASE "--with-qt5-qmake=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/qmake" "--with-qt5-moc=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/moc" "--with-qt5-uic=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin/uic" - "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config" - "gpg_error_config_args=gpg-error" + "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config gpg-error" + "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/bin/gpgrt-config" "LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/bin/libgcrypt-config" OPTIONS_DEBUG "--with-qt5-qmake=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/qmake" "--with-qt5-moc=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/moc" "--with-qt5-uic=${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/debug/bin/uic" - "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config" - "gpg_error_config_args=gpg-error" + "GPG_ERROR_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config gpg-error" + "GPGRT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgpg-error/debug/bin/gpgrt-config" "LIBGCRYPT_CONFIG=${CURRENT_INSTALLED_DIR}/tools/libgcrypt/debug/bin/libgcrypt-config" ) -vcpkg_install_make() +vcpkg_make_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -string(REGEX MATCH "^([0-9]*[.][0-9]*)" MAJOR_MINOR "${VERSION}") -foreach(GUI IN LISTS FEATURES_GUI) - vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-${GUI} CONFIG_PATH lib/cmake/gwengui-${GUI}-${MAJOR_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH) -endforeach() -vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${MAJOR_MINOR}) - -if ("tools" IN_LIST FEATURES) - vcpkg_copy_tools(SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" TOOL_NAMES gct-tool gsa mklistdoc typemaker typemaker2 xmlmerge AUTO_CLEAN) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + string(REGEX MATCH "^([0-9]*[.][0-9]*)" MAJOR_MINOR "${VERSION}") + foreach(GUI IN LISTS FEATURES_GUI) + vcpkg_cmake_config_fixup(PACKAGE_NAME gwengui-${GUI} CONFIG_PATH lib/cmake/gwengui-${GUI}-${MAJOR_MINOR} DO_NOT_DELETE_PARENT_CONFIG_PATH) + endforeach() + vcpkg_cmake_config_fixup(PACKAGE_NAME gwenhywfar CONFIG_PATH lib/cmake/gwenhywfar-${MAJOR_MINOR}) +else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") endif() -# the `dir` variable is not used in the script -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}\"" "") -if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgwenhywfar/debug/bin/gwenhywfar-config" "dir=\"${CURRENT_INSTALLED_DIR}/debug\"" "") -endif() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/gwenhywfar-config" [[dir="[^"]*"]] [[dir=""]] REGEX) # unused abs path +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libgwenhywfar/static-link-order.diff b/ports/libgwenhywfar/static-link-order.diff new file mode 100644 index 00000000000000..2cd0b46420d049 --- /dev/null +++ b/ports/libgwenhywfar/static-link-order.diff @@ -0,0 +1,17 @@ +diff --git a/tools/gwenbuild/Makefile.am b/tools/gwenbuild/Makefile.am +index 14aa0e2..eb60988 100644 +--- a/tools/gwenbuild/Makefile.am ++++ b/tools/gwenbuild/Makefile.am +@@ -28,11 +28,11 @@ noinst_HEADERS=\ + + + gwbuild_LDADD = \ +- $(top_builddir)/src/$(gwenhywfar_internal_libname) \ + types/libgwb_types.la \ + parser/libgwb_parser.la \ + tools/libgwb_tools.la \ + builders/libgwb_builders.la \ + buildctx/libgwb_build.la \ ++ $(top_builddir)/src/$(gwenhywfar_internal_libname) \ + $(PROG_LIBRARIES) + diff --git a/ports/libgwenhywfar/vcpkg.json b/ports/libgwenhywfar/vcpkg.json index 01962b31181bde..88bfb4ad469a55 100644 --- a/ports/libgwenhywfar/vcpkg.json +++ b/ports/libgwenhywfar/vcpkg.json @@ -1,21 +1,23 @@ { "name": "libgwenhywfar", - "version-semver": "5.6.0", - "port-version": 5, + "version-semver": "5.12.0", "description": "A helper library for networking and security applications and libraries", "homepage": "https://www.aquamaniac.de/rdm/", - "supports": "!windows & !(osx & arm64)", + "supports": "!windows | mingw", "dependencies": [ - "libgcrypt", { - "name": "libgnutls", - "features": [ - "openssl" - ] + "name": "gettext", + "host": true }, + "libgcrypt", + "libgnutls", { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-make", + "host": true } ], "default-features": [ @@ -24,7 +26,7 @@ ], "features": { "cpp": { - "description": "C++ bindings" + "description": "A C++ binding for the C module GWEN_GUI" }, "libxml2": { "description": "Enables libXML2-depending functionality", @@ -35,17 +37,22 @@ } ] }, + "openssl": { + "description": "OpenSSL support in gct-tool", + "supports": "!arm64", + "dependencies": [ + "openssl" + ] + }, "qt5": { "description": "Qt bindings", + "supports": "!(osx & static)", "dependencies": [ { "name": "qt5-base", "default-features": false } ] - }, - "tools": { - "description": "Some helper tools provided by Gwenhywfar and useful for applications using it" } } } diff --git a/scripts/test_ports/vcpkg-ci-libgwenhywfar/portfile.cmake b/scripts/test_ports/vcpkg-ci-libgwenhywfar/portfile.cmake new file mode 100644 index 00000000000000..dd2570612035c8 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libgwenhywfar/portfile.cmake @@ -0,0 +1,10 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_find_acquire_program(PKGCONFIG) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_PORT_DIR}/project" + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" +) +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-libgwenhywfar/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-libgwenhywfar/project/CMakeLists.txt new file mode 100644 index 00000000000000..7e04f3561e60a5 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libgwenhywfar/project/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.10) +project(libgwenhywfar-test C) + +find_package(PkgConfig REQUIRED) + +block() + pkg_check_modules(gwenhywfar IMPORTED_TARGET REQUIRED gwenhywfar) + + add_executable(libgwenhywfar_pkgconfig main.c) + target_link_libraries(libgwenhywfar_pkgconfig PkgConfig::gwenhywfar) +endblock() diff --git a/scripts/test_ports/vcpkg-ci-libgwenhywfar/project/main.c b/scripts/test_ports/vcpkg-ci-libgwenhywfar/project/main.c new file mode 100644 index 00000000000000..6a24a6a28aa006 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libgwenhywfar/project/main.c @@ -0,0 +1,8 @@ +#include /* based on gwenhywfar.pc */ + +int main() +{ + int result = GWEN_Init(); + GWEN_Fini(); + return result; +} diff --git a/scripts/test_ports/vcpkg-ci-libgwenhywfar/vcpkg.json b/scripts/test_ports/vcpkg-ci-libgwenhywfar/vcpkg.json new file mode 100644 index 00000000000000..3f9f827b083bc9 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-libgwenhywfar/vcpkg.json @@ -0,0 +1,49 @@ +{ + "name": "vcpkg-ci-libgwenhywfar", + "version-string": "ci", + "description": "Validates libgwenhywfar", + "dependencies": [ + { + "name": "libgwenhywfar", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], + "default-features": [ + { + "name": "openssl", + "platform": "!arm64" + }, + { + "name": "qt5", + "platform": "!(osx & static)" + } + ], + "features": { + "openssl": { + "description": "Use openssl", + "dependencies": [ + { + "name": "libgwenhywfar", + "features": [ + "openssl" + ] + } + ] + }, + "qt5": { + "description": "Install qt5 binding", + "dependencies": [ + { + "name": "libgwenhywfar", + "features": [ + "qt5" + ] + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index b7ff38ef4b92c2..aafde3613e4bd3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4625,8 +4625,8 @@ "port-version": 0 }, "libgwenhywfar": { - "baseline": "5.6.0", - "port-version": 5 + "baseline": "5.12.0", + "port-version": 0 }, "libgxps": { "baseline": "0.3.2", diff --git a/versions/l-/libgwenhywfar.json b/versions/l-/libgwenhywfar.json index 2bd0cd1d58c40e..294b4c8605a7b9 100644 --- a/versions/l-/libgwenhywfar.json +++ b/versions/l-/libgwenhywfar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35c7f16cf8e9c02e65d9ce898690ef2b8b0691dd", + "version-semver": "5.12.0", + "port-version": 0 + }, { "git-tree": "8b4376fdc006cc932f5bc581b32479ebd273b275", "version-semver": "5.6.0", From 3ebdcf417915f0197ae44bfd8f8033947f56031c Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Wed, 15 Jan 2025 13:40:22 +0400 Subject: [PATCH 34/44] [openvino] 2024.5.0 update (#43053) Signed-off-by: Ilya Lavrenov --- ports/openvino/002-fix-onnx.patch | 26 ------- ports/openvino/003-protobuf.patch | 37 --------- ports/openvino/004-opencl-v2024.10.24.patch | 64 ---------------- ports/openvino/add-include-chrono.patch | 12 --- ports/openvino/portfile.cmake | 85 ++++++++++++++++----- ports/openvino/vcpkg.json | 18 +++-- versions/baseline.json | 4 +- versions/o-/openvino.json | 5 ++ 8 files changed, 83 insertions(+), 168 deletions(-) delete mode 100644 ports/openvino/002-fix-onnx.patch delete mode 100644 ports/openvino/003-protobuf.patch delete mode 100644 ports/openvino/004-opencl-v2024.10.24.patch delete mode 100644 ports/openvino/add-include-chrono.patch diff --git a/ports/openvino/002-fix-onnx.patch b/ports/openvino/002-fix-onnx.patch deleted file mode 100644 index 7fdbc006a6f0f8..00000000000000 --- a/ports/openvino/002-fix-onnx.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/frontends/onnx/onnx_common/CMakeLists.txt b/src/frontends/onnx/onnx_common/CMakeLists.txt -index d63bce4..116a6e3 100644 ---- a/src/frontends/onnx/onnx_common/CMakeLists.txt -+++ b/src/frontends/onnx/onnx_common/CMakeLists.txt -@@ -30,7 +30,7 @@ target_include_directories(${TARGET_NAME} - - target_link_libraries(${TARGET_NAME} PRIVATE openvino::runtime openvino::util) - --ov_link_system_libraries(${TARGET_NAME} PUBLIC onnx_proto onnx) -+ov_link_system_libraries(${TARGET_NAME} PUBLIC ONNX::onnx ONNX::onnx_proto) - - ov_add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME}) - -diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake -index 24c4940..8ea7d12 100644 ---- a/thirdparty/dependencies.cmake -+++ b/thirdparty/dependencies.cmake -@@ -479,7 +479,7 @@ endif() - # - - if(ENABLE_OV_ONNX_FRONTEND) -- find_package(ONNX 1.15.0 QUIET COMPONENTS onnx onnx_proto NO_MODULE) -+ find_package(ONNX CONFIG REQUIRED) - - if(ONNX_FOUND) - # conan and vcpkg create imported targets 'onnx' and 'onnx_proto' diff --git a/ports/openvino/003-protobuf.patch b/ports/openvino/003-protobuf.patch deleted file mode 100644 index dcb3ba4bb293ae..00000000000000 --- a/ports/openvino/003-protobuf.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/frontends/onnx/frontend/src/frontend.cpp b/src/frontends/onnx/frontend/src/frontend.cpp -index d4b83fee20..28272a1eda 100644 ---- a/src/frontends/onnx/frontend/src/frontend.cpp -+++ b/src/frontends/onnx/frontend/src/frontend.cpp -@@ -2,6 +2,7 @@ - // SPDX-License-Identifier: Apache-2.0 - // - -+#include - #include - #if PROTOBUF_VERSION >= 4022000 // protobuf 4.22 - # define OV_PROTOBUF_ABSL_IS_USED -diff --git a/src/frontends/paddle/src/frontend.cpp b/src/frontends/paddle/src/frontend.cpp -index c6febe0843..5d4789ccb6 100644 ---- a/src/frontends/paddle/src/frontend.cpp -+++ b/src/frontends/paddle/src/frontend.cpp -@@ -4,6 +4,7 @@ - - #include "openvino/frontend/paddle/frontend.hpp" - -+#include - #include - #if PROTOBUF_VERSION >= 4022000 // protobuf 4.22 - # define OV_PROTOBUF_ABSL_IS_USED -diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake -index 9d7b16aeb8..af47fb99ee 100644 ---- a/thirdparty/dependencies.cmake -+++ b/thirdparty/dependencies.cmake -@@ -325,7 +325,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND - # try to find newer version first (major is changed) - # see https://protobuf.dev/support/version-support/ and - # https://github.com/protocolbuffers/protobuf/commit/d61f75ff6db36b4f9c0765f131f8edc2f86310fa -- find_package(Protobuf 4.22.0 QUIET CONFIG) -+ find_package(Protobuf REQUIRED CONFIG) - if(Protobuf_FOUND) - # protobuf was found via CONFIG mode, let's save it for later usage in OpenVINOConfig.cmake static build - set(protobuf_config CONFIG) diff --git a/ports/openvino/004-opencl-v2024.10.24.patch b/ports/openvino/004-opencl-v2024.10.24.patch deleted file mode 100644 index 332c23862420f7..00000000000000 --- a/ports/openvino/004-opencl-v2024.10.24.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit 255202328d39490f2cdca0d646b2e12b17ac9b69 -Author: Ilya Lavrenov -Date: Mon Jan 6 09:56:08 2025 +0100 - - Migrate to OpenCL v2024.10.24 - -diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp -index 759d796a5e..7246a6f6df 100644 ---- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp -+++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_ext.hpp -@@ -16,6 +16,10 @@ - #include - #endif - -+#ifndef CL_HPP_PARAM_NAME_CL_INTEL_UNIFIED_SHARED_MEMORY_ -+#define OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 -+#endif -+ - #include - - #ifdef _WIN32 -@@ -45,12 +49,16 @@ typedef cl_va_api_device_set_intel cl_device_set_intel; - - #endif // cl_intel_required_subgroup_size - -+#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 -+ - namespace cl { - namespace detail { --CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, vector) -+CL_HPP_DECLARE_PARAM_TRAITS_(cl_device_info, CL_DEVICE_SUB_GROUP_SIZES_INTEL, cl::vector) - } // namespace detail - } // namespace cl - -+#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 -+ - /*************************************************************** - * cl_intel_command_queue_families - ***************************************************************/ -@@ -260,11 +268,15 @@ typedef cl_bitfield cl_device_feature_capabilities_intel; - - #endif // cl_intel_device_attribute_query - -+#ifndef CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ - #define CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(F) \ - F(cl_device_info, CL_DEVICE_QUEUE_FAMILY_PROPERTIES_INTEL, cl::vector) \ - \ - F(cl_command_queue_info, CL_QUEUE_FAMILY_INTEL, cl_uint) \ - F(cl_command_queue_info, CL_QUEUE_INDEX_INTEL, cl_uint) -+#endif // CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_ -+ -+#ifdef OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 - - namespace cl { - namespace detail { -@@ -279,6 +291,8 @@ CL_HPP_PARAM_NAME_CL_INTEL_COMMAND_QUEUE_FAMILIES_(CL_HPP_DECLARE_PARAM_TRAITS_) - } // namespace detail - } // namespace cl - -+#endif // OPENVINO_CLHPP_HEADERS_ARE_OLDER_THAN_V2024_10_24 -+ - #include - - namespace { diff --git a/ports/openvino/add-include-chrono.patch b/ports/openvino/add-include-chrono.patch deleted file mode 100644 index 7a71f969f9c023..00000000000000 --- a/ports/openvino/add-include-chrono.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/core/include/openvino/pass/manager.hpp b/src/core/include/openvino/pass/manager.hpp -index a026957..a727942 100644 ---- a/src/core/include/openvino/pass/manager.hpp -+++ b/src/core/include/openvino/pass/manager.hpp -@@ -4,6 +4,7 @@ - - #pragma once - -+#include - #include - #include - #include diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index 2eddc5a5b344f6..0b79fba488e400 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -1,16 +1,61 @@ +vcpkg_download_distfile(PATCH_002_PROTOBUF # https://github.com/openvinotoolkit/openvino/pull/27510 + URLS https://github.com/openvinotoolkit/openvino/commit/103c3b72259648c990970afb8ce2bec489fcf583.patch?full_index=1 + SHA512 315eb2f651b55fc70a4d6faeb1ac1b5d90d53b9010fdc98f3417beb86854ed733eba105ea51de8795471c5e84340b96cf17d511ea3fe3447c5f961ded661a947 + FILENAME openvinotoolkit-openvino-103c3b72259648c990970afb8ce2bec489fcf583.patch +) + +vcpkg_download_distfile(PATCH_003_CODE_SNIPPETS_TEMPALTE # https://github.com/openvinotoolkit/openvino/pull/28172 + URLS https://github.com/openvinotoolkit/openvino/commit/8d74cbb8e1af7c66ccee202fec5a18565e5b37b0.patch?full_index=1 + SHA512 24640b608c2eb78b948c257a8bc9bb0c2f05e4d6cb04c23cf7546a3191a73e163b4732590eb8e5b834765bb78472e1454785c20c74a4dcbaf40a34ff14fafc83 + FILENAME openvinotoolkit-openvino-8d74cbb8e1af7c66ccee202fec5a18565e5b37b0.patch +) + +vcpkg_download_distfile(PATCH_004_ADD_CHRONO # https://github.com/openvinotoolkit/openvino/pull/28192 + URLS https://github.com/openvinotoolkit/openvino/commit/9d78056f243b1f8d5c0331420416c98a005e5945.patch?full_index=1 + SHA512 8b44e04ed88945174b17c6dada2ce3065340b6278a140717599ec0c33f548679424c5acd36b5edc10f2ed74c3288626c2b47a1af0ab530ed6a7ca868fe88ad4b + FILENAME openvinotoolkit-openvino-9d78056f243b1f8d5c0331420416c98a005e5945.patch +) + +vcpkg_download_distfile(PATCH_005_LEVEL_ZERO_FROM_SYSTEM # https://github.com/openvinotoolkit/openvino/pull/27633 + URLS https://github.com/openvinotoolkit/openvino/commit/5c2b9ac6b4daffc24762aea2f6dacdaa70d5ae8c.patch?full_index=1 + SHA512 85c2422ef78b853dd9937319cf16c915c3ce4a143f3a0628ffd4edf0ceac4c26d90e3ffd9d6c7f4f3f72fc631c4860fcfcbf96ce37134b31fc45ccae4f3df308 + FILENAME openvinotoolkit-openvino-5c2b9ac6b4daffc24762aea2f6dacdaa70d5ae8c.patch +) + +vcpkg_download_distfile(PATCH_006_LEVEL_ZERO_AT_RUNTIME # https://github.com/openvinotoolkit/openvino/pull/27659 + URLS https://github.com/openvinotoolkit/openvino/commit/99d7cd4bc4492b81a99bc41e2d2469da1a929491.patch?full_index=1 + SHA512 091ad0328feb0ec9a59a9728ede444c408db9e7532b7a85b62b63f059fa766833b9c0b2d1c8e5972476652b24d62cf8bdb0313b197e2ea5e0b64c79a0a0da1b1 + FILENAME openvinotoolkit-openvino-99d7cd4bc4492b81a99bc41e2d2469da1a929491.patch +) + +vcpkg_download_distfile(PATCH_007_OPENCL_V2024_10_24 # https://github.com/openvinotoolkit/openvino/pull/28275 + URLS https://github.com/openvinotoolkit/openvino/commit/120ad760494eeb513ea957bdbc655b6ad07bce42.patch?full_index=1 + SHA512 45a06bf54cef7d619b862f3219dd1225fb38bb653b2f09191d57e945a2df08621b15a27463429d5d72a18dfe05b113b94555cea0cabab0da36c9d89a2757196a + FILENAME openvinotoolkit-openvino-120ad760494eeb513ea957bdbc655b6ad07bce42.patch +) + +vcpkg_download_distfile(PATCH_008_FIX_LEVEL_ZERO_SYSTEM # https://github.com/openvinotoolkit/openvino/pull/28241 + URLS https://github.com/openvinotoolkit/openvino/commit/65f6ce8c5cd0ac5ae5f64fc1c533cc621475a105.patch?full_index=1 + SHA512 e756d181658dee933ffb727d004276a8fc37f9cfc473b25b0e0b5043234b1b2f021e1b26aa6513f7f40a9897d3c96b652aa7d81521205602f673d73a74cb5621 + FILENAME openvinotoolkit-openvino-65f6ce8c5cd0ac5ae5f64fc1c533cc621475a105.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openvinotoolkit/openvino REF "${VERSION}" - SHA512 2bf3f00589d825b7f4ca40d43129d81af4ba62382f98b283a3a206e7661a7a69f178c6afafdde646db8d68cb7fc54ec5280d2f4ff4fbbffe24082cf6649dda29 + SHA512 b003647de3de49e605943488ca9b2e5196b20d95b3152f0c2331c283d4cb253d1bbbb9cde04fa82733d3871d7128c6db6210957660bd89f26462798f782eca47 HEAD_REF master PATCHES # vcpkg specific patch, because OV creates a file in source tree, which is prohibited 001-disable-tools.patch - 002-fix-onnx.patch - 003-protobuf.patch - add-include-chrono.patch #https://github.com/openvinotoolkit/openvino/pull/27782 - 004-opencl-v2024.10.24.patch # https://github.com/openvinotoolkit/openvino/pull/28275 + "${PATCH_002_PROTOBUF}" + "${PATCH_003_CODE_SNIPPETS_TEMPALTE}" + "${PATCH_004_ADD_CHRONO}" + "${PATCH_005_LEVEL_ZERO_FROM_SYSTEM}" + "${PATCH_006_LEVEL_ZERO_AT_RUNTIME}" + "${PATCH_007_OPENCL_V2024_10_24}" + "${PATCH_008_FIX_LEVEL_ZERO_SYSTEM}" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -39,8 +84,8 @@ if(ENABLE_INTEL_GPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO oneapi-src/oneDNN - REF 4ccd07e3a10e1c08075cf824ac14708245fbc334 - SHA512 c9a28f8427b5cd9c057a546b0b62303026f848045b26e0c9705e2f64d5bc84424ee15935d3bf5ee120d3c430a9dd41b7a6e26ef4fc0c53a2154ce83fcaee8b5a + REF 1722066ad4c0f15495f2d0fcbe9deb2bfd188c36 + SHA512 0b0461bf42d67f0fe7c6c61289a28e42915f7ac2ea5cc569957b8bb601962bec6135e84a2716911394952dffe2bb557c2d59d42c7f80a8db3c3937ecc6bd8ce8 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu") @@ -53,8 +98,8 @@ if(ENABLE_INTEL_CPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO openvinotoolkit/oneDNN - REF c8ae8d96e963bd04214858319fa334968e5e73c9 - SHA512 6877ca37c3678e738fa94767b70432d3fff73305342164d0902875d9bcce3fe12abaf52bfc6ae0ef288532324e746b01e604ab7e47f198e7776352b8f5b6f009 + REF c60a9946aa2386890e5c9f5587974facb7624227 + SHA512 cc91f5b2ece1c3f14af308e3da436447d07964fa5ffa848c571fe67197a367673bf7bf9cd979fab0c9b216f92c611bd8df7018ec8e080f10759582629c10cb9d ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn") @@ -77,31 +122,28 @@ if(ENABLE_INTEL_CPU) OUT_PYTHON_VAR OV_PYTHON_WITH_SCONS ) + list(APPEND FEATURE_OPTIONS "-DPython3_EXECUTABLE=${OV_PYTHON_WITH_SCONS}") + vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO ARM-software/ComputeLibrary - REF v24.08 - SHA512 82debaf8d8345b79b112afdabf6019c7ad8a9b30161d3061320a3da3040b2ad49153cc508caafe9fb1182c2669c958785acf2c361382080af273465d1727a71c + REF v24.09 + SHA512 c755da7d576b9bc1f33c9505efe4ce9e50cb927978f929d61f31b213904dca45ddb78b7c0cf9b215e37d2028e0404f4e3435678c120bba16263b55fd701eb4f1 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary") endif() endif() if(ENABLE_INTEL_NPU) - list(APPEND FEATURE_OPTIONS "-DENABLE_INTEL_NPU_INTERNAL=OFF") - vcpkg_from_github( - OUT_SOURCE_PATH DEP_SOURCE_PATH - REPO oneapi-src/level-zero - REF v1.17.6 - SHA512 bb412e875d97d1c80a0e67087e6dac1a6ffb91fa50e22deb7649ee3250c0937679d225419b52bfd7938f71a66ac15742a6a215cee7714c27e0f935e04df5b88e - ) - file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero") + list(APPEND FEATURE_OPTIONS + "-DENABLE_INTEL_NPU_INTERNAL=OFF" + "-DENABLE_SYSTEM_LEVEL_ZERO=ON") vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO intel/level-zero-npu-extensions - REF 16c85231a82ee1a0b06ed7ab7da3f411a0878ed7 - SHA512 983468c7706dc44cfc248c491cf51d2f69181c16ae1e400ca689df39c51112e03227c2f311173b1665115cdd33fa7d51d48e75adaf8353564a980b37c16aaa66 + REF 110f48ee8eda22d8b40daeeecdbbed0fc3b08f8b + SHA512 aaaeecad6c00489b652cd94d63ed0c1e59eb0eaed8b463198b40f1af3944004b072808ccc3074b71d825e9f0f37bf76fedf296961bb18959ef66a699b71fec41 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_npu/thirdparty/level-zero-ext") endif() @@ -140,6 +182,7 @@ vcpkg_cmake_configure( "-DENABLE_SYSTEM_TBB=ON" "-DENABLE_TBBBIND_2_5=OFF" "-DENABLE_TEMPLATE=OFF" + "-DENABLE_OV_JAX_FRONTEND=OFF" "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json index 6ae6e73a9340c2..426b6e333de644 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -1,8 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", - "version": "2024.4.0", - "port-version": 6, + "version": "2024.5.0", "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ @@ -37,7 +36,7 @@ { "name": "xbyak", "platform": "!(arm | uwp)", - "version>=": "6.69" + "version>=": "6.73" } ], "default-features": [ @@ -53,6 +52,10 @@ }, "hetero", "ir", + { + "name": "npu", + "platform": "x64 & !(osx | uwp)" + }, "onnx", "paddle", "pytorch", @@ -85,15 +88,18 @@ "description": "Enables IR frontend for reading models in OpenVINO IR format" }, "npu": { - "description": "NPU Support", - "supports": "x64 & !(osx | uwp) & !static" + "description": "Enables NPU plugin for inference", + "supports": "x64 & !(osx | uwp)", + "dependencies": [ + "level-zero" + ] }, "onnx": { "description": "Enables ONNX frontend for reading models in ONNX format", "dependencies": [ { "name": "onnx", - "version>=": "1.13.1" + "version>=": "1.16.2" }, { "name": "protobuf", diff --git a/versions/baseline.json b/versions/baseline.json index aafde3613e4bd3..78a4ce89899361 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6789,8 +6789,8 @@ "port-version": 0 }, "openvino": { - "baseline": "2024.4.0", - "port-version": 6 + "baseline": "2024.5.0", + "port-version": 0 }, "openvpn3": { "baseline": "3.10", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index d3f809fbae4523..6a101c4506bf90 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "244afb074f2bdd5195e2631afdfe8af8753c5362", + "version": "2024.5.0", + "port-version": 0 + }, { "git-tree": "a52cc9b435c23fc08e94f744aa4799de019a76c7", "version": "2024.4.0", From e1118ae492d4b3470c8d546e080a7cad8bb49938 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:43:35 +0800 Subject: [PATCH 35/44] [libtorch] Include `` for `high_resolution_clock` (#43234) --- ports/libtorch/add-include-chrono.patch | 11 +++++++++++ ports/libtorch/portfile.cmake | 1 + ports/libtorch/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtorch.json | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/libtorch/add-include-chrono.patch diff --git a/ports/libtorch/add-include-chrono.patch b/ports/libtorch/add-include-chrono.patch new file mode 100644 index 00000000000000..0375ba860eb956 --- /dev/null +++ b/ports/libtorch/add-include-chrono.patch @@ -0,0 +1,11 @@ +diff --git a/torch/csrc/jit/runtime/logging.h b/torch/csrc/jit/runtime/logging.h +index 5499ecf..269168e 100644 +--- a/torch/csrc/jit/runtime/logging.h ++++ b/torch/csrc/jit/runtime/logging.h +@@ -1,5 +1,6 @@ + #pragma once + ++#include + #include + #include + #include diff --git a/ports/libtorch/portfile.cmake b/ports/libtorch/portfile.cmake index 4dc05e8dc48706..24d5130f233d33 100644 --- a/ports/libtorch/portfile.cmake +++ b/ports/libtorch/portfile.cmake @@ -39,6 +39,7 @@ vcpkg_from_github( fix-aten-cutlass.patch fix-build-error-with-fmt11.patch no-abs-path.patch + add-include-chrono.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 1d2b9770749453..eda740b804489d 100644 --- a/ports/libtorch/vcpkg.json +++ b/ports/libtorch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtorch", "version": "2.1.2", - "port-version": 9, + "port-version": 10, "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration", "homepage": "https://pytorch.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 78a4ce89899361..c6a3e084decb2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5230,7 +5230,7 @@ }, "libtorch": { "baseline": "2.1.2", - "port-version": 9 + "port-version": 10 }, "libtorrent": { "baseline": "2.0.10", diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json index 3a1b3878fd5081..bf8ec57c1eb7d2 100644 --- a/versions/l-/libtorch.json +++ b/versions/l-/libtorch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7307f8c37b266aeb61d83e069740e75cff863bf6", + "version": "2.1.2", + "port-version": 10 + }, { "git-tree": "0a4d67bf0f603494ff7ce3e51587513a1df295fe", "version": "2.1.2", From 7a67a2de78862d30e4052b143f7b27e3a553b4c0 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Wed, 15 Jan 2025 10:44:22 +0100 Subject: [PATCH 36/44] [sentry-native] update to 0.7.18 (#43262) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 2 +- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 9caef15c54a8ae..ef974fab7b199e 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 559e831720e27ed2bf0702c7fc29a3c2dfa553e2c74b8c7adbc3f5071a5eea0e434127fc8cf9d8f29aa668ab627c84dc13194227203aab085a437684e4591895 + SHA512 1d7b909019e4e9c88f5cc142484f944d57edad4a93df9db1e50e3b5584304694029557cf7286ed48dc952485b8682f03cf43491bb6980f8f517c4c4c7ad8fa2b ) vcpkg_extract_source_archive( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 1d0ab2059357ef..39a3e19b8f15b8 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.7.17", + "version": "0.7.18", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c6a3e084decb2e..0c44a8a7df8b8f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8301,7 +8301,7 @@ "port-version": 1 }, "sentry-native": { - "baseline": "0.7.17", + "baseline": "0.7.18", "port-version": 0 }, "septag-dmon": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 17dd66126d5e45..ab1fac27e8f649 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6174389ee3b7d1866941781507d7da2d47ada313", + "version": "0.7.18", + "port-version": 0 + }, { "git-tree": "1c5a6fefa8e806d07acee57b8c25b6a72ce22822", "version": "0.7.17", From 6220088b956e4e4c7de27fb5f5eff8c9745cb4c8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:45:50 +0800 Subject: [PATCH 37/44] [mosquitto] update version to 2.0.20 (#43256) Co-authored-by: Jon --- .../0005-websocket-shared-lib-name.patch | 11 ++--------- ports/mosquitto/0006-pthreads-for-windows.patch | 15 --------------- ports/mosquitto/portfile.cmake | 5 ++--- ports/mosquitto/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mosquitto.json | 5 +++++ 6 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 ports/mosquitto/0006-pthreads-for-windows.patch diff --git a/ports/mosquitto/0005-websocket-shared-lib-name.patch b/ports/mosquitto/0005-websocket-shared-lib-name.patch index 33074e9c1bb175..eba54c174d2b43 100644 --- a/ports/mosquitto/0005-websocket-shared-lib-name.patch +++ b/ports/mosquitto/0005-websocket-shared-lib-name.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 62ce99e..61f941e 100644 +index e76cc2b..61f941e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -194,13 +194,13 @@ endif (WIN32) +@@ -194,7 +194,7 @@ endif (WIN32) if (WITH_WEBSOCKETS) if (STATIC_WEBSOCKETS) @@ -11,10 +11,3 @@ index 62ce99e..61f941e 100644 if (WIN32) set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi) link_directories(${mosquitto_SOURCE_DIR}) - endif (WIN32) - else (STATIC_WEBSOCKETS) -- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) -+ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) - endif (STATIC_WEBSOCKETS) - endif (WITH_WEBSOCKETS) - diff --git a/ports/mosquitto/0006-pthreads-for-windows.patch b/ports/mosquitto/0006-pthreads-for-windows.patch deleted file mode 100644 index 14d59946f16dcb..00000000000000 --- a/ports/mosquitto/0006-pthreads-for-windows.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4c55e05..adece3e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,8 +68,8 @@ option(WITH_THREADING "Include client library threading support?" ON) - if (WITH_THREADING) - add_definitions("-DWITH_THREADING") - if (WIN32) -- find_package(Threads REQUIRED) -- set (PTHREAD_LIBRARIES Threads::Threads) -+ find_package(pthread CONFIG REQUIRED) -+ set (PTHREAD_LIBRARIES PThreads4W::PThreads4W) - set (PTHREAD_INCLUDE_DIR "") - elseif (ANDROID) - set (PTHREAD_LIBRARIES "") diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index f1487108e5c374..119ba314f8100f 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_from_github( REPO eclipse/mosquitto HEAD_REF master REF "v${VERSION}" - SHA512 667216f3e60f9916d5de200d3a205fb5a5c798564c96e44939af6c8e3af85fffa36a63eba47db009b432d14f43883dbca5b92547a458215dd269e91f6bcfb7fa + SHA512 92994ec34cebc56dd9aba1a5c3e082117157b42dc5a4c418a9e57a741ad0f2d909226e432082d21b4c9836d2f13fc37d39a1a77f0122a349d1ba6d50974e5190 PATCHES 0003-add-find_package-libwebsockets.patch 0004-support-static-build.patch 0005-websocket-shared-lib-name.patch - 0006-pthreads-for-windows.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE) @@ -73,4 +72,4 @@ endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json index d298cf9f3973e1..19457cea96de33 100644 --- a/ports/mosquitto/vcpkg.json +++ b/ports/mosquitto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mosquitto", - "version": "2.0.18", + "version": "2.0.20", "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", "homepage": "https://mosquitto.org/", "license": "EPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0c44a8a7df8b8f..5a9327220d602a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6077,7 +6077,7 @@ "port-version": 3 }, "mosquitto": { - "baseline": "2.0.18", + "baseline": "2.0.20", "port-version": 0 }, "mozjpeg": { diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json index 20220eac430be9..6cc7c6b4743412 100644 --- a/versions/m-/mosquitto.json +++ b/versions/m-/mosquitto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee450abba4fe411781a8bb412bd4b74a0e45892c", + "version": "2.0.20", + "port-version": 0 + }, { "git-tree": "6fbbe753533949d40d9ff4307bab2bb61432a117", "version": "2.0.18", From f576077538d54fc2a932ca89aa5fbfe58ef725f5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 16 Jan 2025 00:57:54 +0100 Subject: [PATCH 38/44] [vcpkg script] Update ninja to 1.12 (#41980) --- ports/libdatachannel/portfile.cmake | 1 + ports/libdatachannel/vcpkg.json | 2 +- ports/qt5-webengine/portfile.cmake | 13 ++++++ ports/qt5-webengine/vcpkg.json | 1 + scripts/ci.baseline.txt | 7 +-- .../vcpkg_find_acquire_program(NINJA).cmake | 32 +++++++++++--- scripts/vcpkg-tools.json | 44 ++++++++++++++----- versions/baseline.json | 4 +- versions/l-/libdatachannel.json | 5 +++ versions/q-/qt5-webengine.json | 5 +++ 10 files changed, 89 insertions(+), 25 deletions(-) diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index ab1db9c674db5d..4a9b92288d8c30 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # version.h configuration OPTIONS ${FEATURE_OPTIONS} -DPREFER_SYSTEM_LIB=ON diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 71d55e0f4dad2b..d5bfcea0042d66 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libdatachannel", "version-semver": "0.21.2", - "port-version": 1, + "port-version": 2, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "MPL-2.0", diff --git a/ports/qt5-webengine/portfile.cmake b/ports/qt5-webengine/portfile.cmake index d861194edfa3ad..1ea5c73aa48205 100644 --- a/ports/qt5-webengine/portfile.cmake +++ b/ports/qt5-webengine/portfile.cmake @@ -45,6 +45,19 @@ vcpkg_add_to_path(PREPEND "${GPERF_DIR}") vcpkg_add_to_path(PREPEND "${NINJA_DIR}") vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") +vcpkg_execute_in_download_mode( + COMMAND "${NINJA}" --version + OUTPUT_VARIABLE ninja_version + OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" +) +if(ninja_version VERSION_GREATER_EQUAL "1.12.1") + message(WARNING + "Found ninja version ${ninja_version} which may fail to build ${PORT}." + "You can supply a different filepath using per-port customization of CMake variable NINJA." + ) +endif() + set(PATCHES common.pri.patch gl.patch build_1.patch diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 33b2681c1b8dff..c8a588406fdc90 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.16", + "port-version": 1, "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", "license": null, "supports": "!static", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 68387e7585f346..472df7f96b4a1d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -917,12 +917,13 @@ qt5-canvas3d:x64-windows=skip qt5-canvas3d:x64-windows-static=skip qt5-canvas3d:x64-windows-static-md=skip qt5-canvas3d:x86-windows=skip +# Skipped to avoid exceeding the 48 hour time limit in CI +# May also need an older ninja version +qt5-webengine:x64-windows=skip +qt5-webengine:x86-windows=skip # Missing system libraries qt5-x11extras:x64-osx=skip qt5-x11extras:arm64-osx=skip -# Skipped to avoid exceeding the 48 hour time limit in CI -qt5-webengine:x86-windows=skip -qt5-webengine:x64-windows=skip # Missing system libraries qtwayland:x64-osx=skip qtwayland:arm64-osx=skip diff --git a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake index 3bca6338a317b3..14deacb32fa7ec 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake @@ -1,17 +1,29 @@ set(program_name ninja) -set(program_version 1.10.2) +set(program_version 1.12.1) set(version_command --version) if(CMAKE_HOST_WIN32) - set(download_filename "ninja-win-${program_version}.zip") - set(tool_subdirectory "${program_version}-windows") - set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") - set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(build_arch $ENV{PROCESSOR_ARCHITEW6432}) + else() + set(build_arch $ENV{PROCESSOR_ARCHITECTURE}) + endif() + if(build_arch MATCHES "^(ARM|arm)64$") + set(download_filename "ninja-winarm64-${program_version}.zip") + set(tool_subdirectory "${program_version}-windows-arm64") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-winarm64.zip") + set(download_sha512 b1826c422a677f47f9f7e001672ce831791b092e4f1cd84ddf2ea067781c31aa8246f26e91dd66300c23ffa77a8ea29910c48ccf7e4235ff20bccc2d2b6e247b) + else() + set(download_filename "ninja-win-${program_version}.zip") + set(tool_subdirectory "${program_version}-windows") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") + set(download_sha512 d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f) + endif() elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(download_filename "ninja-mac-${program_version}.zip") set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip") set(tool_subdirectory "${program_version}-osx") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx") - set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b) + set(download_sha512 4c11f477359c9d1dcda72529a503a59948ec20b368992132e545d6d4f6e3aabfd1d6b1d0f32cf932626037959b24a7bb375ef901e2d002eabadc83a265cbc351) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") else() @@ -21,7 +33,13 @@ else() set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") set(tool_subdirectory "${program_version}-linux") set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") - set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) + set(download_sha512 9c2ad534e7e72e67c608de7784cfbae601095bfca96713731a3f1eca268d66a6302f40c138a4ad97f7e8c902cd3fb05994a175e46fe922295dcc2d1334bf9014) + elseif(HOST_ARCH MATCHES "arm64|aarch64|ARM64|AARCH64") + set(download_filename "ninja-linux-aarch64-${program_version}.zip") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux-aarch64.zip") + set(tool_subdirectory "${program_version}-linux-aarch64") + set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux-aarch64") + set(download_sha512 22c46abb7e6d916e11713705f78d093e9b30029cb49cadc65755908ad9f44b3f2548105174cc615a5ef86c4672b366173f18bd04c2d71710a303d952c06db334) else() set(version_command "") # somewhat hacky way to skip version check and use system binary endif() diff --git a/scripts/vcpkg-tools.json b/scripts/vcpkg-tools.json index 65fdba3dce1082..64015bffff96c8 100644 --- a/scripts/vcpkg-tools.json +++ b/scripts/vcpkg-tools.json @@ -230,34 +230,54 @@ "sha512": "3bb32b7d55347d1af37c6f4ebf0e20b38ce51c37a1baf92f7ad1762000539a03413dd679a6d902fdb1805fa71917300c9692aceee012eb06ecdff10491137aec", "archive": "aria2-1.35.0-osx-darwin.tar.bz2" }, + { + "name": "ninja", + "os": "windows", + "arch": "arm64", + "version": "1.12.1", + "executable": "ninja.exe", + "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-winarm64.zip", + "sha512": "b1826c422a677f47f9f7e001672ce831791b092e4f1cd84ddf2ea067781c31aa8246f26e91dd66300c23ffa77a8ea29910c48ccf7e4235ff20bccc2d2b6e247b", + "archive": "ninja-winarm64-1.12.1.zip" + }, { "name": "ninja", "os": "windows", "arch": "x64", - "version": "1.11.1", + "version": "1.12.1", "executable": "ninja.exe", - "url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip", - "sha512": "a700e794c32eb67b9f87040db7f1ba3a8e891636696fc54d416b01661c2421ff46fa517c97fd904adacdf8e621df3e68ea380105b909ae8b6651a78ae7eb3199", - "archive": "ninja-win-1.11.1.zip" + "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip", + "sha512": "d6715c6458d798bcb809f410c0364dabd937b5b7a3ddb4cd5aba42f9fca45139b2a8a3e7fd9fbd88fd75d298ed99123220b33c7bdc8966a9d5f2a1c9c230955f", + "archive": "ninja-win-1.12.1.zip" + }, + { + "name": "ninja", + "os": "linux", + "arch": "arm64", + "version": "1.12.1", + "executable": "ninja", + "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux-aarch64.zip", + "sha512": "22c46abb7e6d916e11713705f78d093e9b30029cb49cadc65755908ad9f44b3f2548105174cc615a5ef86c4672b366173f18bd04c2d71710a303d952c06db334", + "archive": "ninja-linux-aarch64-1.12.1.zip" }, { "name": "ninja", "os": "linux", "arch": "x64", - "version": "1.11.1", + "version": "1.12.1", "executable": "ninja", - "url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip", - "sha512": "6403dac9196baffcff614fa73ea530752997c8db6bbfbaa0446b4b09d7327e2aa6e8615d1283c961d3bf0df497e85ba86604149f1505ee75f89d600245a45dde", - "archive": "ninja-linux-1.11.1.zip" + "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip", + "sha512": "9c2ad534e7e72e67c608de7784cfbae601095bfca96713731a3f1eca268d66a6302f40c138a4ad97f7e8c902cd3fb05994a175e46fe922295dcc2d1334bf9014", + "archive": "ninja-linux-1.12.1.zip" }, { "name": "ninja", "os": "osx", - "version": "1.11.1", + "version": "1.12.1", "executable": "ninja", - "url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip", - "sha512": "dad33b0918c60bbf5107951a936175b1610b4894a408f4ba4b47a2f5b328fc982a52a2aed6a0cb75028ee4765af5083bea66611c37516826eb0c851366bb4427", - "archive": "ninja-mac-1.11.1.zip" + "url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip", + "sha512": "4c11f477359c9d1dcda72529a503a59948ec20b368992132e545d6d4f6e3aabfd1d6b1d0f32cf932626037959b24a7bb375ef901e2d002eabadc83a265cbc351", + "archive": "ninja-mac-1.12.1.zip" }, { "name": "powershell-core", diff --git a/versions/baseline.json b/versions/baseline.json index 5a9327220d602a..6551689a964fc5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4422,7 +4422,7 @@ }, "libdatachannel": { "baseline": "0.21.2", - "port-version": 1 + "port-version": 2 }, "libdatrie": { "baseline": "0.2.13", @@ -7530,7 +7530,7 @@ }, "qt5-webengine": { "baseline": "5.15.16", - "port-version": 0 + "port-version": 1 }, "qt5-webglplugin": { "baseline": "5.15.16", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 7e27848a8f2baa..d09ca00928681c 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdae5c743dedd26494c0c49587b1eef0bdffe042", + "version-semver": "0.21.2", + "port-version": 2 + }, { "git-tree": "df0663ab881ed7a331bf51b6bf652e80fc55dbf4", "version-semver": "0.21.2", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 61e59d41b364ed..9941a062e5a1a9 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92f56035f25cfc039d74c70b6905c1b78e480e2e", + "version": "5.15.16", + "port-version": 1 + }, { "git-tree": "b49c1e293ead06cecbbc431801688483b0473f3e", "version": "5.15.16", From b060916374afb51b7e2131bc2e784a510e869854 Mon Sep 17 00:00:00 2001 From: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com> Date: Thu, 16 Jan 2025 02:35:09 +0000 Subject: [PATCH 39/44] [vcpkg baseline][salome-configuration][salome-medcoupling] Update to official download source on GitHub (#43281) --- ports/salome-configuration/portfile.cmake | 10 +++++++--- ports/salome-configuration/vcpkg.json | 1 + ports/salome-medcoupling/portfile.cmake | 10 +++++++--- ports/salome-medcoupling/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/s-/salome-configuration.json | 5 +++++ versions/s-/salome-medcoupling.json | 5 +++++ 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/ports/salome-configuration/portfile.cmake b/ports/salome-configuration/portfile.cmake index 1561e845b9b9c1..d7c9faa88185bf 100644 --- a/ports/salome-configuration/portfile.cmake +++ b/ports/salome-configuration/portfile.cmake @@ -1,7 +1,11 @@ -vcpkg_from_git( +string(REPLACE "." "_" UNDERSCORE_VERSION "${VERSION}") + +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH_CONFIG - URL "https://git.salome-platform.org/gitpub/tools/configuration.git" - REF "25f724f7a6c0000330a40c3851dcd8bc2493e1fa" + REPO SalomePlatform/configuration + REF "V${UNDERSCORE_VERSION}" + SHA512 e905a0f1e1105f5a630153036b80942032ccc07fad411d390e4da19d56561e224ac2ac681873b97d811d33ce4b0c9518ce3488b54414a42e011c39628d8e1673 + HEAD_REF master ) file(COPY "${SOURCE_PATH_CONFIG}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/salome-configuration/vcpkg.json b/ports/salome-configuration/vcpkg.json index 75bd4aa63e74d1..33b3d3fff9e887 100644 --- a/ports/salome-configuration/vcpkg.json +++ b/ports/salome-configuration/vcpkg.json @@ -1,6 +1,7 @@ { "name": "salome-configuration", "version": "9.10.0", + "port-version": 1, "description": "Configuration files and other utilities for SALOME platform", "homepage": "https://www.salome-platform.org", "license": "LGPL-2.1-or-later", diff --git a/ports/salome-medcoupling/portfile.cmake b/ports/salome-medcoupling/portfile.cmake index 79e1ef4ba039cf..2e031f1aa0fcf9 100644 --- a/ports/salome-medcoupling/portfile.cmake +++ b/ports/salome-medcoupling/portfile.cmake @@ -4,10 +4,14 @@ if(VCPKG_TARGET_IS_WINDOWS) # in the EXPORTS macros. endif() -vcpkg_from_git( +string(REPLACE "." "_" UNDERSCORE_VERSION "${VERSION}") + +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - URL "https://git.salome-platform.org/gitpub/tools/medcoupling.git" - REF "fe2e38d301902c626f644907e00e499552bb2fa5" + REPO SalomePlatform/medcoupling + REF "V${UNDERSCORE_VERSION}" + SHA512 576b10daf58830e934a3f9d06abc63a22be76b995b2c2f2d1ab0bf16a76f3ba90f583eab06be2d665874cb433f8c990b7a7fd6724f69a5a3f9a5c20c775407cd + HEAD_REF master PATCHES win.patch fix-missing-symbols.patch diff --git a/ports/salome-medcoupling/vcpkg.json b/ports/salome-medcoupling/vcpkg.json index ba9051916243dc..9a200cb2aea6e6 100644 --- a/ports/salome-medcoupling/vcpkg.json +++ b/ports/salome-medcoupling/vcpkg.json @@ -1,6 +1,7 @@ { "name": "salome-medcoupling", "version": "9.10.0", + "port-version": 1, "description": "salome-medcoupling is a part of SALOME platform to manipulate meshes and fields in memory, and use salome-med format for files.", "homepage": "https://www.salome-platform.org", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 6551689a964fc5..73d291c872c312 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8142,7 +8142,7 @@ }, "salome-configuration": { "baseline": "9.10.0", - "port-version": 0 + "port-version": 1 }, "salome-med-fichier": { "baseline": "4.1.1", @@ -8150,7 +8150,7 @@ }, "salome-medcoupling": { "baseline": "9.10.0", - "port-version": 0 + "port-version": 1 }, "sassc": { "baseline": "3.6.2", diff --git a/versions/s-/salome-configuration.json b/versions/s-/salome-configuration.json index b3bb0594a3a0c4..4b4eaf83cadd89 100644 --- a/versions/s-/salome-configuration.json +++ b/versions/s-/salome-configuration.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "729c277b29f980cab19babca0dadc1a1ffb6de61", + "version": "9.10.0", + "port-version": 1 + }, { "git-tree": "2cbf34b9ab5a63d3b341c3a8c3e1b0cf48c1c6d9", "version": "9.10.0", diff --git a/versions/s-/salome-medcoupling.json b/versions/s-/salome-medcoupling.json index 45123a6a95c91c..2e927432938772 100644 --- a/versions/s-/salome-medcoupling.json +++ b/versions/s-/salome-medcoupling.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b5a4eb9704cc5b12228fdaeffbf6b4e34609431", + "version": "9.10.0", + "port-version": 1 + }, { "git-tree": "5b007fe28cfb58ed83464e901ce70e8a1ef4bfa5", "version": "9.10.0", From c50109fdf986b28d54efd76bbad58ea6c9c51f05 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Thu, 16 Jan 2025 10:51:13 +0800 Subject: [PATCH 40/44] [miniupnpc] Update to 2.3.0 (#43233) Co-authored-by: Monica --- ports/miniupnpc/portfile.cmake | 4 ++-- ports/miniupnpc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/miniupnpc.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/miniupnpc/portfile.cmake b/ports/miniupnpc/portfile.cmake index 78d66aebb9d10f..8152284bb4baf7 100644 --- a/ports/miniupnpc/portfile.cmake +++ b/ports/miniupnpc/portfile.cmake @@ -2,8 +2,8 @@ string(REPLACE "." "_" MINIUPNPC_VERSION "${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO miniupnp/miniupnp - REF "miniupnpd_${MINIUPNPC_VERSION}" - SHA512 f461b57446d9086e8fc2caf6ef202a78d204b2580d6096aca63234fda53302cad03840b14cc0d8b68e9033049b749be46e35c3737cc6cbcd2ad30c59b737a390 + REF "miniupnpc_${MINIUPNPC_VERSION}" + SHA512 8b3e0499507a7da679676c9c086658b0be441845a9649c0e989227d6f7afd9de754f169e7c726e7bb5c450d4b62bb92fabfcfd60696350b6e137a13fb1d3201a HEAD_REF master ) diff --git a/ports/miniupnpc/vcpkg.json b/ports/miniupnpc/vcpkg.json index 568a768dd0f05d..f5e9b155827e78 100644 --- a/ports/miniupnpc/vcpkg.json +++ b/ports/miniupnpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "miniupnpc", - "version": "2.3.7", + "version": "2.3.0", "description": "UPnP client library/tool to access Internet Gateway Devices", "supports": "!uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 73d291c872c312..c50cec458f37a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5997,7 +5997,7 @@ "port-version": 0 }, "miniupnpc": { - "baseline": "2.3.7", + "baseline": "2.3.0", "port-version": 0 }, "miniz": { diff --git a/versions/m-/miniupnpc.json b/versions/m-/miniupnpc.json index 7c7f707f389d36..9eb62022d872c5 100644 --- a/versions/m-/miniupnpc.json +++ b/versions/m-/miniupnpc.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "7cd06d47cb0cbaf659be8195bf06f2aef1980746", - "version": "2.3.7", + "git-tree": "1df0846b7dbe04a4f9904be58d30759b16f119f0", + "version": "2.3.0", "port-version": 0 }, { From c811ff4a0d320a018f84085ed38f23d76b21073a Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Thu, 16 Jan 2025 05:14:36 +0100 Subject: [PATCH 41/44] [tbb] Fix build for non-English systems (#43291) --- ports/tbb/fix-lang.patch | 13 +++++++++++++ ports/tbb/portfile.cmake | 2 ++ ports/tbb/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tbb.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/tbb/fix-lang.patch diff --git a/ports/tbb/fix-lang.patch b/ports/tbb/fix-lang.patch new file mode 100644 index 00000000000000..1cabc1f783f855 --- /dev/null +++ b/ports/tbb/fix-lang.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake +index cf6d8bdb..458ea339 100644 +--- a/cmake/compilers/GNU.cmake ++++ b/cmake/compilers/GNU.cmake +@@ -48,7 +48,7 @@ endif() + # information is written to either stdout or stderr. To not make any + # assumptions, both are captured. + execute_process( +- COMMAND ${CMAKE_COMMAND} -E env "LANG=C" ${CMAKE_CXX_COMPILER} -xc -c /dev/null -Wa,-v -o/dev/null ++ COMMAND ${CMAKE_COMMAND} -E env "LC_ALL=C" "LANG=C" ${CMAKE_CXX_COMPILER} -xc -c /dev/null -Wa,-v -o/dev/null + OUTPUT_VARIABLE ASSEMBLER_VERSION_LINE_OUT + ERROR_VARIABLE ASSEMBLER_VERSION_LINE_ERR + OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index ccfafdfee60ef4..6c4a0cf4086912 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 c87b84964b2c323f61895a532968dfa6413a774c177cffbf6e798a07e74e8da5d449144875771df0a1b02657eeb2a7ae4d41c6c432dbf7ea50e3d5a9ea9f8cd3 HEAD_REF master + PATCHES + fix-lang.patch # https://github.com/uxlfoundation/oneTBB/pull/1606 ) vcpkg_check_features( diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index 8525d00a5ef851..da0cf42fbabff4 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tbb", "version": "2022.0.0", + "port-version": 1, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index c50cec458f37a8..8779ce38204ed6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8858,7 +8858,7 @@ }, "tbb": { "baseline": "2022.0.0", - "port-version": 0 + "port-version": 1 }, "tcb-span": { "baseline": "2022-06-15", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index e7f683d83887dd..339182f33aa2f8 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8eb4f6f5f53c1b56598b26a951b8d49cf349d0d", + "version": "2022.0.0", + "port-version": 1 + }, { "git-tree": "1190d84d0e84ec7100662a4c35cd6a27ce532864", "version": "2022.0.0", From 400cc7d4885f2e0d43de0eb394ac3af51a7aa812 Mon Sep 17 00:00:00 2001 From: Mengna-Li <543250287@qq.com> Date: Thu, 16 Jan 2025 12:59:54 +0800 Subject: [PATCH 42/44] [llfio] update to 2025-01-13 (#43301) Co-authored-by: Mengna-Li --- ports/llfio/portfile.cmake | 4 ++-- ports/llfio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/llfio.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index f317aad94bbf17..ea6153ac92b053 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/llfio - REF 2af67dad6d87ec37a4dd042c48f5d0edcdeff326 - SHA512 207cf7b113aa7703a9197254a01bde794a1ec5ab8ab94e690913344b29bb2579e942f12260ce6c208fb919e11731f57d2e5c80ca85ccf1d98f6747a1681be7a9 + REF 52560148e7e199675a38ab5669d172a3db6a5c94 + SHA512 a13c8c3340b871f492b1a9eab087ff0ff16d7bee2e3fb3b6539d34efdc3e286920f89283f4df48a79f716803b58abf389ab379bc08838b65d6f5f05455505492 HEAD_REF develop ) diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index 704a216b65a797..d9320f79765fcd 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "llfio", - "version-date": "2024-09-05", + "version-date": "2025-01-13", "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/versions/baseline.json b/versions/baseline.json index 8779ce38204ed6..73a93957d6186e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5557,7 +5557,7 @@ "port-version": 0 }, "llfio": { - "baseline": "2024-09-05", + "baseline": "2025-01-13", "port-version": 0 }, "llgi": { diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index fe848d6795f6c9..7b2fe4c1105fc2 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79adb348fb8078a09e4751f68192908083ffc305", + "version-date": "2025-01-13", + "port-version": 0 + }, { "git-tree": "3060aa294d21b2d01efa79cc1c79fd416e6922c3", "version-date": "2024-09-05", From 953d212337371e3b73d5ee9ba143bc9c7808c0f8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 16 Jan 2025 06:04:50 +0100 Subject: [PATCH 43/44] [vcpkg-make] Misc fixes, in particular: parallel builds (#43249) --- ports/vcpkg-make/vcpkg.json | 2 +- ports/vcpkg-make/vcpkg_make.cmake | 7 +++++-- ports/vcpkg-make/vcpkg_make_common.cmake | 3 +-- ports/vcpkg-make/vcpkg_make_configure.cmake | 4 ++-- ports/vcpkg-make/vcpkg_make_install.cmake | 15 ++++++++------- versions/baseline.json | 2 +- versions/v-/vcpkg-make.json | 5 +++++ 7 files changed, 23 insertions(+), 15 deletions(-) diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json index 59046f78a10ecc..ecf88b73a2239a 100644 --- a/ports/vcpkg-make/vcpkg.json +++ b/ports/vcpkg-make/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-make", - "version-date": "2024-12-27", + "version-date": "2025-01-13", "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure", "license": null, "supports": "native", diff --git a/ports/vcpkg-make/vcpkg_make.cmake b/ports/vcpkg-make/vcpkg_make.cmake index ee3ec778fce9b2..757b2bd7fdf565 100644 --- a/ports/vcpkg-make/vcpkg_make.cmake +++ b/ports/vcpkg-make/vcpkg_make.cmake @@ -53,7 +53,7 @@ function(vcpkg_run_shell_as_build) "SHELL;COMMAND;NO_PARALLEL_COMMAND;SAVE_LOG_FILES" ) z_vcpkg_unparsed_args(FATAL_ERROR) - z_vcpkg_required_args(SHELL WORKINK_DIRECTORY COMMAND LOGNAME) + z_vcpkg_required_args(SHELL WORKING_DIRECTORY COMMAND LOGNAME) set(extra_opts "") if(arg_SAVE_LOG_FILES) @@ -62,9 +62,12 @@ function(vcpkg_run_shell_as_build) list(JOIN arg_COMMAND " " cmd) list(JOIN arg_NO_PARALLEL_COMMAND " " no_par_cmd) + if(NOT no_par_cmd STREQUAL "") + set(no_par_cmd NO_PARALLEL_COMMAND ${arg_SHELL} -c "${no_par_cmd}") + endif() vcpkg_execute_build_process( COMMAND ${arg_SHELL} -c "${cmd}" - NO_PARALLEL_COMMAND ${arg_SHELL} -c "${no_par_cmd}" + ${no_par_cmd} WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" LOGNAME "${arg_LOGNAME}" ${extra_opts} diff --git a/ports/vcpkg-make/vcpkg_make_common.cmake b/ports/vcpkg-make/vcpkg_make_common.cmake index 575f3b81f8089d..8e7c4933f59be9 100644 --- a/ports/vcpkg-make/vcpkg_make_common.cmake +++ b/ports/vcpkg-make/vcpkg_make_common.cmake @@ -11,7 +11,7 @@ macro(z_vcpkg_make_set_common_vars) endforeach() set(buildtypes release) if(NOT VCPKG_BUILD_TYPE) - list(APPEND buildtypes debug) + list(PREPEND buildtypes debug) endif() endmacro() @@ -557,7 +557,6 @@ function(z_vcpkg_make_prepare_flags) ${flags_opts} ) if(NOT DEFINED VCPKG_BUILD_TYPE) - list(APPEND all_buildtypes DEBUG) z_vcpkg_make_prepare_compile_flags( CONFIG DEBUG COMPILER_FRONTEND "${VCPKG_DETECTED_CMAKE_C_COMPILER_FRONTEND_VARIANT}" diff --git a/ports/vcpkg-make/vcpkg_make_configure.cmake b/ports/vcpkg-make/vcpkg_make_configure.cmake index d58200fdc1dd0f..57ce70d9333684 100644 --- a/ports/vcpkg-make/vcpkg_make_configure.cmake +++ b/ports/vcpkg-make/vcpkg_make_configure.cmake @@ -97,7 +97,6 @@ function(vcpkg_make_configure) set(opts "") if(NOT arg_DISABLE_DEFAULT_OPTIONS) z_vcpkg_make_default_path_and_configure_options(opts AUTOMAKE CONFIG "${configup}") - vcpkg_list(APPEND arg_OPTIONS ${opts}) endif() set(configure_path_from_wd "./${relative_build_path}/configure") @@ -116,7 +115,8 @@ function(vcpkg_make_configure) "${configure_path_from_wd}" OPTIONS ${BUILD_TRIPLET} - ${arg_OPTIONS} + ${arg_OPTIONS} + ${opts} ${arg_OPTIONS_${configup}} WORKING_DIRECTORY "${target_dir}" diff --git a/ports/vcpkg-make/vcpkg_make_install.cmake b/ports/vcpkg-make/vcpkg_make_install.cmake index 76bfae405193e2..00b39416f785ef 100644 --- a/ports/vcpkg-make/vcpkg_make_install.cmake +++ b/ports/vcpkg-make/vcpkg_make_install.cmake @@ -4,8 +4,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make.cmake") function(vcpkg_make_install) cmake_parse_arguments(PARSE_ARGV 0 arg "DISABLE_PARALLEL" - "LOGFILE_ROOT;MAKEFILE;TARGETS" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" + "LOGFILE_ROOT;MAKEFILE" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;TARGETS" ) z_vcpkg_unparsed_args(FATAL_ERROR) @@ -81,26 +81,27 @@ function(vcpkg_make_install) endif() foreach(target IN LISTS arg_TARGETS) + string(REPLACE "/" "_" target_no_slash "${target}") vcpkg_list(SET make_cmd_line ${make_command} ${arg_OPTIONS} ${arg_OPTIONS_${cmake_buildtype}} V=1 -j ${VCPKG_CONCURRENCY} ${extra_opts} -f ${arg_MAKEFILE} ${target} ${destdir_opt}) vcpkg_list(SET no_parallel_make_cmd_line ${make_command} ${arg_OPTIONS} ${arg_OPTIONS_${cmake_buildtype}} V=1 -j 1 ${extra_opts} -f ${arg_MAKEFILE} ${target} ${destdir_opt}) message(STATUS "Making target '${target}' for ${TARGET_TRIPLET}-${short_buildtype}") if (arg_DISABLE_PARALLEL) vcpkg_run_shell_as_build( WORKING_DIRECTORY "${working_directory}" - LOGNAME "${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}" + LOGNAME "${arg_LOGFILE_ROOT}-${target_no_slash}-${TARGET_TRIPLET}-${short_buildtype}" SHELL ${shell_cmd} - NO_PARALLEL_COMMAND ${configure_env} ${no_parallel_make_cmd_line} + COMMAND ${configure_env} ${no_parallel_make_cmd_line} ) else() vcpkg_run_shell_as_build( WORKING_DIRECTORY "${working_directory}" - LOGNAME "${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}" + LOGNAME "${arg_LOGFILE_ROOT}-${target_no_slash}-${TARGET_TRIPLET}-${short_buildtype}" SHELL ${shell_cmd} - COMMAND ${configure_env} ${no_parallel_make_cmd_line} + COMMAND ${configure_env} ${make_cmd_line} NO_PARALLEL_COMMAND ${configure_env} ${no_parallel_make_cmd_line} ) endif() - file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${target}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata) + file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${target_no_slash}-${TARGET_TRIPLET}-${short_buildtype}-out.log" logdata) if(logdata MATCHES "Warning: linker path does not have real file for library") message(FATAL_ERROR "libtool could not find a file being linked against!") endif() diff --git a/versions/baseline.json b/versions/baseline.json index 73a93957d6186e..d2a1b5f57c62ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9397,7 +9397,7 @@ "port-version": 0 }, "vcpkg-make": { - "baseline": "2024-12-27", + "baseline": "2025-01-13", "port-version": 0 }, "vcpkg-msbuild": { diff --git a/versions/v-/vcpkg-make.json b/versions/v-/vcpkg-make.json index 960c6a0c986d65..a840346820ff3b 100644 --- a/versions/v-/vcpkg-make.json +++ b/versions/v-/vcpkg-make.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5af3456c1f7742c9d880d70dc678c061b91668c1", + "version-date": "2025-01-13", + "port-version": 0 + }, { "git-tree": "ac1381c26cff8ab8365670f4fb00395e86c58dfa", "version-date": "2024-12-27", From 7894bc9fa303eb77d42e3a8b01dc5af59d57feea Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 16 Jan 2025 13:06:49 +0800 Subject: [PATCH 44/44] [onnx] Update to 1.17.0 and fix openvino dependency error (#42942) Co-authored-by: Jon --- ports/onnx/fix-cxx_standard.patch | 12 ++++++++++++ ports/onnx/portfile.cmake | 3 ++- ports/onnx/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/onnx.json | 5 +++++ 5 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 ports/onnx/fix-cxx_standard.patch diff --git a/ports/onnx/fix-cxx_standard.patch b/ports/onnx/fix-cxx_standard.patch new file mode 100644 index 00000000000000..4f9f10626049b2 --- /dev/null +++ b/ports/onnx/fix-cxx_standard.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 55869f4..e8b20cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -524,6 +524,7 @@ else() + set_target_properties(onnx_proto PROPERTIES VISIBILITY_INLINES_HIDDEN 1) + endif() + target_compile_definitions(onnx_proto PRIVATE ${ONNX_API_DEFINE}) ++target_compile_features(onnx_proto PUBLIC cxx_std_${CMAKE_CXX_STANDARD}) + + if(ONNX_USE_LITE_PROTO) + if(TARGET protobuf::libprotobuf-lite) diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index 668425d3223791..31332aafa36046 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -4,10 +4,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onnx/onnx REF "v${VERSION}" - SHA512 7a9a8493b9c007429629484156487395044506f34e72253640e626351cb623b390750b36af78a290786131e3dcac35f4eb269e8693b594b7ce7cb105bcf9318d + SHA512 5a18e2b19ec9c18c8b115fb7e12ed98eddaa581c95f15c4dd420cd6c86e7caa04f9a393da589e76b89cf9b3544abd3749a8c77c2446782f37502eb74e9b1f661 PATCHES fix-cmakelists.patch fix-dependency-protobuf.patch + fix-cxx_standard.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index ada26a3f2694f1..47c4952b482540 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,7 +1,6 @@ { "name": "onnx", - "version-semver": "1.16.2", - "port-version": 1, + "version-semver": "1.17.0", "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index d2a1b5f57c62ab..47c49ec07a1126 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6605,8 +6605,8 @@ "port-version": 0 }, "onnx": { - "baseline": "1.16.2", - "port-version": 1 + "baseline": "1.17.0", + "port-version": 0 }, "onnx-optimizer": { "baseline": "0.3.19", diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index 494dd57dbdf0d3..b3a1b486919351 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9849fadc0639a430cf9c49434b60cbeb08989112", + "version-semver": "1.17.0", + "port-version": 0 + }, { "git-tree": "262df4daa9534c3c514b1a4f7c048369b575568f", "version-semver": "1.16.2",