From d667e63a80b087b401c87199d3229997be1d5558 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 23 May 2023 19:42:37 -0700 Subject: [PATCH] depends: libheif: update to 1.16.1 Signed-off-by: Lukas Rusak --- .../common/libheif/01-windows-warnings.patch | 28 ++++++++----------- ....patch => 02-fix-static-win-linkage.patch} | 0 depends/common/libheif/02-remove-werror.patch | 10 ------- .../libheif/03-disable-gdk-pixbuf.patch | 8 ------ depends/common/libheif/flags.txt | 2 +- depends/common/libheif/libheif.sha256 | 2 +- depends/common/libheif/libheif.txt | 2 +- 7 files changed, 14 insertions(+), 38 deletions(-) rename depends/common/libheif/{04-fix-static-win-linkage.patch => 02-fix-static-win-linkage.patch} (100%) delete mode 100644 depends/common/libheif/02-remove-werror.patch delete mode 100644 depends/common/libheif/03-disable-gdk-pixbuf.patch diff --git a/depends/common/libheif/01-windows-warnings.patch b/depends/common/libheif/01-windows-warnings.patch index 61069ac..c048fe7 100644 --- a/depends/common/libheif/01-windows-warnings.patch +++ b/depends/common/libheif/01-windows-warnings.patch @@ -1,16 +1,9 @@ ---- a/libheif/heif_colorconversion.cc -+++ b/libheif/heif_colorconversion.cc -@@ -1811,7 +1811,7 @@ Op_mono_to_RGB24_32::convert_colorspace(const std::shared_ptradd_plane(heif_channel_interleaved, width, height, 8); - -- const uint8_t* in_y, * in_a; -+ const uint8_t* in_y, * in_a = nullptr; - int in_y_stride = 0, in_a_stride; - - uint8_t* out_p; -@@ -2160,7 +2160,7 @@ Op_RGB24_32_to_YCbCr444_GBR::convert_colorspace(const std::shared_ptradd_plane(heif_channel_Alpha, width, height, 8); +diff --git a/libheif/color-conversion/rgb2yuv.cc b/libheif/color-conversion/rgb2yuv.cc +index 6b2df3b..f07aa54 100644 +--- a/libheif/color-conversion/rgb2yuv.cc ++++ b/libheif/color-conversion/rgb2yuv.cc +@@ -835,7 +835,7 @@ Op_RGB24_32_to_YCbCr444_GBR::convert_colorspace(const std::shared_ptr& data, int& ptr, int le +diff --git a/libheif/context.cc b/libheif/context.cc +index 28292a5..ffa2d1d 100644 +--- a/libheif/context.cc ++++ b/libheif/context.cc +@@ -100,7 +100,7 @@ static int32_t readvec_signed(const std::vector& data, int& ptr, int le val &= ~high_bit; if (negative) { @@ -29,4 +24,3 @@ } else { return val; - diff --git a/depends/common/libheif/04-fix-static-win-linkage.patch b/depends/common/libheif/02-fix-static-win-linkage.patch similarity index 100% rename from depends/common/libheif/04-fix-static-win-linkage.patch rename to depends/common/libheif/02-fix-static-win-linkage.patch diff --git a/depends/common/libheif/02-remove-werror.patch b/depends/common/libheif/02-remove-werror.patch deleted file mode 100644 index 031bdc1..0000000 --- a/depends/common/libheif/02-remove-werror.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,7 +22,6 @@ endif() - - if(NOT MSVC) - add_definitions(-Wall) -- add_definitions(-Werror) - add_definitions(-Wsign-compare) - add_definitions(-Wconversion) - add_definitions(-Wno-sign-conversion) diff --git a/depends/common/libheif/03-disable-gdk-pixbuf.patch b/depends/common/libheif/03-disable-gdk-pixbuf.patch deleted file mode 100644 index 20efff8..0000000 --- a/depends/common/libheif/03-disable-gdk-pixbuf.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -164,4 +164,4 @@ if(WITH_EXAMPLES) - add_subdirectory (examples) - endif() - add_subdirectory (libheif) --add_subdirectory (gdk-pixbuf) -+#add_subdirectory (gdk-pixbuf) diff --git a/depends/common/libheif/flags.txt b/depends/common/libheif/flags.txt index c07b037..15e898e 100644 --- a/depends/common/libheif/flags.txt +++ b/depends/common/libheif/flags.txt @@ -1 +1 @@ --DBUILD_SHARED_LIBS=0 -DLIBHEIF_STATIC_BUILD=1 -DWITH_EXAMPLES=0 -DWITH_X265=0 -DWITH_RAV1E=0 -DWITH_AOM=0 -DWITH_DAV1D=0 +-DBUILD_SHARED_LIBS=OFF -DENABLE_PLUGIN_LOADING=OFF -DWITH_LIBDE265=OFF -DWITH_X265=OFF -DWITH_DAV1D=OFF -DWITH_AOM_ENCODER=OFF -DWITH_AOM_DECODER=OFF -DWITH_SvtEnc=OFF -DWITH_RAV1E=OFF -DWITH_EXAMPLES=OFF -DWITH_GDK_PIXBUF=OFF -DWITH_REDUCED_VISIBILITY=ON -DWITH_DEFLATE_HEADER_COMPRESSION=OFF -DENABLE_MULTITHREADING_SUPPORT=ON -DENABLE_PARALLEL_TILE_DECODING=ON -DWITH_LIBSHARPYUV=OFF diff --git a/depends/common/libheif/libheif.sha256 b/depends/common/libheif/libheif.sha256 index 0b41913..91e3b4b 100644 --- a/depends/common/libheif/libheif.sha256 +++ b/depends/common/libheif/libheif.sha256 @@ -1 +1 @@ -e1ac2abb354fdc8ccdca71363ebad7503ad731c84022cf460837f0839e171718 +ac15b54b6d7c315710e156d119b8a1bfc89f29621e99222b2750b1f31c9c3558 diff --git a/depends/common/libheif/libheif.txt b/depends/common/libheif/libheif.txt index 21343c5..21d31ab 100644 --- a/depends/common/libheif/libheif.txt +++ b/depends/common/libheif/libheif.txt @@ -1 +1 @@ -libheif https://github.com/strukturag/libheif/releases/download/v1.12.0/libheif-1.12.0.tar.gz +libheif https://mirrors.kodi.tv/build-deps/sources/libheif-1.16.1.tar.gz