Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-10 19:10:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to libvips v8.3.2

Browse Source
This commit is contained in:
Lovell Fuller 2016-07-25 14:36:27 +01:00
parent 032bb7e96b
commit 4f1472d4ff
7 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binding.gyp
View File

@ -156,7 +156,6 @@
'<(module_root_dir)/lib/libpangoft2-1.0.so', '<(module_root_dir)/lib/libpangoft2-1.0.so',
'<(module_root_dir)/lib/libpixman-1.so', '<(module_root_dir)/lib/libpixman-1.so',
'<(module_root_dir)/lib/libpng.so', '<(module_root_dir)/lib/libpng.so',
'<(module_root_dir)/lib/libpng16.so',
'<(module_root_dir)/lib/librsvg-2.so', '<(module_root_dir)/lib/librsvg-2.so',
'<(module_root_dir)/lib/libtiff.so', '<(module_root_dir)/lib/libtiff.so',
'<(module_root_dir)/lib/libwebp.so', '<(module_root_dir)/lib/libwebp.so',
@ -216,6 +215,7 @@
'<(module_root_dir)/lib/libcairo-2.dll', '<(module_root_dir)/lib/libcairo-2.dll',
'<(module_root_dir)/lib/libcairo-gobject-2.dll', '<(module_root_dir)/lib/libcairo-gobject-2.dll',
'<(module_root_dir)/lib/libcairo-script-interpreter-2.dll', '<(module_root_dir)/lib/libcairo-script-interpreter-2.dll',
'<(module_root_dir)/lib/libcharset-1.dll',
'<(module_root_dir)/lib/libcroco-0.6-3.dll', '<(module_root_dir)/lib/libcroco-0.6-3.dll',
'<(module_root_dir)/lib/libexif-12.dll', '<(module_root_dir)/lib/libexif-12.dll',
'<(module_root_dir)/lib/libexpat-1.dll', '<(module_root_dir)/lib/libexpat-1.dll',
@ -225,13 +225,14 @@
'<(module_root_dir)/lib/libfreetype-6.dll', '<(module_root_dir)/lib/libfreetype-6.dll',
'<(module_root_dir)/lib/libgcc_s_seh-1.dll', '<(module_root_dir)/lib/libgcc_s_seh-1.dll',
'<(module_root_dir)/lib/libgdk_pixbuf-2.0-0.dll', '<(module_root_dir)/lib/libgdk_pixbuf-2.0-0.dll',
'<(module_root_dir)/lib/libgif-4.dll', '<(module_root_dir)/lib/libgif-7.dll',
'<(module_root_dir)/lib/libgio-2.0-0.dll', '<(module_root_dir)/lib/libgio-2.0-0.dll',
'<(module_root_dir)/lib/libglib-2.0-0.dll', '<(module_root_dir)/lib/libglib-2.0-0.dll',
'<(module_root_dir)/lib/libgmodule-2.0-0.dll', '<(module_root_dir)/lib/libgmodule-2.0-0.dll',
'<(module_root_dir)/lib/libgobject-2.0-0.dll', '<(module_root_dir)/lib/libgobject-2.0-0.dll',
'<(module_root_dir)/lib/libgsf-1-114.dll', '<(module_root_dir)/lib/libgsf-1-114.dll',
'<(module_root_dir)/lib/libgthread-2.0-0.dll', '<(module_root_dir)/lib/libgthread-2.0-0.dll',
'<(module_root_dir)/lib/libiconv-2.dll',
'<(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',

10
docs/changelog.md
View File

