download.lst | 4 ++--
external/skia/Library_skia.mk | 13 ++++++++++---
external/skia/fix-without-gl.patch.1 | 22 +++++++++++-----------
external/skia/share-grcontext.patch.1 | 2 +-
4 files changed, 24 insertions(+), 17 deletions(-)
New commits:
commit d649e297fde11efab2c681605e27e513a183e314
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 10 15:03:00 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Oct 12 19:12:24 2024 +0200
update to skia m130
Change-Id: Ibfa3d8f5a86dd7474f5cc288c89eb33a8aa472cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174848
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index b8d7680761ff..e32d732741fb 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 :=
2520148d5c1d024fa6c7124a3bd8ff82754d3ee5171295954734e84427575cd0
-SKIA_TARBALL := skia-m129-dda581d538cb6532cda841444e7b4ceacde01ec9.tar.xz
+SKIA_SHA256SUM :=
53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d
+SKIA_TARBALL := skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.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 84bbf92c6b15..40fe09a29d6a 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -225,7 +225,6 @@ endif
#
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/codec/SkIcoCodec \
- UnpackedTarball/skia/src/codec/SkPngCodec \
))
# from file skia/gn/BUILD.gn:1314, target "typeface_freetype"
@@ -311,7 +310,7 @@ $(eval $(call gb_Library_add_generated_objcxxobjects,skia,\
endif
endif
-# from file skia/gn/codec.gni, target "skia_codec_core"
+# from file skia/gn/codec.gni:30, target "skia_codec_shared"
#
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/codec/SkCodec \
@@ -326,7 +325,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/codec/SkTiffUtility \
))
-# from file skia/gn/codec.gni, target "skia_codec_decode_bmp"
+# from file skia/gn/codec.gni:64, target "skia_codec_decode_bmp"
#
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/codec/SkBmpBaseCodec \
@@ -337,6 +336,14 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/codec/SkWbmpCodec \
))
+# from file skia/gn/codec.gni:96, target "skia_codec_png"
+#
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+ UnpackedTarball/skia/src/codec/SkPngCodec \
+ UnpackedTarball/skia/src/codec/SkPngCodecBase \
+))
+
+
# from file skia/gn/core.gni:152, target "skia_core_sources"
#
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
diff --git a/external/skia/fix-without-gl.patch.1
b/external/skia/fix-without-gl.patch.1
index cdc89df8efa4..5e16abd34a8f 100644
--- a/external/skia/fix-without-gl.patch.1
+++ b/external/skia/fix-without-gl.patch.1
@@ -1,7 +1,7 @@
-diff -ur skia.org/include/gpu/gl/GrGLInterface.h
skia/include/gpu/gl/GrGLInterface.h
---- skia.org/include/gpu/gl/GrGLInterface.h 2024-10-04 15:33:38.063875425
+0200
-+++ skia/include/gpu/gl/GrGLInterface.h 2024-10-04 15:34:00.073017585
+0200
-@@ -83,7 +83,9 @@
+diff -ur skia.org/include/gpu/ganesh/gl/GrGLInterface.h
skia/include/gpu/ganesh/gl/GrGLInterface.h
+--- skia.org/include/gpu/ganesh/gl/GrGLInterface.h 2024-10-10
14:54:07.470413121 +0200
++++ skia/include/gpu/ganesh/gl/GrGLInterface.h 2024-10-10 14:54:43.609667653
+0200
+@@ -81,7 +81,9 @@
GrGLStandard fStandard;
GrGLExtensions fExtensions;
@@ -12,9 +12,9 @@ diff -ur skia.org/include/gpu/gl/GrGLInterface.h
skia/include/gpu/gl/GrGLInterfa
/**
* The function pointers are in a struct so that we can have a compiler
generated assignment
diff -ur skia.org/src/gpu/ganesh/gl/GrGLContext.h
skia/src/gpu/ganesh/gl/GrGLContext.h
---- skia.org/src/gpu/ganesh/gl/GrGLContext.h 2024-10-04 15:33:38.116875769
+0200
-+++ skia/src/gpu/ganesh/gl/GrGLContext.h 2024-10-04 15:34:36.192247894
+0200
-@@ -69,9 +69,11 @@
+--- skia.org/src/gpu/ganesh/gl/GrGLContext.h 2024-10-10 14:54:07.528413530
+0200
++++ skia/src/gpu/ganesh/gl/GrGLContext.h 2024-10-10 14:54:20.569505434
+0200
+@@ -79,9 +79,11 @@
const GrGLCaps* caps() const { return fGLCaps.get(); }
GrGLCaps* caps() { return fGLCaps.get(); }
@@ -27,9 +27,9 @@ diff -ur skia.org/src/gpu/ganesh/gl/GrGLContext.h
skia/src/gpu/ganesh/gl/GrGLCon
const GrGLExtensions& extensions() const { return
fInterface->fExtensions; }
diff -ur skia.org/src/gpu/ganesh/gl/GrGLGpu.h skia/src/gpu/ganesh/gl/GrGLGpu.h
---- skia.org/src/gpu/ganesh/gl/GrGLGpu.h 2024-10-04 15:33:38.116875769
+0200
-+++ skia/src/gpu/ganesh/gl/GrGLGpu.h 2024-10-04 15:35:07.627445512 +0200
-@@ -291,6 +291,7 @@
+--- skia.org/src/gpu/ganesh/gl/GrGLGpu.h 2024-10-10 14:54:07.529413537
+0200
++++ skia/src/gpu/ganesh/gl/GrGLGpu.h 2024-10-10 14:54:20.569505434 +0200
+@@ -343,6 +343,7 @@
// compatible stencil format, or negative if there is no compatible
stencil format.
int getCompatibleStencilIndex(GrGLFormat format);
@@ -37,7 +37,7 @@ diff -ur skia.org/src/gpu/ganesh/gl/GrGLGpu.h
skia/src/gpu/ganesh/gl/GrGLGpu.h
GrBackendFormat getPreferredStencilFormat(const GrBackendFormat& format)
override {
int idx =
this->getCompatibleStencilIndex(GrBackendFormats::AsGLFormat(format));
if (idx < 0) {
-@@ -299,6 +300,7 @@
+@@ -351,6 +352,7 @@
return
GrBackendFormats::MakeGL(GrGLFormatToEnum(this->glCaps().stencilFormats()[idx]),
GR_GL_TEXTURE_NONE);
}
diff --git a/external/skia/share-grcontext.patch.1
b/external/skia/share-grcontext.patch.1
index e627539a013a..20f410b48bc9 100644
--- a/external/skia/share-grcontext.patch.1
+++ b/external/skia/share-grcontext.patch.1
@@ -792,7 +792,7 @@ diff -ur skia.org/tools/window/WindowContext.h
skia/tools/window/WindowContext.h
@@ -10,9 +10,9 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkSurfaceProps.h"
- #include "include/gpu/GrTypes.h"
+ #include "include/gpu/ganesh/GrTypes.h"
+#include "include/gpu/GrDirectContext.h"
#include "tools/window/DisplayParams.h"
