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.3

Browse Source
This commit is contained in:
Lovell Fuller 2024-08-12 13:19:10 +01:00
parent 2eb03b0049
commit de42667767
14 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,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.56" container: "emscripten/emsdk:3.1.64"
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.2 Requires libvips v8.15.3
### v0.33.5 - TBD ### v0.33.5 - TBD
* Upgrade to libvips v8.15.3 for upstream bug fixes.
* Add `pageHeight` and `pages` to response of multi-page output. * Add `pageHeight` and `pages` to response of multi-page output.
[#3411](https://github.com/lovell/sharp/issues/3411) [#3411](https://github.com/lovell/sharp/issues/3411)

2
docs/install.md
View File

@ -43,7 +43,7 @@ Ready-compiled sharp and libvips binaries are provided for use on the most commo
* macOS x64 (>= 10.13) * macOS x64 (>= 10.13)
* macOS ARM64 * macOS ARM64
* Linux ARM (glibc >= 2.28) * Linux ARM (glibc >= 2.31)
* Linux ARM64 (glibc >= 2.26, musl >= 1.2.2) * Linux ARM64 (glibc >= 2.26, musl >= 1.2.2)
* Linux s390x (glibc >= 2.31) * Linux s390x (glibc >= 2.31)
* Linux x64 (glibc >= 2.26, musl >= 1.2.2, CPU with SSE4.2) * Linux x64 (glibc >= 2.26, musl >= 1.2.2, CPU with SSE4.2)

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.2" "@img/sharp-libvips-darwin-arm64": "1.0.4"
}, },
"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.2" "@img/sharp-libvips-darwin-x64": "1.0.4"
}, },
"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.2" "@img/sharp-libvips-linux-arm": "1.0.4"
}, },
"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.2" "@img/sharp-libvips-linux-arm64": "1.0.4"
}, },
"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.2" "@img/sharp-libvips-linux-s390x": "1.0.4"
}, },
"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.2" "@img/sharp-libvips-linux-x64": "1.0.4"
}, },
"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.2" "@img/sharp-libvips-linuxmusl-arm64": "1.0.4"
}, },
"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.2" "@img/sharp-libvips-linuxmusl-x64": "1.0.4"
}, },
"files": [ "files": [
"lib" "lib"

30
package.json
View File

@ -144,14 +144,14 @@
"optionalDependencies": { "optionalDependencies": {
"@img/sharp-darwin-arm64": "0.33.4", "@img/sharp-darwin-arm64": "0.33.4",
"@img/sharp-darwin-x64": "0.33.4", "@img/sharp-darwin-x64": "0.33.4",
"@img/sharp-libvips-darwin-arm64": "1.0.2", "@img/sharp-libvips-darwin-arm64": "1.0.4",
"@img/sharp-libvips-darwin-x64": "1.0.2", "@img/sharp-libvips-darwin-x64": "1.0.4",
"@img/sharp-libvips-linux-arm": "1.0.2", "@img/sharp-libvips-linux-arm": "1.0.4",
"@img/sharp-libvips-linux-arm64": "1.0.2", "@img/sharp-libvips-linux-arm64": "1.0.4",
"@img/sharp-libvips-linux-s390x": "1.0.2", "@img/sharp-libvips-linux-s390x": "1.0.4",
"@img/sharp-libvips-linux-x64": "1.0.2", "@img/sharp-libvips-linux-x64": "1.0.4",
"@img/sharp-libvips-linuxmusl-arm64": "1.0.2", "@img/sharp-libvips-linuxmusl-arm64": "1.0.4",
"@img/sharp-libvips-linuxmusl-x64": "1.0.2", "@img/sharp-libvips-linuxmusl-x64": "1.0.4",
"@img/sharp-linux-arm": "0.33.4", "@img/sharp-linux-arm": "0.33.4",
"@img/sharp-linux-arm64": "0.33.4", "@img/sharp-linux-arm64": "0.33.4",
"@img/sharp-linux-s390x": "0.33.4", "@img/sharp-linux-s390x": "0.33.4",
@ -164,10 +164,10 @@
}, },
"devDependencies": { "devDependencies": {
"@emnapi/runtime": "^1.2.0", "@emnapi/runtime": "^1.2.0",
"@img/sharp-libvips-dev": "1.0.2", "@img/sharp-libvips-dev": "1.0.4",
"@img/sharp-libvips-dev-wasm32": "1.0.3", "@img/sharp-libvips-dev-wasm32": "1.0.5",
"@img/sharp-libvips-win32-ia32": "1.0.2", "@img/sharp-libvips-win32-ia32": "1.0.4",
"@img/sharp-libvips-win32-x64": "1.0.2", "@img/sharp-libvips-win32-x64": "1.0.4",
"@types/node": "*", "@types/node": "*",
"async": "^3.2.5", "async": "^3.2.5",
"cc": "^3.0.1", "cc": "^3.0.1",
@ -175,9 +175,9 @@
"exif-reader": "^2.0.1", "exif-reader": "^2.0.1",
"extract-zip": "^2.0.1", "extract-zip": "^2.0.1",
"icc": "^3.0.0", "icc": "^3.0.0",
"jsdoc-to-markdown": "^8.0.2", "jsdoc-to-markdown": "^8.0.3",
"license-checker": "^25.0.1", "license-checker": "^25.0.1",
"mocha": "^10.7.0", "mocha": "^10.7.3",
"node-addon-api": "^8.1.0", "node-addon-api": "^8.1.0",
"nyc": "^17.0.0", "nyc": "^17.0.0",
"prebuild": "^13.0.1", "prebuild": "^13.0.1",
@ -188,7 +188,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.2" "libvips": ">=8.15.3"
}, },
"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 < 2) (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 3)
#error "libvips version 8.15.2+ is required - please see https://sharp.pixelplumbing.com/install" #error "libvips version 8.15.3+ 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

@ -179,7 +179,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, '45978c229d'); assert.strictEqual(locatorHash, 'c4ea54fdc1');
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;