Skip to content

Commit 31423d1

Browse files
kleisaukekleisauke
committed
Dependency version bumps
- Update GDK-PixBuf to 2.42.9. - Update GLib to 2.73.3. - Update librsvg to 2.55.0. - Update libwebp to 1.2.4. - Update libxml2 to 2.10.0. - Update MozJPEG to 4.1.1. - Update Pango to 1.50.9. - Update highway to 1.0.0. - Update ImageMagick to 6.9.12-59. - Update libjxl to 0.7rc. MXE Updates: - Update HarfBuzz to 5.1.0. - Update Poppler to 22.08.0. - Update libjpeg-turbo to 2.1.4.
1 parent e9e8046 commit 31423d1

20 files changed

+144
-1318
lines changed

‎README.md

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2424
| [fontconfig] | 2.14.0 | [fontconfig Licence] (BSD-like) |
2525
| [freetype] | 2.12.1 | [freetype Licence] (BSD-like) |
2626
| [fribidi] | 1.0.12 | LGPLv3 |
27-
| [gdk-pixbuf] | 2.42.8 | LGPLv3 |
28-
| [glib] | 2.73.2 | LGPLv3 |
29-
| [harfbuzz] | 4.4.1 | MIT Licence |
27+
| [gdk-pixbuf] | 2.42.9 | LGPLv3 |
28+
| [glib] | 2.73.3 | LGPLv3 |
29+
| [harfbuzz] | 5.1.0 | MIT Licence |
3030
| [lcms] | 2.13.1 | MIT Licence |
3131
| [libexif] | 0.6.24 | LGPLv3 |
3232
| [libffi] | 3.4.2 | MIT Licence |
3333
| [libgsf] | 1.14.50 | LGPLv3 |
3434
| [libheif] | 1.12.0 | LGPLv3 |
3535
| [libimagequant] | 2.4.1¹ | BSD 2-Clause |
3636
| [libpng] | 1.6.37 | [libpng License version 2] |
37-
| [librsvg] | 2.54.4 | LGPLv3 |
37+
| [librsvg] | 2.55.0 | LGPLv3 |
3838
| [libspng] | 0.7.2 | BSD 2-Clause |
3939
| [libtiff] | 4.4.0 | [libtiff License] (BSD-like) |
4040
| [libvips] | 8.13.0 | LGPLv3 |
41-
| [libwebp] | 1.2.3 | New BSD License |
42-
| [libxml2] | 2.9.14 | MIT Licence |
43-
| [mozjpeg] | 4.0.3 | [zlib License, IJG License, BSD-3-Clause] |
41+
| [libwebp] | 1.2.4 | New BSD License |
42+
| [libxml2] | 2.10.0 | MIT Licence |
43+
| [mozjpeg] | 4.1.1 | [zlib License, IJG License, BSD-3-Clause] |
4444
| [orc] | 0.4.32 | [orc License] (BSD-like) |
45-
| [pango] | 1.50.8 | LGPLv3 |
45+
| [pango] | 1.50.9 | LGPLv3 |
4646
| [pixman] | 0.40.0 | MIT Licence |
4747
| [proxy-libintl] | 0.4 | LGPLv3 |
4848
| [zlib-ng] | 2.0.6 | [zlib-ng Licence] |
@@ -96,18 +96,21 @@ Same as libvips-web + these extra dependencies:
9696
| [brotli] | 1.0.9 | MIT Licence |
9797
| [cfitsio] | 4.1.0 | BSD-like |
9898
| [fftw] | 3.3.10 | GPLv2 |
99-
| [highway] | 0.17.0 | Apache-2.0 License |
100-
| [imagemagick] | 6.9.12-58 | [ImageMagick License] (Apache-2.0-like) |
99+
| [highway] | 1.0.0 | Apache-2.0 License |
100+
| [imagemagick] | 6.9.12-59 | [ImageMagick License] (Apache-2.0-like) |
101101
| [imath] | 3.1.5 | BSD 3-Clause |
102-
| [libjxl] | 0.6.1 | BSD 3-Clause |
102+
| [libjxl] | 0.7² | BSD 3-Clause |
103103
| [matio] | 1.5.23 | BSD 2-Clause |
104104
| [nifticlib] | 3.0.1 | Public domain |
105105
| [openexr] | 3.1.5 | BSD 3-Clause |
106106
| [openjpeg] | 2.5.0 | BSD 2-Clause |
107107
| [openslide] | 3.4.1 | LGPLv3 |
108-
| [poppler] | 22.07.0 | GPLv2 |
108+
| [poppler] | 22.08.0 | GPLv2 |
109109
| [sqlite] | 3.39.2 | Public domain |
110110

