M145 public

.github/workflows/ci.yml

@@ -15,19 +15,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-13]
+        os: [ubuntu-22.04, windows-2022, macos-15-intel]
         arch: [auto64]
-        cp: ["cp3{10,11,12,13}"]
+        cp: ["cp3{10,11,12,13,14}"]
         include:
-          - os: macos-13
+          - os: macos-14
             arch: arm64
-            cp: "cp3{10,11,12,13}"
+            cp: "cp3{10,11,12,13,14}"
           - os: ubuntu-22.04-arm
             arch: aarch64
-            cp: "cp3{10,11,12,13}"
+            cp: "cp3{10,11,12,13,14}"
           - os: windows-11-arm
             arch: ARM64
-            cp: "cp3{11,12,13}"
+            cp: "cp3{11,12,13,14}"
 
     steps:
       - uses: actions/checkout@v4
@@ -66,11 +66,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-13]
+        os: [ubuntu-22.04, windows-2022, macos-15-intel]
         arch: [auto64]
         cp: ["cp3{8,9}"]
         include:
-          - os: macos-13
+          - os: macos-14
             arch: arm64
             cp: "cp3{8,9}"
           - os: ubuntu-22.04-arm
@@ -127,6 +127,7 @@ jobs:
       - name: Build docs
         run: |
           # installing libegl1 will also install libegl-mesa0
+          sudo apt-get -y update
           sudo apt-get -y install libegl1
           python -m pip install --pre -f dist skia-python
           python -m pip install sphinx sphinx-rtd-theme
@@ -174,8 +175,13 @@ jobs:
           submodules: recursive
        - run: bash scripts/build_Linux.sh
        - run: python -m build --wheel
