Update dependencies

kleisauke · Jul 5, 2024 · f153556 · f153556
1 parent ab24288
commit f153556
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,7 +33,7 @@ RUN \
     --no-modify-path \
     --profile minimal \
     --target wasm32-unknown-emscripten \
-    --default-toolchain nightly-2024-06-23 \
+    --default-toolchain nightly-2024-07-05 \
     --component rust-src
 
 # Cache settings

diff --git a/build.sh b/build.sh
@@ -162,16 +162,16 @@ export RUSTFLAGS+=" --remap-path-prefix=$CARGO_HOME/registry/src/="
 export RUSTFLAGS+=" --remap-path-prefix=$DEPS/="
 
 # Dependency version numbers
-VERSION_ZLIB_NG=2.1.7       # https://github.com/zlib-ng/zlib-ng
+VERSION_ZLIB_NG=2.2.1       # https://github.com/zlib-ng/zlib-ng
 VERSION_FFI=3.4.6           # https://github.com/libffi/libffi
-VERSION_GLIB=2.80.3         # https://gitlab.gnome.org/GNOME/glib
+VERSION_GLIB=2.81.0         # https://gitlab.gnome.org/GNOME/glib
 VERSION_EXPAT=2.6.2         # 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.2.0           # 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.10.2          # https://github.com/libjxl/libjxl
+VERSION_JXL=0.10.3          # 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.4.1          # https://github.com/dloebl/cgif
@@ -241,12 +241,8 @@ node --version
   cd $DEPS/zlib-ng
   # SSE intrinsics needs to be checked for wasm32
   sed -i 's/BASEARCH_X86_FOUND/& OR BASEARCH_WASM32_FOUND/g' CMakeLists.txt
-  # Avoid CPU checks at runtime
-  sed -i '/-DX86_FEATURES/d' CMakeLists.txt
-  sed -i '/x86_features.[hc]/d' CMakeLists.txt
-  sed -i 's/cf.x86.has_ssse3/1/' functable.c
   emcmake cmake -B_build -H. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$TARGET -DBUILD_SHARED_LIBS=FALSE \
-    ${DISABLE_SIMD:+-DWITH_OPTIM=FALSE} ${ENABLE_SIMD:+-DFORCE_SSE2=TRUE} -DZLIB_COMPAT=TRUE \
+    ${DISABLE_SIMD:+-DWITH_OPTIM=FALSE} ${ENABLE_SIMD:+-DFORCE_SSE2=TRUE} -DWITH_RUNTIME_CPU_DETECTION=FALSE -DZLIB_COMPAT=TRUE \
     -DZLIB_ENABLE_TESTS=FALSE -DZLIBNG_ENABLE_TESTS=FALSE -DWITH_GTEST=FALSE
   make -C _build install
 )
@@ -273,7 +269,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 -Dintrospection=disabled -Dselinux=disabled -Dxattr=false -Dlibmount=disabled -Dnls=disabled \
+    --force-fallback-for=gvdb -Dintrospection=disabled -Dselinux=disabled -Dxattr=false -Dlibmount=disabled -Dsysprof=disabled -Dnls=disabled \
     -Dtests=false -Dglib_assert=false -Dglib_checks=false
   meson install -C _build --tag devel
 )
@@ -465,7 +461,7 @@ node --version
   # Compile with -D__EMSCRIPTEN_STANDALONE_WASM__ to disable the Embind implementation.
   emcmake cmake -B_build -H. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$TARGET -DCMAKE_FIND_ROOT_PATH=$TARGET \
     -DBUILD_SHARED_LIBS=FALSE -DCMAKE_POSITION_INDEPENDENT_CODE=$PIC -DENABLE_PLUGIN_LOADING=FALSE \
-    -DWITH_EXAMPLES=FALSE -DWITH_LIBDE265=FALSE -DWITH_X265=FALSE \
+    -DBUILD_TESTING=FALSE -DWITH_EXAMPLES=FALSE -DWITH_LIBDE265=FALSE -DWITH_X265=FALSE \
     -DCMAKE_CXX_FLAGS="$CXXFLAGS -D__EMSCRIPTEN_STANDALONE_WASM__" \
     -DENABLE_MULTITHREADING_SUPPORT=FALSE # Disable threading support, we rely on libvips' thread pool.
   make -C _build install

diff --git a/test/unit/index.html b/test/unit/index.html
@@ -4,7 +4,8 @@
   <meta charset="utf-8">
   <title>wasm-vips testsuite</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.4.0/mocha.min.css" crossorigin="anonymous">
+  <!-- FIXME(kleisauke): https://github.com/cdnjs/tools/issues/285 -->
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.6.0/mocha.css" crossorigin="anonymous">
   <style>
     html,
     body {
@@ -13,25 +14,21 @@
       margin: 0;
     }
 
-    #mocha {
-      font: 13px "Segoe UI", Arial, "HelveticaNeue-Light", sans-serif;
-    }
-
     #mocha-stats {
       font-size: initial;
     }
 
     #mocha h1 {
-      font-size: 1.8em;
+      font-size: 23px;
       font-weight: initial;
     }
 
     #mocha .suite .suite h1 {
-      font-size: 1.4em;
+      font-size: 18px;
     }
 
     #mocha h2 {
-      font-size: 1.2em;
+      font-size: 16px;
       font-weight: initial;
       cursor: default;
     }
@@ -67,7 +64,7 @@
 </head>
 <body>
 <div id="mocha"></div>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.4.0/mocha.min.js" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mocha/10.6.0/mocha.min.js" crossorigin="anonymous"></script>
 <script class="mocha-init">
   mocha.setup({
     ui: 'bdd',

diff --git a/test/unit/package.json b/test/unit/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "chai": "^5.1.1",
-    "mocha": "^10.4.0"
+    "mocha": "^10.6.0"
   },
   "engines": {
     "node": ">=16.4.0"