From 0d094c1d41e595b2c77b4d8ece84f2525ac62e6e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:47:17 +0200 Subject: [PATCH] package/libheif: bump version to 1.18.1 Removed patch which is included in this release: https://github.com/strukturag/libheif/commit/4944d7d47cc537681d6836e8c77db179f63af005 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ns-encoder_jpeg.cc-fix-libjpeg-build.patch | 47 ------------------- package/libheif/libheif.hash | 2 +- package/libheif/libheif.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch diff --git a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch deleted file mode 100644 index 5245327fe7..0000000000 --- a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 33eb948240365434c845b618854403e82a229012 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 31 Jan 2024 21:04:37 +0100 -Subject: [PATCH] libheif/plugins/encoder_jpeg.cc: fix libjpeg build - -Fix the following libjpeg build failure raised since version 1.17.0 and -https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 -because third argument of jpeg_mem_dest is defined as size_t* on libjpeg -instead of unsigned long* on jpeg-turbo: - -/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': -/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] - 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); - | ^~~~~~~~~~ - | | - | long unsigned int* - -Fix #1008 and #1086 - -Fixes: - - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/strukturag/libheif/pull/1120 ---- - libheif/plugins/encoder_jpeg.cc | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/libheif/plugins/encoder_jpeg.cc b/libheif/plugins/encoder_jpeg.cc -index d6c7854..21a5541 100644 ---- a/libheif/plugins/encoder_jpeg.cc -+++ b/libheif/plugins/encoder_jpeg.cc -@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image* - } - - uint8_t* outbuffer = nullptr; -+#ifdef LIBJPEG_TURBO_VERSION - unsigned long outlength = 0; -+#else -+ size_t outlength = 0; -+#endif - - jpeg_create_compress(&cinfo); - jpeg_mem_dest(&cinfo, &outbuffer, &outlength); --- -2.43.0 - diff --git a/package/libheif/libheif.hash b/package/libheif/libheif.hash index a2ca065b7a..ed1a083d7c 100644 --- a/package/libheif/libheif.hash +++ b/package/libheif/libheif.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8390baf4913eda0a183e132cec62b875fb2ef507ced5ddddc98dfd2f17780aee libheif-1.17.6.tar.gz +sha256 8702564b0f288707ea72b260b3bf4ba9bf7abfa7dac01353def3a86acd6bbb76 libheif-1.18.1.tar.gz sha256 b2eb4f6588b005bebac44cfb2dfd23f6a16c5ca9b8a619a315158b0215a917a3 COPYING diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk index 908e2ce068..e2c3a328bc 100644 --- a/package/libheif/libheif.mk +++ b/package/libheif/libheif.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHEIF_VERSION = 1.17.6 +LIBHEIF_VERSION = 1.18.1 LIBHEIF_SITE = https://github.com/strukturag/libheif/releases/download/v$(LIBHEIF_VERSION) LIBHEIF_LICENSE = LGPL-3.0+ LIBHEIF_LICENSE_FILES = COPYING