diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -29,10 +29,13 @@ libheif.so.1:heif_decoding_options_alloc libheif.so.1:heif_decoding_options_free libheif.so.1:heif_depth_representation_info_free +libheif.so.1:heif_encoder_descriptor_get_compression_format libheif.so.1:heif_encoder_descriptor_get_id_name libheif.so.1:heif_encoder_descriptor_get_name libheif.so.1:heif_encoder_descriptor_supportes_lossless_compression libheif.so.1:heif_encoder_descriptor_supportes_lossy_compression +libheif.so.1:heif_encoder_descriptor_supports_lossless_compression +libheif.so.1:heif_encoder_descriptor_supports_lossy_compression libheif.so.1:heif_encoder_get_name libheif.so.1:heif_encoder_get_parameter libheif.so.1:heif_encoder_get_parameter_boolean @@ -111,6 +114,7 @@ libheif.so.1:heif_image_set_nclx_color_profile libheif.so.1:heif_image_set_raw_color_profile libheif.so.1:heif_main_brand +libheif.so.1:heif_nclx_color_profile_free libheif.so.1:heif_register_decoder libheif.so.1:heif_register_decoder_plugin libheif.so.1:heif_register_encoder_plugin diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -9,5 +9,6 @@ libm.so.6 libpng16.so.16 libpthread.so.0 +librav1e.so.0 libstdc++.so.6 libx265.so.192 diff --git a/files/0000-enable-compilation-with-system-rav1e.patch b/files/0000-enable-compilation-with-system-rav1e.patch new file mode 100644 --- /dev/null +++ b/files/0000-enable-compilation-with-system-rav1e.patch @@ -0,0 +1,99 @@ +From 2d7b2a93083dc5bb22f6bd971fd054e9cec94a35 Mon Sep 17 00:00:00 2001 +From: Martin Reboredo +Date: Mon, 14 Sep 2020 13:50:11 -0300 +Subject: [PATCH] Enable compilation with system rav1e. + +Signed-off-by: Martin Reboredo +--- + configure.ac | 18 +++++++++--------- + libheif/Makefile.am | 10 +++++----- + libheif/heif_encoder_rav1e.cc | 2 +- + 3 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8469ea2..12c8a44 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -189,14 +189,14 @@ if eval "test x$have_gdkpixbuf2 = xyes"; then + AC_SUBST([gdk_pixbuf_cache_file]) + fi + +-AC_ARG_ENABLE([local_rav1e], AS_HELP_STRING([--enable-local-rav1e], +- [Enable compiling with local rav1e encoder.]), [], [enable_local_rav1e=no]) +-if eval "test x$enable_local_rav1e != xno"; then +- AC_MSG_NOTICE([Enable compiling with local rav1e]) +- AC_DEFINE([HAVE_RAV1E], [1], [Whether rav1e plugin has been enabled.]) +-fi +-AM_CONDITIONAL([ENABLE_LOCAL_RAV1E], [test "x$enable_local_rav1e" != "xno"]) +-AC_SUBST(ENABLE_LOCAL_RAV1E) ++PKG_CHECK_MODULES([rav1e], [rav1e], [ ++ AC_DEFINE([HAVE_RAV1E], [1], [Whether rav1e was found.]) ++ AC_SUBST(rav1e_CFLAGS) ++ AC_SUBST(rav1e_LIBS) ++ have_rav1e="yes" ++], [have_rav1e="no"]) ++AM_CONDITIONAL([HAVE_RAV1E], [test "x$have_rav1e" != "xno"]) ++AC_SUBST(HAVE_RAV1E) + + + AC_ARG_ENABLE([libfuzzer], AS_HELP_STRING([--enable-libfuzzer], +@@ -236,7 +236,7 @@ AC_MSG_NOTICE([Multithreading: $enable_multithreading]) + AC_MSG_NOTICE([Symbol visibility: $enable_visibility]) + AC_MSG_NOTICE([libaom decoder: $have_aom]) + AC_MSG_NOTICE([libaom encoder: $have_aom]) +-AC_MSG_NOTICE([rav1e encoder: $enable_local_rav1e]) ++AC_MSG_NOTICE([rav1e encoder: $have_rav1e]) + AC_MSG_NOTICE([libde265 decoder: $have_libde265]) + AC_MSG_NOTICE([libx265 encoder: $have_x265]) + AC_MSG_NOTICE([JPEG output: $have_libjpeg]) +diff --git a/libheif/Makefile.am b/libheif/Makefile.am +index a2b91ea..2d8a0bf 100644 +--- a/libheif/Makefile.am ++++ b/libheif/Makefile.am +@@ -21,8 +21,8 @@ if HAVE_X265 + ADDITIONAL_LIBS += $(x265_LIBS) + endif + +-if ENABLE_LOCAL_RAV1E +-ADDITIONAL_LIBS += ../third-party/rav1e/target/release/librav1e.a ++if HAVE_RAV1E ++ADDITIONAL_LIBS += $(rav1e_LIBS) + endif + + libheif_la_CPPFLAGS = +@@ -37,8 +37,8 @@ libheif_la_CXXFLAGS = \ + -DLIBHEIF_EXPORTS -I$(top_srcdir) + libheif_la_LIBADD = $(ADDITIONAL_LIBS) + +-if ENABLE_LOCAL_RAV1E +-libheif_la_CXXFLAGS += -I../third-party/rav1e/target/release/include ++if HAVE_RAV1E ++libheif_la_CXXFLAGS += $(rav1e_LIBS) + endif + + libheif_la_LDFLAGS = -version-info $(LIBHEIF_CURRENT):$(LIBHEIF_REVISION):$(LIBHEIF_AGE) +@@ -91,7 +91,7 @@ libheif_la_SOURCES += \ + heif_decoder_libde265.h + endif + +-if ENABLE_LOCAL_RAV1E ++if HAVE_RAV1E + libheif_la_SOURCES += \ + heif_encoder_rav1e.cc \ + heif_encoder_rav1e.h +diff --git a/libheif/heif_encoder_rav1e.cc b/libheif/heif_encoder_rav1e.cc +index 69ad6ab..aa419c7 100644 +--- a/libheif/heif_encoder_rav1e.cc ++++ b/libheif/heif_encoder_rav1e.cc +@@ -37,7 +37,7 @@ + + #include // TODO: remove me + +-#include "rav1e/rav1e.h" ++#include + + + struct encoder_struct_rav1e +-- +2.27.0 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : libheif -version : 1.7.0 -release : 13 +version : 1.8.0 +release : 14 source : - - https://github.com/strukturag/libheif/releases/download/v1.7.0/libheif-1.7.0.tar.gz : 842a9ab4b8d6f0faf5a6dc5e8507321199ec44c0b1d8eb199f2de9b49e2db092 + - https://github.com/strukturag/libheif/releases/download/v1.8.0/libheif-1.8.0.tar.gz : e43ef91a5ad41de4471a2fd484279d0793b419009a7d102965739da8f7b75d96 license : LGPL-3.0-or-later component : multimedia.codecs summary : libheif is an ISO/IEC 23008-12:2017 HEIF file format decoder and encoder @@ -16,8 +16,10 @@ - pkgconfig(libde265) - pkgconfig(libpng) - pkgconfig(libturbojpeg) + - pkgconfig(rav1e) - pkgconfig(x265) setup : | + %patch -p1 < $pkgfiles/0000-enable-compilation-with-system-rav1e.patch %reconfigure --disable-static build : | %make diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ libheif - Joshua Strobl - joshua@getsol.us + Martin Reboredo + yakoyoku@gmail.com LGPL-3.0-or-later multimedia.codecs @@ -29,11 +29,12 @@ /usr/bin/heif-thumbnailer /usr/lib64/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-heif.so /usr/lib64/libheif.so.1 - /usr/lib64/libheif.so.1.7.0 + /usr/lib64/libheif.so.1.8.0 /usr/share/man/man1/heif-convert.1 /usr/share/man/man1/heif-enc.1 /usr/share/man/man1/heif-info.1 /usr/share/man/man1/heif-thumbnailer.1 + /usr/share/mime/packages/avif.xml /usr/share/mime/packages/heif.xml /usr/share/thumbnailers/heif.thumbnailer @@ -47,7 +48,7 @@ programming.devel - libheif + libheif /usr/include/libheif/heif.h @@ -59,12 +60,12 @@ - - 2020-08-18 - 1.7.0 + + 2020-09-14 + 1.8.0 Packaging update - Joshua Strobl - joshua@getsol.us + Martin Reboredo + yakoyoku@gmail.com \ No newline at end of file