From 3c7cbf868561420554c919abf5abb74ccc440ef4 Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Sat, 2 Jan 2016 14:13:58 +0000
Subject: [PATCH] Update libvips to v8.2.0 Plus version bumps of other
 dependencies

---
 docs/install.md          |  2 +-
 package.json             |  8 +++----
 packaging/build.sh       |  4 ++--
 packaging/lin/Dockerfile | 52 ++++++++++++++++++++--------------------
 packaging/win/Dockerfile |  9 +++----
 preinstall.sh            | 26 ++++++++------------
 6 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/docs/install.md b/docs/install.md
index 018137a0..c30bb9e4 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -22,7 +22,7 @@ Most recent 64-bit Linux-based operating systems should "just work", e.g.:
 * Debian 7, 8
 * Ubuntu 12.04, 14.04, 14.10, 15.04, 15.10
 * Centos 7
-* Fedora 20, 21
+* Fedora 21, 22, 23
 * openSUSE 13.2
 * Archlinux 2015.06.01
 
diff --git a/package.json b/package.json
index a26863d5..cbae9187 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "vips"
   ],
   "dependencies": {
-    "bluebird": "^3.0.5",
+    "bluebird": "^3.1.1",
     "color": "^0.10.1",
     "nan": "^2.1.0",
     "semver": "^5.1.0",
@@ -59,16 +59,16 @@
     "coveralls": "^2.11.6",
     "exif-reader": "^1.0.0",
     "icc": "^0.0.2",
-    "istanbul": "^0.4.0",
+    "istanbul": "^0.4.1",
     "mocha": "^2.3.4",
     "mocha-jshint": "^2.2.5",
     "node-cpplint": "^0.4.0",
-    "rimraf": "^2.4.4",
+    "rimraf": "^2.5.0",
     "bufferutil": "^1.2.1"
   },
   "license": "Apache-2.0",
   "config": {
-    "libvips": "8.1.1"
+    "libvips": "8.2.0"
   },
   "engines": {
     "node": ">=0.10"
diff --git a/packaging/build.sh b/packaging/build.sh
index b543436e..66ff1250 100755
--- a/packaging/build.sh
+++ b/packaging/build.sh
@@ -13,14 +13,14 @@ fi
 
 docker build -t vips-dev-win win
 WIN_CONTAINER_ID=$(docker run -d vips-dev-win)
-docker cp $WIN_CONTAINER_ID:/libvips-8.1.1-win.tar.gz .
+docker cp $WIN_CONTAINER_ID:/libvips-8.2.0-win.tar.gz .
 docker rm $WIN_CONTAINER_ID
 
 # Linux
 
 docker build -t vips-dev-lin lin
 LIN_CONTAINER_ID=$(docker run -d vips-dev-lin)
-docker cp $LIN_CONTAINER_ID:/libvips-8.1.1-lin.tar.gz .
+docker cp $LIN_CONTAINER_ID:/libvips-8.2.0-lin.tar.gz .
 docker rm $LIN_CONTAINER_ID
 
 # Checksums
diff --git a/packaging/lin/Dockerfile b/packaging/lin/Dockerfile
index 61cff49e..c5e24743 100644
--- a/packaging/lin/Dockerfile
+++ b/packaging/lin/Dockerfile
@@ -4,32 +4,32 @@ MAINTAINER Lovell Fuller <npm@lovell.info>
 # Build dependencies
 RUN apt-get update && apt-get install -y build-essential autoconf libtool nasm gtk-doc-tools texinfo
 
-# Working directories
-ENV DEPS /deps
-ENV TARGET /target
+# Create working directories
+ENV DEPS=/deps \
+    TARGET=/target
 RUN mkdir ${DEPS} && mkdir ${TARGET}
 
 # Common build paths and flags
-ENV PKG_CONFIG_PATH ${PKG_CONFIG_PATH}:${TARGET}/lib/pkgconfig
-ENV PATH ${PATH}:${TARGET}/bin
-ENV CPPFLAGS -I${TARGET}/include
-ENV LDFLAGS -L${TARGET}/lib
+ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${TARGET}/lib/pkgconfig \
+    PATH=${PATH}:${TARGET}/bin \
+    CPPFLAGS=-I${TARGET}/include \
+    LDFLAGS=-L${TARGET}/lib
 
 # Dependency version numbers
-ENV VERSION_ZLIB 1.2.8
-ENV VERSION_FFI 3.2.1
-ENV VERSION_GLIB 2.46.2
-ENV VERSION_XML2 2.9.2
-ENV VERSION_GSF 1.14.34
-ENV VERSION_EXIF 0.6.21
-ENV VERSION_JPEG 1.4.2
-ENV VERSION_PNG16 1.6.19
-ENV VERSION_LCMS2 2.7
-ENV VERSION_WEBP 0.4.4
-ENV VERSION_TIFF 4.0.6
-ENV VERSION_MAGICK 6.9.2-6
-ENV VERSION_ORC 0.4.24
-ENV VERSION_VIPS 8.1.1
+ENV VERSION_ZLIB=1.2.8 \
+    VERSION_FFI=3.2.1 \
+    VERSION_GLIB=2.46.2 \
+    VERSION_XML2=2.9.3 \
+    VERSION_GSF=1.14.34 \
+    VERSION_EXIF=0.6.21 \
+    VERSION_JPEG=1.4.2 \
+    VERSION_PNG16=1.6.20 \
+    VERSION_LCMS2=2.7 \
+    VERSION_WEBP=0.5.0 \
+    VERSION_TIFF=4.0.6 \
+    VERSION_MAGICK=6.9.2-10 \
+    VERSION_ORC=0.4.24 \
+    VERSION_VIPS=8.2.0
 
 RUN mkdir ${DEPS}/zlib
 RUN curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz | tar xJC ${DEPS}/zlib --strip-components=1
@@ -58,22 +58,22 @@ WORKDIR ${DEPS}/gsf
 RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip
 
 RUN mkdir ${DEPS}/exif
-RUN curl -Ls http://kent.dl.sourceforge.net/project/libexif/libexif/${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.bz2 | tar xjC ${DEPS}/exif --strip-components=1
+RUN curl -Ls http://heanet.dl.sourceforge.net/project/libexif/libexif/${VERSION_EXIF}/libexif-${VERSION_EXIF}.tar.bz2 | tar xjC ${DEPS}/exif --strip-components=1
 WORKDIR ${DEPS}/exif
 RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip
 
 RUN mkdir ${DEPS}/jpeg
-RUN curl -Ls http://kent.dl.sourceforge.net/project/libjpeg-turbo/${VERSION_JPEG}/libjpeg-turbo-${VERSION_JPEG}.tar.gz | tar xzC ${DEPS}/jpeg --strip-components=1
+RUN curl -Ls http://heanet.dl.sourceforge.net/project/libjpeg-turbo/${VERSION_JPEG}/libjpeg-turbo-${VERSION_JPEG}.tar.gz | tar xzC ${DEPS}/jpeg --strip-components=1
 WORKDIR ${DEPS}/jpeg
 RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --with-jpeg8 --without-turbojpeg && make install-strip
 
 RUN mkdir ${DEPS}/png16
-RUN curl -Ls http://kent.dl.sourceforge.net/project/libpng/libpng16/${VERSION_PNG16}/libpng-${VERSION_PNG16}.tar.xz | tar xJC ${DEPS}/png16 --strip-components=1
+RUN curl -Ls http://heanet.dl.sourceforge.net/project/libpng/libpng16/${VERSION_PNG16}/libpng-${VERSION_PNG16}.tar.xz | tar xJC ${DEPS}/png16 --strip-components=1
 WORKDIR ${DEPS}/png16
 RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip
 
 RUN mkdir ${DEPS}/lcms2
-RUN curl -Ls http://kent.dl.sourceforge.net/project/lcms/lcms/${VERSION_LCMS2}/lcms2-${VERSION_LCMS2}.tar.gz | tar xzC ${DEPS}/lcms2 --strip-components=1
+RUN curl -Ls http://heanet.dl.sourceforge.net/project/lcms/lcms/${VERSION_LCMS2}/lcms2-${VERSION_LCMS2}.tar.gz | tar xzC ${DEPS}/lcms2 --strip-components=1
 WORKDIR ${DEPS}/lcms2
 RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip
 
@@ -99,7 +99,7 @@ WORKDIR ${DEPS}/orc
 RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip
 
 RUN mkdir ${DEPS}/vips
-RUN curl -Ls http://www.vips.ecs.soton.ac.uk/supported/8.1/vips-${VERSION_VIPS}.tar.gz | tar xzC ${DEPS}/vips --strip-components=1
+RUN curl -Ls http://www.vips.ecs.soton.ac.uk/supported/8.2/vips-${VERSION_VIPS}.tar.gz | tar xzC ${DEPS}/vips --strip-components=1
 WORKDIR ${DEPS}/vips
 RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking \
   --disable-debug --disable-introspection --without-python --without-fftw \
diff --git a/packaging/win/Dockerfile b/packaging/win/Dockerfile
index e1eb1105..d3d1d36e 100644
--- a/packaging/win/Dockerfile
+++ b/packaging/win/Dockerfile
@@ -6,11 +6,12 @@ RUN apt-get update && apt-get install -y curl zip
 # Fetch and unzip
 RUN mkdir /vips
 WORKDIR /vips
-RUN curl -O http://www.vips.ecs.soton.ac.uk/supported/8.1/win32/vips-dev-w64-8.1.1-3.zip
-RUN unzip vips-dev-w64-8.1.1-3.zip
+RUN curl -O http://www.vips.ecs.soton.ac.uk/supported/8.2/win32/vips-dev-w64-8.2.zip
+RUN unzip vips-dev-w64-8.2.zip
 
 # Clean and zip
-WORKDIR /vips/vips-dev-8.1.1
+WORKDIR /vips/vips-dev-8.2
 RUN rm bin/libvipsCC-42.dll bin/libvips-cpp-42.dll bin/libgsf-win32-1-114.dll bin/libstdc++-6.dll
 RUN cp bin/*.dll lib/
-RUN GZIP=-9 tar czf /libvips-8.1.1-win.tar.gz include lib/glib-2.0 lib/libvips.lib lib/libglib-2.0.lib lib/libgobject-2.0.lib lib/*.dll
+RUN cp -r lib64/* lib/
+RUN GZIP=-9 tar czf /libvips-8.2.0-win.tar.gz include lib/glib-2.0 lib/libvips.lib lib/libglib-2.0.lib lib/libgobject-2.0.lib lib/*.dll
diff --git a/preinstall.sh b/preinstall.sh
index 28567706..37fa1c62 100755
--- a/preinstall.sh
+++ b/preinstall.sh
@@ -9,13 +9,13 @@
 #   * Elementary 0.3
 # * Red Hat Linux
 #   * RHEL/Centos/Scientific 6, 7
-#   * Fedora 21, 22
+#   * Fedora 21, 22, 23
 #   * Amazon Linux 2015.03, 2015.09
 # * OpenSuse 13
 
-vips_version_minimum=8.1.1
-vips_version_latest_major_minor=8.1
-vips_version_latest_patch=1
+vips_version_minimum=8.2.0
+vips_version_latest_major_minor=8.2
+vips_version_latest_patch=0
 
 openslide_version_minimum=3.4.0
 openslide_version_latest_major_minor=3.4
@@ -253,18 +253,12 @@ elif [ -f /etc/redhat-release ]; then
       yum install -y --enablerepo=remi libwebp-devel
       install_libvips_from_source "--prefix=/usr"
       ;;
-    "Fedora release 21 "*|"Fedora release 22 "*)
-      # Fedora 21, 22
-      if [ $enable_openslide -eq 1 ]; then
-        echo "Installing libvips dependencies via yum"
-        yum groupinstall -y "Development Tools"
-        yum install -y gcc-c++ gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl
-        echo "Compiling vips with openslide support"
-        install_libvips_from_source "--prefix=/usr"
-      else
-        echo "Installing libvips via yum"
-        yum install -y vips-devel
-      fi
+    "Fedora"*)
+      # Fedora 21, 22, 23
+      echo "Installing libvips dependencies via yum"
+      yum groupinstall -y "Development Tools"
+      yum install -y gcc-c++ gtk-doc libxml2-devel libjpeg-turbo-devel libpng-devel libtiff-devel libexif-devel lcms-devel ImageMagick-devel gobject-introspection-devel libwebp-devel curl
+      install_libvips_from_source "--prefix=/usr"
       ;;
     *)
       # Unsupported RHEL-based OS