Update for 8.14.2

- Update librsvg to 2.56.0. - Update zlib-ng 2.0.7. - Update highway to 1.0.4. - Update ImageMagick to 6.9.12-82.
libvips · Mar 21, 2023 · 96c2b87 · 96c2b87
1 parent a431b67
commit 96c2b87
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -33,18 +33,18 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [libheif]       | 1.15.1    | LGPLv3                                                       |
 | [libimagequant] | 2.4.1¹    | BSD 2-Clause                                                 |
 | [libpng]        | 1.6.39    | [libpng License version 2]                                   |
-| [librsvg]       | 2.55.92   | LGPLv3                                                       |
+| [librsvg]       | 2.56.0    | LGPLv3                                                       |
 | [libspng]       | 0.7.3     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.5.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.14.1    | LGPLv3                                                       |
+| [libvips]       | 8.14.2    | LGPLv3                                                       |
 | [libwebp]       | 1.3.0     | New BSD License                                              |
 | [libxml2]       | 2.10.3    | MIT Licence                                                  |
 | [mozjpeg]       | 4.1.1     | [zlib License, IJG License, BSD-3-Clause]                    |
 | [orc]           | 0.4.33    | [orc License] (BSD-like)                                     |
 | [pango]         | 1.50.14   | LGPLv3                                                       |
 | [pixman]        | 0.42.2    | MIT Licence                                                  |
 | [proxy-libintl] | 0.4       | LGPLv3                                                       |
-| [zlib-ng]       | 2.0.6     | [zlib-ng Licence]                                            |
+| [zlib-ng]       | 2.0.7     | [zlib-ng Licence]                                            |
 
 ¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.  
 
@@ -94,8 +94,8 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
 | [cfitsio]       | 4.2.0     | BSD-like                                                     |
 | [fftw]          | 3.3.10    | GPLv2                                                        |
-| [highway]       | 1.0.3     | Apache-2.0 License                                           |
-| [imagemagick]   | 6.9.12-80 | [ImageMagick License] (Apache-2.0-like)                      |
+| [highway]       | 1.0.4     | Apache-2.0 License                                           |
+| [imagemagick]   | 6.9.12-82 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.7     | BSD 3-Clause                                                 |
 | [libjxl]        | 0.8.1     | BSD 3-Clause                                                 |
 | [matio]         | 1.5.23    | BSD 2-Clause                                                 |

diff --git a/build/highway.mk b/build/highway.mk
@@ -2,8 +2,8 @@ PKG             := highway
 $(PKG)_WEBSITE  := https://github.com/google/highway
 $(PKG)_DESCR    := Performance-portable, length-agnostic SIMD with runtime dispatch
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.3
-$(PKG)_CHECKSUM := 566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e
+$(PKG)_VERSION  := 1.0.4
+$(PKG)_CHECKSUM := faccd343935c9e98afd1016e9d20e0b8b89d908508d1af958496f8c2d3004ac2
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_GH_CONF  := google/highway/tags
 $(PKG)_DEPS     := cc

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -29,8 +29,8 @@ libxml2_FILE     := libxml2-$(libxml2_VERSION).tar.xz
 libxml2_URL      := https://download.gnome.org/sources/libxml2/$(call SHORT_PKG_VERSION,libxml2)/$(libxml2_FILE)
 
 # upstream version is 7, we want ImageMagick 6
-imagemagick_VERSION  := 6.9.12-80
-imagemagick_CHECKSUM := 8dd537e833c36e1aa732d817eb6cbef82bf37fbee344b95bc1817e6fc3ced5f0
+imagemagick_VERSION  := 6.9.12-82
+imagemagick_CHECKSUM := 54721e7933f415a3d7e61a5ebe7d2cc81b26951c54187722c7f5fc88da525a75
 imagemagick_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
 imagemagick_GH_CONF  := ImageMagick/ImageMagick6/tags
 
@@ -43,8 +43,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.55.92
-librsvg_CHECKSUM := aaf806a388ac82c82e450d1565e9fbf76e0113cc5c82e13e3ce832f9f23e3cd2
+librsvg_VERSION  := 2.56.0
+librsvg_CHECKSUM := 194b5097d9cd107495f49c291cf0da65ec2b4bb55e5628369751a3f44ba222b3
 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

diff --git a/build/patches/vips-8-dlldir-as-libdir.patch b/build/patches/vips-8-dlldir-as-libdir.patch
@@ -21,7 +21,7 @@ diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c
 index 1111111..2222222 100644
 --- a/libvips/iofuncs/init.c
 +++ b/libvips/iofuncs/init.c
