diff --git a/Dockerfile b/Dockerfile index a8d31c5af..2277e9c8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,8 @@ RUN \ # needed for Meson ninja-build \ python3-pip \ + # needed by GLib + python3-packaging \ && \ pip3 install meson diff --git a/build.sh b/build.sh index fd1fca2d9..e59da41ff 100755 --- a/build.sh +++ b/build.sh @@ -163,22 +163,22 @@ export RUSTFLAGS+=" --remap-path-prefix=$DEPS/=" # Dependency version numbers VERSION_ZLIB_NG=2.1.5 # https://github.com/zlib-ng/zlib-ng VERSION_FFI=3.4.4 # https://github.com/libffi/libffi -VERSION_GLIB=2.78.3 # https://gitlab.gnome.org/GNOME/glib +VERSION_GLIB=2.79.0 # https://gitlab.gnome.org/GNOME/glib VERSION_EXPAT=2.5.0 # https://github.com/libexpat/libexpat VERSION_EXIF=0.6.24 # https://github.com/libexif/libexif VERSION_LCMS2=2.16 # https://github.com/mm2/Little-CMS VERSION_HWY=1.0.7 # https://github.com/google/highway VERSION_BROTLI=1.1.0 # https://github.com/google/brotli VERSION_MOZJPEG=4.1.5 # https://github.com/mozilla/mozjpeg -VERSION_JXL=0.8.2 # https://github.com/libjxl/libjxl +VERSION_JXL=0.9.0 # https://github.com/libjxl/libjxl VERSION_SPNG=0.7.4 # https://github.com/randy408/libspng VERSION_IMAGEQUANT=2.4.1 # https://github.com/lovell/libimagequant VERSION_CGIF=0.3.2 # https://github.com/dloebl/cgif VERSION_WEBP=1.3.2 # https://chromium.googlesource.com/webm/libwebp VERSION_TIFF=4.6.0 # https://gitlab.com/libtiff/libtiff -VERSION_RESVG=0.36.0 # https://github.com/RazrFalcon/resvg +VERSION_RESVG=0.37.0 # https://github.com/RazrFalcon/resvg VERSION_AOM=3.8.0 # https://aomedia.googlesource.com/aom -VERSION_HEIF=1.17.5 # https://github.com/strukturag/libheif +VERSION_HEIF=1.17.6 # https://github.com/strukturag/libheif VERSION_VIPS=8.15.1 # https://github.com/libvips/libvips VERSION_EMSCRIPTEN="$(emcc -dumpversion)" @@ -273,7 +273,7 @@ node --version # TODO(kleisauke): Discuss these patches upstream curl -Ls https://github.com/GNOME/glib/compare/$VERSION_GLIB...kleisauke:wasm-vips-$VERSION_GLIB.patch | patch -p1 meson setup _build --prefix=$TARGET --cross-file=$MESON_CROSS --default-library=static --buildtype=release \ - --force-fallback-for=gvdb -Dselinux=disabled -Dxattr=false -Dlibmount=disabled -Dnls=disabled \ + --force-fallback-for=gvdb -Dintrospection=disabled -Dselinux=disabled -Dxattr=false -Dlibmount=disabled -Dnls=disabled \ -Dtests=false -Dglib_assert=false -Dglib_checks=false meson install -C _build --tag devel ) @@ -350,10 +350,11 @@ node --version curl -Ls https://github.com/libjxl/libjxl/archive/refs/tags/v$VERSION_JXL.tar.gz | tar xzC $DEPS/jxl --strip-components=1 cd $DEPS/jxl emcmake cmake -B_build -H. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$TARGET -DCMAKE_FIND_ROOT_PATH=$TARGET \ - -DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=FALSE -DJPEGXL_ENABLE_TOOLS=FALSE -DJPEGXL_ENABLE_EXAMPLES=FALSE \ - -DJPEGXL_ENABLE_SJPEG=FALSE -DJPEGXL_ENABLE_SKCMS=FALSE -DJPEGXL_BUNDLE_LIBPNG=FALSE -DJPEGXL_ENABLE_TRANSCODE_JPEG=FALSE \ + -DBUILD_SHARED_LIBS=FALSE -DBUILD_TESTING=FALSE -DJPEGXL_ENABLE_TOOLS=FALSE -DJPEGXL_ENABLE_JPEGLI=FALSE \ + -DJPEGXL_ENABLE_EXAMPLES=FALSE -DJPEGXL_ENABLE_SJPEG=FALSE -DJPEGXL_ENABLE_SKCMS=FALSE -DJPEGXL_BUNDLE_LIBPNG=FALSE \ -DJPEGXL_FORCE_SYSTEM_BROTLI=TRUE -DJPEGXL_FORCE_SYSTEM_LCMS2=TRUE -DJPEGXL_FORCE_SYSTEM_HWY=TRUE \ - -DCMAKE_C_FLAGS="$CFLAGS -DJXL_DEBUG_ON_ABORT=0" -DCMAKE_CXX_FLAGS="$CXXFLAGS -DJXL_DEBUG_ON_ABORT=0" + -DCMAKE_C_FLAGS="$CFLAGS -DJXL_DEBUG_ON_ABORT=0" -DCMAKE_CXX_FLAGS="$CXXFLAGS -DJXL_DEBUG_ON_ABORT=0" \ + -DJPEGXL_ENABLE_TRANSCODE_JPEG=FALSE # libvips always decodes to pixels make -C _build install if [ -n "$ENABLE_MODULES" ]; then # Ensure we don't link with highway in the vips-jxl side module diff --git a/playground/package.json b/playground/package.json index a107bef15..b57ff83cd 100644 --- a/playground/package.json +++ b/playground/package.json @@ -24,7 +24,7 @@ "copy-webpack-plugin": "^11.0.0", "css-loader": "^6.8.1", "fflate": "^0.8.1", - "html-webpack-plugin": "^5.5.4", + "html-webpack-plugin": "^5.6.0", "mini-css-extract-plugin": "^2.7.6", "monaco-editor": "^0.45.0", "monaco-editor-webpack-plugin": "^7.1.0", diff --git a/test/unit/test_foreign.js b/test/unit/test_foreign.js index 05fe9cac0..21371837a 100644 --- a/test/unit/test_foreign.js +++ b/test/unit/test_foreign.js @@ -1126,7 +1126,7 @@ describe('foreign', () => { // remove the ICC profile: the RGB one will no longer be appropriate rgb16.remove('icc-profile-data'); saveLoadBuffer('jxlsave_buffer', 'jxlload_buffer', - rgb16, 10700); + rgb16, 12000); // repeat for lossless mode saveLoadBuffer('jxlsave_buffer', 'jxlload_buffer',