Update for 8.16.0-rc2

- Update GLib to 2.82.2.
libvips · Oct 20, 2024 · d22422b · d22422b
1 parent a243662
commit d22422b
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [fontconfig]    | 2.15.0    | [fontconfig Licence] (BSD-like)                              |
 | [freetype]      | 2.13.3    | [freetype Licence] (BSD-like)                                |
 | [fribidi]       | 1.0.16    | LGPLv3                                                       |
-| [glib]          | 2.82.1    | LGPLv3                                                       |
+| [glib]          | 2.82.2    | LGPLv3                                                       |
 | [harfbuzz]      | 10.0.1    | MIT Licence                                                  |
 | [highway]       | 1.2.0     | Apache-2.0 License, BSD 3-Clause                             |
 | [lcms]          | 2.16      | MIT Licence                                                  |
@@ -47,8 +47,8 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [zlib-ng]       | 2.2.2     | [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.16.0-rc1`](https://github.com/libvips/libvips/tree/v8.16.0-rc1) tag, see:
-https://github.com/libvips/libvips/releases/tag/v8.16.0-rc1
+² libvips is built from the [`v8.16.0-rc2`](https://github.com/libvips/libvips/tree/v8.16.0-rc2) tag, see:
+https://github.com/libvips/libvips/releases/tag/v8.16.0-rc2
 
 [aom]: https://aomedia.googlesource.com/aom/
 [Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -59,6 +59,14 @@ pango_SUBDIR   := pango-$(pango_VERSION)
 pango_FILE     := pango-$(pango_VERSION).tar.xz
 pango_URL      := https://download.gnome.org/sources/pango/$(call SHORT_PKG_VERSION,pango)/$(pango_FILE)
 
+# upstream version is 2.82.1
+glib_VERSION  := 2.82.2
+glib_CHECKSUM := ab45f5a323048b1659ee0fbda5cecd94b099ab3e4b9abf26ae06aeb3e781fd63
+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 1.0.13
 # cannot use GH_CONF:
 # fribidi_GH_CONF  := fribidi/fribidi/releases,v

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
-@@ -1211,6 +1211,12 @@ vips_guess_prefix(const char *argv0, const char *env_name)
+@@ -1207,6 +1207,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;
 
-@@ -1235,6 +1241,7 @@ vips_guess_libdir(const char *argv0, const char *env_name)
+@@ -1231,6 +1237,7 @@ vips_guess_libdir(const char *argv0, const char *env_name)
  		libdir = g_strdup_printf("%s/lib", prefix);
 
  	return libdir;

diff --git a/build/patches/vips-8-heifsave-disable-hbr-support.patch b/build/patches/vips-8-heifsave-disable-hbr-support.patch
@@ -41,7 +41,7 @@ index 1111111..2222222 100644
  		vips_error("heifsave", _("%d-bit colour depth not supported"),
  			heif->bitdepth);
  		return -1;
-@@ -717,14 +706,10 @@ vips_foreign_save_heif_build(VipsObject *object)
+@@ -730,14 +719,10 @@ vips_foreign_save_heif_build(VipsObject *object)
  }
 
  #define UC VIPS_FORMAT_UCHAR
@@ -57,7 +57,7 @@ index 1111111..2222222 100644
  };
 
  static void
-@@ -759,7 +744,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class)
+@@ -772,7 +757,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class)
  		_("Number of bits per pixel"),
  		VIPS_ARGUMENT_OPTIONAL_INPUT,
  		G_STRUCT_OFFSET(VipsForeignSaveHeif, bitdepth),
@@ -66,7 +66,7 @@ index 1111111..2222222 100644
 
  	VIPS_ARG_BOOL(class, "lossless", 13,
  		_("Lossless"),
-@@ -812,7 +797,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif)
+@@ -825,7 +810,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif)
  {
  	heif->ctx = heif_context_alloc();
  	heif->Q = 50;

diff --git a/build/variables.sh b/build/variables.sh
@@ -3,7 +3,7 @@
 vips_package=vips
 vips_version=8.16
 vips_patch_version=0
-vips_pre_version=rc1
+vips_pre_version=rc2
 
 if [ -n "$GIT_COMMIT" ]; then
   vips_version=$GIT_COMMIT

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.16.0
-$(PKG)_CHECKSUM := 190b8d8590094cb181a70b29272bbbe8c29729047d998b75ec7ce00adb4310e3
+$(PKG)_CHECKSUM := 1e4efe52104f16710cb6608f855641d41c701c45510c6b9f9c5fbb123b74c873
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc2,,,-rc2.tar.xz
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc1.tar.xz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc2.tar.xz
 $(PKG)_DEPS     := cc meson-wrapper libwebp librsvg glib pango libarchive \
                    libjpeg-turbo tiff lcms libexif libheif libpng \
                    libspng libimagequant highway 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.16.0
-$(PKG)_CHECKSUM := 190b8d8590094cb181a70b29272bbbe8c29729047d998b75ec7ce00adb4310e3
+$(PKG)_CHECKSUM := 1e4efe52104f16710cb6608f855641d41c701c45510c6b9f9c5fbb123b74c873
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc2,,,-rc2.tar.xz
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc1.tar.xz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc2.tar.xz
 $(PKG)_DEPS     := cc meson-wrapper libwebp librsvg glib pango libarchive \
                    libjpeg-turbo tiff lcms libexif libheif libpng \
                    libspng libimagequant highway cgif