Rebuild for new libavif

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -33,3 +33,6 @@
 /efl-1.24.3.tar.xz
 /efl-1.25.0.tar.xz
 /efl-1.25.1.tar.xz
+/efl-1.26.0.tar.xz
+/efl-1.26.1.tar.xz
+/efl-1.26.3.tar.xz

efl.spec

@@ -4,6 +4,9 @@
 %if 0%{?rhel} && 0%{?rhel} <= 7
 %global has_luajit 0
 %endif
+%ifarch ppc64le s390x riscv64
+%global has_luajit 0
+%endif
 # PANIC: unprotected error in call to Lua API (bad light userdata pointer)
 # Disabling luajit for aarch64
 # %%ifarch aarch64
@@ -23,10 +26,12 @@
 %global use_wayland 0
 %endif
 
+# Enable avif support (this broke before)
+%bcond_without avif
 
 Name:		efl
-Version:	1.25.1
-Release:	3%{?dist}
+Version:	1.26.3
+Release:	6.1.riscv64%{?dist}
 Summary:	Collection of Enlightenment libraries
 License:	BSD and LGPLv2+ and GPLv2 and zlib
 URL:		http://enlightenment.org/
@@ -60,12 +65,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
@@ -75,12 +79,13 @@ BuildRequires:	doxygen systemd giflib-devel openjpeg2-devel libdrm-devel
 BuildRequires:	wayland-devel >= 1.11.0
 BuildRequires:	wayland-protocols-devel >= 1.7
 %endif
-BuildRequires:	ninja-build meson gettext-devel mesa-libGLES-devel
+BuildRequires:	meson >= 0.50
+BuildRequires:	ninja-build gettext-devel mesa-libGLES-devel
 BuildRequires:	mesa-libgbm-devel libinput-devel
 %if 0%{?has_luajit}
 BuildRequires:	luajit-devel
 %else
-BuildRequires:	lua-devel
+BuildRequires:	compat-lua-devel
 %endif
 # For AutoReq cmake-filesystem
 BuildRequires:	cmake
@@ -209,12 +214,17 @@ Development files for EFL.
 # sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
 #  data/libeo.so.%{version}-gdb.py
 
+# libheif is legally encumbered (and not in Fedora)
+
 %build
-# Disable libavif support for now
 %{meson} \
  -Dxinput22=true \
  -Dsystemd=true \
- -Devas-loaders-disabler=json,avif \
+%if %{with avif}
+ -Devas-loaders-disabler=json,heif \
+%else
+ -Devas-loaders-disabler=json,heif,avif \
+%endif
  -Dharfbuzz=true \
  -Dsdl=true \
  -Dbuffer=true \
@@ -239,8 +249,7 @@ Development files for EFL.
  -Dbindings=cxx \
  -Dlua-interpreter=lua \
 %endif
- -Dphysics=true \
- -Dsystemdunitdir=%{_userunitdir}
+ -Dphysics=true
 %{meson_build}
 
 %install
@@ -392,6 +401,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/evas/
 %{_libdir}/libevas.so.*
 %{_datadir}/evas/
+%{_datadir}/mime/packages/evas.xml
 # exactness
 %{_bindir}/exactness*
 %{_libdir}/libexactness*.so.*
@@ -570,6 +580,70 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libexactness*.so
 
 %changelog
+* Tue Mar 28 2023 David Abdurachmanov <davidlt@rivosinc.com> - 1.26.3-6.1.riscv64
+- Rebuild for new libavif
+
+* Mon Mar 20 2023 David Abdurachmanov <davidlt@rivosinc.com> - 1.26.3-6.0.riscv64
+- Disable LuaJIT on riscv64 (not ported)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Dec 20 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.26.3-5
+- LibRaw rebuild
+
+* Thu Dec 01 2022 Kalev Lember <klember@redhat.com> - 1.26.3-4
+- Rebuild for new libavif
+
+* Sun Oct 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 1.26.3-3
+- Rebuild for new libavif
+
+* Sun Oct 23 2022 Robert-André Mauchin <zebob.m@gmail.com> - 1.26.3-2
+- Rebuild for new libavif
+
+* Sat Sep 24 2022 Tom Callaway <spot@fedoraproject.org> - 1.26.3-1
+- update to 1.26.3
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 22 2022 Robert-André Mauchin <zebob.m@gmail.com> - 1.26.1-4
+- Rebuilt for new libavif
+
+* Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 1.26.1-3
+- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Jan  3 2022 Tom Callaway <spot@fedoraproject.org> - 1.26.1-1
+- update to 1.26.1
+
+* Wed Dec 29 2021 Tom Callaway <spot@fedoraproject.org> - 1.26.0-1
+- update to 1.26.0
+
+* Wed Dec 01 2021 Andreas Schneider <asn@redhat.com> - 1.25.1-10
+- Don't build with luajit support on ppc64le and s390x
+- Remove unknown systemdunitdir option
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.25.1-8
+- Rebuilt with OpenSSL 3.0.0
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Feb 12 2021 Tom Callaway <spot@fedoraproject.org> - 1.25.1-6
+- rebuild against new bullet
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.25.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Dec  4 2020 Tom Callaway <spot@fedoraproject.org> - 1.25.1-4
+- merge libavif logic to one spec
+
+* Mon Nov 30 2020 Andreas Schneider <asn@redhat.com> - 1.25.1-3.1
+- Disable avif support
+
 * Tue Oct 27 2020 Mamoru TASAKA <mtasaka@fedoraprojet.org> - 1.25.1-3
 - Disable libavif support for now (bug 1891658)
 

sources

@@ -1 +1 @@
-SHA512 (efl-1.25.1.tar.xz) = cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
+SHA512 (efl-1.26.3.tar.xz) = 9801ee8bc963786962d87af56d532d3f019bc18a91924d2ef84934dcd0ae30452d858db93c33964f2bff9af2f3c8feb9927f7281ead4a8993ed622cd0cf2c514