diff --git a/README.md b/README.md index 48e9087..3945fb8 100644 --- 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.59.1 | LGPLv3 | | [libspng] | 0.7.4 | BSD 2-Clause | | [libtiff] | 4.7.0 | [libtiff License] (BSD-like) | -| [libvips] | 8.15.3 | LGPLv3 | +| [libvips] | 8.15.5² | LGPLv3 | | [libwebp] | 1.4.0 | New BSD License | | [libxml2] | 2.13.4 | MIT Licence | | [mozjpeg] | 4.1.5 | [zlib License, IJG License, BSD-3-Clause] | @@ -47,6 +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.15.5-rc1`](https://github.com/libvips/libvips/tree/v8.15.5-rc1) tag, see: +https://github.com/libvips/libvips/releases/tag/v8.15.5-rc1 [aom]: https://aomedia.googlesource.com/aom/ [Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/ diff --git a/build/patches/vips-8-heifsave-disable-hbr-support.patch b/build/patches/vips-8-heifsave-disable-hbr-support.patch index 7461f89..15c9403 100644 --- a/build/patches/vips-8-heifsave-disable-hbr-support.patch +++ b/build/patches/vips-8-heifsave-disable-hbr-support.patch @@ -18,27 +18,30 @@ diff --git a/libvips/foreign/heifsave.c b/libvips/foreign/heifsave.c index 1111111..2222222 100644 --- a/libvips/foreign/heifsave.c +++ b/libvips/foreign/heifsave.c -@@ -525,15 +525,10 @@ vips_foreign_save_heif_build(VipsObject *object) +@@ -532,20 +532,9 @@ vips_foreign_save_heif_build(VipsObject *object) !vips_object_argument_isset(object, "subsample_mode")) heif->subsample_mode = VIPS_FOREIGN_SUBSAMPLE_OFF; -- /* Default 12 bit save for 16-bit images. HEIC (for example) implements -- * 8 / 10 / 12. -- */ +- /* Default 12 bit save for 16-bit images. ++ /* Prebuilt binaries support a bitdepth of 8 only. + */ - if (!vips_object_argument_isset(object, "bitdepth")) - heif->bitdepth = - save->ready->Type == VIPS_INTERPRETATION_RGB16 || - save->ready->Type == VIPS_INTERPRETATION_GREY16 - ? 12 - : 8; +- +- /* HEIC and AVIF only implements 8 / 10 / 12 bit depth. +- */ +- if (heif->bitdepth != 12 && +- heif->bitdepth != 10 && +- heif->bitdepth != 8) { + if (heif->bitdepth != 8) { -+ g_warning("heifsave: prebuilt binaries support a bitdepth of 8 only"); -+ heif->bitdepth = 8; -+ } - - /* Try to find the selected encoder. - */ -@@ -675,14 +670,10 @@ vips_foreign_save_heif_build(VipsObject *object) + vips_error("heifsave", _("%d-bit colour depth not supported"), + heif->bitdepth); + return -1; +@@ -691,14 +680,10 @@ vips_foreign_save_heif_build(VipsObject *object) } #define UC VIPS_FORMAT_UCHAR @@ -54,16 +57,16 @@ index 1111111..2222222 100644 }; static void -@@ -717,7 +708,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class) +@@ -733,7 +718,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class) _("Number of bits per pixel"), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET(VipsForeignSaveHeif, bitdepth), -- 1, 16, 12); -+ 1, 16, 8); +- 8, 12, 12); ++ 8, 12, 8); VIPS_ARG_BOOL(class, "lossless", 13, _("Lossless"), -@@ -770,7 +761,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif) +@@ -786,7 +771,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 index 755ffd9..aa44cd7 100755 --- a/build/variables.sh +++ b/build/variables.sh @@ -2,8 +2,8 @@ vips_package=vips vips_version=8.15 -vips_patch_version=3 -#vips_pre_version=rc2 +vips_patch_version=5 +vips_pre_version=rc1 if [ -n "$GIT_COMMIT" ]; then vips_version=$GIT_COMMIT diff --git a/build/vips-all.mk b/build/vips-all.mk index 60df4e4..b966f1a 100644 --- a/build/vips-all.mk +++ b/build/vips-all.mk @@ -2,12 +2,12 @@ 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.15.3 -$(PKG)_CHECKSUM := 3e27d9f536eafad64013958fe9e8a1964c90b564c731d49db7c1a1c11b1052a0 +$(PKG)_VERSION := 8.15.5 +$(PKG)_CHECKSUM := 7c59d20996373482fe55ebf7999ba605e74540fadd647894b17fa35ebf2f50b7 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) -$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz +$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) -$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz +$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc1.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 index 33e0348..035d6f7 100644 --- a/build/vips-web.mk +++ b/build/vips-web.mk @@ -2,12 +2,12 @@ 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.15.3 -$(PKG)_CHECKSUM := 3e27d9f536eafad64013958fe9e8a1964c90b564c731d49db7c1a1c11b1052a0 +$(PKG)_VERSION := 8.15.5 +$(PKG)_CHECKSUM := 7c59d20996373482fe55ebf7999ba605e74540fadd647894b17fa35ebf2f50b7 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) -$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz +$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) -$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz +$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc1.tar.xz $(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \ libjpeg-turbo tiff lcms libexif libheif libpng \ libspng libimagequant highway cgif