Skip to content

Commit afa6740

Browse files
kleisaukekleisauke
committed
Dependency version bumps
- Update aom to 3.5.0. - Update libffi to 3.4.3. - Update librsvg to 2.55.1. - Update ImageMagick to 6.9.12-64. - Update libjxl to 0.7.0. MXE Updates: - Update Expat to 2.4.9.
1 parent 637e470 commit afa6740

File tree

8 files changed

+25
-33
lines changed

8 files changed

+25
-33
lines changed

‎README.md‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
1717

1818
| Dependency | Version | Used under the terms of |
1919
|-----------------|-----------|--------------------------------------------------------------|
20-
| [aom] | 3.4.0 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] |
20+
| [aom] | 3.5.0 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] |
2121
| [cairo] | 1.17.6 | Mozilla Public License 2.0 |
2222
| [cgif] | 0.3.0 | MIT Licence |
23-
| [expat] | 2.4.8 | MIT Licence |
23+
| [expat] | 2.4.9 | MIT Licence |
2424
| [fontconfig] | 2.14.0 | [fontconfig Licence] (BSD-like) |
2525
| [freetype] | 2.12.1 | [freetype Licence] (BSD-like) |
2626
| [fribidi] | 1.0.12 | LGPLv3 |
@@ -29,12 +29,12 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2929
| [harfbuzz] | 5.2.0 | MIT Licence |
3030
| [lcms] | 2.13.1 | MIT Licence |
3131
| [libexif] | 0.6.24 | LGPLv3 |
32-
| [libffi] | 3.4.2 | MIT Licence |
32+
| [libffi] | 3.4.3 | MIT Licence |
3333
| [libgsf] | 1.14.50 | LGPLv3 |
3434
| [libheif] | 1.13.0 | LGPLv3 |
3535
| [libimagequant] | 2.4.1¹ | BSD 2-Clause |
3636
| [libpng] | 1.6.38 | [libpng License version 2] |
37-
| [librsvg] | 2.55.0 | LGPLv3 |
37+
| [librsvg] | 2.55.1 | LGPLv3 |
3838
| [libspng] | 0.7.2 | BSD 2-Clause |
3939
| [libtiff] | 4.4.0 | [libtiff License] (BSD-like) |
4040
| [libvips] | 8.13.1 | LGPLv3 |
@@ -97,9 +97,9 @@ Same as libvips-web + these extra dependencies:
9797
| [cfitsio] | 4.1.0 | BSD-like |
9898
| [fftw] | 3.3.10 | GPLv2 |
9999
| [highway] | 1.0.1 | Apache-2.0 License |
100-
| [imagemagick] | 6.9.12-63 | [ImageMagick License] (Apache-2.0-like) |
100+
| [imagemagick] | 6.9.12-64 | [ImageMagick License] (Apache-2.0-like) |
101101
| [imath] | 3.1.5 | BSD 3-Clause |
102-
| [libjxl] | 0.7² | BSD 3-Clause |
102+
| [libjxl] | 0.7.0 | 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 |
@@ -108,9 +108,6 @@ Same as libvips-web + these extra dependencies:
108108
| [poppler] | 22.09.0 | GPLv2 |
109109
| [sqlite] | 3.39.3 | 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-
114111
[brotli]: https://github.com/google/brotli
115112
[cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/
116113
[fftw]: https://github.com/FFTW/fftw3

‎build/aom.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG := aom
22
$(PKG)_WEBSITE := https://aomedia.googlesource.com/aom/
33
$(PKG)_DESCR := AV1 Codec Library
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 3.4.0
6-
$(PKG)_CHECKSUM := bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354
5+
$(PKG)_VERSION := 3.5.0
6+
$(PKG)_CHECKSUM := d37dbee372e2430a7efde813984ae6d78bdf1fc4080ebe32457c9115408b0738
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_SUBDIR := libaom-$($(PKG)_VERSION)
99
$(PKG)_FILE := libaom-$($(PKG)_VERSION).tar.gz

‎build/build.sh‎

Lines changed: 1 addition & 1 deletion
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="f1cb8e7b92c4ae014de8a1816c995e13d4fbffbd"
54+
revision="dc3375b068df5b92bd2df33744394d1901079e6e"
5555
initialize=false
5656

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

‎build/libjxl.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ 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.7
6-
$(PKG)_CHECKSUM := 17148629624e328cd015439b37bf07fc49245afefa1abaa50ef9e7a56028dcef
5+
$(PKG)_VERSION := 0.7.0
6+
$(PKG)_CHECKSUM := 3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libjxl/libjxl/tags,v,rc
8+
$(PKG)_GH_CONF := libjxl/libjxl/tags,v
99
$(PKG)_DEPS := cc brotli highway lcms libjpeg-turbo libpng
1010

1111
define $(PKG)_BUILD

‎build/overrides.mk‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ $(info == General overrides: $(lastword $(MAKEFILE_LIST)))
33
## Update dependencies
44

55
# upstream version is 3.3
6-
libffi_VERSION := 3.4.2
7-
libffi_CHECKSUM := 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620
6+
libffi_VERSION := 3.4.3
7+
libffi_CHECKSUM := 4416dd92b6ae8fcb5b10421e711c4d3cb31203d77521a77d85d0102311e6c3b8
88
libffi_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libffi-[0-9]*.patch)))
99
libffi_SUBDIR := libffi-$(libffi_VERSION)
1010
libffi_FILE := libffi-$(libffi_VERSION).tar.gz
@@ -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-63
43-
imagemagick_CHECKSUM := 208e8dda121f51ac8a1230ac5dec57b7366120ae2b0b0a243c40757c7776d1ea
42+
imagemagick_VERSION := 6.9.12-64
43+
imagemagick_CHECKSUM := 3fd28f52dd8af0e896c29bbd4749326613ec6881ce33f8fb6bd5605a1984e027
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.55.0
57-
librsvg_CHECKSUM := 6e626c564e354bcd8c384b90f8e4f30b303afa6c1e0cb5cc56ba14900c5db730
56+
librsvg_VERSION := 2.55.1
57+
librsvg_CHECKSUM := 6baf48a9d3a56fd13bbfbb9f1f76759b240b70a1fa220fd238474d66a926f98c
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
@@ -143,12 +143,6 @@ pixman_SUBDIR := pixman-$(pixman_VERSION)
143143
pixman_FILE := pixman-$(pixman_VERSION).tar.gz
144144
pixman_URL := https://cairographics.org/releases/$(pixman_FILE)
145145

