Update for 8.7.0

- Enable GCC optimizations (`-ffast-math` and `-ftree-vectorize`). See #2. - Update Cairo to 1.15.14. - Update librsvg to 2.44.4. - Update Pixman to 0.34.0. - Update ImageMagick to 6.9.10-12. - Update Poppler to 0.69.0. MXE Updates: - Update Fontconfig to 2.13.1. - Update HarfBuzz to 1.9.0. - Update SQLite to 3.25.1.
libvips · Sep 25, 2018 · 33fbac6 · 33fbac6
1 parent 9bf3c7c
commit 33fbac6
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 31 deletions.
diff --git a/8.7/build.sh b/8.7/build.sh
@@ -20,7 +20,7 @@ target="${2:-x86_64-w64-mingw32.shared}"
 # Always checkout a particular revision which will successfully build.
 # This ensures that it will not suddenly break a build.
 # Note: Must be regularly updated.
-revision="5ecaf44f421aa6d45961caaa7f4853d3befb6a5d"
+revision="1b2605524df72505e3a82208cfd9c591867d365c"
 
 if [ -f "$mxe_dir/Makefile" ]; then
   echo "Skip cloning, MXE already exists at $mxe_dir"

diff --git a/8.7/overrides.mk b/8.7/overrides.mk
@@ -84,8 +84,8 @@ matio_FILE     := matio-$(matio_VERSION).tar.gz
 matio_URL      := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
 
 # upstream version is 6.9.0-0
-imagemagick_VERSION  := 6.9.10-11
-imagemagick_CHECKSUM := 2d1c61999a9b1f663a085d6657cc4db4b1652af6462256d1aa3c467df3e9e6eb
+imagemagick_VERSION  := 6.9.10-12
+imagemagick_CHECKSUM := 54549fe394598f6a7cec8cb5adc45d5d65b8b4f043745c6610693618b1372966
 imagemagick_SUBDIR   := ImageMagick-$(imagemagick_VERSION)
 imagemagick_FILE     := ImageMagick-$(imagemagick_VERSION).tar.xz
 imagemagick_URL      := https://www.imagemagick.org/download/releases/$(imagemagick_FILE)
@@ -94,8 +94,8 @@ imagemagick_URL_2    := https://ftp.nluug.nl/ImageMagick/$(imagemagick_FILE)
 # Note: static linking is broken on 2.42, if static linking is needed; stick with 2.40.20.
 # See: https://gitlab.gnome.org/GNOME/librsvg/issues/159
 # upstream version is 2.40.5
-librsvg_VERSION  := 2.44.2
-librsvg_CHECKSUM := 4eec96cc53ed499417dac3db9b4604f80a76f377f8f791641c458df1d7a3631f
+librsvg_VERSION  := 2.44.4
+librsvg_CHECKSUM := bd913b1f598d2dec70762849e51c5db334d072648557821e3908a2c43bad5f3d
 librsvg_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/librsvg-[0-9]*.patch)))
 librsvg_SUBDIR   := librsvg-$(librsvg_VERSION)
 librsvg_FILE     := librsvg-$(librsvg_VERSION).tar.xz
@@ -133,8 +133,8 @@ libwebp_FILE     := libwebp-$(libwebp_VERSION).tar.gz
 libwebp_URL      := http://downloads.webmproject.org/releases/webp/$(libwebp_FILE)
 
 # upstream version is 0.51.0
-poppler_VERSION  := 0.68.0
-poppler_CHECKSUM := f90d04f0fb8df6923ecb0f106ae866cf9f8761bb537ddac64dfb5322763d0e58
+poppler_VERSION  := 0.69.0
+poppler_CHECKSUM := 637ff943f805f304ff1da77ba2e7f1cbd675f474941fd8ae1e0fc01a5b45a3f9
 poppler_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/poppler-[0-9]*.patch)))
 poppler_SUBDIR   := poppler-$(poppler_VERSION)
 poppler_FILE     := poppler-$(poppler_VERSION).tar.xz
@@ -157,8 +157,8 @@ libgsf_FILE     := libgsf-$(libgsf_VERSION).tar.xz
 libgsf_URL      := https://download.gnome.org/sources/libgsf/$(call SHORT_PKG_VERSION,libgsf)/$(libgsf_FILE)
 
 # upstream version is 1.15.4
-cairo_VERSION  := 1.15.12
-cairo_CHECKSUM := 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9
+cairo_VERSION  := 1.15.14
+cairo_CHECKSUM := 16566b6c015a761bb0b7595cf879b77f8de85f90b443119083c4c2769b93298d
 cairo_SUBDIR   := cairo-$(cairo_VERSION)
 cairo_FILE     := cairo-$(cairo_VERSION).tar.xz
 cairo_URL      := https://cairographics.org/snapshots/$(cairo_FILE)
