From dc07fd4e9c293a9c62dc84d8997aaf8d2833cf3e Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 18 Mar 2024 15:55:01 +0000 Subject: [PATCH] Upgrade to libvips v8.15.2 --- .github/workflows/ci.yml | 2 +- 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-s390x/package.json | 2 +- npm/linux-x64/package.json | 2 +- npm/linuxmusl-arm64/package.json | 2 +- npm/linuxmusl-x64/package.json | 2 +- package.json | 26 +++++++++++++------------- src/common.h | 4 ++-- test/unit/libvips.js | 2 +- 13 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ba6e1a8e..83da912ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,7 +169,7 @@ jobs: contents: write name: wasm32 - prebuild runs-on: ubuntu-22.04 - container: "emscripten/emsdk:3.1.51" + container: "emscripten/emsdk:3.1.56" steps: - name: Checkout uses: actions/checkout@v4 diff --git a/docs/changelog.md b/docs/changelog.md index 9503c48f6..7ee70631d 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,10 +2,12 @@ ## v0.33 - *gauge* -Requires libvips v8.15.1 +Requires libvips v8.15.2 ### v0.33.3 - TBD +* Upgrade to libvips v8.15.2 for upstream bug fixes. + * Ensure `keepIccProfile` retains P3 and CMYK input profiles. [#3906](https://github.com/lovell/sharp/issues/3906) [#4008](https://github.com/lovell/sharp/issues/4008) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 9b970d045..ff6a1a54b 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.1" + "@img/sharp-libvips-darwin-arm64": "1.0.2" }, "files": [ "lib" diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index a54d69799..8d40ff933 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.1" + "@img/sharp-libvips-darwin-x64": "1.0.2" }, "files": [ "lib" diff --git a/npm/linux-arm/package.json b/npm/linux-arm/package.json index 10df61bef..32af1a21b 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.1" + "@img/sharp-libvips-linux-arm": "1.0.2" }, "files": [ "lib" diff --git a/npm/linux-arm64/package.json b/npm/linux-arm64/package.json index b31f64cd4..489938500 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.1" + "@img/sharp-libvips-linux-arm64": "1.0.2" }, "files": [ "lib" diff --git a/npm/linux-s390x/package.json b/npm/linux-s390x/package.json index 9fbbe03fb..02408570a 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.1" + "@img/sharp-libvips-linux-s390x": "1.0.2" }, "files": [ "lib" diff --git a/npm/linux-x64/package.json b/npm/linux-x64/package.json index 04757096c..6861d6b49 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.1" + "@img/sharp-libvips-linux-x64": "1.0.2" }, "files": [ "lib" diff --git a/npm/linuxmusl-arm64/package.json b/npm/linuxmusl-arm64/package.json index 71c2088da..b15d167a0 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.1" + "@img/sharp-libvips-linuxmusl-arm64": "1.0.2" }, "files": [ "lib" diff --git a/npm/linuxmusl-x64/package.json b/npm/linuxmusl-x64/package.json index 28b2b0be3..5ffbffd9e 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.1" + "@img/sharp-libvips-linuxmusl-x64": "1.0.2" }, "files": [ "lib" diff --git a/package.json b/package.json index 114465b6d..b17e36feb 100644 --- a/package.json +++ b/package.json @@ -143,14 +143,14 @@ "optionalDependencies": { "@img/sharp-darwin-arm64": "0.33.2", "@img/sharp-darwin-x64": "0.33.2", - "@img/sharp-libvips-darwin-arm64": "1.0.1", - "@img/sharp-libvips-darwin-x64": "1.0.1", - "@img/sharp-libvips-linux-arm": "1.0.1", - "@img/sharp-libvips-linux-arm64": "1.0.1", - "@img/sharp-libvips-linux-s390x": "1.0.1", - "@img/sharp-libvips-linux-x64": "1.0.1", - "@img/sharp-libvips-linuxmusl-arm64": "1.0.1", - "@img/sharp-libvips-linuxmusl-x64": "1.0.1", + "@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-linux-arm": "0.33.2", "@img/sharp-linux-arm64": "0.33.2", "@img/sharp-linux-s390x": "0.33.2", @@ -163,10 +163,10 @@ }, "devDependencies": { "@emnapi/runtime": "^1.0.0", - "@img/sharp-libvips-dev": "1.0.1", - "@img/sharp-libvips-dev-wasm32": "1.0.1", - "@img/sharp-libvips-win32-ia32": "1.0.1", - "@img/sharp-libvips-win32-x64": "1.0.1", + "@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", "@types/node": "*", "async": "^3.2.5", "cc": "^3.0.1", @@ -187,7 +187,7 @@ "license": "Apache-2.0", "engines": { "node": "^18.17.0 || ^20.3.0 || >=21.0.0", - "libvips": ">=8.15.1" + "libvips": ">=8.15.2" }, "funding": { "url": "https://opencollective.com/libvips" diff --git a/src/common.h b/src/common.h index b5af7225e..dbde766cb 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 < 1) -#error "libvips version 8.15.1+ is required - please see https://sharp.pixelplumbing.com/install" + (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" #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 abc10ff5a..4c1879c75 100644 --- a/test/unit/libvips.js +++ b/test/unit/libvips.js @@ -162,7 +162,7 @@ describe('libvips binaries', function () { process.env.npm_config_arch = 's390x'; process.env.npm_config_libc = ''; const locatorHash = libvips.yarnLocator(); - assert.strictEqual(locatorHash, 'f2bd19138a'); + assert.strictEqual(locatorHash, '45978c229d'); delete process.env.npm_config_platform; delete process.env.npm_config_arch; delete process.env.npm_config_libc;