From 2656c69d991ce8b8384d96d2f18a89d50912301b Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sun, 31 Jan 2016 11:26:47 +0000 Subject: [PATCH] Upgrade to libvips v8.2.2 --- docs/install.md | 2 +- package.json | 2 +- packaging/arm/build.sh | 8 +++++--- packaging/build.sh | 4 ++-- packaging/lin/Dockerfile | 10 ++++++---- packaging/win/Dockerfile | 11 +++-------- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/docs/install.md b/docs/install.md index ce723df0..b92ea1d4 100644 --- a/docs/install.md +++ b/docs/install.md @@ -15,7 +15,7 @@ npm install sharp [![Linux Build Status](https://circleci.com/gh/lovell/sharp.svg?style=svg&circle-token=6cb6d1d287a51af83722b19ed8885377fbc85e5c)](https://circleci.com/gh/lovell/sharp) libvips and its dependencies are fetched and stored within `node_modules/sharp` during `npm install`. -This involves an automated HTTPS download of approximately 6MB. +This involves an automated HTTPS download of approximately 7MB. Most recent Linux-based operating systems running on x64 and ARMv6+ CPUs should "just work", e.g.: diff --git a/package.json b/package.json index 6742734b..73307645 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ }, "license": "Apache-2.0", "config": { - "libvips": "8.2.1" + "libvips": "8.2.2" }, "engines": { "node": ">=0.10" diff --git a/packaging/arm/build.sh b/packaging/arm/build.sh index e9932099..bcf38a03 100755 --- a/packaging/arm/build.sh +++ b/packaging/arm/build.sh @@ -13,6 +13,8 @@ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${TARGET}/lib/pkgconfig" export PATH="${PATH}:${TARGET}/bin" export CPPFLAGS="-I${TARGET}/include" export LDFLAGS="-L${TARGET}/lib" +export CFLAGS="-O3" +export CXXFLAGS="-O3" # Dependency version numbers VERSION_ZLIB=1.2.8 @@ -22,13 +24,13 @@ 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_PNG16=1.6.21 VERSION_LCMS2=2.7 VERSION_WEBP=0.5.0 VERSION_TIFF=4.0.6 -VERSION_MAGICK=6.9.2-10 +VERSION_MAGICK=6.9.3-2 VERSION_ORC=0.4.24 -VERSION_VIPS=8.2.1 +VERSION_VIPS=8.2.2 mkdir ${DEPS}/zlib curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz | tar xJC ${DEPS}/zlib --strip-components=1 diff --git a/packaging/build.sh b/packaging/build.sh index fd0ce6b3..24f8f849 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.2.1-win.tar.gz . +docker cp $WIN_CONTAINER_ID:/libvips-8.2.2-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.2.1-lin.tar.gz . +docker cp $LIN_CONTAINER_ID:/libvips-8.2.2-lin.tar.gz . docker rm $LIN_CONTAINER_ID # Checksums diff --git a/packaging/lin/Dockerfile b/packaging/lin/Dockerfile index 62b7afeb..e4dae5a0 100644 --- a/packaging/lin/Dockerfile +++ b/packaging/lin/Dockerfile @@ -13,7 +13,9 @@ RUN mkdir ${DEPS} && mkdir ${TARGET} ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${TARGET}/lib/pkgconfig \ PATH=${PATH}:${TARGET}/bin \ CPPFLAGS=-I${TARGET}/include \ - LDFLAGS=-L${TARGET}/lib + LDFLAGS=-L${TARGET}/lib \ + CFLAGS="-O3" \ + CXXFLAGS="-O3" # Dependency version numbers ENV VERSION_ZLIB=1.2.8 \ @@ -23,13 +25,13 @@ ENV VERSION_ZLIB=1.2.8 \ VERSION_GSF=1.14.34 \ VERSION_EXIF=0.6.21 \ VERSION_JPEG=1.4.2 \ - VERSION_PNG16=1.6.20 \ + VERSION_PNG16=1.6.21 \ VERSION_LCMS2=2.7 \ VERSION_WEBP=0.5.0 \ VERSION_TIFF=4.0.6 \ - VERSION_MAGICK=6.9.2-10 \ + VERSION_MAGICK=6.9.3-2 \ VERSION_ORC=0.4.24 \ - VERSION_VIPS=8.2.1 + VERSION_VIPS=8.2.2 RUN mkdir ${DEPS}/zlib RUN curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz | tar xJC ${DEPS}/zlib --strip-components=1 diff --git a/packaging/win/Dockerfile b/packaging/win/Dockerfile index d469c261..74ddc3d6 100644 --- a/packaging/win/Dockerfile +++ b/packaging/win/Dockerfile @@ -6,8 +6,8 @@ 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.2/win32/vips-dev-w64-8.2.1.zip -RUN unzip vips-dev-w64-8.2.1.zip +RUN curl -O http://www.vips.ecs.soton.ac.uk/supported/8.2/win32/vips-dev-w64-8.2.2.zip +RUN unzip vips-dev-w64-8.2.2.zip # Clean and zip WORKDIR /vips/vips-dev-8.2 @@ -15,9 +15,4 @@ RUN rm bin/libvipsCC-42.dll bin/libvips-cpp-42.dll bin/libgsf-win32-1-114.dll bi RUN cp bin/*.dll lib/ RUN cp -r lib64/* lib/ -# Temporary workaround until libvips 8.2.2 is released -RUN curl -L -o include/vips/VError8.h https://raw.githubusercontent.com/jcupitt/libvips/master/cplusplus/include/vips/VError8.h -RUN curl -L -o include/vips/VImage8.h https://raw.githubusercontent.com/jcupitt/libvips/master/cplusplus/include/vips/VImage8.h -RUN curl -L -o include/vips/vips8 https://raw.githubusercontent.com/jcupitt/libvips/master/cplusplus/include/vips/vips8 - -RUN GZIP=-9 tar czf /libvips-8.2.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 GZIP=-9 tar czf /libvips-8.2.2-win.tar.gz include lib/glib-2.0 lib/libvips.lib lib/libglib-2.0.lib lib/libgobject-2.0.lib lib/*.dll