From e22d093002a1b31f546cfe9ee0c22c3411fb2440 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 12 Nov 2014 20:30:13 +0000 Subject: [PATCH] Ubuntu 14 now compiles 7.40.x from source as packaged version is the outdated 7.38.x Added support for Ubuntu 15 and Mint 17.1 --- README.md | 6 +++--- preinstall.sh | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5f8eea4a..6056e39c 100755 --- a/README.md +++ b/README.md @@ -29,16 +29,16 @@ This module is powered by the blazingly fast [libvips](https://github.com/jcupit ### Prerequisites * Node.js v0.10+ -* [libvips](https://github.com/jcupitt/libvips) v7.38.5+ (7.40.9+ recommended) +* [libvips](https://github.com/jcupitt/libvips) v7.38.5+ (7.40.12+ recommended) -To install the latest version of libvips on the following Operating Systems: +To install the most suitable version of libvips on the following Operating Systems: * Mac OS * Homebrew * MacPorts * Debian Linux * Debian 7, 8 - * Ubuntu 12.04, 14.04, 14.10 + * Ubuntu 12.04, 14.04, 14.10, 15.04 * Mint 13, 17 * Red Hat Linux * RHEL/Centos/Scientific 6, 7 diff --git a/preinstall.sh b/preinstall.sh index ee9cfa2a..24f2fcf5 100755 --- a/preinstall.sh +++ b/preinstall.sh @@ -86,11 +86,17 @@ case $(uname -s) in DISTRO=$(lsb_release -c -s) echo "Detected Debian Linux '$DISTRO'" case "$DISTRO" in - jessie|trusty|utopic|qiana) - # Debian 8, Ubuntu 14, Mint 17 + jessie|vivid) + # Debian 8, Ubuntu 15 echo "Installing libvips via apt-get" apt-get install -y libvips-dev ;; + trusty|utopic|qiana|rebecca) + # Ubuntu 14, Mint 17 + echo "Installing libvips dependencies via apt-get" + apt-get install -y automake build-essential gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg-turbo8-dev libpng12-dev libwebp-dev libtiff5-dev libexif-dev libxml2-dev swig libmagickwand-dev curl + install_libvips_from_source + ;; precise|wheezy|maya) # Debian 7, Ubuntu 12.04, Mint 13 echo "Installing libvips dependencies via apt-get"