Skip to content

Commit 3ba2792

Browse files
kleisaukekleisauke
committed
Dependency version bumps
- Update librsvg to 2.54.4. - Update ImageMagick to 6.9.12-52.
1 parent 4291a6d commit 3ba2792

File tree

3 files changed

+27
-19
lines changed

3 files changed

+27
-19
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
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.3 | LGPLv3 |
37+
| [librsvg] | 2.54.4 | LGPLv3 |
3838
| [libspng] | 0.7.2 | BSD 2-Clause |
3939
| [libtiff] | 4.4.0 | [libtiff License] (BSD-like) |
4040
| [libvips] | 8.12.2 | LGPLv3 |
@@ -97,7 +97,7 @@ Same as libvips-web + these extra dependencies:
9797
| [cfitsio] | 4.1.0 | BSD-like |
9898
| [fftw] | 3.3.10 | GPLv2 |
9999
| [highway] | 0.17.0 | Apache-2.0 License |
100-
| [imagemagick] | 6.9.12-51 | [ImageMagick License] (Apache-2.0-like) |
100+
| [imagemagick] | 6.9.12-52 | [ImageMagick License] (Apache-2.0-like) |
101101
| [imath] | 3.1.5 | BSD 3-Clause |
102102
| [libjxl] | 0.6.1 | BSD 3-Clause |
103103
| [matio] | 1.5.23 | BSD 2-Clause |

‎build/overrides.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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-51
43-
imagemagick_CHECKSUM := 699cd979e845f96bae309adf2c6acb1a1eccf01907c12a3ef743f5a4b9a1897b
42+
imagemagick_VERSION := 6.9.12-52
43+
imagemagick_CHECKSUM := 033bbb2b07219337ee49ec43d3b36813b0a6b92bb4089be39abceb48edc5e135
4444
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
4545
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
4646

@@ -53,8 +53,8 @@ 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.3
57-
librsvg_CHECKSUM := 66158f2ef46dde260026846c4da102e4a9dd4e5293010f30949c6cc26dd6efe8
56+
librsvg_VERSION := 2.54.4
57+
librsvg_CHECKSUM := ea152a243f6a43c0e036a28c70de3fcbcdea5664c6811c78592bc229ecc24833
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
@@ -554,7 +554,7 @@ define librsvg_BUILD
554554
$(if $(IS_LLVM), \
555555
(cd '$(SOURCE_DIR)' && $(PATCH) -p1 -u) < $(realpath $(dir $(lastword $(librsvg_PATCHES))))/librsvg-llvm-mingw.patch \
556556
# Update expected Cargo SHA256 hashes for the vendored files we have patched
557-
$(SED) -i 's/3c7fe77a67a34e6641b798f3a67dd6904396011a428f6af82cbec993eb924f0c/a52dbb88925434e6769aa0a10eec5b0648ea8f8092a9607e0c734b725a55e0ec/' '$(SOURCE_DIR)/vendor/cfg-expr/.cargo-checksum.json'; \
557+
$(SED) -i 's/f078966ea9ec6f5b003664ad36a7598dadb11179188643ae1adceabbaf7893ab/2b61f22c9caba100e52e84357f857ad12c7b9386c0c18e933e2789e1bd79c14d/' '$(SOURCE_DIR)/vendor/cfg-expr/.cargo-checksum.json'; \
558558
$(SED) -i 's/991919d9ab1eca85e87a85acafcb86d4880f1afe9fe35d6bd87039dcb1fa9aa7/38fb6d61251112ff4ff22ebcdad41f4193cd2e0b2788065e5634e9a9027260e2/' '$(SOURCE_DIR)/vendor/compiler_builtins/.cargo-checksum.json'; \
559559
$(SED) -i 's/55138604371e00ef14167894159156b68f939039b0e5b2b1f3db61456e3d3870/ff7df885cb6b31736b49f8d0a4755e8a2d947145316c3e5b212c78ab08142108/' '$(SOURCE_DIR)/vendor/compiler_builtins/.cargo-checksum.json'; \
560560
$(SED) -i 's/966128476fdf0d3148da21508a27a159ad2d272391e4a3ffbf18008300cca80c/ead5a3b748c9a5fcb145fa2e5cfc8df32f383369b8842fba4272ca3b568109ea/' '$(SOURCE_DIR)/vendor/windows-sys/.cargo-checksum.json';)

‎build/patches/librsvg-llvm-mingw.patch

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ diff --git a/vendor/cfg-expr/src/targets/builtins.rs b/vendor/cfg-expr/src/targe
1010
index 1111111..2222222 100644
1111
--- a/vendor/cfg-expr/src/targets/builtins.rs
1212
+++ b/vendor/cfg-expr/src/targets/builtins.rs
13-
@@ -93,6 +93,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
14-
pointer_width: 64,
15-
endian: Endian::little,
13+
@@ -109,6 +109,18 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
14+
has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
15+
panic: Panic::unwind,
1616
},
1717
+ TargetInfo {
1818
+ triple: Triple::new_const("aarch64-pc-windows-gnullvm"),
@@ -23,13 +23,15 @@ index 1111111..2222222 100644
2323
+ families: Families::windows,
2424
+ pointer_width: 64,
2525
+ endian: Endian::little,
26+
+ has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
27+
+ panic: Panic::unwind,
2628
+ },
2729
TargetInfo {
2830
triple: Triple::new_const("aarch64-pc-windows-msvc"),
2931
os: Some(Os::windows),
30-
@@ -413,6 +423,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
31-
pointer_width: 32,
32-
endian: Endian::little,
32+
@@ -505,6 +517,18 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
33+
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
34+
panic: Panic::unwind,
3335
},
3436
+ TargetInfo {
3537
+ triple: Triple::new_const("armv7-pc-windows-gnullvm"),
@@ -40,13 +42,15 @@ index 1111111..2222222 100644
4042
+ families: Families::windows,
4143
+ pointer_width: 32,
4244
+ endian: Endian::little,
45+
+ has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
46+
+ panic: Panic::unwind,
4347
+ },
4448
TargetInfo {
4549
triple: Triple::new_const("armv7-unknown-freebsd"),
4650
os: Some(Os::freebsd),
47-
@@ -683,6 +703,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
48-
pointer_width: 32,
49-
endian: Endian::little,
51+
@@ -841,6 +865,18 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
52+
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
53+
panic: Panic::unwind,
5054
},
5155
+ TargetInfo {
5256
+ triple: Triple::new_const("i686-pc-windows-gnullvm"),
@@ -57,13 +61,15 @@ index 1111111..2222222 100644
5761
+ families: Families::windows,
5862
+ pointer_width: 32,
5963
+ endian: Endian::little,
64+
+ has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
65+
+ panic: Panic::unwind,
6066
+ },
6167
TargetInfo {
6268
triple: Triple::new_const("i686-pc-windows-msvc"),
6369
os: Some(Os::windows),
64-
@@ -1573,6 +1603,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
65-
pointer_width: 64,
66-
endian: Endian::little,
70+
@@ -1921,6 +1957,18 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
71+
has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
72+
panic: Panic::unwind,
6773
},
6874
+ TargetInfo {
6975
+ triple: Triple::new_const("x86_64-pc-windows-gnullvm"),
@@ -74,6 +80,8 @@ index 1111111..2222222 100644
7480
+ families: Families::windows,
7581
+ pointer_width: 64,
7682
+ endian: Endian::little,
83+
+ has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
84+
+ panic: Panic::unwind,
7785
+ },
7886
TargetInfo {
7987
triple: Triple::new_const("x86_64-pc-windows-msvc"),

0 commit comments

Comments
 (0)