+       - uses: actions/upload-artifact@v4
+         with:
+           name: wheel-fedora-42
+           path: ./dist/*.whl
        - run: python -m pip install dist/*.whl
        - run: python -m pip install moderngl
+       - run: python -c 'import skia; print(skia.__version__)'
        - run: python -c 'import moderngl; moderngl_context = moderngl.create_standalone_context(backend="egl"); import skia; interface = skia.GrGLInterface.MakeEGL() ; assert isinstance(skia.GrDirectContext.MakeGL(interface), skia.GrContext) ; print("Success3")'
        - run: eglinfo || /bin/true
        - run: xvfb-run -s "-screen 0 640x480x24" glxinfo

patch/0001-Conditionally-include-SkGradientShader.h.patch

@@ -0,0 +1,114 @@
+From 075316994c97ee86961b369bb2bff246aaa9d6c4 Mon Sep 17 00:00:00 2001
+From: Ben Wagner <bungeman@google.com>
+Date: Fri, 2 Jan 2026 10:14:39 -0500
+Subject: [PATCH] Conditionally include SkGradientShader.h
+
+User builds still set `SK_SUPPORT_LEGACY_UNSPANNED_GRADIENTS` globally.
+
+Change-Id: I868ade904ed15a5a84e97630502ebfa979d41621
+Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1134418
+Reviewed-by: Florin Malita <fmalita@google.com>
+Commit-Queue: Ben Wagner <bungeman@google.com>
+Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net>
+---
+ include/effects/SkGradientShader.h                 | 4 ----
+ include/gpu/graphite/precompile/PrecompileShader.h | 4 ++++
+ src/shaders/gradients/SkConicalGradient.cpp        | 4 ++++
+ src/shaders/gradients/SkLinearGradient.cpp         | 4 ++++
+ src/shaders/gradients/SkRadialGradient.cpp         | 4 ++++
+ src/shaders/gradients/SkSweepGradient.cpp          | 4 ++++
+ 6 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/include/effects/SkGradientShader.h b/include/effects/SkGradientShader.h
+index e633d68e3b..578ef0aef2 100644
+--- a/include/effects/SkGradientShader.h
++++ b/include/effects/SkGradientShader.h
+@@ -22,10 +22,6 @@
+ #include <cstdint>
+ #include <utility>
+
+-#ifndef SK_SUPPORT_LEGACY_UNSPANNED_GRADIENTS
+-#define SK_SUPPORT_LEGACY_UNSPANNED_GRADIENTS
+-#endif
+-
+ class SkMatrix;
+
+ /** \class SkGradientShader
+diff --git a/include/gpu/graphite/precompile/PrecompileShader.h b/include/gpu/graphite/precompile/PrecompileShader.h
+index d85a8a6e3e..d04b780a7c 100644
+--- a/include/gpu/graphite/precompile/PrecompileShader.h
++++ b/include/gpu/graphite/precompile/PrecompileShader.h
+@@ -14,7 +14,10 @@
+ #include "include/core/SkImageInfo.h"
+ #include "include/effects/SkGradient.h"
+
++#ifdef SK_SUPPORT_LEGACY_UNSPANNED_GRADIENTS
+ #include "include/effects/SkGradientShader.h"
++#endif
++
+ class SkColorSpace;
+
+ namespace skgpu::graphite {
+diff --git a/src/shaders/gradients/SkConicalGradient.cpp b/src/shaders/gradients/SkConicalGradient.cpp
+index ab368b6af6..0e65e02f64 100644
+--- a/src/shaders/gradients/SkConicalGradient.cpp
++++ b/src/shaders/gradients/SkConicalGradient.cpp
+@@ -29,7 +29,10 @@
+ #include <cstdint>
+ #include <utility>
+
++#ifdef SK_SUPPORT_LEGACY_UNSPANNED_GRADIENTS
+ #include "include/effects/SkGradientShader.h"
++#endif
++
+ bool SkConicalGradient::FocalData::set(SkScalar r0, SkScalar r1, SkMatrix* matrix) {
+     fIsSwapped = false;
+     fFocalX = sk_ieee_float_divide(r0, (r0 - r1));
+diff --git a/src/shaders/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp
+index e515e9f0d3..e2adc0ad40 100644
+--- a/src/shaders/gradients/SkLinearGradient.cpp
++++ b/src/shaders/gradients/SkLinearGradient.cpp
+@@ -23,7 +23,10 @@
+ #include <cstdint>
+ #include <utility>
+
++#ifdef SK_SUPPORT_LEGACY_UNSPANNED_GRADIENTS
+ #include "include/effects/SkGradientShader.h"
++#endif
++
+ class SkArenaAlloc;
+ class SkRasterPipeline;
+ enum class SkTileMode;
+diff --git a/src/shaders/gradients/SkRadialGradient.cpp b/src/shaders/gradients/SkRadialGradient.cpp
+index 8837651c27..016c82e13d 100644
+--- a/src/shaders/gradients/SkRadialGradient.cpp
++++ b/src/shaders/gradients/SkRadialGradient.cpp
+@@ -23,7 +23,10 @@
+ #include <cstdint>
+ #include <utility>
+
++#ifdef SK_SUPPORT_LEGACY_UNSPANNED_GRADIENTS
+ #include "include/effects/SkGradientShader.h"
++#endif
++
+ class SkArenaAlloc;
+ enum class SkTileMode;
+
+diff --git a/src/shaders/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp
+index 411f42658e..6c53ba3fe5 100644
+--- a/src/shaders/gradients/SkSweepGradient.cpp
++++ b/src/shaders/gradients/SkSweepGradient.cpp
+@@ -28,7 +28,10 @@
+ #include <tuple>
+ #include <utility>
+
++#ifdef SK_SUPPORT_LEGACY_UNSPANNED_GRADIENTS
+ #include "include/effects/SkGradientShader.h"
++#endif
++
+ class SkArenaAlloc;
+
+ SkSweepGradient::SkSweepGradient(const SkPoint& center,
+-- 
+2.52.0
+

patch/0001-Disable-OpenGL-for-Windows-on-ARM64.patch

@@ -33,19 +33,19 @@ index ef913e9..33f3208 100644
        sources += [ "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ]
      }
 @@ -2185,10 +2187,10 @@ if (skia_enable_tools) {
-           "tools/gpu/gl/win/SkWGL.h",
-           "tools/gpu/gl/win/SkWGL_win.cpp",
-         ]
--      libs += [
--        "Gdi32.lib",
--        "OpenGL32.lib",
--        ]
-+        libs += [ "Gdi32.lib" ]
-+        if (target_cpu != "arm64") {
-+          libs += [ "OpenGL32.lib" ]
-+        }
+             "tools/ganesh/gl/win/SkWGL.h",
+             "tools/ganesh/gl/win/SkWGL_win.cpp",
+           ]
+-        libs += [
+-          "Gdi32.lib",
+-          "OpenGL32.lib",
+-          ]
++          libs += [ "Gdi32.lib" ]
++          if (target_cpu != "arm64") {
++            libs += [ "OpenGL32.lib" ]
++          }
+         }
        }
-     }
 
 diff --git b/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp a/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp
 index f33f2e1..da3cbe2 100644
@@ -70,26 +70,26 @@ index f33f2e1..da3cbe2 100644
 +#endif // ARM64
 +
  #endif // SK_DISABLE_LEGACY_GL_MAKE_NATIVE_INTERFACE
-diff --git b/tools/gpu/gl/win/SkWGL_win.cpp a/tools/gpu/gl/win/SkWGL_win.cpp
+diff --git b/tools/ganesh/gl/win/SkWGL_win.cpp a/tools/ganesh/gl/win/SkWGL_win.cpp
 index 4cb462b..ac2d700 100644
---- b/tools/gpu/gl/win/SkWGL_win.cpp
-+++ a/tools/gpu/gl/win/SkWGL_win.cpp
+--- b/tools/ganesh/gl/win/SkWGL_win.cpp
++++ a/tools/ganesh/gl/win/SkWGL_win.cpp
 @@ -6,7 +6,7 @@
   */
 
  #include "include/core/SkTypes.h"
 -#if defined(SK_BUILD_FOR_WIN) && !defined(WINUWP)
 +#if defined(SK_BUILD_FOR_WIN) && !defined(_M_ARM64) && !defined(WINUWP)
 
