feat: chrome/m123

Brooooooklyn · Feb 22, 2024 · 80b5323 · 80b5323
1 parent 1469a7d
commit 80b5323
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/README-zh.md b/README-zh.md
@@ -1,7 +1,7 @@
 # `skr canvas`
 
 ![CI](https://github.com/Brooooooklyn/canvas/workflows/CI/badge.svg)
-![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm122-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm123-hotpink)
 [![install size](https://packagephobia.com/badge?p=@napi-rs/canvas)](https://packagephobia.com/result?p=@napi-rs/canvas)
 [![Downloads](https://img.shields.io/npm/dm/@napi-rs/canvas.svg?sanitize=true)](https://npmcharts.com/compare/@napi-rs/canvas?minimal=true)
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # `skr canvas`
 
 ![CI](https://github.com/Brooooooklyn/canvas/workflows/CI/badge.svg)
-![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm122-hotpink)
+![Skia Version](https://img.shields.io/badge/Skia-chrome%2Fm123-hotpink)
 [![install size](https://packagephobia.com/badge?p=@napi-rs/canvas)](https://packagephobia.com/result?p=@napi-rs/canvas)
 [![Downloads](https://img.shields.io/npm/dm/@napi-rs/canvas.svg?sanitize=true)](https://npmcharts.com/compare/@napi-rs/canvas?minimal=true)
 

diff --git a/__test__/snapshots/draw-image-svg-noto-emoji.png b/__test__/snapshots/draw-image-svg-noto-emoji.png
diff --git a/__test__/snapshots/drawImage-svg-resize.png b/__test__/snapshots/drawImage-svg-resize.png
diff --git a/__test__/snapshots/fillText-COLRv1.png b/__test__/snapshots/fillText-COLRv1.png
diff --git a/__test__/snapshots/filter-blur.png b/__test__/snapshots/filter-blur.png
diff --git a/build.rs b/build.rs
@@ -166,14 +166,14 @@ fn main() {
                 "/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/include",
               )
               .flag("--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot");
-            println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/lib/llvm-16/lib");
+            println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/lib/llvm-18/lib");
             println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/lib");
             println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/lib");
             println!("cargo:rustc-link-search=/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5");
           }
           "x86_64" => {
-            build.include("/usr/lib/llvm-16/include/c++/v1");
-            println!("cargo:rustc-link-search=/usr/lib/llvm-16/lib");
+            build.include("/usr/lib/llvm-18/include/c++/v1");
+            println!("cargo:rustc-link-search=/usr/lib/llvm-18/lib");
           }
           "arm" => {
             let gcc_version = String::from_utf8(

diff --git a/scripts/build-skia.js b/scripts/build-skia.js
@@ -133,7 +133,7 @@ switch (PLATFORM_NAME) {
       HOST_LIBC === 'glibc' &&
       HOST_ARCH === 'x64'
     ) {
-      ExtraCflagsCC += ',"-stdlib=libc++","-static","-I/usr/lib/llvm-16/include/c++/v1"'
+      ExtraCflagsCC += ',"-stdlib=libc++","-static","-I/usr/lib/llvm-18/include/c++/v1"'
     }
     if (PLATFORM_NAME === 'linux' && (!TARGET_TRIPLE || TARGET_TRIPLE.startsWith('x86_64'))) {
       ExtraCflagsCC += ',"-Wno-psabi"'
@@ -149,9 +149,9 @@ switch (TARGET_TRIPLE) {
     ExtraCflags =
       '"--target=aarch64-unknown-linux-gnu", "--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot", "-I/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/include", "-march=armv8-a"'
     ExtraCflagsCC +=
-      ', "--target=aarch64-unknown-linux-gnu", "--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot", "-I/usr/lib/llvm-16/include/c++/v1", "-I/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/include", "-march=armv8-a"'
+      ', "--target=aarch64-unknown-linux-gnu", "--sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot", "-I/usr/lib/llvm-18/include/c++/v1", "-I/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/usr/include", "-march=armv8-a"'
     ExtraLdFlags =
-      '"-fuse-ld=lld", "-L/usr/aarch64-unknown-linux-gnu/lib/llvm-16/lib", "-L/usr/aarch64-unknown-linux-gnu/lib", "-L/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/lib", "-L/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5"'
+      '"-fuse-ld=lld", "-L/usr/aarch64-unknown-linux-gnu/lib/llvm-18/lib", "-L/usr/aarch64-unknown-linux-gnu/lib", "-L/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot/lib", "-L/usr/aarch64-unknown-linux-gnu/lib/gcc/aarch64-unknown-linux-gnu/4.8.5"'
     ExtraAsmFlags = '"--target=aarch64-unknown-linux-gnu", "-march=armv8-a"'
 
     GN_ARGS.push(

diff --git a/skia b/skia