@@ -200,6 +200,13 @@ cfitsio_SUBDIR   := cfitsio
 cfitsio_FILE     := cfitsio$(cfitsio_VERSION).tar.gz
 cfitsio_URL      := https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$(cfitsio_FILE)
 
+# upstream version is 0.33.6
+pixman_VERSION  := 0.34.0
+pixman_CHECKSUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
+pixman_SUBDIR   := pixman-$(pixman_VERSION)
+pixman_FILE     := pixman-$(pixman_VERSION).tar.gz
+pixman_URL      := https://cairographics.org/releases/$(pixman_FILE)
+
 ## Override sub-dependencies
 
 harfbuzz_DEPS           := $(filter-out icu4c,$(harfbuzz_DEPS))

diff --git a/8.7/settings.mk b/8.7/settings.mk
@@ -4,8 +4,8 @@ JOBS := 4
 
 # Special flags for compiler.
 export CPPFLAGS := -D_FORTIFY_SOURCE=2
-export CFLAGS   := -s -Os -fdata-sections -ffunction-sections -fPIC $(CPPFLAGS) -static-libgcc
-export CXXFLAGS := -s -Os -fdata-sections -ffunction-sections -fPIC $(CPPFLAGS) -static-libgcc -static-libstdc++
+export CFLAGS   := -s -Os -ffast-math -ftree-vectorize -fdata-sections -ffunction-sections -fPIC $(CPPFLAGS) -static-libgcc
+export CXXFLAGS := -s -Os -ffast-math -ftree-vectorize -fdata-sections -ffunction-sections -fPIC $(CPPFLAGS) -static-libgcc -static-libstdc++
 export LDFLAGS  := -Wl,--gc-sections -Wl,--strip-all -Wl,--as-needed
 
 # We don't need debugging symbols.

diff --git a/8.7/vips-all.mk b/8.7/vips-all.mk
@@ -1,14 +1,13 @@
 PKG             := vips-all
