Update for 8.14.3

- Update HarfBuzz to 8.0.1. - Update libarchive to 3.7.0. - Update highway to 1.0.5. - Update ImageMagick to 6.9.12-91.
libvips · Jul 20, 2023 · 4fb5221 · 4fb5221
1 parent 9f3592e
commit 4fb5221
Show file tree

Hide file tree

Showing 10 changed files with 316 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -26,9 +26,9 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [fribidi]       | 1.0.13    | LGPLv3                                                       |
 | [gdk-pixbuf]    | 2.42.10   | LGPLv3                                                       |
 | [glib]          | 2.77.0    | LGPLv3                                                       |
-| [harfbuzz]      | 7.3.0     | MIT Licence                                                  |
+| [harfbuzz]      | 8.0.1     | MIT Licence                                                  |
 | [lcms]          | 2.15      | MIT Licence                                                  |
-| [libarchive]    | 3.6.2     | BSD 2-Clause                                                 |
+| [libarchive]    | 3.7.0     | BSD 2-Clause                                                 |
 | [libexif]       | 0.6.24    | LGPLv3                                                       |
 | [libffi]        | 3.4.4     | MIT Licence                                                  |
 | [libheif]       | 1.16.2    | LGPLv3                                                       |
@@ -37,7 +37,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [librsvg]       | 2.56.90   | LGPLv3                                                       |
 | [libspng]       | 0.7.4     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.5.1     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.14.2    | LGPLv3                                                       |
+| [libvips]       | 8.14.3    | LGPLv3                                                       |
 | [libwebp]       | 1.3.1     | New BSD License                                              |
 | [libxml2]       | 2.11.4    | MIT Licence                                                  |
 | [mozjpeg]       | 4.1.3     | [zlib License, IJG License, BSD-3-Clause]                    |
@@ -96,8 +96,8 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
 | [cfitsio]       | 4.2.0     | BSD-like                                                     |
 | [fftw]          | 3.3.10    | GPLv2                                                        |
-| [highway]       | 1.0.4     | Apache-2.0 License                                           |
-| [imagemagick]   | 6.9.12-90 | [ImageMagick License] (Apache-2.0-like)                      |
+| [highway]       | 1.0.5     | Apache-2.0 License                                           |
+| [imagemagick]   | 6.9.12-91 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.9     | BSD 3-Clause                                                 |
 | [libjxl]        | 0.8.2     | BSD 3-Clause                                                 |
 | [matio]         | 1.5.23    | BSD 2-Clause                                                 |

diff --git a/build.sh b/build.sh
@@ -13,10 +13,10 @@ OPTIONS:
 	--tmpdir <DIR>		Where intermediate files should be stored (default in /var/tmp/mxe)
 	--nightly		Build libvips from tip-of-tree (alias of -r master)
 	--with-hevc		Build libheif with the HEVC-related dependencies
-	--with-debug		Build binaires without optimizations to improve debuggability
-	--without-llvm		Build binaires with GCC
-	--without-mozjpeg	Build binaires with libjpeg-turbo
-	--without-zlib-ng	Build binaires with vanilla zlib
+	--with-debug		Build binaries without optimizations to improve debuggability
+	--without-llvm		Build binaries with GCC
+	--without-mozjpeg	Build binaries with libjpeg-turbo
+	--without-zlib-ng	Build binaries with vanilla zlib
 
 DEPS:
 	The group of dependencies to build libvips with,

diff --git a/build/highway.mk b/build/highway.mk
@@ -2,17 +2,22 @@ PKG             := highway
 $(PKG)_WEBSITE  := https://github.com/google/highway
 $(PKG)_DESCR    := Performance-portable, length-agnostic SIMD with runtime dispatch
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.4
-$(PKG)_CHECKSUM := faccd343935c9e98afd1016e9d20e0b8b89d908508d1af958496f8c2d3004ac2
+$(PKG)_VERSION  := 1.0.5
+$(PKG)_CHECKSUM := 99b7dad98b8fa088673b720151458fae698ae5df9154016e39de4afdc23bb927
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_GH_CONF  := google/highway/tags
 $(PKG)_DEPS     := cc
 
