Skip to content

Commit e949d29

Browse files
committed
Update for 8.15.2
- Update aom to 3.8.2. - Update Expat to 2.6.2. - Update GLib to 2.80.0. - Update librsvg to 2.57.92. MXE Updates: - Update SQLite to 3.45.2.
1 parent 76ec455 commit e949d29

File tree

10 files changed

+35
-36
lines changed

10 files changed

+35
-36
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ 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.8.1 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] |
20+
| [aom] | 3.8.2 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] |
2121
| [cairo] | 1.18.0 | Mozilla Public License 2.0 |
2222
| [cgif] | 0.3.2 | MIT Licence |
23-
| [expat] | 2.6.1 | MIT Licence |
23+
| [expat] | 2.6.2 | MIT Licence |
2424
| [fontconfig] | 2.15.0 | [fontconfig Licence] (BSD-like) |
2525
| [freetype] | 2.13.2 | [freetype Licence] (BSD-like) |
2626
| [fribidi] | 1.0.13 | LGPLv3 |
2727
| [gdk-pixbuf] | 2.42.10 | LGPLv3 |
28-
| [glib] | 2.79.3 | LGPLv3 |
28+
| [glib] | 2.80.0 | LGPLv3 |
2929
| [harfbuzz] | 8.3.0 | MIT Licence |
3030
| [highway] | 1.1.0 | Apache-2.0 License, BSD 3-Clause |
3131
| [lcms] | 2.16 | MIT Licence |
@@ -35,7 +35,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
3535
| [libheif] | 1.17.6 | LGPLv3 |
3636
| [libimagequant] | 2.4.1¹ | BSD 2-Clause |
3737
| [libpng] | 1.6.43 | [libpng License version 2] |
38-
| [librsvg] | 2.57.91 | LGPLv3 |
38+
| [librsvg] | 2.57.92 | LGPLv3 |
3939
| [libspng] | 0.7.4 | BSD 2-Clause |
4040
| [libtiff] | 4.6.0 | [libtiff License] (BSD-like) |
4141
| [libvips] | 8.15.1 | LGPLv3 |
@@ -105,7 +105,7 @@ Same as libvips-web + these extra dependencies:
105105
| [openjpeg] | 2.5.2 | BSD 2-Clause |
106106
| [openslide] | 4.0.0 | LGPLv3 |
107107
| [poppler] | 24.03.0 | GPLv2 |
108-
| [sqlite] | 3.45.1 | Public domain |
108+
| [sqlite] | 3.45.2 | Public domain |
109109

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

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.8.1
6-
$(PKG)_CHECKSUM := dedc65060812a7df801c0270a2fe8bd773c6bb0b601f2144ecfbc62dc0f671ca
5+
$(PKG)_VERSION := 3.8.2
6+
$(PKG)_CHECKSUM := 98f7d6d7ddbf06d088735f5e51782df053fd1b08c553882c2924bd0b2021a202
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="009902d3ccb83119e4b7d47fbf9ad6392c4ab751"
54+
revision="e6942d41898b7b569feff02763b72f472e30b3f8"
5555
initialize=false
5656

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

build/overrides.mk

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ graphicsmagick_FILE := GraphicsMagick-$(graphicsmagick_VERSION).tar.lz
6161
graphicsmagick_URL := https://$(SOURCEFORGE_MIRROR)/project/graphicsmagick/graphicsmagick/$(graphicsmagick_VERSION)/$(graphicsmagick_FILE)
6262

6363
# upstream version is 2.40.21
64-
librsvg_VERSION := 2.57.91
65-
librsvg_CHECKSUM := e0f9346258ba1c1299aee8abd7b0218ab2ef45fa83bb078a636c1ebb2ecdb6b2
64+
librsvg_VERSION := 2.57.92
65+
librsvg_CHECKSUM := 2a2c30beabf3cfdd40a4a6dbed3fb33e677caee5d8f304788249b731e7be3852
6666
librsvg_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/librsvg-[0-9]*.patch)))
6767
librsvg_SUBDIR := librsvg-$(librsvg_VERSION)
6868
librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz
@@ -87,16 +87,16 @@ fribidi_FILE := fribidi-$(fribidi_VERSION).tar.xz
8787
fribidi_URL := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
8888

8989
# upstream version is 2.70.2
90-
glib_VERSION := 2.79.3
91-
glib_CHECKSUM := 00d1a313677ed5f5c5e6f7a77ca66e31cf7aa1e3d6b92b6041a16d7a024580c6
90+
glib_VERSION := 2.80.0
91+
glib_CHECKSUM := 8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d
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
9595
glib_URL := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,glib)/$(glib_FILE)
9696

97-
# upstream version is 2.6.0
98-
expat_VERSION := 2.6.1
99-
expat_CHECKSUM := 0c00d2760ad12efef6e26efc8b363c8eb28eb8c8de719e46d5bb67b40ba904a3
97+
# upstream version is 2.6.1
98+
expat_VERSION := 2.6.2
99+
expat_CHECKSUM := ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364
100100
expat_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/expat-[0-9]*.patch)))
101101
expat_SUBDIR := expat-$(expat_VERSION)
102102
expat_FILE := expat-$(expat_VERSION).tar.xz
@@ -158,12 +158,6 @@ fftw_SUBDIR := fftw-$(fftw_VERSION)
158158
fftw_FILE := fftw-$(fftw_VERSION).tar.gz
159159
fftw_URL := http://www.fftw.org/$(fftw_FILE)
160160

