Dependency version bumps

- Update GLib to 2.69.0.
- Update librsvg to 2.51.4.
- Update Pango to 1.48.7.
- Update LLVM toolchain to 12.0.1.
- Update highway to the latest git revision.
- Update libjxl to the latest git revision.
- Fix LCMS thread-safety patch for i686 (#31).

MXE Updates:
- Update HarfBuzz to 2.8.2.

Author: kleisauke

README.md

@@ -24,24 +24,24 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [freetype]      | 2.10.4    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.10    | LGPLv3                                                       |
 | [gdk-pixbuf]    | 2.42.6    | LGPLv3                                                       |
-| [glib]          | 2.68.3    | LGPLv3                                                       |
-| [harfbuzz]      | 2.8.1     | MIT Licence                                                  |
+| [glib]          | 2.69.0    | LGPLv3                                                       |
+| [harfbuzz]      | 2.8.2     | MIT Licence                                                  |
 | [lcms]          | 2.12      | MIT Licence                                                  |
 | [libexif]       | 0.6.22    | LGPLv3                                                       |
 | [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.3    | LGPLv3                                                       |
+| [librsvg]       | 2.51.4    | LGPLv3                                                       |
 | [libspng]       | 0.6.3     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.3.0     | [libtiff License] (BSD-like)                                 |
 | [libvips]       | 8.11.2    | LGPLv3                                                       |
 | [libwebp]       | 1.2.0     | New BSD License                                              |
 | [libxml2]       | 2.9.12    | MIT Licence                                                  |
 | [mozjpeg]       | 4.0.3     | [zlib License, IJG License, BSD-3-Clause]                    |
 | [orc]           | 0.4.32    | [orc License] (BSD-like)                                     |
-| [pango]         | 1.48.6    | LGPLv3                                                       |
+| [pango]         | 1.48.7    | LGPLv3                                                       |
 | [pixman]        | 0.40.0    | MIT Licence                                                  |
 | [zlib-ng]       | 2.0.5     | [zlib-ng Licence]                                            |
 
@@ -92,10 +92,10 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
 | [cfitsio]       | 3.49      | BSD-like                                                     |
 | [fftw]          | 3.3.9     | GPLv2                                                        |
-| [highway]       | [91017e4] | Apache-2.0 License                                           |
+| [highway]       | [c7d83de] | Apache-2.0 License                                           |
 | [imagemagick]   | 6.9.12-17 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.0.5     | BSD 3-Clause                                                 |
-| [libjxl]        | [c8b0bf3] | BSD 3-Clause                                                 |
+| [libjxl]        | [2db3204] | BSD 3-Clause                                                 |
 | [matio]         | 1.5.21    | BSD 2-Clause                                                 |
 | [nifticlib]     | 2.0.0     | Public domain                                                |
 | [openexr]       | 3.0.5     | BSD 3-Clause                                                 |
@@ -104,8 +104,8 @@ Same as libvips-web + these extra dependencies:
 | [poppler]       | 21.07.0   | GPLv2                                                        |
 | [sqlite]        | 3.36.0    | Public domain                                                |
 
-[91017e4]: https://github.com/google/highway/commit/91017e4f3bb7e3a178e3f2b1f393adea60a6df0d
-[c8b0bf3]: https://github.com/libjxl/libjxl/commit/c8b0bf3789351c9ccd8c48441354c522fd9ab188
+[c7d83de]: https://github.com/google/highway/commit/c7d83dee21a55607a3032a751de57eb72eaa4987
+[2db3204]: https://github.com/libjxl/libjxl/commit/2db3204b23b96a169ae851faffdef2ae1c41b018
 
 [brotli]: https://github.com/google/brotli
 [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/

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="b48b3cc7085548e896fe967dc6371ff9951390a4"
+revision="99d62e454ce805b03aaddcdb6cd209cada503543"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then

build/gendeflibs.sh

@@ -42,8 +42,7 @@ fi
 
 deps="${1:-web}"
 target="${2:-x86_64-w64-mingw32.shared.win32}"
-dlltool=$mxe_prefix/bin/$target.$deps-dlltool
-gendeftool=$mxe_prefix/$target.$deps/bin/gendef
+dlltool=$target.$deps-dlltool
 
 cd $repackage_dir
 
@@ -62,7 +61,7 @@ for dllfile in bin/*.dll; do
 
   if [ ! -f lib/$defname ]; then
     echo "Generating lib/$defname file for $base"
-    $gendeftool - $dllfile > lib/$defname 2> /dev/null
+    gendef - $dllfile > lib/$defname 2> /dev/null
   fi
 
   if [ ! -f lib/$libname ]; then

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/91017e4f3bb7e3a178e3f2b1f393adea60a6df0d
-$(PKG)_VERSION  := 91017e4
-$(PKG)_CHECKSUM := c07f25290c3a6c660b5ebf9b2184c4353a643828a1b9f1d7390d40bc733eb274
+# https://github.com/google/highway/tarball/c7d83dee21a55607a3032a751de57eb72eaa4987
+$(PKG)_VERSION  := c7d83de
+$(PKG)_CHECKSUM := 98b95de53e9d032ffb03075dd87ae1babfbdac16f3002e794fdcc1b3dc33a6d4
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/highway-[0-9]*.patch)))
 $(PKG)_GH_CONF  := google/highway/branches/master
 $(PKG)_DEPS     := cc

build/libimagequant.mk

@@ -3,19 +3,13 @@ $(PKG)_WEBSITE  := https://github.com/lovell/libimagequant
 $(PKG)_DESCR    := libimagequant v2.4.1 fork (BSD 2-Clause)
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.4.1
-$(PKG)_CHECKSUM := d78a28455598a1b73a4d480c9f1db3048f526971496f4d37a484b71b00624fef
+$(PKG)_CHECKSUM := 76dca8e48366d7e16284071528d60c9275c85945e45e887f26ec0028668a144f
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_GH_CONF  := lovell/libimagequant/tags,v
 $(PKG)_DEPS     := cc
 
 define $(PKG)_BUILD
-    '$(TARGET)-meson' \
-        --buildtype=release \
-        $(if $(STRIP_LIB), --strip) \
-        --libdir='lib' \
-        --includedir='include' \
-        '$(SOURCE_DIR)' \
-        '$(BUILD_DIR)'
+    '$(TARGET)-meson' '$(SOURCE_DIR)' '$(BUILD_DIR)'
 
     ninja -C '$(BUILD_DIR)' install
 endef

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/c8b0bf3789351c9ccd8c48441354c522fd9ab188
-$(PKG)_VERSION  := c8b0bf3
-$(PKG)_CHECKSUM := 7f9ee9d54a3a2bbf753680aac67ce49a316d062ffb072958232cfdbf0ff78fdc
+# https://github.com/libjxl/libjxl/tarball/2db3204b23b96a169ae851faffdef2ae1c41b018
+$(PKG)_VERSION  := 2db3204
+$(PKG)_CHECKSUM := 4159e8c558ec3afd974021bd2bb57e2a44539358d44f23ebaac317d105afc52f
 $(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

build/libspng.mk

@@ -10,10 +10,6 @@ $(PKG)_DEPS     := cc zlib
 
 define $(PKG)_BUILD
     '$(TARGET)-meson' \
-        --buildtype=release \
-        $(if $(STRIP_LIB), --strip) \
-        --libdir='lib' \
-        --includedir='include' \
         -Dstatic_zlib=$(if $(BUILD_STATIC),true,false) \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'

build/orc.mk

@@ -18,10 +18,6 @@ endef
 
 define $(PKG)_BUILD
     '$(TARGET)-meson' \
-        --buildtype=release \
-        $(if $(STRIP_LIB), --strip) \
-        --libdir='lib' \
-        --includedir='include' \
         -Dbenchmarks=disabled \
         -Dexamples=disabled \
         -Dgtk_doc=disabled \

build/overrides.mk

@@ -46,16 +46,16 @@ imagemagick_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE
 imagemagick_GH_CONF  := ImageMagick/ImageMagick6/tags
 
 # upstream version is 2.40.5
-librsvg_VERSION  := 2.51.3
-librsvg_CHECKSUM := 4f83d40484bd69d1944d203090b50b812ec6aa553195e4f6d67d03d135897c7f
+librsvg_VERSION  := 2.51.4
+librsvg_CHECKSUM := 0b87d61de9b973aac1fdb9583368b9a893e67f5f7cb75c3e8f7de142557aca00
 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
 librsvg_URL      := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE)
 
 # upstream version is 1.37.4
-pango_VERSION  := 1.48.6
-pango_CHECKSUM := 3027cd6b5e34bff49c38c769ca651a5f9ef6e0d54cadaa1263d872044bedc7dd
+pango_VERSION  := 1.48.7
+pango_CHECKSUM := 28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc
 pango_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch)))
 pango_SUBDIR   := pango-$(pango_VERSION)
 pango_FILE     := pango-$(pango_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.3
-glib_CHECKSUM := e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138
+glib_VERSION  := 2.69.0
+glib_CHECKSUM := 1cdb3fd8610f3c57b6622e5cd68e0a3210561d80b0eceb971eb51fb8b63dbfae
 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
@@ -279,12 +279,6 @@ endef
 # build with Meson.
 define harfbuzz_BUILD
     '$(TARGET)-meson' \
-        --buildtype=release \
-        $(if $(STRIP_LIB), --strip) \
-        --libdir='lib' \
-        --bindir='bin' \
-        --libexecdir='bin' \
-        --includedir='include' \
         -Dicu=disabled \
         -Dtests=disabled \
         -Dintrospection=disabled \
@@ -296,6 +290,24 @@ define harfbuzz_BUILD
     ninja -C '$(BUILD_DIR)' install
 endef
 
+# TODO(kleisauke): build with the Meson build system once a new version is available
+#define freetype_BUILD_COMMON
+#    '$(TARGET)-meson' \
+#        -Dharfbuzz=enabled \
+#        -Dpng=enabled \
+#        -Dzlib=enabled \
+#        -Dbrotli=disabled \
+#        -Dbzip2=disabled \
+#        '$(SOURCE_DIR)' \
+#        '$(BUILD_DIR)'
+#
+#    ninja -C '$(BUILD_DIR)' install
+#endef
+
+#define freetype-bootstrap_BUILD
+#    $(subst harfbuzz=enabled,harfbuzz=disabled,$(freetype_BUILD_COMMON))
+#endef
+
 define freetype_BUILD
     # alias libharfbuzz and libfreetype to satisfy circular dependence
     # libfreetype should already have been created by freetype-bootstrap.mk
@@ -320,7 +332,6 @@ define libgsf_BUILD
     cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
         --without-gdk-pixbuf \
-        --without-python \
         --without-bz2 \
         --with-zlib \
         --disable-nls \
@@ -334,12 +345,6 @@ endef
 # build with the Meson build system
 define gdk-pixbuf_BUILD
     '$(TARGET)-meson' \
-        --buildtype=release \
-        $(if $(STRIP_LIB), --strip) \
-        --libdir='lib' \
-        --bindir='bin' \
-        --libexecdir='bin' \
-        --includedir='include' \
         -Dbuiltin_loaders='jpeg,png,tiff' \
         -Dintrospection=disabled \
         $(if $(IS_INTL_DUMMY), -Dc_link_args='-lintl') \
@@ -355,12 +360,6 @@ define pixman_BUILD
     $(SED) -i "/subdir('test')/{N;d;}" '$(SOURCE_DIR)/meson.build'
 
     '$(TARGET)-meson' \
-        --buildtype=release \
-        $(if $(STRIP_LIB), --strip) \
-        --libdir='lib' \
-        --bindir='bin' \
-        --libexecdir='bin' \
-        --includedir='include' \
         -Dopenmp=disabled \
         -Dgtk=disabled \
         '$(SOURCE_DIR)' \
@@ -372,12 +371,6 @@ endef
 # build fribidi with the Meson build system
 define fribidi_BUILD
     '$(TARGET)-meson' \
-        --buildtype=release \
-        $(if $(STRIP_LIB), --strip) \
-        --libdir='lib' \
-        --bindir='bin' \
-        --libexecdir='bin' \
-        --includedir='include' \
         -Ddocs=false \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'
@@ -472,11 +465,6 @@ define pango_BUILD
     $(SED) -i "/subdir('utils')/{N;N;N;d;}" '$(SOURCE_DIR)/meson.build'
 
     '$(TARGET)-meson' \
-        --buildtype=release \
-        $(if $(STRIP_LIB), --strip) \
-        --libdir='lib' \
-        --libexecdir='bin' \
-        --includedir='include' \
         -Dintrospection=disabled \
         -Dfontconfig=enabled \
         '$(SOURCE_DIR)' \
@@ -504,9 +492,6 @@ define librsvg_BUILD
         $(MXE_CONFIGURE_OPTS) \
         --disable-pixbuf-loader \
         --disable-introspection \
-        --disable-nls \
-        --without-libiconv-prefix \
-        --without-libintl-prefix \
         RUST_TARGET='$(ARCH_NAME)-pc-windows-gnu' \
         CARGO='$(TARGET)-cargo' \
         RUSTC='$(TARGET)-rustc'
@@ -582,7 +567,6 @@ define libwebp_BUILD
         --disable-jpeg \
         --disable-tiff \
         --disable-gif \
-        --disable-nls \
         --enable-libwebpmux \
         --enable-libwebpdemux
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_PROGRAMS)
@@ -692,19 +676,13 @@ define glib_BUILD
     $(if $(BUILD_STATIC), \
         (cd '$(SOURCE_DIR)' && $(PATCH) -p1 -u) < $(realpath $(dir $(lastword $(glib_PATCHES))))/glib-static.patch)
 
-    # cross build
-    # build as shared library, since we need `libgobject-2.0-0.dll`
+    # Build as shared library, since we need `libgobject-2.0-0.dll`
     # and `libglib-2.0-0.dll` for the language bindings.
-    '$(TARGET)-meson' \
+    # Enable networking to allow libpcre to be downloaded from WrapDB
+    MXE_ENABLE_NETWORK=1 '$(TARGET)-meson' \
         --default-library=shared \
-        --buildtype=release \
-        $(if $(STRIP_LIB), --strip) \
-        --libdir='lib' \
-        --bindir='bin' \
-        --libexecdir='bin' \
-        --includedir='include' \
+        --force-fallback-for=libpcre \
         -Dforce_posix_threads=false \
-        -Dinternal_pcre=true \
         -Dnls=disabled \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'

build/package-vipsdev.sh

@@ -44,6 +44,8 @@ type="${target#*.}"
 type="${type%%.*}"
 build_os=`$mxe_dir/ext/config.guess`
 
+export PATH="$mxe_prefix/$build_os/bin:$mxe_prefix/bin:$mxe_prefix/$target.$deps/bin:$PATH"
+
 if [ "$arch" = "i686" ]; then
   arch="w32"
 elif [ "$arch" = "x86_64" ]; then
@@ -88,8 +90,7 @@ if [ "$ZLIB_NG" = "false" ]; then
 fi
 
 # Utilities
-peldd=$mxe_prefix/$build_os/bin/peldd
-strip=$mxe_prefix/bin/$target.$deps-strip
+strip=$target.$deps-strip
 
 # Directories
 install_dir=$mxe_prefix/$target.$deps
@@ -106,7 +107,7 @@ whitelist=(api-ms-win-crt-{conio,convert,environment,filesystem,heap,locale,math
 whitelist+=(userenv.dll)
 
 # Copy libvips and dependencies with pe-util
-binaries=$($peldd $bin_dir/$target_dll --clear-path --path $bin_dir ${whitelist[@]/#/--wlist } --all)
+binaries=$(peldd $bin_dir/$target_dll --clear-path --path $bin_dir ${whitelist[@]/#/--wlist } --all)
 for dll in $binaries; do
   cp $dll $repackage_dir/bin
 done
@@ -115,7 +116,7 @@ done
 # which are not yet present in the bin directory.
 if [ -d "$module_dir" ]; then
   for module in $module_dir/*.dll; do
-    binaries=$($peldd $module --clear-path --path $bin_dir ${whitelist[@]/#/--wlist } --transitive)
+    binaries=$(peldd $module --clear-path --path $bin_dir ${whitelist[@]/#/--wlist } --transitive)
     for dll in $binaries; do
       cp -n $dll $repackage_dir/bin
     done