Move libjxl and brotli to 'web' group dependencies

For JPEG XL support.

Author: kleisauke

README.md

@@ -18,6 +18,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | Dependency      | Version    | Used under the terms of                                      |
 |-----------------|------------|--------------------------------------------------------------|
 | [aom]           | 3.13.1     | BSD 2-Clause + [Alliance for Open Media Patent License 1.0]  |
+| [brotli]        | 1.2.0      | MIT Licence                                                  |
 | [cairo]         | 1.18.4     | Mozilla Public License 2.0                                   |
 | [cgif]          | 0.5.0      | MIT Licence                                                  |
 | [expat]         | 2.7.3      | MIT Licence                                                  |
@@ -33,6 +34,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [libffi]        | 3.5.2      | MIT Licence                                                  |
 | [libheif]       | 1.20.2     | LGPLv3                                                       |
 | [libimagequant] | 2.4.1[^1]  | BSD 2-Clause                                                 |
+| [libjxl]        | 0.11.1     | BSD 3-Clause                                                 |
 | [libpng]        | 1.6.52     | [libpng License version 2]                                   |
 | [librsvg]       | 2.61.3     | LGPLv3                                                       |
 | [libtiff]       | 4.7.1      | [libtiff License] (BSD-like)                                 |
@@ -53,6 +55,7 @@ https://github.com/libvips/libvips/releases/tag/v8.18.0-alpha1
 
 [aom]: https://aomedia.googlesource.com/aom/
 [Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/
+[brotli]: https://github.com/google/brotli
 [cairo]: https://gitlab.freedesktop.org/cairo/cairo
 [cgif]: https://github.com/dloebl/cgif
 [expat]: https://github.com/libexpat/libexpat
@@ -70,6 +73,7 @@ https://github.com/libvips/libvips/releases/tag/v8.18.0-alpha1
 [libffi]: https://github.com/libffi/libffi
 [libheif]: https://github.com/strukturag/libheif
 [libimagequant]: https://github.com/lovell/libimagequant
+[libjxl]: https://github.com/libjxl/libjxl
 [libpng]: https://github.com/pnggroup/libpng
 [libpng License version 2]: https://github.com/pnggroup/libpng/blob/master/LICENSE
 [librsvg]: https://gitlab.gnome.org/GNOME/librsvg
@@ -92,14 +96,12 @@ Same as libvips-web + these extra dependencies:
 
 | Dependency      | Version    | Used under the terms of                                      |
 |-----------------|------------|--------------------------------------------------------------|
-| [brotli]        | 1.2.0      | MIT Licence                                                  |
 | [cfitsio]       | 4.6.2      | BSD-like                                                     |
 | [fftw]          | 3.3.10     | GPLv2                                                        |
 | [gdk-pixbuf]    | 2.44.4     | LGPLv3                                                       |
 | [imagemagick]   | 6.9.13-33  | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.9      | BSD 3-Clause                                                 |
 | [libdicom]      | 1.2.0      | MIT Licence                                                  |
-| [libjxl]        | 0.11.1     | BSD 3-Clause                                                 |
 | [libraw]        | 0.21.4     | LGPL-2.1-only                                                |
 | [matio]         | 1.5.29     | BSD 2-Clause                                                 |
 | [nifticlib]     | 3.0.1      | Public domain                                                |
@@ -110,15 +112,13 @@ Same as libvips-web + these extra dependencies:
 | [sqlite]        | 3.51.1     | Public domain                                                |
 | [zstd]          | 1.5.7      | BSD 3-Clause                                                 |
 
-[brotli]: https://github.com/google/brotli
 [cfitsio]: https://github.com/HEASARC/cfitsio
 [fftw]: https://github.com/FFTW/fftw3
 [gdk-pixbuf]: https://gitlab.gnome.org/GNOME/gdk-pixbuf
 [imagemagick]: https://github.com/ImageMagick/ImageMagick6
 [ImageMagick License]: https://github.com/ImageMagick/ImageMagick6/blob/main/LICENSE
 [imath]: https://github.com/AcademySoftwareFoundation/Imath
 [libdicom]: https://github.com/ImagingDataCommons/libdicom
-[libjxl]: https://github.com/libjxl/libjxl
 [libraw]: https://github.com/LibRaw/LibRaw
 [matio]: https://github.com/tbeu/matio
 [nifticlib]: https://github.com/NIFTI-Imaging/nifti_clib

build/plugins/all-deps/overrides.mk

@@ -11,6 +11,7 @@ vips_PATCHES := $(vips_PATCHES) \
 vips_MESON_OPTS = \
     -Dmodules=enabled \
     -Dheif-module=$(if $(IS_HEVC),enabled,disabled) \
+    -Djpeg-xl-module=disabled \
     $(if $(findstring graphicsmagick,$(vips_all_DEPS)), -Dmagick-package=GraphicsMagick) \
     -Dpdfium=disabled \
     -Dquantizr=disabled \

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

@@ -9,7 +9,7 @@ $(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
+                   nifticlib poppler fftw openslide libraw
 
 define $(PKG)_PRE_CONFIGURE
     # Copy some files to the packaging directory

build/plugins/web-deps/overrides.mk

@@ -4,7 +4,6 @@ vips_MESON_OPTS = \
     -Dmodules=disabled \
     -Dcfitsio=disabled \
     -Dfftw=disabled \
-    -Djpeg-xl=disabled \
     -Dmagick=disabled \
     -Dmatio=disabled \
     -Dnifti=disabled \

build/plugins/web-deps/vips-web.mk

@@ -19,6 +19,7 @@ define $(PKG)_PRE_CONFIGURE
     (printf '{\n'; \
      printf '  "aom": "$(aom_VERSION)",\n'; \
      printf '  "archive": "$(libarchive_VERSION)",\n'; \
+     printf '  "brotli": "$(brotli_VERSION)",\n'; \
      printf '  "cairo": "$(cairo_VERSION)",\n'; \
      printf '  "cgif": "$(cgif_VERSION)",\n'; \
      printf '  "exif": "$(libexif_VERSION)",\n'; \
@@ -36,6 +37,7 @@ define $(PKG)_PRE_CONFIGURE
      $(if $(IS_JPEGLI), \
           printf '  "jpegli": "$(jpegli_VERSION)"$(comma)\n';, \
           $(if $(IS_MOZJPEG),,printf '  "jpeg": "$(libjpeg-turbo_VERSION)"$(comma)\n';)) \
+     printf '  "jxl": "$(libjxl_VERSION)",\n'; \
      printf '  "lcms": "$(lcms_VERSION)",\n'; \
      $(if $(IS_MOZJPEG),printf '  "mozjpeg": "$(mozjpeg_VERSION)"$(comma)\n';) \
      printf '  "pango": "$(pango_VERSION)",\n'; \

build/vips.mk

@@ -9,7 +9,7 @@ $(PKG)_GH_CONF  := libvips/libvips/releases,v,,,,.tar.xz
 $(PKG)_SUBDIR   := $(PKG)-$(firstword $(subst -, ,$($(PKG)_VERSION)))
 $(PKG)_DEPS     := cc meson-wrapper libwebp librsvg glib pango libarchive \
                    libjpeg-turbo tiff lcms libexif libheif \
-                   libimagequant highway cgif
+                   libimagequant highway cgif libjxl
 
 define $(PKG)_BUILD
     $(eval export CFLAGS += -O3)