Skip to content

Commit 99153ad

Browse files
kleisaukekleisauke
committed
Dependency version bumps
- Update libpng to 1.6.47. - Update librsvg to 2.59.90. - Update libxml2 to 2.13.6. MXE Updates: - Update SQLite to 3.49.1.
1 parent 32a2d0e commit 99153ad

File tree

7 files changed

+106
-211
lines changed

7 files changed

+106
-211
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
3333
| [libffi] | 3.4.7 | MIT Licence |
3434
| [libheif] | 1.19.5 | LGPLv3 |
3535
| [libimagequant] | 2.4.1¹ | BSD 2-Clause |
36-
| [libpng] | 1.6.46 | [libpng License version 2] |
37-
| [librsvg] | 2.59.2 | LGPLv3 |
36+
| [libpng] | 1.6.47 | [libpng License version 2] |
37+
| [librsvg] | 2.59.90 | LGPLv3 |
3838
| [libspng] | 0.7.4 | BSD 2-Clause |
3939
| [libtiff] | 4.7.0 | [libtiff License] (BSD-like) |
4040
| [libvips] | 8.16.0 | LGPLv3 |
4141
| [libwebp] | 1.5.0 | New BSD License |
42-
| [libxml2] | 2.13.5 | MIT Licence |
42+
| [libxml2] | 2.13.6 | MIT Licence |
4343
| [mozjpeg] | 4.1.5 | [zlib License, IJG License, BSD-3-Clause] |
4444
| [pango] | 1.56.1 | LGPLv3 |
4545
| [pixman] | 0.44.2 | MIT Licence |
@@ -104,7 +104,7 @@ Same as libvips-web + these extra dependencies:
104104
| [openjpeg] | 2.5.3 | BSD 2-Clause |
105105
| [openslide] | 4.0.0 | LGPLv3 |
106106
| [poppler] | 25.02.0 | GPLv2 |
107-
| [sqlite] | 3.49.0 | Public domain |
107+
| [sqlite] | 3.49.1 | Public domain |
108108

109109
[brotli]: https://github.com/google/brotli
110110
[cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/

‎build/build.sh‎

Lines changed: 3 additions & 3 deletions
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="866492387740cc6580ef516c8a746402be645453"
48+
revision="2bf85f28165cefbce457a79cc0c69007455b025a"
4949
initialize=false
5050

5151
if [ -f "$mxe_dir/Makefile" ]; then
@@ -59,12 +59,12 @@ fi
5959
curr_revision=$(git rev-parse HEAD)
6060

6161
# Is our branch up-to-date?
62-
if [ ! "$curr_revision" = "$revision" ]; then
62+
if [ "$curr_revision" != "$revision" ]; then
6363
git pull && git reset --hard $revision
6464
initialize=true
6565
fi
6666

67-
if [ "$initialize" = true ]; then
67+
if [ "$initialize" = "true" ]; then
6868
# Patch MXE to support the ARM64 target
6969
git apply $work_dir/patches/mxe-fixes.patch
7070
fi

‎build/overrides.mk‎

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,23 @@ 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

22+
# no longer needed by libvips, but some of the deps need it
23+
# upstream version is 2.13.5
24+
libxml2_VERSION := 2.13.6
25+
libxml2_CHECKSUM := f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96
26+
libxml2_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libxml2-[0-9]*.patch)))
27+
libxml2_SUBDIR := libxml2-$(libxml2_VERSION)
28+
libxml2_FILE := libxml2-$(libxml2_VERSION).tar.xz
29+
libxml2_URL := https://download.gnome.org/sources/libxml2/$(call SHORT_PKG_VERSION,libxml2)/$(libxml2_FILE)
30+
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+
2239
# upstream version is 1.5.23
2340
# cannot use GH_CONF:
2441
# matio_GH_CONF := tbeu/matio/releases,v
@@ -52,8 +69,8 @@ graphicsmagick_FILE := GraphicsMagick-$(graphicsmagick_VERSION).tar.xz
5269
graphicsmagick_URL := https://$(SOURCEFORGE_MIRROR)/project/graphicsmagick/graphicsmagick/$(graphicsmagick_VERSION)/$(graphicsmagick_FILE)
5370

