Upgrade to libvips v8.15.3

lovell · Aug 12, 2024 · de42667 · de42667
1 parent 2eb03b0
commit de42667
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -171,7 +171,7 @@ jobs:
       contents: write
     name: wasm32 - prebuild
     runs-on: ubuntu-22.04
-    container: "emscripten/emsdk:3.1.56"
+    container: "emscripten/emsdk:3.1.64"
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,10 +2,12 @@
 
 ## v0.33 - *gauge*
 
-Requires libvips v8.15.2
+Requires libvips v8.15.3
 
 ### v0.33.5 - TBD
 
+* Upgrade to libvips v8.15.3 for upstream bug fixes.
+
 * Add `pageHeight` and `pages` to response of multi-page output.
   [#3411](https://github.com/lovell/sharp/issues/3411)
 

diff --git a/docs/install.md b/docs/install.md
@@ -43,7 +43,7 @@ Ready-compiled sharp and libvips binaries are provided for use on the most commo
 
 * macOS x64 (>= 10.13)
 * macOS ARM64
-* Linux ARM (glibc >= 2.28)
+* Linux ARM (glibc >= 2.31)
 * Linux ARM64 (glibc >= 2.26, musl >= 1.2.2)
 * Linux s390x (glibc >= 2.31)
 * Linux x64 (glibc >= 2.26, musl >= 1.2.2, CPU with SSE4.2)

diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-darwin-arm64": "1.0.2"
+    "@img/sharp-libvips-darwin-arm64": "1.0.4"
   },
   "files": [
     "lib"

diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-darwin-x64": "1.0.2"
+    "@img/sharp-libvips-darwin-x64": "1.0.4"
   },
   "files": [
     "lib"

diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linux-arm": "1.0.2"
+    "@img/sharp-libvips-linux-arm": "1.0.4"
   },
   "files": [
     "lib"

diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linux-arm64": "1.0.2"
+    "@img/sharp-libvips-linux-arm64": "1.0.4"
   },
   "files": [
     "lib"

diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linux-s390x": "1.0.2"
+    "@img/sharp-libvips-linux-s390x": "1.0.4"
   },
   "files": [
     "lib"

diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linux-x64": "1.0.2"
+    "@img/sharp-libvips-linux-x64": "1.0.4"
   },
   "files": [
     "lib"

diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linuxmusl-arm64": "1.0.2"
+    "@img/sharp-libvips-linuxmusl-arm64": "1.0.4"
   },
   "files": [
     "lib"

diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linuxmusl-x64": "1.0.2"
+    "@img/sharp-libvips-linuxmusl-x64": "1.0.4"
   },
   "files": [
     "lib"

diff --git a/package.json b/package.json
@@ -144,14 +144,14 @@
   "optionalDependencies": {
     "@img/sharp-darwin-arm64": "0.33.4",
     "@img/sharp-darwin-x64": "0.33.4",
-    "@img/sharp-libvips-darwin-arm64": "1.0.2",
-    "@img/sharp-libvips-darwin-x64": "1.0.2",
-    "@img/sharp-libvips-linux-arm": "1.0.2",
-    "@img/sharp-libvips-linux-arm64": "1.0.2",
-    "@img/sharp-libvips-linux-s390x": "1.0.2",
-    "@img/sharp-libvips-linux-x64": "1.0.2",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.0.2",
-    "@img/sharp-libvips-linuxmusl-x64": "1.0.2",
+    "@img/sharp-libvips-darwin-arm64": "1.0.4",
+    "@img/sharp-libvips-darwin-x64": "1.0.4",
+    "@img/sharp-libvips-linux-arm": "1.0.4",
+    "@img/sharp-libvips-linux-arm64": "1.0.4",
+    "@img/sharp-libvips-linux-s390x": "1.0.4",
+    "@img/sharp-libvips-linux-x64": "1.0.4",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.0.4",
+    "@img/sharp-libvips-linuxmusl-x64": "1.0.4",
     "@img/sharp-linux-arm": "0.33.4",
     "@img/sharp-linux-arm64": "0.33.4",
     "@img/sharp-linux-s390x": "0.33.4",
@@ -164,20 +164,20 @@
   },
   "devDependencies": {
     "@emnapi/runtime": "^1.2.0",
-    "@img/sharp-libvips-dev": "1.0.2",
-    "@img/sharp-libvips-dev-wasm32": "1.0.3",
-    "@img/sharp-libvips-win32-ia32": "1.0.2",
-    "@img/sharp-libvips-win32-x64": "1.0.2",
+    "@img/sharp-libvips-dev": "1.0.4",
+    "@img/sharp-libvips-dev-wasm32": "1.0.5",
+    "@img/sharp-libvips-win32-ia32": "1.0.4",
+    "@img/sharp-libvips-win32-x64": "1.0.4",
     "@types/node": "*",
     "async": "^3.2.5",
     "cc": "^3.0.1",
     "emnapi": "^1.2.0",
     "exif-reader": "^2.0.1",
     "extract-zip": "^2.0.1",
     "icc": "^3.0.0",
-    "jsdoc-to-markdown": "^8.0.2",
+    "jsdoc-to-markdown": "^8.0.3",
     "license-checker": "^25.0.1",
-    "mocha": "^10.7.0",
+    "mocha": "^10.7.3",
     "node-addon-api": "^8.1.0",
     "nyc": "^17.0.0",
     "prebuild": "^13.0.1",
@@ -188,7 +188,7 @@
   "license": "Apache-2.0",
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-    "libvips": ">=8.15.2"
+    "libvips": ">=8.15.3"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

diff --git a/src/common.h b/src/common.h
@@ -16,8 +16,8 @@
 
 #if (VIPS_MAJOR_VERSION < 8) || \
   (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 15) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 2)
-#error "libvips version 8.15.2+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 3)
+#error "libvips version 8.15.3+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))

diff --git a/test/unit/libvips.js b/test/unit/libvips.js
@@ -179,7 +179,7 @@ describe('libvips binaries', function () {
       process.env.npm_config_arch = 's390x';
       process.env.npm_config_libc = '';
       const locatorHash = libvips.yarnLocator();
-      assert.strictEqual(locatorHash, '45978c229d');
+      assert.strictEqual(locatorHash, 'c4ea54fdc1');
       delete process.env.npm_config_platform;
       delete process.env.npm_config_arch;
       delete process.env.npm_config_libc;