Skip to content

Commit 0811f87

Browse files
committed
Merge branch 'master' into wasmfs
2 parents 14cd1e0 + 6f99463 commit 0811f87

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN \
3333
--no-modify-path \
3434
--profile minimal \
3535
--target wasm32-unknown-emscripten \
36-
--default-toolchain nightly-2026-04-01 \
36+
--default-toolchain nightly-2026-04-14 \
3737
--component rust-src
3838

3939
# Cache settings

build.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,14 @@ VERSION_BROTLI=1.2.0 # https://github.com/google/brotli
186186
VERSION_MOZJPEG=0826579 # https://github.com/mozilla/mozjpeg
187187
VERSION_UHDR=1.4.0 # https://github.com/google/libultrahdr
188188
VERSION_JXL=0.11.2 # https://github.com/libjxl/libjxl
189-
VERSION_PNG=1.6.56 # https://github.com/pnggroup/libpng
189+
VERSION_PNG=1.6.57 # https://github.com/pnggroup/libpng
190190
VERSION_IMAGEQUANT=2.4.1 # https://github.com/lovell/libimagequant
191191
VERSION_CGIF=0.5.3 # https://github.com/dloebl/cgif
192192
VERSION_WEBP=1.6.0 # https://chromium.googlesource.com/webm/libwebp
193193
VERSION_TIFF=4.7.1 # https://gitlab.com/libtiff/libtiff
194194
VERSION_RESVG=0.47.0 # https://github.com/linebender/resvg
195-
VERSION_AOM=3.13.2 # https://aomedia.googlesource.com/aom
196-
VERSION_HEIF=1.21.2 # https://github.com/strukturag/libheif
195+
VERSION_AOM=3.13.3 # https://aomedia.googlesource.com/aom
196+
VERSION_HEIF=434d96c # https://github.com/strukturag/libheif
197197
VERSION_VIPS=8.18.2 # https://github.com/libvips/libvips
198198

199199
VERSION_EMSCRIPTEN="$(emcc -dumpversion)"
@@ -435,6 +435,8 @@ node --version
435435
mkdir $DEPS/webp
436436
curl -Ls https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$VERSION_WEBP.tar.gz | tar xzC $DEPS/webp --strip-components=1
437437
cd $DEPS/webp
438+
# https://chromium.googlesource.com/webm/libwebp/+/5339483509d998936c3f184ec5a95e8c1bb4a5d9
439+
sed -i 's/EMSCRIPTEN/__&__/' src/dsp/cpu.c
438440
# Prepend `-msimd128` to SSE flags, see: https://github.com/emscripten-core/emscripten/issues/12714
439441
sed -i 's/-msse/-msimd128 &/g' configure
440442
# Disable threading support, we rely on libvips' thread pool
@@ -487,7 +489,7 @@ node --version
487489
[ -f "$TARGET/lib/pkgconfig/libheif.pc" ] || [ -n "$DISABLE_AVIF" ] || (
488490
stage "Compiling libheif"
489491
mkdir $DEPS/heif
490-
curl -Ls https://github.com/strukturag/libheif/releases/download/v$VERSION_HEIF/libheif-$VERSION_HEIF.tar.gz | tar xzC $DEPS/heif --strip-components=1
492+
curl -Ls https://github.com/strukturag/libheif/archive/$VERSION_HEIF.tar.gz | tar xzC $DEPS/heif --strip-components=1
491493
cd $DEPS/heif
492494
# Note: without CMAKE_FIND_ROOT_PATH find_path for AOM is not working for some reason (see https://github.com/emscripten-core/emscripten/issues/10078).
493495
# Compile with -D__EMSCRIPTEN_STANDALONE_WASM__ to disable the Embind implementation.

playground/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"monaco-editor": "0.54.0",
3030
"monaco-editor-webpack-plugin": "^7.1.1",
3131
"terser-webpack-plugin": "^5.4.0",
32-
"webpack": "^5.105.4",
32+
"webpack": "^5.106.1",
3333
"webpack-cli": "^7.0.2",
3434
"webpack-dev-server": "^5.2.3"
3535
}

0 commit comments

Comments
 (0)