Dependency version bumps

- Update ImageMagick to 6.9.12-50.
- Add --commit and --ref build option (#44).

MXE Updates:
- Update HarfBuzz to 4.3.0.

Author: kleisauke

README.md

@@ -26,7 +26,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [fribidi]       | 1.0.12    | LGPLv3                                                       |
 | [gdk-pixbuf]    | 2.42.8    | LGPLv3                                                       |
 | [glib]          | 2.72.1    | LGPLv3                                                       |
-| [harfbuzz]      | 4.2.1     | MIT Licence                                                  |
+| [harfbuzz]      | 4.3.0     | MIT Licence                                                  |
 | [lcms]          | 2.13.1    | MIT Licence                                                  |
 | [libexif]       | 0.6.24    | LGPLv3                                                       |
 | [libffi]        | 3.4.2     | MIT Licence                                                  |
@@ -97,7 +97,7 @@ Same as libvips-web + these extra dependencies:
 | [cfitsio]       | 4.1.0     | BSD-like                                                     |
 | [fftw]          | 3.3.10    | GPLv2                                                        |
 | [highway]       | 0.16.0    | Apache-2.0 License                                           |
-| [imagemagick]   | 6.9.12-48 | [ImageMagick License] (Apache-2.0-like)                      |
+| [imagemagick]   | 6.9.12-50 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.5     | BSD 3-Clause                                                 |
 | [libjxl]        | 0.6.1     | BSD 3-Clause                                                 |
 | [matio]         | 1.5.23    | BSD 2-Clause                                                 |

build.sh

@@ -7,13 +7,15 @@ Usage: $(basename "$0") [OPTIONS] [DEPS] [ARCH] [TYPE]
 Build Windows binaries for libvips in a container
 
 OPTIONS:
-	--help			Show the help and exit
-	--nightly		Build libvips from tip-of-tree
-	--with-hevc		Build libheif with the HEVC-related dependencies
-	--with-debug		Build binaires with debug symbols
-	--without-llvm		Build binaires with GCC
-	--without-mozjpeg	Build binaires with libjpeg-turbo
-	--without-zlib-ng	Build binaires with vanilla zlib
+	--help					Show the help and exit
+	-c, --commit <COMMIT>	The commit to build libvips from
+	-r, --ref <REF>			The branch or tag to build libvips from
+	--nightly				Build libvips from tip-of-tree (alias of -r master)
+	--with-hevc				Build libheif with the HEVC-related dependencies
+	--with-debug			Build binaires with debug symbols
+	--without-llvm			Build binaires with GCC
+	--without-mozjpeg		Build binaires with libjpeg-turbo
+	--without-zlib-ng		Build binaires with vanilla zlib
 
 DEPS:
 	The group of dependencies to build libvips with,
@@ -47,7 +49,8 @@ EOF
 . $PWD/build/variables.sh
 
 # Default arguments
-nightly=false
+git_commit=""
+git_ref=""
 with_hevc=false
 with_debug=false
 with_llvm=true
@@ -60,7 +63,9 @@ POSITIONAL=()
 while [ $# -gt 0 ]; do
   case $1 in
     -h|--help) usage 0 ;;
-    --nightly) nightly=true ;;
+    -c|--commit) git_commit="$2"; shift ;;
+    -r|--ref) git_ref="$2"; shift ;;
+    --nightly) git_ref="master" ;;
     --with-hevc) with_hevc=true ;;
     --with-debug) with_debug=true ;;
     --without-llvm) with_llvm=false ;;
@@ -122,6 +127,22 @@ if [ "$type" = "static" ] && [ "$deps" = "all" ]; then
   exit 1
 fi
 
+if [ -n "$git_commit" ] && [ -n "$git_ref" ]; then
+  echo "ERROR: The --commit and --ref options are mutually exclusive." >&2
+  exit 1
+fi
+
+if [ -n "$git_ref" ]; then
+  git_commit=$(git ls-remote --heads --tags --refs https://github.com/libvips/libvips.git $git_ref | awk '{print $1}')
+  if [ -z "$git_commit" ]; then
+    echo "ERROR: Couldn't find remote ref $git_ref in the libvips repository." >&2
+    exit 1
+  fi
+fi
+
+# GitHub's tarball API requires the short SHA commit as the directory name
+git_commit="${git_commit:0:7}"
+
 target="$arch-w64-mingw32.$type.$threads${unwind:+.$unwind}"
 
 if [ "$with_debug" = "true" ]; then
@@ -150,7 +171,7 @@ $oci_runtime build -t libvips-build-win-mxe container
 $oci_runtime run --rm -t \
   -u $(id -u):$(id -g) \
   -v $PWD/build:/data \
-  -e "NIGHTLY=$nightly" \
+  -e "GIT_COMMIT=$git_commit" \
   -e "HEVC=$with_hevc" \
   -e "DEBUG=$with_debug" \
   -e "LLVM=$with_llvm" \

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="c3ac37bc7e09a55219c4671fd856edb1973a9c42"
+revision="23cb13d8aec6bbd51ef3671b0e975c61d7dbd0ad"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then
@@ -92,7 +92,7 @@ fi
 # The 'plugins' variable controls which plugins are in use
 plugins="$work_dir"
 
-if [ "$NIGHTLY" = "true" ]; then
+if [ -n "$GIT_COMMIT" ]; then
   plugins+=" $work_dir/plugins/nightly"
 fi
 
@@ -129,9 +129,7 @@ make pe-util \
   MXE_TARGETS=`$mxe_dir/ext/config.guess` \
   MXE_USE_CCACHE=
 
-if [ "$NIGHTLY" = "true" ]; then
-  nightly_version=$(wget -q -O- 'https://api.github.com/repos/libvips/libvips/git/refs/heads/master' | sed -n 's#.*"sha": "\([^"]\{7\}\).*#\1#p' | head -1)
-
+if [ -n "$GIT_COMMIT" ]; then
   # Invalidate build cache, if exits
   rm -f $mxe_dir/usr/$target.$deps/installed/vips-$deps
 fi
@@ -141,7 +139,7 @@ fi
 make gendef vips-$deps \
   MXE_PLUGIN_DIRS="$plugins" \
   MXE_TARGETS=$target.$deps \
-  NIGHTLY_VERSION=$nightly_version
+  GIT_COMMIT=$GIT_COMMIT
 
 # Build and bundle llvm-mingw tests when debugging
 if [ "$LLVM" = "true" ] && [ "$DEBUG" = "true" ]; then

build/overrides.mk

@@ -2,7 +2,7 @@ $(info == General overrides: $(lastword $(MAKEFILE_LIST)))
 
 ## Update dependencies
 
-# upstream version is 3.2.1
+# upstream version is 3.3
 libffi_VERSION  := 3.4.2
 libffi_CHECKSUM := 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620
 libffi_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libffi-[0-9]*.patch)))