-$(PKG)_WEBSITE  := https://jcupitt.github.io/libvips/
+$(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.7.0
-$(PKG)_CHECKSUM := cec8db44ba4dc4a510b4cc6fac926024e5476b015bac5ba352a3b518adad86a9
+$(PKG)_CHECKSUM := c4473ea3fd90654a39076f896828fc67c9c9800d77ba643ea58454f31a340898
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := jcupitt/libvips/releases/download,v,-rc3
+$(PKG)_GH_CONF  := libvips/libvips/releases/download,v
 $(PKG)_SUBDIR   := $(subst -all,,$(PKG))-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(subst -all,,$(PKG))-$($(PKG)_VERSION)-rc3.tar.gz
-$(PKG)_URL      := https://github.com/jcupitt/libvips/releases/download/v$($(PKG)_VERSION)-rc3/$($(PKG)_FILE)
+$(PKG)_FILE     := $(subst -all,,$(PKG))-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := cc matio libwebp librsvg giflib poppler glib pango fftw \
                    libgsf libjpeg-turbo tiff openslide lcms libexif \
                    imagemagick libpng openexr cfitsio nifticlib orc

diff --git a/8.7/vips-web.mk b/8.7/vips-web.mk
@@ -1,14 +1,13 @@
 PKG             := vips-web
-$(PKG)_WEBSITE  := https://jcupitt.github.io/libvips/
+$(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.7.0
-$(PKG)_CHECKSUM := cec8db44ba4dc4a510b4cc6fac926024e5476b015bac5ba352a3b518adad86a9
+$(PKG)_CHECKSUM := c4473ea3fd90654a39076f896828fc67c9c9800d77ba643ea58454f31a340898
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := jcupitt/libvips/releases/download,v,-rc3
+$(PKG)_GH_CONF  := libvips/libvips/releases/download,v
 $(PKG)_SUBDIR   := $(subst -web,,$(PKG))-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(subst -web,,$(PKG))-$($(PKG)_VERSION)-rc3.tar.gz
-$(PKG)_URL      := https://github.com/jcupitt/libvips/releases/download/v$($(PKG)_VERSION)-rc3/$($(PKG)_FILE)
+$(PKG)_FILE     := $(subst -web,,$(PKG))-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := cc libwebp librsvg giflib glib pango libgsf \
                    libjpeg-turbo tiff lcms libexif libpng orc
 

diff --git a/README.md b/README.md
@@ -5,16 +5,16 @@ Experiment with building a libvips binary for Windows with [MXE](https://github.
 ## libvips-web dependencies
 | Dependency      | Version   | Used under the terms of         |
 |-----------------|-----------|---------------------------------|
-| [cairo]         | 1.15.12   | Mozilla Public License 2.0      |
+| [cairo]         | 1.15.14   | Mozilla Public License 2.0      |
 | [expat]         | 2.2.6     | MIT Licence                     |
-| [fontconfig]    | 2.13.0    | [fontconfig Licence] (BSD-like) |
+| [fontconfig]    | 2.13.1    | [fontconfig Licence] (BSD-like) |
 | [freetype]      | 2.9.1     | [freetype Licence] (BSD-like)   |
 | [fribidi]       | 0.19.7    | LGPLv3                          |
 | [gdk-pixbuf]    | 2.36.12   | LGPLv3                          |
 | [gettext]       | 0.19.8.1  | LGPLv3                          |
 | [giflib]        | 5.1.4     | MIT Licence                     |
 | [glib]          | 2.57.2    | LGPLv3                          |
-| [harfbuzz]      | 1.8.8     | MIT Licence                     |
+| [harfbuzz]      | 1.9.0     | MIT Licence                     |
 | [lcms]          | 2.9       | MIT Licence                     |
 | [libcroco]      | 0.6.12    | LGPLv3                          |
 | [libexif]       | 0.6.21    | LGPLv3                          |
@@ -23,14 +23,14 @@ Experiment with building a libvips binary for Windows with [MXE](https://github.
 | [libiconv]      | 1.15      | LGPLv3                          |
 | [libjpeg-turbo] | 2.0.0     | [zlib License, IJG License]     |
 | [libpng]        | 1.6.35    | [libpng License]                |
-| [librsvg]       | 2.44.2    | LGPLv3                          |
+| [librsvg]       | 2.44.4    | LGPLv3                          |
 | [libtiff]       | 4.0.9     | [libtiff License] (BSD-like)    |
-| [libvips]       | 8.7.0-rc3 | LGPLv3                          |
+| [libvips]       | 8.7.0     | LGPLv3                          |
 | [libwebp]       | 1.0.0     | New BSD License                 |
 | [libxml2]       | 2.9.8     | MIT Licence                     |
 | [orc]           | 0.4.28    | BSD 2-Clause                    |
 | [pango]         | 1.42.4    | LGPLv3                          |
-| [pixman]        | 0.33.6    | MIT Licence                     |
+| [pixman]        | 0.34.0    | MIT Licence                     |
 | [zlib]          | 1.2.11    | [zlib Licence]                  |
 
 [cairo]: https://cairographics.org/
@@ -75,14 +75,14 @@ Same as libvips-web + these extra dependencies:
 | [cfitsio]       | 3.450     | BSD-like                         |
 | [fftw]          | 3.3.8     | GPLv2                            |
 | [hdf5]          | 1.8.12    | BSD-like                         |
-| [imagemagick]   | 6.9.10-11 | [ImageMagick License] (GPL-like) |
+| [imagemagick]   | 6.9.10-12 | [ImageMagick License] (GPL-like) |
 | [matio]         | 1.5.12    | BSD 2-Clause                     |
 | [nifticlib]     | 2.0.0     | Public domain                    |
 | [openexr]       | 2.3.0     | BSD 3-Clause                     |
 | [openjpeg]      | 2.3.0     | BSD 2-Clause                     |
 | [openslide]     | 3.4.1     | LGPLv3                           |
-| [poppler]       | 0.68.0    | GPLv2                            |
-| [sqlite]        | 3.24.0    | Public domain                    |
+| [poppler]       | 0.69.0    | GPLv2                            |
+| [sqlite]        | 3.25.1    | Public domain                    |
 
 [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/
 [hdf5]: https://www.hdfgroup.org/solutions/hdf5/

diff --git a/TODO.md b/TODO.md
@@ -27,6 +27,6 @@
 - [ ] Incorporate all new dependencies and patches into [MXE](https://github.com/mxe/mxe).
   - [ ] Should we also add libvips-web?
   - [ ] Not sure about `librsvg`, because v2.42.0+ requires the Rust toolchain.
-- [ ] Try to update Pixman to 0.34.0. Couldn't find a tarball for version 0.34.0 [here](https://cairographics.org/snapshots/).
+- [X] Try to update Pixman to 0.34.0. Couldn't find a tarball for version 0.34.0 [here](https://cairographics.org/snapshots/).
 - [X] Try to build with 32-bit architecture (not sure if this is still being distributed).
 - [ ] Try to test the binaries with the Python test suite on Wine.