5471
# upstream version is 2.40.21
55-
librsvg_VERSION := 2.59.2
56-
librsvg_CHECKSUM := ecd293fb0cc338c170171bbc7bcfbea6725d041c95f31385dc935409933e4597
72+
librsvg_VERSION := 2.59.90
73+
librsvg_CHECKSUM := d3d623a9839d2b7eb76a5b0b621c15d02abc4d9a886376c3a53b568206ebf545
5774
librsvg_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/librsvg-[0-9]*.patch)))
5875
librsvg_SUBDIR := librsvg-$(librsvg_VERSION)
5976
librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz
@@ -557,10 +574,6 @@ define librsvg_BUILD
557574
# Disable tools
558575
$(SED) -i "/subdir('rsvg_convert')/d" '$(SOURCE_DIR)/meson.build'
559576

560-
# Update and regenerate the lockfile for zune-jpeg
561-
# https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1071
562-
cargo update zune-jpeg --manifest-path='$(SOURCE_DIR)/Cargo.toml'
563-
564577
$(MXE_MESON_WRAPPER) \
565578
-Dintrospection=disabled \
566579
-Dpixbuf=disabled \
@@ -822,27 +835,24 @@ endef
822835

823836
# install DLL in /bin
824837
# generate missing import library
838+
# build with --disable-load-extension
825839
define sqlite_BUILD
826-
cd '$(1)' && $(SOURCE_DIR)/configure \
840+
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
827841
--host='$(TARGET)' \
828842
--build='$(BUILD)' \
829843
--prefix='$(PREFIX)/$(TARGET)' \
830-
$(if $(BUILD_STATIC), \
831-
--enable-static \
832-
--disable-shared \
833-
$(else), \
844+
$(if $(BUILD_SHARED), \
845+
--out-implib \
846+
--enable-shared \
834847
--disable-static \
835-
--enable-shared) \
836-
--disable-readline
837-
$(MAKE) -C '$(1)' -j 1 install
848+
$(else), \
849+
--enable-static \
850+
--disable-shared) \
851+
--disable-readline \
852+
--disable-load-extension
853+
$(MAKE) -C '$(BUILD_DIR)' -j 1 install
838854

839855
# https://sqlite.org/forum/forumpost/4b68a3b892dfb9a1
840-
# TODO(kleisauke): Switch to `--out-implib` configure flag for the next release.
841856
$(if $(BUILD_SHARED), \
842-
cp -L '$(PREFIX)/$(TARGET)/lib/libsqlite3.dll' '$(PREFIX)/$(TARGET)/bin'; \
843-
rm -v '$(PREFIX)/$(TARGET)/lib/libsqlite3.dll'*; \
844-
'$(PREFIX)/$(TARGET)/bin/gendef' '$(PREFIX)/$(TARGET)/bin/libsqlite3.dll'; \
845-
$(TARGET)-dlltool -D '$(PREFIX)/$(TARGET)/bin/libsqlite3.dll' \
846-
-l '$(PREFIX)/$(TARGET)/lib/libsqlite3.dll.a' \
847-
-d 'libsqlite3.def';)
857+
mv -vf '$(PREFIX)/$(TARGET)/lib/libsqlite3.dll' '$(PREFIX)/$(TARGET)/bin')
848858
endef

