mirror of
https://github.com/lovell/sharp.git
synced 2025-07-11 03:20:13 +02:00
Upgrade to libvips v8.2.2
This commit is contained in:
parent
57c1e3ae26
commit
2656c69d99
@ -15,7 +15,7 @@ npm install sharp
|
||||
[](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.:
|
||||
|
||||
|
@ -68,7 +68,7 @@
|
||||
},
|
||||
"license": "Apache-2.0",
|
||||
"config": {
|
||||
"libvips": "8.2.1"
|
||||
"libvips": "8.2.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user