M143 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
@@ -55,6 +55,7 @@ jobs:
           CIBW_TEST_SKIP: "*-macosx_arm64"
 
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           name: wheel-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.cp }}
           path: ./wheelhouse/*.whl
@@ -66,11 +67,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
@@ -103,6 +104,7 @@ jobs:
           CIBW_TEST_SKIP: "*-macosx_arm64"
 
       - uses: actions/upload-artifact@v4
+        if: always()
         with:
           name: wheel-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.cp }}
           path: ./wheelhouse/*.whl
@@ -127,6 +129,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,6 +177,10 @@ 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 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")'

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-Reland-Make-SkPath-immutable-on-GN-build.patch

@@ -0,0 +1,81 @@
+From f352da2d607fffd2629ba408d1c9fb0da8c49c60 Mon Sep 17 00:00:00 2001
+From: Kaylee Lubick <kjlubick@google.com>
+Date: Fri, 24 Oct 2025 14:25:24 -0700
+Subject: [PATCH] Reland "Make SkPath immutable on GN build"
+
+This reverts commit a01eb11751829966ffe9925388e47f85ce585870.
+
+Reason for revert: CanvasKit updated, PathKit deleted, WasmGM tests disabled
+
+Original change's description:
+> Revert "Make SkPath immutable on GN build"
+>
+> This reverts commit 832f6e513d41ec0b268dc1596169312b37f7a182.
+>
+> Reason for revert: Breaking Ubuntu builds
+>
+> Original change's description:
+> > Make SkPath immutable on GN build
+> >
+> > Our clients don't use our GN files directly, so we can set the
+> > define here and it should not bleed into those builds.
+> >
+> > Change-Id: Ia991a3075d2f551d8b264b1629548e21f0cbe303
+> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1074076
+> > Auto-Submit: Kaylee Lubick <kjlubick@google.com>
+> > Reviewed-by: Eric Boren <borenet@google.com>
+> > Commit-Queue: Eric Boren <borenet@google.com>
+>
+> No-Presubmit: true
+> No-Tree-Checks: true
+> No-Try: true
+> Change-Id: If5b99e4b73506bc5f31a189f0a9c3462486642bb
+> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1078196
+> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
+> Commit-Queue: Thomas Smith <thomsmit@google.com>
+
+Change-Id: I6caa8371ca86eeb51d8406bad9586f341ffac1e0
+Reviewed-on: https://skia-review.googlesource.com/c/skia/+/1084436
+Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
+Commit-Queue: Kaylee Lubick <kjlubick@google.com>
+Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net>
+---
+ BUILD.gn       | 3 +++
+ gn/gn_to_bp.py | 7 ++++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/BUILD.gn b/BUILD.gn
+index 0fd3c5f93d..7645bf3dca 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -23,6 +23,9 @@ config("skia_public") {
+   defines = [
+     "SK_CODEC_DECODES_BMP",
+     "SK_CODEC_DECODES_WBMP",
++
++    # TODO(kjlubick,fmalita) Remove when clients updated and APIs deleted.
++    "SK_HIDE_PATH_EDIT_METHODS",
+   ]
+   cflags_objcc = []
+   if (is_component_build) {
+diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py
+index 24195d2eea..2bbe758676 100755
+--- a/gn/gn_to_bp.py
++++ b/gn/gn_to_bp.py
+@@ -771,7 +771,12 @@ here = os.path.dirname(__file__)
+ defs = gn_to_bp_utils.GetArchSources(os.path.join(here, 'opts.gni'))
+
+ def get_defines(json):
+-  return {str(d) for d in json['targets']['//:skia']['defines']}
++  defines = {str(d) for d in json['targets']['//:skia']['defines']}
++  # TODO(kjlubick, fmalita) Add this back in to enforce Android doesn't
++  # use these methods anymore.
++  defines.remove("SK_HIDE_PATH_EDIT_METHODS")
++  return defines
++
+ android_defines      = get_defines(js)
+ linux_defines        = get_defines(js_linux)
+ mac_defines          = get_defines(js_mac)
+-- 
+2.52.0
+

patch/fetch-gn-windows-arm64.diff

@@ -0,0 +1,11 @@
+--- a/bin/fetch-gn.orig	2025-08-11 19:21:42.666070053 +0100
++++ b/bin/fetch-gn	2025-08-11 19:23:01.381159842 +0100
+@@ -20,7 +20,7 @@
+ gnzip = os.path.join(tempfile.mkdtemp(), 'gn.zip')
+ with open(gnzip, 'wb') as f:
+   OS  = {'darwin': 'mac', 'linux': 'linux', 'linux2': 'linux', 'win32': 'windows'}[sys.platform]
+-  cpu = {'aarch64': 'arm64', 'amd64': 'amd64', 'arm64': 'arm64', 'x86_64': 'amd64'}[platform.machine().lower()]
++  cpu = {'aarch64': 'arm64', 'amd64': 'amd64', 'arm64': 'amd64', 'x86_64': 'amd64'}[platform.machine().lower()]
+
+   rev = 'b2afae122eeb6ce09c52d63f67dc53fc517dbdc8'
+   url = 'https://chrome-infra-packages.appspot.com/dl/gn/gn/{}-{}/+/git_revision:{}'.format(