Dependency version bumps

- Update aom to 3.12.0.
- Update cgif to 0.5.0.
- Update libffi to 3.4.7.
- Update zlib-ng 2.2.4.
- Update Poppler to 25.02.0.

MXE Updates:
- Update LCMS to 2.17.
- Update SQLite to 3.49.0.

Author: kleisauke

README.md

@@ -17,20 +17,20 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 
 | Dependency      | Version   | Used under the terms of                                      |
 |-----------------|-----------|--------------------------------------------------------------|
-| [aom]           | 3.11.0    | BSD 2-Clause + [Alliance for Open Media Patent License 1.0]  |
+| [aom]           | 3.12.0    | BSD 2-Clause + [Alliance for Open Media Patent License 1.0]  |
 | [cairo]         | 1.18.2    | Mozilla Public License 2.0                                   |
-| [cgif]          | 0.4.1     | MIT Licence                                                  |
+| [cgif]          | 0.5.0     | MIT Licence                                                  |
 | [expat]         | 2.6.4     | MIT Licence                                                  |
 | [fontconfig]    | 2.16.0    | [fontconfig Licence] (BSD-like)                              |
 | [freetype]      | 2.13.3    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.16    | LGPLv3                                                       |
 | [glib]          | 2.83.3    | LGPLv3                                                       |
 | [harfbuzz]      | 10.2.0    | MIT Licence                                                  |
 | [highway]       | 1.2.0     | Apache-2.0 License, BSD 3-Clause                             |
-| [lcms]          | 2.16      | MIT Licence                                                  |
+| [lcms]          | 2.17      | MIT Licence                                                  |
 | [libarchive]    | 3.7.7     | BSD 2-Clause                                                 |
 | [libexif]       | 0.6.25    | LGPLv3                                                       |
-| [libffi]        | 3.4.6     | MIT Licence                                                  |
+| [libffi]        | 3.4.7     | MIT Licence                                                  |
 | [libheif]       | 1.19.5    | LGPLv3                                                       |
 | [libimagequant] | 2.4.1¹    | BSD 2-Clause                                                 |
 | [libpng]        | 1.6.46    | [libpng License version 2]                                   |
@@ -44,7 +44,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [pango]         | 1.56.1    | LGPLv3                                                       |
 | [pixman]        | 0.44.2    | MIT Licence                                                  |
 | [proxy-libintl] | 0.4       | LGPLv3                                                       |
-| [zlib-ng]       | 2.2.3     | [zlib-ng Licence]                                            |
+| [zlib-ng]       | 2.2.4     | [zlib-ng Licence]                                            |
 
 ¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.  
 
@@ -103,8 +103,8 @@ Same as libvips-web + these extra dependencies:
 | [openexr]       | 3.1.11    | BSD 3-Clause                                                 |
 | [openjpeg]      | 2.5.3     | BSD 2-Clause                                                 |
 | [openslide]     | 4.0.0     | LGPLv3                                                       |
-| [poppler]       | 25.01.0   | GPLv2                                                        |
-| [sqlite]        | 3.48.0    | Public domain                                                |
+| [poppler]       | 25.02.0   | GPLv2                                                        |
+| [sqlite]        | 3.49.0    | Public domain                                                |
 
 [brotli]: https://github.com/google/brotli
 [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/

build/aom.mk

@@ -2,8 +2,8 @@ PKG             := aom
 $(PKG)_WEBSITE  := https://aomedia.googlesource.com/aom/
 $(PKG)_DESCR    := AV1 Codec Library
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.11.0
-$(PKG)_CHECKSUM := cf7d103d2798e512aca9c6e7353d7ebf8967ee96fffe9946e015bb9947903e3e
+$(PKG)_VERSION  := 3.12.0
+$(PKG)_CHECKSUM := d89daa160a0ea1409c4193be5b17c9591024c4f5a0e545dcb9d197535c66836e
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_SUBDIR   := libaom-$($(PKG)_VERSION)
 $(PKG)_FILE     := libaom-$($(PKG)_VERSION).tar.gz

build/build.sh

@@ -45,7 +45,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="d734fd4f78f6b629e352aa47c93288d5e0ea9114"
+revision="866492387740cc6580ef516c8a746402be645453"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then

build/cgif.mk

@@ -2,8 +2,8 @@ PKG             := cgif
 $(PKG)_WEBSITE  := https://github.com/dloebl/cgif
 $(PKG)_DESCR    := A fast and lightweight GIF encoder
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.4.1
-$(PKG)_CHECKSUM := 8666f9c5f8123d1c22137a6dd714502a330377fb74e2007621926fe4258529d5
+$(PKG)_VERSION  := 0.5.0
+$(PKG)_CHECKSUM := d6cb312c7da2c6c9f310811aa3658120c0316ba130c48a012e7baf3698920fe9
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_GH_CONF  := dloebl/cgif/tags,v
@@ -13,6 +13,7 @@ define $(PKG)_BUILD
     $(eval export CFLAGS += -O3)
 
     $(MXE_MESON_WRAPPER) \
+        -Dexamples=false \
         -Dtests=false \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'

build/overrides.mk

@@ -2,6 +2,14 @@ $(info == General overrides: $(lastword $(MAKEFILE_LIST)))
 
 ## Update dependencies
 
+# upstream version is 3.4.6
+libffi_VERSION  := 3.4.7
+libffi_CHECKSUM := 138607dee268bdecf374adf9144c00e839e38541f75f24a1fcf18b78fda48b2d
+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
+libffi_URL      := https://github.com/libffi/libffi/releases/download/v$(libffi_VERSION)/$(libffi_FILE)
+
 # upstream version is 2.42.10
 # gdk-pixbuf is still used by OpenSlide
 gdk-pixbuf_VERSION  := 2.42.12
@@ -103,8 +111,8 @@ libjpeg-turbo_FILE     := libjpeg-turbo-$(libjpeg-turbo_VERSION).tar.gz
 libjpeg-turbo_URL      := https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$(libjpeg-turbo_VERSION)/$(libjpeg-turbo_FILE)
 
 # upstream version is 23.09.0
-poppler_VERSION  := 25.01.0
-poppler_CHECKSUM := 7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112
+poppler_VERSION  := 25.02.0
+poppler_CHECKSUM := 21234cb2a9647d73c752ce4031e65a79d11a511a835f2798284c2497b8701dee
 poppler_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
 poppler_SUBDIR   := poppler-$(poppler_VERSION)
 poppler_FILE     := poppler-$(poppler_VERSION).tar.xz
@@ -145,6 +153,7 @@ libxml2_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 meson_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/meson-[0-9]*.patch)))
 mingw-w64_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/mingw-w64-[0-9]*.patch)))
 poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