+# Highway requires VFPv4 floating-point instructions when targeting Armv7.
+# See: https://github.com/google/highway/pull/1143
+# Dynamic dispatch requires Linux to detect CPU capabilities on both Armv7
+# and AArch64.
 define $(PKG)_BUILD
     cd '$(BUILD_DIR)' && $(TARGET)-cmake \
         -DBUILD_TESTING=OFF \
         -DHWY_ENABLE_CONTRIB=OFF \
         -DHWY_ENABLE_EXAMPLES=OFF \
+        $(if $(call seq,armv7,$(PROCESSOR)), -DCMAKE_CXX_FLAGS='$(CXXFLAGS) -mfpu=neon-vfpv4') \
         '$(SOURCE_DIR)'
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR)' -j 1 $(subst -,/,$(INSTALL_STRIP_LIB))

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -29,16 +29,16 @@ libxml2_FILE     := libxml2-$(libxml2_VERSION).tar.xz
 libxml2_URL      := https://download.gnome.org/sources/libxml2/$(call SHORT_PKG_VERSION,libxml2)/$(libxml2_FILE)
 
 # upstream version is 3.4.0
-libarchive_VERSION  := 3.6.2
-libarchive_CHECKSUM := 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d
+libarchive_VERSION  := 3.7.0
+libarchive_CHECKSUM := 44729a0cc3b0b0be6742a9873d25e85e240c9318f5f5ebf2cca6bc84d7b91b07
 libarchive_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libarchive-[0-9]*.patch)))
 libarchive_SUBDIR   := libarchive-$(libarchive_VERSION)
 libarchive_FILE     := libarchive-$(libarchive_VERSION).tar.xz
-libarchive_URL      := https://www.libarchive.org/downloads/$(libarchive_FILE)
+libarchive_URL      := https://github.com/libarchive/libarchive/releases/download/v$(libarchive_VERSION)/$(libarchive_FILE)
 
 # upstream version is 7, we want ImageMagick 6
-imagemagick_VERSION  := 6.9.12-90
-imagemagick_CHECKSUM := d17bdab4ba3dbe735026cbbe82046a28e8ad36ff8bf090be37bd34f4aedc8d78
+imagemagick_VERSION  := 6.9.12-91
+imagemagick_CHECKSUM := d55f906897ee806e8fc3ba4a20afe2290603435db3f775522035c501358f5b32
 imagemagick_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
 imagemagick_GH_CONF  := ImageMagick/ImageMagick6/tags
 
@@ -125,6 +125,12 @@ pixman_SUBDIR   := pixman-$(pixman_VERSION)
 pixman_FILE     := pixman-$(pixman_VERSION).tar.gz
 pixman_URL      := https://cairographics.org/releases/$(pixman_FILE)
 
+# upstream version is 7.3.0
+harfbuzz_VERSION  := 8.0.1
+harfbuzz_CHECKSUM := c1ce780acd385569f25b9a29603d1d5bc71e6940e55bfdd4f7266fad50e42620
+harfbuzz_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/harfbuzz-[0-9]*.patch)))
+harfbuzz_GH_CONF  := harfbuzz/harfbuzz/releases,,,,,.tar.xz
+
 # upstream version is 3.3.8
 fftw_VERSION  := 3.3.10
 fftw_CHECKSUM := 56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467
@@ -577,8 +583,6 @@ define librsvg_BUILD
 
     # Allow libtool to statically link against libintl
     # by specifying lt_cv_deplibs_check_method="pass_all"
-    # Need to explicitly link against ntdll after PR:
-    # https://github.com/rust-lang/rust/pull/108262
     cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
         --disable-pixbuf-loader \
@@ -767,7 +771,8 @@ define libarchive_BUILD
         --disable-bsdtar \
         --disable-bsdcat \
         --disable-bsdcpio \
-        --disable-posix-regex-lib
+        --disable-posix-regex-lib \
+        $(if $(BUILD_STATIC), CFLAGS='-DLIBARCHIVE_STATIC')
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT)
     $(MAKE) -C '$(BUILD_DIR)' -j 1 $(INSTALL_STRIP_LIB) $(MXE_DISABLE_CRUFT)
 endef
@@ -791,6 +796,7 @@ define glib_BUILD
         --default-library=shared \
         --force-fallback-for=gvdb \
         -Dnls=disabled \
+        -Dtests=false \
         -Dglib_assert=false \
         -Dglib_checks=false \
         '$(SOURCE_DIR)' \