From de42667767b7488e9e6ebebc2ba21a1bbb3d21db Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 12 Aug 2024 13:19:10 +0100 Subject: [PATCH] Upgrade to libvips v8.15.3 --- .github/workflows/ci.yml | 2 +- docs/changelog.md | 4 +++- docs/install.md | 2 +- 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-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- package.json | 30 +++++++++++++++--------------- src/common.h | 4 ++-- test/unit/libvips.js | 2 +- 14 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ece8f714..0fcf394b8 100644 --- 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 index b198fab7c..220c3efd6 100644 --- 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 index 317895d32..b170f2092 100644 --- 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 index bc4d41fa1..3705505f1 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.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 index e0ba7d3e5..cefd0db43 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.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 index 4f6b6901b..ec9959c98 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.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 index 8b7de50ef..ad3bfede0 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.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 index dd0869a20..ed5a0ea7c 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.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 index 66ac40fac..658947f8a 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.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 index c04ecd1f0..f5843a47d 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.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 index 4080277dd..705d4c2ff 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.2" + "@img/sharp-libvips-linuxmusl-x64": "1.0.4" }, "files": [ "lib" diff --git a/package.json b/package.json index 1ab54e6ae..3ea1b0737 100644 --- 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,10 +164,10 @@ }, "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", @@ -175,9 +175,9 @@ "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 index 5dabe02c2..225f6129c 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 < 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 index 2d763fbd5..f40a5dec2 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, '45978c229d'); + assert.strictEqual(locatorHash, 'c4ea54fdc1'); delete process.env.npm_config_platform; delete process.env.npm_config_arch; delete process.env.npm_config_libc;