+sqlite_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/sqlite-[0-9]*.patch)))
 tiff_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/tiff-[0-9]*.patch)))
 
 # zlib will make libzlib.dll, but we want libz.dll so we must
@@ -197,6 +206,9 @@ zlib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))
 #  Removed: brotli, icu4c
 # libarchive:
 #  Removed: bzip2, libiconv, libxml2, nettle, openssl, xz
+# SQLite:
+#  Added: zlib
+#  Removed: dlfcn-win32
 
 freetype_DEPS           := $(subst brotli bzip2,meson-wrapper,$(freetype_DEPS))
 freetype-bootstrap_DEPS := $(subst brotli bzip2,meson-wrapper,$(freetype-bootstrap_DEPS))
@@ -217,6 +229,7 @@ fontconfig_DEPS         := cc meson-wrapper expat freetype-bootstrap
 libexif_DEPS            := $(filter-out  gettext,$(libexif_DEPS))
 harfbuzz_DEPS           := cc meson-wrapper cairo freetype-bootstrap glib
 libarchive_DEPS         := cc zlib
+sqlite_DEPS             := cc zlib
 
 ## Override build scripts
 
@@ -433,6 +446,7 @@ define lcms_BUILD
     $(eval export CFLAGS += -O3)
 
     $(MXE_MESON_WRAPPER) \
+        -Dtests=disabled \
         -Djpeg=disabled \
         -Dtiff=disabled \
         -Dc_args='$(CFLAGS) -DCMS_RELY_ON_WINDOWS_STATIC_MUTEX_INIT' \
@@ -555,7 +569,7 @@ define librsvg_BUILD
         -Dvala=disabled \
         -Dtests=false \
         -Dtriplet='$(PROCESSOR)-pc-windows-gnu$(if $(IS_LLVM),llvm)' \
-        $(if $(IS_LLVM), -Dc_link_args='$(LDFLAGS) -lntdll -luserenv -lsynchronization -lbcryptprimitives') \
+        $(if $(IS_LLVM), -Dc_link_args='$(LDFLAGS) -lntdll -luserenv') \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'
 
@@ -564,8 +578,8 @@ define librsvg_BUILD
     # Add native libraries needed for static linking to .pc file.
     # We cannot use rustc --print native-static-libs due to -Zbuild-std.
     # See: https://gitlab.gnome.org/GNOME/librsvg/-/issues/968
-    $(if $(and $(IS_LLVM),$(BUILD_STATIC)), \
-        $(SED) -i "/^Libs:/s/$$/ -lntdll -luserenv -lsynchronization -lbcryptprimitives/" '$(PREFIX)/$(TARGET)/lib/pkgconfig/librsvg-2.0.pc')
+    $(if $(IS_LLVM), \
+        $(SED) -i "/^Libs.private:/s/$$/ -lntdll -luserenv/" '$(PREFIX)/$(TARGET)/lib/pkgconfig/librsvg-2.0.pc')
 endef
 
 # compile with CMake
@@ -805,3 +819,30 @@ define brotli_BUILD
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR)' -j 1 $(subst -,/,$(INSTALL_STRIP_LIB))
 endef