@@ -39,8 +39,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 7, we want ImageMagick 6
-imagemagick_VERSION  := 6.9.12-48
-imagemagick_CHECKSUM := af46e8caa8fc871f77e6cd55713fdc660d80d8803feb3bb5991bd82e18bddd15
+imagemagick_VERSION  := 6.9.12-50
+imagemagick_CHECKSUM := 36c9be90f6158e36e5496bed6d539aa7bd1fe2509c9a911e01edb5283f6a0db2
 imagemagick_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
 imagemagick_GH_CONF  := ImageMagick/ImageMagick6/tags
 

build/package-vipsdev.sh

@@ -94,7 +94,7 @@ install_dir=$mxe_prefix/$target.$deps
 bin_dir=$install_dir/bin
 
 # Ensure module_dir is set correctly when building nightly versions
-if [ "$NIGHTLY" = "true" ]; then
+if [ -n "$GIT_COMMIT" ]; then
   module_dir=$(printf '%s\n' $install_dir/lib/vips-modules-* | sort -n | tail -1)
 else
   module_dir=$install_dir/lib/vips-modules-$vips_version

build/plugins/nightly/overrides.mk

@@ -3,20 +3,20 @@ $(PLUGIN_HEADER)
 # Nightly build, skip checksum verification
 SKIP_CHECKSUM := $(true)
 
-vips-web_VERSION  := $(NIGHTLY_VERSION)
+vips-web_VERSION  := $(GIT_COMMIT)
 vips-web_GH_CONF  := libvips/libvips/branches/master
-vips-web_SUBDIR   := libvips-libvips-$(NIGHTLY_VERSION)
-vips-web_FILE     := vips-web-$(NIGHTLY_VERSION).tar.gz
+vips-web_SUBDIR   := libvips-libvips-$(GIT_COMMIT)
+vips-web_FILE     := vips-web-$(GIT_COMMIT).tar.gz
 
 vips-web_BUILD_x86_64-w64-mingw32  = $(subst configure,autogen.sh,$(vips-web_BUILD))
 vips-web_BUILD_i686-w64-mingw32    = $(subst configure,autogen.sh,$(vips-web_BUILD))
 vips-web_BUILD_aarch64-w64-mingw32 = $(subst configure,autogen.sh,$(vips-web_BUILD))
 vips-web_BUILD_armv7-w64-mingw32   = $(subst configure,autogen.sh,$(vips-web_BUILD))
 
-vips-all_VERSION  := $(NIGHTLY_VERSION)
+vips-all_VERSION  := $(GIT_COMMIT)
 vips-all_GH_CONF  := libvips/libvips/branches/master
-vips-all_SUBDIR   := libvips-libvips-$(NIGHTLY_VERSION)
-vips-all_FILE     := vips-all-$(NIGHTLY_VERSION).tar.gz
+vips-all_SUBDIR   := libvips-libvips-$(GIT_COMMIT)
+vips-all_FILE     := vips-all-$(GIT_COMMIT).tar.gz
 
 vips-all_BUILD_x86_64-w64-mingw32  = $(subst configure,autogen.sh,$(vips-all_BUILD))
 vips-all_BUILD_i686-w64-mingw32    = $(subst configure,autogen.sh,$(vips-all_BUILD))

build/variables.sh

@@ -5,8 +5,8 @@ vips_version=8.12
 vips_patch_version=2
 #vips_pre_version=rc1
 
-if [ "$NIGHTLY" = "true" ]; then
-  vips_version=nightly
+if [ -n "$GIT_COMMIT" ]; then
+  vips_version=$GIT_COMMIT
   vips_patch_version=
   vips_pre_version=
 fi

container/Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get update \
     # http://mxe.cc/#requirements-debian
     autopoint bison flex gettext gperf g++-multilib \
     intltool libc6-dev-i386 libtool-bin libxml-parser-perl \
-    lzip p7zip-full python-is-python3 python3-mako ruby texinfo \
+    lzip p7zip-full python-is-python3 python3-mako ruby \
     # needed when building libvips from git
     gobject-introspection gtk-doc-tools