download.lst | 4 ++-- external/skia/Library_skia.mk | 1 + external/skia/UnpackedTarball_skia.mk | 1 + external/skia/fix-semaphore-include.patch.1 | 11 +++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit 6e0d9ef6fd8ce744d5a296798e2a4a56ac12b313 Author: Noel Grandin <[email protected]> AuthorDate: Thu Nov 13 09:29:27 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Nov 13 12:08:07 2025 +0100 update to skia m142 one small patch needed for a file that includes a header that no longer exists. Change-Id: I4f8c9aff46afbc3a7f34f2ead804ee956ee18d70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193938 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index d980c8584044..68029985a093 100644 --- a/download.lst +++ b/download.lst @@ -657,8 +657,8 @@ RHINO_TARBALL := rhino-1.7.15.zip # three static lines # so that git cherry-pick # will not run into conflicts -SKIA_SHA256SUM := 01aa9c77b506900ad39c6ec0750d4b8051306287fad970170e0d780a30821d3c -SKIA_TARBALL := skia-m141-5eefbe51d17d2e379fa2d7353827e0ccb1e1f601.tar.xz +SKIA_SHA256SUM := 45ae58e84fa2d1e261bfc980e1c5b7bbfaf83887e3813795bd343d3786f4d0bc +SKIA_TARBALL := skia-m142-f4ed99d2443962782cf5f8b4dd27179f131e7cbe.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 603b32ae4b08..b900c5ce420a 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -318,6 +318,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/codec/SkColorPalette \ UnpackedTarball/skia/src/codec/SkExif \ UnpackedTarball/skia/src/codec/SkGainmapInfo \ + UnpackedTarball/skia/src/codec/SkHdrMetadata \ UnpackedTarball/skia/src/codec/SkImageGenerator_FromEncoded \ UnpackedTarball/skia/src/codec/SkMaskSwizzler \ UnpackedTarball/skia/src/codec/SkPixmapUtils \ diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index cd7b2ffa9553..692eba0130e5 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -43,6 +43,7 @@ skia_patches := \ 0003-loong64-Fix-missing-rounding-in-loong64-scaled_mult-.patch \ 0004-loong64-Fix-the-remaining-implicit-vector-casts.patch \ msvc-unknown-attributes.patch.1 \ + fix-semaphore-include.patch.1 \ ifneq ($(MSYSTEM),) # use binary flag so patch from git-bash won't choke on mixed line-endings in patches diff --git a/external/skia/fix-semaphore-include.patch.1 b/external/skia/fix-semaphore-include.patch.1 new file mode 100644 index 000000000000..00cb3384b475 --- /dev/null +++ b/external/skia/fix-semaphore-include.patch.1 @@ -0,0 +1,11 @@ +diff -ur skia.org/src/gpu/ganesh/vk/GrVkSemaphore.cpp skia/src/gpu/ganesh/vk/GrVkSemaphore.cpp +--- skia.org/src/gpu/ganesh/vk/GrVkSemaphore.cpp 2025-11-13 09:00:20.811020429 +0200 ++++ skia/src/gpu/ganesh/vk/GrVkSemaphore.cpp 2025-11-13 09:00:49.822813511 +0200 +@@ -12,7 +12,6 @@ + #include "include/private/base/SkAssert.h" + #include "src/gpu/ganesh/vk/GrVkGpu.h" + #include "src/gpu/ganesh/vk/GrVkUtil.h" +-#include "tools/gpu/vk/GrVulkanDefines.h" + + #include <string.h> +
