diff --git a/cgmanifest.json b/cgmanifest.json index 154afd3b4a7..e4ddeb81cb4 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -216,7 +216,7 @@ "type": "git", "git": { "repositoryUrl": "https://github.com/mono/skia.git", - "commitHash": "b16789ec352c37e02ad38dbac55e6f47d22ff87f" + "commitHash": "f1e0d6e222891ad2461006596cf6baa561d3378a" } } }, @@ -226,12 +226,12 @@ "type": "other", "other": { "name": "skia", - "version": "chrome/m150", + "version": "chrome/m151", "downloadUrl": "https://github.com/google/skia" } }, - "chrome_milestone": 150, - "upstream_merge_commit": "14d05ec761901b6e9e9193af8b347ab3a7f6fed0" + "chrome_milestone": 151, + "upstream_merge_commit": "94dd812d73bf43160bdcff57e1bc09bb09c24e0e" } ] } diff --git a/externals/skia b/externals/skia index b16789ec354..f1e0d6e2228 160000 --- a/externals/skia +++ b/externals/skia @@ -1 +1 @@ -Subproject commit b16789ec3540beaa43e8a71b050d9d328eb68025 +Subproject commit f1e0d6e222891ad2461006596cf6baa561d3378a diff --git a/native/android/build.cake b/native/android/build.cake index 5380b2afe2f..89fa20abe53 100644 --- a/native/android/build.cake +++ b/native/android/build.cake @@ -25,6 +25,7 @@ Task("libSkiaSharp") $"target_os='android' " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_freetype2=false " + diff --git a/native/ios/build.cake b/native/ios/build.cake index 2e6ed0f654d..1e71b2f3b1a 100644 --- a/native/ios/build.cake +++ b/native/ios/build.cake @@ -56,6 +56,7 @@ Task("libSkiaSharp") $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + $"skia_use_metal=true " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_libjpeg_turbo=false " + diff --git a/native/linux/build.cake b/native/linux/build.cake index bc55a7ea63d..e99c34a0b5c 100644 --- a/native/linux/build.cake +++ b/native/linux/build.cake @@ -106,6 +106,7 @@ Task("libSkiaSharp") $"skia_enable_ganesh={(SUPPORT_GPU ? "true" : "false")} " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_freetype2=false " + @@ -152,6 +153,7 @@ Task("libHarfBuzzSharp") GnNinja($"{VARIANT}/{arch}", "HarfBuzzSharp", $"target_os='linux' " + $"target_cpu='{skiaArch}' " + + $"skia_use_partition_alloc=false " + $"visibility_hidden=false " + $"extra_asmflags=[] " + $"extra_cflags=[ '-stdlib=libc++'{bionicDefineHB} ] " + diff --git a/native/macos/build.cake b/native/macos/build.cake index 224d9ff55ec..f2e3d72a025 100644 --- a/native/macos/build.cake +++ b/native/macos/build.cake @@ -33,6 +33,7 @@ Task("libSkiaSharp") $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + $"skia_use_metal=true " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_libjpeg_turbo=false " + diff --git a/native/tizen/build.cake b/native/tizen/build.cake index 7f3523b0912..0ea33ff8217 100644 --- a/native/tizen/build.cake +++ b/native/tizen/build.cake @@ -44,6 +44,7 @@ Task("libSkiaSharp") $"skia_enable_ganesh=true " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_freetype2=true " + diff --git a/native/tvos/build.cake b/native/tvos/build.cake index df4ba81e34f..693ff7c4b14 100644 --- a/native/tvos/build.cake +++ b/native/tvos/build.cake @@ -40,6 +40,7 @@ Task("libSkiaSharp") $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + $"skia_use_metal=true " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_libjpeg_turbo=false " + diff --git a/native/wasm/build.cake b/native/wasm/build.cake index b77d7283eef..cd5bf945a42 100644 --- a/native/wasm/build.cake +++ b/native/wasm/build.cake @@ -46,6 +46,7 @@ Task("libSkiaSharp") $"skia_use_freetype=true " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=false " + $"skia_use_expat=true " + $"skia_use_libwebp_encode=true " + @@ -125,6 +126,7 @@ Task("libHarfBuzzSharp") $"target_os='linux' " + $"target_cpu='wasm' " + $"is_static_skiasharp=true " + + $"skia_use_partition_alloc=false " + $"extra_cflags=[ '-s', 'WARN_UNALIGNED=1' { (hasSimdEnabled ? ", '-msimd128'" : "") } { (hasThreadingEnabled ? ", '-pthread'" : "") } { (hasWasmEH ? ", '-fwasm-exceptions'" : "") } ] " + $"extra_cflags_cc=[ '-frtti' { (hasSimdEnabled ? ", '-msimd128'" : "") } { (hasThreadingEnabled ? ", '-pthread'" : "") } { (hasWasmEH ? ", '-fwasm-exceptions'" : "") } ] " + $"skia_emsdk_dir='{EMSCRIPTEN_ROOT}'" + diff --git a/native/windows/build.cake b/native/windows/build.cake index 643ea542100..1c3fea482db 100644 --- a/native/windows/build.cake +++ b/native/windows/build.cake @@ -50,6 +50,7 @@ Task("libSkiaSharp") $"skia_use_dng_sdk=true " + $"skia_use_harfbuzz=false " + $"skia_use_icu=false " + + $"skia_use_partition_alloc=false " + $"skia_use_piex=true " + $"skia_use_system_expat=false " + $"skia_use_system_libjpeg_turbo=false " + diff --git a/scripts/VERSIONS.txt b/scripts/VERSIONS.txt index 74fd3656336..a39ee42d93e 100644 --- a/scripts/VERSIONS.txt +++ b/scripts/VERSIONS.txt @@ -1,6 +1,6 @@ # native sources harfbuzz release 14.2.1 -skia release m150 +skia release m151 ANGLE release chromium/6275 # product dependencies @@ -65,19 +65,19 @@ xunit.runner.console release 2.4.2 # this is related to the API versions, not the library versions # - milestone: the skia milestone determined by Google/Chromium # - increment: the C API version increment caused by new APIs (externals\skia\include\c\sk_types.h) -libSkiaSharp milestone 150 +libSkiaSharp milestone 151 libSkiaSharp increment 0 # native sonames # ..0 -libSkiaSharp soname 150.0.0 +libSkiaSharp soname 151.0.0 # 0.<60000 + major*100 + minor*10 + micro>.0 HarfBuzz soname 0.61421.0 # SkiaSharp.dll # SkiaSharp.dll -SkiaSharp assembly 4.150.0.0 -SkiaSharp file 4.150.0.0 +SkiaSharp assembly 4.151.0.0 +SkiaSharp file 4.151.0.0 # HarfBuzzSharp.dll HarfBuzzSharp assembly 1.0.0.0 @@ -85,36 +85,36 @@ HarfBuzzSharp file 14.2.1 # nuget versions # SkiaSharp -SkiaSharp nuget 4.150.0 -SkiaSharp.NativeAssets.Linux nuget 4.150.0 -SkiaSharp.NativeAssets.Linux.NoDependencies nuget 4.150.0 -SkiaSharp.NativeAssets.NanoServer nuget 4.150.0 -SkiaSharp.NativeAssets.WebAssembly nuget 4.150.0 -SkiaSharp.NativeAssets.Android nuget 4.150.0 -SkiaSharp.NativeAssets.iOS nuget 4.150.0 -SkiaSharp.NativeAssets.MacCatalyst nuget 4.150.0 -SkiaSharp.NativeAssets.macOS nuget 4.150.0 -SkiaSharp.NativeAssets.Tizen nuget 4.150.0 -SkiaSharp.NativeAssets.tvOS nuget 4.150.0 -SkiaSharp.NativeAssets.Win32 nuget 4.150.0 -SkiaSharp.NativeAssets.WinUI nuget 4.150.0 -SkiaSharp.Views nuget 4.150.0 -SkiaSharp.Views.Desktop.Common nuget 4.150.0 -SkiaSharp.Views.Gtk3 nuget 4.150.0 -SkiaSharp.Views.Gtk4 nuget 4.150.0 -SkiaSharp.Views.WindowsForms nuget 4.150.0 -SkiaSharp.Views.WPF nuget 4.150.0 -SkiaSharp.Views.Uno.WinUI nuget 4.150.0 -SkiaSharp.Views.WinUI nuget 4.150.0 -SkiaSharp.Views.Maui.Core nuget 4.150.0 -SkiaSharp.Views.Maui.Controls nuget 4.150.0 -SkiaSharp.Views.Blazor nuget 4.150.0 -SkiaSharp.HarfBuzz nuget 4.150.0 -SkiaSharp.Skottie nuget 4.150.0 -SkiaSharp.SceneGraph nuget 4.150.0 -SkiaSharp.Resources nuget 4.150.0 -SkiaSharp.Vulkan.SharpVk nuget 4.150.0 -SkiaSharp.Direct3D.Vortice nuget 4.150.0 +SkiaSharp nuget 4.151.0 +SkiaSharp.NativeAssets.Linux nuget 4.151.0 +SkiaSharp.NativeAssets.Linux.NoDependencies nuget 4.151.0 +SkiaSharp.NativeAssets.NanoServer nuget 4.151.0 +SkiaSharp.NativeAssets.WebAssembly nuget 4.151.0 +SkiaSharp.NativeAssets.Android nuget 4.151.0 +SkiaSharp.NativeAssets.iOS nuget 4.151.0 +SkiaSharp.NativeAssets.MacCatalyst nuget 4.151.0 +SkiaSharp.NativeAssets.macOS nuget 4.151.0 +SkiaSharp.NativeAssets.Tizen nuget 4.151.0 +SkiaSharp.NativeAssets.tvOS nuget 4.151.0 +SkiaSharp.NativeAssets.Win32 nuget 4.151.0 +SkiaSharp.NativeAssets.WinUI nuget 4.151.0 +SkiaSharp.Views nuget 4.151.0 +SkiaSharp.Views.Desktop.Common nuget 4.151.0 +SkiaSharp.Views.Gtk3 nuget 4.151.0 +SkiaSharp.Views.Gtk4 nuget 4.151.0 +SkiaSharp.Views.WindowsForms nuget 4.151.0 +SkiaSharp.Views.WPF nuget 4.151.0 +SkiaSharp.Views.Uno.WinUI nuget 4.151.0 +SkiaSharp.Views.WinUI nuget 4.151.0 +SkiaSharp.Views.Maui.Core nuget 4.151.0 +SkiaSharp.Views.Maui.Controls nuget 4.151.0 +SkiaSharp.Views.Blazor nuget 4.151.0 +SkiaSharp.HarfBuzz nuget 4.151.0 +SkiaSharp.Skottie nuget 4.151.0 +SkiaSharp.SceneGraph nuget 4.151.0 +SkiaSharp.Resources nuget 4.151.0 +SkiaSharp.Vulkan.SharpVk nuget 4.151.0 +SkiaSharp.Direct3D.Vortice nuget 4.151.0 # HarfBuzzSharp HarfBuzzSharp nuget 14.2.1 HarfBuzzSharp.NativeAssets.Android nuget 14.2.1 diff --git a/scripts/azure-templates-variables.yml b/scripts/azure-templates-variables.yml index 63b7dcc3c8e..5cef43af407 100644 --- a/scripts/azure-templates-variables.yml +++ b/scripts/azure-templates-variables.yml @@ -3,7 +3,7 @@ variables: # It must match the SkiaSharp nuget version in scripts/VERSIONS.txt. # SKIASHARP_VERSION is used in the BUILD_NUMBER counter expression below, # which requires a compile-time constant (cannot be derived dynamically). - SKIASHARP_VERSION: 4.150.0 + SKIASHARP_VERSION: 4.151.0 FEATURE_NAME_PREFIX: 'feature/' VERBOSITY: normal GIT_SHA: $(Build.SourceVersion)