From 4daa6c4448e9f38c1abef241e924b04fdeada34b Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Wed, 9 Oct 2024 14:31:29 +0100
Subject: [PATCH] Upgrade to libvips v8.15.5-rc1

---
 docs/changelog.md                |  4 +++-
 npm/darwin-arm64/package.json    |  2 +-
 npm/darwin-x64/package.json      |  2 +-
 npm/linux-arm/package.json       |  2 +-
 npm/linux-arm64/package.json     |  2 +-
 npm/linux-ppc64/package.json     |  2 +-
 npm/linux-s390x/package.json     |  2 +-
 npm/linux-x64/package.json       |  2 +-
 npm/linuxmusl-arm64/package.json |  2 +-
 npm/linuxmusl-x64/package.json   |  2 +-
 package.json                     | 28 ++++++++++++++--------------
 src/binding.gyp                  |  8 ++++----
 src/common.h                     |  4 ++--
 test/unit/libvips.js             |  2 +-
 14 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index a0bb95ea8..15c562fcb 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -2,10 +2,12 @@
 
 ## v0.33 - *gauge*
 
-Requires libvips v8.15.3
+Requires libvips v8.15.5-rc1
 
 ### v0.33.6 - TBD
 
+* Upgrade to libvips v8.15.5-rc1 for upstream bug fixes.
+
 * Improve support for ppc64le architecture.
   [#4203](https://github.com/lovell/sharp/pull/4203)
   [@sumitd2](https://github.com/sumitd2)
diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
index 3092b0514..44e63f4ec 100644
--- 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.4"
+    "@img/sharp-libvips-darwin-arm64": "1.0.6"
   },
   "files": [
     "lib"
diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
index 15b4afabc..ce382363f 100644
--- 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.4"
+    "@img/sharp-libvips-darwin-x64": "1.0.6"
   },
   "files": [
     "lib"
diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json
index 54c49f4fa..241c3bc61 100644
--- 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.5"
+    "@img/sharp-libvips-linux-arm": "1.0.6"
   },
   "files": [
     "lib"
diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json
index e4c417abc..47a49e5dc 100644
--- 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.4"
+    "@img/sharp-libvips-linux-arm64": "1.0.6"
   },
   "files": [
     "lib"
diff --git a/npm/linux-ppc64/package.json b/npm/linux-ppc64/package.json
index 2c6f4bd71..52622ae38 100644
--- a/npm/linux-ppc64/package.json
+++ b/npm/linux-ppc64/package.json
@@ -15,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@img/sharp-libvips-linux-ppc64": "1.0.4"
+    "@img/sharp-libvips-linux-ppc64": "1.0.6"
   },
   "files": [
     "lib"
diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json
index 1f6779abd..1abf2d070 100644
--- 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.4"
+    "@img/sharp-libvips-linux-s390x": "1.0.6"
   },
   "files": [
     "lib"
diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json
index 5a394880e..8ef186ea2 100644
--- 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.4"
+    "@img/sharp-libvips-linux-x64": "1.0.6"
   },
   "files": [
     "lib"
diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json
index e73a39a5c..4cf3ee540 100644
--- 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.4"
+    "@img/sharp-libvips-linuxmusl-arm64": "1.0.6"
   },
   "files": [
     "lib"
diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json
index 74dbd4c1d..b065354cd 100644
--- 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.4"
+    "@img/sharp-libvips-linuxmusl-x64": "1.0.6"
   },
   "files": [
     "lib"
diff --git a/package.json b/package.json
index fa8feb9a4..faf9a0c27 100644
--- a/package.json
+++ b/package.json
@@ -144,15 +144,15 @@
   "optionalDependencies": {
     "@img/sharp-darwin-arm64": "0.33.5",
     "@img/sharp-darwin-x64": "0.33.5",
-    "@img/sharp-libvips-darwin-arm64": "1.0.4",
-    "@img/sharp-libvips-darwin-x64": "1.0.4",
-    "@img/sharp-libvips-linux-arm": "1.0.5",
-    "@img/sharp-libvips-linux-arm64": "1.0.4",
-    "@img/sharp-libvips-linux-ppc64": "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-libvips-darwin-arm64": "1.0.6",
+    "@img/sharp-libvips-darwin-x64": "1.0.6",
+    "@img/sharp-libvips-linux-arm": "1.0.6",
+    "@img/sharp-libvips-linux-arm64": "1.0.6",
+    "@img/sharp-libvips-linux-ppc64": "1.0.6",
+    "@img/sharp-libvips-linux-s390x": "1.0.6",
+    "@img/sharp-libvips-linux-x64": "1.0.6",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.0.6",
+    "@img/sharp-libvips-linuxmusl-x64": "1.0.6",
     "@img/sharp-linux-arm": "0.33.5",
     "@img/sharp-linux-arm64": "0.33.5",
     "@img/sharp-linux-s390x": "0.33.5",
@@ -165,10 +165,10 @@
   },
   "devDependencies": {
     "@emnapi/runtime": "^1.2.0",
-    "@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",
+    "@img/sharp-libvips-dev": "1.0.6",
+    "@img/sharp-libvips-dev-wasm32": "1.0.6",
+    "@img/sharp-libvips-win32-ia32": "1.0.6",
+    "@img/sharp-libvips-win32-x64": "1.0.6",
     "@types/node": "*",
     "cc": "^3.0.1",
     "emnapi": "^1.2.0",
@@ -190,7 +190,7 @@
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
   },
   "config": {
-    "libvips": ">=8.15.3"
+    "libvips": ">=8.15.5"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"
diff --git a/src/binding.gyp b/src/binding.gyp
index 33607f9aa..e8eb23cdf 100644
--- a/src/binding.gyp
+++ b/src/binding.gyp
@@ -12,7 +12,7 @@
     'sharp_libvips_lib_dir': '<!(node -p "require(\'../lib/libvips\').buildSharpLibvipsLibDir()")'
   },
   'targets': [{
-    'target_name': 'libvips-cpp',
+    'target_name': 'libvips-cpp-<(vips_version)',
     'conditions': [
       ['OS == "win"', {
         # Build libvips C++ binding for Windows due to MSVC std library ABI changes
@@ -83,7 +83,7 @@
     ],
     'dependencies': [
       '<!(node -p "require(\'node-addon-api\').gyp")',
-      'libvips-cpp'
+      'libvips-cpp-<(vips_version)'
     ],
     'variables': {
       'conditions': [
@@ -149,7 +149,7 @@
           ['OS == "mac"', {
             'link_settings': {
               'libraries': [
-                'libvips-cpp.42.dylib'
+                'libvips-cpp.<(vips_version).dylib'
               ]
             },
             'xcode_settings': {
@@ -169,7 +169,7 @@
             ],
             'link_settings': {
               'libraries': [
-                '-l:libvips-cpp.so.42'
+                '-l:libvips-cpp.so.<(vips_version)'
               ],
               'ldflags': [
                 '-Wl,-s',
diff --git a/src/common.h b/src/common.h
index 499f03a22..2f983d9db 100644
--- 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 < 3)
-#error "libvips version 8.15.3+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 5)
+#error "libvips version 8.15.5+ 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
index 3ac9b7081..0a6f79320 100644
--- 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, 'c4ea54fdc1');
+      assert.strictEqual(locatorHash, 'b9c917c310');
       delete process.env.npm_config_platform;
       delete process.env.npm_config_arch;
       delete process.env.npm_config_libc;