111+
² libjxl is built from the [`v0.7rc`](https://github.com/libjxl/libjxl/tree/v0.7rc) tag, see:
112+
https://github.com/libjxl/libjxl/releases/tag/v0.7rc
113+
111114
[brotli]: https://github.com/google/brotli
112115
[cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/
113116
[fftw]: https://github.com/FFTW/fftw3
@@ -138,7 +141,7 @@ In that case, the following version of libjpeg-turbo is built:
138141

139142
| Dependency | Version | Used under the terms of |
140143
|-----------------|-----------|--------------------------------------------------------------|
141-
| [libjpeg-turbo] | 2.1.3 | [zlib License, IJG License] |
144+
| [libjpeg-turbo] | 2.1.4 | [zlib License, IJG License] |
142145

143146
[libjpeg-turbo]: https://github.com/libjpeg-turbo/libjpeg-turbo
144147
[zlib License, IJG License]: https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/LICENSE.md

‎build/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
# Always checkout a particular revision which will successfully build.
5252
# This ensures that it will not suddenly break a build.
5353
# Note: Must be regularly updated.
54-
revision="523678e36c2678f3d170c91c095a84b3bcc2bbfe"
54+
revision="46cf2d3f6e55d3ea30f515041bf01352c4f1a7ce"
5555
initialize=false
5656

5757
if [ -f "$mxe_dir/Makefile" ]; then
@@ -130,7 +130,7 @@ make pe-util \
130130
MXE_USE_CCACHE=
131131

132132
if [ -n "$GIT_COMMIT" ]; then
133-
# Invalidate build cache, if exits
133+
# Invalidate build cache, if exists
134134
rm -f $mxe_dir/usr/$target.$deps/installed/vips-$deps
135135
fi
136136

‎build/highway.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ PKG := highway
22
$(PKG)_WEBSITE := https://github.com/google/highway
33
$(PKG)_DESCR := Performance-portable, length-agnostic SIMD with runtime dispatch
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 0.17.0
6-
$(PKG)_CHECKSUM := 25158fd5c090b70ecea47fc246c860d150f07f801d2434e1e51ec14a6c15822c
5+
$(PKG)_VERSION := 1.0.0
6+
$(PKG)_CHECKSUM := ab4f5f864932268356f9f6aa86f612fa4430a7db3c8de0391076750197e876b8
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_GH_CONF := google/highway/tags
99
$(PKG)_DEPS := cc
1010

1111
define $(PKG)_BUILD
1212
cd '$(BUILD_DIR)' && $(TARGET)-cmake \
1313
-DBUILD_TESTING=OFF \
14+
-DHWY_ENABLE_CONTRIB=OFF \
1415
-DHWY_ENABLE_EXAMPLES=OFF \
1516
'$(SOURCE_DIR)'
1617
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'

‎build/libjxl.mk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,27 @@ PKG := libjxl
22
$(PKG)_WEBSITE := https://github.com/libjxl/libjxl
33
$(PKG)_DESCR := JPEG XL image format reference implementation
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 0.6.1
6-
$(PKG)_CHECKSUM := ccbd5a729d730152303be399f033b905e608309d5802d77a61a95faa092592c5
5+
$(PKG)_VERSION := 0.7
6+
$(PKG)_CHECKSUM := 17148629624e328cd015439b37bf07fc49245afefa1abaa50ef9e7a56028dcef
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libjxl/libjxl/tags,v
8+
$(PKG)_GH_CONF := libjxl/libjxl/tags,v,rc
99
$(PKG)_DEPS := cc brotli highway lcms libjpeg-turbo libpng
1010

1111
define $(PKG)_BUILD
1212
cd '$(BUILD_DIR)' && $(TARGET)-cmake \
1313
-DJPEGXL_STATIC=$(CMAKE_STATIC_BOOL) \
1414
-DBUILD_TESTING=OFF \
1515
-DJPEGXL_ENABLE_TOOLS=OFF \
16+
-DJPEGXL_ENABLE_DOXYGEN=OFF \
17+
-DJPEGXL_ENABLE_MANPAGES=OFF \
1618
-DJPEGXL_ENABLE_BENCHMARK=OFF \
1719
-DJPEGXL_ENABLE_EXAMPLES=OFF \
1820
-DJPEGXL_ENABLE_SJPEG=OFF \
19-
-DJPEGXL_ENABLE_LODEPNG=OFF \
2021
-DJPEGXL_ENABLE_OPENEXR=OFF \
2122
-DJPEGXL_ENABLE_SKCMS=OFF \
2223
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON \
24+
-DJPEGXL_FORCE_SYSTEM_LCMS2=ON \
2325
-DJPEGXL_FORCE_SYSTEM_HWY=ON \
24-
-DJPEGXL_FORCE_SYSTEM_LCMS=ON \
2526
'$(SOURCE_DIR)'
2627
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
2728
$(MAKE) -C '$(BUILD_DIR)' -j 1 $(subst -,/,$(INSTALL_STRIP_LIB))

‎build/overrides.mk

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ libffi_URL := https://github.com/libffi/libffi/releases/download/v$(libffi_
1212
libffi_URL_2 := https://sourceware.org/pub/libffi/$(libffi_FILE)
1313

1414
# upstream version is 2.42.6
15-
gdk-pixbuf_VERSION := 2.42.8
16-
gdk-pixbuf_CHECKSUM := 84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6
15+
gdk-pixbuf_VERSION := 2.42.9
16+
gdk-pixbuf_CHECKSUM := 28f7958e7bf29a32d4e963556d241d0a41a6786582ff6a5ad11665e0347fc962
1717
gdk-pixbuf_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/gdk-pixbuf-[0-9]*.patch)))
1818
gdk-pixbuf_SUBDIR := gdk-pixbuf-$(gdk-pixbuf_VERSION)
1919
gdk-pixbuf_FILE := gdk-pixbuf-$(gdk-pixbuf_VERSION).tar.xz
2020
gdk-pixbuf_URL := https://download.gnome.org/sources/gdk-pixbuf/$(call SHORT_PKG_VERSION,gdk-pixbuf)/$(gdk-pixbuf_FILE)
2121

2222
# no longer needed by libvips, but some of the deps need it
2323
# upstream version is 2.9.12
24-
libxml2_VERSION := 2.9.14
25-
libxml2_CHECKSUM := 60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee
24+
libxml2_VERSION := 2.10.0
25+
libxml2_CHECKSUM := 2dd33110ea778676de14bea4999ee1173c4ca55d5ff1452bca224e06f0152595
2626
libxml2_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libxml2-[0-9]*.patch)))
2727
libxml2_SUBDIR := libxml2-$(libxml2_VERSION)
2828
libxml2_FILE := libxml2-$(libxml2_VERSION).tar.xz
@@ -39,8 +39,8 @@ matio_FILE := matio-$(matio_VERSION).tar.gz
3939
matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
4040

4141
# upstream version is 7, we want ImageMagick 6
42-
imagemagick_VERSION := 6.9.12-58
43-
imagemagick_CHECKSUM := 6f7774b5a1bd06a6d67da00252ad88da2197d0d88959c599fff6c4fc81628973
42+
imagemagick_VERSION := 6.9.12-59
43+
imagemagick_CHECKSUM := 116cb21653ec613fcf356e9fc1dcd855ddcef0d2b5482e6d721cb714aaafb380
4444
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
4545
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
4646

@@ -53,16 +53,16 @@ graphicsmagick_FILE := GraphicsMagick-$(graphicsmagick_VERSION).tar.lz
5353
graphicsmagick_URL := https://$(SOURCEFORGE_MIRROR)/project/graphicsmagick/graphicsmagick/$(graphicsmagick_VERSION)/$(graphicsmagick_FILE)
5454

5555
# upstream version is 2.40.21
56-
librsvg_VERSION := 2.54.4
57-
librsvg_CHECKSUM := ea152a243f6a43c0e036a28c70de3fcbcdea5664c6811c78592bc229ecc24833
56+
librsvg_VERSION := 2.55.0
57+
librsvg_CHECKSUM := 6e626c564e354bcd8c384b90f8e4f30b303afa6c1e0cb5cc56ba14900c5db730
5858
librsvg_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/librsvg-[0-9]*.patch)))
5959
librsvg_SUBDIR := librsvg-$(librsvg_VERSION)
6060
librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz
6161
librsvg_URL := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE)
6262

6363
# upstream version is 1.50.0
64-
pango_VERSION := 1.50.8
65-
pango_CHECKSUM := cf626f59dd146c023174c4034920e9667f1d25ac2c1569516d63136c311255fa
64+
pango_VERSION := 1.50.9
65+
pango_CHECKSUM := 1b636aabf905130d806372136f5e137b6a27f26d47defd9240bf444f6a4fe610
6666
pango_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch)))
6767
pango_SUBDIR := pango-$(pango_VERSION)
6868
pango_FILE := pango-$(pango_VERSION).tar.xz
@@ -79,16 +79,16 @@ fribidi_FILE := fribidi-$(fribidi_VERSION).tar.xz
7979
fribidi_URL := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
8080

8181
# upstream version is 1.2.2
82-
libwebp_VERSION := 1.2.3
83-
libwebp_CHECKSUM := f5d7ab2390b06b8a934a4fc35784291b3885b557780d099bd32f09241f9d83f9
82+
libwebp_VERSION := 1.2.4
83+
libwebp_CHECKSUM := 7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df
8484
libwebp_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libwebp-[0-9]*.patch)))
8585
libwebp_SUBDIR := libwebp-$(libwebp_VERSION)
8686
libwebp_FILE := libwebp-$(libwebp_VERSION).tar.gz
8787
libwebp_URL := http://downloads.webmproject.org/releases/webp/$(libwebp_FILE)
8888

8989
# upstream version is 2.70.2
90-
glib_VERSION := 2.73.2
91-
glib_CHECKSUM := 5f3ee36e34f4aaab393c3e3dc46fb01b32f7ead6c88d41d7f20d88a49cdef1d9
90+
glib_VERSION := 2.73.3
91+
glib_CHECKSUM := df1a2b841667d6b48b2ef6969ebda4328243829f6e45866726f806f90f64eead
9292
glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
9393
glib_SUBDIR := glib-$(glib_VERSION)
9494
glib_FILE := glib-$(glib_VERSION).tar.xz
@@ -420,6 +420,7 @@ define gdk-pixbuf_BUILD
420420
$(MXE_MESON_WRAPPER) \
421421
-Dbuiltin_loaders='jpeg,png,tiff' \
422422
-Dintrospection=disabled \
423+
-Dman=false \
423424
'$(SOURCE_DIR)' \
424425
'$(BUILD_DIR)'
425426

