Dependency version bumps

- Update highway to 0.17.0.
- Update ImageMagick to 6.9.12-51.

MXE Updates:
- Update Poppler to 22.06.0.

Author: kleisauke

README.md

@@ -96,16 +96,16 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
 | [cfitsio]       | 4.1.0     | BSD-like                                                     |
 | [fftw]          | 3.3.10    | GPLv2                                                        |
-| [highway]       | 0.16.0    | Apache-2.0 License                                           |
-| [imagemagick]   | 6.9.12-50 | [ImageMagick License] (Apache-2.0-like)                      |
+| [highway]       | 0.17.0    | Apache-2.0 License                                           |
+| [imagemagick]   | 6.9.12-51 | [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                                                 |
 | [nifticlib]     | 3.0.1     | Public domain                                                |
 | [openexr]       | 3.1.5     | BSD 3-Clause                                                 |
 | [openjpeg]      | 2.5.0     | BSD 2-Clause                                                 |
 | [openslide]     | 3.4.1     | LGPLv3                                                       |
-| [poppler]       | 22.05.0   | GPLv2                                                        |
+| [poppler]       | 22.06.0   | GPLv2                                                        |
 | [sqlite]        | 3.38.5    | Public domain                                                |
 
 [brotli]: https://github.com/google/brotli

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="c8a846658a349da3e4676a69f9b01cbf13205dbe"
+revision="7771847b4212235b48e7270331ba82e791704a03"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; 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   :=
-$(PKG)_VERSION  := 0.16.0
-$(PKG)_CHECKSUM := 746c9578446be6c5286e8846c5f0d4118c0c1f04219c401abadcb8a5f2051893
-$(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/highway-[0-9]*.patch)))
+$(PKG)_VERSION  := 0.17.0
+$(PKG)_CHECKSUM := 25158fd5c090b70ecea47fc246c860d150f07f801d2434e1e51ec14a6c15822c
+$(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_GH_CONF  := google/highway/tags
 $(PKG)_DEPS     := cc
 

build/libjxl.mk

@@ -4,7 +4,7 @@ $(PKG)_DESCR    := JPEG XL image format reference implementation
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 0.6.1
 $(PKG)_CHECKSUM := ccbd5a729d730152303be399f033b905e608309d5802d77a61a95faa092592c5
-$(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjxl-[0-9]*.patch)))
+$(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_GH_CONF  := libjxl/libjxl/tags,v
 $(PKG)_DEPS     := cc brotli highway lcms libjpeg-turbo libpng
 

build/overrides.mk

@@ -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-50
-imagemagick_CHECKSUM := 36c9be90f6158e36e5496bed6d539aa7bd1fe2509c9a911e01edb5283f6a0db2
+imagemagick_VERSION  := 6.9.12-51
+imagemagick_CHECKSUM := 699cd979e845f96bae309adf2c6acb1a1eccf01907c12a3ef743f5a4b9a1897b
 imagemagick_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
 imagemagick_GH_CONF  := ImageMagick/ImageMagick6/tags
 

build/patches/libjxl-0.6-fixes.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <github@kleisauke.nl>
 Date: Wed, 2 Jun 2021 14:07:04 +0200
-Subject: [PATCH 1/9] Remove LCMS mutex
+Subject: [PATCH 1/11] Remove LCMS mutex
 
 Upstream-Status: Accepted [https://github.com/libjxl/libjxl/commit/057cd06c19875bcf8b5d34d41d92a8abdb856b7c]
 
@@ -70,7 +70,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <github@kleisauke.nl>
 Date: Tue, 8 Jun 2021 12:40:01 +0200
-Subject: [PATCH 2/9] Allow to build with system-wide installed lcms
+Subject: [PATCH 2/11] Allow to build with system-wide installed lcms
 
 See: https://gitlab.com/wg1/jpeg-xl/-/issues/124
 
@@ -158,7 +158,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <github@kleisauke.nl>
 Date: Tue, 8 Jun 2021 13:14:53 +0200
-Subject: [PATCH 3/9] Allow to build without LodePNG
+Subject: [PATCH 3/11] Allow to build without LodePNG
 
 Since there's no official release available.
 
@@ -300,7 +300,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <github@kleisauke.nl>
 Date: Tue, 8 Jun 2021 13:30:49 +0200
-Subject: [PATCH 4/9] Ensure DLLs are installed in the bin directory
+Subject: [PATCH 4/11] Ensure DLLs are installed in the bin directory
 
 
 diff --git a/lib/jxl.cmake b/lib/jxl.cmake
@@ -339,7 +339,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <github@kleisauke.nl>
 Date: Wed, 9 Jun 2021 19:38:33 +0200
-Subject: [PATCH 5/9] tsc_timer.h: sync with nanobenchmark.cc from Highway (#797)
+Subject: [PATCH 5/11] tsc_timer.h: sync with nanobenchmark.cc from Highway (#797)
 
 This file was originally originated from nanobenchmark.cc on the
 Highway project. Re-syncing this file ensures that the fixes from
@@ -493,7 +493,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <github@kleisauke.nl>
 Date: Sun, 10 Oct 2021 18:50:00 +0200
-Subject: [PATCH 6/9] --exclude-libs=ALL is only supported on ELF platforms
+Subject: [PATCH 6/11] --exclude-libs=ALL is only supported on ELF platforms
 
 This linker option is not available for COFF and Mach-O platforms.
 
@@ -519,7 +519,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jan Wassenberg <janwas@google.com>
 Date: Fri, 12 Nov 2021 09:12:35 +0100
-Subject: [PATCH 7/9] Avoid deprecated Highway functions
+Subject: [PATCH 7/11] Avoid deprecated Highway functions
 
 Instead use the newer overloads with the extra d arg required to
 support SVE/RISC-V.
@@ -867,7 +867,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jan Wassenberg <janwas@google.com>
 Date: Thu, 6 Jan 2022 09:36:20 +0100
-Subject: [PATCH 8/9] Avoid deprecated Hwy functions - add d arg
+Subject: [PATCH 8/11] Avoid deprecated Hwy functions - add d arg
 
 Upstream-Status: Accepted [https://github.com/libjxl/libjxl/commit/0902f85ca6e9e305338baf7974192acab8c53ac5]
 
@@ -973,7 +973,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jan Wassenberg <janwas@google.com>
 Date: Fri, 4 Feb 2022 11:37:43 +0100
-Subject: [PATCH 9/9] Rename deprecated StoreFence to FlushStream
+Subject: [PATCH 9/11] Rename deprecated StoreFence to FlushStream
 
 Upstream-Status: Accepted [https://github.com/libjxl/libjxl/commit/600b591538827247f1b2ad6ee6ae627a2173b7ec]
 
@@ -1017,3 +1017,54 @@ index 1111111..2222222 100644
  #endif
 
  #if defined(__MACH__)
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jan Wassenberg <janwas@google.com>
+Date: Wed, 13 Apr 2022 11:04:32 +0200
+Subject: [PATCH 10/11] Prepare for EMU128 target: avoid x86-specific code
+
+Upstream-Status: Accepted [https://github.com/libjxl/libjxl/commit/98d25826edc1d93284ba36928b96c0f13968e940]
+
+diff --git a/lib/jxl/convolve-inl.h b/lib/jxl/convolve-inl.h
+index 1111111..2222222 100644
+--- a/lib/jxl/convolve-inl.h
++++ b/lib/jxl/convolve-inl.h
+@@ -44,7 +44,7 @@ class Neighbors {
+     return c;  // Same (the first mirrored value is the last valid one)
+ #else  // 128 bit
+     // c = LKJI
+-#if HWY_ARCH_X86
++#if HWY_TARGET <= (1 << HWY_HIGHEST_TARGET_BIT_X86)
+     return V{_mm_shuffle_ps(c.raw, c.raw, _MM_SHUFFLE(2, 1, 0, 0))};  // KJII
+ #else
+     const D d;
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jan Wassenberg <janwas@google.com>
+Date: Fri, 22 Apr 2022 10:16:44 +0200
+Subject: [PATCH 11/11] Further fix of convolve-inl, missed some spots
+
+Upstream-Status: Accepted [https://github.com/libjxl/libjxl/commit/1f849bd281453bfe6502a9aad58dffb3ac088e17]
+
+diff --git a/lib/jxl/convolve-inl.h b/lib/jxl/convolve-inl.h
+index 1111111..2222222 100644
+--- a/lib/jxl/convolve-inl.h
++++ b/lib/jxl/convolve-inl.h
+@@ -72,7 +72,7 @@ class Neighbors {
+     return Zero(d);
+ #else  // 128 bit
+     // c = LKJI
+-#if HWY_ARCH_X86
++#if HWY_TARGET <= (1 << HWY_HIGHEST_TARGET_BIT_X86)
+     return V{_mm_shuffle_ps(c.raw, c.raw, _MM_SHUFFLE(1, 0, 0, 1))};  // JIIJ
+ #else
+     const D d;
+@@ -98,7 +98,7 @@ class Neighbors {
+     return Zero(d);
+ #else  // 128 bit
+     // c = LKJI
+-#if HWY_ARCH_X86
++#if HWY_TARGET <= (1 << HWY_HIGHEST_TARGET_BIT_X86)
+     return V{_mm_shuffle_ps(c.raw, c.raw, _MM_SHUFFLE(0, 0, 1, 2))};  // IIJK
+ #else
+     const D d;

build/patches/meson-0.61-fixes.patch renamed to build/patches/meson-0.62-fixes.patch

@@ -21,7 +21,7 @@ diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
 index 1111111..2222222 100644
 --- a/mesonbuild/linkers/linkers.py
 +++ b/mesonbuild/linkers/linkers.py
-@@ -607,7 +607,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -612,7 +612,8 @@ class GnuLikeDynamicLinkerMixin:
          return self._apply_prefix('--out-implib=' + implibname)
 
      def thread_flags(self, env: 'Environment') -> T.List[str]:

build/patches/poppler-mingw-std-threads.patch

@@ -57,18 +57,18 @@ diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h
 index 1111111..2222222 100644
 --- a/poppler/CairoFontEngine.h
 +++ b/poppler/CairoFontEngine.h
-@@ -31,7 +31,11 @@
- #ifndef CAIROFONTENGINE_H
+@@ -32,7 +32,11 @@
  #define CAIROFONTENGINE_H
 
+ #include <memory>
 +#ifdef _WIN32
 +#include "mingw.mutex.h"
 +#else
  #include <mutex>
 +#endif
+ #include <unordered_map>
+ #include <vector>
 
- #include "poppler-config.h"
- #include <cairo-ft.h>
 diff --git a/poppler/Dict.h b/poppler/Dict.h
 index 1111111..2222222 100644
 --- a/poppler/Dict.h