-@@ -1205,6 +1205,12 @@ vips_guess_prefix( const char *argv0, const char *env_name )
+@@ -1200,6 +1200,12 @@ vips_guess_prefix( const char *argv0, const char *env_name )
  const char *
  vips_guess_libdir( const char *argv0, const char *env_name )
  {
@@ -34,7 +34,7 @@ index 1111111..2222222 100644
  	const char *prefix = vips_guess_prefix( argv0, env_name );
  	static char *libdir = NULL;
 
-@@ -1229,6 +1235,7 @@ vips_guess_libdir( const char *argv0, const char *env_name )
+@@ -1224,6 +1230,7 @@ vips_guess_libdir( const char *argv0, const char *env_name )
  		libdir = g_strdup_printf( "%s/lib", prefix );
 
  	return( libdir );

diff --git 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/2023-03-18/rustc-nightly-src.tar.xz.sha256
+# https://static.rust-lang.org/dist/2023-03-21/rustc-nightly-src.tar.xz.sha256
 $(PKG)_VERSION  := nightly
-$(PKG)_CHECKSUM := 9e59efd134cd76ff7acb6f6f5f702ba764f4144a2e7d8514882d5b8da063e8fe
+$(PKG)_CHECKSUM := c2893a1709f6860a3f55d67c055fe544cbb340feeeb1e7f399783216e89f5815
 $(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/2023-03-18/$($(PKG)_FILE)
+$(PKG)_URL      := https://static.rust-lang.org/dist/2023-03-21/$($(PKG)_FILE)
 $(PKG)_DEPS     := $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 

diff --git a/build/plugins/zlib-ng/patches/zlib-ng-2-fixes.patch b/build/plugins/zlib-ng/patches/zlib-ng-2-fixes.patch
@@ -12,7 +12,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 1111111..2222222 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1008,7 +1008,12 @@ endforeach()
+@@ -1022,7 +1022,12 @@ endforeach()
  if(WIN32)
      # Shared library
      if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)

diff --git a/build/plugins/zlib-ng/zlib-ng.mk b/build/plugins/zlib-ng/zlib-ng.mk
@@ -2,8 +2,8 @@ PKG             := zlib-ng
 $(PKG)_WEBSITE  := https://github.com/zlib-ng/zlib-ng
 $(PKG)_DESCR    := zlib replacement with optimizations for "next generation" systems.
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.0.6
-$(PKG)_CHECKSUM := 8258b75a72303b661a238047cb348203d88d9dddf85d480ed885f375916fcab6
+$(PKG)_VERSION  := 2.0.7
+$(PKG)_CHECKSUM := 6c0853bb27738b811f2b4d4af095323c3d5ce36ceed6b50e5f773204fb8f7200
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_GH_CONF  := zlib-ng/zlib-ng/tags
 $(PKG)_DEPS     := cc

diff --git a/build/variables.sh b/build/variables.sh
@@ -2,7 +2,7 @@
 
 vips_package=vips
 vips_version=8.14
-vips_patch_version=1
+vips_patch_version=2
 #vips_pre_version=rc1
 
 if [ -n "$GIT_COMMIT" ]; then

diff --git a/build/vips-all.mk b/build/vips-all.mk
@@ -2,8 +2,8 @@ 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.14.1
-$(PKG)_CHECKSUM := 5abde2a61f99ced7be4c32ccb13a654256eb7a0f6f0520ab61cc11412a1233fa
+$(PKG)_VERSION  := 8.14.2
+$(PKG)_CHECKSUM := 27dad021f0835a5ab14e541d02abd41e4c3bd012d2196438df5a9e754984f7ce
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
 $(PKG)_GH_CONF  := libvips/libvips/releases,v,,,,.tar.xz
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)

diff --git a/build/vips-web.mk b/build/vips-web.mk
@@ -2,8 +2,8 @@ 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.14.1
-$(PKG)_CHECKSUM := 5abde2a61f99ced7be4c32ccb13a654256eb7a0f6f0520ab61cc11412a1233fa
+$(PKG)_VERSION  := 8.14.2
+$(PKG)_CHECKSUM := 27dad021f0835a5ab14e541d02abd41e4c3bd012d2196438df5a9e754984f7ce
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
 $(PKG)_GH_CONF  := libvips/libvips/releases,v,,,,.tar.xz
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)