Update for 8.11.1

- Update Fontconfig to 2.13.94. - Update GLib to 2.68.3. - Update libffi to 3.4.2. - Update librsvg to 2.51.3. - Update zlib-ng 2.0.5. - Update ImageMagick to 6.9.12-17. - Update Rust to 1.53.0. - Update highway to the latest git revision. - Update libjxl to the latest git revision. - Backport libtiff fixes merged upstream. MXE Updates: - Update SQLite to 3.36.0.
libvips · Jun 29, 2021 · f1d3fca · f1d3fca
1 parent 4868505
commit f1d3fca
Show file tree

Hide file tree

Showing 19 changed files with 245 additions and 799 deletions.
diff --git a/README.md b/README.md
@@ -20,20 +20,20 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [aom]           | 3.1.1     | BSD 2-Clause + [Alliance for Open Media Patent License 1.0]  |
 | [cairo]         | 1.17.4    | Mozilla Public License 2.0                                   |
 | [expat]         | 2.4.1     | MIT Licence                                                  |
-| [fontconfig]    | 2.13.93   | [fontconfig Licence] (BSD-like)                              |
+| [fontconfig]    | 2.13.94   | [fontconfig Licence] (BSD-like)                              |
 | [freetype]      | 2.10.4    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.10    | LGPLv3                                                       |
 | [gdk-pixbuf]    | 2.42.6    | LGPLv3                                                       |
-| [glib]          | 2.68.2    | LGPLv3                                                       |
+| [glib]          | 2.68.3    | LGPLv3                                                       |
 | [harfbuzz]      | 2.8.1     | MIT Licence                                                  |
 | [lcms]          | 2.12      | MIT Licence                                                  |
 | [libexif]       | 0.6.22    | LGPLv3                                                       |
-| [libffi]        | 3.3       | MIT Licence                                                  |
+| [libffi]        | 3.4.2     | MIT Licence                                                  |
 | [libgsf]        | 1.14.47   | LGPLv3                                                       |
 | [libheif]       | 1.12.0    | LGPLv3                                                       |
 | [libimagequant] | 2.4.1¹    | BSD 2-Clause                                                 |
 | [libpng]        | 1.6.37    | [libpng License version 2]                                   |
-| [librsvg]       | 2.51.2    | LGPLv3                                                       |
+| [librsvg]       | 2.51.3    | LGPLv3                                                       |
 | [libspng]       | 0.6.3     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.3.0     | [libtiff License] (BSD-like)                                 |
 | [libvips]       | 8.11.0    | LGPLv3                                                       |
@@ -43,7 +43,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [orc]           | 0.4.32    | [orc License] (BSD-like)                                     |
 | [pango]         | 1.48.5    | LGPLv3                                                       |
 | [pixman]        | 0.40.0    | MIT Licence                                                  |
-| [zlib-ng]       | 2.0.3     | [zlib-ng Licence]                                            |
+| [zlib-ng]       | 2.0.5     | [zlib-ng Licence]                                            |
 
 ¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.  
 
@@ -92,20 +92,20 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
 | [cfitsio]       | 3.49      | BSD-like                                                     |
 | [fftw]          | 3.3.9     | GPLv2                                                        |
-| [highway]       | [e8ab731] | Apache-2.0 License                                           |
-| [imagemagick]   | 6.9.12-14 | [ImageMagick License] (Apache-2.0-like)                      |
+| [highway]       | [9fefc7c] | Apache-2.0 License                                           |
+| [imagemagick]   | 6.9.12-17 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.0.4     | BSD 3-Clause                                                 |
-| [libjxl]        | [91204ed] | BSD 3-Clause                                                 |
+| [libjxl]        | [6783d48] | BSD 3-Clause                                                 |
 | [matio]         | 1.5.21    | BSD 2-Clause                                                 |
 | [nifticlib]     | 2.0.0     | Public domain                                                |
 | [openexr]       | 3.0.4     | BSD 3-Clause                                                 |
 | [openjpeg]      | 2.4.0     | BSD 2-Clause                                                 |
 | [openslide]     | 3.4.1     | LGPLv3                                                       |
 | [poppler]       | 21.06.1   | GPLv2                                                        |
-| [sqlite]        | 3.35.5    | Public domain                                                |
+| [sqlite]        | 3.36.0    | Public domain                                                |
 
-[e8ab731]: https://github.com/google/highway/commit/e8ab731e4eff6df5415771518345af85f9bffa0f
-[91204ed]: https://github.com/libjxl/libjxl/commit/91204ed4521a304f983163137283d35c7021de5b
+[9fefc7c]: https://github.com/google/highway/commit/9fefc7cef1dd5ee83221b3446a1415020a64eabf
+[6783d48]: https://github.com/libjxl/libjxl/commit/6783d48aa68dbca76b2259f3414efbbffa14eeab
 
 [brotli]: https://github.com/google/brotli
 [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/

diff --git a/build/build.sh b/build/build.sh
@@ -51,7 +51,7 @@ fi
 # 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="baa4ed6b469c620afa6861c861dd9c9752ca5cca"
+revision="b48b3cc7085548e896fe967dc6371ff9951390a4"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then

diff --git a/build/highway.mk b/build/highway.mk
@@ -2,9 +2,9 @@ PKG             := highway
 $(PKG)_WEBSITE  := https://github.com/google/highway
 $(PKG)_DESCR    := Performance-portable, length-agnostic SIMD with runtime dispatch
 $(PKG)_IGNORE   :=
-# https://github.com/google/highway/tarball/e8ab731e4eff6df5415771518345af85f9bffa0f
-$(PKG)_VERSION  := e8ab731
-$(PKG)_CHECKSUM := f4ff871a60fa7f102e947d0d563f550eff1cc22afc6a6343d2223de85563b31b
+# https://github.com/google/highway/tarball/9fefc7cef1dd5ee83221b3446a1415020a64eabf
+$(PKG)_VERSION  := 9fefc7c
+$(PKG)_CHECKSUM := 73fd70cbbb5cf2d80ea4e14042d15dcc8be5b7b7935e7caf4547ff234e88ee06
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/highway-[0-9]*.patch)))
 $(PKG)_GH_CONF  := google/highway/branches/master
 $(PKG)_DEPS     := cc

