Add zstd to 'all' group dependencies (#80)

For Zstd-compressed TIFF support.

Author: kleisauke

README.md

@@ -40,7 +40,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [libvips]       | 8.18.0[^2] | LGPLv3                                                       |
 | [libwebp]       | 1.6.0      | New BSD License                                              |
 | [libxml2]       | 2.14.6     | MIT Licence                                                  |
-| [mozjpeg]       | 4.1.5      | [zlib License, IJG License, BSD-3-Clause]                    |
+| [mozjpeg]       | 4.1.5      | [zlib License, IJG License, BSD 3-Clause]                    |
 | [pango]         | 1.57.0     | LGPLv3                                                       |
 | [pixman]        | 0.46.4     | MIT Licence                                                  |
 | [proxy-libintl] | 0.5        | LGPLv3                                                       |
@@ -79,7 +79,7 @@ https://github.com/libvips/libvips/releases/tag/v8.18.0-test1
 [libwebp]: https://github.com/webmproject/libwebp
 [libxml2]: https://gitlab.gnome.org/GNOME/libxml2
 [mozjpeg]: https://github.com/mozilla/mozjpeg
-[zlib License, IJG License, BSD-3-Clause]: https://github.com/mozilla/mozjpeg/blob/master/LICENSE.md
+[zlib License, IJG License, BSD 3-Clause]: https://github.com/mozilla/mozjpeg/blob/master/LICENSE.md
 [pango]: https://gitlab.gnome.org/GNOME/pango
 [pixman]: https://gitlab.freedesktop.org/pixman/pixman
 [proxy-libintl]: https://github.com/frida/proxy-libintl
@@ -108,6 +108,7 @@ Same as libvips-web + these extra dependencies:
 | [openslide]     | 4.0.0      | LGPLv3                                                       |
 | [poppler]       | 25.09.1    | GPLv2                                                        |
 | [sqlite]        | 3.50.4     | Public domain                                                |
+| [zstd]          | 1.5.7      | BSD 3-Clause                                                 |
 
 [brotli]: https://github.com/google/brotli
 [cfitsio]: https://github.com/HEASARC/cfitsio
@@ -126,6 +127,7 @@ Same as libvips-web + these extra dependencies:
 [openslide]: https://github.com/openslide/openslide
 [poppler]: https://gitlab.freedesktop.org/poppler/poppler
 [sqlite]: https://sqlite.org/
+[zstd]: https://github.com/facebook/zstd
 
 ## libjpeg-turbo
 

TODO.md

@@ -1,5 +1,4 @@
 ## TODO
 - [ ] Add CI that builds libvips with pre-compiled dependencies.
 - [ ] Incorporate all new dependencies and patches into [MXE](https://github.com/mxe/mxe).
-  - [ ] Should we also add vips-web?
 - [ ] Incorporate the llvm-mingw toolchain plugin into MXE (see [mxe/mxe#2330](https://github.com/mxe/mxe/issues/2330)).

build.sh

@@ -144,15 +144,7 @@ fi
 # GitHub's tarball API requires the short SHA commit as the directory name
 git_commit="${git_commit:0:7}"
 
-# Ensure separate build targets
-if [ "$build_all_variant" = true ]; then
-  mxe_targets=("${mxe_targets[@]/%/.all}")
-fi
-
-if [ "$with_ffi_compat" = true ]; then
-  mxe_targets=("${mxe_targets[@]/%/.ffi}")
-fi
-
+# Ensure separate debug build targets
 if [ "$with_debug" = true ]; then
   mxe_targets=("${mxe_targets[@]/%/.debug}")
 fi
@@ -187,18 +179,28 @@ if [ "$jpeg_impl" != "libjpeg-turbo" ]; then
   plugin_dirs+=" /data/plugins/$jpeg_impl"
 fi
 
-if [ "$build_gtk" = true ]; then
-  plugin_dirs+=" /data/plugins/gtk4"
-fi
-
 if [ "$with_hevc" = true ]; then
-  plugin_dirs+=" /data/plugins/hevc"
+  plugin_dirs+=" /data/plugins/hevc-deps"
 fi
 
 if [ "$with_zlib_ng" = true ]; then
   plugin_dirs+=" /data/plugins/zlib-ng"
 fi
 
+if [ "$with_ffi_compat" = true ]; then
+  plugin_dirs+=" /data/plugins/ffi-compat"
+fi
+
+if [ "$build_web_variant" = true ]; then
+  plugin_dirs+=" /data/plugins/web-deps"
+elif [ "$build_all_variant" = true ]; then
+  plugin_dirs+=" /data/plugins/all-deps"
+fi
+
+if [ "$build_gtk" = true ]; then
+  plugin_dirs+=" /data/plugins/gtk4"
+fi
+
 # Avoid shipping the gettext DLL (libintl-8.dll),
 # use a statically build dummy implementation instead.
 # This intentionally disables the i18n features of (GNU)

build/overrides.mk

@@ -581,7 +581,7 @@ define librsvg_BUILD
         -Dtests=false \
         -Dtriplet='$(PROCESSOR)-pc-windows-gnullvm' \
         -Dc_link_args='$(LDFLAGS) -lntdll -luserenv' \
-        $(librsvg_CONFIGURE_OPTS) \
+        $(PKG_MESON_OPTS) \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'
 
@@ -657,6 +657,7 @@ define tiff_BUILD
         --disable-cxx \
         --disable-lzma \
         --disable-zstd \
+        $(PKG_CONFIGURE_OPTS) \
         $(if $(and $(IS_JPEGLI),$(BUILD_STATIC)), LIBS="`'$(TARGET)-pkg-config' --libs libjpeg`")
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT)
     $(MAKE) -C '$(BUILD_DIR)' -j 1 $(INSTALL_STRIP_LIB) $(MXE_DISABLE_CRUFT)
@@ -700,7 +701,7 @@ define cairo_BUILD
         -Dspectre=disabled \
         -Dsymbol-lookup=disabled \
         -Dgtk_doc=false \
-        $(cairo_CONFIGURE_OPTS) \
+        $(PKG_MESON_OPTS) \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'
 
@@ -722,16 +723,10 @@ endef
 
 # build with the Meson build system
 # build a minimal libxml2, see: https://github.com/lovell/sharp-libvips/pull/92
-# OpenSlide needs -Dxpath=enabled
-# ImageMagick's internal MSVG parser needs -Dpush=enabled -Dsax1=enabled
 define libxml2_BUILD
     $(MXE_MESON_WRAPPER) \
         -Dminimum=true \
-        $(if $(findstring .all,$(TARGET)), \
-            -Dxpath=enabled \
-            -Dpush=enabled \
-            -Dsax1=enabled) \
-        $(libxml2_MESON_OPTS) \
+        $(PKG_MESON_OPTS) \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'
 
@@ -766,22 +761,16 @@ endef
 # build with the Meson build system
 # compile with the internal PCRE library
 define glib_BUILD
-    $(if $(findstring .ffi,$(TARGET)), \
-        (cd '$(SOURCE_DIR)' && $(PATCH) -p1 -u) < $(realpath $(dir $(lastword $(glib_PATCHES))))/glib-static.patch)
-
-    # Build as shared library when `--with-ffi-compat` is passed, since we
-    # need `libgobject-2.0-0.dll` and `libglib-2.0-0.dll` for these bindings.
     # Enable networking to allow gvdb to be downloaded from WrapDB
     MXE_ENABLE_NETWORK=1 $(MXE_MESON_WRAPPER) \
-        $(if $(findstring .ffi,$(TARGET)), --default-library=shared) \
         --force-fallback-for=gvdb \
         -Dsysprof=disabled \
         -Dtests=false \
         -Dnls=disabled \
         -Dglib_debug=disabled \
         -Dglib_assert=false \
         -Dglib_checks=false \
-        $(glib_CONFIGURE_OPTS) \
+        $(PKG_MESON_OPTS) \
         '$(SOURCE_DIR)' \
         '$(BUILD_DIR)'
 

build/plugins/all-deps/overrides.mk

@@ -0,0 +1,22 @@
+$(PLUGIN_HEADER)
+
+# OpenSlide needs -Dxpath=enabled
+# ImageMagick's internal MSVG parser needs -Dpush=enabled -Dsax1=enabled
+libxml2_MESON_OPTS = -Dxpath=enabled -Dpush=enabled -Dsax1=enabled
+
+# Patch to ensure the DLL directory is used as libdir
+vips_PATCHES := $(vips_PATCHES) \
+                $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
+
+vips_MESON_OPTS = \
+    -Dmodules=enabled \
+    -Dheif-module=$(if $(IS_HEVC),enabled,disabled) \
+    $(if $(findstring graphicsmagick,$(vips_all_DEPS)), -Dmagick-package=GraphicsMagick) \
+    -Dpdfium=disabled \
+    -Dquantizr=disabled
+
+# https://github.com/libvips/build-win64-mxe/issues/80
+tiff_CONFIGURE_OPTS = --enable-zstd
+
+# Override sub-dependencies
+tiff_DEPS := $(tiff_DEPS) zstd

build/patches/vips-8-dlldir-as-libdir.patch renamed to build/plugins/all-deps/patches/vips-8-dlldir-as-libdir.patch

@@ -25,33 +25,32 @@ index 1111111..2222222 100644
  const char *
  vips_guess_libdir(const char *argv0, const char *env_name)
  {
-+#if defined(G_OS_WIN32) && defined(VIPS_DLLDIR_AS_LIBDIR)
++#ifdef G_OS_WIN32
 +	/* Sometimes users want to use the DLL directory where the libvips DLL
 +	 * resides as libdir.
 +	 */
 +	return vips__dll_dir();
-+#else  /*!G_OS_WIN32 || !VIPS_DLLDIR_AS_LIBDIR*/
++#else  /*!G_OS_WIN32*/
  	const char *prefix = vips_guess_prefix(argv0, env_name);
  	static char *libdir = NULL;
 
 @@ -1225,6 +1231,7 @@ vips_guess_libdir(const char *argv0, const char *env_name)
  		libdir = g_strdup_printf("%s/lib", prefix);
 
  	return libdir;
-+#endif /*G_OS_WIN32 && VIPS_DLLDIR_AS_LIBDIR*/
++#endif /*G_OS_WIN32*/
  }
 
  /**
 diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c
 index 1111111..2222222 100644
 --- a/libvips/iofuncs/util.c
 +++ b/libvips/iofuncs/util.c
-@@ -1992,6 +1992,53 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+@@ -1992,6 +1992,51 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
  	return TRUE;
  }
  #endif
 +
-+#ifdef VIPS_DLLDIR_AS_LIBDIR
 +static void *
 +vips__dll_dir_once(void *null)
 +{
@@ -96,7 +95,6 @@ index 1111111..2222222 100644
 +
 +	return (const char *) g_once(&once, vips__dll_dir_once, NULL);
 +}
-+#endif /*VIPS_DLLDIR_AS_LIBDIR*/
  #endif /*G_OS_WIN32*/
 
  static void *

build/vips-all.mk renamed to build/plugins/all-deps/vips-all.mk

@@ -1,18 +1,15 @@
 PKG             := vips-all
-$(PKG)_WEBSITE  := https://libvips.github.io/libvips/
-$(PKG)_DESCR    := A fast image processing library with low memory needs.
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.18.0-test1
-$(PKG)_CHECKSUM := 242eaa2c195fd5a3021e5daaa4448cdbfa5b9702ec4377cbb9b2b18c4f542163
-$(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,,,,-test1.tar.xz
-$(PKG)_SUBDIR   := vips-$(firstword $(subst -, ,$($(PKG)_VERSION)))
-$(PKG)_FILE     := vips-$($(PKG)_VERSION).tar.xz
-$(PKG)_DEPS     := cc meson-wrapper libwebp librsvg glib pango libarchive \
-                   libjpeg-turbo tiff lcms libexif libheif libspng \
-                   libimagequant highway imagemagick matio openexr \
-                   cfitsio nifticlib poppler fftw openslide libjxl cgif \
-                   libraw
+$(PKG)_WEBSITE   = $(vips_WEBSITE)
+$(PKG)_DESCR     = $(vips_DESCR)
+$(PKG)_IGNORE    = $(vips_IGNORE)
+$(PKG)_VERSION   = $(vips_VERSION)
+$(PKG)_CHECKSUM  = $(vips_CHECKSUM)
+$(PKG)_PATCHES   = $(vips_PATCHES)
+$(PKG)_SUBDIR    = $(vips_SUBDIR)
+$(PKG)_FILE      = $(vips_FILE)
+$(PKG)_URL       = $(vips_URL)
+$(PKG)_DEPS     := $(vips_DEPS) imagemagick matio openexr cfitsio \
+                   nifticlib poppler fftw openslide libjxl libraw
 
 define $(PKG)_PRE_CONFIGURE
     # Copy some files to the packaging directory
@@ -66,35 +63,20 @@ define $(PKG)_PRE_CONFIGURE
      printf '  "spng": "$(libspng_VERSION)",\n'; \
      printf '  "sqlite": "$(sqlite_VERSION)",\n'; \
      printf '  "tiff": "$(tiff_VERSION)",\n'; \
-     printf '  "vips": "$(vips-all_VERSION)",\n'; \
+     printf '  "vips": "$(vips_VERSION)",\n'; \
      printf '  "webp": "$(libwebp_VERSION)",\n'; \
      $(if $(IS_HEVC),printf '  "x265": "$(x265_VERSION)"$(comma)\n';) \
      printf '  "xml2": "$(libxml2_VERSION)",\n'; \
      $(if $(IS_ZLIB_NG), \
-          printf '  "zlib-ng": "$(zlib-ng_VERSION)"\n';, \
-          printf '  "zlib": "$(zlib_VERSION)"\n';) \
+          printf '  "zlib-ng": "$(zlib-ng_VERSION)"$(comma)\n';, \
+          printf '  "zlib": "$(zlib_VERSION)"$(comma)\n';) \
+     printf '  "zstd": "$(zstd_VERSION)"\n'; \
      printf '}';) \
      > '$(PREFIX)/$(TARGET)/vips-packaging/versions.json'
 endef
 
 define $(PKG)_BUILD
     $($(PKG)_PRE_CONFIGURE)
 
-    $(eval export CFLAGS += -O3)
-    $(eval export CXXFLAGS += -O3)
-
-    $(MXE_MESON_WRAPPER) \
-        -Ddeprecated=false \
-        -Dexamples=false \
-        -Dintrospection=disabled \
-        -Dmodules=enabled \
-        -Dheif-module=$(if $(IS_HEVC),enabled,disabled) \
-        $(if $(findstring graphicsmagick,$($(PKG)_DEPS)), -Dmagick-package=GraphicsMagick) \
-        -Dpdfium=disabled \
-        -Dquantizr=disabled \
-        -Dc_args='$(CFLAGS) -DVIPS_DLLDIR_AS_LIBDIR' \
-        '$(SOURCE_DIR)' \
-        '$(BUILD_DIR)'
-
-    $(MXE_NINJA) -C '$(BUILD_DIR)' -j '$(JOBS)' install
+    $(vips_BUILD)
 endef

build/plugins/ffi-compat/overrides.mk

@@ -0,0 +1,9 @@
+$(PLUGIN_HEADER)
+
+# Patch to build gio and gmodule statically
+glib_PATCHES := $(glib_PATCHES) \
+                $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
+
+# Build as shared library when `--with-ffi-compat` is passed, since we
+# need `libgobject-2.0-0.dll` and `libglib-2.0-0.dll` for these bindings.
+glib_MESON_OPTS = --default-library=shared

build/patches/glib-static.patch renamed to build/plugins/ffi-compat/patches/glib-2-static.patch

@@ -2,23 +2,23 @@ $(PLUGIN_HEADER)
 
 # GTK requires GRegex
 glib_PATCHES := $(filter-out $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/../../patches/glib-2-without-gregex.patch))),$(glib_PATCHES))