‎build/patches/librsvg-2-fixes.patch‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ diff --git a/meson.build b/meson.build
1313
index 1111111..2222222 100644
1414
--- a/meson.build
1515
+++ b/meson.build
16-
@@ -336,13 +336,9 @@ if host_system == 'windows'
16+
@@ -339,13 +339,9 @@ if host_system in ['windows', 'linux']
1717
native_libs = run_command(
1818
rustc_query_native_static_libs_args,
1919
capture: true,
@@ -26,8 +26,8 @@ index 1111111..2222222 100644
2626
- endif
2727
-
2828
foreach i: native_libs.stdout().split()
29-
if i != 'msvcrt'
30-
private_dependencies += cc.find_library(i, required: get_option('default_library') != 'shared')
29+
if 'msvcrt' in i
30+
if i.endswith('.lib') # pre Rust 1.83
3131

3232
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
3333
From: Kleis Auke Wolthuizen <[email protected]>
@@ -76,9 +76,9 @@ diff --git a/Cargo.lock b/Cargo.lock
7676
index 1111111..2222222 100644
7777
--- a/Cargo.lock
7878
+++ b/Cargo.lock
79-
@@ -387,12 +387,6 @@ version = "0.7.2"
79+
@@ -399,12 +399,6 @@ version = "0.7.4"
8080
source = "registry+https://github.com/rust-lang/crates.io-index"
81-
checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
81+
checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
8282

8383
-[[package]]
8484
-name = "color_quant"
@@ -88,8 +88,8 @@ index 1111111..2222222 100644
8888
-
8989
[[package]]
9090
name = "colorchoice"
91-
version = "1.0.2"
92-
@@ -835,16 +829,6 @@ dependencies = [
91+
version = "1.0.3"
92+
@@ -848,16 +842,6 @@ dependencies = [
9393
"wasi",
9494
]
9595

@@ -105,36 +105,35 @@ index 1111111..2222222 100644
105105
-
106106
[[package]]
107107
name = "gio"
108-
version = "0.20.0"
109-
@@ -1010,11 +994,8 @@ checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
108+
version = "0.20.6"
109+
@@ -1150,10 +1134,7 @@ checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
110110
dependencies = [
111111
"bytemuck",
112112
"byteorder-lite",
113113
- "color_quant",
114114
"dav1d",
115-
"dcv-color-primitives",
116115
- "gif",
117116
- "image-webp",
118117
"mp4parse",
119118
"num-traits",
120119
"png",
121-
@@ -1022,16 +1003,6 @@ dependencies = [
120+
@@ -1161,16 +1142,6 @@ dependencies = [
122121
"zune-jpeg",
123122
]
124123

125124
-[[package]]
126125
-name = "image-webp"
127-
-version = "0.1.3"
126+
-version = "0.2.0"
128127
-source = "registry+https://github.com/rust-lang/crates.io-index"
129-
-checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
128+
-checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
130129
-dependencies = [
131130
- "byteorder-lite",
132131
- "quick-error 2.0.1",
133132
-]
134133
-
135134
[[package]]
136135
name = "indexmap"
137-
version = "2.3.0"
136+
version = "2.7.0"
138137
diff --git a/rsvg/Cargo.toml b/rsvg/Cargo.toml
139138
index 1111111..2222222 100644
140139
--- a/rsvg/Cargo.toml

‎build/patches/mxe-fixes.patch‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,15 @@ index 1111111..2222222 100644
151151
cmake = '@PREFIX@/bin/@TARGET@-cmake'
152152
glib-mkenums = '@PREFIX@/@TARGET@/bin/glib-mkenums'
153153
glib-genmarshal = '@PREFIX@/@TARGET@/bin/glib-genmarshal'
154-
@@ -23,6 +23,16 @@ needs_exe_wrapper = true
154+
@@ -22,6 +22,20 @@ glib-compile-resources = '/usr/bin/glib-compile-resources'
155+
needs_exe_wrapper = true
155156
sys_root = '@PREFIX@/@TARGET@'
156157
pkg_config_libdir = '@PREFIX@/@TARGET@/lib/pkgconfig'
157-
158+
+# https://docs.gtk.org/glib/cross-compiling.html#cross-properties
159+
+have_c99_vsnprintf = true
160+
+have_c99_snprintf = true
161+
+have_unix98_printf = true
162+
+
158163
+[built-in options]
159164
+bindir = 'bin'
160165
+includedir = 'include'
@@ -164,10 +169,9 @@ index 1111111..2222222 100644
164169
+buildtype = 'release'
165170
+default_library = '@LIBTYPE@'
166171
+strip = @STRIP@
167-
+
172+
168173
[host_machine]
169174
system = 'windows'
170-
cpu_family = '@CPU_FAMILY@'
171175
diff --git a/src/meson-wrapper/conf/target-meson.in b/src/meson-wrapper/conf/target-meson.in
172176
index 1111111..2222222 100644
173177
--- a/src/meson-wrapper/conf/target-meson.in

0 commit comments

Comments
 (0)