From e949d2910d4de739a808739d527bcade7d27edec Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Thu, 14 Mar 2024 08:23:59 +0100 Subject: [PATCH] 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. --- README.md | 10 +++++----- build/aom.mk | 4 ++-- build/build.sh | 2 +- build/overrides.mk | 20 +++++++------------ build/patches/vips-8-dlldir-as-libdir.patch | 2 +- .../llvm-mingw/patches/rust-1-fixes.patch | 13 ++++++++---- build/plugins/llvm-mingw/rust.mk | 6 +++--- build/variables.sh | 2 +- build/vips-all.mk | 6 +++--- build/vips-web.mk | 6 +++--- 10 files changed, 35 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 4ab06b8b..c5e2ff98 100644 --- a/README.md +++ b/README.md @@ -17,15 +17,15 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. | Dependency | Version | Used under the terms of | |-----------------|-----------|--------------------------------------------------------------| -| [aom] | 3.8.1 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] | +| [aom] | 3.8.2 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] | | [cairo] | 1.18.0 | Mozilla Public License 2.0 | | [cgif] | 0.3.2 | MIT Licence | -| [expat] | 2.6.1 | MIT Licence | +| [expat] | 2.6.2 | MIT Licence | | [fontconfig] | 2.15.0 | [fontconfig Licence] (BSD-like) | | [freetype] | 2.13.2 | [freetype Licence] (BSD-like) | | [fribidi] | 1.0.13 | LGPLv3 | | [gdk-pixbuf] | 2.42.10 | LGPLv3 | -| [glib] | 2.79.3 | LGPLv3 | +| [glib] | 2.80.0 | LGPLv3 | | [harfbuzz] | 8.3.0 | MIT Licence | | [highway] | 1.1.0 | Apache-2.0 License, BSD 3-Clause | | [lcms] | 2.16 | MIT Licence | @@ -35,7 +35,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. | [libheif] | 1.17.6 | LGPLv3 | | [libimagequant] | 2.4.1ยน | BSD 2-Clause | | [libpng] | 1.6.43 | [libpng License version 2] | -| [librsvg] | 2.57.91 | LGPLv3 | +| [librsvg] | 2.57.92 | LGPLv3 | | [libspng] | 0.7.4 | BSD 2-Clause | | [libtiff] | 4.6.0 | [libtiff License] (BSD-like) | | [libvips] | 8.15.1 | LGPLv3 | @@ -105,7 +105,7 @@ Same as libvips-web + these extra dependencies: | [openjpeg] | 2.5.2 | BSD 2-Clause | | [openslide] | 4.0.0 | LGPLv3 | | [poppler] | 24.03.0 | GPLv2 | -| [sqlite] | 3.45.1 | Public domain | +| [sqlite] | 3.45.2 | Public domain | [brotli]: https://github.com/google/brotli [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/ diff --git a/build/aom.mk b/build/aom.mk index 36fe6db7..ee244664 100644 --- a/build/aom.mk +++ b/build/aom.mk @@ -2,8 +2,8 @@ PKG := aom $(PKG)_WEBSITE := https://aomedia.googlesource.com/aom/ $(PKG)_DESCR := AV1 Codec Library $(PKG)_IGNORE := -$(PKG)_VERSION := 3.8.1 -$(PKG)_CHECKSUM := dedc65060812a7df801c0270a2fe8bd773c6bb0b601f2144ecfbc62dc0f671ca +$(PKG)_VERSION := 3.8.2 +$(PKG)_CHECKSUM := 98f7d6d7ddbf06d088735f5e51782df053fd1b08c553882c2924bd0b2021a202 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch))) $(PKG)_SUBDIR := libaom-$($(PKG)_VERSION) $(PKG)_FILE := libaom-$($(PKG)_VERSION).tar.gz diff --git a/build/build.sh b/build/build.sh index 776e5857..4f3b1dc4 100755 --- a/build/build.sh +++ b/build/build.sh @@ -51,7 +51,7 @@ fi # Always checkout a particular revision which will successfully build. # This ensures that it will not suddenly break a build. # Note: Must be regularly updated. -revision="009902d3ccb83119e4b7d47fbf9ad6392c4ab751" +revision="e6942d41898b7b569feff02763b72f472e30b3f8" initialize=false if [ -f "$mxe_dir/Makefile" ]; then diff --git a/build/overrides.mk b/build/overrides.mk index 69019b42..8fba9af8 100644 --- a/build/overrides.mk +++ b/build/overrides.mk @@ -61,8 +61,8 @@ graphicsmagick_FILE := GraphicsMagick-$(graphicsmagick_VERSION).tar.lz graphicsmagick_URL := https://$(SOURCEFORGE_MIRROR)/project/graphicsmagick/graphicsmagick/$(graphicsmagick_VERSION)/$(graphicsmagick_FILE) # upstream version is 2.40.21 -librsvg_VERSION := 2.57.91 -librsvg_CHECKSUM := e0f9346258ba1c1299aee8abd7b0218ab2ef45fa83bb078a636c1ebb2ecdb6b2 +librsvg_VERSION := 2.57.92 +librsvg_CHECKSUM := 2a2c30beabf3cfdd40a4a6dbed3fb33e677caee5d8f304788249b731e7be3852 librsvg_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/librsvg-[0-9]*.patch))) librsvg_SUBDIR := librsvg-$(librsvg_VERSION) librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz @@ -87,16 +87,16 @@ fribidi_FILE := fribidi-$(fribidi_VERSION).tar.xz fribidi_URL := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE) # upstream version is 2.70.2 -glib_VERSION := 2.79.3 -glib_CHECKSUM := 00d1a313677ed5f5c5e6f7a77ca66e31cf7aa1e3d6b92b6041a16d7a024580c6 +glib_VERSION := 2.80.0 +glib_CHECKSUM := 8228a92f92a412160b139ae68b6345bd28f24434a7b5af150ebe21ff587a561d glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch))) glib_SUBDIR := glib-$(glib_VERSION) glib_FILE := glib-$(glib_VERSION).tar.xz glib_URL := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,glib)/$(glib_FILE) -# upstream version is 2.6.0 -expat_VERSION := 2.6.1 -expat_CHECKSUM := 0c00d2760ad12efef6e26efc8b363c8eb28eb8c8de719e46d5bb67b40ba904a3 +# upstream version is 2.6.1 +expat_VERSION := 2.6.2 +expat_CHECKSUM := ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/expat-[0-9]*.patch))) expat_SUBDIR := expat-$(expat_VERSION) expat_FILE := expat-$(expat_VERSION).tar.xz @@ -158,12 +158,6 @@ fftw_SUBDIR := fftw-$(fftw_VERSION) fftw_FILE := fftw-$(fftw_VERSION).tar.gz fftw_URL := http://www.fftw.org/$(fftw_FILE) -# upstream version is 2.5.0 -openjpeg_VERSION := 2.5.2 -openjpeg_CHECKSUM := 90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a -openjpeg_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/openjpeg-[0-9]*.patch))) -openjpeg_GH_CONF := uclouvain/openjpeg/tags,v - # upstream version is 3.0.1 libjpeg-turbo_VERSION := 3.0.2 libjpeg-turbo_CHECKSUM := c2ce515a78d91b09023773ef2770d6b0df77d674e144de80d63e0389b3a15ca6 diff --git a/build/patches/vips-8-dlldir-as-libdir.patch b/build/patches/vips-8-dlldir-as-libdir.patch index 7dee8cb5..65939813 100644 --- a/build/patches/vips-8-dlldir-as-libdir.patch +++ b/build/patches/vips-8-dlldir-as-libdir.patch @@ -9,7 +9,7 @@ diff --git a/libvips/include/vips/util.h b/libvips/include/vips/util.h index 1111111..2222222 100644 --- a/libvips/include/vips/util.h +++ b/libvips/include/vips/util.h -@@ -437,6 +437,7 @@ guint32 vips__random(guint32 seed); +@@ -428,6 +428,7 @@ guint32 vips__random(guint32 seed); guint32 vips__random_add(guint32 seed, int value); const char *vips__icc_dir(void); diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch index c5bc1d8a..3964fd0e 100644 --- a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch +++ b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch @@ -14,7 +14,7 @@ new file mode 100644 index 0000000..1111111 --- /dev/null +++ b/compiler/rustc_target/src/spec/targets/armv7_pc_windows_gnullvm.rs -@@ -0,0 +1,18 @@ +@@ -0,0 +1,23 @@ +use crate::spec::{base, FramePointer, Target}; + +pub fn target() -> Target { @@ -26,7 +26,12 @@ index 0000000..1111111 + + Target { + llvm_target: "armv7-pc-windows-gnu".into(), -+ description: None, ++ metadata: crate::spec::TargetMetadata { ++ description: None, ++ tier: None, ++ host_tools: None, ++ std: None, ++ }, + pointer_width: 32, + data_layout: "e-m:w-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(), + arch: "arm".into(), @@ -37,7 +42,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s index 1111111..2222222 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs -@@ -1559,6 +1559,7 @@ supported_targets! { +@@ -1574,6 +1574,7 @@ supported_targets! { ("i686-uwp-windows-gnu", i686_uwp_windows_gnu), ("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu), @@ -138,7 +143,7 @@ index 1111111..2222222 100644 -#![cfg_attr(bootstrap, feature(cfg_target_abi))] #![feature(strict_provenance)] #![cfg_attr(not(target_env = "msvc"), feature(libc))] - #![allow(internal_features)] + #![cfg_attr( diff --git a/library/unwind/src/libunwind.rs b/library/unwind/src/libunwind.rs index 1111111..2222222 100644 --- a/library/unwind/src/libunwind.rs diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk index 76e55376..e02ca652 100644 --- a/build/plugins/llvm-mingw/rust.mk +++ b/build/plugins/llvm-mingw/rust.mk @@ -2,13 +2,13 @@ PKG := rust $(PKG)_WEBSITE := https://www.rust-lang.org/ $(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency. $(PKG)_IGNORE := -# https://static.rust-lang.org/dist/2024-03-09/rustc-nightly-src.tar.xz.sha256 +# https://static.rust-lang.org/dist/2024-03-14/rustc-nightly-src.tar.xz.sha256 $(PKG)_VERSION := nightly -$(PKG)_CHECKSUM := 4f99fe8c9d940a384290e348cf23e6b3821220dc465c6afde370f0a6e5804a34 +$(PKG)_CHECKSUM := 0d70617e70a3f13f5d932c61ade9669d5016f4ae760b400c247c74bce9c0e4b3 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch))) $(PKG)_SUBDIR := $(PKG)c-$($(PKG)_VERSION)-src $(PKG)_FILE := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz -$(PKG)_URL := https://static.rust-lang.org/dist/2024-03-09/$($(PKG)_FILE) +$(PKG)_URL := https://static.rust-lang.org/dist/2024-03-14/$($(PKG)_FILE) $(PKG)_DEPS := $(BUILD)~$(PKG) $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) diff --git a/build/variables.sh b/build/variables.sh index 6e204d34..09a41dbe 100755 --- a/build/variables.sh +++ b/build/variables.sh @@ -2,7 +2,7 @@ vips_package=vips vips_version=8.15 -vips_patch_version=1 +vips_patch_version=2 #vips_pre_version=rc2 if [ -n "$GIT_COMMIT" ]; then diff --git a/build/vips-all.mk b/build/vips-all.mk index 258d820d..6174e851 100644 --- a/build/vips-all.mk +++ b/build/vips-all.mk @@ -2,10 +2,10 @@ PKG := vips-all $(PKG)_WEBSITE := https://libvips.github.io/libvips/ $(PKG)_DESCR := A fast image processing library with low memory needs. $(PKG)_IGNORE := -$(PKG)_VERSION := 8.15.1 -$(PKG)_CHECKSUM := 06811f5aed3e7bc03e63d05537ff4b501de5283108c8ee79396c60601a00830c +$(PKG)_VERSION := 8.15.2 +$(PKG)_CHECKSUM := a2ab15946776ca7721d11cae3215f20f1f097b370ff580cd44fc0f19387aee84 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) -$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz +$(PKG)_GH_CONF := libvips/libvips/releases,v,a,,,.tar.xz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) $(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz $(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \ diff --git a/build/vips-web.mk b/build/vips-web.mk index 094e44e3..76218b4e 100644 --- a/build/vips-web.mk +++ b/build/vips-web.mk @@ -2,10 +2,10 @@ PKG := vips-web $(PKG)_WEBSITE := https://libvips.github.io/libvips/ $(PKG)_DESCR := A fast image processing library with low memory needs. $(PKG)_IGNORE := -$(PKG)_VERSION := 8.15.1 -$(PKG)_CHECKSUM := 06811f5aed3e7bc03e63d05537ff4b501de5283108c8ee79396c60601a00830c +$(PKG)_VERSION := 8.15.2 +$(PKG)_CHECKSUM := a2ab15946776ca7721d11cae3215f20f1f097b370ff580cd44fc0f19387aee84 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) -$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz +$(PKG)_GH_CONF := libvips/libvips/releases,v,a,,,.tar.xz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) $(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz $(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \