download.lst | 4 +-
external/skia/Library_skia.mk | 6 ++--
external/skia/UnpackedTarball_skia.mk | 1
external/skia/help-msvc-analyzer.patch | 25 ++++++++++++++---
external/skia/incomplete-type-SkImageGenerator.patch.1 | 11 -------
external/skia/incomplete.patch.0 | 2 -
vcl/skia/SkiaHelper.cxx | 2 -
vcl/skia/x11/textrender.cxx | 1
8 files changed, 29 insertions(+), 23 deletions(-)
New commits:
commit 0a90ed2524785ab84a65a1b7979797b7297e3000
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 7 15:02:43 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 8 14:22:47 2024 +0200
update to skia m119
the SkImageGenerator patch seems to have been upstreamed
Change-Id: Ic2af62b9479c36394c6c0cf19d1c6f61edfff6b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174653
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/download.lst b/download.lst
index 0181250badc0..b926fa6504c7 100644
--- a/download.lst
+++ b/download.lst
@@ -626,8 +626,8 @@ RHINO_TARBALL := rhino-1.7.15.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
-SKIA_SHA256SUM :=
f8bcf09a73e46267ef97496aa5455d502a65cb5501700ddb24998e017f44157e
-SKIA_TARBALL := skia-m118-7754f9f8257ad0872b7bb04d969452b74bb0c0bc.tar.xz
+SKIA_SHA256SUM :=
89fd7b376aea68e515f4af53893a3b9b6199b1b01bd77791cafe68057309c4ed
+SKIA_TARBALL := skia-m119-fcb55886b914028a99f35fb0ba28e66ff82027e3.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 0e874352e940..faee9931ab19 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -297,6 +297,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/codec/SkCodec \
UnpackedTarball/skia/src/codec/SkCodecImageGenerator \
UnpackedTarball/skia/src/codec/SkColorPalette \
+ UnpackedTarball/skia/src/codec/SkImageGenerator_FromEncoded \
UnpackedTarball/skia/src/codec/SkMasks \
UnpackedTarball/skia/src/codec/SkMaskSwizzler \
UnpackedTarball/skia/src/codec/SkPixmapUtils \
@@ -486,7 +487,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkScan_Path \
UnpackedTarball/skia/src/core/SkScan_SAAPath \
UnpackedTarball/skia/src/core/SkSpecialImage \
- UnpackedTarball/skia/src/core/SkSpecialSurface \
UnpackedTarball/skia/src/core/SkSpriteBlitter_ARGB32 \
UnpackedTarball/skia/src/core/SkStream \
UnpackedTarball/skia/src/core/SkStrike \
@@ -502,7 +502,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkTaskGroup \
UnpackedTarball/skia/src/core/SkTextBlob \
UnpackedTarball/skia/src/core/SkTextBlobTrace \
- UnpackedTarball/skia/src/core/SkTime \
UnpackedTarball/skia/src/core/SkTypeface \
UnpackedTarball/skia/src/core/SkTypefaceCache \
UnpackedTarball/skia/src/core/SkTypeface_remote \
@@ -545,7 +544,9 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/shaders/SkShaderBase \
UnpackedTarball/skia/src/shaders/SkTransformShader \
UnpackedTarball/skia/src/shaders/SkTriColorShader \
+ UnpackedTarball/skia/src/shaders/SkWorkingColorSpaceShader \
UnpackedTarball/skia/src/text/GlyphRun \
+ UnpackedTarball/skia/src/text/SlugFromBuffer \
UnpackedTarball/skia/src/text/StrikeForGPU \
))
@@ -629,7 +630,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/effects/SkEmbossMaskFilter \
UnpackedTarball/skia/src/effects/SkHighContrastFilter \
UnpackedTarball/skia/src/effects/SkLayerDrawLooper \
- UnpackedTarball/skia/src/effects/SkOpPathEffect \
UnpackedTarball/skia/src/effects/SkShaderMaskFilterImpl \
UnpackedTarball/skia/src/effects/SkTableMaskFilter \
UnpackedTarball/skia/src/effects/SkTrimPathEffect \
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index a97025a1678f..d6fe0b65c05c 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -39,7 +39,6 @@ skia_patches := \
fix-SkDebugf-link-error.patch.1 \
incomplete.patch.0 \
ubsan-missing-typeinfo.patch.1 \
- incomplete-type-SkImageGenerator.patch.1 \
help-msvc-analyzer.patch \
always_inline_and_multiversioning_conflict.patch.1 \
diff --git a/external/skia/help-msvc-analyzer.patch
b/external/skia/help-msvc-analyzer.patch
index 73554111907f..a1a3878c81ff 100644
--- a/external/skia/help-msvc-analyzer.patch
+++ b/external/skia/help-msvc-analyzer.patch
@@ -1,5 +1,6 @@
---- skia/include/private/base/SkAssert.h.orig
-+++ skia/include/private/base/SkAssert.h
+diff -ur skia.org/include/private/base/SkAssert.h
skia/include/private/base/SkAssert.h
+--- skia.org/include/private/base/SkAssert.h 2024-10-07 14:41:12.295957640
+0200
++++ skia/include/private/base/SkAssert.h 2024-10-07 14:44:36.271140309
+0200
@@ -60,6 +60,13 @@
} while (false)
#endif
@@ -14,12 +15,28 @@
// SkASSERT, SkASSERTF and SkASSERT_RELEASE can be used as standalone
assertion expressions, e.g.
// uint32_t foo(int x) {
// SkASSERT(x > 4);
-@@ -77,7 +83,7 @@
- : []{ SK_ABORT("check(%s)", #cond); }() )
+@@ -74,20 +81,20 @@
+ #define SkASSERT_RELEASE(cond) \
+ static_cast<void>( __builtin_expect(static_cast<bool>(cond), 1) \
+ ? static_cast<void>(0) \
+- : []{ SK_ABORT("check(%s)", #cond); }() )
++ : [&]{ SK_ABORT("check(%s)", #cond); SkANALYSIS_ASSUME(cond); }() )
+
+ #define SkASSERTF_RELEASE(cond, fmt, ...) \
+ static_cast<void>( __builtin_expect(static_cast<bool>(cond), 1) \
+ ? static_cast<void>(0) \
+- : [&]{ SK_ABORT("assertf(%s): " fmt, #cond, ##__VA_ARGS__); }() )
++ : [&]{ SK_ABORT("assertf(%s): " fmt, #cond, ##__VA_ARGS__);
SkANALYSIS_ASSUME(cond); }() )
#else
#define SkASSERT_RELEASE(cond) \
- static_cast<void>( (cond) ? static_cast<void>(0) : []{
SK_ABORT("check(%s)", #cond); }() )
+ static_cast<void>( (cond) ? static_cast<void>(0) : [&]{
SK_ABORT("check(%s)", #cond); SkANALYSIS_ASSUME(cond); }() )
+
+ #define SkASSERTF_RELEASE(cond, fmt, ...) \
+ static_cast<void>( (cond) \
+ ? static_cast<void>(0) \
+- : [&]{ SK_ABORT("assertf(%s): " fmt, #cond, ##__VA_ARGS__); }() )
++ : [&]{ SK_ABORT("assertf(%s): " fmt, #cond, ##__VA_ARGS__);
SkANALYSIS_ASSUME(cond); }() )
#endif
#if defined(SK_DEBUG)
diff --git a/external/skia/incomplete-type-SkImageGenerator.patch.1
b/external/skia/incomplete-type-SkImageGenerator.patch.1
deleted file mode 100644
index e22c62d05dcf..000000000000
--- a/external/skia/incomplete-type-SkImageGenerator.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur skia.org/src/ports/SkImageGenerator_none.cpp
skia/src/ports/SkImageGenerator_none.cpp
---- skia.org/src/ports/SkImageGenerator_none.cpp 2023-07-13
12:45:22.893718610 +0200
-+++ skia/src/ports/SkImageGenerator_none.cpp 2023-07-13 12:45:46.621816770
+0200
-@@ -6,6 +6,7 @@
- */
-
- #include "include/core/SkData.h"
-+#include "include/core/SkImageGenerator.h"
- #include "src/image/SkImageGeneratorPriv.h"
-
- namespace SkImageGenerators {
diff --git a/external/skia/incomplete.patch.0 b/external/skia/incomplete.patch.0
index f8450b1c1da2..390ca146b522 100644
--- a/external/skia/incomplete.patch.0
+++ b/external/skia/incomplete.patch.0
@@ -1,9 +1,9 @@
--- src/gpu/ganesh/image/GrImageUtils.h
+++ src/gpu/ganesh/image/GrImageUtils.h
@@ -12,6 +12,7 @@
+
#include "include/core/SkSamplingOptions.h"
#include "include/core/SkYUVAPixmaps.h"
- #include "include/gpu/GrTypes.h"
+#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h" // IWYU pragma: keep
#include "src/gpu/ganesh/SkGr.h"
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 76f8099000fc..09a294b86207 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -44,7 +44,7 @@ bool isAlphaMaskBlendingEnabled() { return false; }
#include <SkBitmap.h>
#include <SkCanvas.h>
-#include <SkEncodedImageFormat.h>
+#include <include/codec/SkEncodedImageFormat.h>
#include <SkPaint.h>
#include <SkSurface.h>
#include <SkGraphics.h>
diff --git a/vcl/skia/x11/textrender.cxx b/vcl/skia/x11/textrender.cxx
index 425710626fb5..ba94b44d7b0d 100644
--- a/vcl/skia/x11/textrender.cxx
+++ b/vcl/skia/x11/textrender.cxx
@@ -38,6 +38,7 @@
#include <SkFont.h>
#include <SkFontMgr_fontconfig.h>
+#include <SkFontTypes.h>
#if defined __GNUC__ && !defined __clang__
#pragma GCC diagnostic pop
