diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 9bb664dd..2471e46f 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -36,7 +36,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Install @@ -161,7 +161,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Set up QEMU @@ -619,7 +619,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Install @@ -680,7 +680,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Install dependencies diff --git a/.github/workflows/skia.yaml b/.github/workflows/skia.yaml index baaa931e..ba28560b 100644 --- a/.github/workflows/skia.yaml +++ b/.github/workflows/skia.yaml @@ -35,7 +35,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - uses: actions/setup-python@v5 @@ -117,7 +117,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - uses: actions/setup-python@v5 @@ -162,7 +162,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Login to GitHub Container Registry @@ -191,7 +191,7 @@ jobs: build-aarch64-linux-gnu: if: "!contains(github.event.head_commit.message, 'skip skia')" - name: stable - aarch64-linux - build skia + name: stable - aarch64-linux-gnu - build skia runs-on: ubuntu-latest steps: @@ -202,7 +202,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - uses: actions/setup-python@v5 @@ -242,7 +242,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Login to GitHub Container Registry @@ -282,7 +282,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - uses: actions/setup-python@v5 @@ -306,10 +306,10 @@ jobs: - name: Install cross compile tools run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee -a /etc/apt/sources.list > /dev/null - echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee -a /etc/apt/sources.list > /dev/null + echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" | sudo tee -a /etc/apt/sources.list > /dev/null + echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" | sudo tee -a /etc/apt/sources.list > /dev/null sudo apt-get update - sudo apt-get install llvm-16 clang-16 lld-16 gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y + sudo apt-get install llvm-18 clang-18 lld-18 gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker buildx build --load --platform linux/arm/v7 -t ubuntu:jammy-armv7 . -f jammy-armv7.Dockerfile docker run --rm -dt --name ubuntu-jammy-armv7 ubuntu:jammy-armv7 @@ -343,7 +343,7 @@ jobs: - name: Setup node uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - uses: actions/setup-python@v5 diff --git a/README-zh.md b/README-zh.md index ea6314f6..2686b060 100644 --- 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 index 16b564f9..cbfa8c07 100644 --- 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__/regression.spec.ts b/__test__/regression.spec.ts index 98c1309e..698f5e62 100644 --- a/__test__/regression.spec.ts +++ b/__test__/regression.spec.ts @@ -188,7 +188,7 @@ test('draw-svg-with-text', async (t) => { const Arrow = new Image() Arrow.src = await fs.readFile(join(__dirname, 'image-og.svg')) ctx.drawImage(Arrow, 80, 60) - await snapshotImage(t, { ctx, canvas }, 'png', process.arch === 'x64' && process.platform !== 'darwin' ? 0.015 : 0.3) + await snapshotImage(t, { ctx, canvas }, 'png', process.arch === 'x64' && process.platform !== 'darwin' ? 0.15 : 0.3) }) test('DOMMatrix::transformPoint', (t) => { diff --git a/__test__/snapshots/arc.png b/__test__/snapshots/arc.png index 1e420c02..cfa658ca 100644 Binary files a/__test__/snapshots/arc.png and b/__test__/snapshots/arc.png differ diff --git a/__test__/snapshots/arcTo-colorful.png b/__test__/snapshots/arcTo-colorful.png index c71f60b6..b24dff29 100644 Binary files a/__test__/snapshots/arcTo-colorful.png and b/__test__/snapshots/arcTo-colorful.png differ diff --git a/__test__/snapshots/arcTo.png b/__test__/snapshots/arcTo.png index c6808319..04648ca5 100644 Binary files a/__test__/snapshots/arcTo.png and b/__test__/snapshots/arcTo.png differ diff --git a/__test__/snapshots/beginPath.png b/__test__/snapshots/beginPath.png index 27939603..0162f687 100644 Binary files a/__test__/snapshots/beginPath.png and b/__test__/snapshots/beginPath.png differ diff --git a/__test__/snapshots/bezierCurveTo-colorful.png b/__test__/snapshots/bezierCurveTo-colorful.png index 70fd233d..939e41bf 100644 Binary files a/__test__/snapshots/bezierCurveTo-colorful.png and b/__test__/snapshots/bezierCurveTo-colorful.png differ diff --git a/__test__/snapshots/bezierCurveTo.png b/__test__/snapshots/bezierCurveTo.png index 9fdd7ed2..096b8f60 100644 Binary files a/__test__/snapshots/bezierCurveTo.png and b/__test__/snapshots/bezierCurveTo.png differ diff --git a/__test__/snapshots/clearRect.png b/__test__/snapshots/clearRect.png index ea99ce1c..26d78e98 100644 Binary files a/__test__/snapshots/clearRect.png and b/__test__/snapshots/clearRect.png differ diff --git a/__test__/snapshots/clip.png b/__test__/snapshots/clip.png index 5e3e50ab..3aedc5d5 100644 Binary files a/__test__/snapshots/clip.png and b/__test__/snapshots/clip.png differ diff --git a/__test__/snapshots/closePath-arc.png b/__test__/snapshots/closePath-arc.png index 017c9f3b..28939a80 100644 Binary files a/__test__/snapshots/closePath-arc.png and b/__test__/snapshots/closePath-arc.png differ diff --git a/__test__/snapshots/closePath.png b/__test__/snapshots/closePath.png index e739135c..bc999c7b 100644 Binary files a/__test__/snapshots/closePath.png and b/__test__/snapshots/closePath.png differ diff --git a/__test__/snapshots/composition-destination-in.png b/__test__/snapshots/composition-destination-in.png index 27aa640e..a49ad158 100644 Binary files a/__test__/snapshots/composition-destination-in.png and b/__test__/snapshots/composition-destination-in.png differ diff --git a/__test__/snapshots/composition-source-in.png b/__test__/snapshots/composition-source-in.png index 6e737bfb..187bc0ab 100644 Binary files a/__test__/snapshots/composition-source-in.png and b/__test__/snapshots/composition-source-in.png differ diff --git a/__test__/snapshots/createConicGradient.png b/__test__/snapshots/createConicGradient.png index f822431a..06b9331c 100644 Binary files a/__test__/snapshots/createConicGradient.png and b/__test__/snapshots/createConicGradient.png differ diff --git a/__test__/snapshots/createPattern-no-transform-imagedata.png b/__test__/snapshots/createPattern-no-transform-imagedata.png index 766c6059..786f1ef9 100644 Binary files a/__test__/snapshots/createPattern-no-transform-imagedata.png and b/__test__/snapshots/createPattern-no-transform-imagedata.png differ diff --git a/__test__/snapshots/createPattern-no-transform.png b/__test__/snapshots/createPattern-no-transform.png index 766c6059..786f1ef9 100644 Binary files a/__test__/snapshots/createPattern-no-transform.png and b/__test__/snapshots/createPattern-no-transform.png differ diff --git a/__test__/snapshots/createPattern-with-transform.png b/__test__/snapshots/createPattern-with-transform.png index d55e7b36..1cef6ffc 100644 Binary files a/__test__/snapshots/createPattern-with-transform.png and b/__test__/snapshots/createPattern-with-transform.png differ diff --git a/__test__/snapshots/createRadialGradient.png b/__test__/snapshots/createRadialGradient.png index 8bbb41dd..29ecd3f9 100644 Binary files a/__test__/snapshots/createRadialGradient.png and b/__test__/snapshots/createRadialGradient.png differ diff --git a/__test__/snapshots/draw-image-svg-noto-emoji.png b/__test__/snapshots/draw-image-svg-noto-emoji.png index 58f6ffe4..949865a8 100644 Binary files a/__test__/snapshots/draw-image-svg-noto-emoji.png and b/__test__/snapshots/draw-image-svg-noto-emoji.png differ diff --git a/__test__/snapshots/draw-svg-with-text.png b/__test__/snapshots/draw-svg-with-text.png index ecc1c4d8..c67ed5b6 100644 Binary files a/__test__/snapshots/draw-svg-with-text.png and b/__test__/snapshots/draw-svg-with-text.png differ diff --git a/__test__/snapshots/draw-text-center-maxWidth.png b/__test__/snapshots/draw-text-center-maxWidth.png index f029196e..8da2e7a5 100644 Binary files a/__test__/snapshots/draw-text-center-maxWidth.png and b/__test__/snapshots/draw-text-center-maxWidth.png differ diff --git a/__test__/snapshots/draw-text-maxWidth.png b/__test__/snapshots/draw-text-maxWidth.png index cb250e53..33c227e6 100644 Binary files a/__test__/snapshots/draw-text-maxWidth.png and b/__test__/snapshots/draw-text-maxWidth.png differ diff --git a/__test__/snapshots/draw-text-right-maxWidth.png b/__test__/snapshots/draw-text-right-maxWidth.png index 7d718f90..c387e972 100644 Binary files a/__test__/snapshots/draw-text-right-maxWidth.png and b/__test__/snapshots/draw-text-right-maxWidth.png differ diff --git a/__test__/snapshots/drawImage-another-Canvas.png b/__test__/snapshots/drawImage-another-Canvas.png index 6a745e50..74258ad7 100644 Binary files a/__test__/snapshots/drawImage-another-Canvas.png and b/__test__/snapshots/drawImage-another-Canvas.png differ diff --git a/__test__/snapshots/drawImage-svg-resize.png b/__test__/snapshots/drawImage-svg-resize.png index be0fc0bd..47cd1422 100644 Binary files a/__test__/snapshots/drawImage-svg-resize.png and b/__test__/snapshots/drawImage-svg-resize.png differ diff --git a/__test__/snapshots/drawImage.png b/__test__/snapshots/drawImage.png index 9ee50ef4..eaf2e5c4 100644 Binary files a/__test__/snapshots/drawImage.png and b/__test__/snapshots/drawImage.png differ diff --git a/__test__/snapshots/echarts-start.png b/__test__/snapshots/echarts-start.png index 1511517b..aa95c3da 100644 Binary files a/__test__/snapshots/echarts-start.png and b/__test__/snapshots/echarts-start.png differ diff --git a/__test__/snapshots/ellipse.png b/__test__/snapshots/ellipse.png index fff557a0..bddd2ba2 100644 Binary files a/__test__/snapshots/ellipse.png and b/__test__/snapshots/ellipse.png differ diff --git a/__test__/snapshots/fill-alpha-should-not-effect-drawImage.png b/__test__/snapshots/fill-alpha-should-not-effect-drawImage.png index 30099e35..8a37f843 100644 Binary files a/__test__/snapshots/fill-alpha-should-not-effect-drawImage.png and b/__test__/snapshots/fill-alpha-should-not-effect-drawImage.png differ diff --git a/__test__/snapshots/fill.png b/__test__/snapshots/fill.png index 860fd309..a603579d 100644 Binary files a/__test__/snapshots/fill.png and b/__test__/snapshots/fill.png differ diff --git a/__test__/snapshots/fillText-AA.png b/__test__/snapshots/fillText-AA.png index 15bfa418..4cdc9830 100644 Binary files a/__test__/snapshots/fillText-AA.png and b/__test__/snapshots/fillText-AA.png differ diff --git a/__test__/snapshots/fillText-COLRv1.png b/__test__/snapshots/fillText-COLRv1.png index 37e522c4..7e54cfd1 100644 Binary files a/__test__/snapshots/fillText-COLRv1.png and b/__test__/snapshots/fillText-COLRv1.png differ diff --git a/__test__/snapshots/fillText-line-break-as-space.png b/__test__/snapshots/fillText-line-break-as-space.png index 6cb0c227..3efbaa41 100644 Binary files a/__test__/snapshots/fillText-line-break-as-space.png and b/__test__/snapshots/fillText-line-break-as-space.png differ diff --git a/__test__/snapshots/fillText-maxWidth.png b/__test__/snapshots/fillText-maxWidth.png index aab56f43..f2e25b88 100644 Binary files a/__test__/snapshots/fillText-maxWidth.png and b/__test__/snapshots/fillText-maxWidth.png differ diff --git a/__test__/snapshots/fillText.png b/__test__/snapshots/fillText.png index 582bdc35..c2f1114b 100644 Binary files a/__test__/snapshots/fillText.png and b/__test__/snapshots/fillText.png differ diff --git a/__test__/snapshots/filter-blur.png b/__test__/snapshots/filter-blur.png index 172338b5..4f54b15a 100644 Binary files a/__test__/snapshots/filter-blur.png and b/__test__/snapshots/filter-blur.png differ diff --git a/__test__/snapshots/filter-brightness.png b/__test__/snapshots/filter-brightness.png index c8f55d8f..b99b666a 100644 Binary files a/__test__/snapshots/filter-brightness.png and b/__test__/snapshots/filter-brightness.png differ diff --git a/__test__/snapshots/filter-combine-contrast-brightness.png b/__test__/snapshots/filter-combine-contrast-brightness.png index 73b33024..c825664d 100644 Binary files a/__test__/snapshots/filter-combine-contrast-brightness.png and b/__test__/snapshots/filter-combine-contrast-brightness.png differ diff --git a/__test__/snapshots/filter-contrast-ff.png b/__test__/snapshots/filter-contrast-ff.png index 4cd0be93..ba490166 100644 Binary files a/__test__/snapshots/filter-contrast-ff.png and b/__test__/snapshots/filter-contrast-ff.png differ diff --git a/__test__/snapshots/filter-contrast.png b/__test__/snapshots/filter-contrast.png index a49150e3..f6307f6d 100644 Binary files a/__test__/snapshots/filter-contrast.png and b/__test__/snapshots/filter-contrast.png differ diff --git a/__test__/snapshots/filter-drop-shadow.png b/__test__/snapshots/filter-drop-shadow.png index 51ae0278..02ad332a 100644 Binary files a/__test__/snapshots/filter-drop-shadow.png and b/__test__/snapshots/filter-drop-shadow.png differ diff --git a/__test__/snapshots/filter-grayscale.png b/__test__/snapshots/filter-grayscale.png index 59dd2973..2562d194 100644 Binary files a/__test__/snapshots/filter-grayscale.png and b/__test__/snapshots/filter-grayscale.png differ diff --git a/__test__/snapshots/filter-hue-rotate.png b/__test__/snapshots/filter-hue-rotate.png index 8cacc274..49a564a1 100644 Binary files a/__test__/snapshots/filter-hue-rotate.png and b/__test__/snapshots/filter-hue-rotate.png differ diff --git a/__test__/snapshots/filter-invert.png b/__test__/snapshots/filter-invert.png index 9e8587c6..7faa380a 100644 Binary files a/__test__/snapshots/filter-invert.png and b/__test__/snapshots/filter-invert.png differ diff --git a/__test__/snapshots/filter-opacity.png b/__test__/snapshots/filter-opacity.png index e7888971..416bf14b 100644 Binary files a/__test__/snapshots/filter-opacity.png and b/__test__/snapshots/filter-opacity.png differ diff --git a/__test__/snapshots/filter-saturate.png b/__test__/snapshots/filter-saturate.png index c7761da2..d36cbae4 100644 Binary files a/__test__/snapshots/filter-saturate.png and b/__test__/snapshots/filter-saturate.png differ diff --git a/__test__/snapshots/filter-save-restore.png b/__test__/snapshots/filter-save-restore.png index c7f013da..7d3f7b9b 100644 Binary files a/__test__/snapshots/filter-save-restore.png and b/__test__/snapshots/filter-save-restore.png differ diff --git a/__test__/snapshots/filter-sepia.png b/__test__/snapshots/filter-sepia.png index f0057545..ef30fd09 100644 Binary files a/__test__/snapshots/filter-sepia.png and b/__test__/snapshots/filter-sepia.png differ diff --git a/__test__/snapshots/getImageData.png b/__test__/snapshots/getImageData.png index d2967434..b8fb6318 100644 Binary files a/__test__/snapshots/getImageData.png and b/__test__/snapshots/getImageData.png differ diff --git a/__test__/snapshots/global-alpha-should-effect-drawImage.png b/__test__/snapshots/global-alpha-should-effect-drawImage.png index c5482225..622b401a 100644 Binary files a/__test__/snapshots/global-alpha-should-effect-drawImage.png and b/__test__/snapshots/global-alpha-should-effect-drawImage.png differ diff --git a/__test__/snapshots/lineTo-with-invalid-point.png b/__test__/snapshots/lineTo-with-invalid-point.png index 7de175b6..ee7589dc 100644 Binary files a/__test__/snapshots/lineTo-with-invalid-point.png and b/__test__/snapshots/lineTo-with-invalid-point.png differ diff --git a/__test__/snapshots/lineTo.png b/__test__/snapshots/lineTo.png index d020707d..b71d412f 100644 Binary files a/__test__/snapshots/lineTo.png and b/__test__/snapshots/lineTo.png differ diff --git a/__test__/snapshots/moveTo.png b/__test__/snapshots/moveTo.png index b578996d..e2ea0206 100644 Binary files a/__test__/snapshots/moveTo.png and b/__test__/snapshots/moveTo.png differ diff --git a/__test__/snapshots/quadraticCurveTo.png b/__test__/snapshots/quadraticCurveTo.png index 9cc91598..810ca021 100644 Binary files a/__test__/snapshots/quadraticCurveTo.png and b/__test__/snapshots/quadraticCurveTo.png differ diff --git a/__test__/snapshots/rect.png b/__test__/snapshots/rect.png index cbd5d171..8c69569f 100644 Binary files a/__test__/snapshots/rect.png and b/__test__/snapshots/rect.png differ diff --git a/__test__/snapshots/resetTransform.png b/__test__/snapshots/resetTransform.png index 3f131ed6..26024007 100644 Binary files a/__test__/snapshots/resetTransform.png and b/__test__/snapshots/resetTransform.png differ diff --git a/__test__/snapshots/rotate.png b/__test__/snapshots/rotate.png index 1fd917e6..91f9368e 100644 Binary files a/__test__/snapshots/rotate.png and b/__test__/snapshots/rotate.png differ diff --git a/__test__/snapshots/save-restore.png b/__test__/snapshots/save-restore.png index fd4ac9fc..47ca19b6 100644 Binary files a/__test__/snapshots/save-restore.png and b/__test__/snapshots/save-restore.png differ diff --git a/__test__/snapshots/setLineDash.png b/__test__/snapshots/setLineDash.png index 38768a21..803ba470 100644 Binary files a/__test__/snapshots/setLineDash.png and b/__test__/snapshots/setLineDash.png differ diff --git a/__test__/snapshots/setTransform matrix.png b/__test__/snapshots/setTransform matrix.png index d8b69c70..660464c6 100644 Binary files a/__test__/snapshots/setTransform matrix.png and b/__test__/snapshots/setTransform matrix.png differ diff --git a/__test__/snapshots/setTransform.png b/__test__/snapshots/setTransform.png index 2bc6cfa3..32941eda 100644 Binary files a/__test__/snapshots/setTransform.png and b/__test__/snapshots/setTransform.png differ diff --git a/__test__/snapshots/shadowOffsetX.png b/__test__/snapshots/shadowOffsetX.png index 95248bb2..1d3e9fae 100644 Binary files a/__test__/snapshots/shadowOffsetX.png and b/__test__/snapshots/shadowOffsetX.png differ diff --git a/__test__/snapshots/shadowOffsetY.png b/__test__/snapshots/shadowOffsetY.png index 860e5f7c..19417750 100644 Binary files a/__test__/snapshots/shadowOffsetY.png and b/__test__/snapshots/shadowOffsetY.png differ diff --git a/__test__/snapshots/stroke.png b/__test__/snapshots/stroke.png index 8ec665df..0db24ec6 100644 Binary files a/__test__/snapshots/stroke.png and b/__test__/snapshots/stroke.png differ diff --git a/__test__/snapshots/strokeRect.png b/__test__/snapshots/strokeRect.png index f656f619..a040c3e9 100644 Binary files a/__test__/snapshots/strokeRect.png and b/__test__/snapshots/strokeRect.png differ diff --git a/__test__/snapshots/strokeRoundRect.png b/__test__/snapshots/strokeRoundRect.png index 81dc8689..ae67b85a 100644 Binary files a/__test__/snapshots/strokeRoundRect.png and b/__test__/snapshots/strokeRoundRect.png differ diff --git a/__test__/snapshots/strokeText-line-break-as-space.png b/__test__/snapshots/strokeText-line-break-as-space.png index 25212c6f..94086f49 100644 Binary files a/__test__/snapshots/strokeText-line-break-as-space.png and b/__test__/snapshots/strokeText-line-break-as-space.png differ diff --git a/__test__/snapshots/strokeText.png b/__test__/snapshots/strokeText.png index b3192182..252b17d9 100644 Binary files a/__test__/snapshots/strokeText.png and b/__test__/snapshots/strokeText.png differ diff --git a/__test__/snapshots/svg-transparent-background.png b/__test__/snapshots/svg-transparent-background.png index 7f103641..21f9cdc3 100644 Binary files a/__test__/snapshots/svg-transparent-background.png and b/__test__/snapshots/svg-transparent-background.png differ diff --git a/__test__/snapshots/text-align-center.png b/__test__/snapshots/text-align-center.png index c1c8b5bb..9909f674 100644 Binary files a/__test__/snapshots/text-align-center.png and b/__test__/snapshots/text-align-center.png differ diff --git a/__test__/snapshots/text-align-end.png b/__test__/snapshots/text-align-end.png index 4a72c926..2e4a2d0f 100644 Binary files a/__test__/snapshots/text-align-end.png and b/__test__/snapshots/text-align-end.png differ diff --git a/__test__/snapshots/text-align-left.png b/__test__/snapshots/text-align-left.png index 86385d92..70b69961 100644 Binary files a/__test__/snapshots/text-align-left.png and b/__test__/snapshots/text-align-left.png differ diff --git a/__test__/snapshots/text-align-right.png b/__test__/snapshots/text-align-right.png index 4a72c926..2e4a2d0f 100644 Binary files a/__test__/snapshots/text-align-right.png and b/__test__/snapshots/text-align-right.png differ diff --git a/__test__/snapshots/text-align-start.png b/__test__/snapshots/text-align-start.png index 86385d92..70b69961 100644 Binary files a/__test__/snapshots/text-align-start.png and b/__test__/snapshots/text-align-start.png differ diff --git a/__test__/snapshots/text-align-with-space.png b/__test__/snapshots/text-align-with-space.png index c0b5bb50..f0147c9c 100644 Binary files a/__test__/snapshots/text-align-with-space.png and b/__test__/snapshots/text-align-with-space.png differ diff --git a/__test__/snapshots/text-baseline-all.png b/__test__/snapshots/text-baseline-all.png index 5f207246..21348db3 100644 Binary files a/__test__/snapshots/text-baseline-all.png and b/__test__/snapshots/text-baseline-all.png differ diff --git a/__test__/snapshots/text-baseline.png b/__test__/snapshots/text-baseline.png index cfa430c4..f935773b 100644 Binary files a/__test__/snapshots/text-baseline.png and b/__test__/snapshots/text-baseline.png differ diff --git a/__test__/snapshots/transform-with-radial-gradient-x.png b/__test__/snapshots/transform-with-radial-gradient-x.png index 247ea223..85086b8c 100644 Binary files a/__test__/snapshots/transform-with-radial-gradient-x.png and b/__test__/snapshots/transform-with-radial-gradient-x.png differ diff --git a/__test__/snapshots/transform-with-radial-gradient.png b/__test__/snapshots/transform-with-radial-gradient.png index dd415819..1c37d8a2 100644 Binary files a/__test__/snapshots/transform-with-radial-gradient.png and b/__test__/snapshots/transform-with-radial-gradient.png differ diff --git a/__test__/snapshots/transform.png b/__test__/snapshots/transform.png index d4345d4d..08fd43ad 100644 Binary files a/__test__/snapshots/transform.png and b/__test__/snapshots/transform.png differ diff --git a/build.rs b/build.rs index f136ad54..d1cc1f17 100644 --- 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 index 76b06de8..c1ae3bff 100644 --- 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,14 +149,14 @@ 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( `extra_ldflags=[${ExtraLdFlags}]`, - `ar="llvm-ar-16"`, + `ar="llvm-ar-18"`, `extra_asmflags=[${ExtraAsmFlags}]`, `extra_cflags=[${ExtraCflags}]`, `extra_cflags_c=[${ExtraCflags}]`, @@ -189,7 +189,7 @@ switch (TARGET_TRIPLE) { GN_ARGS.push( `extra_ldflags=[${ExtraLdFlags}]`, - `ar="llvm-ar-16"`, + `ar="llvm-ar-18"`, `extra_asmflags=[${ExtraAsmFlags}]`, `extra_cflags=[${ExtraCflags}]`, `extra_cflags_c=[${ExtraCflags}]`, diff --git a/skia b/skia index 98287499..aeae2261 160000 --- a/skia +++ b/skia @@ -1 +1 @@ -Subproject commit 982874994d829e7a9c1aa38f429a66cd32a2d0a2 +Subproject commit aeae2261c7d380404fb8e53eb6062338c4ba0367