Update for 8.12.0

- Update highway to 0.15.0. - Update ImageMagick to 6.9.11-29.
libvips · Nov 20, 2021 · cacfd12 · cacfd12
1 parent f5512e9
commit cacfd12
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [librsvg]       | 2.52.4    | LGPLv3                                                       |
 | [libspng]       | 0.7.0     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.3.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.12.0²   | LGPLv3                                                       |
+| [libvips]       | 8.12.0    | LGPLv3                                                       |
 | [libwebp]       | 1.2.1     | New BSD License                                              |
 | [libxml2]       | 2.9.12    | MIT Licence                                                  |
 | [mozjpeg]       | 4.0.3     | [zlib License, IJG License, BSD-3-Clause]                    |
@@ -48,8 +48,6 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [zlib-ng]       | 2.0.5     | [zlib-ng Licence]                                            |
 
 ¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.  
-² libvips is built from the [`v8.12.0-rc1`](https://github.com/libvips/libvips/tree/v8.12.0-rc1) tag, see:
-https://github.com/libvips/libvips/releases/tag/v8.12.0-rc1
 
 [aom]: https://aomedia.googlesource.com/aom/
 [Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/
@@ -98,8 +96,8 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
 | [cfitsio]       | 4.0.0     | BSD-like                                                     |
 | [fftw]          | 3.3.10    | GPLv2                                                        |
-| [highway]       | 0.14.2    | Apache-2.0 License                                           |
-| [imagemagick]   | 6.9.12-28 | [ImageMagick License] (Apache-2.0-like)                      |
+| [highway]       | 0.15.0    | Apache-2.0 License                                           |
+| [imagemagick]   | 6.9.12-29 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.3     | BSD 3-Clause                                                 |
 | [libjxl]        | 0.6.1     | BSD 3-Clause                                                 |
 | [matio]         | 1.5.21    | 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  := 0.14.2
-$(PKG)_CHECKSUM := 58f7f3a12394341796fbb3045d18020474cb214ef85b9a50bbaaa809e34e9232
+$(PKG)_VERSION  := 0.15.0
+$(PKG)_CHECKSUM := 4bbd4439eae08cf038f1c5cc5d9ebc6a1a50f2c610c13a1483adccacfa24c150
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/highway-[0-9]*.patch)))
 $(PKG)_GH_CONF  := google/highway/tags
 $(PKG)_DEPS     := cc

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -40,8 +40,8 @@ matio_FILE     := matio-$(matio_VERSION).tar.gz
 matio_URL      := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
 
 # upstream version is 7, we want ImageMagick 6
-imagemagick_VERSION  := 6.9.12-28
-imagemagick_CHECKSUM := 31564e017110287d675bb997233b73a6fb5bd62671ca7f708503d26232f8598b
+imagemagick_VERSION  := 6.9.12-29
+imagemagick_CHECKSUM := c1dd81b3f7f8875c3c7a1a73029b3ca6c6b60769bdd9500aa574158949ccac6e
 imagemagick_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
 imagemagick_GH_CONF  := ImageMagick/ImageMagick6/tags
 

diff --git a/build/patches/libheif-1-fixes.patch b/build/patches/libheif-1-fixes.patch
@@ -96,7 +96,7 @@ diff --git a/libheif/heif_colorconversion.cc b/libheif/heif_colorconversion.cc
 index 1111111..2222222 100644
 --- a/libheif/heif_colorconversion.cc
 +++ b/libheif/heif_colorconversion.cc
-@@ -306,7 +306,7 @@ static inline uint8_t clip_int_u8(int x)
+@@ -303,7 +303,7 @@ static inline uint8_t clip_int_u8(int x)
 
  static inline uint16_t clip_f_u16(float fx, int32_t maxi)
  {
@@ -105,7 +105,7 @@ index 1111111..2222222 100644
    if (x < 0) return 0;
    if (x > maxi) return (uint16_t) maxi;
    return static_cast<uint16_t>(x);
-@@ -1961,7 +1961,7 @@ Op_RGB24_32_to_YCbCr::state_after_conversion(ColorState input_state,
+@@ -1937,7 +1937,7 @@ Op_RGB24_32_to_YCbCr::state_after_conversion(ColorState input_state,
 
  static inline uint8_t clip_f_u8(float fx)
  {

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
-@@ -1224,6 +1224,12 @@ vips_guess_prefix( const char *argv0, const char *env_name )
+@@ -1227,6 +1227,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;
 
-@@ -1248,6 +1254,7 @@ vips_guess_libdir( const char *argv0, const char *env_name )
+@@ -1251,6 +1257,7 @@ vips_guess_libdir( const char *argv0, const char *env_name )
  		libdir = g_strdup_printf( "%s/lib", prefix );
 
  	return( libdir );

diff --git a/build/variables.sh b/build/variables.sh
@@ -3,7 +3,7 @@
 vips_package=vips
 vips_version=8.12
 vips_patch_version=0
-vips_pre_version=rc1
+#vips_pre_version=rc1
 
 # build-win64-mxe/build dir we are building
 work_dir=$(pwd)

diff --git a/build/vips-all.mk b/build/vips-all.mk
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.12.0
-$(PKG)_CHECKSUM := f19948eaa8663e3d1734ad681cc353db79dd12147bb9e6aec7d942645bb4dd14
+$(PKG)_CHECKSUM := 8abe9364990b64a95cd4cbe36614b1f8b5d5f0b480e6118128f83ffc2a9ae19d
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc1,,,-rc1.tar.gz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc1.tar.gz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := cc libwebp librsvg glib pango libgsf \
                    libjpeg-turbo tiff lcms libexif libheif libpng \
                    libspng libimagequant orc imagemagick matio openexr \

diff --git a/build/vips-web.mk b/build/vips-web.mk
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.12.0
-$(PKG)_CHECKSUM := f19948eaa8663e3d1734ad681cc353db79dd12147bb9e6aec7d942645bb4dd14
+$(PKG)_CHECKSUM := 8abe9364990b64a95cd4cbe36614b1f8b5d5f0b480e6118128f83ffc2a9ae19d
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc1,,,-rc1.tar.gz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc1.tar.gz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := cc libwebp librsvg glib pango libgsf \
                    libjpeg-turbo tiff lcms libexif libheif libpng \
                    libspng libimagequant orc cgif