diff --git a/build/libjxl.mk b/build/libjxl.mk
@@ -2,9 +2,9 @@ PKG             := libjxl
 $(PKG)_WEBSITE  := https://github.com/libjxl/libjxl
 $(PKG)_DESCR    := JPEG XL image format reference implementation
 $(PKG)_IGNORE   :=
-# https://github.com/libjxl/libjxl/tarball/91204ed4521a304f983163137283d35c7021de5b
-$(PKG)_VERSION  := 91204ed
-$(PKG)_CHECKSUM := 2d710002e828b066e962b4bed294e2ae7dddff737a6f938f8e83443981032c88
+# https://github.com/libjxl/libjxl/tarball/6783d48aa68dbca76b2259f3414efbbffa14eeab
+$(PKG)_VERSION  := 6783d48
+$(PKG)_CHECKSUM := 2ff471794b0d85f705faaea4a13a1c0cdd9da9533639c57e82ef8e1f689f00df
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjxl-[0-9]*.patch)))
 $(PKG)_GH_CONF  := libjxl/libjxl/branches/main
 $(PKG)_DEPS     := cc brotli highway lcms libjpeg-turbo libpng

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -3,8 +3,8 @@ $(info == General overrides: $(lastword $(MAKEFILE_LIST)))
 ## Update dependencies
 
 # upstream version is 3.2.1
-libffi_VERSION  := 3.3
-libffi_CHECKSUM := 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
+libffi_VERSION  := 3.4.2
+libffi_CHECKSUM := 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620
 libffi_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libffi-[0-9]*.patch)))
 libffi_SUBDIR   := libffi-$(libffi_VERSION)
 libffi_FILE     := libffi-$(libffi_VERSION).tar.gz
@@ -40,14 +40,14 @@ matio_FILE     := matio-$(matio_VERSION).tar.gz
 matio_URL      := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
 
 # upstream version is 7, we want ImageMagick 6
-imagemagick_VERSION  := 6.9.12-14
-imagemagick_CHECKSUM := f2831934ebccb444a7ced6dfe2e87fa065ece02a7b28627e3be57428df469c93
+imagemagick_VERSION  := 6.9.12-17
+imagemagick_CHECKSUM := 453c42cb1c837b3a125150743d3f6591d157e3ca753aee760a9b5f1c070c52ac
 imagemagick_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
 imagemagick_GH_CONF  := ImageMagick/ImageMagick6/tags
 
 # upstream version is 2.40.5
-librsvg_VERSION  := 2.51.2
-librsvg_CHECKSUM := 6b80840ef3e4724624e715398bb4470fa68368943cdbd507e681708bbe32b289
+librsvg_VERSION  := 2.51.3
+librsvg_CHECKSUM := 4f83d40484bd69d1944d203090b50b812ec6aa553195e4f6d67d03d135897c7f
 librsvg_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/librsvg-[0-9]*.patch)))
 librsvg_SUBDIR   := librsvg-$(librsvg_VERSION)
 librsvg_FILE     := librsvg-$(librsvg_VERSION).tar.xz
@@ -72,8 +72,8 @@ fribidi_FILE     := fribidi-$(fribidi_VERSION).tar.xz
 fribidi_URL      := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
 
 # upstream version is 2.50.2
-glib_VERSION  := 2.68.2
-glib_CHECKSUM := ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb
+glib_VERSION  := 2.68.3
+glib_CHECKSUM := e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138
 glib_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
 glib_SUBDIR   := glib-$(glib_VERSION)
 glib_FILE     := glib-$(glib_VERSION).tar.xz
@@ -123,8 +123,8 @@ pixman_FILE     := pixman-$(pixman_VERSION).tar.gz
 pixman_URL      := https://cairographics.org/releases/$(pixman_FILE)
 
 # upstream version is 2.13.1
-fontconfig_VERSION  := 2.13.93
-fontconfig_CHECKSUM := ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0
+fontconfig_VERSION  := 2.13.94
+fontconfig_CHECKSUM := a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c
 fontconfig_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/fontconfig-[0-9]*.patch)))
 fontconfig_SUBDIR   := fontconfig-$(fontconfig_VERSION)
 fontconfig_FILE     := fontconfig-$(fontconfig_VERSION).tar.xz
@@ -158,6 +158,7 @@ nasm_URL_2    := https://sources.voidlinux.org/nasm-$(nasm_VERSION)/$(nasm_FILE)
 ## Patches that we override with our own
 
 libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch)))
+tiff_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/tiff-[0-9]*.patch)))
 lcms_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/lcms-[0-9]*.patch)))
 
 # zlib will make libzlib.dll, but we want libz.dll so we must

diff --git a/build/patches/fontconfig-2-fixes.patch b/build/patches/fontconfig-2-fixes.patch
@@ -17,7 +17,7 @@ diff --git a/src/fcxml.c b/src/fcxml.c
 index 1111111..2222222 100644
 --- a/src/fcxml.c
 +++ b/src/fcxml.c
-@@ -3641,8 +3641,6 @@ bail0:
+@@ -3686,8 +3686,6 @@ bail0:
      {
  	if (name)
  	    FcConfigMessage (0, FcSevereError, "Cannot %s config file \"%s\": %s", load ? "load" : "scan", name, FcStrBufDoneStatic (&reason));