Skip to content

Commit d22422b

Browse files
committed
Update for 8.16.0-rc2
- Update GLib to 2.82.2.
1 parent a243662 commit d22422b

7 files changed

+23
-15
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2424
| [fontconfig] | 2.15.0 | [fontconfig Licence] (BSD-like) |
2525
| [freetype] | 2.13.3 | [freetype Licence] (BSD-like) |
2626
| [fribidi] | 1.0.16 | LGPLv3 |
27-
| [glib] | 2.82.1 | LGPLv3 |
27+
| [glib] | 2.82.2 | LGPLv3 |
2828
| [harfbuzz] | 10.0.1 | MIT Licence |
2929
| [highway] | 1.2.0 | Apache-2.0 License, BSD 3-Clause |
3030
| [lcms] | 2.16 | MIT Licence |
@@ -47,8 +47,8 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
4747
| [zlib-ng] | 2.2.2 | [zlib-ng Licence] |
4848

4949
¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.
50-
² libvips is built from the [`v8.16.0-rc1`](https://github.com/libvips/libvips/tree/v8.16.0-rc1) tag, see:
51-
https://github.com/libvips/libvips/releases/tag/v8.16.0-rc1
50+
² libvips is built from the [`v8.16.0-rc2`](https://github.com/libvips/libvips/tree/v8.16.0-rc2) tag, see:
51+
https://github.com/libvips/libvips/releases/tag/v8.16.0-rc2
5252

5353
[aom]: https://aomedia.googlesource.com/aom/
5454
[Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/

build/overrides.mk

+8
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ pango_SUBDIR := pango-$(pango_VERSION)
5959
pango_FILE := pango-$(pango_VERSION).tar.xz
6060
pango_URL := https://download.gnome.org/sources/pango/$(call SHORT_PKG_VERSION,pango)/$(pango_FILE)
6161

62+
# upstream version is 2.82.1
63+
glib_VERSION := 2.82.2
64+
glib_CHECKSUM := ab45f5a323048b1659ee0fbda5cecd94b099ab3e4b9abf26ae06aeb3e781fd63
65+
glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
66+
glib_SUBDIR := glib-$(glib_VERSION)
67+
glib_FILE := glib-$(glib_VERSION).tar.xz
68+
glib_URL := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,glib)/$(glib_FILE)
69+
6270
# upstream version is 1.0.13
6371
# cannot use GH_CONF:
6472
# fribidi_GH_CONF := fribidi/fribidi/releases,v

build/patches/vips-8-dlldir-as-libdir.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c
2121
index 1111111..2222222 100644
2222
--- a/libvips/iofuncs/init.c
2323
+++ b/libvips/iofuncs/init.c
24-
@@ -1211,6 +1211,12 @@ vips_guess_prefix(const char *argv0, const char *env_name)
24+
@@ -1207,6 +1207,12 @@ vips_guess_prefix(const char *argv0, const char *env_name)
2525
const char *
2626
vips_guess_libdir(const char *argv0, const char *env_name)
2727
{
@@ -34,7 +34,7 @@ index 1111111..2222222 100644
3434
const char *prefix = vips_guess_prefix(argv0, env_name);
3535
static char *libdir = NULL;
3636

37-
@@ -1235,6 +1241,7 @@ vips_guess_libdir(const char *argv0, const char *env_name)
37+
@@ -1231,6 +1237,7 @@ vips_guess_libdir(const char *argv0, const char *env_name)
3838
libdir = g_strdup_printf("%s/lib", prefix);
3939

4040
return libdir;

build/patches/vips-8-heifsave-disable-hbr-support.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ index 1111111..2222222 100644
4141
vips_error("heifsave", _("%d-bit colour depth not supported"),
4242
heif->bitdepth);
4343
return -1;
44-
@@ -717,14 +706,10 @@ vips_foreign_save_heif_build(VipsObject *object)
44+
@@ -730,14 +719,10 @@ vips_foreign_save_heif_build(VipsObject *object)
4545
}
4646

4747
#define UC VIPS_FORMAT_UCHAR
@@ -57,7 +57,7 @@ index 1111111..2222222 100644
5757
};
5858

5959
static void
60-
@@ -759,7 +744,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class)
60+
@@ -772,7 +757,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class)
6161
_("Number of bits per pixel"),
6262
VIPS_ARGUMENT_OPTIONAL_INPUT,
6363
G_STRUCT_OFFSET(VipsForeignSaveHeif, bitdepth),
@@ -66,7 +66,7 @@ index 1111111..2222222 100644
6666

6767
VIPS_ARG_BOOL(class, "lossless", 13,
6868
_("Lossless"),
69-
@@ -812,7 +797,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif)
69+
@@ -825,7 +810,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif)
7070
{
7171
heif->ctx = heif_context_alloc();
7272
heif->Q = 50;

build/variables.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
vips_package=vips
44
vips_version=8.16
55
vips_patch_version=0
6-
vips_pre_version=rc1
6+
vips_pre_version=rc2
77

88
if [ -n "$GIT_COMMIT" ]; then
99
vips_version=$GIT_COMMIT

build/vips-all.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
55
$(PKG)_VERSION := 8.16.0
6-
$(PKG)_CHECKSUM := 190b8d8590094cb181a70b29272bbbe8c29729047d998b75ec7ce00adb4310e3
6+
$(PKG)_CHECKSUM := 1e4efe52104f16710cb6608f855641d41c701c45510c6b9f9c5fbb123b74c873
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc2,,,-rc2.tar.xz
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
10-
$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc1.tar.xz
10+
$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc2.tar.xz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \
1212
libjpeg-turbo tiff lcms libexif libheif libpng \
1313
libspng libimagequant highway imagemagick matio openexr \

build/vips-web.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
55
$(PKG)_VERSION := 8.16.0
6-
$(PKG)_CHECKSUM := 190b8d8590094cb181a70b29272bbbe8c29729047d998b75ec7ce00adb4310e3
6+
$(PKG)_CHECKSUM := 1e4efe52104f16710cb6608f855641d41c701c45510c6b9f9c5fbb123b74c873
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc2,,,-rc2.tar.xz
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
10-
$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc1.tar.xz
10+
$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc2.tar.xz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \
1212
libjpeg-turbo tiff lcms libexif libheif libpng \
1313
libspng libimagequant highway cgif

0 commit comments

Comments
 (0)