[libheif] Update to 1.9.1

commit 77a9d2c60e58028a7c1510a21d6fd0f08c473085 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Oct 27 14:49:02 2020 +0000 Update to 1.9.1 libheif.spec | 10 ++++++++-- sources | 2 +- system_rav1e.patch | 33 --------------------------------- system_rav1e_dav1d.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 36 deletions(-) --- diff --git a/libheif.spec b/libheif.spec index a25b3ad..b175771 100644 --- a/libheif.spec +++ b/libheif.spec @@ -1,18 +1,19 @@ Name: libheif -Version: 1.8.0 +Version: 1.9.1 Release: 1%{?dist} Summary: HEIF file format decoder and encoder License: LGPLv3+ and MIT URL: https://github.com/strukturag/%{name} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: system_rav1e.patch +Patch0: system_rav1e_dav1d.patch BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(aom) +BuildRequires: pkgconfig(dav1d) BuildRequires: pkgconfig(libde265) %if 0%{?fedora} BuildRequires: pkgconfig(libjpeg) @@ -44,10 +45,12 @@ developing applications that use %{name}. %prep %autosetup -p1 NOCONFIGURE=1 ./autogen.sh +rm -rf third-party/ %build %configure --disable-static \ + --enable-local-dav1d \ %if 0%{?fedora} > 32 --enable-local-rav1e %endif @@ -83,6 +86,9 @@ find %buildroot -name '*.la' -or -name '*.a' | xargs rm -f %changelog +* Tue Oct 27 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.9.1-1 +- Update to 1.9.1 + * Fri Aug 28 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.8.0-1 - Update to 1.8.0 diff --git a/sources b/sources index 4fc4500..a9d2270 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libheif-1.8.0.tar.gz) = e5116530190a6bd97a6788393a3070be54e432ffd43045fa4b7a028f2a7f652d6bc09b7bf5992a6fb2b3cf6669f29a269f2007099cfef661e17732cf1b09debe +SHA512 (libheif-1.9.1.tar.gz) = ab9bd455499223f234efba255c2a0bda418381ccd6cc3cda667ddf7ca3c73efc01385bf629662f72693e40757d3d512b6662c9a6424e7d81d348a3a02ca77a90 diff --git a/system_rav1e_dav1d.patch b/system_rav1e_dav1d.patch new file mode 100644 index 0000000..e698648 --- /dev/null +++ b/system_rav1e_dav1d.patch @@ -0,0 +1,43 @@ +diff -uNrp a/libheif/heif_encoder_rav1e.cc b/libheif/heif_encoder_rav1e.cc +--- a/libheif/heif_encoder_rav1e.cc 2020-09-25 09:28:40.000000000 +0100 ++++ b/libheif/heif_encoder_rav1e.cc 2020-10-27 14:31:44.692222806 +0000 +@@ -34,7 +34,7 @@ + + #include <iostream> // TODO: remove me + +-#include "rav1e/rav1e.h" ++#include <rav1e/rav1e.h> + + + struct encoder_struct_rav1e +diff -uNrp a/libheif/Makefile.am b/libheif/Makefile.am +--- a/libheif/Makefile.am 2020-09-25 09:28:40.000000000 +0100 ++++ b/libheif/Makefile.am 2020-10-27 14:36:13.730638570 +0000 +@@ -22,11 +22,11 @@ ADDITIONAL_LIBS += $(x265_LIBS) + endif + + if ENABLE_LOCAL_RAV1E +-ADDITIONAL_LIBS += ../third-party/rav1e/target/release/librav1e.a -ldl ++ADDITIONAL_LIBS += -lrav1e -ldl + endif + + if ENABLE_LOCAL_DAV1D +-ADDITIONAL_LIBS += ../third-party/dav1d/build/src/libdav1d.a -ldl ++ADDITIONAL_LIBS += -ldav1d -ldl + endif + + libheif_la_CPPFLAGS = +@@ -42,11 +42,11 @@ libheif_la_CXXFLAGS = \ + libheif_la_LIBADD = $(ADDITIONAL_LIBS) + + if ENABLE_LOCAL_RAV1E +-libheif_la_CXXFLAGS += -I../third-party/rav1e/target/release/include ++libheif_la_CXXFLAGS += -I/usr/include/ + endif + + if ENABLE_LOCAL_DAV1D +-libheif_la_CXXFLAGS += -I../third-party/dav1d/build -I../third-party/dav1d/build/include -I../third-party/dav1d/build/include/dav1d -I../third-party/dav1d/include ++libheif_la_CXXFLAGS += -I/usr/include/ + endif + + libheif_la_LDFLAGS = -version-info $(LIBHEIF_CURRENT):$(LIBHEIF_REVISION):$(LIBHEIF_AGE)