download.lst | 4 external/skia/Library_skia.mk | 2 external/skia/UnpackedTarball_skia.mk | 1 external/skia/macosmetal.patch.1 | 5 - external/skia/modified-skcms-0001-Change-use-of-removed-intrinsic.patch | 42 ---------- 5 files changed, 6 insertions(+), 48 deletions(-)
New commits: commit aafe72e921a47fe2aedd70544a2111e6a9766fbc Author: Noel Grandin <[email protected]> AuthorDate: Tue Oct 21 10:55:00 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Oct 21 15:13:20 2025 +0200 update to skia m141 drop patch that is now upstream Change-Id: Id319f2d287a92a38d1ba0812e4d59b63d2ae1b48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192776 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index 4d60df6b35a7..ac8ced586bc5 100644 --- a/download.lst +++ b/download.lst @@ -652,8 +652,8 @@ RHINO_TARBALL := rhino-1.7.15.zip # three static lines # so that git cherry-pick # will not run into conflicts -SKIA_SHA256SUM := 1808fba8891ebac4ae50007bd2b7bdf4dee27fb5a345fc720cb4891d1b859136 -SKIA_TARBALL := skia-m140-f3ff281f2330f2948888a9cc0ba921bbdc107da8.tar.xz +SKIA_SHA256SUM := 01aa9c77b506900ad39c6ec0750d4b8051306287fad970170e0d780a30821d3c +SKIA_TARBALL := skia-m141-5eefbe51d17d2e379fa2d7353827e0ccb1e1f601.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index cb65ede020dc..603b32ae4b08 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -424,7 +424,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/core/SkDistanceFieldGen \ UnpackedTarball/skia/src/core/SkDocument \ UnpackedTarball/skia/src/core/SkDraw \ - UnpackedTarball/skia/src/core/SkDrawBase \ UnpackedTarball/skia/src/core/SkDrawShadowInfo \ UnpackedTarball/skia/src/core/SkDraw_atlas \ UnpackedTarball/skia/src/core/SkDraw_text \ @@ -484,6 +483,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/core/SkPath \ UnpackedTarball/skia/src/core/SkPathBuilder \ UnpackedTarball/skia/src/core/SkPathEffect \ + UnpackedTarball/skia/src/core/SkPathIter \ UnpackedTarball/skia/src/core/SkPathMeasure \ UnpackedTarball/skia/src/core/SkPathPriv \ UnpackedTarball/skia/src/core/SkPathRaw \ diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index 1c915a86a53f..cf2cd6c99b8d 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -42,7 +42,6 @@ skia_patches := \ 0002-loong64-Honor-existing-LASX-LSX-settings.patch \ 0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch \ 0004-loong64-Fix-the-remaining-implicit-vector-casts.patch \ - modified-skcms-0001-Change-use-of-removed-intrinsic.patch \ ifneq ($(MSYSTEM),) # use binary flag so patch from git-bash won't choke on mixed line-endings in patches diff --git a/external/skia/macosmetal.patch.1 b/external/skia/macosmetal.patch.1 index acd17a85eab1..38be22875163 100644 --- a/external/skia/macosmetal.patch.1 +++ b/external/skia/macosmetal.patch.1 @@ -101,14 +101,15 @@ diff -ur skia.org/tools/window/mac/GaneshMetalWindowContext_mac.mm skia/tools/wi fMetalLayer.device = fShared->fDevice.get(); fMetalLayer.pixelFormat = MTLPixelFormatBGRA8Unorm; -@@ -65,10 +89,10 @@ +@@ -65,11 +89,11 @@ fMetalLayer.autoresizingMask = kCALayerHeightSizable | kCALayerWidthSizable; fMetalLayer.contentsGravity = kCAGravityTopLeft; fMetalLayer.magnificationFilter = kCAFilterNearest; - NSColorSpace* cs = fMainView.window.colorSpace; - fMetalLayer.colorspace = cs.CGColorSpace; + fMetalLayer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB); - + fMetalLayer.framebufferOnly = false; + - fMainView.layer = fMetalLayer; + if (!reuseMetalLayer) + fMainView.layer = fMetalLayer; diff --git a/external/skia/modified-skcms-0001-Change-use-of-removed-intrinsic.patch b/external/skia/modified-skcms-0001-Change-use-of-removed-intrinsic.patch deleted file mode 100644 index d7af3211d536..000000000000 --- a/external/skia/modified-skcms-0001-Change-use-of-removed-intrinsic.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 135488419331644e59091ecc73e682299d3937a4 Mon Sep 17 00:00:00 2001 -From: Devon Loehr <[email protected]> -Date: Fri, 15 Aug 2025 14:31:27 +0000 -Subject: Change use of removed intrinsic - -A recent LLVM change removed the __builtin_ia32_vcvtph2ps256 intrinsic -because it can be implemented using __builtin_shufflevector and/or -__builtin_convertvector. This CL changes skia to use convertvector as -to match. - -Bug: chromium:438445382 -Change-Id: I2ed16cd507d7feeafba4c082b3840cbdd6368dd9 -Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/1038217 -Reviewed-by: Ben Wagner <[email protected]> -Commit-Queue: Ben Wagner <[email protected]> -Auto-Submit: Devon Loehr <[email protected]> ---- - src/Transform_inl.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Transform_inl.h b/src/Transform_inl.h -index bc10e7d..99faf25 100644 ---- a/modules/skcms/src/Transform_inl.h -+++ b/modules/skcms/src/Transform_inl.h -@@ -156,8 +156,12 @@ SI F F_from_Half(U16 half) { - #elif defined(USING_AVX512F) - return (F)_mm512_cvtph_ps((__m256i)half); - #elif defined(USING_AVX_F16C) -- typedef int16_t __attribute__((vector_size(16))) I16; -- return __builtin_ia32_vcvtph2ps256((I16)half); -+#if defined __clang__ -+ typedef __fp16 __attribute__((vector_size(16))) F16; -+#else -+ typedef _Float16 __attribute__((vector_size(16))) F16; -+#endif -+ return __builtin_convertvector((F16)half, F); - #else - U32 wide = cast<U32>(half); - // A half is 1-5-10 sign-exponent-mantissa, with 15 exponent bias. --- -2.50.1 -
