Merge remote-tracking branch 'refs/remotes/upstream/main'

# Conflicts:
#	.github/workflows/build.yml

.github/workflows/build.yml

@@ -13,12 +13,12 @@ on:
         default: 'false'
 
 env:
-  version: m116-47d3027-1
+  version: m126-1d69d9b-1
 
 jobs:
   macos:
     if: ${{ false }} # Disable macOS build for now
-    runs-on: ${{ fromJson('{"macos":"macos-11","ios":"macos-11","iosSim":"macos-11","tvos":"macos-13","tvosSim":"macos-13"}')[matrix.target] }}
+    runs-on: ${{ fromJson('{"macos":"macos-13","ios":"macos-13","iosSim":"macos-13","tvos":"macos-13","tvosSim":"macos-13"}')[matrix.target] }}
     strategy:
       matrix:
         target: ["macos", "ios", "iosSim", "tvos", "tvosSim"]

README.md

@@ -16,15 +16,15 @@ Prebuilt binaries can be found [in releases](https://github.com/silenium-dev/ski
 ## Building locally
 
 ```sh
-python3 script/checkout.py --version m116-47d3027-1
+python3 script/checkout.py --version m126-1d69d9b-1
 python3 script/build.py
-python3 script/archive.py --version m116-47d3027-1
+python3 script/archive.py --version m126-1d69d9b-1
 ```
 
 To build a debug build:
 
 ```sh
-python3 script/checkout.py --version m116-47d3027-1
+python3 script/checkout.py --version m126-1d69d9b-1
 python3 script/build.py --build-type Debug
-python3 script/archive.py --version m116-47d3027-1 --build-type Debug
+python3 script/archive.py --version m126-1d69d9b-1 --build-type Debug
 ```

script/build.py

@@ -115,7 +115,7 @@ def main():
         'skia_enable_tools=false',
         'skia_enable_fontmgr_custom_directory=false',
         'skia_enable_fontmgr_custom_embedded=true',
-        'skia_enable_fontmgr_custom_empty=false',
+        'skia_enable_fontmgr_custom_empty=true',
         'skia_use_webgl=true',
         'skia_gl_standard="webgl"',
         'skia_use_gl=true',