From afff9f98336721ccaa874bac5933d91290b84e36 Mon Sep 17 00:00:00 2001 From: greepar Date: Wed, 22 Jul 2026 03:46:36 +0800 Subject: [PATCH] Upgrade static graphics to SkiaSharp 4.150.1 --- .github/workflows/nuget-static-graphics-repack.yml | 2 +- .github/workflows/static-graphics-linux.yml | 2 +- .github/workflows/static-graphics-macos.yml | 2 +- .github/workflows/static-graphics-musl.yml | 2 +- .github/workflows/static-graphics-windows.yml | 2 +- NuGet/StaticGraphics/README.md | 2 +- NuGet/StaticGraphics/StaticLink.Avalonia.csproj | 4 ++-- README.md | 4 ++-- scripts/build-linux-static-graphics.sh | 4 ++-- scripts/build-macos-static-graphics.sh | 2 +- scripts/build-windows-static-graphics.ps1 | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/nuget-static-graphics-repack.yml b/.github/workflows/nuget-static-graphics-repack.yml index 3a46b1b..52174e9 100644 --- a/.github/workflows/nuget-static-graphics-repack.yml +++ b/.github/workflows/nuget-static-graphics-repack.yml @@ -6,7 +6,7 @@ on: source_version: description: Existing package version containing the static libraries required: true - default: 3.119.4-7922.1 + default: 4.150.1-7922.1 type: string publish_to_nuget: description: Publish package to nuget.org diff --git a/.github/workflows/static-graphics-linux.yml b/.github/workflows/static-graphics-linux.yml index ee469ec..7a72668 100644 --- a/.github/workflows/static-graphics-linux.yml +++ b/.github/workflows/static-graphics-linux.yml @@ -13,7 +13,7 @@ on: inputs: skiasharp_version: required: true - default: "3.119.4" + default: "4.150.1" type: string angle_branch: required: true diff --git a/.github/workflows/static-graphics-macos.yml b/.github/workflows/static-graphics-macos.yml index 523aad9..46d0986 100644 --- a/.github/workflows/static-graphics-macos.yml +++ b/.github/workflows/static-graphics-macos.yml @@ -13,7 +13,7 @@ on: inputs: skiasharp_version: required: true - default: "3.119.4" + default: "4.150.1" type: string angle_branch: required: true diff --git a/.github/workflows/static-graphics-musl.yml b/.github/workflows/static-graphics-musl.yml index 9505bcb..3086d0f 100644 --- a/.github/workflows/static-graphics-musl.yml +++ b/.github/workflows/static-graphics-musl.yml @@ -16,7 +16,7 @@ on: inputs: skiasharp_version: required: true - default: "3.119.4" + default: "4.150.1" type: string angle_branch: required: true diff --git a/.github/workflows/static-graphics-windows.yml b/.github/workflows/static-graphics-windows.yml index 3506813..a6799e0 100644 --- a/.github/workflows/static-graphics-windows.yml +++ b/.github/workflows/static-graphics-windows.yml @@ -13,7 +13,7 @@ on: inputs: skiasharp_version: required: true - default: "3.119.4" + default: "4.150.1" type: string angle_branch: required: true diff --git a/NuGet/StaticGraphics/README.md b/NuGet/StaticGraphics/README.md index 147e402..6d87c98 100644 --- a/NuGet/StaticGraphics/README.md +++ b/NuGet/StaticGraphics/README.md @@ -11,7 +11,7 @@ dotnet add package StaticLink.Avalonia Or add it manually: ```xml - + ``` For macOS, also reference `StaticLink.Avalonia.Native`. This package is macOS-only and must match your Avalonia version because it contains `libAvaloniaNative.a`. diff --git a/NuGet/StaticGraphics/StaticLink.Avalonia.csproj b/NuGet/StaticGraphics/StaticLink.Avalonia.csproj index 0d09bc7..69ca529 100644 --- a/NuGet/StaticGraphics/StaticLink.Avalonia.csproj +++ b/NuGet/StaticGraphics/StaticLink.Avalonia.csproj @@ -6,7 +6,7 @@ false false StaticLink.Avalonia - 3.119.4-7922.1 + 4.150.1-7922.1 greepar greepar Static SkiaSharp, HarfBuzzSharp, and ANGLE libraries for Avalonia NativeAOT single-file publishing. @@ -19,7 +19,7 @@ - + diff --git a/README.md b/README.md index 2c54ef1..4576fe7 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,10 @@ dotnet add package StaticLink.Avalonia Or add it manually: ```xml - + ``` -`3.119.4-7922.1` supports Avalonia 11. If you need the SkiaSharp 2 line for an Avalonia 11 project, use this optional package variant: +`4.150.1-7922.1` uses the latest stable SkiaSharp 4 release. If you need the SkiaSharp 2 line for an Avalonia 11 project, use this optional package variant: ```xml diff --git a/scripts/build-linux-static-graphics.sh b/scripts/build-linux-static-graphics.sh index ef1c74c..8f8efac 100755 --- a/scripts/build-linux-static-graphics.sh +++ b/scripts/build-linux-static-graphics.sh @@ -6,7 +6,7 @@ WORK_DIR="${WORK_DIR:-$ROOT_DIR/External/NativeStatic/.work}" TARGET_CPU="${TARGET_CPU:-x64}" RID="${RID:-linux-$TARGET_CPU}" OUTPUT_DIR="${OUTPUT_DIR:-$ROOT_DIR/External/NativeStatic/$RID}" -SKIASHARP_VERSION="${SKIASHARP_VERSION:-3.119.4}" +SKIASHARP_VERSION="${SKIASHARP_VERSION:-4.150.1}" ANGLE_BRANCH="${ANGLE_BRANCH:-7922}" BUILD_JOBS="${BUILD_JOBS:-$(nproc)}" ANGLE_PATCH_DIR="${ANGLE_PATCH_DIR:-$ROOT_DIR/External/NativeStatic/patches}" @@ -20,7 +20,7 @@ Usage: scripts/build-linux-static-graphics.sh [skia|angle|all] Environment: WORK_DIR Source/build cache directory. Default: External/NativeStatic/.work OUTPUT_DIR Final static library directory. Default: External/NativeStatic/linux-$TARGET_CPU - SKIASHARP_VERSION SkiaSharp release branch version. Default: 3.119.4 + SKIASHARP_VERSION SkiaSharp release branch version. Default: 4.150.1 ANGLE_BRANCH ANGLE chromium branch. Default: 7922 TARGET_CPU GN target_cpu. Default: x64. Supported: x64, arm64 RID Output RID. Default: linux-$TARGET_CPU diff --git a/scripts/build-macos-static-graphics.sh b/scripts/build-macos-static-graphics.sh index 34d5f70..12a6d82 100755 --- a/scripts/build-macos-static-graphics.sh +++ b/scripts/build-macos-static-graphics.sh @@ -6,7 +6,7 @@ WORK_DIR="${WORK_DIR:-$ROOT_DIR/External/NativeStatic/.work}" TARGET_CPU="${TARGET_CPU:-arm64}" RID="${RID:-osx-$TARGET_CPU}" OUTPUT_DIR="${OUTPUT_DIR:-$ROOT_DIR/External/NativeStatic/$RID}" -SKIASHARP_VERSION="${SKIASHARP_VERSION:-3.119.4}" +SKIASHARP_VERSION="${SKIASHARP_VERSION:-4.150.1}" ANGLE_BRANCH="${ANGLE_BRANCH:-7922}" BUILD_JOBS="${BUILD_JOBS:-$(sysctl -n hw.ncpu)}" ANGLE_PATCH_DIR="${ANGLE_PATCH_DIR:-$ROOT_DIR/External/NativeStatic/patches}" diff --git a/scripts/build-windows-static-graphics.ps1 b/scripts/build-windows-static-graphics.ps1 index be31550..2c70fa0 100644 --- a/scripts/build-windows-static-graphics.ps1 +++ b/scripts/build-windows-static-graphics.ps1 @@ -7,7 +7,7 @@ $ErrorActionPreference = "Stop" $RootDir = Split-Path -Parent $PSScriptRoot $WorkDir = if ($env:WORK_DIR) { $env:WORK_DIR } else { Join-Path $RootDir "External\NativeStatic\.work" } -$SkiaSharpVersion = if ($env:SKIASHARP_VERSION) { $env:SKIASHARP_VERSION } else { "3.119.4" } +$SkiaSharpVersion = if ($env:SKIASHARP_VERSION) { $env:SKIASHARP_VERSION } else { "4.150.1" } $AngleBranch = if ($env:ANGLE_BRANCH) { $env:ANGLE_BRANCH } else { "7922" } $TargetCpu = if ($env:TARGET_CPU) { $env:TARGET_CPU } else { "x64" } $Rid = if ($env:RID) { $env:RID } else { "win-$TargetCpu" }