Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-09 10:30:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to libvips v8.15.2

Browse Source
This commit is contained in:
Lovell Fuller 2024-03-18 15:55:01 +00:00
parent 7bc74feb11
commit dc07fd4e9c
13 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -169,7 +169,7 @@ jobs:
contents: write contents: write
name: wasm32 - prebuild name: wasm32 - prebuild
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
container: "emscripten/emsdk:3.1.51" container: "emscripten/emsdk:3.1.56"
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4

4
docs/changelog.md
View File

@ -2,10 +2,12 @@
## v0.33 - *gauge* ## v0.33 - *gauge*
Requires libvips v8.15.1 Requires libvips v8.15.2
### v0.33.3 - TBD ### v0.33.3 - TBD
* Upgrade to libvips v8.15.2 for upstream bug fixes.
* Ensure `keepIccProfile` retains P3 and CMYK input profiles. * Ensure `keepIccProfile` retains P3 and CMYK input profiles.
[#3906](https://github.com/lovell/sharp/issues/3906) [#3906](https://github.com/lovell/sharp/issues/3906)
[#4008](https://github.com/lovell/sharp/issues/4008) [#4008](https://github.com/lovell/sharp/issues/4008)

2
npm/darwin-arm64/package.json
View File

@ -15,7 +15,7 @@
}, },
"preferUnplugged": true, "preferUnplugged": true,
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-libvips-darwin-arm64": "1.0.1" "@img/sharp-libvips-darwin-arm64": "1.0.2"
}, },
"files": [ "files": [
"lib" "lib"

2
npm/darwin-x64/package.json
View File

@ -15,7 +15,7 @@
}, },
"preferUnplugged": true, "preferUnplugged": true,
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-libvips-darwin-x64": "1.0.1" "@img/sharp-libvips-darwin-x64": "1.0.2"
}, },
"files": [ "files": [
"lib" "lib"

2
npm/linux-arm/package.json
View File

@ -15,7 +15,7 @@
}, },
"preferUnplugged": true, "preferUnplugged": true,
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-libvips-linux-arm": "1.0.1" "@img/sharp-libvips-linux-arm": "1.0.2"
}, },
"files": [ "files": [
"lib" "lib"

2
npm/linux-arm64/package.json
View File

@ -15,7 +15,7 @@
}, },
"preferUnplugged": true, "preferUnplugged": true,
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-libvips-linux-arm64": "1.0.1" "@img/sharp-libvips-linux-arm64": "1.0.2"
}, },
"files": [ "files": [
"lib" "lib"

2
npm/linux-s390x/package.json
View File

@ -15,7 +15,7 @@
}, },
"preferUnplugged": true, "preferUnplugged": true,
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-libvips-linux-s390x": "1.0.1" "@img/sharp-libvips-linux-s390x": "1.0.2"
}, },
"files": [ "files": [
"lib" "lib"

2
npm/linux-x64/package.json
View File

@ -15,7 +15,7 @@
}, },
"preferUnplugged": true, "preferUnplugged": true,
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-libvips-linux-x64": "1.0.1" "@img/sharp-libvips-linux-x64": "1.0.2"
}, },
"files": [ "files": [
"lib" "lib"

2
npm/linuxmusl-arm64/package.json
View File

@ -15,7 +15,7 @@
}, },
"preferUnplugged": true, "preferUnplugged": true,
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-libvips-linuxmusl-arm64": "1.0.1" "@img/sharp-libvips-linuxmusl-arm64": "1.0.2"
}, },
"files": [ "files": [
"lib" "lib"

2
npm/linuxmusl-x64/package.json
View File

@ -15,7 +15,7 @@
}, },
"preferUnplugged": true, "preferUnplugged": true,
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-libvips-linuxmusl-x64": "1.0.1" "@img/sharp-libvips-linuxmusl-x64": "1.0.2"
}, },
"files": [ "files": [
"lib" "lib"

26
package.json
View File

@ -143,14 +143,14 @@
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-darwin-arm64": "0.33.2", "@img/sharp-darwin-arm64": "0.33.2",
"@img/sharp-darwin-x64": "0.33.2", "@img/sharp-darwin-x64": "0.33.2",
"@img/sharp-libvips-darwin-arm64": "1.0.1", "@img/sharp-libvips-darwin-arm64": "1.0.2",
"@img/sharp-libvips-darwin-x64": "1.0.1", "@img/sharp-libvips-darwin-x64": "1.0.2",
"@img/sharp-libvips-linux-arm": "1.0.1", "@img/sharp-libvips-linux-arm": "1.0.2",
"@img/sharp-libvips-linux-arm64": "1.0.1", "@img/sharp-libvips-linux-arm64": "1.0.2",
"@img/sharp-libvips-linux-s390x": "1.0.1", "@img/sharp-libvips-linux-s390x": "1.0.2",
"@img/sharp-libvips-linux-x64": "1.0.1", "@img/sharp-libvips-linux-x64": "1.0.2",
"@img/sharp-libvips-linuxmusl-arm64": "1.0.1", "@img/sharp-libvips-linuxmusl-arm64": "1.0.2",
"@img/sharp-libvips-linuxmusl-x64": "1.0.1", "@img/sharp-libvips-linuxmusl-x64": "1.0.2",
"@img/sharp-linux-arm": "0.33.2", "@img/sharp-linux-arm": "0.33.2",
"@img/sharp-linux-arm64": "0.33.2", "@img/sharp-linux-arm64": "0.33.2",
"@img/sharp-linux-s390x": "0.33.2", "@img/sharp-linux-s390x": "0.33.2",
@ -163,10 +163,10 @@
}, },
"devDependencies": { "devDependencies": {
"@emnapi/runtime": "^1.0.0", "@emnapi/runtime": "^1.0.0",
"@img/sharp-libvips-dev": "1.0.1", "@img/sharp-libvips-dev": "1.0.2",
"@img/sharp-libvips-dev-wasm32": "1.0.1", "@img/sharp-libvips-dev-wasm32": "1.0.3",
"@img/sharp-libvips-win32-ia32": "1.0.1", "@img/sharp-libvips-win32-ia32": "1.0.2",
"@img/sharp-libvips-win32-x64": "1.0.1", "@img/sharp-libvips-win32-x64": "1.0.2",
"@types/node": "*", "@types/node": "*",
"async": "^3.2.5", "async": "^3.2.5",
"cc": "^3.0.1", "cc": "^3.0.1",
@ -187,7 +187,7 @@
"license": "Apache-2.0", "license": "Apache-2.0",
"engines": { "engines": {
"node": "^18.17.0 || ^20.3.0 || >=21.0.0", "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
"libvips": ">=8.15.1" "libvips": ">=8.15.2"
}, },
"funding": { "funding": {
"url": "https://opencollective.com/libvips" "url": "https://opencollective.com/libvips"

4
src/common.h
View File

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

2
test/unit/libvips.js
View File

@ -162,7 +162,7 @@ describe('libvips binaries', function () {
process.env.npm_config_arch = 's390x'; process.env.npm_config_arch = 's390x';
process.env.npm_config_libc = ''; process.env.npm_config_libc = '';
const locatorHash = libvips.yarnLocator(); const locatorHash = libvips.yarnLocator();
assert.strictEqual(locatorHash, 'f2bd19138a'); assert.strictEqual(locatorHash, '45978c229d');
delete process.env.npm_config_platform; delete process.env.npm_config_platform;
delete process.env.npm_config_arch; delete process.env.npm_config_arch;
delete process.env.npm_config_libc; delete process.env.npm_config_libc;