mirror of
https://github.com/lovell/sharp.git
synced 2025-07-10 11:00:14 +02:00
Upgrade to libvips v8.2.3 ahead of sharp v0.14.0
This commit is contained in:
parent
185fcfe635
commit
5b4f4b0672
@ -221,7 +221,7 @@
|
|||||||
'<(module_root_dir)/lib/libintl-8.dll',
|
'<(module_root_dir)/lib/libintl-8.dll',
|
||||||
'<(module_root_dir)/lib/libjpeg-62.dll',
|
'<(module_root_dir)/lib/libjpeg-62.dll',
|
||||||
'<(module_root_dir)/lib/liblcms2-2.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/libopenslide-0.dll',
|
||||||
'<(module_root_dir)/lib/libpango-1.0-0.dll',
|
'<(module_root_dir)/lib/libpango-1.0-0.dll',
|
||||||
'<(module_root_dir)/lib/libpangocairo-1.0-0.dll',
|
'<(module_root_dir)/lib/libpangocairo-1.0-0.dll',
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
"vips"
|
"vips"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bluebird": "^3.3.3",
|
"bluebird": "^3.3.4",
|
||||||
"color": "^0.11.1",
|
"color": "^0.11.1",
|
||||||
"nan": "^2.2.0",
|
"nan": "^2.2.0",
|
||||||
"semver": "^5.1.0",
|
"semver": "^5.1.0",
|
||||||
@ -68,7 +68,7 @@
|
|||||||
},
|
},
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"config": {
|
"config": {
|
||||||
"libvips": "8.2.2"
|
"libvips": "8.2.3"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.10"
|
"node": ">=0.10"
|
||||||
|
@ -19,7 +19,7 @@ export CXXFLAGS="-O3"
|
|||||||
# Dependency version numbers
|
# Dependency version numbers
|
||||||
VERSION_ZLIB=1.2.8
|
VERSION_ZLIB=1.2.8
|
||||||
VERSION_FFI=3.2.1
|
VERSION_FFI=3.2.1
|
||||||
VERSION_GLIB=2.47.5
|
VERSION_GLIB=2.47.6
|
||||||
VERSION_XML2=2.9.3
|
VERSION_XML2=2.9.3
|
||||||
VERSION_GSF=1.14.34
|
VERSION_GSF=1.14.34
|
||||||
VERSION_EXIF=0.6.21
|
VERSION_EXIF=0.6.21
|
||||||
@ -29,8 +29,8 @@ VERSION_JPEG=1.4.2
|
|||||||
VERSION_PNG16=1.6.21
|
VERSION_PNG16=1.6.21
|
||||||
VERSION_WEBP=0.5.0
|
VERSION_WEBP=0.5.0
|
||||||
VERSION_TIFF=4.0.6
|
VERSION_TIFF=4.0.6
|
||||||
VERSION_ORC=0.4.24
|
VERSION_ORC=0.4.25
|
||||||
VERSION_VIPS=8.2.2
|
VERSION_VIPS=8.2.3
|
||||||
|
|
||||||
mkdir ${DEPS}/zlib
|
mkdir ${DEPS}/zlib
|
||||||
curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz | tar xJC ${DEPS}/zlib --strip-components=1
|
curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz | tar xJC ${DEPS}/zlib --strip-components=1
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
VERSION_VIPS=8.2.3
|
||||||
|
|
||||||
# Is docker available?
|
# Is docker available?
|
||||||
|
|
||||||
if ! type docker >/dev/null; then
|
if ! type docker >/dev/null; then
|
||||||
@ -13,15 +15,15 @@ fi
|
|||||||
|
|
||||||
docker build -t vips-dev-win win
|
docker build -t vips-dev-win win
|
||||||
WIN_CONTAINER_ID=$(docker run -d vips-dev-win)
|
WIN_CONTAINER_ID=$(docker run -d vips-dev-win)
|
||||||
docker cp $WIN_CONTAINER_ID:/libvips-8.2.2-win.tar.gz .
|
docker cp "${WIN_CONTAINER_ID}:/libvips-${VERSION_VIPS}-win.tar.gz" .
|
||||||
docker rm $WIN_CONTAINER_ID
|
docker rm "${WIN_CONTAINER_ID}"
|
||||||
|
|
||||||
# Linux
|
# Linux
|
||||||
|
|
||||||
docker build -t vips-dev-lin lin
|
docker build -t vips-dev-lin lin
|
||||||
LIN_CONTAINER_ID=$(docker run -d vips-dev-lin)
|
LIN_CONTAINER_ID=$(docker run -d vips-dev-lin)
|
||||||
docker cp $LIN_CONTAINER_ID:/libvips-8.2.2-lin.tar.gz .
|
docker cp "${LIN_CONTAINER_ID}:/libvips-${VERSION_VIPS}-lin.tar.gz" .
|
||||||
docker rm $LIN_CONTAINER_ID
|
docker rm "${LIN_CONTAINER_ID}"
|
||||||
|
|
||||||
# Checksums
|
# Checksums
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ ENV PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${TARGET}/lib/pkgconfig \
|
|||||||
# Dependency version numbers
|
# Dependency version numbers
|
||||||
ENV VERSION_ZLIB=1.2.8 \
|
ENV VERSION_ZLIB=1.2.8 \
|
||||||
VERSION_FFI=3.2.1 \
|
VERSION_FFI=3.2.1 \
|
||||||
VERSION_GLIB=2.47.5 \
|
VERSION_GLIB=2.47.6 \
|
||||||
VERSION_XML2=2.9.3 \
|
VERSION_XML2=2.9.3 \
|
||||||
VERSION_GSF=1.14.34 \
|
VERSION_GSF=1.14.34 \
|
||||||
VERSION_EXIF=0.6.21 \
|
VERSION_EXIF=0.6.21 \
|
||||||
@ -30,8 +30,8 @@ ENV VERSION_ZLIB=1.2.8 \
|
|||||||
VERSION_PNG16=1.6.21 \
|
VERSION_PNG16=1.6.21 \
|
||||||
VERSION_WEBP=0.5.0 \
|
VERSION_WEBP=0.5.0 \
|
||||||
VERSION_TIFF=4.0.6 \
|
VERSION_TIFF=4.0.6 \
|
||||||
VERSION_ORC=0.4.24 \
|
VERSION_ORC=0.4.25 \
|
||||||
VERSION_VIPS=8.2.2
|
VERSION_VIPS=8.2.3
|
||||||
|
|
||||||
RUN mkdir ${DEPS}/zlib
|
RUN mkdir ${DEPS}/zlib
|
||||||
RUN curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz | tar xJC ${DEPS}/zlib --strip-components=1
|
RUN curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz | tar xJC ${DEPS}/zlib --strip-components=1
|
||||||
|
@ -3,11 +3,13 @@ MAINTAINER Lovell Fuller <npm@lovell.info>
|
|||||||
|
|
||||||
RUN apt-get update && apt-get install -y curl zip
|
RUN apt-get update && apt-get install -y curl zip
|
||||||
|
|
||||||
|
ENV VERSION_VIPS=8.2.3
|
||||||
|
|
||||||
# Fetch and unzip
|
# Fetch and unzip
|
||||||
RUN mkdir /vips
|
RUN mkdir /vips
|
||||||
WORKDIR /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 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.2.zip
|
RUN unzip vips-dev-w64-8.2.zip
|
||||||
|
|
||||||
# Clean and zip
|
# Clean and zip
|
||||||
WORKDIR /vips/vips-dev-8.2
|
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 bin/*.dll lib/
|
||||||
RUN cp -r lib64/* 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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user