Skip to content

Commit 02bd6f2

Browse files
kleisaukekleisauke
committed
Dependency version bumps
- Update libxml2 to 2.10.2. - Update highway to 1.0.1. - Update ImageMagick to 6.9.12-62.
1 parent 31423d1 commit 02bd6f2

File tree

9 files changed

+24
-48
lines changed

9 files changed

+24
-48
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
3939
| [libtiff] | 4.4.0 | [libtiff License] (BSD-like) |
4040
| [libvips] | 8.13.0 | LGPLv3 |
4141
| [libwebp] | 1.2.4 | New BSD License |
42-
| [libxml2] | 2.10.0 | MIT Licence |
42+
| [libxml2] | 2.10.2 | MIT Licence |
4343
| [mozjpeg] | 4.1.1 | [zlib License, IJG License, BSD-3-Clause] |
4444
| [orc] | 0.4.32 | [orc License] (BSD-like) |
4545
| [pango] | 1.50.9 | LGPLv3 |
@@ -96,8 +96,8 @@ Same as libvips-web + these extra dependencies:
9696
| [brotli] | 1.0.9 | MIT Licence |
9797
| [cfitsio] | 4.1.0 | BSD-like |
9898
| [fftw] | 3.3.10 | GPLv2 |
99-
| [highway] | 1.0.0 | Apache-2.0 License |
100-
| [imagemagick] | 6.9.12-59 | [ImageMagick License] (Apache-2.0-like) |
99+
| [highway] | 1.0.1 | Apache-2.0 License |
100+
| [imagemagick] | 6.9.12-62 | [ImageMagick License] (Apache-2.0-like) |
101101
| [imath] | 3.1.5 | BSD 3-Clause |
102102
| [libjxl] | 0.7² | BSD 3-Clause |
103103
| [matio] | 1.5.23 | BSD 2-Clause |

‎build/highway.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG := highway
22
$(PKG)_WEBSITE := https://github.com/google/highway
33
$(PKG)_DESCR := Performance-portable, length-agnostic SIMD with runtime dispatch
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 1.0.0
6-
$(PKG)_CHECKSUM := ab4f5f864932268356f9f6aa86f612fa4430a7db3c8de0391076750197e876b8
5+
$(PKG)_VERSION := 1.0.1
6+
$(PKG)_CHECKSUM := 7ca6af7dc2e3e054de9e17b9dfd88609a7fd202812b1c216f43cc41647c97311
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_GH_CONF := google/highway/tags
99
$(PKG)_DEPS := cc

‎build/overrides.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ gdk-pixbuf_URL := https://download.gnome.org/sources/gdk-pixbuf/$(call SHOR
2121

2222
# no longer needed by libvips, but some of the deps need it
2323
# upstream version is 2.9.12
24-
libxml2_VERSION := 2.10.0
25-
libxml2_CHECKSUM := 2dd33110ea778676de14bea4999ee1173c4ca55d5ff1452bca224e06f0152595
24+
libxml2_VERSION := 2.10.2
25+
libxml2_CHECKSUM := d240abe6da9c65cb1900dd9bf3a3501ccf88b3c2a1cb98317d03f272dda5b265
2626
libxml2_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libxml2-[0-9]*.patch)))
2727
libxml2_SUBDIR := libxml2-$(libxml2_VERSION)
2828
libxml2_FILE := libxml2-$(libxml2_VERSION).tar.xz
@@ -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-59
43-
imagemagick_CHECKSUM := 116cb21653ec613fcf356e9fc1dcd855ddcef0d2b5482e6d721cb714aaafb380
42+
imagemagick_VERSION := 6.9.12-62
43+
imagemagick_CHECKSUM := 21eb4c5a4f0f9e76f1e67fb6a20f7b1e4374346ed9351bec9898f370d7b2f035
4444
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
4545
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
4646

‎build/package-vipsdev.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ fi
173173

174174
echo "Copying packaging files"
175175

176-
cp $install_dir/vips-packaging/{AUTHORS,ChangeLog,COPYING,README.md,versions.json} $repackage_dir
176+
for file in AUTHORS ChangeLog COPYING LICENSE README.md versions.json; do
177+
[ -e "$install_dir/vips-packaging/$file" ] && cp $install_dir/vips-packaging/$file $repackage_dir
178+
done
177179