- #include "tools/gpu/gl/win/SkWGL.h"
+ #include "tools/ganesh/gl/win/SkWGL.h"
 
-diff --git b/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp a/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
+diff --git b/tools/ganesh/gl/win/CreatePlatformGLTestContext_win.cpp a/tools/ganesh/gl/win/CreatePlatformGLTestContext_win.cpp
 index cb62daf..0d29da7 100644
---- b/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
-+++ a/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
+--- b/tools/ganesh/gl/win/CreatePlatformGLTestContext_win.cpp
++++ a/tools/ganesh/gl/win/CreatePlatformGLTestContext_win.cpp
 @@ -8,6 +8,16 @@
 
- #include "tools/gpu/gl/GLTestContext.h"
+ #include "tools/ganesh/gl/GLTestContext.h"
 
 +#if defined(_M_ARM64)
 +
@@ -103,7 +103,7 @@ index cb62daf..0d29da7 100644
 +
  #include <windows.h>
  #include <GL/GL.h>
- #include "tools/gpu/gl/win/SkWGL.h"
+ #include "tools/ganesh/gl/win/SkWGL.h"
 @@ -221,3 +231,4 @@ GLTestContext* CreatePlatformGLTestContext(GrGLStandard forcedGpuAPI,
  }
  }  // namespace sk_gpu_test

patch/0001-Proper-copy-and-move-for-path-classes.patch

@@ -0,0 +1,141 @@
+From e9b3264ade0c0e520d32df1ad00184de9640851b Mon Sep 17 00:00:00 2001
+From: Ben Wagner <bungeman@google.com>
+Date: Thu, 8 Jan 2026 12:12:56 -0500
+Subject: [PATCH] Proper copy and move for path classes
+
+SkPathBuilder and SkPath should be movable (avoids extra work in both
+cases) and the default implementations should not be inline as they are
+not trivial.
+
+Change-Id: I31ee6b2b775c83e0b681e1dc6c2c1cf1357c8724
+Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1138116
+Reviewed-by: Florin Malita <fmalita@google.com>
+Auto-Submit: Ben Wagner <bungeman@google.com>
+Commit-Queue: Ben Wagner <bungeman@google.com>
+Commit-Queue: Florin Malita <fmalita@google.com>
+Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net>
+---
+ include/core/SkPath.h        |  6 ++++--
+ include/core/SkPathBuilder.h | 10 ++++++----
+ src/core/SkPathBuilder.cpp   |  9 ++++++---
+ src/core/SkPath_pathdata.cpp | 18 ++++--------------
+ 4 files changed, 20 insertions(+), 23 deletions(-)
+
+diff --git a/include/core/SkPath.h b/include/core/SkPath.h
+index 7a433f7a82..192a0d3c81 100644
+--- a/include/core/SkPath.h
++++ b/include/core/SkPath.h
+@@ -142,7 +142,8 @@ public:
+
+         example: https://fiddle.skia.org/c/@Path_copy_const_SkPath
+     */
+-    SkPath(const SkPath& path);
++    SkPath(const SkPath&);
++    SkPath(SkPath&&);
+
+     /** Releases ownership of any shared data and deletes data if SkPath is sole owner.
+
+@@ -169,7 +170,8 @@ public:
+
+         example: https://fiddle.skia.org/c/@Path_copy_operator
+     */
+-    SkPath& operator=(const SkPath& path);
++    SkPath& operator=(const SkPath&);
++    SkPath& operator=(SkPath&&);
+
+     /** Compares a and b; returns true if SkPath::FillType, verb array, SkPoint array, and weights
+         are equivalent.
+diff --git a/include/core/SkPathBuilder.h b/include/core/SkPathBuilder.h
+index d64d221462..adc5b24f52 100644
+--- a/include/core/SkPathBuilder.h
++++ b/include/core/SkPathBuilder.h
+@@ -47,6 +47,12 @@ public:
+     */
+     SkPathBuilder();
+
++    SkPathBuilder(const SkPathBuilder&);
++    SkPathBuilder& operator=(const SkPathBuilder&);
++    SkPathBuilder(SkPathBuilder&&);
++    SkPathBuilder& operator=(SkPathBuilder&&);
++    ~SkPathBuilder();
++
+     /** Constructs an empty SkPathBuilder with the given FillType. By default, SkPathBuilder has no
+         verbs, no SkPoint, and no weights.
+
+@@ -63,9 +69,6 @@ public:
+     */
+     explicit SkPathBuilder(const SkPath& path);
+
+-    SkPathBuilder(const SkPathBuilder&) = default;
+-    ~SkPathBuilder();
+-
+     /** Sets an SkPathBuilder to be a copy of an existing SkPath.
+         Copies the FillType and replays all of the verbs from the SkPath into the SkPathBuilder.
+
+@@ -73,7 +76,6 @@ public:
+         @return      SkPathBuilder
+     */
+     SkPathBuilder& operator=(const SkPath&);
+-    SkPathBuilder& operator=(const SkPathBuilder&) = default;
+
+     bool operator==(const SkPathBuilder&) const;
+     bool operator!=(const SkPathBuilder& o) const { return !(*this == o); }
+diff --git a/src/core/SkPathBuilder.cpp b/src/core/SkPathBuilder.cpp
+index 789ab6bebe..bcab6bfff5 100644
+--- a/src/core/SkPathBuilder.cpp
++++ b/src/core/SkPathBuilder.cpp
+@@ -52,6 +52,12 @@ SkPathBuilder::SkPathBuilder() {
+     this->reset();
+ }
+
++SkPathBuilder::SkPathBuilder(const SkPathBuilder&) = default;
++SkPathBuilder& SkPathBuilder::operator=(const SkPathBuilder&) = default;
++SkPathBuilder::SkPathBuilder(SkPathBuilder&&) = default;
++SkPathBuilder& SkPathBuilder::operator=(SkPathBuilder&&) = default;
++SkPathBuilder::~SkPathBuilder() = default;
++
+ SkPathBuilder::SkPathBuilder(SkPathFillType ft) {
+     this->reset();
+     fFillType = ft;
+@@ -61,9 +67,6 @@ SkPathBuilder::SkPathBuilder(const SkPath& src) {
+     *this = src;
+ }
+
+-SkPathBuilder::~SkPathBuilder() {
+-}
+-
+ SkPathBuilder& SkPathBuilder::reset() {
+     fPts.clear();
+     fVerbs.clear();
+diff --git a/src/core/SkPath_pathdata.cpp b/src/core/SkPath_pathdata.cpp
+index a38d184702..1005dc7624 100644
+--- a/src/core/SkPath_pathdata.cpp
++++ b/src/core/SkPath_pathdata.cpp
+@@ -57,20 +57,10 @@ SkPath::SkPath(SkPathFillType ft)
+     , fIsVolatile(false)
+ {}
+
+-SkPath::SkPath(const SkPath& that)
+-    : fPathData(that.fPathData)
+-    , fFillType(that.fFillType)
+-    , fIsVolatile(that.fIsVolatile)
+-{}
+-
+-SkPath& SkPath::operator=(const SkPath& o) {
+-    if (this != &o) {
+-        fPathData   = o.fPathData;
+-        fFillType   = o.fFillType;
+-        fIsVolatile = o.fIsVolatile;
+-    }
+-    return *this;
+-}
++SkPath::SkPath(const SkPath&) = default;
++SkPath& SkPath::operator=(const SkPath&) = default;
++SkPath::SkPath(SkPath&&) = default;
++SkPath& SkPath::operator=(SkPath&&) = default;
+
+ void SkPath::setConvexity(SkPathConvexity c) const {
+     fPathData->setConvexity(c);
+-- 
+2.52.0
+