@ -1,10 +1,10 @@
# Changelog # Changelog
### v0.15 - "*outfit*" ### v0.16 - "*pencil*"
Requires libvips v8.3.1 Requires libvips v8.3.2
#### v0.15.2 - TBD #### v0.16.0 - TBD
* Ensure boolean, bandbool, extractChannel ops occur before sRGB conversion. * Ensure boolean, bandbool, extractChannel ops occur before sRGB conversion.
[#504](https://github.com/lovell/sharp/pull/504) [#504](https://github.com/lovell/sharp/pull/504)
@ -22,6 +22,10 @@ Requires libvips v8.3.1
[#521](https://github.com/lovell/sharp/issues/521) [#521](https://github.com/lovell/sharp/issues/521)
[@ChrisPinewood](https://github.com/ChrisPinewood) [@ChrisPinewood](https://github.com/ChrisPinewood)
### v0.15 - "*outfit*"
Requires libvips v8.3.1
#### v0.15.1 - 12<sup>th</sup> July 2016 #### v0.15.1 - 12<sup>th</sup> July 2016
* Concat Stream-based input in single operation for ~+3% perf and less GC. * Concat Stream-based input in single operation for ~+3% perf and less GC.

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "sharp", "name": "sharp",
"version": "0.15.1", "version": "0.16.0",
"author": "Lovell Fuller <npm@lovell.info>", "author": "Lovell Fuller <npm@lovell.info>",
"contributors": [ "contributors": [
"Pierre Inglebert <pierre.inglebert@gmail.com>", "Pierre Inglebert <pierre.inglebert@gmail.com>",
@ -80,7 +80,7 @@
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"config": { "config": {
"libvips": "8.3.1" "libvips": "8.3.2"
}, },
"engines": { "engines": {
"node": ">=0.10" "node": ">=0.10"

24
packaging/arm/build.sh
View File

@ -19,27 +19,27 @@ 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.48.0 VERSION_GLIB=2.49.4
VERSION_XML2=2.9.4 VERSION_XML2=2.9.4
VERSION_GSF=1.14.36 VERSION_GSF=1.14.39
VERSION_EXIF=0.6.21 VERSION_EXIF=0.6.21
VERSION_LCMS2=2.7 VERSION_LCMS2=2.8
VERSION_JPEG=1.5.0 VERSION_JPEG=1.5.0
VERSION_PNG16=1.6.23 VERSION_PNG16=1.6.23
VERSION_WEBP=0.5.0 VERSION_WEBP=0.5.1
VERSION_TIFF=4.0.6 VERSION_TIFF=4.0.6
VERSION_ORC=0.4.25 VERSION_ORC=0.4.25
VERSION_GDKPIXBUF=2.34.0 VERSION_GDKPIXBUF=2.35.2
VERSION_FREETYPE=2.6.3 VERSION_FREETYPE=2.6.5
VERSION_FONTCONFIG=2.11.95 VERSION_FONTCONFIG=2.12.0
VERSION_HARFBUZZ=1.2.6 VERSION_HARFBUZZ=1.3.0
VERSION_PIXMAN=0.34.0 VERSION_PIXMAN=0.34.0
VERSION_CAIRO=1.14.6 VERSION_CAIRO=1.14.6
VERSION_PANGO=1.40.1 VERSION_PANGO=1.40.1
VERSION_CROCO=0.6.11 VERSION_CROCO=0.6.11
VERSION_SVG=2.40.15 VERSION_SVG=2.40.16
VERSION_GIF=5.1.4 VERSION_GIF=5.1.4
VERSION_VIPS=8.3.1 VERSION_VIPS=8.3.2
# Least out-of-sync Sourceforge mirror # Least out-of-sync Sourceforge mirror
SOURCEFORGE_MIRROR=netix SOURCEFORGE_MIRROR=netix
@ -56,7 +56,7 @@ cd ${DEPS}/ffi
./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --disable-builddir && make install-strip ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --disable-builddir && make install-strip
mkdir ${DEPS}/glib mkdir ${DEPS}/glib
curl -Ls https://download.gnome.org/sources/glib/2.48/glib-${VERSION_GLIB}.tar.xz | tar xJC ${DEPS}/glib --strip-components=1 curl -Ls https://download.gnome.org/sources/glib/2.49/glib-${VERSION_GLIB}.tar.xz | tar xJC ${DEPS}/glib --strip-components=1
cd ${DEPS}/glib cd ${DEPS}/glib
./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --with-pcre=internal && make install-strip ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --with-pcre=internal && make install-strip
@ -107,7 +107,7 @@ cd ${DEPS}/orc
./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking && make install-strip
mkdir ${DEPS}/gdkpixbuf mkdir ${DEPS}/gdkpixbuf
curl -Ls https://download.gnome.org/sources/gdk-pixbuf/2.34/gdk-pixbuf-${VERSION_GDKPIXBUF}.tar.xz | tar xJC ${DEPS}/gdkpixbuf --strip-components=1 curl -Ls https://download.gnome.org/sources/gdk-pixbuf/2.35/gdk-pixbuf-${VERSION_GDKPIXBUF}.tar.xz | tar xJC ${DEPS}/gdkpixbuf --strip-components=1
cd ${DEPS}/gdkpixbuf cd ${DEPS}/gdkpixbuf
LD_LIBRARY_PATH=${TARGET}/lib ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking \ LD_LIBRARY_PATH=${TARGET}/lib ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking \
--disable-introspection --disable-modules --without-libpng --without-libjpeg --without-libtiff --without-gdiplus --with-included-loaders= \ --disable-introspection --disable-modules --without-libpng --without-libjpeg --without-libtiff --without-gdiplus --with-included-loaders= \

2
packaging/build.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
VERSION_VIPS=8.3.1 VERSION_VIPS=8.3.2
# Is docker available? # Is docker available?

24
packaging/lin/Dockerfile
View File

@ -20,27 +20,27 @@ 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.48.0 \ VERSION_GLIB=2.49.4 \
VERSION_XML2=2.9.4 \ VERSION_XML2=2.9.4 \
VERSION_GSF=1.14.36 \ VERSION_GSF=1.14.39 \
VERSION_EXIF=0.6.21 \ VERSION_EXIF=0.6.21 \
VERSION_LCMS2=2.7 \ VERSION_LCMS2=2.8 \
VERSION_JPEG=1.5.0 \ VERSION_JPEG=1.5.0 \
VERSION_PNG16=1.6.23 \ VERSION_PNG16=1.6.23 \
VERSION_WEBP=0.5.0 \ VERSION_WEBP=0.5.1 \
VERSION_TIFF=4.0.6 \ VERSION_TIFF=4.0.6 \
VERSION_ORC=0.4.25 \ VERSION_ORC=0.4.25 \
VERSION_GDKPIXBUF=2.34.0 \ VERSION_GDKPIXBUF=2.35.2 \
VERSION_FREETYPE=2.6.3 \ VERSION_FREETYPE=2.6.5 \
VERSION_FONTCONFIG=2.11.95 \ VERSION_FONTCONFIG=2.12.0 \
VERSION_HARFBUZZ=1.2.6 \ VERSION_HARFBUZZ=1.3.0 \
VERSION_PIXMAN=0.34.0 \ VERSION_PIXMAN=0.34.0 \
VERSION_CAIRO=1.14.6 \ VERSION_CAIRO=1.14.6 \
VERSION_PANGO=1.40.1 \ VERSION_PANGO=1.40.1 \
VERSION_CROCO=0.6.11 \ VERSION_CROCO=0.6.11 \
VERSION_SVG=2.40.15 \ VERSION_SVG=2.40.16 \
VERSION_GIF=5.1.4 \ VERSION_GIF=5.1.4 \
VERSION_VIPS=8.3.1 VERSION_VIPS=8.3.2
# Least out-of-sync Sourceforge mirror # Least out-of-sync Sourceforge mirror
ENV SOURCEFORGE_MIRROR=netix ENV SOURCEFORGE_MIRROR=netix
@ -57,7 +57,7 @@ WORKDIR ${DEPS}/ffi
RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --disable-builddir && make install-strip RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --disable-builddir && make install-strip
RUN mkdir ${DEPS}/glib RUN mkdir ${DEPS}/glib
RUN curl -Ls https://download.gnome.org/sources/glib/2.48/glib-${VERSION_GLIB}.tar.xz | tar xJC ${DEPS}/glib --strip-components=1 RUN curl -Ls https://download.gnome.org/sources/glib/2.49/glib-${VERSION_GLIB}.tar.xz | tar xJC ${DEPS}/glib --strip-components=1
WORKDIR ${DEPS}/glib WORKDIR ${DEPS}/glib
RUN CFLAGS="${CFLAGS} -Wl,--default-symver" CXXFLAGS="${CXXFLAGS} -Wl,--default-symver" \ RUN CFLAGS="${CFLAGS} -Wl,--default-symver" CXXFLAGS="${CXXFLAGS} -Wl,--default-symver" \
./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --with-pcre=internal && make install-strip ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking --with-pcre=internal && make install-strip
@ -113,7 +113,7 @@ RUN ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-de
RUN rm ${TARGET}/lib/liborc-test-* RUN rm ${TARGET}/lib/liborc-test-*
RUN mkdir ${DEPS}/gdkpixbuf RUN mkdir ${DEPS}/gdkpixbuf
RUN curl -Ls https://download.gnome.org/sources/gdk-pixbuf/2.34/gdk-pixbuf-${VERSION_GDKPIXBUF}.tar.xz | tar xJC ${DEPS}/gdkpixbuf --strip-components=1 RUN curl -Ls https://download.gnome.org/sources/gdk-pixbuf/2.35/gdk-pixbuf-${VERSION_GDKPIXBUF}.tar.xz | tar xJC ${DEPS}/gdkpixbuf --strip-components=1
WORKDIR ${DEPS}/gdkpixbuf WORKDIR ${DEPS}/gdkpixbuf
RUN LD_LIBRARY_PATH=${TARGET}/lib ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking \ RUN LD_LIBRARY_PATH=${TARGET}/lib ./configure --prefix=${TARGET} --enable-shared --disable-static --disable-dependency-tracking \
--disable-introspection --disable-modules --without-libpng --without-libjpeg --without-libtiff --without-gdiplus --with-included-loaders= \ --disable-introspection --disable-modules --without-libpng --without-libjpeg --without-libtiff --without-gdiplus --with-included-loaders= \

2
packaging/win/Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER Lovell Fuller <npm@lovell.info>
RUN apt-get update && apt-get install -y curl zip advancecomp RUN apt-get update && apt-get install -y curl zip advancecomp
ENV VERSION_VIPS=8.3.1 ENV VERSION_VIPS=8.3.2
# Fetch and unzip # Fetch and unzip
RUN mkdir /vips RUN mkdir /vips