178180
zipfile=$vips_package-dev-$arch-$deps-$vips_version${vips_patch_version:+.$vips_patch_version}$zip_suffix.zip
179181

‎build/patches/highway-1-fixes.patch‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s
6262
index 1111111..2222222 100644
6363
--- a/compiler/rustc_target/src/spec/mod.rs
6464
+++ b/compiler/rustc_target/src/spec/mod.rs
65-
@@ -955,7 +955,9 @@ supported_targets! {
65+
@@ -1006,7 +1006,9 @@ supported_targets! {
6666
("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
6767

6868
("aarch64-pc-windows-gnullvm", aarch64_pc_windows_gnullvm),
@@ -94,11 +94,11 @@ ld.lld: error: undefined symbol: _Unwind_VRS_Set
9494

9595
Upstream-Status: Pending
9696

97-
diff --git a/library/panic_unwind/src/gcc.rs b/library/panic_unwind/src/gcc.rs
97+
diff --git a/library/std/src/personality/gcc.rs b/library/std/src/personality/gcc.rs
9898
index 1111111..2222222 100644
99-
--- a/library/panic_unwind/src/gcc.rs
100-
+++ b/library/panic_unwind/src/gcc.rs
101-
@@ -131,7 +131,7 @@ const UNWIND_DATA_REG: (i32, i32) = (10, 11); // x10, x11
99+
--- a/library/std/src/personality/gcc.rs
100+
+++ b/library/std/src/personality/gcc.rs
101+
@@ -81,7 +81,7 @@ const UNWIND_DATA_REG: (i32, i32) = (10, 11); // x10, x11
102102
// https://github.com/gcc-mirror/gcc/blob/trunk/libgcc/unwind-c.c
103103

104104
cfg_if::cfg_if! {

‎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/2022-08-18/rustc-nightly-src.tar.xz.sha256
5+
# https://static.rust-lang.org/dist/2022-08-30/rustc-nightly-src.tar.xz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := 23087c23498b3f4284b1b203d095b891bf866e0aded919699729af61110e28fd
7+
$(PKG)_CHECKSUM := 2f682fc0dbb88b56f3a556cabd5ac7c9a521fde8eaaf58cebfd4e0262838c3ce
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/2022-08-18/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2022-08-30/$($(PKG)_FILE)
1212
$(PKG)_DEPS := $(BUILD)~$(PKG)
1313
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1414

‎build/vips-all.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ $(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libgsf \
1616
define $(PKG)_PRE_CONFIGURE
1717
# Copy some files to the packaging directory
1818
mkdir -p $(PREFIX)/$(TARGET)/vips-packaging
19-
$(foreach f, COPYING ChangeLog README.md AUTHORS, \
20-
cp '$(SOURCE_DIR)/$(f)' '$(PREFIX)/$(TARGET)/vips-packaging';)
19+
$(foreach f, AUTHORS ChangeLog COPYING LICENSE README.md, \
20+
[ -e '$(SOURCE_DIR)/$(f)' ] && cp '$(SOURCE_DIR)/$(f)' '$(PREFIX)/$(TARGET)/vips-packaging';)
2121

2222
(printf '{\n'; \
2323
printf ' "aom": "$(aom_VERSION)",\n'; \

‎build/vips-web.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ $(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libgsf \
1515
define $(PKG)_PRE_CONFIGURE
1616
# Copy some files to the packaging directory
1717
mkdir -p $(PREFIX)/$(TARGET)/vips-packaging
18-
$(foreach f, COPYING ChangeLog README.md AUTHORS, \
19-
cp '$(SOURCE_DIR)/$(f)' '$(PREFIX)/$(TARGET)/vips-packaging';)
18+
$(foreach f, AUTHORS ChangeLog COPYING LICENSE README.md, \
19+
[ -e '$(SOURCE_DIR)/$(f)' ] && cp '$(SOURCE_DIR)/$(f)' '$(PREFIX)/$(TARGET)/vips-packaging';)
2020

2121
(printf '{\n'; \
2222
printf ' "aom": "$(aom_VERSION)",\n'; \

0 commit comments

Comments
 (0)