[libheif] Update to 1.8.0
commit 58bc66e04d4f4552e1e07e71a5df357a7cf4252e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 28 17:16:18 2020 +0100
Update to 1.8.0
libheif.spec | 20 +++++++++++++++-----
sources | 2 +-
system_rav1e.patch | 33 +++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 6 deletions(-)
---
diff --git a/libheif.spec b/libheif.spec
index 55c12bb..b5bacc5 100644
--- a/libheif.spec
+++ b/libheif.spec
@@ -1,11 +1,12 @@
Name: libheif
-Version: 1.7.0
-Release: 3%{?dist}
+Version: 1.8.0
+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
BuildRequires: autoconf
BuildRequires: gcc-c++
@@ -19,6 +20,9 @@ BuildRequires: pkgconfig(libjpeg)
BuildRequires: libjpeg-devel
%endif
BuildRequires: pkgconfig(libpng)
+%if 0%{?fedora} > 32
+BuildRequires: pkgconfig(rav1e)
+%endif
BuildRequires: pkgconfig(x265)
Requires: shared-mime-info
@@ -38,12 +42,15 @@ developing applications that use %{name}.
%prep
-%autosetup
+%autosetup -p1
NOCONFIGURE=1 ./autogen.sh
%build
-%configure --disable-static
+%configure --disable-static \
+%if 0%{?fedora} > 32
+ --enable-local-rav1e
+%endif
%make_build
@@ -64,7 +71,7 @@ find %buildroot -name '*.la' -or -name '*.a' | xargs rm
-f
%{_bindir}/heif-thumbnailer
%{_libdir}/*.so.1*
%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-heif.*
-%{_datadir}/mime/packages/heif.xml
+%{_datadir}/mime/packages/*.xml
%{_datadir}/thumbnailers/
%{_mandir}/man1/heif-*
@@ -75,6 +82,9 @@ find %buildroot -name '*.la' -or -name '*.a' | xargs rm
-f
%changelog
+* Fri Aug 28 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.8.0-1
+- Update to 1.8.0
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
1.7.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 50e2a4c..4fc4500 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libheif-1.7.0.tar.gz) =
7da6ab9daf253c2493e0c3960c6f817e0234dfbd0463467cd1e5f11f7d6804735e401b73fb1038b8f81cfc6527fafb6ac7f4668c3de9400a0131c1292bdbe660
+SHA512 (libheif-1.8.0.tar.gz) =
e5116530190a6bd97a6788393a3070be54e432ffd43045fa4b7a028f2a7f652d6bc09b7bf5992a6fb2b3cf6669f29a269f2007099cfef661e17732cf1b09debe
diff --git a/system_rav1e.patch b/system_rav1e.patch
new file mode 100644
index 0000000..5d3ff58
--- /dev/null
+++ b/system_rav1e.patch
@@ -0,0 +1,33 @@
+--- a/libheif/Makefile.am
++++ b/libheif/Makefile.am
+@@ -22,7 +22,7 @@
+ endif
+
+ if ENABLE_LOCAL_RAV1E
+-ADDITIONAL_LIBS += ../third-party/rav1e/target/release/librav1e.a
++ADDITIONAL_LIBS += -lrav1e
+ endif
+
+ libheif_la_CPPFLAGS =
+@@ -38,7 +38,7 @@
+ 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/rav1e
+ endif
+
+ libheif_la_LDFLAGS = -version-info
$(LIBHEIF_CURRENT):$(LIBHEIF_REVISION):$(LIBHEIF_AGE)
+
+--- a/libheif/heif_encoder_rav1e.cc
++++ b/libheif/heif_encoder_rav1e.cc
+@@ -37,7 +37,7 @@
+
+ #include <iostream> // TODO: remove me
+
+-#include "rav1e/rav1e.h"
++#include <rav1e.h>
+
+
+ struct encoder_struct_rav1e
+