diff --git a/ports/cppgraphqlgen/356.patch b/ports/cppgraphqlgen/356.patch new file mode 100644 index 00000000000000..e8e3ede8612ff7 --- /dev/null +++ b/ports/cppgraphqlgen/356.patch @@ -0,0 +1,40 @@ +From f6a0073a51324209035ab0632272c970cdfbfe5b Mon Sep 17 00:00:00 2001 +From: Bruno S Marques +Date: Wed, 11 Feb 2026 11:09:47 -0300 +Subject: [PATCH] Fix operator overload attribute syntax in GraphQLParse.h + +to fix identifier '_graphql' preceded by whitespace in a literal operator declaration is deprecated [-Wdeprecated-literal-operator] + 53 | [[nodiscard("unnecessary parse")]] GRAPHQLPEG_EXPORT peg::ast operator"" _graphql( + | ~~~~~~~~~~~^~~~~~~~ + | operator""_graphql +--- + include/graphqlservice/GraphQLParse.h | 2 +- + src/SyntaxTree.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/graphqlservice/GraphQLParse.h b/include/graphqlservice/GraphQLParse.h +index e983b224..627446dc 100644 +--- a/include/graphqlservice/GraphQLParse.h ++++ b/include/graphqlservice/GraphQLParse.h +@@ -50,7 +50,7 @@ constexpr size_t c_defaultDepthLimit = 25; + + } // namespace peg + +-[[nodiscard("unnecessary parse")]] GRAPHQLPEG_EXPORT peg::ast operator"" _graphql( ++[[nodiscard("unnecessary parse")]] GRAPHQLPEG_EXPORT peg::ast operator""_graphql( + const char* text, size_t size); + + } // namespace graphql +diff --git a/src/SyntaxTree.cpp b/src/SyntaxTree.cpp +index 60743538..524067ec 100644 +--- a/src/SyntaxTree.cpp ++++ b/src/SyntaxTree.cpp +@@ -1148,7 +1148,7 @@ ast parseFile(std::string_view filename, size_t depthLimit) + + } // namespace peg + +-peg::ast operator"" _graphql(const char* text, size_t size) ++peg::ast operator""_graphql(const char* text, size_t size) + { + peg::ast result { std::make_shared( + peg::ast_input { peg::ast_string_view { { text, size } } }), diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 6d17e772d514ef..2232e56b5154ae 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 eb26e6b9b51eabeb84ab82035097579dcdc5f44cc1d50ae85303bbab8fcc2a3da0749cef4e15bf09adb62a4783446bb8b661666db52517b2e98543177f662eb5 HEAD_REF main + PATCHES + 356.patch # https://patch-diff.githubusercontent.com/raw/microsoft/cppgraphqlgen/pull/356.patch ) vcpkg_check_features( diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json index 2a924cc1c6966c..e76fc81352a472 100644 --- a/ports/cppgraphqlgen/vcpkg.json +++ b/ports/cppgraphqlgen/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cppgraphqlgen", "version": "4.5.9", + "port-version": 1, "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", "license": "MIT", diff --git a/ports/crashpad/crashpad-memset-errors-5758170.diff b/ports/crashpad/crashpad-memset-errors-5758170.diff new file mode 100644 index 00000000000000..62f99dbf782c01 --- /dev/null +++ b/ports/crashpad/crashpad-memset-errors-5758170.diff @@ -0,0 +1,45 @@ +From 575817027d03ecce3c5d9ee0991a04e00babae3b Mon Sep 17 00:00:00 2001 +From: Victor Hugo Vianna Silva +Date: Wed, 17 Dec 2025 22:33:24 +0000 +Subject: [PATCH] Fix C++23 build errors in crashpad + +Bug: 388070065 +Change-Id: Iaa150463bcae34db0f3ea022cd25df3035112704 +Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/7270947 +Reviewed-by: Joshua Peraza +Commit-Queue: Victor Vianna +--- + +diff --git a/util/linux/socket_test.cc b/util/linux/socket_test.cc +index 3e84aaa..8e75318 100644 +--- a/util/linux/socket_test.cc ++++ b/util/linux/socket_test.cc +@@ -124,7 +124,7 @@ + for (size_t index = 0; index < UnixCredentialSocket::kMaxSendRecvMsgFDs; + ++index) { + recv_fds[index].reset(); +- char c; ++ char c = 0; + EXPECT_EQ( + HANDLE_EINTR(send(send_fds[index].get(), &c, sizeof(c), MSG_NOSIGNAL)), + -1); +diff --git a/util/linux/thread_info.cc b/util/linux/thread_info.cc +index 77ffb06..4cff830 100644 +--- a/util/linux/thread_info.cc ++++ b/util/linux/thread_info.cc +@@ -19,13 +19,13 @@ + namespace crashpad { + + ThreadContext::ThreadContext() { +- memset(this, 0, sizeof(*this)); ++ memset(static_cast(this), 0, sizeof(*this)); + } + + ThreadContext::~ThreadContext() {} + + FloatContext::FloatContext() { +- memset(this, 0, sizeof(*this)); ++ memset(static_cast(this), 0, sizeof(*this)); + } + + FloatContext::~FloatContext() {} diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index c209bd4b8f3b2f..09ab7f51749446 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_git( PATCHES fix-linux.patch fix-lib-name-conflict.patch + crashpad-memset-errors-5758170.diff # https://chromium-review.googlesource.com/c/crashpad/crashpad/+/7270947 ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index 99618928f4ce0f..897528a05b86a6 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "crashpad", "version-date": "2024-04-11", - "port-version": 9, + "port-version": 10, "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." diff --git a/ports/highway/2695.patch b/ports/highway/2695.patch new file mode 100644 index 00000000000000..7c7e0ac95745ef --- /dev/null +++ b/ports/highway/2695.patch @@ -0,0 +1,25 @@ +From 21635e43996f0b4365584f69b0014655f548853a Mon Sep 17 00:00:00 2001 +From: John Platts +Date: Sun, 31 Aug 2025 22:08:43 -0500 +Subject: [PATCH] Fix for AVX10_2 target with Android NDK r29-beta3 + +--- + hwy/ops/x86_128-inl.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/hwy/ops/x86_128-inl.h b/hwy/ops/x86_128-inl.h +index bcd08d590d..3a2820102e 100644 +--- a/hwy/ops/x86_128-inl.h ++++ b/hwy/ops/x86_128-inl.h +@@ -71,8 +71,9 @@ namespace detail { + #endif + + #undef HWY_X86_HAVE_AVX10_2_OPS +-#if HWY_TARGET_IS_AVX10_2 && \ +- (HWY_COMPILER_GCC_ACTUAL >= 1501 || HWY_COMPILER3_CLANG >= 200103) ++#if HWY_TARGET_IS_AVX10_2 && \ ++ (HWY_COMPILER_GCC_ACTUAL >= 1501 || \ ++ (HWY_COMPILER3_CLANG >= 200103 && HWY_COMPILER_CLANG != 2100)) + #define HWY_X86_HAVE_AVX10_2_OPS 1 + #else + #define HWY_X86_HAVE_AVX10_2_OPS 0 diff --git a/ports/highway/portfile.cmake b/ports/highway/portfile.cmake index c6f811280ca3bb..544201aa2bc0cf 100644 --- a/ports/highway/portfile.cmake +++ b/ports/highway/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF "${VERSION}" SHA512 8b9f4fdc4fa60b6817417959853f5b55bf86aec9d35fc6664dda15179cc55e0a9940f3a46011a84b95263ba342dc47ca1cb93b04481ff4b63d724cce1815d7c6 HEAD_REF master + PATCHES + 2695.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/highway/vcpkg.json b/ports/highway/vcpkg.json index 561c07aafc8cad..1a1df7faf6451d 100644 --- a/ports/highway/vcpkg.json +++ b/ports/highway/vcpkg.json @@ -1,6 +1,7 @@ { "name": "highway", "version": "1.3.0", + "port-version": 1, "description": "Performance-portable, length-agnostic SIMD with runtime dispatch", "homepage": "https://github.com/google/highway", "license": "Apache-2.0", diff --git a/ports/orefkov-simstr/portfile.cmake b/ports/orefkov-simstr/portfile.cmake index b6784c915e9f4a..cbcfddbbfb484c 100644 --- a/ports/orefkov-simstr/portfile.cmake +++ b/ports/orefkov-simstr/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO orefkov/simstr - SHA512 9948349336dbe2bfde8b691c7168df41c1708a35a740b1147eb22f5f86f898ff110ef3b6ed08bc4ec7ea808b90540994786361f86455bfe674801cb727e1817e + SHA512 9948349336dbe2bfde8b691c7168df41c1708a35a740b1147eb22f5f86f898ff110ef3b6ed08bc4ec7ea808b90540994786361f86455bfe674801cb727e1817e REF "rel${VERSION}" HEAD_REF main ) @@ -11,7 +11,8 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DSIMSTR_BUILD_TESTS=OFF -DSIMSTR_BENCHMARKS=OFF - -DSIMSTR_LINK_NATVIS=OFF + -DSIMSTR_LINK_NATVIS=OFF + -DUSE_SYSTEM_DEPS=ON ) vcpkg_cmake_install() diff --git a/ports/orefkov-simstr/vcpkg.json b/ports/orefkov-simstr/vcpkg.json index ffbc350cdde1aa..687145829e2d56 100644 --- a/ports/orefkov-simstr/vcpkg.json +++ b/ports/orefkov-simstr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "orefkov-simstr", "version-semver": "1.7.1", + "port-version": 1, "description": "Yet another C++ strings library implementation", "homepage": "https://github.com/orefkov/simstr", "license": "MIT", diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index 392784e49bae02..f60b3bf0216698 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -1,14 +1,14 @@ # syntax=docker/dockerfile:1.4 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry" -FROM ubuntu:noble-20251013 +FROM ubuntu:noble-20260113 ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb -ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14+7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz /OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz -ADD https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip /sdk-commandlinetools-linux-10406996_latest.zip -ADD https://dl.google.com/android/repository/build-tools_r34-linux.zip /build-tools_r34-linux.zip -ADD https://dl.google.com/android/repository/platform-34-ext7_r03.zip /platform-34-ext7_r03.zip -ADD https://dl.google.com/android/repository/platform-tools_r35.0.1-linux.zip /platform-tools_r35.0.1-linux.zip -ADD https://dl.google.com/android/repository/android-ndk-r28c-linux.zip /android-ndk-r28c-linux.zip +ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.18+8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.18_8.tar.gz /OpenJDK17U-jdk_x64_linux_hotspot_17.0.18_8.tar.gz +ADD https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip /commandlinetools-linux-14742923_latest.zip +ADD https://dl.google.com/android/repository/build-tools_r36.1_linux.zip /build-tools_r36.1_linux.zip +ADD https://dl.google.com/android/repository/platform-36_r01.zip /platform-36_r01.zip +ADD https://dl.google.com/android/repository/platform-tools_r36.0.2-linux.zip /platform-tools_r36.0.2-linux.zip +ADD https://dl.google.com/android/repository/android-ndk-r29-linux.zip /android-ndk-r29-linux.zip # Add apt packages @@ -70,39 +70,39 @@ apt-get -y dist-upgrade apt-get -y --no-install-recommends install $APT_PACKAGES # OpenJDK -tar xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz -rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz +tar xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.18_8.tar.gz +rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.18_8.tar.gz # Android SDK -unzip -q sdk-commandlinetools-linux-10406996_latest.zip -d android-sdk -rm sdk-commandlinetools-linux-10406996_latest.zip +unzip -q commandlinetools-linux-14742923_latest.zip -d android-sdk +rm commandlinetools-linux-14742923_latest.zip -unzip -q build-tools_r34-linux.zip -d android-sdk/build-tools -mv android-sdk/build-tools/android-14 android-sdk/build-tools/34.0.0 -rm build-tools_r34-linux.zip +unzip -q build-tools_r36.1_linux.zip -d android-sdk/build-tools +mv android-sdk/build-tools/android-16 android-sdk/build-tools/36.1.0 +rm build-tools_r36.1_linux.zip -unzip -q platform-34-ext7_r03.zip -d android-sdk/platforms -rm platform-34-ext7_r03.zip +unzip -q platform-36_r01.zip -d android-sdk/platforms +rm platform-36_r01.zip find android-sdk/platforms -type d -exec chmod o+rx '{}' ';' find android-sdk/platforms -type f -exec chmod o+r '{}' ';' -unzip -q platform-tools_r35.0.1-linux.zip -d android-sdk -rm platform-tools_r35.0.1-linux.zip +unzip -q platform-tools_r36.0.2-linux.zip -d android-sdk +rm platform-tools_r36.0.2-linux.zip # JRE for sdk setup -export JAVA_HOME=/jdk-17.0.14+7 +export JAVA_HOME=/jdk-17.0.18+8 yes | /android-sdk/cmdline-tools/bin/sdkmanager --sdk_root=/android-sdk --licenses # Android NDK -unzip -q /android-ndk-r28c-linux.zip -rm -f android-ndk-r28c-linux.zip +unzip -q /android-ndk-r29-linux.zip +rm -f android-ndk-r29-linux.zip END_OF_SCRIPT -ENV JAVA_HOME="/jdk-17.0.14+7" +ENV JAVA_HOME="/jdk-17.0.18+8" ENV ANDROID_HOME="/android-sdk" -ENV ANDROID_NDK_HOME="/android-ndk-r28c" +ENV ANDROID_NDK_HOME="/android-ndk-r29" WORKDIR /vcpkg diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml index 1f93ddafbc3d07..853128562bffe7 100644 --- a/scripts/azure-pipelines/android/azure-pipelines.yml +++ b/scripts/azure-pipelines/android/azure-pipelines.yml @@ -25,10 +25,8 @@ jobs: value: /mnt/vcpkg-ci - name: VCPKG_DOWNLOADS value: /mnt/vcpkg-ci/downloads - - name: ANDROID_NDK_HOME - value: /android-ndk-r28c - name: ANDROID_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2026-01-20' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2026-02-10' - name: LINUX_DOCKER_IMAGE value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2026-01-20' steps: @@ -93,7 +91,6 @@ jobs: --mount type=bind,source=$(WORKING_ROOT)/failure-logs,target=/vcpkg/failure-logs \ --mount type=bind,source=/mnt/vcpkg-ci,target=/mnt/vcpkg-ci \ --env X_VCPKG_ASSET_SOURCES="x-azurl,https://vcpkgassetcachewus.blob.core.windows.net/cache,$assetSas,readwrite" \ - --env ANDROID_NDK_HOME="${{ variables.ANDROID_NDK_HOME }}" \ --workdir /vcpkg \ ${{ variables.ANDROID_DOCKER_IMAGE }} \ pwsh \ diff --git a/scripts/azure-pipelines/linux/Dockerfile b/scripts/azure-pipelines/linux/Dockerfile index 542dcda19b3463..5a7ad1d57ddc34 100644 --- a/scripts/azure-pipelines/linux/Dockerfile +++ b/scripts/azure-pipelines/linux/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry" -FROM ubuntu:noble-20251013 +FROM ubuntu:noble-20260113 ADD provision-image.sh /provision-image.sh RUN apt-get update && \ apt-get install --no-install-recommends -y curl gnupg ca-certificates diff --git a/scripts/azure-pipelines/update-containers.yml b/scripts/azure-pipelines/update-containers.yml index dd741452e45b23..3ff8d03520e5a8 100644 --- a/scripts/azure-pipelines/update-containers.yml +++ b/scripts/azure-pipelines/update-containers.yml @@ -30,12 +30,12 @@ jobs: az acr login --name vcpkgandroidwus # Note that this is marking the *previous* image as EOL, not the one we're building as it attaches # to the SHA to which the tag points, not the tag itself. - oras attach --artifact-type application/vnd.microsoft.artifact.lifecycle --annotation "vnd.microsoft.artifact.lifecycle.end-of-life.date=$EndDate" vcpkgandroidwus.azurecr.io/vcpkg-android:2026-01-20 - oras attach --artifact-type application/vnd.microsoft.artifact.lifecycle --annotation "vnd.microsoft.artifact.lifecycle.end-of-life.date=$EndDate" vcpkgandroidwus.azurecr.io/vcpkg-linux:2026-01-20 + oras attach --artifact-type application/vnd.microsoft.artifact.lifecycle --annotation "vnd.microsoft.artifact.lifecycle.end-of-life.date=$EndDate" vcpkgandroidwus.azurecr.io/vcpkg-android:2026-02-10 || echo "WARNING: Failed to attach lifecycle metadata to vcpkg-android:2026-01-20" + oras attach --artifact-type application/vnd.microsoft.artifact.lifecycle --annotation "vnd.microsoft.artifact.lifecycle.end-of-life.date=$EndDate" vcpkgandroidwus.azurecr.io/vcpkg-linux:2026-01-20 || echo "WARNING: Failed to attach lifecycle metadata to vcpkg-linux:2026-01-20" cd scripts/azure-pipelines/android # to explain the ulimit thing, see https://github.com/docker/buildx/issues/379 - docker buildx build . -t vcpkgandroidwus.azurecr.io/vcpkg-android:2026-01-20 --build-arg BUILD_DATE=$BuildDate --ulimit nofile=1024:1024 - docker push vcpkgandroidwus.azurecr.io/vcpkg-android:2026-01-20 + docker buildx build . -t vcpkgandroidwus.azurecr.io/vcpkg-android:2026-02-10 --build-arg BUILD_DATE=$BuildDate --ulimit nofile=1024:1024 + docker push vcpkgandroidwus.azurecr.io/vcpkg-android:2026-02-10 cd ../linux docker buildx build . -t vcpkgandroidwus.azurecr.io/vcpkg-linux:2026-01-20 --build-arg BUILD_DATE=$BuildDate --ulimit nofile=1024:1024 docker push vcpkgandroidwus.azurecr.io/vcpkg-linux:2026-01-20 diff --git a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml index 8dad024a45b99a..b63efc92740155 100644 --- a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml @@ -6,7 +6,7 @@ jobs: - job: x64_windows pool: name: vcpkg-testing-msvc - demands: ImageVersionOverride -equals 2026.01.14 + demands: ImageVersionOverride -equals 2026.02.12 timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index c50ef234759989..bb733efbf67571 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -20,7 +20,7 @@ jobs: condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}')) pool: name: PrWin-WUS - demands: ImageVersionOverride -equals 2026.01.14 + demands: ImageVersionOverride -equals 2026.02.12 timeoutInMinutes: 2880 # 2 days variables: - name: WORKING_ROOT diff --git a/scripts/azure-pipelines/windows/deploy-azcopy.ps1 b/scripts/azure-pipelines/windows/deploy-azcopy.ps1 index dccf4579853a63..3bf08b945dd6e1 100644 --- a/scripts/azure-pipelines/windows/deploy-azcopy.ps1 +++ b/scripts/azure-pipelines/windows/deploy-azcopy.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$AzCopyUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.1/azcopy_windows_amd64_10.31.1.zip' + $AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.32.0/azcopy_windows_amd64_10.32.0.zip' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.31.1.zip?$SasToken" + $AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.32.0.zip?$SasToken" } mkdir -Force "C:\AzCopy10" diff --git a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 index 007b52fc131a6b..41cc453dadf603 100644 --- a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 +++ b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$AzCliUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.82.0-x64.msi' + $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.83.0-x64.msi' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.82.0-x64.msi?$SasToken" + $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.83.0-x64.msi?$SasToken" } DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart') diff --git a/scripts/azure-pipelines/windows/deploy-cudnn.ps1 b/scripts/azure-pipelines/windows/deploy-cudnn.ps1 index 9b2066092694f3..a48892a2e231e2 100644 --- a/scripts/azure-pipelines/windows/deploy-cudnn.ps1 +++ b/scripts/azure-pipelines/windows/deploy-cudnn.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$CudnnUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $CudnnUrl = 'https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-9.10.2.21_cuda12-archive.zip' + $CudnnUrl = 'https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-9.19.0.56_cuda12-archive.zip' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $CudnnUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-9.10.2.21_cuda12-archive.zip?$SasToken" + $CudnnUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-9.19.0.56_cuda12-archive.zip?$SasToken" } DownloadAndUnzip -Name 'CUDNN' -Url $CudnnUrl -Destination "$env:ProgramFiles\NVIDIA GPU Computing Toolkit\CUDA\v12.9" diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 583bdae8424ff2..02bc4321d31558 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -8,12 +8,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { } # See https://learn.microsoft.com/visualstudio/releases/2022/release-history -# 17.14.24 -$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/6a6c3c0f-51bf-4bfb-a89c-59f6e85932b3/8908e6b6ae03b014125ba05ce9746a2750126d1715d88ca269ca01a2b62cec7a/vs_Enterprise.exe' +# 17.14.26 +$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/8ded7f52-a29c-4020-aa42-b89467fbc1ef/333504f828d3ffb075512c986ae2f94561faf1e6a71e867691fc2b07fcd43fde/vs_Enterprise.exe' $Workloads = @( 'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.Universal', - 'Microsoft.VisualStudio.Component.UWP.VC.ARM64', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', 'Microsoft.VisualStudio.Component.VC.Tools.ARM64', 'Microsoft.VisualStudio.Component.VC.ASAN', @@ -22,14 +21,12 @@ $Workloads = @( 'Microsoft.VisualStudio.Component.VC.ATL.ARM64', 'Microsoft.VisualStudio.Component.VC.MFC.ARM64', 'Microsoft.VisualStudio.Component.Windows11SDK.26100', - 'Microsoft.VisualStudio.Component.Windows10SDK.19041', # As of 2024-11-15, CMake explicitly needs a Windows 10 SDK for Store # These .NET parts are needed for easyhook, openni2 'Microsoft.Net.Component.4.8.SDK', 'Microsoft.Net.Component.4.7.2.TargetingPack', 'Microsoft.Component.NetFX.Native', 'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset', 'Microsoft.VisualStudio.Component.VC.Llvm.Clang', - 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools', 'Microsoft.VisualStudio.Component.VC.CMake.Project' ) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 732ed917cb5811..eeca870a926409 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -41,6 +41,9 @@ apr:arm64-android=fail apr:x64-android=fail apsi:arm-neon-android=fail apsi:x64-android=fail +arcticdb-sparrow:arm-neon-android=fail # https://github.com/man-group/sparrow/issues/653 +arcticdb-sparrow:arm64-android=fail +arcticdb-sparrow:x64-android=fail arpack-ng:x64-windows-static-md=fail arpack-ng:x64-windows-static=fail # Broken with CUDA 12; needs update to 3.8.3 and https://github.com/arrayfire/arrayfire/issues/3349 fixed @@ -312,6 +315,7 @@ libhdfs3:arm64-android=fail libhdfs3:arm64-osx=fail libhdfs3:x64-android=fail libhdfs3:x64-linux=fail +libjxl:arm-neon-android=fail # error: out of range pc-relative fixup value # libmariadb conflicts with libmysql libmariadb:arm64-osx=skip libmariadb:arm64-windows-static-md=skip @@ -487,10 +491,6 @@ openzl:x64-windows=fail orc:arm-neon-android=fail orc:arm64-android=fail orc:x64-android=fail -# due to outdated compilers in android CI -orefkov-simstr:arm-neon-android=fail -orefkov-simstr:arm64-android=fail -orefkov-simstr:x64-android=fail paraview:arm64-windows-static-md=fail paraview:arm64-windows=fail plib:arm-neon-android=fail @@ -524,6 +524,9 @@ qtopcua:x64-android=fail qtwayland:arm64-osx=skip quickfix:arm-neon-android=fail quickfix:arm64-android=fail +realm-core:arm-neon-android=fail # https://github.com/realm/realm-core/issues/8093 +realm-core:arm64-android=fail +realm-core:x64-android=fail restbed:arm-neon-android=fail restbed:arm64-android=fail rpclib:arm64-windows-static-md=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 47ebd30c0ffd20..2a07c5a3426712 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -58,6 +58,9 @@ ace[tao]:x64-android=feature-fails aeron[archive]=skip # archive feature requires Java for SBE code generation allegro5:arm64-windows=fail # Fails with "fatal error LNK1322: cannot avoid potential ARM hazard" even with /Gy apr:arm64-windows=fail # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h +arcticdb-sparrow:arm-neon-android=fail # https://github.com/man-group/sparrow/issues/653 +arcticdb-sparrow:arm64-android=fail +arcticdb-sparrow:x64-android=fail blitz:arm64-windows=fail caf(android)=fail cctag:x64-windows-static-md=fail @@ -111,6 +114,7 @@ libgo:x64-android=fail libgxps:x64-windows-static=fail libigl[opengl](android)=feature-fails libirecovery:x64-windows-static-md=fail +libjxl:arm-neon-android=fail # error: out of range pc-relative fixup value libmodman:x64-windows-static=fail libopensp(android)=fail libplist:x64-windows-static=fail @@ -166,7 +170,6 @@ openzl:x64-windows-static-md=fail openzl:x64-windows-static=fail openzl:x64-windows=fail orc(android)=fail # try_run for time_t properties -orefkov-simstr(android)=fail # due to outdated compilers in android CI paraview(arm64 & windows)=fail # in-build host tools pfring:arm64-osx=fail pmdk:x64-windows-static=fail @@ -176,6 +179,9 @@ qt5-base(arm & windows)=fail qt5-webengine(!(arm & windows)) = fail # Missing prerequisites for CI success qt5-x11extras(osx)=fail # Missing system libraries qt5-x11extras(windows)=fail # Missing libraries +realm-core:arm-neon-android=fail # https://github.com/realm/realm-core/issues/8093 +realm-core:arm64-android=fail +realm-core:x64-android=fail rpclib:arm64-windows=fail simbody:arm64-windows=fail simd(android)=fail @@ -274,6 +280,9 @@ coin-or-ipopt:arm64-windows = cascade coin-or-ipopt:x86-windows = cascade colmap[cuda,cuda-redist]:x64-linux = feature-fails colmap[cuda,cuda-redist](arm64 & osx) = cascade +cpprealm:arm-neon-android=cascade # https://github.com/realm/realm-core/issues/8093 +cpprealm:arm64-android=cascade +cpprealm:x64-android=cascade crashrpt(windows) = cascade cuda-api-wrappers(osx) = cascade cutelyst2:arm64-windows = cascade @@ -463,9 +472,11 @@ opencv4[dnn-cuda](!((windows & x64 & !xbox) | (linux & x64) | (linux & arm64)) | opencv4[dnn-cuda](osx) = cascade opencv4[gstreamer](xbox) = cascade opencv4[halide](android | (windows & staticcrt) | (arm & windows))=cascade +opencv4[jpegxl]:arm-neon-android=cascade opencv4[opengl](xbox) = cascade opencv4[qt](ios | xbox) = cascade opencv4[vtk](xbox) = cascade +openimageio[jpegxl]:arm-neon-android=cascade openmama:arm64-windows = cascade openmama:x64-windows-static = cascade openmvg[software](arm & windows) = cascade @@ -561,6 +572,7 @@ rtabmap:arm64-windows = cascade rtabmap[k4w2,openni2](arm | !windows) = cascade rtabmap[opencv-cuda](!x64 | android | osx) = cascade ryml:arm64-windows = cascade +sail[jpegxl]:arm-neon-android=cascade salome-medcoupling(arm | !(linux | windows)) = cascade sdformat13:x64-windows-static = cascade sdl1-mixer(android) = cascade diff --git a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json index 17b44006e274e8..77c4aace1f653e 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json @@ -17,7 +17,6 @@ "highgui", "intrinsics", "jpeg", - "jpegxl", "nonfree", "openjpeg", "png", @@ -68,6 +67,14 @@ ], "platform": "windows & !uwp" }, + { + "name": "opencv", + "default-features": false, + "features": [ + "jpegxl" + ], + "platform": "!(android & arm32)" + }, { "name": "opencv", "default-features": false, diff --git a/versions/baseline.json b/versions/baseline.json index 5a09722ea53b24..0b1ddf43dfb9f9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2094,7 +2094,7 @@ }, "cppgraphqlgen": { "baseline": "4.5.9", - "port-version": 0 + "port-version": 1 }, "cppitertools": { "baseline": "2.3", @@ -2178,7 +2178,7 @@ }, "crashpad": { "baseline": "2024-04-11", - "port-version": 9 + "port-version": 10 }, "crashrpt": { "baseline": "1.4.3", @@ -3782,7 +3782,7 @@ }, "highway": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "hikogui": { "baseline": "0.8.1", @@ -7370,7 +7370,7 @@ }, "orefkov-simstr": { "baseline": "1.7.1", - "port-version": 0 + "port-version": 1 }, "ormpp": { "baseline": "0.2.0", diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json index 3ccad4fe43275a..c53e05d0733f44 100644 --- a/versions/c-/cppgraphqlgen.json +++ b/versions/c-/cppgraphqlgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c405bdb4821d43145534e29f36c91cfa3f7e2c96", + "version": "4.5.9", + "port-version": 1 + }, { "git-tree": "75a00a0ed6f9b23e5b7ca132e7d6017a01deaa6a", "version": "4.5.9", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 31517292f4dd6d..99f5c61303e449 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45929b16dd46deb0333a00975263a3ee7fafbcf9", + "version-date": "2024-04-11", + "port-version": 10 + }, { "git-tree": "3db57798ca8f3d8309c3564cc7a8a1ed8955bf63", "version-date": "2024-04-11", diff --git a/versions/h-/highway.json b/versions/h-/highway.json index a89e0e712bc544..2d78e84bb4a431 100644 --- a/versions/h-/highway.json +++ b/versions/h-/highway.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bf9c7166ab8a4e4727c51977ec1a9c7563ffcfe", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "5f81b96695f9e09191745ddb2308fb98ac33164c", "version": "1.3.0", diff --git a/versions/o-/orefkov-simstr.json b/versions/o-/orefkov-simstr.json index 877ea93fd93e25..7fd31bc690a235 100644 --- a/versions/o-/orefkov-simstr.json +++ b/versions/o-/orefkov-simstr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29252300cc78a4ce8ad527b071fa8f74351a4280", + "version-semver": "1.7.1", + "port-version": 1 + }, { "git-tree": "fa6b3a4e56c14a3a745c1301099bcddcc10b6859", "version-semver": "1.7.1",