161-
# upstream version is 2.5.0
162-
openjpeg_VERSION := 2.5.2
163-
openjpeg_CHECKSUM := 90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a
164-
openjpeg_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/openjpeg-[0-9]*.patch)))
165-
openjpeg_GH_CONF := uclouvain/openjpeg/tags,v
166-
167161
# upstream version is 3.0.1
168162
libjpeg-turbo_VERSION := 3.0.2
169163
libjpeg-turbo_CHECKSUM := c2ce515a78d91b09023773ef2770d6b0df77d674e144de80d63e0389b3a15ca6

build/patches/vips-8-dlldir-as-libdir.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ diff --git a/libvips/include/vips/util.h b/libvips/include/vips/util.h
99
index 1111111..2222222 100644
1010
--- a/libvips/include/vips/util.h
1111
+++ b/libvips/include/vips/util.h
12-
@@ -437,6 +437,7 @@ guint32 vips__random(guint32 seed);
12+
@@ -428,6 +428,7 @@ guint32 vips__random(guint32 seed);
1313
guint32 vips__random_add(guint32 seed, int value);
1414

1515
const char *vips__icc_dir(void);

build/plugins/llvm-mingw/patches/rust-1-fixes.patch

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ new file mode 100644
1414
index 0000000..1111111
1515
--- /dev/null
1616
+++ b/compiler/rustc_target/src/spec/targets/armv7_pc_windows_gnullvm.rs
17-
@@ -0,0 +1,18 @@
17+
@@ -0,0 +1,23 @@
1818
+use crate::spec::{base, FramePointer, Target};
1919
+
2020
+pub fn target() -> Target {
@@ -26,7 +26,12 @@ index 0000000..1111111
2626
+
2727
+ Target {
2828
+ llvm_target: "armv7-pc-windows-gnu".into(),
29-
+ description: None,
29+
+ metadata: crate::spec::TargetMetadata {
30+
+ description: None,
31+
+ tier: None,
32+
+ host_tools: None,
33+
+ std: None,
34+
+ },
3035
+ pointer_width: 32,
3136
+ data_layout: "e-m:w-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
3237
+ arch: "arm".into(),
@@ -37,7 +42,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s
3742
index 1111111..2222222 100644
3843
--- a/compiler/rustc_target/src/spec/mod.rs
3944
+++ b/compiler/rustc_target/src/spec/mod.rs
40-
@@ -1559,6 +1559,7 @@ supported_targets! {
45+
@@ -1574,6 +1574,7 @@ supported_targets! {
4146
("i686-uwp-windows-gnu", i686_uwp_windows_gnu),
4247
("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
4348

@@ -138,7 +143,7 @@ index 1111111..2222222 100644
138143
-#![cfg_attr(bootstrap, feature(cfg_target_abi))]
139144
#![feature(strict_provenance)]
140145
#![cfg_attr(not(target_env = "msvc"), feature(libc))]
141-
#![allow(internal_features)]
146+
#![cfg_attr(
142147
diff --git a/library/unwind/src/libunwind.rs b/library/unwind/src/libunwind.rs
143148
index 1111111..2222222 100644
144149
--- a/library/unwind/src/libunwind.rs

build/plugins/llvm-mingw/rust.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ 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/2024-03-09/rustc-nightly-src.tar.xz.sha256
5+
# https://static.rust-lang.org/dist/2024-03-14/rustc-nightly-src.tar.xz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := 4f99fe8c9d940a384290e348cf23e6b3821220dc465c6afde370f0a6e5804a34
7+
$(PKG)_CHECKSUM := 0d70617e70a3f13f5d932c61ade9669d5016f4ae760b400c247c74bce9c0e4b3
88
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
99
$(PKG)_SUBDIR := $(PKG)c-$($(PKG)_VERSION)-src
1010
$(PKG)_FILE := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz
11-
$(PKG)_URL := https://static.rust-lang.org/dist/2024-03-09/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2024-03-14/$($(PKG)_FILE)
1212
$(PKG)_DEPS := $(BUILD)~$(PKG)
1313
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1414

build/variables.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
vips_package=vips
44
vips_version=8.15
5-
vips_patch_version=1
5+
vips_patch_version=2
66
#vips_pre_version=rc2
77

88
if [ -n "$GIT_COMMIT" ]; then

build/vips-all.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PKG := vips-all
22
$(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 8.15.1
6-
$(PKG)_CHECKSUM := 06811f5aed3e7bc03e63d05537ff4b501de5283108c8ee79396c60601a00830c
5+
$(PKG)_VERSION := 8.15.2
6+
$(PKG)_CHECKSUM := a2ab15946776ca7721d11cae3215f20f1f097b370ff580cd44fc0f19387aee84
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v,a,,,.tar.xz
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
1010
$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \

build/vips-web.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ PKG := vips-web
22
$(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 8.15.1
6-
$(PKG)_CHECKSUM := 06811f5aed3e7bc03e63d05537ff4b501de5283108c8ee79396c60601a00830c
5+
$(PKG)_VERSION := 8.15.2
6+
$(PKG)_CHECKSUM := a2ab15946776ca7721d11cae3215f20f1f097b370ff580cd44fc0f19387aee84
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v,a,,,.tar.xz
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
1010
$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \

0 commit comments

Comments
 (0)