-glib_CONFIGURE_OPTS = --force-fallback-for=libpcre2-8
+glib_MESON_OPTS = --force-fallback-for=libpcre2-8
 
 # GTK requires cairo-win32, cairo-ps and cairo-pdf
 # https://gitlab.gnome.org/GNOME/gtk/-/issues/5072
 # Also enable the DWrite font backend in Cairo
 # https://gitlab.gnome.org/GNOME/gtk/-/issues/7144
 cairo_PATCHES := $(filter-out $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/../../patches/cairo-1-nanoserver-compat.patch))),$(cairo_PATCHES))
-cairo_CONFIGURE_OPTS = -Dzlib=enabled -Ddwrite=enabled
+cairo_MESON_OPTS = -Dzlib=enabled -Ddwrite=enabled
 
 # GTK requires a relocatable GDK-PixBuf plugin with SVG support.
 # TODO(kleisauke): Probably no longer needed in GTK >= 4.19.2.
 gdk-pixbuf_PATCHES := $(filter-out $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/../../patches/gdk-pixbuf-2-without-relocation.patch))),$(gdk-pixbuf_PATCHES))
 librsvg_DEPS := $(librsvg_DEPS) gdk-pixbuf
-librsvg_CONFIGURE_OPTS = -Dpixbuf=enabled -Dpixbuf-loader=enabled
+librsvg_MESON_OPTS = -Dpixbuf=enabled -Dpixbuf-loader=enabled
 
 # nip4 needs -Doutput=enabled
-libxml2_MESON_OPTS = -Doutput=enabled
+libxml2_MESON_OPTS := $(libxml2_MESON_OPTS) -Doutput=enabled
 
 # Override sub-dependencies
 adwaita-icon-theme_DEPS := $(subst gtk3,gtk4,$(adwaita-icon-theme_DEPS))