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

Upgrade to libvips v8.5.5

Browse Source
This commit is contained in:
Lovell Fuller 2017-05-21 17:46:49 +01:00
parent b7b6fdbdf5
commit f78ffdb9ce
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
binding.js
View File

@ -3,7 +3,6 @@
const fs = require('fs'); const fs = require('fs');
const os = require('os'); const os = require('os');
const path = require('path'); const path = require('path');
const zlib = require('zlib');
const caw = require('caw'); const caw = require('caw');
const got = require('got'); const got = require('got');
@ -29,15 +28,16 @@ const isFile = function (file) {
}; };
const unpack = function (tarPath, done) { const unpack = function (tarPath, done) {
const extractor = tar.Extract({ path: path.join(__dirname, 'vendor') }); const vendorPath = path.join(__dirname, 'vendor');
if (done) { fs.mkdirSync(vendorPath);
extractor.on('end', done); tar
} .extract({
extractor.on('error', error); file: tarPath,
fs.createReadStream(tarPath) cwd: vendorPath,
.on('error', error) strict: true
.pipe(zlib.Unzip()) })
.pipe(extractor); .then(done)
.catch(error);
}; };
const platformId = function () { const platformId = function () {

2
docs/changelog.md
View File

@ -2,7 +2,7 @@
### v0.18 - "*ridge*" ### v0.18 - "*ridge*"
Requires libvips v8.5.2. Requires libvips v8.5.5.
#### v0.18.0 - TBD #### v0.18.0 - TBD

6
package.json
View File

@ -70,7 +70,7 @@
"got": "^6.7.1", "got": "^6.7.1",
"nan": "^2.6.2", "nan": "^2.6.2",
"semver": "^5.3.0", "semver": "^5.3.0",
"tar": "^2.2.1" "tar": "^3.1.3"
}, },
"devDependencies": { "devDependencies": {
"async": "^2.4.0", "async": "^2.4.0",
@ -78,7 +78,7 @@
"documentation": "^4.0.0-rc.1", "documentation": "^4.0.0-rc.1",
"exif-reader": "^1.0.2", "exif-reader": "^1.0.2",
"icc": "^1.0.0", "icc": "^1.0.0",
"mocha": "^3.3.0", "mocha": "^3.4.1",
"nyc": "^10.3.2", "nyc": "^10.3.2",
"rimraf": "^2.5.4", "rimraf": "^2.5.4",
"semistandard": "^11.0.0", "semistandard": "^11.0.0",
@ -86,7 +86,7 @@
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"config": { "config": {
"libvips": "8.5.4" "libvips": "8.5.5"
}, },
"engines": { "engines": {
"node": ">=4" "node": ">=4"

14
packaging/build/lin.sh
View File

@ -18,7 +18,7 @@ export CXXFLAGS="${FLAGS}"
# Dependency version numbers # Dependency version numbers
VERSION_ZLIB=1.2.11 VERSION_ZLIB=1.2.11
VERSION_FFI=3.2.1 VERSION_FFI=3.2.1
VERSION_GLIB=2.52.0 VERSION_GLIB=2.53.1
VERSION_XML2=2.9.4 VERSION_XML2=2.9.4
VERSION_GSF=1.14.41 VERSION_GSF=1.14.41
VERSION_EXIF=0.6.21 VERSION_EXIF=0.6.21
@ -29,15 +29,15 @@ VERSION_WEBP=0.6.0
VERSION_TIFF=4.0.7 VERSION_TIFF=4.0.7
VERSION_ORC=0.4.26 VERSION_ORC=0.4.26
VERSION_GDKPIXBUF=2.36.6 VERSION_GDKPIXBUF=2.36.6
VERSION_FREETYPE=2.7.1 VERSION_FREETYPE=2.8
VERSION_EXPAT=2.2.0 VERSION_EXPAT=2.2.0
VERSION_FONTCONFIG=2.12.1 VERSION_FONTCONFIG=2.12.1
VERSION_HARFBUZZ=1.4.5 VERSION_HARFBUZZ=1.4.6
VERSION_PIXMAN=0.34.0 VERSION_PIXMAN=0.34.0
VERSION_CAIRO=1.14.8 VERSION_CAIRO=1.14.8
VERSION_PANGO=1.40.4 VERSION_PANGO=1.40.5
VERSION_CROCO=0.6.11 VERSION_CROCO=0.6.12
VERSION_SVG=2.40.16 VERSION_SVG=2.40.17
VERSION_GIF=5.1.4 VERSION_GIF=5.1.4
# Least out-of-sync Sourceforge mirror # Least out-of-sync Sourceforge mirror
@ -57,7 +57,7 @@ cd ${DEPS}/ffi
make install-strip make install-strip
mkdir ${DEPS}/glib mkdir ${DEPS}/glib
curl -Ls https://download.gnome.org/sources/glib/2.52/glib-${VERSION_GLIB}.tar.xz | tar xJC ${DEPS}/glib --strip-components=1 curl -Ls https://download.gnome.org/sources/glib/2.53/glib-${VERSION_GLIB}.tar.xz | tar xJC ${DEPS}/glib --strip-components=1
cd ${DEPS}/glib cd ${DEPS}/glib
echo glib_cv_stack_grows=no >>glib.cache echo glib_cv_stack_grows=no >>glib.cache
echo glib_cv_uscore=no >>glib.cache echo glib_cv_uscore=no >>glib.cache

4
src/common.h
View File

@ -25,8 +25,8 @@
// Verify platform and compiler compatibility // Verify platform and compiler compatibility
#if (VIPS_MAJOR_VERSION < 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 4)) #if (VIPS_MAJOR_VERSION < 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 5))
#error libvips version 8.4.x required - see sharp.dimens.io/page/install #error libvips version 8.5.x required - see sharp.dimens.io/page/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)))