+
+# install DLL in /bin
+# generate missing import library
+define sqlite_BUILD
+    cd '$(1)' && $(SOURCE_DIR)/configure \
+        --host='$(TARGET)' \
+        --build='$(BUILD)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        $(if $(BUILD_STATIC), \
+            --enable-static \
+            --disable-shared \
+        $(else), \
+            --disable-static \
+            --enable-shared) \
+        --disable-readline
+    $(MAKE) -C '$(1)' -j 1 install
+
+    # https://sqlite.org/forum/forumpost/4b68a3b892dfb9a1
+    # TODO(kleisauke): Switch to `--out-implib` configure flag for the next release.
+    $(if $(BUILD_SHARED), \
+        cp -L '$(PREFIX)/$(TARGET)/lib/libsqlite3.dll' '$(PREFIX)/$(TARGET)/bin'; \
+        rm -v '$(PREFIX)/$(TARGET)/lib/libsqlite3.dll'*; \
+        '$(PREFIX)/$(TARGET)/bin/gendef' '$(PREFIX)/$(TARGET)/bin/libsqlite3.dll'; \
+        $(TARGET)-dlltool -D '$(PREFIX)/$(TARGET)/bin/libsqlite3.dll' \
+            -l '$(PREFIX)/$(TARGET)/lib/libsqlite3.dll.a' \
+            -d 'libsqlite3.def';)
+endef

build/package-vipsdev.sh

@@ -70,6 +70,13 @@ module_dir_base=$(basename $module_dir)
 # List of PE targets that need to be copied, including their transitive dependencies and PDBs
 pe_targets=($bin_dir/libvips-cpp-42.dll $bin_dir/{vips,vipsedit,vipsheader,vipsthumbnail}.exe)
 
+# DLL search paths
+search_paths=($bin_dir)
+
+if [ "$type" = "shared" ]; then
+  search_paths+=($install_dir/${target%%.*}/bin)
+fi
+
 if [ -d "$module_dir" ]; then
   mkdir -p $repackage_dir/bin/$module_dir_base
   pe_targets+=($module_dir/*.dll)
@@ -137,7 +144,7 @@ fi
 for pe_target in "${pe_targets[@]}"; do
   [ -f "$pe_target" ] || { echo "WARNING: $pe_target doesn't exist." >&2 ; continue; }
 
-  pe_deps=$(peldd $pe_target --clear-path --path $bin_dir ${whitelist[@]/#/--wlist } --all)
+  pe_deps=$(peldd $pe_target --clear-path ${search_paths[@]/#/--path } ${whitelist[@]/#/--wlist } --all)
   for pe_dep in $pe_deps; do
     dir=$(dirname $pe_dep)
     base=$(basename $pe_dep .${pe_dep##*.})
@@ -161,11 +168,7 @@ echo "Generating import files"
 
 echo "Cleaning unnecessary files / directories"
 
-if [ "$LLVM" = "true" ]; then
-  # Ensure that the header files of libc++/libunwind are not distributed
-  rm -rf $repackage_dir/include/c++
-  rm -rf $repackage_dir/include/{*unwind*,mach-o}
-else
+if [ "$LLVM" = "false" ]; then
   # Remove native build files of Rust
   rm -rf $repackage_dir/lib/{*.so*,ldscripts,rustlib}
 fi
@@ -179,11 +182,14 @@ else
   rm -rf $repackage_dir/share/glib-2.0
 fi
 
+# pkg-config files for OpenGL/GLU are not needed
+rm -f $repackage_dir/lib/pkgconfig/{gl,glu}.pc
+
 rm -rf $repackage_dir/share/{aclocal,bash-completion,cmake,config.site,doc,gdb,gtk-2.0,gtk-doc,installed-tests,man,meson,thumbnailers,xml,zsh}
 rm -rf $repackage_dir/etc/bash_completion.d
 
 # Remove dynamic modules
-rm -rf $repackage_dir/lib/{gdk-pixbuf-2.0,vips-modules-*}
+rm -rf $repackage_dir/lib/{gdk-pixbuf-2.0,gio,vips-modules-*}
 
 find $repackage_dir/lib -name "*.a" -and ! -name "*.dll.a" -exec rm -f {} \;
 find $repackage_dir/lib \( -name "*.la" -o -name "*.pdb" \) -exec rm -f {} \;

build/patches/meson-1-fixes.patch

@@ -8,7 +8,7 @@ diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/
 index 1111111..2222222 100644
 --- a/mesonbuild/compilers/mixins/clike.py
 +++ b/mesonbuild/compilers/mixins/clike.py
-@@ -1253,7 +1253,7 @@ class CLikeCompiler:
+@@ -1268,7 +1268,7 @@ class CLikeCompiler(Compiler):
      def thread_flags(self, env: 'Environment') -> T.List[str]:
          # TODO: does this belong here or in GnuLike or maybe PosixLike?
          host_m = env.machines[self.for_machine]
@@ -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
-@@ -644,7 +644,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -665,7 +665,8 @@ class GnuLikeDynamicLinkerMixin(DynamicLinkerBase):
          return self._apply_prefix('--out-implib=' + implibname)
 
      def thread_flags(self, env: 'Environment') -> T.List[str]: