Skip to content

Commit 5e87055

Browse files
committed
Dependency version bumps
- Update GLib to 2.83.5. - Update libheif to 1.19.7. - Update ImageMagick to 6.9.13-22. - Update Poppler to 25.03.0. MXE Updates: - Update HarfBuzz to 10.4.0.
1 parent 99153ad commit 5e87055

File tree

6 files changed

+28
-25
lines changed

6 files changed

+28
-25
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2424
| [fontconfig] | 2.16.0 | [fontconfig Licence] (BSD-like) |
2525
| [freetype] | 2.13.3 | [freetype Licence] (BSD-like) |
2626
| [fribidi] | 1.0.16 | LGPLv3 |
27-
| [glib] | 2.83.3 | LGPLv3 |
28-
| [harfbuzz] | 10.2.0 | MIT Licence |
27+
| [glib] | 2.83.5 | LGPLv3 |
28+
| [harfbuzz] | 10.4.0 | MIT Licence |
2929
| [highway] | 1.2.0 | Apache-2.0 License, BSD 3-Clause |
3030
| [lcms] | 2.17 | MIT Licence |
3131
| [libarchive] | 3.7.7 | BSD 2-Clause |
3232
| [libexif] | 0.6.25 | LGPLv3 |
3333
| [libffi] | 3.4.7 | MIT Licence |
34-
| [libheif] | 1.19.5 | LGPLv3 |
34+
| [libheif] | 1.19.7 | LGPLv3 |
3535
| [libimagequant] | 2.4.1¹ | BSD 2-Clause |
3636
| [libpng] | 1.6.47 | [libpng License version 2] |
3737
| [librsvg] | 2.59.90 | LGPLv3 |
@@ -94,7 +94,7 @@ Same as libvips-web + these extra dependencies:
9494
| [cfitsio] | 4.5.0 | BSD-like |
9595
| [fftw] | 3.3.10 | GPLv2 |
9696
| [gdk-pixbuf] | 2.42.12 | LGPLv3 |
97-
| [imagemagick] | 6.9.13-21 | [ImageMagick License] (Apache-2.0-like) |
97+
| [imagemagick] | 6.9.13-22 | [ImageMagick License] (Apache-2.0-like) |
9898
| [imath] | 3.1.9 | BSD 3-Clause |
9999
| [libdicom] | 1.1.0 | MIT Licence |
100100
| [libjxl] | 0.11.1 | BSD 3-Clause |
@@ -103,7 +103,7 @@ Same as libvips-web + these extra dependencies:
103103
| [openexr] | 3.1.11 | BSD 3-Clause |
104104
| [openjpeg] | 2.5.3 | BSD 2-Clause |
105105
| [openslide] | 4.0.0 | LGPLv3 |
106-
| [poppler] | 25.02.0 | GPLv2 |
106+
| [poppler] | 25.03.0 | GPLv2 |
107107
| [sqlite] | 3.49.1 | Public domain |
108108

109109
[brotli]: https://github.com/google/brotli

build/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fi
4545
# Always checkout a particular revision which will successfully build.
4646
# This ensures that it will not suddenly break a build.
4747
# Note: Must be regularly updated.
48-
revision="2bf85f28165cefbce457a79cc0c69007455b025a"
48+
revision="7e76b638d6d6c96686d733f676c734ec688fa0ec"
4949
initialize=false
5050

5151
if [ -f "$mxe_dir/Makefile" ]; then

build/libheif.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG := libheif
22
$(PKG)_WEBSITE := http://www.libheif.org/
33
$(PKG)_DESCR := libheif is a ISO/IEC 23008-12:2017 HEIF file format decoder and encoder.
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 1.19.5
6-
$(PKG)_CHECKSUM := d3cf0a76076115a070f9bc87cf5259b333a1f05806500045338798486d0afbaf
5+
$(PKG)_VERSION := 1.19.7
6+
$(PKG)_CHECKSUM := 161c042d2102665fcee3ded851c78a0eb5f2d4bfe39fba48ba6e588fd6e964f3
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_GH_CONF := strukturag/libheif/releases,v
99
$(PKG)_DEPS := cc aom

build/overrides.mk

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ libxml2_SUBDIR := libxml2-$(libxml2_VERSION)
2828
libxml2_FILE := libxml2-$(libxml2_VERSION).tar.xz
2929
libxml2_URL := https://download.gnome.org/sources/libxml2/$(call SHORT_PKG_VERSION,libxml2)/$(libxml2_FILE)
3030

31-
# upstream version is 1.6.46
32-
libpng_VERSION := 1.6.47
33-
libpng_CHECKSUM := b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631
34-
libpng_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libpng-[0-9]*.patch)))
35-
libpng_SUBDIR := libpng-$(libpng_VERSION)
36-
libpng_FILE := libpng-$(libpng_VERSION).tar.xz
37-
libpng_URL := https://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$(libpng_VERSION)/$(libpng_FILE)
38-
3931
# upstream version is 1.5.23
4032
# cannot use GH_CONF:
4133
# matio_GH_CONF := tbeu/matio/releases,v
@@ -55,8 +47,8 @@ libarchive_FILE := libarchive-$(libarchive_VERSION).tar.xz
5547
libarchive_URL := https://github.com/libarchive/libarchive/releases/download/v$(libarchive_VERSION)/$(libarchive_FILE)
5648

