update to skia m123

Change-Id: Ic7687add0fce85b17bf77b003137649bc7be9042
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174703
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 10 insertions, 31 deletions

diff --git a/download.lst b/download.lst
index 64069403bca1..98810dbf4588 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 := 68a0bb515b8834a93a7bc5b49d1a0d789be0bd92ac2b7c2a60a99dac41d12f9d
-SKIA_TARBALL := skia-m122-256631b5cc1d91e84811e2ded209d999515618f1.tar.xz
+SKIA_SHA256SUM := b14a960166f9a87f96287f7f1809152c658e4187a1159f876f174379c4032c66
+SKIA_TARBALL := skia-m123-4a0a5e99062a105b3d8f3f819f1579f776897171.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 64d74d531d8f..b63c2f4ae392 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -466,7 +466,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/core/SkScan_Antihair \
     UnpackedTarball/skia/src/core/SkScan_Hairline \
     UnpackedTarball/skia/src/core/SkScan_Path \
-    UnpackedTarball/skia/src/core/SkScan_SAAPath \
     UnpackedTarball/skia/src/core/SkSpecialImage \
     UnpackedTarball/skia/src/core/SkSpriteBlitter_ARGB32 \
     UnpackedTarball/skia/src/core/SkStream \
@@ -757,6 +756,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/sksl/transform/SkSLEliminateEmptyStatements \
     UnpackedTarball/skia/src/sksl/transform/SkSLEliminateUnreachableCode \
     UnpackedTarball/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinFunctions \
+    UnpackedTarball/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinStructs \
     UnpackedTarball/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinVariables \
     UnpackedTarball/skia/src/sksl/transform/SkSLHoistSwitchVarDeclarationsAtTopLevel \
     UnpackedTarball/skia/src/sksl/transform/SkSLRenamePrivateSymbols \
@@ -1232,7 +1232,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
     UnpackedTarball/skia/src/opts/SkOpts_hsw \
     UnpackedTarball/skia/src/core/SkSwizzler_opts_hsw \
     UnpackedTarball/skia/src/core/SkBlitRow_opts_hsw \
-    UnpackedTarball/skia/src/core/SkBitmapProcState_opts_hsw \
 	UnpackedTarball/skia/modules/skcms/src/skcms_TransformHsw, \
 	$(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C) $(CXXFLAGS_INTRINSICS_FMA) \
 	$(LO_CLANG_CXXFLAGS_INTRINSICS_AVX2) $(LO_CLANG_CXXFLAGS_INTRINSICS_F16C) $(LO_CLANG_CXXFLAGS_INTRINSICS_FMA) \
diff --git a/external/skia/clang-attributes-warning.patch.1 b/external/skia/clang-attributes-warning.patch.1
index fa617c4e831f..6e6c34674734 100644
--- a/external/skia/clang-attributes-warning.patch.1
+++ b/external/skia/clang-attributes-warning.patch.1
@@ -12,9 +12,9 @@ diff -ur skia.org/include/private/base/SkFloatingPoint.h skia/include/private/ba
      return static_cast<float>(x);
  }
 @@ -161,12 +163,16 @@
-
- // IEEE defines how float divide behaves for non-finite values and zero-denoms, but C does not,
- // so we have a helper that suppresses the possible undefined-behavior warnings.
+ #pragma warning( disable : 4723)
+ #endif
+ // Your function
 +#if defined(__clang__)
  SK_NO_SANITIZE("float-divide-by-zero")
 +#endif
diff --git a/external/skia/fix-pch.patch.1 b/external/skia/fix-pch.patch.1
index fa449941171e..235b63be6908 100644
--- a/external/skia/fix-pch.patch.1
+++ b/external/skia/fix-pch.patch.1
@@ -2,13 +2,13 @@ diff --git a/include/private/SkColorData.h b/include/private/SkColorData.h
 index a59e7b0446..960b4c0313 100644
 --- a/include/private/SkColorData.h
 +++ b/include/private/SkColorData.h
-@@ -438,4 +438,6 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity,
+@@ -382,4 +382,6 @@ constexpr SkPMColor4f SK_PMColor4fILLEGAL = { SK_FloatNegativeInfinity,
+                                               SK_FloatNegativeInfinity,
                                                SK_FloatNegativeInfinity,
                                                SK_FloatNegativeInfinity };
- 
 +template <> uint32_t SkPMColor4f::toBytes_RGBA() const;
 +
- #endif
+ #endif  // SkColorData_DEFINED
 diff --git a/src/core/SkM44.cpp b/src/core/SkM44.cpp
 index 02b1741763..4cece999d2 100644
 --- a/src/core/SkM44.cpp
@@ -34,26 +34,6 @@ index 70c7f0ea80..ab8319a447 100644
  
  #ifdef VK_USE_PLATFORM_WIN32_KHR
  // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW
-diff --git a/src/sksl/ir/SkSLPoison.h b/src/sksl/ir/SkSLPoison.h
-index 035f94e1f6..3cf12db902 100644
---- a/src/sksl/ir/SkSLPoison.h
-+++ b/src/sksl/ir/SkSLPoison.h
-@@ -5,6 +5,9 @@
-  * found in the LICENSE file.
-  */
- 
-+#ifndef SKSL_POISON
-+#define SKSL_POISON
-+
- #include "src/sksl/SkSLBuiltinTypes.h"
- #include "src/sksl/SkSLCompiler.h"
- #include "src/sksl/SkSLContext.h"
-@@ -38,3 +41,5 @@ private:
- };
- 
- } // namespace SkSL
-+
-+#endif
 diff --git a/src/utils/win/SkDWriteGeometrySink.h b/src/utils/win/SkDWriteGeometrySink.h
 index af4909aaaf..825ec35c83 100644
 --- a/src/utils/win/SkDWriteGeometrySink.h
diff --git a/external/skia/fix-without-gl.patch.1 b/external/skia/fix-without-gl.patch.1
index 1f78e3ebe22d..cdc89df8efa4 100644
--- a/external/skia/fix-without-gl.patch.1
+++ b/external/skia/fix-without-gl.patch.1
@@ -2,7 +2,7 @@ diff -ur skia.org/include/gpu/gl/GrGLInterface.h skia/include/gpu/gl/GrGLInterfa
 --- 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 @@
-
+     GrGLStandard fStandard;
      GrGLExtensions fExtensions;
 
 +#ifdef SK_GL