From 5b4f4b06728a5261d29c0f460bc95fddf1550d5e Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Tue, 22 Mar 2016 09:25:29 +0000 Subject: [PATCH] Upgrade to libvips v8.2.3 ahead of sharp v0.14.0 --- binding.gyp | 2 +- package.json | 4 ++-- packaging/arm/build.sh | 6 +++--- packaging/build.sh | 10 ++++++---- packaging/lin/Dockerfile | 6 +++--- packaging/win/Dockerfile | 8 +++++--- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/binding.gyp b/binding.gyp index e561c761..8f87dd13 100644 --- a/binding.gyp +++ b/binding.gyp @@ -221,7 +221,7 @@ '<(module_root_dir)/lib/libintl-8.dll', '<(module_root_dir)/lib/libjpeg-62.dll', '<(module_root_dir)/lib/liblcms2-2.dll', - '<(module_root_dir)/lib/libopenjpeg-1.dll', + '<(module_root_dir)/lib/libopenjp2.dll', '<(module_root_dir)/lib/libopenslide-0.dll', '<(module_root_dir)/lib/libpango-1.0-0.dll', '<(module_root_dir)/lib/libpangocairo-1.0-0.dll', diff --git a/package.json b/package.json index de2aa324..3dd1b01c 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "vips" ], "dependencies": { - "bluebird": "^3.3.3", + "bluebird": "^3.3.4", "color": "^0.11.1", "nan": "^2.2.0", "semver": "^5.1.0", @@ -68,7 +68,7 @@ }, "license": "Apache-2.0", "config": { - "libvips": "8.2.2" + "libvips": "8.2.3" }, "engines": { "node": ">=0.10" diff --git a/packaging/arm/build.sh b/packaging/arm/build.sh index e677dab9..3b1e3b1a 100755 --- a/packaging/arm/build.sh +++ b/packaging/arm/build.sh @@ -19,7 +19,7 @@ export CXXFLAGS="-O3" # Dependency version numbers VERSION_ZLIB=1.2.8 VERSION_FFI=3.2.1 -VERSION_GLIB=2.47.5 +VERSION_GLIB=2.47.6 VERSION_XML2=2.9.3 VERSION_GSF=1.14.34 VERSION_EXIF=0.6.21 @@ -29,8 +29,8 @@ VERSION_JPEG=1.4.2 VERSION_PNG16=1.6.21 VERSION_WEBP=0.5.0 VERSION_TIFF=4.0.6 -VERSION_ORC=0.4.24 -VERSION_VIPS=8.2.2 +VERSION_ORC=0.4.25 +VERSION_VIPS=8.2.3 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 24f8f849..2d8d619a 100755 --- a/packaging/build.sh +++ b/packaging/build.sh @@ -1,5 +1,7 @@ #!/bin/sh +VERSION_VIPS=8.2.3 + # Is docker available? if ! type docker >/dev/null; then @@ -13,15 +15,15 @@ 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.2-win.tar.gz . -docker rm $WIN_CONTAINER_ID +docker cp "${WIN_CONTAINER_ID}:/libvips-${VERSION_VIPS}-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.2-lin.tar.gz . -docker rm $LIN_CONTAINER_ID +docker cp "${LIN_CONTAINER_ID}:/libvips-${VERSION_VIPS}-lin.tar.gz" . +docker rm "${LIN_CONTAINER_ID}" # Checksums diff --git a/packaging/lin/Dockerfile b/packaging/lin/Dockerfile index 7c19d927..c057e4a2 100644 --- a/packaging/lin/Dockerfile +++ b/packaging/lin/Dockerfile @@ -20,7 +20,7 @@ ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${TARGET}/lib/pkgconfig \ # Dependency version numbers ENV VERSION_ZLIB=1.2.8 \ VERSION_FFI=3.2.1 \ - VERSION_GLIB=2.47.5 \ + VERSION_GLIB=2.47.6 \ VERSION_XML2=2.9.3 \ VERSION_GSF=1.14.34 \ VERSION_EXIF=0.6.21 \ @@ -30,8 +30,8 @@ ENV VERSION_ZLIB=1.2.8 \ VERSION_PNG16=1.6.21 \ VERSION_WEBP=0.5.0 \ VERSION_TIFF=4.0.6 \ - VERSION_ORC=0.4.24 \ - VERSION_VIPS=8.2.2 + VERSION_ORC=0.4.25 \ + VERSION_VIPS=8.2.3 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 74ddc3d6..07c49c9c 100644 --- a/packaging/win/Dockerfile +++ b/packaging/win/Dockerfile @@ -3,11 +3,13 @@ MAINTAINER Lovell Fuller RUN apt-get update && apt-get install -y curl zip +ENV VERSION_VIPS=8.2.3 + # 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.2.zip -RUN unzip vips-dev-w64-8.2.2.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.2 @@ -15,4 +17,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/ -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 +RUN GZIP=-9 tar czf /libvips-${VERSION_VIPS}-win.tar.gz include lib/glib-2.0 lib/libvips.lib lib/libglib-2.0.lib lib/libgobject-2.0.lib lib/*.dll