Compare commits

..

2 Commits

Author SHA1 Message Date
Mamoru TASAKA 20275f2e49 bump release 2020-10-27 10:16:19 +09:00
Mamoru TASAKA a0e1fb7263 Disable libavif support for now (bug 1891658) 2020-10-27 10:15:59 +09:00
2 changed files with 10 additions and 27 deletions

View File

@ -1,13 +0,0 @@
diff --git a/meson.build b/meson.build
index 91ddfdc..a9d5262 100644
--- a/meson.build
+++ b/meson.build
@@ -256,7 +256,7 @@ ecore_evas_wayland_engine_include_dir = []
evas_static_list = []
luaold_interpreters = [
- ['lua', ['>=5.1.0', '<5.3.0']],
+ ['lua', ['>=5.1.0', '<5.5.0']],
['lua51', ['>=5.1.0', '<5.2.0']],
['lua-5.1', ['>=5.1.0', '<5.2.0']],
['lua5.1', ['>=5.1.0', '<5.2.0']],

View File

@ -10,10 +10,6 @@
# %%global has_luajit 0
# %%endif
%ifarch riscv64
%global has_luajit 0
%endif
# Look, you probably don't want this. scim is so 2012. ibus is the new hotness.
# Enabling this means you'll almost certainly need to pass ECORE_IMF_MODULE=xim
# to get anything to work. (*cough*terminology*cough*)
@ -30,7 +26,7 @@
Name: efl
Version: 1.25.1
Release: 2.0.riscv64%{?dist}
Release: 3%{?dist}
Summary: Collection of Enlightenment libraries
License: BSD and LGPLv2+ and GPLv2 and zlib
URL: http://enlightenment.org/
@ -46,9 +42,7 @@ Patch3: efl-1.25.0-no-neon.patch
# Upstream efl probably needs to rework how they use check in their C tests
Patch4: efl-1.25.0-check-fix.patch
Patch10: allow-lua-54.patch
%ifnarch s390 s390x riscv64
%ifnarch s390 s390x
BuildRequires: libunwind-devel
%endif
BuildRequires: gcc-c++
@ -68,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
@ -208,17 +205,16 @@ Development files for EFL.
%patch3 -p1 -b .noneon
%patch4 -p1 -b .checkfix
%patch10 -p1 -b .lua54
# This is why hardcoding paths is bad.
# sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
# 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 \
@ -574,8 +570,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/libexactness*.so
%changelog
* Fri Dec 04 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 1.25.1-2.0.riscv64
- Add support for riscv64
* Tue Oct 27 2020 Mamoru TASAKA <mtasaka@fedoraprojet.org> - 1.25.1-3
- Disable libavif support for now (bug 1891658)
* Fri Oct 23 10:33:37 CEST 2020 Nils Philippsen <nils@tiptoe.de> - 1.25.1-2
- rebuild for new libavif