From a0e1fb72636eabb717617c21cc28352476d20f3e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 27 Oct 2020 10:15:59 +0900 Subject: [PATCH 1/3] Disable libavif support for now (bug 1891658) --- efl.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/efl.spec b/efl.spec index 1aa8d17..2f5d584 100644 --- a/efl.spec +++ b/efl.spec @@ -62,7 +62,10 @@ BuildRequires: pkgconfig(poppler-cpp) >= 0.12 BuildRequires: pkgconfig(libspectre) pkgconfig(libraw) BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0 BuildRequires: pkgconfig(cairo) >= 1.0.0 -BuildRequires: pkgconfig(libavif) +# Disable libavif support for now +# https://phab.enlightenment.org/T8844 +# efl 1.25.1 or git master fails to compile with libavif v0.8.2 +#BuildRequires: pkgconfig(libavif) %if %{with_scim} BuildRequires: scim-devel %endif @@ -207,10 +210,11 @@ Development files for EFL. # data/libeo.so.%{version}-gdb.py %build +# Disable libavif support for now %{meson} \ -Dxinput22=true \ -Dsystemd=true \ - -Devas-loaders-disabler=json \ + -Devas-loaders-disabler=json,avif \ -Dharfbuzz=true \ -Dsdl=true \ -Dbuffer=true \ @@ -566,6 +570,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/libexactness*.so %changelog +* Tue Oct 27 2020 Mamoru TASAKA - 1.25.1-3 +- Disable libavif support for now (bug 1891658) + * Fri Oct 23 10:33:37 CEST 2020 Nils Philippsen - 1.25.1-2 - rebuild for new libavif From 20275f2e49a21113e2bd657fa532e929286f5e82 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 27 Oct 2020 10:16:19 +0900 Subject: [PATCH 2/3] bump release --- efl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/efl.spec b/efl.spec index 2f5d584..5e52681 100644 --- a/efl.spec +++ b/efl.spec @@ -26,7 +26,7 @@ Name: efl Version: 1.25.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ From ebf953f4a99015b3cfd20f361c2c94643ca9b700 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Fri, 4 Dec 2020 13:31:40 -0500 Subject: [PATCH 3/3] merge libavif logic to one spec --- efl.spec | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/efl.spec b/efl.spec index 5e52681..9c4ba10 100644 --- a/efl.spec +++ b/efl.spec @@ -23,10 +23,14 @@ %global use_wayland 0 %endif +# Disable libavif support for now +# https://phab.enlightenment.org/T8844 +# efl 1.25.1 or git master fails to compile with libavif v0.8.2 +%bcond_with avif Name: efl Version: 1.25.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -60,12 +64,11 @@ BuildRequires: libxkbcommon-devel uuid-devel libxkbcommon-x11-devel avahi-devel BuildRequires: rlottie-devel BuildRequires: pkgconfig(poppler-cpp) >= 0.12 BuildRequires: pkgconfig(libspectre) pkgconfig(libraw) -BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0 +BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0 BuildRequires: pkgconfig(cairo) >= 1.0.0 -# Disable libavif support for now -# https://phab.enlightenment.org/T8844 -# efl 1.25.1 or git master fails to compile with libavif v0.8.2 -#BuildRequires: pkgconfig(libavif) +%if %{with avif} +BuildRequires: pkgconfig(libavif) +%endif %if %{with_scim} BuildRequires: scim-devel %endif @@ -210,11 +213,14 @@ Development files for EFL. # data/libeo.so.%{version}-gdb.py %build -# Disable libavif support for now %{meson} \ -Dxinput22=true \ -Dsystemd=true \ +%if %{with avif} + -Devas-loaders-disabler=json \ +%else -Devas-loaders-disabler=json,avif \ +%endif -Dharfbuzz=true \ -Dsdl=true \ -Dbuffer=true \ @@ -570,6 +576,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/libexactness*.so %changelog +* Fri Dec 4 2020 Tom Callaway - 1.25.1-4 +- merge libavif logic to one spec + +* Mon Nov 30 2020 Andreas Schneider - 1.25.1-3.1 +- Disable avif support + * Tue Oct 27 2020 Mamoru TASAKA - 1.25.1-3 - Disable libavif support for now (bug 1891658)