mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
Update macOS 2026-01-12. (#49382)
This commit is contained in:
@@ -10,8 +10,12 @@ if(VCPKG_TARGET_IS_OSX)
|
||||
execute_process(COMMAND xcrun --show-sdk-version
|
||||
OUTPUT_VARIABLE OSX_SDK_VERSION
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
if(${OSX_SDK_VERSION} VERSION_GREATER_EQUAL 26)
|
||||
# macOS 26 Tahoe has removed AGL APIs https://bugreports.qt.io/browse/QTBUG-137687
|
||||
# macOS 26 Tahoe has removed AGL APIs https://bugreports.qt.io/browse/QTBUG-137687
|
||||
#
|
||||
# macOS 26.2 fails to query this with the following error, so we conservatively apply the patch in that case
|
||||
# xcodebuild: error: SDK "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" cannot be located.
|
||||
# xcrun: error: unable to lookup item 'SDKVersion' in SDK '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk'
|
||||
if(NOT OSX_SDK_VERSION OR OSX_SDK_VERSION VERSION_GREATER_EQUAL 26)
|
||||
list(APPEND PATCHES remove-agl-framework.patch)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "openimageio",
|
||||
"version": "3.0.9.1",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
|
||||
"homepage": "https://github.com/OpenImageIO/oiio",
|
||||
"license": "BSD-3-Clause",
|
||||
|
||||
@@ -28,13 +28,13 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
|
||||
rm macosvm-0.2-2-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/2025FallFCS/fullrestores/089-04148/791B6F00-A30B-4EB0-B2E3-257167F7715B/UniversalMac_26.1_25B78_Restore.ipsw
|
||||
- [ ] Determine the VM name using the form "vcpkg-osx-<date>-arm64", for example "vcpkg-osx-2025-11-11-arm64".
|
||||
- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2025-11-11-arm64 and UniversalMac_26.1_25B78_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/2025FallFCS/fullrestores/093-37399/E144C918-CF99-4BBC-B1D0-3E739B9A3F2D/UniversalMac_26.2_25C56_Restore.ipsw
|
||||
- [ ] Determine the VM name using the form "vcpkg-osx-<date>-arm64", for example "vcpkg-osx-2026-01-12-arm64".
|
||||
- [ ] Open a terminal and run the following commands to create the VM with vcpkg-osx-2026-01-12-arm64 and UniversalMac_26.2_25C56_Restore.ipsw replaced as appropriate. This must be run in the KVM as it uses a GUI:
|
||||
```sh
|
||||
mkdir -p ~/Parallels/vcpkg-osx-2025-11-11-arm64
|
||||
cd ~/Parallels/vcpkg-osx-2025-11-11-arm64
|
||||
~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_26.1_25B78_Restore.ipsw ./vm.json
|
||||
mkdir -p ~/Parallels/vcpkg-osx-2026-01-12-arm64
|
||||
cd ~/Parallels/vcpkg-osx-2026-01-12-arm64
|
||||
~/macosvm --disk disk.img,size=500g --aux aux.img -c 8 -r 12g --restore ~/UniversalMac_26.2_25C56_Restore.ipsw ./vm.json
|
||||
~/macosvm -g ./vm.json
|
||||
```
|
||||
- [ ] Follow prompts as you would on real hardware.
|
||||
@@ -66,7 +66,7 @@ This is the checklist for what the vcpkg team does when updating the macOS machi
|
||||
exit
|
||||
```
|
||||
- [ ] 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.264.2/vsts-agent-osx-arm64-4.264.2.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.266.2/vsts-agent-osx-arm64-4.266.2.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
|
||||
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
- job: ${{ parameters.jobName }}
|
||||
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
|
||||
pool:
|
||||
name: PrOsx-2025-11-11-arm64
|
||||
name: PrOsx-2026-01-12-arm64
|
||||
workspace:
|
||||
clean: resources
|
||||
timeoutInMinutes: 2880 # 2 days
|
||||
|
||||
@@ -10,7 +10,7 @@ sudo xcode-select -s /Applications/Xcode.app
|
||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||
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
|
||||
curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.264.2/vsts-agent-osx-arm64-4.264.2.tar.gz
|
||||
curl -s -o ~/Downloads/azure-agent.tar.gz https://download.agent.dev.azure.com/agent/4.266.2/vsts-agent-osx-arm64-4.266.2.tar.gz
|
||||
mkdir ~/myagent
|
||||
tar xf ~/Downloads/azure-agent.tar.gz -C ~/myagent
|
||||
rm ~/Downloads/azure-agent.tar.gz
|
||||
|
||||
@@ -7226,7 +7226,7 @@
|
||||
},
|
||||
"openimageio": {
|
||||
"baseline": "3.0.9.1",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"openjpeg": {
|
||||
"baseline": "2.5.4",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "6601c24576470ac3d475ed52f9971a6466dfbb71",
|
||||
"version": "3.0.9.1",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "780866629207436afdc4882082116feeb7ccf677",
|
||||
"version": "3.0.9.1",
|
||||
|
||||
Reference in New Issue
Block a user