Document Debian 7 support

Add liborc to fix openSUSE support

Switch recommended *magick to ImageMagick for OS X

Increase test timeouts (for Circle CI)
This commit is contained in:
Lovell Fuller 2015-11-19 22:47:34 +00:00
parent 434a433a09
commit c9ecc7a517
3 changed files with 8 additions and 7 deletions

View File

@ -100,6 +100,7 @@
'<(module_root_dir)/lib/liblcms2.so', '<(module_root_dir)/lib/liblcms2.so',
'<(module_root_dir)/lib/libpng16.so', '<(module_root_dir)/lib/libpng16.so',
'<(module_root_dir)/lib/libxml2.so', '<(module_root_dir)/lib/libxml2.so',
'<(module_root_dir)/lib/liborc-0.4.so',
# Ensure runtime linking is relative to sharp.node # Ensure runtime linking is relative to sharp.node
'-Wl,-rpath=\'$${ORIGIN}/../../lib\'' '-Wl,-rpath=\'$${ORIGIN}/../../lib\''
] ]

View File

@ -18,7 +18,7 @@ This involves an automated HTTPS download of approximately 6MB.
Most recent 64-bit Linux-based operating systems should "just work", e.g.: Most recent 64-bit Linux-based operating systems should "just work", e.g.:
* Debian 8 * Debian 7, 8
* Ubuntu 12.04, 14.04, 14.10, 15.04, 15.10 * Ubuntu 12.04, 14.04, 14.10, 15.04, 15.10
* Centos 7 * Centos 7
* Fedora 20, 21 * Fedora 20, 21
@ -53,7 +53,7 @@ brew install homebrew/science/vips
For GIF input and WebP output suppport use: For GIF input and WebP output suppport use:
```sh ```sh
brew install homebrew/science/vips --with-graphicsmagick --with-webp brew install homebrew/science/vips --with-imagemagick --with-webp
``` ```
A missing or incorrectly configured _Xcode Command Line Tools_ installation A missing or incorrectly configured _Xcode Command Line Tools_ installation

View File

@ -22,8 +22,8 @@
], ],
"description": "High performance Node.js module to resize JPEG, PNG, WebP and TIFF images using the libvips library", "description": "High performance Node.js module to resize JPEG, PNG, WebP and TIFF images using the libvips library",
"scripts": { "scripts": {
"clean": "rm -rf build/ include/ lib/ coverage/ test/fixtures/output.*", "clean": "rm -rf node_modules/ build/ include/ lib/ coverage/ test/fixtures/output.*",
"test": "VIPS_WARNING=0 node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --slow=5000 --timeout=20000 ./test/unit/*.js", "test": "VIPS_WARNING=0 node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --slow=5000 --timeout=30000 ./test/unit/*.js",
"test-win": "node ./node_modules/mocha/bin/mocha --slow=5000 --timeout=30000 ./test/unit/*.js", "test-win": "node ./node_modules/mocha/bin/mocha --slow=5000 --timeout=30000 ./test/unit/*.js",
"test-leak": "./test/leak/leak.sh", "test-leak": "./test/leak/leak.sh",
"test-packaging": "./packaging/test.sh", "test-packaging": "./packaging/test.sh",
@ -50,8 +50,8 @@
"bluebird": "^3.0.5", "bluebird": "^3.0.5",
"color": "^0.10.1", "color": "^0.10.1",
"nan": "^2.1.0", "nan": "^2.1.0",
"semver": "^5.0.3", "semver": "^5.1.0",
"request": "^2.65.0", "request": "^2.67.0",
"tar": "^2.2.1" "tar": "^2.2.1"
}, },
"devDependencies": { "devDependencies": {
@ -60,7 +60,7 @@
"exif-reader": "1.0.0", "exif-reader": "1.0.0",
"icc": "^0.0.2", "icc": "^0.0.2",
"istanbul": "^0.4.0", "istanbul": "^0.4.0",
"mocha": "^2.3.3", "mocha": "^2.3.4",
"mocha-jshint": "^2.2.5", "mocha-jshint": "^2.2.5",
"node-cpplint": "^0.4.0", "node-cpplint": "^0.4.0",
"rimraf": "^2.4.3", "rimraf": "^2.4.3",