Upgrade to libvips v8.15.5-rc1

lovell · Oct 9, 2024 · a53d7cb · a53d7cb
1 parent b249357
commit a53d7cb
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 32 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -178,7 +178,7 @@ jobs:
  contents: write
  name: wasm32 - prebuild
  runs-on: ubuntu-22.04
- container: "emscripten/emsdk:3.1.64"
+ container: "emscripten/emsdk:3.1.68"
  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.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;