146-
# upstream version is 5.1.0
147-
harfbuzz_VERSION := 5.2.0
148-
harfbuzz_CHECKSUM := 735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c
149-
harfbuzz_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/harfbuzz-[0-9]*.patch)))
150-
harfbuzz_GH_CONF := harfbuzz/harfbuzz/releases,,,,,.tar.xz
151-
152146
# upstream version is 2.13
153147
# cannot use GH_CONF:
154148
# lcms_GH_CONF := mm2/Little-CMS,lcms

‎build/patches/aom-3-fixes.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
8383
index 1111111..2222222 100644
8484
--- a/av1/decoder/decodeframe.c
8585
+++ b/av1/decoder/decodeframe.c
86-
@@ -5225,6 +5225,7 @@ static AOM_INLINE void setup_frame_info(AV1Decoder *pbi) {
86+
@@ -5228,6 +5228,7 @@ static AOM_INLINE void setup_frame_info(AV1Decoder *pbi) {
8787
}
8888
}
8989

@@ -95,7 +95,7 @@ diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
9595
index 1111111..2222222 100644
9696
--- a/av1/encoder/encoder.c
9797
+++ b/av1/encoder/encoder.c
98-
@@ -3675,6 +3675,7 @@ static int encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
98+
@@ -3732,6 +3732,7 @@ static int encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
9999
return AOM_CODEC_OK;
100100
}
101101

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ diff --git a/Cargo.toml b/Cargo.toml
3434
index 1111111..2222222 100644
3535
--- a/Cargo.toml
3636
+++ b/Cargo.toml
37-
@@ -36,7 +36,7 @@ edition = "2018"
37+
@@ -42,7 +42,7 @@ libxml2 = { name = "libxml-2.0", version = "2.9" }
3838

3939
[lib]
4040
name = "librsvg"

‎build/plugins/llvm-mingw/rust.mk‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ PKG := rust
22
$(PKG)_WEBSITE := https://www.rust-lang.org/
33
$(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency.
44
$(PKG)_IGNORE :=
5-
# https://static.rust-lang.org/dist/2022-09-18/rustc-nightly-src.tar.xz.sha256
5+
# Temporarily pin to 2022-09-24 due to https://github.com/rust-lang/rust/pull/98483#issuecomment-1260975364
6+
# https://static.rust-lang.org/dist/2022-09-24/rustc-nightly-src.tar.xz.sha256
67
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := bbc7bc15350ddc6fc2ab0a67eafd41347a5ae14effade2f570be575506fdfba6
8+
$(PKG)_CHECKSUM := ccc2c11228b80d6a068846d0b9ee08765a85c8cd67a601d13e743c905b271f52
89
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
910
$(PKG)_SUBDIR := $(PKG)c-$($(PKG)_VERSION)-src
1011
$(PKG)_FILE := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz
11-
$(PKG)_URL := https://static.rust-lang.org/dist/2022-09-18/$($(PKG)_FILE)
12+
$(PKG)_URL := https://static.rust-lang.org/dist/2022-09-24/$($(PKG)_FILE)
1213
$(PKG)_DEPS := $(BUILD)~$(PKG)
1314
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1415

0 commit comments

Comments
 (0)