@@ -563,9 +564,17 @@ define librsvg_BUILD
563564
(cd '$(SOURCE_DIR)' && $(PATCH) -p1 -u) < $(realpath $(dir $(lastword $(librsvg_PATCHES))))/librsvg-llvm-mingw.patch \
564565
# Update expected Cargo SHA256 hashes for the vendored files we have patched
565566
$(SED) -i 's/f078966ea9ec6f5b003664ad36a7598dadb11179188643ae1adceabbaf7893ab/2b61f22c9caba100e52e84357f857ad12c7b9386c0c18e933e2789e1bd79c14d/' '$(SOURCE_DIR)/vendor/cfg-expr/.cargo-checksum.json'; \
566-
$(SED) -i 's/991919d9ab1eca85e87a85acafcb86d4880f1afe9fe35d6bd87039dcb1fa9aa7/38fb6d61251112ff4ff22ebcdad41f4193cd2e0b2788065e5634e9a9027260e2/' '$(SOURCE_DIR)/vendor/compiler_builtins/.cargo-checksum.json'; \
567-
$(SED) -i 's/55138604371e00ef14167894159156b68f939039b0e5b2b1f3db61456e3d3870/ff7df885cb6b31736b49f8d0a4755e8a2d947145316c3e5b212c78ab08142108/' '$(SOURCE_DIR)/vendor/compiler_builtins/.cargo-checksum.json'; \
568-
$(SED) -i 's/966128476fdf0d3148da21508a27a159ad2d272391e4a3ffbf18008300cca80c/ead5a3b748c9a5fcb145fa2e5cfc8df32f383369b8842fba4272ca3b568109ea/' '$(SOURCE_DIR)/vendor/windows-sys/.cargo-checksum.json';)
567+
$(SED) -i 's/0c006642fbbe9fa5372a88cbbbb0bb4b391f635b2bde0c497de10740c1458c5e/54ad858051e051e95df10b867411991ca5f6f36ce66b5fa010655ea0a710d14f/' '$(SOURCE_DIR)/vendor/compiler_builtins/.cargo-checksum.json'; \
568+
$(SED) -i 's/cb9a830e0d440ed825aa897f268e4ae067204da4ffc162ba963977a4b309007f/2ad9662639d60baf1441bec3eb5db7bd726dbe9ad6b4fe20c25448ccd666131a/' '$(SOURCE_DIR)/vendor/compiler_builtins/.cargo-checksum.json'; \
569+
$(SED) -i 's/966128476fdf0d3148da21508a27a159ad2d272391e4a3ffbf18008300cca80c/ead5a3b748c9a5fcb145fa2e5cfc8df32f383369b8842fba4272ca3b568109ea/' '$(SOURCE_DIR)/vendor/windows-sys/.cargo-checksum.json'; \
570+
# Install Cargo config
571+
$(INSTALL) -d '$(SOURCE_DIR)/.cargo'
572+
(echo '[source.crates-io]'; \
573+
echo 'registry = "https://github.com/rust-lang/crates.io-index"'; \
574+
echo 'replace-with = "vendored-sources"'; \
575+
echo '[source.vendored-sources]'; \
576+
echo 'directory = "./vendor"';) \
577+
> '$(SOURCE_DIR)/.cargo/config')
569578

570579
# Allow libtool to statically link against libintl
571580
# by specifying lt_cv_deplibs_check_method="pass_all"
@@ -578,7 +587,7 @@ define librsvg_BUILD
578587
RUSTC='$(TARGET)-rustc' \
579588
$(if $(IS_INTL_DUMMY), lt_cv_deplibs_check_method="pass_all")
580589

581-
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' bin_SCRIPTS=
590+
$(if $(IS_GCC), MXE_ENABLE_NETWORK=1) $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' bin_SCRIPTS=
582591
$(MAKE) -C '$(BUILD_DIR)' -j 1 $(INSTALL_STRIP_LIB) bin_SCRIPTS=
583592
endef
584593

0 commit comments

Comments
 (0)