From 044c0357328461b7637b81bd78a76ec1e1434937 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 11 Sep 2025 14:56:49 -0700 Subject: [PATCH 01/49] Patch Tuesday for September 2025 + macOS 15.6.1 * Upgrade Linux builds to Ubuntu 24.04 "Noble" * AzCopy 10.30.1 * Azure CLI 2.77.0 * PowerShell 7.5.3 * Visual Studio 2022 17.14.14 * Git 2.51.0 * NodeJS 24.8.0 * macOS 15.6.1 * XCode 16.4 (qtwebengine now needs actual XCode, not just the Command Line Tools) * XCode Command Line Tools 16.4 --- scripts/azure-pipelines/android/Dockerfile | 2 +- .../android/azure-pipelines.yml | 4 +- scripts/azure-pipelines/azure-pipelines.yml | 4 +- scripts/azure-pipelines/linux/Dockerfile | 2 +- .../azure-pipelines/linux/azure-pipelines.yml | 2 +- .../azure-pipelines/linux/provision-image.sh | 2 +- scripts/azure-pipelines/osx/README.md | 71 +++++++---- .../osx/fire-register-guest.ps1 | 22 ---- scripts/azure-pipelines/osx/register-guest.sh | 4 +- scripts/azure-pipelines/osx/setup-box.sh | 10 +- .../windows-unstable/azure-pipelines.yml | 2 +- .../windows/azure-pipelines.yml | 2 +- .../azure-pipelines/windows/deploy-azcopy.ps1 | 4 +- .../windows/deploy-azure-cli.ps1 | 4 +- .../azure-pipelines/windows/deploy-pwsh.ps1 | 4 +- .../windows/deploy-visual-studio.ps1 | 4 +- scripts/vcpkg-tools.json | 116 +++++++++--------- 17 files changed, 130 insertions(+), 129 deletions(-) delete mode 100644 scripts/azure-pipelines/osx/fire-register-guest.ps1 diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index fb83211935ec70..4e727448ca788f 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry" -FROM ubuntu:noble-20250714 +FROM ubuntu:noble-20250805 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 diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml index bba5e3a7acbe54..25b504ddccdfce 100644 --- a/scripts/azure-pipelines/android/azure-pipelines.yml +++ b/scripts/azure-pipelines/android/azure-pipelines.yml @@ -28,9 +28,9 @@ jobs: - name: ANDROID_NDK_HOME value: /android-ndk-r28c - name: ANDROID_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-08-12' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-09-11' - name: LINUX_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-08-12' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-11' steps: # Note: /mnt is the Azure machines' temporary disk. - bash: | diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 7845bbfbc30f15..d4ea9e531eee13 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -69,14 +69,14 @@ jobs: - template: osx/azure-pipelines.yml parameters: jobName: x64_osx - poolName: 'PrOsx-2025-01-24' + poolName: 'PrOsx-2025-09-11' vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} - template: osx/azure-pipelines.yml parameters: jobName: arm64_osx - poolName: 'PrOsx-2025-01-24-arm64' + poolName: 'PrOsx-2025-09-11-arm64' vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} diff --git a/scripts/azure-pipelines/linux/Dockerfile b/scripts/azure-pipelines/linux/Dockerfile index 686a38c28595cc..054e30e25b3222 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:jammy-20250714 +FROM ubuntu:noble-20250805 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/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 8a0e69c60ab032..ce169868ffdeee 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -27,7 +27,7 @@ jobs: - name: VCPKG_DOWNLOADS value: /mnt/vcpkg-ci/downloads - name: LINUX_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-08-12' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-11' steps: # Note: /mnt is the Azure machines' temporary disk. - bash: | diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 7d84b5d575141e..67ce6961438c0e 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -7,7 +7,7 @@ export DEBIAN_FRONTEND=noninteractive # Add apt repos -# Detect Ubuntu VERSION_ID from /etc/os-release (e.g., "20.04") and format to "2004" +# Detect Ubuntu VERSION_ID from /etc/os-release (e.g., "24.04") and format to "2404" UBUNTU_VERSION_ID=$(. /etc/os-release && echo "$VERSION_ID") NVIDIA_REPO_VERSION=$(echo "$UBUNTU_VERSION_ID" | sed 's/\.//') diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index dff7285687d9cd..7164f23e1b9a1c 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -9,9 +9,10 @@ This is the checklist for what the vcpkg team does when updating the macOS machi - [ ] A Parallels license for amd64 or [macosvm](https://github.com/s-u/macosvm) allow-listed by macOS for arm64. Note that the directory 'Parallels' is still used when using `macosvm` just so that scripts know where to find the VM and friends. -- [ ] An Xcode installer - you can get this from Apple's developer website, +- [ ] An Xcode .xip - you can get this from Apple's developer website, although you'll need to sign in first: If you are doing this from a local macos box, you can skip to the "update the macos host" step. +- [ ] An Xcode Command Line Tools installer ### Instructions (AMD64) @@ -23,9 +24,9 @@ This is the checklist for what the vcpkg team does when updating the macOS machi - [ ] Update or install parallels - [ ] Download the macOS installer from the app store. See https://support.apple.com/en-us/102662 Note: This portion of the instructions is that which breaks most often depending on what Parallels and macOS are doing. - You might need to use `softwareupdate --fetch-full-installer --full-installer-version 15.6` and point Parallels + You might need to use `softwareupdate --fetch-full-installer --full-installer-version 15.6.1` and point Parallels at that resulting installer in 'Applications' instead. -- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx--amd64", for example "vcpkg-osx-2025-08-12-amd64". +- [ ] Run parallels, and select that installer you just downloaded. Name the VM "vcpkg-osx-", for example "vcpkg-osx-2025-09-11". - [ ] When creating the VM, customize the hardware to the following: * 12 processors * 24000 MB of memory @@ -46,25 +47,32 @@ This is the checklist for what the vcpkg team does when updating the macOS machi - [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) ) - [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all - [ ] Enable remote login in System Settings -> General -> Sharing -> Remote Login -- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz +- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-x64-4.261.0.tar.gz - [ ] In the guest, set the vcpkg user to be able to use sudo without a password. From a dev machine: ```sh + scp path/to/Xcode.xip vcpkg@HOSTMACHINE:/Users/vcpkg/Xcode.xip ssh vcpkg@HOSTMACHINE + rm ~/.ssh/known_hosts export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'` export SSH_COOKIE=vcpkg@$GUEST_IP - ssh $SSH_COOKIE # and then enter the password here + scp Xcode.xip $SSH_COOKIE:/Users/vcpkg/Xcode.xip + ssh $SSH_COOKIE # and then enter the password here printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg' sudo chmod 0440 '/etc/sudoers.d/vcpkg' - exit + sudo mdutil -ad + xip --expand Xcode.xip + sudo mv Xcode.app /Applications/Xcode.app + rm Xcode.xip exit ``` -- [ ] Copy setup-guest, setup-box.sh, and the xcode installer renamed to 'clt.dmg' to the host, and run setup-guest.sh. From a developer machine: +- [ ] Open Xcode from Applications in the guest GUI. Accept the EULA. +- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-x64-4.261.0.tar.gz +- [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation: ```sh scp ./setup-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg scp ./setup-box.sh vcpkg@HOSTMACHINE:/Users/vcpkg scp path/to/console/tools.dmg vcpkg@HOSTMACHINE:/Users/vcpkg/clt.dmg ssh vcpkg@HOSTMACHINE - rm ~/.ssh/known_hosts chmod +x setup-guest.sh ./setup-guest.sh rm setup-guest.sh @@ -72,7 +80,7 @@ This is the checklist for what the vcpkg team does when updating the macOS machi rm clt.dmg exit ``` -- [ ] Shut down the VM cleanly +- [ ] Shut down the VM cleanly. - [ ] Ensure that there is no host system specific 'hardware' like macOS install .isos attached. - [ ] Set the VM 'Isolated' - [ ] Boot and then cleanly shut down the VM. @@ -82,8 +90,8 @@ This is the checklist for what the vcpkg team does when updating the macOS machi ```sh ssh vcpkg@HOSTMACHINE brew install azcopy - azcopy copy ~/Parallels/vcpkg-osx-2025-08-12-amd64.pvmp "https://vcpkgimageminting.blob.core.windows.net/pvms?" - azcopy copy ~/Parallels/vcpkg-osx-2025-08-12-amd64.sha256.txt "https://vcpkgimageminting.blob.core.windows.net/pvms?" + azcopy copy ~/Parallels/vcpkg-osx-2025-09-11.pvmp "https://vcpkgimageminting.blob.core.windows.net/pvms?" + azcopy copy ~/Parallels/vcpkg-osx-2025-09-11.sha256.txt "https://vcpkgimageminting.blob.core.windows.net/pvms?" exit ``` - [ ] Go to https://dev.azure.com/vcpkg/public/_settings/agentqueues and create a new self hosted Agent pool named `PrOsx-YYYY-MM-DD` based on the current date. Grant microsoft.vcpkg.ci and microsoft.vcpkg.pr access. @@ -104,13 +112,13 @@ This is the checklist for what the vcpkg team does when updating the macOS machi rm macosvm-0.2-1-arm64-darwin21.tar.gz exit ``` -- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2025SummerFCS/fullrestores/082-08674/51294E4D-A273-44BE-A280-A69FC347FB87/UniversalMac_15.6_24G84_Restore.ipsw -- [ ] Determine the VM name using the form "vcpkg-osx--arm64", for example "vcpkg-osx-2025-08-12-arm64". -- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2025-08-12-arm64 and UniversalMac_15.6_24G84_Restore.ipsw replaced as appropriate. This must be run in the KVM as it uses a GUI: +- [ ] Download the matching `.ipsw` for the macOS copy to install. See https://mrmacintosh.com/apple-silicon-m1-full-macos-restore-ipsw-firmware-files-database/ ; links there to find the .ipsw. Example: https://updates.cdn-apple.com/2025SummerFCS/fullrestores/093-10809/CFD6DD38-DAF0-40DA-854F-31AAD1294C6F/UniversalMac_15.6.1_24G90_Restore.ipsw +- [ ] Determine the VM name using the form "vcpkg-osx--arm64", for example "vcpkg-osx-2025-09-11-arm64". +- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2025-09-11-arm64 and UniversalMac_15.6.1_24G90_Restore.ipsw replaced as appropriate. This must be run in the KVM as it uses a GUI: ```sh - mkdir -p ~/Parallels/vcpkg-osx-2025-08-12-arm64 - cd ~/Parallels/vcpkg-osx-2025-08-12-arm64 - ~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_15.6_24G84_Restore.ipsw ./vm.json + mkdir -p ~/Parallels/vcpkg-osx-2025-09-11-arm64 + cd ~/Parallels/vcpkg-osx-2025-09-11-arm64 + ~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_15.6.1_24G90_Restore.ipsw ./vm.json ~/macosvm -g ./vm.json ``` - [ ] Follow prompts as you would on real hardware. @@ -126,16 +134,23 @@ This is the checklist for what the vcpkg team does when updating the macOS machi - [ ] Set the desktop wallpaper to a fixed color from Settings -> Wallpaper . (This makes the KVM a lot easier to use :) ) - [ ] Disable automatic updates in the VM: Settings -> General -> Automatic Updates -> Disable them all - [ ] Enable remote login in the VM: Settings -> General -> Sharing -> Remote Login -- [ ] Set the vcpkg user to be able to use sudo without a password. For example from a dev workstation: +- [ ] Set the vcpkg user to be able to use sudo without a password, and install Xcode. For example from a dev workstation: ```sh + scp path/to/Xcode.xip vcpkg@HOSTMACHINE:/Users/vcpkg/Xcode.xip ssh vcpkg@HOSTMACHINE rm ~/.ssh/known_hosts + scp Xcode.xip vcpkg@vcpkgs-Virtual-Machine.local:/Users/vcpkg/Xcode.xip ssh vcpkg@vcpkgs-Virtual-Machine.local printf 'vcpkg\tALL=(ALL)\tNOPASSWD:\tALL\n' | sudo tee -a '/etc/sudoers.d/vcpkg' sudo chmod 0440 '/etc/sudoers.d/vcpkg' + sudo mdutil -ad + xip --expand Xcode.xip + sudo mv Xcode.app /Applications/Xcode.app + rm Xcode.xip exit ``` -- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz +- [ ] Open Xcode from Applications in the guest GUI. Uncheck the "code completion model" and accept the EULA. +- [ ] Update the Azure Agent URI in setup-box.sh to the current version. You can find this by going to the agent pool, selecting "New agent", picking macOS, and copying the link. For example https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-arm64-4.261.0.tar.gz - [ ] Copy setup-box.sh and the xcode installer renamed to 'clt.dmg' to the host. For example from a dev workstation: ```sh scp ./setup-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg @@ -178,8 +193,8 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i ssh vcpkg@HOSTMACHINE brew install azcopy cd ~/Parallels - azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx--amd64.pvmp?" . - azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx--amd64.sha256.txt?" . + azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-.pvmp?" . + azcopy copy "https://vcpkgimageminting.blob.core.windows.net/pvms/vcpkg-osx-.sha256.txt?" . exit ``` - [ ] Open the .pvmp in Parallels, and unpack it. @@ -197,7 +212,12 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i - [ ] [grab a PAT][] if you don't already have one - [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine: ```sh - ./fire-register-guest.ps1 -Target HOSTMACHINE -Pat YourPatGoesHere + scp register-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg/register-guest.sh + ssh vcpkg@HOSTMACHINE + rm .ssh/known_hosts + chmod +x register-guest.sh + ./register-guest.sh PAT GOES HERE + rm register-guest.sh ``` - [ ] In the VM, open a terminal on the host and run: ``` @@ -243,7 +263,12 @@ Run these steps on each machine to add to the fleet. Skip steps that were done i - [ ] [grab a PAT][] if you don't already have one - [ ] Copy the guest deploy script to the host, and run it with a first parameter of your PAT. From a developer machine: ```sh - ./fire-register-guest.ps1 -Target HOSTMACHINE -Pat YourPatGoesHere + scp register-guest.sh vcpkg@HOSTMACHINE:/Users/vcpkg/register-guest.sh + ssh vcpkg@HOSTMACHINE + rm .ssh/known_hosts + chmod +x register-guest.sh + ./register-guest.sh PAT GOES HERE + rm register-guest.sh ``` - [ ] That will cleanly shut down the VM. In the KVM's terminal, relaunch the VM in ephemeral mode with: ```sh diff --git a/scripts/azure-pipelines/osx/fire-register-guest.ps1 b/scripts/azure-pipelines/osx/fire-register-guest.ps1 deleted file mode 100644 index d3ea9c247dad48..00000000000000 --- a/scripts/azure-pipelines/osx/fire-register-guest.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -Param( - [Parameter(Mandatory = $true)] - [ValidateNotNullOrEmpty()] - [string]$Pat, - [Parameter(Mandatory = $true)] - [ValidateNotNullOrEmpty()] - [string]$Target -) - -$sshCookie = "vcpkg@$Target" -scp "$PSScriptRoot/register-guest.sh" "$($sshCookie):/Users/vcpkg/register-guest.sh" - -# note that the empty line is load bearing -$script = @" -rm .ssh/known_hosts -chmod +x /Users/vcpkg/register-guest.sh -/Users/vcpkg/register-guest.sh $Pat - -"@ - -$script | ssh $sshCookie -ssh $sshCookie rm /Users/vcpkg/register-guest.sh diff --git a/scripts/azure-pipelines/osx/register-guest.sh b/scripts/azure-pipelines/osx/register-guest.sh index c3802b1cf2ea9e..f714e45f5ecefc 100644 --- a/scripts/azure-pipelines/osx/register-guest.sh +++ b/scripts/azure-pipelines/osx/register-guest.sh @@ -10,11 +10,13 @@ export POOL=`echo ~/Parallels/*/ | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-o # on arm64, DNS works export SSH_COOKIE=vcpkg@vcpkgs-Virtual-Machine.local else -export POOL=`echo ~/Parallels/*.pvm | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})-amd64\.pvm/PrOsx-\1/p'` +export POOL=`echo ~/Parallels/*.pvm | sed -nr 's/\/Users\/vcpkg\/Parallels\/vcpkg-osx-([0-9]{4}-[0-9]{2}-[0-9]{2})\.pvm/PrOsx-\1/p'` # on amd64, DNS does not work, but luckily for us prlctl does know the IP export GUEST_IP=`prlctl list --full | sed -nr 's/^.*running *([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/\1/p'` export SSH_COOKIE=vcpkg@$GUEST_IP fi +echo "POOL: $POOL" +echo "SSH_COOKIE: $SSH_COOKIE" ssh $SSH_COOKIE -o "StrictHostKeyChecking=no" -i ~/Parallels/*/id_guest "~/myagent/config.sh --unattended --url https://dev.azure.com/vcpkg --work ~/Data/work --auth pat --token $1 --pool $POOL --agent $AGENT --replace --acceptTeeEula" if [ `uname -m` = 'arm64' ]; then ssh $SSH_COOKIE -o "StrictHostKeyChecking=no" -i ~/Parallels/*/id_guest "sudo shutdown -h now" diff --git a/scripts/azure-pipelines/osx/setup-box.sh b/scripts/azure-pipelines/osx/setup-box.sh index 2adf6dcc328d5d..0dd81e7b8e98dc 100644 --- a/scripts/azure-pipelines/osx/setup-box.sh +++ b/scripts/azure-pipelines/osx/setup-box.sh @@ -1,14 +1,10 @@ #!/bin/sh -# The next 2 lines are a workaround for an XCode Command Line Tools bug: -# https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Known-Issues -sudo mdutil -ad -sudo mkdir -p /Library/Developer/CommandLineTools -sudo touch /Library/Developer/CommandLineTools/.beta hdiutil attach clt.dmg -mountpoint /Volumes/setup-installer sudo installer -pkg "/Volumes/setup-installer/Command Line Tools.pkg" -target / hdiutil detach /Volumes/setup-installer rm clt.dmg +sudo xcode-select -s /Applications/Xcode.app /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" if [ `uname -m` = 'arm64' ]; then (echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') >> /Users/vcpkg/.zprofile @@ -20,9 +16,9 @@ fi brew install autoconf-archive autoconf automake azcopy azure-cli bison cmake gettext gfortran gnu-sed gperf gtk-doc libtool meson mono nasm ninja pkg-config powershell python-setuptools texinfo yasm mkdir ~/Data if [ `uname -m` = 'arm64' ]; then -curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-arm64-4.259.0.tar.gz +curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-arm64-4.261.0.tar.gz else -curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.259.0/vsts-agent-osx-x64-4.259.0.tar.gz +curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.261.0/vsts-agent-osx-x64-4.261.0.tar.gz fi mkdir ~/myagent tar xf ~/Downloads/azure-agent.tar.gz -C ~/myagent diff --git a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml index 5ec13e15e03811..fa15c2b6de7fe6 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 2025.08.15 + demands: ImageVersionOverride -equals 2025.09.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 d55a07124c13ff..35ff4e3d4089ec 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 2025.08.15 + demands: ImageVersionOverride -equals 2025.09.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 0d19fa410ac1d3..3c9ec68a59aaf3 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.30.0/azcopy_windows_amd64_10.30.0.zip' + $AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.1/azcopy_windows_amd64_10.30.1.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.30.0.zip?$SasToken" + $AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.30.1.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 c88831be737a11..2466040a3c7207 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.76.0-x64.msi' + $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.77.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.76.0-x64.msi?$SasToken" + $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.77.0-x64.msi?$SasToken" } DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart') diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 87efb984e8128e..94b05e337142fd 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { [string]$PwshUrl if ([string]::IsNullOrEmpty($SasToken)) { Write-Host 'Downloading from the Internet' - $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.5.2/PowerShell-7.5.2-win-x64.msi' + $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.5.3/PowerShell-7.5.3-win-x64.msi' } else { Write-Host 'Downloading from vcpkgimageminting using SAS token' $SasToken = $SasToken.Replace('"', '') - $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.5.2-win-x64.msi?$SasToken" + $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.5.3-win-x64.msi?$SasToken" } DownloadAndInstall -Url $PwshUrl -Name 'PowerShell Core' -Args @('/quiet', '/norestart') diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 3ea5d25d569f2e..446327c7b8c7ac 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -8,8 +8,8 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") { } # See https://learn.microsoft.com/visualstudio/releases/2022/release-history -# 17.14.12 -$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/a54455c3-57af-4ccb-ab09-88cfa071f1b5/c5dc5ae50da56fa711f3d699747e9bb2ac8795bd2535a1d288d2f4c88b64a582/vs_Enterprise.exe' +# 17.14.14 +$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/c2e2845d-bdff-44fc-ac00-3d488e9f5675/60af8b24769eebe0349cd8bbf17ecb257a30bb69aae1970210e292062a002119/vs_Enterprise.exe' $Workloads = @( 'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.Universal', diff --git a/scripts/vcpkg-tools.json b/scripts/vcpkg-tools.json index 9ea57f8f300686..f31e7699cd62cd 100644 --- a/scripts/vcpkg-tools.json +++ b/scripts/vcpkg-tools.json @@ -74,8 +74,8 @@ "arch": "arm64", "version": "2.7.4", "executable": "clangarm64/bin/git.exe", - "url": "https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.2/PortableGit-2.47.1.2-arm64.7z.exe", - "sha512": "2e57cebc1f567bbb63b92825e4b9625de24bc897c4ea9aa8d88f70b5ad69c53005e062f94b60d10269855f2edd0505d5d6233c6c067d6af1bbedde66c9b856c3", + "url": "https://github.com/git-for-windows/git/releases/download/v2.51.0.windows.1/PortableGit-2.51.0-arm64.7z.exe", + "sha512": "877b4cc5c91108488c55b9a75059d864915f50929cc4ebfa741074216e5e597ae3b7f4e35dea7a1e667f8d712ba8d1f6813d66d11d00bf42b0bb681322386e76", "archive": "PortableGit-2.47.1.2-arm64.7z.exe" }, { @@ -84,8 +84,8 @@ "arch": "amd64", "version": "2.7.4", "executable": "mingw64/bin/git.exe", - "url": "https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.2/PortableGit-2.47.1.2-64-bit.7z.exe", - "sha512": "a96dd809b2dc940d871a84a2c3f2f4600552fe67f437ffeb29abb3b3da636f3534fa3118af61fca9349e97ec8dbb54210c213dee0c8beadbd9ba27a6c091dd98", + "url": "https://github.com/git-for-windows/git/releases/download/v2.51.0.windows.1/PortableGit-2.51.0-64-bit.7z.exe", + "sha512": "74680d7d4573e2f428bbaa0d38d6506ddf870f2a20f4ec3118bc3012cb9ca766e03508f074fd4b3b0b034bbd05d2c4eecde321c73e18613fe11fbc7510c731c7", "archive": "PortableGit-2.47.1.2-64-bit.7z.exe" }, { @@ -297,111 +297,111 @@ { "name": "powershell-core", "os": "windows", - "version": "7.2.24", + "version": "7.5.3", "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" + "url": "https://github.com/PowerShell/PowerShell/releases/download/v7.5.3/PowerShell-7.5.3-win-x64.zip", + "sha512": "3ccac854b8764423d9da5ffd680f8a9d68f37bcac703d17afba89109433d383fbbc5fd55a8b80d406f0f5e8b76836edeb148621fd3b99a5aca549c8938b8c578", + "archive": "PowerShell-7.5.3-win-x64.zip" }, { "name": "node", "os": "windows", "arch":"x64", - "version": "24.3.0", - "executable": "node-v24.3.0-win-x64/node.exe", - "url": "https://nodejs.org/dist/v24.3.0/node-v24.3.0-win-x64.7z", - "sha512": "01d967a0a24f7ffe76a963caca3faae19f788ebdd598d99033adc6cd9916db8912f7b80ca6966eca5e5b215b6d36d4fae22422f9fb269d2e25c1bbf64235e583", - "archive": "node-v24.3.0-win-x64.7z" + "version": "24.8.0", + "executable": "node-v24.8.0-win-x64/node.exe", + "url": "https://nodejs.org/dist/v24.8.0/node-v24.8.0-win-x64.7z", + "sha512": "df7099033a60f746f2a9eb0374d41fb68e7b0cce57f07a1819d3500ce8db36e3da2a6c77227f82e3373f1fe1cdec565f22ee8092274853d8f249fcdc0af5da06", + "archive": "node-v24.8.0-win-x64.7z" }, { "name": "node", "os": "windows", "arch":"arm64", - "version": "24.3.0", - "executable": "node-v24.3.0-win-arm64/node.exe", - "url": "https://nodejs.org/dist/v24.3.0/node-v24.3.0-win-arm64.7z", - "sha512": "8ba71abd1bac1f790f2d71c5e879381e221c00265dc418dd98c01798a5ee60578488b7f838d29a76d70fa2aca7e8c9feb4a6f41d00a55affd9eb991a1e28eef8", - "archive": "node-v24.3.0-win-arm64.7z" + "version": "24.8.0", + "executable": "node-v24.8.0-win-arm64/node.exe", + "url": "https://nodejs.org/dist/v24.8.0/node-v24.8.0-win-arm64.7z", + "sha512": "f80a971d6c818aaea423d7b7171e27636d2701715bb1f6b760872d240121b1eb79bd717977bb3f4909ada81fbb7a941e1c1892707f758c7861d15fcdd623ede5", + "archive": "node-v24.8.0-win-arm64.7z" }, { "name": "node", "os": "linux", "arch":"x64", - "version": "24.3.0", - "executable": "node-v24.3.0-linux-x64/bin/node", - "url": "https://nodejs.org/dist/v24.3.0/node-v24.3.0-linux-x64.tar.gz", - "sha512": "5b64913ad0138d4db19b85048c0a72d81d1b696edcadf2d2d80e18d6c6cf1bf5529bcba692ebeedc0468173db4b9d472d25c88eaa6178b71ae398a91d105c1dc", - "archive": "node-v24.3.0-linux-x64.tar.gz" + "version": "24.8.0", + "executable": "node-v24.8.0-linux-x64/bin/node", + "url": "https://nodejs.org/dist/v24.8.0/node-v24.8.0-linux-x64.tar.gz", + "sha512": "c008d04c1976353fc9cf0efde11ab1cacbc726122ebe22cabf2d5eff156072266bc5a214caf0e064c59899ed4ce674f52fffb9aeec399ce0f94e347086ecf114", + "archive": "node-v24.8.0-linux-x64.tar.gz" }, { "name": "node", "os": "linux", "arch": "arm64", - "version": "24.3.0", - "executable": "node-v24.3.0-linux-arm64/bin/node", - "url": "https://nodejs.org/dist/v24.3.0/node-v24.3.0-linux-arm64.tar.gz", - "sha512": "cebafb7d5889f89dcdf4139c568b84f7daff09088a1b227d02e92bdb56c11f1ba739f29cd645150098c14d70d384c2e31a3ad71e3b582709e7adcaaedc5240cd", - "archive": "node-v24.3.0-linux-arm64.tar.gz" + "version": "24.8.0", + "executable": "node-v24.8.0-linux-arm64/bin/node", + "url": "https://nodejs.org/dist/v24.8.0/node-v24.8.0-linux-arm64.tar.gz", + "sha512": "58bcef57e47179ac9f0b81a2118c4ecb464fd8e38809e9744026af466f4ef1c7df16dd075e7f58b90d80e67241151d623cd48cba8a83cf898c42774b387c8d27", + "archive": "node-v24.8.0-linux-arm64.tar.gz" }, { "name": "node", "os": "osx", "arch":"x64", - "version": "24.3.0", - "executable": "node-v24.3.0-darwin-x64/bin/node", - "url": "https://nodejs.org/dist/v24.3.0/node-v24.3.0-darwin-x64.tar.gz", - "sha512": "366c58a27c04db072116619f7f085f38c9e9fb3d3022ce18484f61bb29ab1d0bb79412b8d6f9ea8b97ec9fa6c41584f18ba83a01e89d744f29983d2bc8532358", - "archive": "node-v24.3.0-darwin-x64.tar.gz" + "version": "24.8.0", + "executable": "node-v24.8.0-darwin-x64/bin/node", + "url": "https://nodejs.org/dist/v24.8.0/node-v24.8.0-darwin-x64.tar.gz", + "sha512": "7537027ce5d7b46e7241625d95a18df15e41233de4ec11ba17e9c500f7eb1b26004921f966f1a862c079fe56143934dd903a29cd5f41d22995811b6fd0842ca7", + "archive": "node-v24.8.0-darwin-x64.tar.gz" }, { "name": "node", "os": "osx", "arch": "arm64", - "version": "24.3.0", - "executable": "node-v24.3.0-darwin-arm64/bin/node", - "url": "https://nodejs.org/dist/v24.3.0/node-v24.3.0-darwin-arm64.tar.gz", - "sha512": "b8356c0798cff75bba1ec652410400ebe0d9de9025f39854b664a327fa28265f8584ccfcb965bf25530cc379163c3b796e11c487e065c836a54b113f318f79c7", - "archive": "node-v24.3.0-darwin-arm64.tar.gz" + "version": "24.8.0", + "executable": "node-v24.8.0-darwin-arm64/bin/node", + "url": "https://nodejs.org/dist/v24.8.0/node-v24.8.0-darwin-arm64.tar.gz", + "sha512": "54e33d0397148e805aff9e3732a71c4f0e6de89a5c4cbe55606c5886e16df2df7812dc8c48f001e1ea2902002a4388221a86af3eb491d8c2287da4b7acdd57a6", + "archive": "node-v24.8.0-darwin-arm64.tar.gz" }, { "name": "azcopy", "os": "linux", "arch": "amd64", - "version": "10.29.1", - "executable": "azcopy_linux_amd64_10.29.1/azcopy", - "url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.29.1/azcopy_linux_amd64_10.29.1.tar.gz", - "sha512": "e2fe66658d790784e5d32f397254aad2bb3fa3faec6929e5a9800111d8feee8353db0250feb7d9e49a77118a5437513162704506e0324903b5aeb96f8d85e8fb", - "archive": "azcopy_linux_amd64_10.29.1.tar.gz" + "version": "10.30.1", + "executable": "azcopy_linux_amd64_10.30.1/azcopy", + "url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.1/azcopy_linux_amd64_10.30.1.tar.gz", + "sha512": "ce4e760d047ef01def9e9e1057540d5b22da610ef1627820ca89ecf5496f2ebf6173fe7ff52fa00dcea55ff9f6e737b53ad1decaca32cd058037954fe1794b6f", + "archive": "azcopy_linux_amd64_10.30.1.tar.gz" }, { "name": "azcopy", "os": "osx", "arch": "amd64", - "version": "10.29.1", - "executable": "azcopy_darwin_amd64_10.29.1/azcopy", - "url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.29.1/azcopy_darwin_amd64_10.29.1.zip", - "sha512": "12481665136e6a10c8b1f784a097420c76d47336e8d2d5dc8b004012ab75e0e91d846fbd8cd0fb75bd6e9603db660cd5eb5ce71a8e003994a4356f19e3c02ec2", - "archive": "azcopy_darwin_amd64_10.29.1.zip" + "version": "10.30.1", + "executable": "azcopy_darwin_amd64_10.30.1/azcopy", + "url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.1/azcopy_darwin_amd64_10.30.1.zip", + "sha512": "dbc2b10cf11df3f25cb30256c653ae713012c74c0a244b4db65bb270bc5499cff4aee88fba3457a2b2efb14b6bfb64be3a511e3ea43efa44c2a5c0aa1166dfe7", + "archive": "azcopy_darwin_amd64_10.30.1.zip" }, { "name": "azcopy", "os": "osx", "arch": "arm64", - "version": "10.29.1", - "executable": "azcopy_darwin_arm64_10.29.1/azcopy", - "url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.29.1/azcopy_darwin_arm64_10.29.1.zip", - "sha512": "025bbc13b6617ab341fd0344a7a6342b44e6d10e5b7fb009a35988bfcebc442e0d3c6040f7245ea4e3c0643410a0342eff17aab295dea7667441f1e78801b845", - "archive": "azcopy_darwin_arm64_10.29.1.zip" + "version": "10.30.1", + "executable": "azcopy_darwin_arm64_10.30.1/azcopy", + "url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.1/azcopy_darwin_arm64_10.30.1.zip", + "sha512": "8b4f4c694a3292bb4e55f14e9898446f38ee07a008f4dfc32c73b0dece78cc159c639afa8bfbe49a9d07a9bb456233beb2692f7a338da027207e28b42434f613", + "archive": "azcopy_darwin_arm64_10.30.1.zip" }, { "name": "azcopy", "os": "windows", "arch": "amd64", - "version": "10.29.1", - "executable": "azcopy_windows_amd64_10.29.1/azcopy.exe", - "url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.29.1/azcopy_windows_amd64_10.29.1.zip", - "sha512": "f3f30b51d7447e27912bb42241ff187cc89596a0ca0c7138367891ecb01282e947a70f6ba1f248f79ef4f4707e03cceeabcc7b3bc8187cb661e32c2195ddfdd2", - "archive": "azcopy_windows_amd64_10.29.1.zip" + "version": "10.30.1", + "executable": "azcopy_windows_amd64_10.30.1/azcopy.exe", + "url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.30.1/azcopy_windows_amd64_10.30.1.zip", + "sha512": "9610cff24c5a0f85423892b3b9ff1b46c7c6b1b8ef27c1164298cc3cd212fc7be0d6f3fbaef42268264448f1d9cd77c39272eebccd9fb8943bbb27a4a638e4c5", + "archive": "azcopy_windows_amd64_10.30.1.zip" } ] } From 7f66120bca9687d475fd8155e81b97967f993d4f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 15 Sep 2025 16:31:57 -0700 Subject: [PATCH 02/49] Passing, remove from fail lists. --- scripts/ci.baseline.txt | 22 +++------------------- scripts/ci.feature.baseline.txt | 4 ---- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 49cabba2262639..d82579adc7bf96 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -39,9 +39,6 @@ ## # Add new items alphabetically - -# ada-url requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. -ada-url:x64-linux=fail angelscript:x64-osx=fail apr:arm-neon-android=fail apr:arm64-android=fail @@ -52,13 +49,11 @@ 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 arrayfire:x64-linux=fail +atliac-minitest:arm64-uwp=fail +atliac-minitest:x64-uwp=fail avro-c:arm-neon-android=fail avro-c:arm64-android=fail avro-c:x64-android=fail -# C++20 conformant compiler required -atliac-minitest:arm64-uwp=fail -atliac-minitest:x64-linux=fail -atliac-minitest:x64-uwp=fail backward-cpp:arm-neon-android=fail backward-cpp:arm64-android=fail backward-cpp:x64-android=fail @@ -243,7 +238,6 @@ cppcoro:arm64-osx=fail cppcoro:x64-android=fail cppcoro:x64-linux=fail cppcoro:x64-osx=fail -cppslippi:x64-linux=fail crashpad:x64-linux=fail #Compilation failed due to the lack of Clang++ compiler. cserialport:arm-neon-android=fail cserialport:arm64-android=fail @@ -284,16 +278,12 @@ directxsdk:x64-windows=skip directxsdk:x86-windows=skip discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail -# Needs newer GCC than we have -discordcoreapi:x64-linux=fail -# Needs newer standard library than we have -discordcoreapi:x64-osx=fail +discordcoreapi:x64-osx=fail # Needs newer standard library than we have discount:x64-android=fail eathread:x64-android=fail ecal:arm-neon-android=fail ecal:arm64-android=fail ecal:x64-android=fail -faker-cxx:x64-linux=fail # requires gcc13 or later # variable length arrays in C++ are a Clang extension fbbgemmerror:arm-neon-android=fail fbbgemmerror:arm64-android=fail @@ -619,7 +609,6 @@ llvm:x64-android=fail log4cplus:arm64-uwp=fail log4cplus:x64-uwp=fail log4cpp:x64-linux=fail # dynamic exception specifications -marzbanpp:x64-linux=fail # triplet supported but vcpkg toolchain is too old (requires GCC 12+/Clang 19+) mchehab-zbar:arm-neon-android=fail mchehab-zbar:arm64-android=fail mchehab-zbar:x64-android=fail @@ -769,7 +758,6 @@ optional-bare:x64-windows-static-md=skip optional-bare:x64-windows-static=skip optional-bare:x64-windows=skip optional-bare:x86-windows=skip -orange-math:x64-linux=fail orc:arm-neon-android=fail orc:arm64-android=fail orc:x64-android=fail @@ -886,7 +874,6 @@ rpclib:x64-uwp=fail rtmidi:arm-neon-android=fail rtmidi:arm64-android=fail rtmidi:x64-android=fail -safetyhook:x64-linux=fail salome-medcoupling:x64-linux=fail saucer:arm64-osx=fail # std::move_only_function is not supported saucer:x64-linux=fail # requires gcc14 or later @@ -1029,9 +1016,6 @@ v8:x64-windows-static-md=fail v8:x64-windows-static=fail v8:x64-windows=fail v8:x86-windows=fail -# vst3sdk CMake files work only with the GUI version of Xcode -vst3sdk:arm64-osx=fail -vst3sdk:x64-osx=fail vtk:arm64-windows-static-md=fail vtk:arm64-windows=fail vtk-dicom:arm64-windows-static-md=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index ecbed4d25c5300..3929d4603278b1 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -54,7 +54,6 @@ llvm = skip ace[tao]:arm-neon-android=feature-fails # tao requires a host tree with tao_idl compiled for the host ace[tao]:arm64-android=feature-fails ace[tao]:x64-android=feature-fails -ada-url:x64-linux=fail # ada-url requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. 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 armadillo:arm-neon-android=cascade @@ -1897,7 +1896,6 @@ rtabmap(uwp) = cascade ryml:arm64-uwp = cascade ryml:arm64-windows = cascade ryml:x64-uwp = cascade -safetyhook:x64-linux=fail salome-configuration:arm64-uwp = cascade salome-configuration:x64-uwp = cascade salome-med-fichier:arm64-uwp = cascade @@ -2134,7 +2132,6 @@ dcmtk(uwp) = fail # Please set the C++ runtime location (required for running ap dmlc[openmp](osx) = feature-fails # No openmp on osx dv-processing[tools](osx) = feature-fails # Broke with compiler version. See https://github.com/microsoft/vcpkg/issues/39852 embree3[core,avx,avx2,avx512,default-features,sse2,sse42](osx) = combination-fails # CMake Error at CMakeLists.txt:447 (MESSAGE): Using Embree as static library is not supported with AppleClang >= 9.0 when multiple ISAs are selected. Please either build a shared library or enable only one ISA. -faker-cxx(linux) = fail # requires gcc13 or later ffmpeg[all,all-gpl](x64 & android) = feature-fails ffmpeg[nvcodec,ffplay,opengl](android) = feature-fails fftw3[openmp](osx) = feature-fails # waits for https://github.com/microsoft/vcpkg/pull/30833 @@ -2213,7 +2210,6 @@ openmvg[core](arm & windows & !uwp) = combination-fails # nmmintrin.h(17): fatal openmvg[openmp](arm & windows & !uwp) = feature-fails openscap[python](!windows) = feature-fails # CI image lacks swig opentelemetry-cpp[otlp](uwp) = feature-fails # --grpc_out: protoc-gen-grpc: The system cannot find the file specified. See https://github.com/microsoft/vcpkg/issues/34847 -orange-math(linux) = fail # requires gcc15 or later osgearth[tools](osx) = feature-fails # Undefined _NSSearchPathForDirectoriesInDomains pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,openni2,png,realsense,tiff,tools,vars,video,zstd]:x64-windows-static-md=combination-fails pangolin[core,eigen,examples,ffmpeg,gui,jpeg,lz4,module,openexr,png,realsense,test,tiff,tools,vars,video,zstd](!(arm & windows)) = combination-fails # see https://github.com/microsoft/vcpkg/issues/31304 From ddb2e31f0d345ae9eb6a0d495f4225563d4f9084 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 15 Sep 2025 23:45:04 +0000 Subject: [PATCH 03/49] [clockutils] Disable -Werror --- ports/clockutils/disable-werror.diff | 22 ++++++++++++++++++++++ ports/clockutils/portfile.cmake | 1 + ports/clockutils/vcpkg.json | 2 +- scripts/ci.baseline.txt | 2 +- scripts/ci.feature.baseline.txt | 2 +- versions/baseline.json | 2 +- versions/c-/clockutils.json | 5 +++++ 7 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 ports/clockutils/disable-werror.diff diff --git a/ports/clockutils/disable-werror.diff b/ports/clockutils/disable-werror.diff new file mode 100644 index 00000000000000..12c48c69b9a805 --- /dev/null +++ b/ports/clockutils/disable-werror.diff @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c77383..0c8029b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,13 +64,13 @@ set (CLANG_FLAGS "-Wstring-plus-int") + IF(${CMAKE_CXX_COMPILER_ID} MATCHES Clang) + set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} ${CLANG_FLAGS} -g") + set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} ${CLANG_FLAGS} -0s -DNDEBUG") +- set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG -Werror") +- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g -Werror") ++ set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${CLANG_FLAGS} -O3 -DNDEBUG") ++ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} ${CLANG_FLAGS} -O2 -g") + ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) + set (CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} -g") + set (CMAKE_CXX_FLAGS_MINSIZEREL "${CXX_FLAGS} -0s -DNDEBUG") +- set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} -O3 -DNDEBUG -Werror") +- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} -O2 -g -Werror") ++ set (CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} -O3 -DNDEBUG") ++ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CXX_FLAGS} -O2 -g") + ELSEIF(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) + set (CXX_FLAGS "/MP /W4 /wd4127 /D_WINSOCK_DEPRECATED_NO_WARNINGS /DNOMINMAX") + set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CXX_FLAGS}") diff --git a/ports/clockutils/portfile.cmake b/ports/clockutils/portfile.cmake index c7b8351cb95fea..b6b791d289ebcf 100644 --- a/ports/clockutils/portfile.cmake +++ b/ports/clockutils/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-warningC4643.patch add-missing-thread-header.patch cmake4.patch + disable-werror.diff ) set(SHARED_FLAG OFF) diff --git a/ports/clockutils/vcpkg.json b/ports/clockutils/vcpkg.json index a97ad8ad631d8f..d2f43d5a2d474a 100644 --- a/ports/clockutils/vcpkg.json +++ b/ports/clockutils/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clockutils", "version": "1.1.1", - "port-version": 3, + "port-version": 4, "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.", "homepage": "https://github.com/ClockworkOrigins/clockUtils", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d82579adc7bf96..8937e0f1810f29 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -209,7 +209,7 @@ clamav:arm64-windows=fail clblas:arm-neon-android=fail clblas:arm64-android=fail clblas:x64-android=fail -clockutils:arm-neon-android=fail +clockutils:arm-neon-android=fail # gnustl_shared is no longer supported. Please switch to either c++_shared or c++_static. clockutils:arm64-android=fail clockutils:x64-android=fail clrng:arm-neon-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 3929d4603278b1..46608b730ca4ca 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -87,7 +87,7 @@ clapack:x64-windows-release=skip clapack:x64-windows=skip clapack:x86-windows=skip clapack(android)=fail # needs target configuration data -clockutils:arm-neon-android=fail +clockutils:arm-neon-android=fail # gnustl_shared is no longer supported. Please switch to either c++_shared or c++_static. clockutils:arm64-android=fail clockutils:x64-android=fail coroutine(uwp)=fail diff --git a/versions/baseline.json b/versions/baseline.json index 50b1e1c2709293..2a18a21049fb59 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1802,7 +1802,7 @@ }, "clockutils": { "baseline": "1.1.1", - "port-version": 3 + "port-version": 4 }, "clrng": { "baseline": "2020-12-01", diff --git a/versions/c-/clockutils.json b/versions/c-/clockutils.json index b5a82ce99fee9e..f1651de0955e60 100644 --- a/versions/c-/clockutils.json +++ b/versions/c-/clockutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3556cbd362e0efbe942f67d19bc63b6963dd5a50", + "version": "1.1.1", + "port-version": 4 + }, { "git-tree": "ff817069188d4dc9146f7f4627e40e367f12ad64", "version": "1.1.1", From 6e6951dd07b6184a2c20325e7ee620ebfc948369 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 16 Sep 2025 00:01:02 +0000 Subject: [PATCH 04/49] [cpprealm] Add missing header and disable -Werror. --- ports/cpprealm/disable-werror.diff | 13 +++++++++++++ ports/cpprealm/missing-cstdint.diff | 12 ++++++++++++ ports/cpprealm/portfile.cmake | 3 +++ ports/cpprealm/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cpprealm.json | 5 +++++ 6 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 ports/cpprealm/disable-werror.diff create mode 100644 ports/cpprealm/missing-cstdint.diff diff --git a/ports/cpprealm/disable-werror.diff b/ports/cpprealm/disable-werror.diff new file mode 100644 index 00000000000000..c33b5e266773b0 --- /dev/null +++ b/ports/cpprealm/disable-werror.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8b0675..cea75c0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,7 @@ target_link_libraries(cpprealm PUBLIC Realm::ObjectStore) + set(CMAKE_OSX_SYSROOT ${CMAKE_OSX_SYSROOT_PATH}) + + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- target_compile_options(cpprealm PRIVATE -Wall -Wextra -pedantic -Werror) ++ target_compile_options(cpprealm PRIVATE -Wall -Wextra -pedantic) + endif() + + if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) diff --git a/ports/cpprealm/missing-cstdint.diff b/ports/cpprealm/missing-cstdint.diff new file mode 100644 index 00000000000000..15321239d7ebf4 --- /dev/null +++ b/ports/cpprealm/missing-cstdint.diff @@ -0,0 +1,12 @@ +diff --git a/include/cpprealm/internal/bridge/realm.hpp b/include/cpprealm/internal/bridge/realm.hpp +index 38703d1..827c71d 100644 +--- a/include/cpprealm/internal/bridge/realm.hpp ++++ b/include/cpprealm/internal/bridge/realm.hpp +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + namespace realm { + class Realm; diff --git a/ports/cpprealm/portfile.cmake b/ports/cpprealm/portfile.cmake index 4355b98e238547..29db6591faed69 100644 --- a/ports/cpprealm/portfile.cmake +++ b/ports/cpprealm/portfile.cmake @@ -4,6 +4,9 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 "cf975741b5a4a68a40845c53d8584d871acff03c7a212e71a67799801979e0514de2a449aa5d78137f2d7f42e113c5df7c97e9f8c5fb6371e95c46f29ab2b246" HEAD_REF "main" + PATCHES + missing-cstdint.diff # https://github.com/realm/realm-cpp/pull/247 + disable-werror.diff ) if(NOT VCPKG_BUILD_TYPE) diff --git a/ports/cpprealm/vcpkg.json b/ports/cpprealm/vcpkg.json index 5947ae49fb380b..b91566471b53cf 100644 --- a/ports/cpprealm/vcpkg.json +++ b/ports/cpprealm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpprealm", "version": "2.2.0", + "port-version": 1, "description": "Realm is a mobile database that runs directly inside phones, tablets or wearables.", "homepage": "https://github.com/realm/realm-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2a18a21049fb59..64661323aea0c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2078,7 +2078,7 @@ }, "cpprealm": { "baseline": "2.2.0", - "port-version": 0 + "port-version": 1 }, "cpprestsdk": { "baseline": "2.10.19", diff --git a/versions/c-/cpprealm.json b/versions/c-/cpprealm.json index 0cd8b5b7c10359..c4f80d9e71b1df 100644 --- a/versions/c-/cpprealm.json +++ b/versions/c-/cpprealm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d9a73a047c5d240bc0eacee7be1dcfcc5b33be7", + "version": "2.2.0", + "port-version": 1 + }, { "git-tree": "bbcfe69dfeb591c85bece17d0c46ff622a66f884", "version": "2.2.0", From 24edd701c0e34c1e4a953eb3182ca1016bf104cb Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 16 Sep 2025 00:18:15 +0000 Subject: [PATCH 05/49] [cpprealm] Also fix macos overzealous template --- ports/cpprealm/portfile.cmake | 1 + .../cpprealm/remove-overzealous-template.diff | 22 +++++++++++++++++++ versions/c-/cpprealm.json | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ports/cpprealm/remove-overzealous-template.diff diff --git a/ports/cpprealm/portfile.cmake b/ports/cpprealm/portfile.cmake index 29db6591faed69..3a1c57aa9bf3b0 100644 --- a/ports/cpprealm/portfile.cmake +++ b/ports/cpprealm/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES missing-cstdint.diff # https://github.com/realm/realm-cpp/pull/247 disable-werror.diff + remove-overzealous-template.diff # https://github.com/realm/realm-cpp/pull/248 ) if(NOT VCPKG_BUILD_TYPE) diff --git a/ports/cpprealm/remove-overzealous-template.diff b/ports/cpprealm/remove-overzealous-template.diff new file mode 100644 index 00000000000000..fed98523a851bd --- /dev/null +++ b/ports/cpprealm/remove-overzealous-template.diff @@ -0,0 +1,22 @@ +diff --git a/include/cpprealm/schema.hpp b/include/cpprealm/schema.hpp +index 7494d60..7479c3c 100644 +--- a/include/cpprealm/schema.hpp ++++ b/include/cpprealm/schema.hpp +@@ -253,7 +253,7 @@ namespace realm { + + if constexpr (N + 1 == sizeof...(Properties)) { + if (property_name == std::string_view(names[N])) { +- auto ptr = managed::template unmanaged_to_managed_pointer(property.ptr); ++ auto ptr = managed::unmanaged_to_managed_pointer(property.ptr); + if constexpr (std::is_pointer_v) { + return (cls.*ptr); + } else { +@@ -263,7 +263,7 @@ namespace realm { + return variant_t{}; + } else { + if (property_name == std::string_view(names[N])) { +- auto ptr = managed::template unmanaged_to_managed_pointer(property.ptr); ++ auto ptr = managed::unmanaged_to_managed_pointer(property.ptr); + if constexpr (std::is_pointer_v) { + return (cls.*ptr); + } else { diff --git a/versions/c-/cpprealm.json b/versions/c-/cpprealm.json index c4f80d9e71b1df..48035f306feed8 100644 --- a/versions/c-/cpprealm.json +++ b/versions/c-/cpprealm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2d9a73a047c5d240bc0eacee7be1dcfcc5b33be7", + "git-tree": "fab378e4d20b4f11ae1514a254770189a3765fbc", "version": "2.2.0", "port-version": 1 }, From 8183ef8732ecdec48d0182e06da56aadd3d3aa66 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 16 Sep 2025 00:45:45 +0000 Subject: [PATCH 06/49] [dbow3] Add missing header. --- ports/dbow3/add-cstdint.diff | 19 +++++++++++++++++++ ports/dbow3/portfile.cmake | 5 +++-- ports/dbow3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dbow3.json | 5 +++++ 5 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 ports/dbow3/add-cstdint.diff diff --git a/ports/dbow3/add-cstdint.diff b/ports/dbow3/add-cstdint.diff new file mode 100644 index 00000000000000..69648b4a31eac9 --- /dev/null +++ b/ports/dbow3/add-cstdint.diff @@ -0,0 +1,19 @@ +diff --git a/Lib/include/DBow3/BowVector.h b/Lib/include/DBow3/BowVector.h +index cdbf517..90862b9 100644 +--- a/Lib/include/DBow3/BowVector.h ++++ b/Lib/include/DBow3/BowVector.h +@@ -10,13 +10,11 @@ + #ifndef __D_T_BOW_VECTOR__ + #define __D_T_BOW_VECTOR__ + ++#include + #include + #include + #include + #include "exports.h" +-#if _WIN32 +-#include +-#endif + namespace DBoW3 { + + /// Id of words diff --git a/ports/dbow3/portfile.cmake b/ports/dbow3/portfile.cmake index 1feaca835004cb..bee7dc461a7569 100644 --- a/ports/dbow3/portfile.cmake +++ b/ports/dbow3/portfile.cmake @@ -13,8 +13,9 @@ vcpkg_from_github( REF c5ae539abddcef43ef64fa130555e2d521098369 SHA512 a1b35d2a524a23c367180574f7ddbcad73161c7fda6c3e7973273ab86092d9c6d89df28925a8e53691cd894f2d6588832604a0dbdba478557695806907bf36eb PATCHES - "${REMOVE_DYNAMIC_EXCEPTION_SPECS}" - fix_cmake.patch + "${REMOVE_DYNAMIC_EXCEPTION_SPECS}" + fix_cmake.patch + add-cstdint.diff # https://github.com/rmsalinas/DBow3/pull/55 ) vcpkg_cmake_configure( diff --git a/ports/dbow3/vcpkg.json b/ports/dbow3/vcpkg.json index 5e1bde4638f8fa..70d9bf4054c2bd 100644 --- a/ports/dbow3/vcpkg.json +++ b/ports/dbow3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dbow3", "version": "1.0.0", - "port-version": 3, + "port-version": 4, "description": "DBoW3 is an improved version of the DBow2 library, an open source C++ library for indexing and converting images into a bag-of-word representation.", "homepage": "https://github.com/rmsalinas/DBow3", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 64661323aea0c7..79011e687c22a6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2358,7 +2358,7 @@ }, "dbow3": { "baseline": "1.0.0", - "port-version": 3 + "port-version": 4 }, "dbus": { "baseline": "1.16.2", diff --git a/versions/d-/dbow3.json b/versions/d-/dbow3.json index 79c87547516365..d974adabedd89d 100644 --- a/versions/d-/dbow3.json +++ b/versions/d-/dbow3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac21ea40917489b6ef9ac7ddbdd98307f9cc5841", + "version": "1.0.0", + "port-version": 4 + }, { "git-tree": "93b9dd598ac996f1dba459030964ba8fb79ae9dd", "version": "1.0.0", From de0efe810dee902346c1b49e1c8fc8ef6511b40f Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 15 Sep 2025 17:58:56 -0700 Subject: [PATCH 07/49] [awlib] Fix build again. --- ports/awlib/fix-mac-build.patch | 35 +++++++++++++++++++++++++++++++-- ports/awlib/vcpkg.json | 2 +- versions/a-/awlib.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ports/awlib/fix-mac-build.patch b/ports/awlib/fix-mac-build.patch index de76dc8959ea88..33eabd6068a7a3 100644 --- a/ports/awlib/fix-mac-build.patch +++ b/ports/awlib/fix-mac-build.patch @@ -1,5 +1,5 @@ diff --git a/io/include/aw/io/mmap_file.h b/io/include/aw/io/mmap_file.h -index 98469732..65e82aac 100644 +index 9846973..65e82aa 100644 --- a/io/include/aw/io/mmap_file.h +++ b/io/include/aw/io/mmap_file.h @@ -83,18 +83,18 @@ using win32::file_mapping; @@ -30,8 +30,26 @@ index 98469732..65e82aac 100644 return file_mode::read|file_mode::write; } +diff --git a/types/include/aw/types/bits/variant_dispatch.h b/types/include/aw/types/bits/variant_dispatch.h +index 9d5dc3b..95a9394 100644 +--- a/types/include/aw/types/bits/variant_dispatch.h ++++ b/types/include/aw/types/bits/variant_dispatch.h +@@ -71,11 +71,11 @@ struct vh_recursive { + if constexpr (Length_left > 0) + { + if (index < Mid) +- return vh_recursive::template dispatch(index, storage, f); ++ return vh_recursive::dispatch(index, storage, f); + } + + if constexpr (Length_right > 1) +- return vh_recursive::template dispatch(index, storage, f); ++ return vh_recursive::dispatch(index, storage, f); + + _unreachable(); + } diff --git a/types/include/aw/types/byte_buffer.h b/types/include/aw/types/byte_buffer.h -index 82f46934..b38c46a9 100644 +index 82f4693..b38c46a 100644 --- a/types/include/aw/types/byte_buffer.h +++ b/types/include/aw/types/byte_buffer.h @@ -8,6 +8,7 @@ @@ -42,3 +60,16 @@ index 82f46934..b38c46a9 100644 #include namespace aw { /** +diff --git a/types/include/aw/types/containers/queue.h b/types/include/aw/types/containers/queue.h +index af8f13b..8398e8c 100644 +--- a/types/include/aw/types/containers/queue.h ++++ b/types/include/aw/types/containers/queue.h +@@ -96,7 +96,7 @@ protected: + queue_base(queue_base&& other, Allocator const& alloc) noexcept + : impl(alloc) + { +- if (alloc == other.alloc) ++ if (alloc == static_cast(other.impl)) + impl.swap(other.impl); + else + create_storage(other.allocated_size()); diff --git a/ports/awlib/vcpkg.json b/ports/awlib/vcpkg.json index 4a85e9857f6415..e6018172a3e4f3 100644 --- a/ports/awlib/vcpkg.json +++ b/ports/awlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "awlib", "version-date": "2024-04-06", - "port-version": 1, + "port-version": 2, "description": "Cross-platform utility library", "homepage": "https://github.com/absurdworlds/awlib", "license": "LGPL-3.0-or-later", diff --git a/versions/a-/awlib.json b/versions/a-/awlib.json index b1d55d6d8b224f..738db3e63ea362 100644 --- a/versions/a-/awlib.json +++ b/versions/a-/awlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47ddf0fee3b72694384dce84e6355f8a6a07ba9c", + "version-date": "2024-04-06", + "port-version": 2 + }, { "git-tree": "8e81b74f7134ef57eeabdfee3984e76eef3a7707", "version-date": "2024-04-06", diff --git a/versions/baseline.json b/versions/baseline.json index 79011e687c22a6..6c862be7040f72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -430,7 +430,7 @@ }, "awlib": { "baseline": "2024-04-06", - "port-version": 1 + "port-version": 2 }, "aws-c-auth": { "baseline": "0.9.1", From 926dba6aeb4d2187bfe26abbb59bb514b1c8632b Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 16 Sep 2025 01:12:57 +0000 Subject: [PATCH 08/49] [hareflow] Add missing header --- ports/hareflow/fix-missing-headers.diff | 12 ++++++++++++ ports/hareflow/portfile.cmake | 1 + ports/hareflow/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hareflow.json | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ports/hareflow/fix-missing-headers.diff diff --git a/ports/hareflow/fix-missing-headers.diff b/ports/hareflow/fix-missing-headers.diff new file mode 100644 index 00000000000000..62cfa9a6ffbc57 --- /dev/null +++ b/ports/hareflow/fix-missing-headers.diff @@ -0,0 +1,12 @@ +diff --git a/include/hareflow/detail/accumulator.h b/include/hareflow/detail/accumulator.h +index 1c1e0c5..6470870 100644 +--- a/include/hareflow/detail/accumulator.h ++++ b/include/hareflow/detail/accumulator.h +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include "hareflow/detail/internal_types.h" + diff --git a/ports/hareflow/portfile.cmake b/ports/hareflow/portfile.cmake index 89e34e9e433852..9d663c721189da 100644 --- a/ports/hareflow/portfile.cmake +++ b/ports/hareflow/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF main PATCHES fix-asio-error.patch + fix-missing-headers.diff ) if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) diff --git a/ports/hareflow/vcpkg.json b/ports/hareflow/vcpkg.json index 7996a010d5bcf4..7ef6873336f050 100644 --- a/ports/hareflow/vcpkg.json +++ b/ports/hareflow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hareflow", "version-semver": "0.1.1", - "port-version": 1, + "port-version": 2, "description": "Hareflow: A RabbitMQ C++ stream client.", "homepage": "https://github.com/coveooss/hareflow", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6c862be7040f72..3ee768dfae0ae1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3658,7 +3658,7 @@ }, "hareflow": { "baseline": "0.1.1", - "port-version": 1 + "port-version": 2 }, "harfbuzz": { "baseline": "11.3.3", diff --git a/versions/h-/hareflow.json b/versions/h-/hareflow.json index e97ce5d5623309..8d29712e6217f8 100644 --- a/versions/h-/hareflow.json +++ b/versions/h-/hareflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1a56088c93917419f284eead5f65b6b3fb5f205", + "version-semver": "0.1.1", + "port-version": 2 + }, { "git-tree": "3ee668a80aa9b5023c3f78edeeec8deede29622e", "version-semver": "0.1.1", From 7559f2ade46ae5afc59e02a5cb5c3d7f6d38a9d6 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 16 Sep 2025 07:29:36 +0000 Subject: [PATCH 09/49] [libgo] Add --- ports/libgo/add-stdexcept.diff | 24 ++++++++++++++++++++++++ ports/libgo/portfile.cmake | 1 + ports/libgo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libgo.json | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 ports/libgo/add-stdexcept.diff diff --git a/ports/libgo/add-stdexcept.diff b/ports/libgo/add-stdexcept.diff new file mode 100644 index 00000000000000..1acd049d21b4a5 --- /dev/null +++ b/ports/libgo/add-stdexcept.diff @@ -0,0 +1,24 @@ +diff --git a/libgo/common/anys.h b/libgo/common/anys.h +index e5b2219..80c22e3 100644 +--- a/libgo/common/anys.h ++++ b/libgo/common/anys.h +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + namespace co + { +diff --git a/libgo/common/spinlock.h b/libgo/common/spinlock.h +index b0adeb8..30789ad 100644 +--- a/libgo/common/spinlock.h ++++ b/libgo/common/spinlock.h +@@ -1,6 +1,7 @@ + #pragma once + #include "config.h" + #include ++#include + + namespace co + { diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake index 826a162b434ed1..9352688923f20c 100644 --- a/ports/libgo/portfile.cmake +++ b/ports/libgo/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES cmake.patch Add-target-include-directory.patch + add-stdexcept.diff ) vcpkg_from_github( diff --git a/ports/libgo/vcpkg.json b/ports/libgo/vcpkg.json index c8be7a4ca42a1d..5651873faa04e5 100644 --- a/ports/libgo/vcpkg.json +++ b/ports/libgo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgo", "version": "3.1", - "port-version": 5, + "port-version": 6, "description": "The best stackful coroutine by c++11.", "homepage": "https://github.com/yyzybb537/libgo", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 3ee768dfae0ae1..615ef8df982ca1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4854,7 +4854,7 @@ }, "libgo": { "baseline": "3.1", - "port-version": 5 + "port-version": 6 }, "libgossip": { "baseline": "1.0.0.2", diff --git a/versions/l-/libgo.json b/versions/l-/libgo.json index 7fa55e263630f3..362cc6d69c71e0 100644 --- a/versions/l-/libgo.json +++ b/versions/l-/libgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa012384feae293b3b643c217849d0eb95088d2f", + "version": "3.1", + "port-version": 6 + }, { "git-tree": "e7eea4022110bad013d460a23328cd2e82385bb1", "version": "3.1", From abb516e68210438334120c00628f6b7a1750b24c Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 19:48:18 +0000 Subject: [PATCH 10/49] [licensepp] Add stdint.h and remove -Werror --- ports/licensepp/add-stdint.diff | 12 ++++++++++++ ports/licensepp/portfile.cmake | 2 ++ ports/licensepp/remove-werror.diff | 13 +++++++++++++ ports/licensepp/vcpkg.json | 3 ++- scripts/ci.feature.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/l-/licensepp.json | 5 +++++ 7 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 ports/licensepp/add-stdint.diff create mode 100644 ports/licensepp/remove-werror.diff diff --git a/ports/licensepp/add-stdint.diff b/ports/licensepp/add-stdint.diff new file mode 100644 index 00000000000000..cadc3e2e43ae63 --- /dev/null +++ b/ports/licensepp/add-stdint.diff @@ -0,0 +1,12 @@ +diff --git a/license++/license.h b/license++/license.h +index 677529e..0c50876 100644 +--- a/license++/license.h ++++ b/license++/license.h +@@ -11,6 +11,7 @@ + #ifndef License_h + #define License_h + ++#include + #include + + namespace licensepp { diff --git a/ports/licensepp/portfile.cmake b/ports/licensepp/portfile.cmake index 807841f9f569b1..9da5ce06275c93 100644 --- a/ports/licensepp/portfile.cmake +++ b/ports/licensepp/portfile.cmake @@ -9,6 +9,8 @@ vcpkg_from_github( PATCHES 0001-use-old-pem-pack.patch 0002-fix-compilation-macos.patch + add-stdint.diff + remove-werror.diff ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake" DESTINATION "${SOURCE_PATH}/cmake") diff --git a/ports/licensepp/remove-werror.diff b/ports/licensepp/remove-werror.diff new file mode 100644 index 00000000000000..e5fde57184f88c --- /dev/null +++ b/ports/licensepp/remove-werror.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6cce99..eae797a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,7 @@ if (APPLE) + endif() + + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall") + endif() + + # Check for cryptopp (static) diff --git a/ports/licensepp/vcpkg.json b/ports/licensepp/vcpkg.json index ecb29ffda833db..bcc2f49a6a5894 100644 --- a/ports/licensepp/vcpkg.json +++ b/ports/licensepp/vcpkg.json @@ -1,8 +1,9 @@ { "name": "licensepp", "version-date": "2020-11-24", + "port-version": 1, "description": "Cross platform software licensing library", - "homepage": "https://github.com/zuhd-org/licensepp", + "homepage": "https://github.com/amrayn/licensepp", "supports": "!uwp", "dependencies": [ { diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 46608b730ca4ca..45d21026b12cae 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -264,8 +264,6 @@ libwandio:x64-windows=fail libwandio:x86-windows=fail libwebp[core]:x64-android=combination-fails # Compiler crash without simd libxt:arm64-windows=fail # clang-cl ICEd -licensepp:arm-uwp=fail -licensepp:x64-uwp=fail linenoise-ng:arm-uwp=fail linenoise-ng:x64-uwp=fail linenoise-ng:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index 615ef8df982ca1..4d046c401fee43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5806,7 +5806,7 @@ }, "licensepp": { "baseline": "2020-11-24", - "port-version": 0 + "port-version": 1 }, "lief": { "baseline": "0.16.1", diff --git a/versions/l-/licensepp.json b/versions/l-/licensepp.json index 2ffc57fa4cce50..56c814ca68bb05 100644 --- a/versions/l-/licensepp.json +++ b/versions/l-/licensepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e3b09b2c84eae8d6c99e8b92b39be6022210f0a", + "version-date": "2020-11-24", + "port-version": 1 + }, { "git-tree": "00707f2d2df73ed1303b493178c791ef41996505", "version-date": "2020-11-24", From acc53472f93b3dfdf0fd3c7b036aa520b0ad9ac0 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 13:45:17 -0700 Subject: [PATCH 11/49] [libmysql] Add libtirpc-dev apt package. --- scripts/azure-pipelines/android/azure-pipelines.yml | 2 +- scripts/azure-pipelines/linux/azure-pipelines.yml | 2 +- scripts/azure-pipelines/linux/provision-image.sh | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/android/azure-pipelines.yml b/scripts/azure-pipelines/android/azure-pipelines.yml index 25b504ddccdfce..b1777f31b3bed5 100644 --- a/scripts/azure-pipelines/android/azure-pipelines.yml +++ b/scripts/azure-pipelines/android/azure-pipelines.yml @@ -30,7 +30,7 @@ jobs: - name: ANDROID_DOCKER_IMAGE value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-09-11' - name: LINUX_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-11' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-17' steps: # Note: /mnt is the Azure machines' temporary disk. - bash: | diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index ce169868ffdeee..6ff64b7e064967 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -27,7 +27,7 @@ jobs: - name: VCPKG_DOWNLOADS value: /mnt/vcpkg-ci/downloads - name: LINUX_DOCKER_IMAGE - value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-11' + value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-09-17' steps: # Note: /mnt is the Azure machines' temporary disk. - bash: | diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 67ce6961438c0e..c70b818d39190d 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -144,6 +144,9 @@ APT_PACKAGES="$APT_PACKAGES wayland-protocols" ## required by robotraconteur APT_PACKAGES="$APT_PACKAGES libbluetooth-dev" +## required by libmysql +APT_PACKAGES="$APT_PACKAGES libtirpc-dev" + ## CUDA # The intent is to install everything that does not require an actual GPU, driver, or GUI. # Intentionally omitted: cuda-demo-suite-12-9 cuda-documentation-12-9 cuda-driver-* From 4712f748bd894f5e92c5781aecdb965265da7db8 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 13:52:33 -0700 Subject: [PATCH 12/49] [clblas] Use all caps for configure_file variables. Fixes: ```console /Users/vcpkg/vcpkg/installed/arm64-osx/include/CL/cl_version.h:22:9: warning: cl_version.h: CL_TARGET_OPENCL_VERSION is not defined. Defaulting to 300 (OpenCL 3.0) [-W#pragma-messages] 22 | #pragma message("cl_version.h: CL_TARGET_OPENCL_VERSION is not defined. Defaulting to 300 (OpenCL 3.0)") | ^ /Users/vcpkg/vcpkg/buildtrees/clblas/src/v2.12-ffa3881f06.clean/src/library/blas/init.c:36:32: error: expected expression 36 | *major = clblasVersionMajor; | ^ /Users/vcpkg/vcpkg/buildtrees/clblas/src/v2.12-ffa3881f06.clean/src/library/blas/init.c:37:32: error: expected expression 37 | *minor = clblasVersionMinor; | ^ /Users/vcpkg/vcpkg/buildtrees/clblas/src/v2.12-ffa3881f06.clean/src/library/blas/init.c:38:32: error: expected expression 38 | *patch = clblasVersionPatch; | ^ 1 warning and 3 errors generated. ```` --- ports/clblas/fix-cmake-4.diff | 58 +++++++++++++++++++++++++++++++++++ ports/clblas/portfile.cmake | 1 + ports/clblas/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/clblas.json | 5 +++ 5 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 ports/clblas/fix-cmake-4.diff diff --git a/ports/clblas/fix-cmake-4.diff b/ports/clblas/fix-cmake-4.diff new file mode 100644 index 00000000000000..3c46f1c67b79df --- /dev/null +++ b/ports/clblas/fix-cmake-4.diff @@ -0,0 +1,58 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 75df37a..4e31cd3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -103,19 +103,19 @@ else( ) + endif( ) + + # Define a version for the code +-if( NOT DEFINED clBLAS_VERSION_MAJOR ) +- set( clBLAS_VERSION_MAJOR 2 ) ++if( NOT DEFINED CLBLAS_VERSION_MAJOR ) ++ set( CLBLAS_VERSION_MAJOR 2 ) + endif( ) + +-if( NOT DEFINED clBLAS_VERSION_MINOR ) +- set( clBLAS_VERSION_MINOR 12 ) ++if( NOT DEFINED CLBLAS_VERSION_MINOR ) ++ set( CLBLAS_VERSION_MINOR 12 ) + endif( ) + +-if( NOT DEFINED clBLAS_VERSION_PATCH ) +- set( clBLAS_VERSION_PATCH 0 ) ++if( NOT DEFINED CLBLAS_VERSION_PATCH ) ++ set( CLBLAS_VERSION_PATCH 0 ) + endif( ) + +-set( clBLAS_VERSION "${clBLAS_VERSION_MAJOR}.${clBLAS_VERSION_MINOR}.${clBLAS_VERSION_PATCH}") ++set( clBLAS_VERSION "${CLBLAS_VERSION_MAJOR}.${CLBLAS_VERSION_MINOR}.${CLBLAS_VERSION_PATCH}") + + # Increment this if we break backward compatibility. + set( clBLAS_SOVERSION 2 ) +@@ -425,9 +425,9 @@ endif( ) + + set( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${clBLAS_VERSION}-${CMAKE_HOST_SYSTEM_NAME}-Source") + +-set( CPACK_PACKAGE_VERSION_MAJOR ${clBLAS_VERSION_MAJOR} ) +-set( CPACK_PACKAGE_VERSION_MINOR ${clBLAS_VERSION_MINOR} ) +-set( CPACK_PACKAGE_VERSION_PATCH ${clBLAS_VERSION_PATCH} ) ++set( CPACK_PACKAGE_VERSION_MAJOR ${CLBLAS_VERSION_MAJOR} ) ++set( CPACK_PACKAGE_VERSION_MINOR ${CLBLAS_VERSION_MINOR} ) ++set( CPACK_PACKAGE_VERSION_PATCH ${CLBLAS_VERSION_PATCH} ) + set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenCL implementation of a BLAS library") + set( CPACK_PACKAGE_VENDOR "Neutral") + set( CPACK_SOURCE_IGNORE_FILES "/\\\\.hg/;/\\\\.svn/;/\\\\.git/" ) +diff --git a/src/clBLAS.version.h.in b/src/clBLAS.version.h.in +index a05cbce..ab22a87 100644 +--- a/src/clBLAS.version.h.in ++++ b/src/clBLAS.version.h.in +@@ -17,6 +17,6 @@ + + /* the configured version and settings for clblas + */ +-#define clblasVersionMajor @clBLAS_VERSION_MAJOR@ +-#define clblasVersionMinor @clBLAS_VERSION_MINOR@ +-#define clblasVersionPatch @clBLAS_VERSION_PATCH@ ++#define clblasVersionMajor @CLBLAS_VERSION_MAJOR@ ++#define clblasVersionMinor @CLBLAS_VERSION_MINOR@ ++#define clblasVersionPatch @CLBLAS_VERSION_PATCH@ diff --git a/ports/clblas/portfile.cmake b/ports/clblas/portfile.cmake index 0e694036fcc0d5..93254b82a6d4ec 100644 --- a/ports/clblas/portfile.cmake +++ b/ports/clblas/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( cmake.patch Fix-BuildDLL.patch abs-arm.patch + fix-cmake-4.diff # https://github.com/clMathLibraries/clBLAS/pull/364 ) # v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names diff --git a/ports/clblas/vcpkg.json b/ports/clblas/vcpkg.json index 79d9f12dc68124..26067ec1b66806 100644 --- a/ports/clblas/vcpkg.json +++ b/ports/clblas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clblas", "version": "2.12", - "port-version": 7, + "port-version": 8, "description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.", "license": "Apache-2.0", "supports": "!(windows & arm)", diff --git a/versions/baseline.json b/versions/baseline.json index 4d046c401fee43..09191b3178d990 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1762,7 +1762,7 @@ }, "clblas": { "baseline": "2.12", - "port-version": 7 + "port-version": 8 }, "clblast": { "baseline": "1.6.3", diff --git a/versions/c-/clblas.json b/versions/c-/clblas.json index 06a8377326ffe0..168b790406298a 100644 --- a/versions/c-/clblas.json +++ b/versions/c-/clblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f16f51f7d1d0b291a52dfc8afc112a7c02c7f458", + "version": "2.12", + "port-version": 8 + }, { "git-tree": "68caca1b774b1896768237791456b8962aa28d54", "version": "2.12", From 40bff5977ae15795295ff0ecc3ad762ec29412e9 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 23:46:39 +0000 Subject: [PATCH 13/49] [llgl] Add using upstream patch. --- ports/llgl/install.patch | 113 -------------------------------------- ports/llgl/portfile.cmake | 14 ++++- ports/llgl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/llgl.json | 5 ++ 5 files changed, 20 insertions(+), 115 deletions(-) delete mode 100644 ports/llgl/install.patch diff --git a/ports/llgl/install.patch b/ports/llgl/install.patch deleted file mode 100644 index 0041c2d5e4f591..00000000000000 --- a/ports/llgl/install.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4c8b497..ff922fd6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -729,8 +729,12 @@ else() - set(SUMMARY_LIBRARY_TYPE "Shared") - add_library(LLGL SHARED ${FilesLLGL}) - endif() -+set(all_targets LLGL) - --target_include_directories(LLGL PUBLIC ${PROJECT_INCLUDE_DIR}) -+include(GNUInstallDirs) -+target_include_directories(LLGL INTERFACE -+ $ -+ $) - - if(LLGL_ANDROID_PLATFORM) - target_link_libraries(LLGL android log) -@@ -763,6 +767,8 @@ if(LLGL_BUILD_RENDERER_NULL) - target_link_libraries(LLGL_Null LLGL ${OPENGL_LIBRARIES}) - - ADD_DEFINE(LLGL_BUILD_RENDERER_NULL) -+ -+ list(APPEND all_targets LLGL_Null) - endif() - - if(LLGL_BUILD_RENDERER_OPENGLES3) -@@ -788,6 +794,8 @@ if(LLGL_BUILD_RENDERER_OPENGLES3) - - ADD_DEFINE(LLGL_BUILD_RENDERER_OPENGLES3) - ADD_PROJECT_DEFINE(LLGL_OpenGLES3 LLGL_OPENGLES3) -+ -+ list(APPEND all_targets LLGL_OpenGLES3) - else() - message("Missing OpenGLES -> LLGL_OpenGLES3 renderer will be excluded from project") - endif() -@@ -816,6 +824,8 @@ if(LLGL_BUILD_RENDERER_OPENGL) - - ADD_DEFINE(LLGL_BUILD_RENDERER_OPENGL) - ADD_PROJECT_DEFINE(LLGL_OpenGL LLGL_OPENGL) -+ -+ list(APPEND all_targets LLGL_OpenGL) - else() - message("Missing OpenGL -> LLGL_OpenGL renderer will be excluded from project") - endif() -@@ -838,6 +848,8 @@ if(NOT APPLE AND LLGL_BUILD_RENDERER_VULKAN) - target_link_libraries(LLGL_Vulkan LLGL ${Vulkan_LIBRARY}) - - ADD_DEFINE(LLGL_BUILD_RENDERER_VULKAN) -+ -+ list(APPEND all_targets LLGL_Vulkan) - else() - message("Missing Vulkan -> LLGL_Vulkan renderer will be excluded from project") - endif() -@@ -869,6 +881,8 @@ if(APPLE AND LLGL_BUILD_RENDERER_METAL) - endif() - - ADD_DEFINE(LLGL_BUILD_RENDERER_METAL) -+ -+ list(APPEND all_targets LLGL_Metal) - else() - message("Missing Metal/MetalKit -> LLGL_Metal renderer will be excluded from project") - endif() -@@ -888,6 +902,8 @@ if(WIN32) - target_link_libraries(LLGL_Direct3D11 LLGL d3d11 dxgi D3DCompiler) - - ADD_DEFINE(LLGL_BUILD_RENDERER_DIRECT3D11) -+ -+ list(APPEND all_targets LLGL_Direct3D11) - endif() - - if(LLGL_BUILD_RENDERER_DIRECT3D12) -@@ -904,6 +920,8 @@ if(WIN32) - target_compile_definitions(LLGL_Direct3D12 PUBLIC -DLLGL_DX_ENABLE_D3D12) - - ADD_DEFINE(LLGL_BUILD_RENDERER_DIRECT3D12) -+ -+ list(APPEND all_targets LLGL_Direct3D12) - endif() - endif() - -@@ -994,6 +1012,20 @@ if(WIN32 AND LLGL_BUILD_WRAPPER_CSHARP) - add_subdirectory(Wrapper/CSharp) - endif() - -+# Install targets -+install(TARGETS ${all_targets} EXPORT LLGLTargets RUNTIME LIBRARY ARCHIVE) -+# Install headers -+install(DIRECTORY "${PROJECT_INCLUDE_DIR}/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -+# Install CMake config files -+install(EXPORT LLGLTargets NAMESPACE LLGL:: DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/LLGL") -+include(CMakePackageConfigHelpers) -+configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/LLGLConfig.cmake" -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/LLGL -+) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/LLGLConfig.cmake" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/LLGL" -+) - # Summary Information - message("~~~ Build Summary ~~~") - -diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in -new file mode 100644 -index 00000000..aa67a9e4 ---- /dev/null -+++ b/cmake/Config.cmake.in -@@ -0,0 +1,5 @@ -+@PACKAGE_INIT@ -+ -+include("${CMAKE_CURRENT_LIST_DIR}/LLGLTargets.cmake") -+ -+check_required_components(@PROJECT_NAME@) diff --git a/ports/llgl/portfile.cmake b/ports/llgl/portfile.cmake index 0eccecdb2fd7f6..a5df8fbf86487c 100644 --- a/ports/llgl/portfile.cmake +++ b/ports/llgl/portfile.cmake @@ -1,3 +1,14 @@ +vcpkg_download_distfile(INSTALL_PATCH + URLS https://github.com/LukasBanana/LLGL/commit/7eea7e5aa7008f0549a03d322a567566d9282b62.diff?full_index=1 + FILENAME llgl-install-7eea7e5aa7008f0549a03d322a567566d9282b62.diff + SHA512 c627f4c0e7239c38e81d6c691b2c12bbb0ff8b8faf390c0832d5dea177b3034e1e2ddd232c0189b1bd0785bf0ac006e15983a712d871d021a124d583134a7212 +) + +vcpkg_download_distfile(ADD_CSTDINT_PATCH + URLS https://github.com/LukasBanana/LLGL/commit/95a613400fb7001306edbdb0c49cb32f8a284989.diff?full_index=1 + FILENAME llgl-add-cstdint-95a613400fb7001306edbdb0c49cb32f8a284989.diff + SHA512 fa1b9f6a3199cecc9effd86171b1b4f12ae9e8b162e8638a63fa4d12cdfd20e93804b663f190b2a91d712f9387580f381d66f384b1f9fb4d1d959943bc39c44f +) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -6,7 +17,8 @@ vcpkg_from_github( SHA512 a6e11573759ced048cc9b9b97dd6abbfb70cbc29770e040b0472d529a1cff14e529b7ed62e647d9b318f6633a41918a29d66762da08e4b093582e1a45284e6d3 HEAD_REF master PATCHES - install.patch # See https://github.com/LukasBanana/LLGL/pull/81 + "${INSTALL_PATCH}" + "${ADD_CSTDINT_PATCH}" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/llgl/vcpkg.json b/ports/llgl/vcpkg.json index 876adcc996e70f..7f02d8d820344b 100644 --- a/ports/llgl/vcpkg.json +++ b/ports/llgl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "llgl", "version-date": "2023-03-05", + "port-version": 1, "description": "Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal.", "homepage": "https://github.com/LukasBanana/LLGL", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 09191b3178d990..1e346f49bda2f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5866,7 +5866,7 @@ }, "llgl": { "baseline": "2023-03-05", - "port-version": 0 + "port-version": 1 }, "llhttp": { "baseline": "9.2.1", diff --git a/versions/l-/llgl.json b/versions/l-/llgl.json index 7c23776b2174be..f8c312188612b6 100644 --- a/versions/l-/llgl.json +++ b/versions/l-/llgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4786380d64d031aed29e5a39291603a3c4e5e80f", + "version-date": "2023-03-05", + "port-version": 1 + }, { "git-tree": "fb900b4d6f95560eda75b56df1d0dd5b072c63bc", "version-date": "2023-03-05", From 54c8735167c6139f27f2e42517319023377568fe Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 23:50:31 +0000 Subject: [PATCH 14/49] [manifold] Disable -Werror --- ports/manifold/portfile.cmake | 1 + ports/manifold/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/manifold.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/manifold/portfile.cmake b/ports/manifold/portfile.cmake index 7e0b18aa32191e..2a6cd09b0bd929 100644 --- a/ports/manifold/portfile.cmake +++ b/ports/manifold/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_cmake_configure( -DMANIFOLD_CBIND=ON -DMANIFOLD_PYBIND=OFF -DMANIFOLD_JSBIND=OFF + -DMANIFOLD_STRICT=OFF ) vcpkg_cmake_install() diff --git a/ports/manifold/vcpkg.json b/ports/manifold/vcpkg.json index f55feba7f32564..6c80e68b01cef8 100644 --- a/ports/manifold/vcpkg.json +++ b/ports/manifold/vcpkg.json @@ -1,6 +1,7 @@ { "name": "manifold", "version": "3.2.1", + "port-version": 1, "description": "Geometry library for topological robustness.", "homepage": "https://github.com/elalish/manifold", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1e346f49bda2f5..a52831aa52ffdc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6070,7 +6070,7 @@ }, "manifold": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 1 }, "mapbox-geojson-cpp": { "baseline": "0.5.1", diff --git a/versions/m-/manifold.json b/versions/m-/manifold.json index f6ae3e0d069785..c9a98751ba75f5 100644 --- a/versions/m-/manifold.json +++ b/versions/m-/manifold.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2352b67bd30ff162a551367458f0732e5f35adc3", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "68fb2412689a720091cce3939dbebd6ed5739afb", "version": "3.2.1", From ebd9b6aaa38599d36015b7145d4cdfa15e3fded1 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 23:54:04 +0000 Subject: [PATCH 15/49] [pistache] Add . --- ports/pistache/portfile.cmake | 10 +++++++++- ports/pistache/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pistache.json | 5 +++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ports/pistache/portfile.cmake b/ports/pistache/portfile.cmake index 089814ed37db80..3191587705a357 100644 --- a/ports/pistache/portfile.cmake +++ b/ports/pistache/portfile.cmake @@ -2,12 +2,20 @@ if(NOT VCPKG_TARGET_IS_LINUX) message(FATAL_ERROR "${PORT} currently only supports Linux platform.") endif() +vcpkg_download_distfile(ADD_CSTDINT_PATCH + URLS https://github.com/pistacheio/pistache/commit/dabe9fcd3eaaa6b0b8723369b2565778341630c0.diff?full_index=1 + FILENAME pistache-cstdint-dabe9fcd3eaaa6b0b8723369b2565778341630c0.diff + SHA512 1cef4b084050a5cb409a2f055e12f03184ad3cd07c8b896c38152f9c0c630d812a73fb78ccb3e7270ffe8001d877c3da173be06810744c2e0807a20e488ee66d +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pistacheio/pistache REF 9dc080b9ebbe6fc1726b45e9db1550305938313e #2021-03-31 SHA512 b55c395fb98af85317590ed2502564af5e92e30a35618132568c6ab589a6d0971570ad20ddbd1f49d9dd8cf54692866c69cfc1350c6fdccf9efb039aacf153b4 - HEAD_REF master + HEAD_REF master + PATCHES + "${ADD_CSTDINT_PATCH}" ) vcpkg_configure_meson( diff --git a/ports/pistache/vcpkg.json b/ports/pistache/vcpkg.json index fb464a5a10b9d1..e1ab20e4da2417 100644 --- a/ports/pistache/vcpkg.json +++ b/ports/pistache/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pistache", "version-date": "2021-03-31", - "port-version": 3, + "port-version": 4, "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API", "homepage": "https://github.com/oktal/pistache", "supports": "linux", diff --git a/versions/baseline.json b/versions/baseline.json index a52831aa52ffdc..bd20446b8917ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7390,7 +7390,7 @@ }, "pistache": { "baseline": "2021-03-31", - "port-version": 3 + "port-version": 4 }, "pixel": { "baseline": "2022-03-15", diff --git a/versions/p-/pistache.json b/versions/p-/pistache.json index 9c84e2e39a0808..c1339d1771bbc3 100644 --- a/versions/p-/pistache.json +++ b/versions/p-/pistache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea0305f1af1410c5685274997fd71b5bc4439d4f", + "version-date": "2021-03-31", + "port-version": 4 + }, { "git-tree": "270e04cb56d330fc6cd8482697341ed0d3bf1320", "version-date": "2021-03-31", From 04aaa8e73fa0d1c9a0245db4eafa1cf9169b3b6b Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 23:57:56 +0000 Subject: [PATCH 16/49] [ms-ifc-sdk] Add . --- ports/ms-ifc-sdk/portfile.cmake | 8 ++++++++ ports/ms-ifc-sdk/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/ms-ifc-sdk.json | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ports/ms-ifc-sdk/portfile.cmake b/ports/ms-ifc-sdk/portfile.cmake index 682345cd7125d2..5e77c6e6b537de 100644 --- a/ports/ms-ifc-sdk/portfile.cmake +++ b/ports/ms-ifc-sdk/portfile.cmake @@ -1,9 +1,17 @@ +vcpkg_download_distfile(ADD_CSTDINT_FIX + URLS https://github.com/microsoft/ifc/commit/48659fbaed5f971aecb1a0c8264e0cb2e9fe235f.diff?full_index=1 + FILENAME ms-ifc-sdk-cstdint-48659fbaed5f971aecb1a0c8264e0cb2e9fe235f.diff + SHA512 56b97bf7cfcc37ddf31bc6f4eabe579197a7e4d259ac3df4dbcf8fdd2263215b7c9a3b1905a223c73f0f7f92d3e4d782f069a88cf4d114674bc56d5980634a94 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/ifc REF 0.43.1 SHA512 c7ce8570d776f875c1a1fed929734ebc73b2cf25106e2a5e80625269f4f91d8106d19da34525cc4d7a694d750788d124e8e1ef082c54a13c9b34fe3da7f9e82d HEAD_REF main + PATCHES + "${ADD_CSTDINT_FIX}" ) set(config_path share/cmake/Microsoft.IFC) diff --git a/ports/ms-ifc-sdk/vcpkg.json b/ports/ms-ifc-sdk/vcpkg.json index c738f26c4b30a7..266c1c299d5b09 100644 --- a/ports/ms-ifc-sdk/vcpkg.json +++ b/ports/ms-ifc-sdk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ms-ifc-sdk", "version": "0.43.1", + "port-version": 1, "description": "SDK for the IFC specification at https://github.com/microsoft/ifc-spec", "homepage": "https://github.com/microsoft/ifc", "license": "Apache-2.0 WITH LLVM-exception", diff --git a/versions/baseline.json b/versions/baseline.json index bd20446b8917ee..1035b125f5298b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6470,7 +6470,7 @@ }, "ms-ifc-sdk": { "baseline": "0.43.1", - "port-version": 0 + "port-version": 1 }, "msdfgen": { "baseline": "1.12.1", diff --git a/versions/m-/ms-ifc-sdk.json b/versions/m-/ms-ifc-sdk.json index 1d6b0c7761b956..abebda7c784895 100644 --- a/versions/m-/ms-ifc-sdk.json +++ b/versions/m-/ms-ifc-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b5100599378870975a1e5bf22731715c4fc32ce", + "version": "0.43.1", + "port-version": 1 + }, { "git-tree": "1c24ff4ae05b7f1b10e071e516d4fb07cedfee16", "version": "0.43.1", From 8d42c41acf6b9fc0c1fc34bd31aff709cf2d89be Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 00:05:11 +0000 Subject: [PATCH 17/49] [realsense2] Add . --- ports/realsense2/add-stdexcept.diff | 24 ++++++++++++++++++++++++ ports/realsense2/portfile.cmake | 1 + ports/realsense2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/realsense2.json | 5 +++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 ports/realsense2/add-stdexcept.diff diff --git a/ports/realsense2/add-stdexcept.diff b/ports/realsense2/add-stdexcept.diff new file mode 100644 index 00000000000000..01a0bbd9b0d32c --- /dev/null +++ b/ports/realsense2/add-stdexcept.diff @@ -0,0 +1,24 @@ +diff --git a/src/core/matcher-factory.cpp b/src/core/matcher-factory.cpp +index ea94209..580af62 100644 +--- a/src/core/matcher-factory.cpp ++++ b/src/core/matcher-factory.cpp +@@ -6,6 +6,7 @@ + #include "stream-interface.h" + + #include ++#include + + + namespace librealsense { +diff --git a/src/core/options-registry.cpp b/src/core/options-registry.cpp +index d22b142..68c62d5 100644 +--- a/src/core/options-registry.cpp ++++ b/src/core/options-registry.cpp +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + + + namespace librealsense { diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index bb01b0c68cda5d..c88c5ec5f8a6af 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_github( fix_openni2.patch libusb.diff using-firmware.diff + add-stdexcept.diff # https://github.com/IntelRealSense/librealsense/pull/14299 ) file(GLOB extern "${SOURCE_PATH}/CMake/extern_*.cmake") file(REMOVE_RECURSE diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index 7b8e96c90b7298..e527c8ffa8fba2 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "realsense2", "version": "2.56.3", + "port-version": 1, "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1035b125f5298b..861b582b800b28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8310,7 +8310,7 @@ }, "realsense2": { "baseline": "2.56.3", - "port-version": 0 + "port-version": 1 }, "rebind": { "baseline": "5.2.2", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 1224d04883ba73..89d8512cb64cd7 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa980b8483d170b67075925135782123f561dd8a", + "version": "2.56.3", + "port-version": 1 + }, { "git-tree": "8f7cc8e7c474b18ca30a256a0df55c49057320cb", "version": "2.56.3", From a0543c1d3991d47aa9423b76fb1b2324f94f9368 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 01:09:20 +0000 Subject: [PATCH 18/49] [qt5-location] Add stdint.h. --- ports/qt5-location/add-stdint.diff | 84 ++++++++++++++++++++++++++++++ ports/qt5-location/portfile.cmake | 2 +- ports/qt5-location/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qt5-location.json | 5 ++ 5 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 ports/qt5-location/add-stdint.diff diff --git a/ports/qt5-location/add-stdint.diff b/ports/qt5-location/add-stdint.diff new file mode 100644 index 00000000000000..58cd4e2b2ec309 --- /dev/null +++ b/ports/qt5-location/add-stdint.diff @@ -0,0 +1,84 @@ +diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp +index 1d5f4e8..fdfec87 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_backend.hpp +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + namespace mbgl { + +diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp +index 551b5c8..e169aa3 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/renderer/renderer_observer.hpp +@@ -1,6 +1,7 @@ + #pragma once + + #include ++#include + + namespace mbgl { + +diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp +index a28c59a..8186483 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + namespace mbgl { + +diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp +index 4887058..e818922 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/image.hpp +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + namespace mbgl { + +diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp +index 12c0ad0..f4cccb8 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/size.hpp +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + namespace mbgl { + +diff --git a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp +index 13498cc..6b67df2 100644 +--- a/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp ++++ b/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + + // Polyfill needed by Qt when building for Android with GCC + #if defined(__ANDROID__) && defined(__GLIBCXX__) +diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp +index bc959c9..c53dca3 100644 +--- a/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp ++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp +@@ -1,6 +1,7 @@ + #pragma once + + #include ++#include + + namespace mbgl { + namespace gl { diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake index 5b446c6b5025ff..79ca1b23ab5a23 100644 --- a/ports/qt5-location/portfile.cmake +++ b/ports/qt5-location/portfile.cmake @@ -1,3 +1,3 @@ message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.") include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch) +qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch add-stdint.diff) diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 690ea6f9242cd8..35f4511adc4a13 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-location", "version": "5.15.17", + "port-version": 1, "description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.", "license": null, "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 861b582b800b28..1f71f9c7bf7432 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7838,7 +7838,7 @@ }, "qt5-location": { "baseline": "5.15.17", - "port-version": 0 + "port-version": 1 }, "qt5-macextras": { "baseline": "5.15.17", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 6fa700b05732f5..3e8c2162b5d3fb 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa699fb5566565da388659ecbd94eb5f08d1ddc5", + "version": "5.15.17", + "port-version": 1 + }, { "git-tree": "daca43cb0f4a73337690ca6e8852cb302d66130d", "version": "5.15.17", From 2b38d1c85c6a5d21003032a3d5f711c397511d5a Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 01:11:42 +0000 Subject: [PATCH 19/49] [openvino] Disable on x64-osx. --- scripts/ci.baseline.txt | 1 + scripts/ci.feature.baseline.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8937e0f1810f29..85f40af5a9f4f4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -741,6 +741,7 @@ openvino:arm64-android=skip # conflicts with kleidiai openvino:arm64-osx=skip # conflicts with kleidiai openvino:arm64-windows-static-md=fail openvino:arm64-windows=fail +openvino:x64-osx=fail # OpenVINO_VERSION_MAJOR parsed from CI_BUILD_NUMBER () and from openvino/core/version.hpp (2025) are different openvr:x64-windows-static=fail # Conflicts with optional-lite, by the same author optional-bare:arm-neon-android=skip diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 45d21026b12cae..5cf189191e6565 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -386,6 +386,7 @@ openvino:arm64-android=skip # conflicts with kleidiai openvino:arm64-osx=skip # conflicts with kleidiai openvino:arm64-windows-static-md=fail openvino:arm64-windows=fail +openvino:x64-osx=fail # OpenVINO_VERSION_MAJOR parsed from CI_BUILD_NUMBER () and from openvino/core/version.hpp (2025) are different openvino[npu]:x64-linux=cascade # dependency level-zero not supported openvpn3:x64-osx=fail openvr:arm-uwp=fail From e3999f2543d607b0f7341987dfb2eab3a68346e1 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 18:17:44 -0700 Subject: [PATCH 20/49] [nmslib] Fix apple clang detection. --- ports/nmslib/portfile.cmake | 8 ++++++++ ports/nmslib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nmslib.json | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake index a6f6a0bd4f2a79..2a33a366b90e2e 100644 --- a/ports/nmslib/portfile.cmake +++ b/ports/nmslib/portfile.cmake @@ -1,11 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_download_distfile(APPLE_CLANG_FIX + URLS https://github.com/nmslib/nmslib/commit/91a6095e7843ccd51e5ac6a85622256224118535.diff?full_index=1 + FILENAME nmslib-apple-clang-fix-91a6095e7843ccd51e5ac6a85622256224118535.diff + SHA512 d1a19f456b01e56178d68dd6539759c0ecc39f248992a441ac46257014200c066527d096e60fb386913a13125044683b773e107602c969e9e2cfdd446b012143 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nmslib/nmslib REF v2.1.1 SHA512 62BBB965EA4BF1D416ED78231B1BA4B41C0F46327D7BE16D1F98095DB63EF0E0D893B70040009711BC9C68555B1B8C4038F5032ABD66B759E955E2CBB0553EC3 HEAD_REF master + PATCHES + "${APPLE_CLANG_FIX}" ) # TODO: check SSE and AVX availability and set corresponding tags diff --git a/ports/nmslib/vcpkg.json b/ports/nmslib/vcpkg.json index eb475f07dcdaa7..9ac284a4f832c4 100644 --- a/ports/nmslib/vcpkg.json +++ b/ports/nmslib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nmslib", "version": "2.1.1", - "port-version": 1, + "port-version": 2, "description": "Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.", "homepage": "https://github.com/searchivarius/nmslib", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 1f71f9c7bf7432..618083d4e78a03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6746,7 +6746,7 @@ }, "nmslib": { "baseline": "2.1.1", - "port-version": 1 + "port-version": 2 }, "nng": { "baseline": "1.11", diff --git a/versions/n-/nmslib.json b/versions/n-/nmslib.json index 733d5e4578e082..91c0a4c16fc618 100644 --- a/versions/n-/nmslib.json +++ b/versions/n-/nmslib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7edc2aca06829ac2ee5b1d882ebafced774ff74b", + "version": "2.1.1", + "port-version": 2 + }, { "git-tree": "98fea3cd9111ced5710357dee8212e576efd514b", "version": "2.1.1", From 1affff70f71735836ef81844f03d2177a8186a5e Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 01:25:18 +0000 Subject: [PATCH 21/49] [colmap] Apply upstream macOS fixes --- ports/colmap/fix-variable-names.diff | 35 ++++++++++++++++++++++++++++ ports/colmap/portfile.cmake | 1 + ports/colmap/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/colmap.json | 5 ++++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 ports/colmap/fix-variable-names.diff diff --git a/ports/colmap/fix-variable-names.diff b/ports/colmap/fix-variable-names.diff new file mode 100644 index 00000000000000..2892b75ebd6c1b --- /dev/null +++ b/ports/colmap/fix-variable-names.diff @@ -0,0 +1,35 @@ +diff --git a/src/thirdparty/PoissonRecon/Ply.h b/src/thirdparty/PoissonRecon/Ply.h +index 699381f..6cb07d6 100644 +--- a/src/thirdparty/PoissonRecon/Ply.h ++++ b/src/thirdparty/PoissonRecon/Ply.h +@@ -340,7 +340,7 @@ public: + PlyOrientedVertex( void ) { ; } + PlyOrientedVertex( Point3D< Real > p , Point3D< Real > n ) : point(p) , normal(n) { ; } + PlyOrientedVertex operator + ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point+p.point , normal+p.normal ); } +- PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.value , normal-p.normal ); } ++ PlyOrientedVertex operator - ( PlyOrientedVertex p ) const { return PlyOrientedVertex( point-p.point , normal-p.normal ); } + template< class _Real > PlyOrientedVertex operator * ( _Real s ) const { return PlyOrientedVertex( point*s , normal*s ); } + template< class _Real > PlyOrientedVertex operator / ( _Real s ) const { return PlyOrientedVertex( point/s , normal/s ); } + PlyOrientedVertex& operator += ( PlyOrientedVertex p ) { point += p.point , normal += p.normal ; return *this; } +@@ -386,7 +386,7 @@ public: + } + + _PlyColorVertex operator + ( _PlyColorVertex p ) const { return _PlyColorVertex( point+p.point , color+p.color ); } +- _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.value , color-p.color ); } ++ _PlyColorVertex operator - ( _PlyColorVertex p ) const { return _PlyColorVertex( point-p.point , color-p.color ); } + template< class _Real > _PlyColorVertex operator * ( _Real s ) const { return _PlyColorVertex( point*s , color*s ); } + template< class _Real > _PlyColorVertex operator / ( _Real s ) const { return _PlyColorVertex( point/s , color/s ); } + _PlyColorVertex& operator += ( _PlyColorVertex p ) { point += p.point , color += p.color ; return *this; } +diff --git a/src/thirdparty/PoissonRecon/SparseMatrix.inl b/src/thirdparty/PoissonRecon/SparseMatrix.inl +index c181d82..0a5e59e 100755 +--- a/src/thirdparty/PoissonRecon/SparseMatrix.inl ++++ b/src/thirdparty/PoissonRecon/SparseMatrix.inl +@@ -195,7 +195,7 @@ void SparseMatrix< T >::SetRowSize( int row , int count ) + template + void SparseMatrix::SetZero() + { +- Resize(this->m_N, this->m_M); ++ Resize(this->rows, this->_maxEntriesPerRow); + } + + template diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index aa477b935e2990..0d5387184b6d9f 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( PATCHES no-glu.diff fix-flann.patch + fix-variable-names.diff # from https://github.com/colmap/colmap/commit/203bf36c2d5e805f0eb26d8b7a2b8572e7b134e1 ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index d9ef5bda4eb4c4..2dd85f511af44c 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "colmap", "version": "3.11.1", - "port-version": 3, + "port-version": 4, "description": "COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. It offers a wide range of features for reconstruction of ordered and unordered image collections. The software is licensed under the new BSD license.", "homepage": "https://colmap.github.io/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 618083d4e78a03..112636b2822c14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1886,7 +1886,7 @@ }, "colmap": { "baseline": "3.11.1", - "port-version": 3 + "port-version": 4 }, "color-console": { "baseline": "2022-03-20", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 8ba4fb59619cee..23e5e4134ff040 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c166234c960ad821bfddccbe87089e1c3d5fa583", + "version": "3.11.1", + "port-version": 4 + }, { "git-tree": "6d6a3ce7dca6d76ac205a89d5426af7a0935f24a", "version": "3.11.1", From 73816c890fc155d8403a99e2fb1f64b5985ad2bb Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 18:41:15 -0700 Subject: [PATCH 22/49] [corrade] Add missing headers. --- ports/corrade/missing-headers.diff | 69 ++++++++++++++++++++++++++++++ ports/corrade/portfile.cmake | 1 + ports/corrade/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/corrade.json | 5 +++ 5 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 ports/corrade/missing-headers.diff diff --git a/ports/corrade/missing-headers.diff b/ports/corrade/missing-headers.diff new file mode 100644 index 00000000000000..8063084593766a --- /dev/null +++ b/ports/corrade/missing-headers.diff @@ -0,0 +1,69 @@ +diff --git a/src/Corrade/PluginManager/AbstractManager.h b/src/Corrade/PluginManager/AbstractManager.h +index c8ef531..3d2e3dd 100644 +--- a/src/Corrade/PluginManager/AbstractManager.h ++++ b/src/Corrade/PluginManager/AbstractManager.h +@@ -29,6 +29,10 @@ + * @brief Class @ref Corrade::PluginManager::AbstractManager, macro @ref CORRADE_PLUGIN_VERSION, @ref CORRADE_PLUGIN_REGISTER() + */ + ++#include ++#include ++#include ++ + #include "Corrade/Containers/EnumSet.h" + #include "Corrade/Containers/Pointer.h" + #include "Corrade/PluginManager/PluginManager.h" +diff --git a/src/Corrade/PluginManager/AbstractPlugin.h b/src/Corrade/PluginManager/AbstractPlugin.h +index b22deee..4f5738f 100644 +--- a/src/Corrade/PluginManager/AbstractPlugin.h ++++ b/src/Corrade/PluginManager/AbstractPlugin.h +@@ -29,6 +29,10 @@ + * @brief Class @ref Corrade::PluginManager::AbstractPlugin + */ + ++#include ++#include ++#include ++ + #include "Corrade/Containers/Pointer.h" + #include "Corrade/PluginManager/PluginManager.h" + #include "Corrade/PluginManager/visibility.h" +diff --git a/src/Corrade/Utility/Arguments.h b/src/Corrade/Utility/Arguments.h +index 84d856d..ea801be 100644 +--- a/src/Corrade/Utility/Arguments.h ++++ b/src/Corrade/Utility/Arguments.h +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + #include "Corrade/Containers/Array.h" + #include "Corrade/Utility/ConfigurationValue.h" +diff --git a/src/Corrade/Utility/Directory.h b/src/Corrade/Utility/Directory.h +index 21c1e1a..8d9bde6 100644 +--- a/src/Corrade/Utility/Directory.h ++++ b/src/Corrade/Utility/Directory.h +@@ -30,6 +30,9 @@ + */ + + #include ++#include ++#include ++#include + + #include "Corrade/Containers/Containers.h" + #include "Corrade/Containers/EnumSet.h" +diff --git a/src/Corrade/Utility/Resource.h b/src/Corrade/Utility/Resource.h +index e08c03d..6ce48b0 100644 +--- a/src/Corrade/Utility/Resource.h ++++ b/src/Corrade/Utility/Resource.h +@@ -30,6 +30,8 @@ + */ + + #include ++#include ++#include + + #include "Corrade/Containers/ArrayView.h" + #include "Corrade/Utility/StlForwardString.h" diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 0680233a268b69..496ea3775c454e 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-vs2019.patch build-corrade-rc-always.patch clang-16.patch + missing-headers.diff ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json index 6bb6ed736f0519..44cc74190a7188 100644 --- a/ports/corrade/vcpkg.json +++ b/ports/corrade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 8, + "port-version": 9, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 112636b2822c14..65912851917e3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1962,7 +1962,7 @@ }, "corrade": { "baseline": "2020.06", - "port-version": 8 + "port-version": 9 }, "correlation-vector-cpp": { "baseline": "1.0", diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json index f3b881e1cf5a59..0b6c6e9d0bcba3 100644 --- a/versions/c-/corrade.json +++ b/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4708bc353abf649f9c911c0f70e0a2f8858c2a43", + "version-string": "2020.06", + "port-version": 9 + }, { "git-tree": "a7c12fdbe3c15ad76eced6d157af6e09d49329e5", "version-string": "2020.06", From f3d39c847dd9ed75f4df185c95c2675013870d68 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 01:52:13 +0000 Subject: [PATCH 23/49] [rtmfp-cpp] Add missing with upstream patch. --- ports/rtmfp-cpp/portfile.cmake | 8 ++++++++ ports/rtmfp-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/rtmfp-cpp.json | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ports/rtmfp-cpp/portfile.cmake b/ports/rtmfp-cpp/portfile.cmake index 5872f427a39d9f..0dd19f50d88ae2 100644 --- a/ports/rtmfp-cpp/portfile.cmake +++ b/ports/rtmfp-cpp/portfile.cmake @@ -1,9 +1,17 @@ +vcpkg_download_distfile(ADD_CSTDINT + URLS https://github.com/zenomt/rtmfp-cpp/commit/9c53bde974e6463537a4e5573a548e59eb45786c.diff?full_index=1 + FILENAME rtmfp-cpp-add-cstdint-9c53bde974e6463537a4e5573a548e59eb45786c.diff + SHA512 7c6c4bf04f541c06a6f24b0e5033a26c13e1f985b5fa33bddcea8374e50e97bdfd768a2a16cb84ba0e67f1525036fd17af298053c909f48fd45f6974b1857d56 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zenomt/rtmfp-cpp REF "v${VERSION}" SHA512 cc8eac88c70b6a00a92a76bee66a3b319857a009fbfd82e9a710fe1c0fc452cf9fdf4128529e3f10931ed33c26eaf69253cab3b3e5a739eca6dd37a13f72800b HEAD_REF main + PATCHES + "${ADD_CSTDINT}" ) vcpkg_cmake_configure( diff --git a/ports/rtmfp-cpp/vcpkg.json b/ports/rtmfp-cpp/vcpkg.json index 38e243c1106036..6a35f6f1887f59 100644 --- a/ports/rtmfp-cpp/vcpkg.json +++ b/ports/rtmfp-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rtmfp-cpp", "version": "1.5.1", + "port-version": 1, "description": "Secure Real-Time Media Flow Protocol Library (RTMFP)", "homepage": "https://github.com/zenomt/rtmfp-cpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 65912851917e3f..0960fed2327b94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8518,7 +8518,7 @@ }, "rtmfp-cpp": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "rtmidi": { "baseline": "6.0.0", diff --git a/versions/r-/rtmfp-cpp.json b/versions/r-/rtmfp-cpp.json index c30393cbe2bb38..9d32cfcc923e52 100644 --- a/versions/r-/rtmfp-cpp.json +++ b/versions/r-/rtmfp-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a858aa5eebe403fcdfb01d0d4a6ff08e275507a", + "version": "1.5.1", + "port-version": 1 + }, { "git-tree": "1636dde21e228a5529dc9195b72b138e7fe1eca0", "version": "1.5.1", From f180114d5bbe44cb7a8e5050aad219412163f449 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 01:57:14 +0000 Subject: [PATCH 24/49] [treehopper] Add missing Note that they use uint8_t rather than std::uint8_t, but they also `using namespace std;`. --- ports/treehopper/add-cstdint.diff | 10 ++++++++++ ports/treehopper/portfile.cmake | 1 + ports/treehopper/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/treehopper.json | 5 +++++ 5 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 ports/treehopper/add-cstdint.diff diff --git a/ports/treehopper/add-cstdint.diff b/ports/treehopper/add-cstdint.diff new file mode 100644 index 00000000000000..fad7beb6d20ab0 --- /dev/null +++ b/ports/treehopper/add-cstdint.diff @@ -0,0 +1,10 @@ +diff --git a/C++/API/inc/UsbConnection.h b/C++/API/inc/UsbConnection.h +index f07533c..614d2f9 100644 +--- a/C++/API/inc/UsbConnection.h ++++ b/C++/API/inc/UsbConnection.h +@@ -1,4 +1,5 @@ + #pragma once ++#include + #include + #include "Treehopper.h" + diff --git a/ports/treehopper/portfile.cmake b/ports/treehopper/portfile.cmake index e3934f06b8c572..1d267fc3a78db9 100644 --- a/ports/treehopper/portfile.cmake +++ b/ports/treehopper/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-dependences.patch + add-cstdint.diff ) if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) diff --git a/ports/treehopper/vcpkg.json b/ports/treehopper/vcpkg.json index cb1eeaa12718a2..56b9b2fedbdc7c 100644 --- a/ports/treehopper/vcpkg.json +++ b/ports/treehopper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "treehopper", "version": "1.11.3", - "port-version": 10, + "port-version": 11, "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.", "homepage": "https://treehopper.io", "supports": "!uwp & !(static & staticcrt)", diff --git a/versions/baseline.json b/versions/baseline.json index 0960fed2327b94..0d111e7799b75a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9746,7 +9746,7 @@ }, "treehopper": { "baseline": "1.11.3", - "port-version": 10 + "port-version": 11 }, "triangle": { "baseline": "1.6", diff --git a/versions/t-/treehopper.json b/versions/t-/treehopper.json index 0f820152997008..bd55a5e2f283bb 100644 --- a/versions/t-/treehopper.json +++ b/versions/t-/treehopper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3be4c6bb53b8ad98434b7c4205003271de5c3dc2", + "version": "1.11.3", + "port-version": 11 + }, { "git-tree": "f11e05d9831f2670955b1a90bf28a8c6f6c984b2", "version": "1.11.3", From f8eec8dd6e47499a517189a1f5b38fb5c3358749 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 02:16:17 +0000 Subject: [PATCH 25/49] [orange-math] Workaround no std::fmodf --- ports/orange-math/no-fmodf.diff | 13 +++++++++++++ ports/orange-math/portfile.cmake | 2 ++ ports/orange-math/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/orange-math.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/orange-math/no-fmodf.diff diff --git a/ports/orange-math/no-fmodf.diff b/ports/orange-math/no-fmodf.diff new file mode 100644 index 00000000000000..a14ad59f67271d --- /dev/null +++ b/ports/orange-math/no-fmodf.diff @@ -0,0 +1,13 @@ +diff --git a/include/omath/color.hpp b/include/omath/color.hpp +index 69e554f..e710a54 100644 +--- a/include/omath/color.hpp ++++ b/include/omath/color.hpp +@@ -95,7 +95,7 @@ namespace omath + hsv_data.hue = 0.f; + + else if (max == red) +- hsv_data.hue = 60.f * (std::fmodf(((green - blue) / delta), 6.f)); ++ hsv_data.hue = 60.f * (std::fmod(static_cast((green - blue) / delta), 6.f)); + else if (max == green) + hsv_data.hue = 60.f * (((blue - red) / delta) + 2.f); + else if (max == blue) diff --git a/ports/orange-math/portfile.cmake b/ports/orange-math/portfile.cmake index 6c31d2770c7bd4..39756bc6aeaeef 100644 --- a/ports/orange-math/portfile.cmake +++ b/ports/orange-math/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 f3d94401e47294eb41cd3ab234cbb40a17dafe3b9a0a09f85e167d0f4f1caa1f3388b14fa5ae6f15283ba64006009791793b4857904d0f06ff56a60435dac7c9 HEAD_REF master + PATCHES + no-fmodf.diff # https://github.com/orange-cpp/omath/pull/74 ) vcpkg_replace_string("${SOURCE_PATH}/include/omath/omath.hpp" [[#include "linear_algebra/matrix.hpp"]] "") diff --git a/ports/orange-math/vcpkg.json b/ports/orange-math/vcpkg.json index 8fc8af6a5106b0..2603a8fe5e24ee 100644 --- a/ports/orange-math/vcpkg.json +++ b/ports/orange-math/vcpkg.json @@ -1,6 +1,7 @@ { "name": "orange-math", "version": "3.6.1", + "port-version": 1, "description": "General purpose math library", "homepage": "https://github.com/orange-cpp/omath", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 436a61649320a0..496c29fab169e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7174,7 +7174,7 @@ }, "orange-math": { "baseline": "3.6.1", - "port-version": 0 + "port-version": 1 }, "orc": { "baseline": "2.1.0", diff --git a/versions/o-/orange-math.json b/versions/o-/orange-math.json index c888916b269808..1f447695874889 100644 --- a/versions/o-/orange-math.json +++ b/versions/o-/orange-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83c92213b6fcf49114c927d43d5dd673e2a414f6", + "version": "3.6.1", + "port-version": 1 + }, { "git-tree": "e658df1845db1f04e22ded70025b895ce8f30362", "version": "3.6.1", From 5e6141f91151cd7e06223168c1344d5de63d7a59 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 19:43:23 -0700 Subject: [PATCH 26/49] [embree3] Fix missing member references using upstream patch. --- ports/embree3/portfile.cmake | 6 ++++++ ports/embree3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/embree3.json | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake index 0a4ea4a558da67..0eab53eeb5aac1 100755 --- a/ports/embree3/portfile.cmake +++ b/ports/embree3/portfile.cmake @@ -1,3 +1,8 @@ +vcpkg_download_distfile(OPERATOR_FIX + URLS https://github.com/RenderKit/embree/commit/cda4cf1919bb2a748e78915fbd6e421a1056638d.diff?full_index=1 + FILENAME embree3-operator-fix-cda4cf1919bb2a748e78915fbd6e421a1056638d.diff + SHA512 3b8492f136b8616da3c21deea32df0629c48d2e0d9b92d418c04570cb71c4c29e280b63f5447a70479ba3bcef989132ea9ccfa20793f46595554ac04f65fe3bd +) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -9,6 +14,7 @@ vcpkg_from_github( no-runtime-install.patch 001-downgrade-find-package-tbb-2020.patch avoid-library-conflicts.diff + "${OPERATOR_FIX}" ) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static EMBREE_STATIC_LIB) diff --git a/ports/embree3/vcpkg.json b/ports/embree3/vcpkg.json index ad72643aed7cc2..3d03aecbc25d2c 100644 --- a/ports/embree3/vcpkg.json +++ b/ports/embree3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "embree3", "version": "3.13.5", - "port-version": 5, + "port-version": 6, "description": "High Performance Ray Tracing Kernels.", "homepage": "https://github.com/embree/embree", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 496c29fab169e4..a1e3a88ea9342d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2694,7 +2694,7 @@ }, "embree3": { "baseline": "3.13.5", - "port-version": 5 + "port-version": 6 }, "enchantum": { "baseline": "0.3.0", diff --git a/versions/e-/embree3.json b/versions/e-/embree3.json index 77e8a43b89f322..de68b3894e694c 100644 --- a/versions/e-/embree3.json +++ b/versions/e-/embree3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69b5b28efbab76db7683a365b9ccd895e4bb7ac3", + "version": "3.13.5", + "port-version": 6 + }, { "git-tree": "080b2ee14b12e697d832deacdd95fe81daa19697", "version": "3.13.5", From 934fb3cf9f0b07f7d526642104329ad16732e449 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 23:20:13 -0700 Subject: [PATCH 27/49] [ggml] Baseline due to https://github.com/ggml-org/ggml/issues/1343 --- scripts/ci.baseline.txt | 1 + scripts/ci.feature.baseline.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 375c1b8b6ceee6..9997ba573f84e4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -351,6 +351,7 @@ gegl:x64-osx=fail gemmlowp:arm-neon-android=fail gemmlowp:arm64-android=fail gemmlowp:x64-android=fail +ggml:arm64-osx=fail # error: always_inline function 'vmmlaq_s32' requires target feature 'i8mm', but would be inlined into function 'ggml_vec_dot_q4_1_q8_1' that is compiled without support for 'i8mm' gherkin-c:arm-neon-android=fail gherkin-c:arm64-android=fail gherkin-c:x64-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 1d1bf01eae5cb2..f7df264416f142 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -134,6 +134,7 @@ freeopcua:arm64-windows=fail # Needs /bigobj ftgl:arm-uwp=fail ftgl:x64-uwp=fail functions-framework-cpp:x64-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 +g g3log:arm-neon-android=fail g3log:arm64-android=fail g3log:x64-android=fail @@ -143,6 +144,7 @@ geotrans = skip # Port geotrans source ftp://ftp.nga.mil server extremely slow m getopt:arm-uwp=fail getopt:x64-uwp=fail gflags(uwp)=fail +ggml:arm64-osx=fail # error: always_inline function 'vmmlaq_s32' requires target feature 'i8mm', but would be inlined into function 'ggml_vec_dot_q4_1_q8_1' that is compiled without support for 'i8mm' glfw3(uwp)=fail glibmm:x64-windows-static-md=fail glibmm:x64-windows-static=fail From 10866e071abd3b90ffd445ed45f4e87ca658d2bc Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 23:27:03 -0700 Subject: [PATCH 28/49] [irrlicht] Avoid using a pointer as a 0. --- ports/irrlicht/fix-osx-compilation-2.diff | 22 ++++++++++++++++++++++ ports/irrlicht/portfile.cmake | 1 + ports/irrlicht/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/irrlicht.json | 5 +++++ 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 ports/irrlicht/fix-osx-compilation-2.diff diff --git a/ports/irrlicht/fix-osx-compilation-2.diff b/ports/irrlicht/fix-osx-compilation-2.diff new file mode 100644 index 00000000000000..8855f1ad53c6df --- /dev/null +++ b/ports/irrlicht/fix-osx-compilation-2.diff @@ -0,0 +1,22 @@ +diff --git a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +index 60da342..6bf2e30 100644 +--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm ++++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +@@ -642,7 +642,7 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key) + NSOpenGLPFASamples, (NSOpenGLPixelFormatAttribute)CreationParams.AntiAlias, + NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)(CreationParams.Stencilbuffer?1:0), + NSOpenGLPFADoubleBuffer, +- (NSOpenGLPixelFormatAttribute)nil ++ (NSOpenGLPixelFormatAttribute)0 + }; + + if (CreationParams.AntiAlias<2) +@@ -668,7 +668,7 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key) + { + // Third try without Doublebuffer + os::Printer::log("No doublebuffering available.", ELL_WARNING); +- windowattribs[14]=(NSOpenGLPixelFormatAttribute)nil; ++ windowattribs[14]=(NSOpenGLPixelFormatAttribute)0; + } + + format = [[NSOpenGLPixelFormat alloc] initWithAttributes:windowattribs]; diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 4bea3839d2b14b..8c46515dabc19c 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_sourceforge( PATCHES fix-encoding.patch fix-osx-compilation.patch + fix-osx-compilation-2.diff ) if(VCPKG_TARGET_IS_LINUX) diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json index 1aef42f306aab6..5cdc2bbea9d6e3 100644 --- a/ports/irrlicht/vcpkg.json +++ b/ports/irrlicht/vcpkg.json @@ -1,7 +1,7 @@ { "name": "irrlicht", "version": "1.8.5", - "port-version": 1, + "port-version": 2, "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.", "homepage": "http://irrlicht.sourceforge.net", "supports": "!(android | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index a1e3a88ea9342d..6cef9d26d5193e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3962,7 +3962,7 @@ }, "irrlicht": { "baseline": "1.8.5", - "port-version": 1 + "port-version": 2 }, "irrxml": { "baseline": "0", diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index 20119f93095b10..c45c666fc614c0 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7237cca2aff7174d4aed13a984f67d7ebfe10150", + "version": "1.8.5", + "port-version": 2 + }, { "git-tree": "ef24b53f59cc9a59d277cbff009156852deb3e5c", "version": "1.8.5", From f0352d19d453fc01b60cef1f544e9958687f2d56 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 23:30:12 -0700 Subject: [PATCH 29/49] [rioki-glow] Add to use std::cerr. --- ports/rioki-glow/add-iostream.diff | 13 +++++++++++++ ports/rioki-glow/portfile.cmake | 2 ++ ports/rioki-glow/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/rioki-glow.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/rioki-glow/add-iostream.diff diff --git a/ports/rioki-glow/add-iostream.diff b/ports/rioki-glow/add-iostream.diff new file mode 100644 index 00000000000000..3ac0c059f6833e --- /dev/null +++ b/ports/rioki-glow/add-iostream.diff @@ -0,0 +1,13 @@ +diff --git a/glow/util.cpp b/glow/util.cpp +index 005df9d..e8a5747 100644 +--- a/glow/util.cpp ++++ b/glow/util.cpp +@@ -25,6 +25,8 @@ + #ifdef _WIN32 + #define NOMINMAX + #include ++#else ++#include + #endif + + namespace glow diff --git a/ports/rioki-glow/portfile.cmake b/ports/rioki-glow/portfile.cmake index 766a26ac858403..e18795a53541c7 100644 --- a/ports/rioki-glow/portfile.cmake +++ b/ports/rioki-glow/portfile.cmake @@ -3,6 +3,8 @@ vcpkg_from_github( REPO rioki/glow REF v0.2.1 SHA512 410d0bcc98f9587321dceab498ed84fe2cffbf1f38ba59592d5f7eded9eea67c17e40415966d14f548b7e91f23e17fc0162c216c34b905c641647f90274af5b1 + PATCHES + add-iostream.diff # https://github.com/rioki/glow/pull/21 ) vcpkg_cmake_configure( diff --git a/ports/rioki-glow/vcpkg.json b/ports/rioki-glow/vcpkg.json index 8b300231b9f893..e56b71805811a9 100644 --- a/ports/rioki-glow/vcpkg.json +++ b/ports/rioki-glow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rioki-glow", "version-semver": "0.2.1", + "port-version": 1, "description": "OpenGL Object Wrapper", "homepage": "https://github.com/rioki/glow", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6cef9d26d5193e..197b0caf1bd225 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8422,7 +8422,7 @@ }, "rioki-glow": { "baseline": "0.2.1", - "port-version": 0 + "port-version": 1 }, "ripper37-libbase": { "baseline": "1.1.2", diff --git a/versions/r-/rioki-glow.json b/versions/r-/rioki-glow.json index 73625406e7881f..289da150db5a50 100644 --- a/versions/r-/rioki-glow.json +++ b/versions/r-/rioki-glow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b29377e55d47f1081d4e49c1c2690bf4c3fc03f8", + "version-semver": "0.2.1", + "port-version": 1 + }, { "git-tree": "626e258c92e0d41283d63d2c264dfbe78239d2d5", "version-semver": "0.2.1", From 354c9a0568d3176c2edd75b4b27a5326dc7e0922 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 23:56:37 -0700 Subject: [PATCH 30/49] [shaderwriter] Fix incorrect ::template followed by no template arguments. --- ports/shaderwriter/fix-template.diff | 13 +++++++++++++ ports/shaderwriter/portfile.cmake | 2 ++ ports/shaderwriter/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/shaderwriter.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/shaderwriter/fix-template.diff diff --git a/ports/shaderwriter/fix-template.diff b/ports/shaderwriter/fix-template.diff new file mode 100644 index 00000000000000..244a09139e2eb3 --- /dev/null +++ b/ports/shaderwriter/fix-template.diff @@ -0,0 +1,13 @@ +diff --git a/include/ShaderWriter/CompositeTypes/StructInstanceHelper.hpp b/include/ShaderWriter/CompositeTypes/StructInstanceHelper.hpp +index 39bdee2..26a1e74 100644 +--- a/include/ShaderWriter/CompositeTypes/StructInstanceHelper.hpp ++++ b/include/ShaderWriter/CompositeTypes/StructInstanceHelper.hpp +@@ -61,7 +61,7 @@ namespace sdw + { + static_assert( hasFieldByName< FieldNameT >() ); + using FieldT = decltype( getFieldByName< FieldNameT >() ); +- return FieldT::template get( *this ); ++ return FieldT::get( *this ); + } + + static type::BaseStructPtr makeType( type::TypesCache & cache ) diff --git a/ports/shaderwriter/portfile.cmake b/ports/shaderwriter/portfile.cmake index b7255621ad8687..1d25201ea6d50b 100644 --- a/ports/shaderwriter/portfile.cmake +++ b/ports/shaderwriter/portfile.cmake @@ -3,6 +3,8 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REF v${VERSION} SHA512 72b197f1185e3cee507fb1a5152709ee4c99317db61484d2427d96ae8426a127cd1cb234553be55616709f6f04bed6aec88fa4dfea48219ac1c5b36d9b349a2a HEAD_REF development + PATCHES + fix-template.diff # https://github.com/DragonJoker/ShaderWriter/pull/280 ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH diff --git a/ports/shaderwriter/vcpkg.json b/ports/shaderwriter/vcpkg.json index 1106afb06982c7..ef096a06ca6548 100644 --- a/ports/shaderwriter/vcpkg.json +++ b/ports/shaderwriter/vcpkg.json @@ -1,6 +1,7 @@ { "name": "shaderwriter", "version": "2.9.0", + "port-version": 1, "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.", "homepage": "https://github.com/DragonJoker/ShaderWriter", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 197b0caf1bd225..790fe4b5b1e614 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8830,7 +8830,7 @@ }, "shaderwriter": { "baseline": "2.9.0", - "port-version": 0 + "port-version": 1 }, "shapelib": { "baseline": "1.6.1", diff --git a/versions/s-/shaderwriter.json b/versions/s-/shaderwriter.json index 59b5b8a3fdcc63..90f1d19e3b7d8d 100644 --- a/versions/s-/shaderwriter.json +++ b/versions/s-/shaderwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29d4738912b68a31fad1d666d96bf9c66be7030a", + "version": "2.9.0", + "port-version": 1 + }, { "git-tree": "c700e6e93b23669ee3e022b983b8814027a5633d", "version": "2.9.0", From 861f02d554e3ded493086814195752330f5ae0cb Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 00:00:50 -0700 Subject: [PATCH 31/49] [trubobase64] Fix arm64 detection on macOS. --- .../fix-apple-silicon-arm64-detection.diff | 13 +++++++++++++ ports/turbobase64/portfile.cmake | 1 + ports/turbobase64/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/turbobase64.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/turbobase64/fix-apple-silicon-arm64-detection.diff diff --git a/ports/turbobase64/fix-apple-silicon-arm64-detection.diff b/ports/turbobase64/fix-apple-silicon-arm64-detection.diff new file mode 100644 index 00000000000000..8562a3ffbc0fdc --- /dev/null +++ b/ports/turbobase64/fix-apple-silicon-arm64-detection.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b898742..f6274c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,7 +20,7 @@ option(BUILD_APP "Build executables" OFF) + message(STATUS "Configuring with CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}") + if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") + set(ARCH_AMD64 ON) +-elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") ++elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64") + set(ARCH_AARCH64 ON) + elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le") + set(ARCH_PPC64LE ON) diff --git a/ports/turbobase64/portfile.cmake b/ports/turbobase64/portfile.cmake index 75c07c1f8e18fa..c58ded7133735e 100644 --- a/ports/turbobase64/portfile.cmake +++ b/ports/turbobase64/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-library-conflict.diff + fix-apple-silicon-arm64-detection.diff # https://github.com/powturbo/Turbo-Base64/pull/29 ) vcpkg_cmake_configure( diff --git a/ports/turbobase64/vcpkg.json b/ports/turbobase64/vcpkg.json index cfd63454772101..1274f80a078ca0 100644 --- a/ports/turbobase64/vcpkg.json +++ b/ports/turbobase64/vcpkg.json @@ -1,7 +1,7 @@ { "name": "turbobase64", "version": "2023.8", - "port-version": 1, + "port-version": 2, "description": "Fastest Base64 SIMD/Neon library", "homepage": "https://github.com/powturbo/Turbo-Base64", "license": "GPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 790fe4b5b1e614..001549a6b04f4d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9798,7 +9798,7 @@ }, "turbobase64": { "baseline": "2023.8", - "port-version": 1 + "port-version": 2 }, "tvision": { "baseline": "2024-05-22", diff --git a/versions/t-/turbobase64.json b/versions/t-/turbobase64.json index 4e263dfc367d97..4642f64bd81cb3 100644 --- a/versions/t-/turbobase64.json +++ b/versions/t-/turbobase64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41c00ae880fba4d6b744e3fb2f33715b936adee3", + "version": "2023.8", + "port-version": 2 + }, { "git-tree": "bfdd804561d73658b325b53727f14b99f0f93c14", "version": "2023.8", From c9453641cf8247831dc03aa8f8fdb181d53a82b6 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 00:10:17 -0700 Subject: [PATCH 32/49] [vanillapdf] Disable broken AutoSubscribe type. --- ports/vanillapdf/disable-autosubscribe.diff | 20 ++++++++++++++++++++ ports/vanillapdf/portfile.cmake | 2 ++ ports/vanillapdf/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/v-/vanillapdf.json | 5 +++++ 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ports/vanillapdf/disable-autosubscribe.diff diff --git a/ports/vanillapdf/disable-autosubscribe.diff b/ports/vanillapdf/disable-autosubscribe.diff new file mode 100644 index 00000000000000..a87187db10d657 --- /dev/null +++ b/ports/vanillapdf/disable-autosubscribe.diff @@ -0,0 +1,20 @@ +diff --git a/src/vanillapdf/utils/util.h b/src/vanillapdf/utils/util.h +index 086dc66..57e23ef 100644 +--- a/src/vanillapdf/utils/util.h ++++ b/src/vanillapdf/utils/util.h +@@ -49,6 +49,7 @@ private: + ScopeGuardFactory(); + }; + ++#if 0 + // The AutoSubscribe concept is something I was thinking about for a long time. + // Unfortunately I am still not able to create a working POC, however I want to keep the code. + // In case I will be thinking about such functionality in the future, this could be the starting point. +@@ -95,6 +96,7 @@ private: + T _observable; + U* _observer; + }; ++#endif + + #if (__cplusplus < 201402L) && !defined(COMPILER_MICROSOFT_VISUAL_STUDIO) + // Use custom implementation if not diff --git a/ports/vanillapdf/portfile.cmake b/ports/vanillapdf/portfile.cmake index 7a26a85f502094..b8d1750912685f 100644 --- a/ports/vanillapdf/portfile.cmake +++ b/ports/vanillapdf/portfile.cmake @@ -3,6 +3,8 @@ vcpkg_from_github( REPO vanillapdf/vanillapdf REF "v${VERSION}" SHA512 f15d9a290de0eebac9073503ac555cbf389484aa3ff6385697ba879c336ed9cd4277af180f9d842b5bd8cca69bf6ef4dcfbedba07a6a76014e3974fe09fc6190 + PATCHES + disable-autosubscribe.diff ) vcpkg_cmake_configure( diff --git a/ports/vanillapdf/vcpkg.json b/ports/vanillapdf/vcpkg.json index 8aa53ca4f228d3..f3d275a10a833e 100644 --- a/ports/vanillapdf/vcpkg.json +++ b/ports/vanillapdf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vanillapdf", "version": "2.1.0", + "port-version": 1, "description": "Vanilla.PDF is a cross-platform SDK for creating and modifying PDF documents.", "homepage": "https://github.com/vanillapdf/vanillapdf", "documentation": "https://vanillapdf.github.io/vanillapdf", diff --git a/versions/baseline.json b/versions/baseline.json index 001549a6b04f4d..2bad323ae0e2b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9974,7 +9974,7 @@ }, "vanillapdf": { "baseline": "2.1.0", - "port-version": 0 + "port-version": 1 }, "variant-lite": { "baseline": "2.0.0", diff --git a/versions/v-/vanillapdf.json b/versions/v-/vanillapdf.json index b8695ef7302731..06b373e219f66e 100644 --- a/versions/v-/vanillapdf.json +++ b/versions/v-/vanillapdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd1d1825ab934b7a5cec195ab2fc6897b98ec154", + "version": "2.1.0", + "port-version": 1 + }, { "git-tree": "5a69c8d9fa47869f4e43bd454e25a620b54188da", "version": "2.1.0", From e32df5b15e231111c928d3d32e5fc3fdd7eefbfd Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 00:18:34 -0700 Subject: [PATCH 33/49] [xeus] Remove broken LTO flags using upstream's commit. --- ports/xeus/portfile.cmake | 7 +++++++ ports/xeus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/x-/xeus.json | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake index b790d4d2919f27..95dafc29523b2e 100644 --- a/ports/xeus/portfile.cmake +++ b/ports/xeus/portfile.cmake @@ -1,3 +1,9 @@ +vcpkg_download_distfile(REMOVE_LTO_PATCH + URLS https://github.com/jupyter-xeus/xeus/commit/2dcccb574713f81b7d69baed2bd543bf6798f671.diff?full_index=1 + FILENAME xeus-remove-lto-2dcccb574713f81b7d69baed2bd543bf6798f671.diff + SHA512 e0ae94825cb606dcd250394aee5c88e23bd5440a38c9f4cd8059590ec01dc1ec751ab0bb413788439dfbbfb2c28c68a82cb56efa11d05c3a2d63d420876e1e0b +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO QuantStack/xeus @@ -6,6 +12,7 @@ vcpkg_from_github( HEAD_REF master PATCHES Fix-Compile-nlohmann-json.patch + "${REMOVE_LTO_PATCH}" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) diff --git a/ports/xeus/vcpkg.json b/ports/xeus/vcpkg.json index 35562d0fd2c155..0c8bba09bf80bb 100644 --- a/ports/xeus/vcpkg.json +++ b/ports/xeus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xeus", "version": "0.24.3", - "port-version": 3, + "port-version": 4, "description": "C++ implementation of the Jupyter kernel protocol", "homepage": "https://github.com/jupyter-xeus/xeus", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 2bad323ae0e2b7..38c4a3334e80c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10498,7 +10498,7 @@ }, "xeus": { "baseline": "0.24.3", - "port-version": 3 + "port-version": 4 }, "xframe": { "baseline": "0.3.0", diff --git a/versions/x-/xeus.json b/versions/x-/xeus.json index eda395f433ba61..371e9cbcf0e8a3 100644 --- a/versions/x-/xeus.json +++ b/versions/x-/xeus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d397975c52cf3f3aaf9820d73c45b817719d81ea", + "version": "0.24.3", + "port-version": 4 + }, { "git-tree": "b36c5dea30b1657552313a07c10623753918b1bf", "version": "0.24.3", From 78a8869bf7b015942a156b495d6d38a0726a9e2e Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 00:44:18 -0700 Subject: [PATCH 34/49] Fix baseline typo. --- scripts/ci.feature.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index f7df264416f142..145d59bb93abdb 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -134,7 +134,6 @@ freeopcua:arm64-windows=fail # Needs /bigobj ftgl:arm-uwp=fail ftgl:x64-uwp=fail functions-framework-cpp:x64-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 -g g3log:arm-neon-android=fail g3log:arm64-android=fail g3log:x64-android=fail From 7a397e9d6e99236bfd4082a998f3b12e4120a8e8 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 12:19:35 -0700 Subject: [PATCH 35/49] [awlib] graphics needs hudf ```console C:\Dev\vcpkg\buildtrees\awlib\src\2024-04-06-a31b188a40.clean\graphics\test\scene.c++(6): fatal error C1083: Cannot open include file: 'aw/hudf/utility.h': No such file or directory ``` --- ports/awlib/vcpkg.json | 7 +++++++ versions/a-/awlib.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/awlib/vcpkg.json b/ports/awlib/vcpkg.json index e6018172a3e4f3..ab6afb6519f937 100644 --- a/ports/awlib/vcpkg.json +++ b/ports/awlib/vcpkg.json @@ -21,6 +21,13 @@ "description": "Build graphics library", "supports": "!uwp", "dependencies": [ + { + "name": "awlib", + "default-features": false, + "features": [ + "hudf" + ] + }, "glfw3", "libpng" ] diff --git a/versions/a-/awlib.json b/versions/a-/awlib.json index 738db3e63ea362..5f4e0e4fde0e9d 100644 --- a/versions/a-/awlib.json +++ b/versions/a-/awlib.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "47ddf0fee3b72694384dce84e6355f8a6a07ba9c", + "git-tree": "e904565707edc7bf03dc4b04abf01ecd882a21d7", "version-date": "2024-04-06", "port-version": 2 }, From b36717d645413528f165677afea5118c7199a27e Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 12:21:55 -0700 Subject: [PATCH 36/49] Feature baseline nitpicks. --- scripts/ci.baseline.txt | 3 +-- scripts/ci.feature.baseline.txt | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9997ba573f84e4..2c58a3f5d36362 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -492,9 +492,8 @@ libdc1394:arm64-android=fail libdc1394:x64-android=fail libfreenect2:arm64-windows-static-md=fail libfreenect2:arm64-windows=fail -# Fails to build due to incompatible delcaration of select in macOS 14.2 libgo:x64-android=fail -libgo:x64-osx=fail +libgo:x64-osx=fail # Fails to build due to incompatible delcaration of select in macOS 14.2 libgxps:x64-windows-static=fail libhdfs3:arm-neon-android=fail libhdfs3:arm64-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 145d59bb93abdb..4eee8b3264e28e 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -216,6 +216,7 @@ libgit2:arm-uwp=fail libgit2:x64-uwp=fail libgo:arm-uwp=fail libgo:arm64-windows=fail +libgo:x64-osx=fail # Fails to build due to incompatible delcaration of select in macOS 14.2 libgo:x64-uwp=fail libgpod:x64-linux=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-osx=fail @@ -751,10 +752,9 @@ coin-or-osi:x64-uwp = cascade collada-dom:arm64-uwp = cascade collada-dom:x64-uwp = cascade colmap:arm64-uwp = cascade -colmap:arm64-windows = cascade colmap:x64-uwp = cascade -colmap:x64-windows = cascade -colmap:x86-windows = cascade +colmap[cuda-redist,tests]:x64-windows = feature-fails +colmap[cuda-redist,tests]:x64-windows-static = feature-fails colmap[cuda,cuda-redist](arm64 & osx) = cascade cppcms:arm64-uwp = cascade cppcms:x64-uwp = cascade From eb283fa6302b0922cacfcebbc2257f63ccf55b17 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 12:28:59 -0700 Subject: [PATCH 37/49] Copy llgl skip from ci.baseline.txt to ci.feature.baseline.txt --- scripts/ci.feature.baseline.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 4eee8b3264e28e..907884219d0491 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1392,6 +1392,9 @@ libxxf86vm:arm64-uwp = cascade libxxf86vm:x64-uwp = cascade libzim:arm64-uwp = cascade libzim:x64-uwp = cascade +llgl:arm-neon-android=fail +llgl:arm64-android=fail +llgl:x64-android=fail llgl[vulkan](osx) = cascade # no vulkan sdk installed luajit:arm-neon-android = cascade luasec:x64-linux = cascade From 23accda0401e55ae31dc2e833d99f5aacd89b370 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 13:09:17 -0700 Subject: [PATCH 38/49] More feature baseline. --- scripts/ci.feature.baseline.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 907884219d0491..34ca376b105224 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -730,6 +730,9 @@ cgal[qt]:arm64-windows = cascade cgal[qt]:x64-windows = cascade cgal[qt]:x86-windows = cascade cgns[hdf5,mpi](uwp) = cascade +clblas:arm-neon-android=fail +clblas:arm64-android=fail +clblas:x64-android=fail clblas:x64-uwp = cascade clblast:arm64-uwp = cascade clblast:x64-uwp = cascade @@ -755,6 +758,7 @@ colmap:arm64-uwp = cascade colmap:x64-uwp = cascade colmap[cuda-redist,tests]:x64-windows = feature-fails colmap[cuda-redist,tests]:x64-windows-static = feature-fails +colmap[cuda,cuda-redist]:x64-linux = feature-fails colmap[cuda,cuda-redist](arm64 & osx) = cascade cppcms:arm64-uwp = cascade cppcms:x64-uwp = cascade @@ -1395,6 +1399,7 @@ libzim:x64-uwp = cascade llgl:arm-neon-android=fail llgl:arm64-android=fail llgl:x64-android=fail +llgl[vulkan]:x64-linux=feature-fails llgl[vulkan](osx) = cascade # no vulkan sdk installed luajit:arm-neon-android = cascade luasec:x64-linux = cascade From f7bf74ca7e76cf00e20c2c8f4e76ba5e26a24c1a Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 18 Sep 2025 13:57:08 -0700 Subject: [PATCH 39/49] More feature baseline --- scripts/ci.feature.baseline.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 34ca376b105224..447e6829c85df9 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -216,6 +216,7 @@ libgit2:arm-uwp=fail libgit2:x64-uwp=fail libgo:arm-uwp=fail libgo:arm64-windows=fail +libgo:x64-android=fail libgo:x64-osx=fail # Fails to build due to incompatible delcaration of select in macOS 14.2 libgo:x64-uwp=fail libgpod:x64-linux=fail # Missing system libraries on linux to run/prepare autoconf @@ -2120,7 +2121,7 @@ adios2[python](!uwp) = feature-fails # Could NOT find Python (missing: Python_Nu arrayfire[opencl](windows & !uwp) = feature-fails # build errror: See https://github.com/microsoft/vcpkg/issues/33464 ashes[core](windows) = combination-fails # CMake Error: INSTALL(EXPORT) given unknown export "AshesRenderers". One render backend must be selected # boost-python[core](!linux) = combination-fails -awlib[graphics] = feature-fails # Broken code. See https://github.com/microsoft/vcpkg/issues/39849 +awlib[graphics](osx) = feature-fails # Broken code. See https://github.com/microsoft/vcpkg/issues/39849 cgns[core,fortran,hdf5,legacy,lfs,mpi,tests](osx | linux) = combination-fails # ["fortran","hdf5","mpi"]: Could NOT find MPI (missing: MPI_Fortran_FOUND) (found version "3.1") cgns[fortran](windows | android) = feature-fails # No fortran compiler installed coroutine(osx) = fail # requires c++20 From 83d1536bd61d7aceeb369eb0b49a6a9e93fc0e24 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 19 Sep 2025 23:44:18 +0000 Subject: [PATCH 40/49] =?UTF-8?q?[qt5-location]=20Actually=20add=20the=20m?= =?UTF-8?q?acOS=20fixing=20patch=20=F0=9F=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ports/qt5-location/add-float-cast.diff | 13 +++++++++++++ ports/qt5-location/portfile.cmake | 2 +- versions/q-/qt5-location.json | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 ports/qt5-location/add-float-cast.diff diff --git a/ports/qt5-location/add-float-cast.diff b/ports/qt5-location/add-float-cast.diff new file mode 100644 index 00000000000000..035b759d6c73dc --- /dev/null +++ b/ports/qt5-location/add-float-cast.diff @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp +index ef669c6..6c6a35e 100644 +--- a/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp ++++ b/src/3rdparty/mapbox-gl-native/src/mbgl/layout/symbol_projection.cpp +@@ -95,7 +95,7 @@ namespace mbgl { + PointAndCameraDistance project(const Point& point, const mat4& matrix) { + vec4 pos = {{ point.x, point.y, 0, 1 }}; + matrix::transformMat4(pos, pos, matrix); +- return {{ static_cast(pos[0] / pos[3]), static_cast(pos[1] / pos[3]) }, pos[3] }; ++ return {{ static_cast(pos[0] / pos[3]), static_cast(pos[1] / pos[3]) }, static_cast(pos[3]) }; + } + + float evaluateSizeForFeature(const ZoomEvaluatedSize& zoomEvaluatedSize, const PlacedSymbol& placedSymbol) { diff --git a/ports/qt5-location/portfile.cmake b/ports/qt5-location/portfile.cmake index 79ca1b23ab5a23..a708f81ed72813 100644 --- a/ports/qt5-location/portfile.cmake +++ b/ports/qt5-location/portfile.cmake @@ -1,3 +1,3 @@ message(STATUS "${PORT} has a spurious failure in which it is unable to create a parent directory! Just retry.") include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch add-stdint.diff) +qt_submodule_installation(PATCHES missing-include.patch disable-enum-warning.patch add-stdint.diff add-float-cast.diff) diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 3e8c2162b5d3fb..6d105e9b32dad6 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fa699fb5566565da388659ecbd94eb5f08d1ddc5", + "git-tree": "e044569ba0612917875541ff2bb7ce903910be88", "version": "5.15.17", "port-version": 1 }, From 89dec0786bcd24f8d3e3e531726b5bf363edc285 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 19 Sep 2025 23:55:47 +0000 Subject: [PATCH 41/49] treehopper now passes --- scripts/ci.feature.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 447e6829c85df9..94aa476c67c3cc 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -559,7 +559,6 @@ torch-th:arm64-windows=fail torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail -treehopper:x64-linux=fail treehopper:x64-windows-static=fail unicorn-lib:arm-uwp=fail unicorn-lib:x64-uwp=fail From 5d5ce74874bcb4075f8ad37ee53187872e24e9a1 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 19 Sep 2025 23:56:04 +0000 Subject: [PATCH 42/49] [cpprealm] Disable -Werror harder --- ports/cpprealm/disable-werror.diff | 4 ++-- versions/c-/cpprealm.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/cpprealm/disable-werror.diff b/ports/cpprealm/disable-werror.diff index c33b5e266773b0..f349219df47d52 100644 --- a/ports/cpprealm/disable-werror.diff +++ b/ports/cpprealm/disable-werror.diff @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f8b0675..cea75c0 100644 +index f8b0675..e7dd3f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,7 @@ target_link_libraries(cpprealm PUBLIC Realm::ObjectStore) @@ -7,7 +7,7 @@ index f8b0675..cea75c0 100644 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - target_compile_options(cpprealm PRIVATE -Wall -Wextra -pedantic -Werror) -+ target_compile_options(cpprealm PRIVATE -Wall -Wextra -pedantic) ++ target_compile_options(cpprealm PRIVATE -Wall -Wextra -pedantic -Wno-changes-meaning) endif() if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) diff --git a/versions/c-/cpprealm.json b/versions/c-/cpprealm.json index 48035f306feed8..d39c7ac7ad4eff 100644 --- a/versions/c-/cpprealm.json +++ b/versions/c-/cpprealm.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "fab378e4d20b4f11ae1514a254770189a3765fbc", + "git-tree": "5902c44c16d86536ca05d1f519b27a44a24ffb2d", "version": "2.2.0", "port-version": 1 }, From a0c2c3f043eed237fbf056361b51b99c7dbc0084 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Fri, 19 Sep 2025 18:41:32 -0700 Subject: [PATCH 43/49] [ggml] Add patch suggested by upstream maintainers for llama.cpp --- ...6734daf6932ff29ba8c1ff0245c51d76f783e.diff | 19 +++++++++++++++++++ ports/ggml/portfile.cmake | 1 + ports/ggml/vcpkg.json | 2 +- scripts/ci.baseline.txt | 1 - scripts/ci.feature.baseline.txt | 1 - versions/baseline.json | 2 +- versions/g-/ggml.json | 5 +++++ 7 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 ports/ggml/ggml-i8mm-macos-24a6734daf6932ff29ba8c1ff0245c51d76f783e.diff diff --git a/ports/ggml/ggml-i8mm-macos-24a6734daf6932ff29ba8c1ff0245c51d76f783e.diff b/ports/ggml/ggml-i8mm-macos-24a6734daf6932ff29ba8c1ff0245c51d76f783e.diff new file mode 100644 index 00000000000000..10cbd4864a29a0 --- /dev/null +++ b/ports/ggml/ggml-i8mm-macos-24a6734daf6932ff29ba8c1ff0245c51d76f783e.diff @@ -0,0 +1,19 @@ +diff --git a/ggml/src/ggml-cpu/CMakeLists.txt b/ggml/src/ggml-cpu/CMakeLists.txt +index 388675f5f0911820830cb8dd366bb3e5fe2d9020..369905750754fb48df1fbac3dc1d5296e1766670 100644 +--- a/src/ggml-cpu/CMakeLists.txt ++++ b/src/ggml-cpu/CMakeLists.txt +@@ -224,7 +224,13 @@ function(ggml_add_cpu_backend_variant_impl tag_name) + foreach(feature DOTPROD SVE MATMUL_INT8 FMA FP16_VECTOR_ARITHMETIC SME) + string(FIND "${ARM_FEATURE}" "__ARM_FEATURE_${feature} 1" feature_pos) + if (NOT ${feature_pos} EQUAL -1) +- message(STATUS "ARM feature ${feature} enabled") ++ # Special handling for MATMUL_INT8 when machine doesn't support i8mm ++ if ("${feature}" STREQUAL "MATMUL_INT8" AND GGML_MACHINE_SUPPORTS_noi8mm) ++ message(STATUS "ARM feature ${feature} detected but unsetting due to machine not supporting i8mm") ++ list(APPEND ARCH_FLAGS -U__ARM_FEATURE_MATMUL_INT8) ++ else() ++ message(STATUS "ARM feature ${feature} enabled") ++ endif() + endif() + endforeach() + endif() diff --git a/ports/ggml/portfile.cmake b/ports/ggml/portfile.cmake index 3facb987a85cc5..79fdfaecb81ce3 100644 --- a/ports/ggml/portfile.cmake +++ b/ports/ggml/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( pkgconfig.diff relax-link-options.diff vulkan-shaders-gen.diff + ggml-i8mm-macos-24a6734daf6932ff29ba8c1ff0245c51d76f783e.diff # as suggested in https://github.com/ggml-org/ggml/issues/1343 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/ggml/vcpkg.json b/ports/ggml/vcpkg.json index 91ee0fecc5aaea..fa95675ab6ad17 100644 --- a/ports/ggml/vcpkg.json +++ b/ports/ggml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ggml", "version-date": "2025-08-18", - "port-version": 1, + "port-version": 2, "description": "Tensor library for machine learning", "homepage": "https://github.com/ggml-org/ggml", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2c58a3f5d36362..58c752ebf6a211 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -351,7 +351,6 @@ gegl:x64-osx=fail gemmlowp:arm-neon-android=fail gemmlowp:arm64-android=fail gemmlowp:x64-android=fail -ggml:arm64-osx=fail # error: always_inline function 'vmmlaq_s32' requires target feature 'i8mm', but would be inlined into function 'ggml_vec_dot_q4_1_q8_1' that is compiled without support for 'i8mm' gherkin-c:arm-neon-android=fail gherkin-c:arm64-android=fail gherkin-c:x64-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 94aa476c67c3cc..12272f95aac131 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -143,7 +143,6 @@ geotrans = skip # Port geotrans source ftp://ftp.nga.mil server extremely slow m getopt:arm-uwp=fail getopt:x64-uwp=fail gflags(uwp)=fail -ggml:arm64-osx=fail # error: always_inline function 'vmmlaq_s32' requires target feature 'i8mm', but would be inlined into function 'ggml_vec_dot_q4_1_q8_1' that is compiled without support for 'i8mm' glfw3(uwp)=fail glibmm:x64-windows-static-md=fail glibmm:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 38c4a3334e80c0..c5d3d9248b9d6a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3262,7 +3262,7 @@ }, "ggml": { "baseline": "2025-08-18", - "port-version": 1 + "port-version": 2 }, "ghc-filesystem": { "baseline": "1.5.14", diff --git a/versions/g-/ggml.json b/versions/g-/ggml.json index fb264679c0573a..54d0b8cecc360f 100644 --- a/versions/g-/ggml.json +++ b/versions/g-/ggml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6098e332e4ec5f74f77ea66fe5e52ae0ed25e4a5", + "version-date": "2025-08-18", + "port-version": 2 + }, { "git-tree": "c3c895324e8a96015f9bf88563a49e513657b628", "version-date": "2025-08-18", From 4c34d87d80e6bd9694ccdacca2493d0a867332fa Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 22 Sep 2025 10:58:13 -0700 Subject: [PATCH 44/49] Skip libxt again. --- scripts/ci.baseline.txt | 6 +++--- scripts/ci.feature.baseline.txt | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 58c752ebf6a211..409f819a0e370d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -582,9 +582,9 @@ libvmdk:x64-windows-static=skip libvmdk:x64-windows=skip libvmdk:x86-windows=skip libxaw:x64-windows-static=skip -# Inline asm used doesn't appear to support arm64-windows: -libxt:arm64-windows-static-md=fail -libxt:arm64-windows=fail +libxt:arm64-windows-static-md=fail # Inline asm used doesn't appear to support arm64-windows +libxt:arm64-windows=fail # Inline asm used doesn't appear to support arm64-windows +libxt:x64-windows=fail # Appears to have broken races linenoise-ng:arm64-uwp=fail linenoise-ng:x64-uwp=fail linenoise-ng:x64-windows-static-md=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 12272f95aac131..573e3e8e9c081a 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -264,7 +264,9 @@ libwandio:x64-windows-static=fail libwandio:x64-windows=fail libwandio:x86-windows=fail libwebp[core]:x64-android=combination-fails # Compiler crash without simd -libxt:arm64-windows=fail # clang-cl ICEd +libxt:arm64-windows-static-md=fail # Inline asm used doesn't appear to support arm64-windows +libxt:arm64-windows=fail # Inline asm used doesn't appear to support arm64-windows +libxt:x64-windows=fail # Appears to have broken races linenoise-ng:arm-uwp=fail linenoise-ng:x64-uwp=fail linenoise-ng:x64-windows-static-md=fail @@ -756,6 +758,7 @@ collada-dom:x64-uwp = cascade colmap:arm64-uwp = cascade colmap:x64-uwp = cascade colmap[cuda-redist,tests]:x64-windows = feature-fails +colmap[cuda-redist,tests]:x64-windows-release = feature-fails colmap[cuda-redist,tests]:x64-windows-static = feature-fails colmap[cuda,cuda-redist]:x64-linux = feature-fails colmap[cuda,cuda-redist](arm64 & osx) = cascade From 42b79fdc5ae3e1de7a2da15802c2baa7dd47d36d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 22 Sep 2025 11:11:09 -0700 Subject: [PATCH 45/49] [magnum] Fix missing headers. --- ports/magnum/007-missing-headers.diff | 40 +++++++++++++++++++++++++++ ports/magnum/portfile.cmake | 1 + ports/magnum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/magnum.json | 5 ++++ 5 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 ports/magnum/007-missing-headers.diff diff --git a/ports/magnum/007-missing-headers.diff b/ports/magnum/007-missing-headers.diff new file mode 100644 index 00000000000000..7140d14f74f142 --- /dev/null +++ b/ports/magnum/007-missing-headers.diff @@ -0,0 +1,40 @@ +diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h +index 861a496..2d0436b 100644 +--- a/src/Magnum/Math/Vector.h ++++ b/src/Magnum/Math/Vector.h +@@ -29,6 +29,8 @@ + * @brief Class @ref Magnum::Math::Vector, function @ref Magnum::Math::dot(), @ref Magnum::Math::angle() + */ + ++#include ++#include + #include + #include + #ifndef CORRADE_NO_DEBUG +diff --git a/src/Magnum/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h +index 7223bd7..aae88c6 100644 +--- a/src/Magnum/MeshTools/CompressIndices.h ++++ b/src/Magnum/MeshTools/CompressIndices.h +@@ -29,6 +29,8 @@ + * @brief Function @ref Magnum::MeshTools::compressIndices() + */ + ++#include ++#include + #include + #include + +diff --git a/src/Magnum/MeshTools/GenerateNormals.h b/src/Magnum/MeshTools/GenerateNormals.h +index 3dbf88b..71eadd0 100644 +--- a/src/Magnum/MeshTools/GenerateNormals.h ++++ b/src/Magnum/MeshTools/GenerateNormals.h +@@ -29,6 +29,9 @@ + * @brief Function @ref Magnum::MeshTools::generateFlatNormals(), @ref Magnum::MeshTools::generateFlatNormalsInto(), @ref Magnum::MeshTools::generateSmoothNormals(), @ref Magnum::MeshTools::generateSmoothNormalsInto() + */ + ++#include ++#include ++#include + #include "Magnum/Magnum.h" + #include "Magnum/MeshTools/visibility.h" + diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index 6a7079fb460310..bd46aa6ceef644 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( 004-fix-FindOpenAL.patch 005-fix-find-sdl2.patch 006-fix-build.patch # From https://github.com/mosra/magnum/issues/642#issuecomment-2217261862 + 007-missing-headers.diff ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json index a6490bca7bd054..8a67495235de81 100644 --- a/ports/magnum/vcpkg.json +++ b/ports/magnum/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum", "version-string": "2020.06", - "port-version": 19, + "port-version": 20, "description": "C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index c5d3d9248b9d6a..779ba175bc64cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6046,7 +6046,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 19 + "port-version": 20 }, "magnum-extras": { "baseline": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index b3d155244752e6..cca8a6e2f47958 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cc74dabc7e41ceba701e8038aa1418b0e6eefb2", + "version-string": "2020.06", + "port-version": 20 + }, { "git-tree": "d8cf9aa78a3ffe42bb01a1ce95564717d2ebd6c8", "version-string": "2020.06", From 2d8849a24bc804923bbbee6beceb39e64e01730d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 22 Sep 2025 16:30:47 -0700 Subject: [PATCH 46/49] [vcpkg-ci-python] Disable CMP0148 on CMake 4.x Disable tests for #47284 for now. --- .../vcpkg-ci-python3/project/CMakeLists.txt | 57 +++++++++---------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/scripts/test_ports/vcpkg-ci-python3/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-python3/project/CMakeLists.txt index 6339bfa0529558..5f3e6c299e386c 100644 --- a/scripts/test_ports/vcpkg-ci-python3/project/CMakeLists.txt +++ b/scripts/test_ports/vcpkg-ci-python3/project/CMakeLists.txt @@ -1,32 +1,32 @@ cmake_minimum_required(VERSION 3.12) project(python3-test) -set(Python_ARTIFACTS_PREFIX "_MEOW") - -# We need to opt-out of CMP0148 to be able to test the pre-CMake 3.12 Python -# find modules. The old policy is deprecated, so, at some point, this aspect -# of the test will have to go away. -if(POLICY CMP0148) - cmake_policy(SET CMP0148 OLD) -endif() +if("${CMAKE_VERSION}" VERSION_LESS "4.0") + # We need to opt-out of CMP0148 to be able to test the pre-CMake 3.12 Python + # find modules. The old policy is deprecated, so, at some point, this aspect + # of the test will have to go away. + if(POLICY CMP0148) + cmake_policy(SET CMP0148 OLD) + endif() -# The purpose of this test is to ensure that we get the expected values -# from the finders, not crosscompiling. So, let's not even go there. -# These find_package() calls aren't required because FindPythonInterp -# seems to not return a result in CI. Probably because FindPythonInterp -# prefers the system Python instead of the executable from the python3 -# port. -if(NOT CMAKE_CROSSCOMPILING) - find_package(PythonInterp) -endif() -find_package(PythonLibs) + # The purpose of this test is to ensure that we get the expected values + # from the finders, not crosscompiling. So, let's not even go there. + # These find_package() calls aren't required because FindPythonInterp + # seems to not return a result in CI. Probably because FindPythonInterp + # prefers the system Python instead of the executable from the python3 + # port. + if(NOT CMAKE_CROSSCOMPILING) + find_package(PythonInterp) + endif() + find_package(PythonLibs) -# The old find modules should NOT be prefixed. -if(DEFINED PythonInterp_MEOW_FOUND OR DEFINED PYTHON_MEOW_EXECUTABLE) - message(FATAL_ERROR "FindPythonInterp prefixed the result variables") -endif() -if(DEFINED PythonLibs_MEOW_FOUND OR DEFINED PYTHON_MEOW_LIBRARIES) - message(FATAL_ERROR "FindPythonLibs prefixed the result variables") + # The old find modules should NOT be prefixed. + if(DEFINED PythonInterp_MEOW_FOUND OR DEFINED PYTHON_MEOW_EXECUTABLE) + message(FATAL_ERROR "FindPythonInterp prefixed the result variables") + endif() + if(DEFINED PythonLibs_MEOW_FOUND OR DEFINED PYTHON_MEOW_LIBRARIES) + message(FATAL_ERROR "FindPythonLibs prefixed the result variables") + endif() endif() function(test_result NAME TYPE EXPECTED UNEXPECTED) @@ -55,13 +55,8 @@ endif() # The new find modules should be prefixed if CMake is 4.0+ find_package(Python REQUIRED COMPONENTS ${_INTERPRETER} Development) -if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.0) - set(EXPECTED_PYTHON Python_MEOW) - set(UNEXPECTED_PYTHON Python) -else() - set(EXPECTED_PYTHON Python) - set(UNEXPECTED_PYTHON Python_MEOW) -endif() +set(EXPECTED_PYTHON Python) +set(UNEXPECTED_PYTHON Python_MEOW) test_new_finder(${EXPECTED_PYTHON} ${UNEXPECTED_PYTHON}) # Also test non-prefixed. Use Python3:: to avoid conflicts with Python_MEOW:: From 475d8455bd61245a843cefdd4edda1be9d81bcdc Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 22 Sep 2025 16:49:07 -0700 Subject: [PATCH 47/49] More CI feature baseline. --- scripts/ci.feature.baseline.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 573e3e8e9c081a..5eaa2e818970bc 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1407,8 +1407,9 @@ luajit:arm-neon-android = cascade luasec:x64-linux = cascade luv:arm64-windows = cascade magma(uwp | osx) = cascade -magnum[al-info,anyaudioimporter,audio,glfwapplication,wavaudioimporter]:arm64-uwp = cascade -magnum[al-info,anyaudioimporter,audio,glfwapplication,wavaudioimporter]:x64-uwp = cascade +magnum[glfwapplication]:arm64-uwp = cascade +magnum[glfwapplication]:x64-uwp = cascade +magnum[glxcontext,windowlessglxapplication](android)=feature-fails magnum[distancefieldconverter,fontconverter,gl-info,imageconverter,magnumfont,magnumfontconverter,opengltester,sceneconverter,shaders,text]:x64-uwp = cascade magnum[vk]:x64-uwp = cascade magnum-extras:arm64-uwp = cascade From 06e80571332251f4047d8e9b9e58e74e3a5784eb Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Mon, 22 Sep 2025 16:49:35 -0700 Subject: [PATCH 48/49] formatting sigh --- scripts/ci.feature.baseline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 5eaa2e818970bc..3815a4a5b16880 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -1407,10 +1407,10 @@ luajit:arm-neon-android = cascade luasec:x64-linux = cascade luv:arm64-windows = cascade magma(uwp | osx) = cascade +magnum[distancefieldconverter,fontconverter,gl-info,imageconverter,magnumfont,magnumfontconverter,opengltester,sceneconverter,shaders,text]:x64-uwp = cascade magnum[glfwapplication]:arm64-uwp = cascade magnum[glfwapplication]:x64-uwp = cascade magnum[glxcontext,windowlessglxapplication](android)=feature-fails -magnum[distancefieldconverter,fontconverter,gl-info,imageconverter,magnumfont,magnumfontconverter,opengltester,sceneconverter,shaders,text]:x64-uwp = cascade magnum[vk]:x64-uwp = cascade magnum-extras:arm64-uwp = cascade magnum-extras:x64-uwp = cascade From 84c0218ce72060127edf4543f76b360a006ed8ce Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 23 Sep 2025 10:29:14 -0700 Subject: [PATCH 49/49] Complete [libxt] --- scripts/ci.baseline.txt | 3 ++- scripts/ci.feature.baseline.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 409f819a0e370d..a26698fa24c268 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -584,7 +584,8 @@ libvmdk:x86-windows=skip libxaw:x64-windows-static=skip libxt:arm64-windows-static-md=fail # Inline asm used doesn't appear to support arm64-windows libxt:arm64-windows=fail # Inline asm used doesn't appear to support arm64-windows -libxt:x64-windows=fail # Appears to have broken races +libxt:x64-windows-release=fail # Appears to have broken races +libxt:x64-windows=fail linenoise-ng:arm64-uwp=fail linenoise-ng:x64-uwp=fail linenoise-ng:x64-windows-static-md=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 3815a4a5b16880..4ba01572287881 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -266,7 +266,8 @@ libwandio:x86-windows=fail libwebp[core]:x64-android=combination-fails # Compiler crash without simd libxt:arm64-windows-static-md=fail # Inline asm used doesn't appear to support arm64-windows libxt:arm64-windows=fail # Inline asm used doesn't appear to support arm64-windows -libxt:x64-windows=fail # Appears to have broken races +libxt:x64-windows-release=fail # Appears to have broken races +libxt:x64-windows=fail linenoise-ng:arm-uwp=fail linenoise-ng:x64-uwp=fail linenoise-ng:x64-windows-static-md=fail