5749
# upstream version is 7, we want ImageMagick 6
58-
imagemagick_VERSION := 6.9.13-21
59-
imagemagick_CHECKSUM := 36a7205c73db9107acec5bb7594e3afbde3cc08a89f0a22a15eead387244fa05
50+
imagemagick_VERSION := 6.9.13-22
51+
imagemagick_CHECKSUM := 5cadcf46363a44ee0f81b87043e39a37621cf637c8feddef73b960a1563cf8b5
6052
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
6153
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
6254

@@ -94,6 +86,14 @@ fribidi_SUBDIR := fribidi-$(fribidi_VERSION)
9486
fribidi_FILE := fribidi-$(fribidi_VERSION).tar.xz
9587
fribidi_URL := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
9688

89+
# upstream version is 2.83.4
90+
glib_VERSION := 2.83.5
91+
glib_CHECKSUM := f8342c4f2b713c926db1b34b8bd93dd4cb2515a1102d8419686fe93942c6071c
92+
glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
93+
glib_SUBDIR := glib-$(glib_VERSION)
94+
glib_FILE := glib-$(glib_VERSION).tar.xz
95+
glib_URL := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,glib)/$(glib_FILE)
96+
9797
# upstream version is 0.6.22
9898
libexif_VERSION := 0.6.25
9999
libexif_CHECKSUM := 62f74cf3bf673a6e24d2de68f6741643718541f83aca5947e76e3978c25dce83
@@ -128,8 +128,8 @@ libjpeg-turbo_FILE := libjpeg-turbo-$(libjpeg-turbo_VERSION).tar.gz
128128
libjpeg-turbo_URL := https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$(libjpeg-turbo_VERSION)/$(libjpeg-turbo_FILE)
129129

130130
# upstream version is 23.09.0
131-
poppler_VERSION := 25.02.0
132-
poppler_CHECKSUM := 21234cb2a9647d73c752ce4031e65a79d11a511a835f2798284c2497b8701dee
131+
poppler_VERSION := 25.03.0
132+
poppler_CHECKSUM := 97da4ff88517a6bbd729529f195f85c8d7a0c3bb4a3d57cb0c685cbb052fe837
133133
poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
134134
poppler_SUBDIR := poppler-$(poppler_VERSION)
135135
poppler_FILE := poppler-$(poppler_VERSION).tar.xz
@@ -834,7 +834,6 @@ define brotli_BUILD
834834
endef
835835

836836
# install DLL in /bin
837-
# generate missing import library
838837
# build with --disable-load-extension
839838
define sqlite_BUILD
840839
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \

build/patches/glib-2-without-gregex.patch

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,18 @@ diff --git a/meson.build b/meson.build
182182
index 1111111..2222222 100644
183183
--- a/meson.build
184184
+++ b/meson.build
185-
@@ -2211,46 +2211,6 @@ else
185+
@@ -2224,50 +2224,6 @@ else
186186
libiconv = dependency('iconv')
187187
endif
188188

189189
-pcre2_req = '>=10.32'
190+
-pcre2_options = [
191+
- 'default_library=static',
192+
- 'test=false',
193+
-]
190194
-
191195
-# Pick up pcre from the system, or if "--force-fallback-for libpcre2-8" was specified
192-
-pcre2 = dependency('libpcre2-8', version: pcre2_req, required: false, default_options: ['default_library=static'])
196+
-pcre2 = dependency('libpcre2-8', version: pcre2_req, required: false, default_options: pcre2_options)
193197
-if not pcre2.found()
194198
- if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
195199
- # MSVC: Search for the PCRE2 library by the configuration, which corresponds
@@ -205,7 +209,7 @@ index 1111111..2222222 100644
205209
-
206210
-# Try again with the fallback
207211
-if not pcre2.found()
208-
- pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true, default_options: ['default_library=static'])
212+
- pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true, default_options: pcre2_options)
209213
- assert(pcre2.type_name() == 'internal')
210214
- # static flags are automatically enabled by the subproject if it's built
211215
- # with default_library=static

build/patches/glib-static.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ diff --git a/meson.build b/meson.build
4747
index 1111111..2222222 100644
4848
--- a/meson.build
4949
+++ b/meson.build
50-
@@ -324,13 +324,14 @@ endif
50+
@@ -335,13 +335,14 @@ endif
5151
if glib_build_static_only
5252
glibconfig_conf.set('GLIB_STATIC_COMPILATION', '1')
5353
glibconfig_conf.set('GOBJECT_STATIC_COMPILATION', '1')

0 commit comments

Comments
 (0)