Merge branch 'master' into f26

This commit is contained in:
Tom Callaway 2017-05-15 11:29:00 -04:00
commit 992dd4b928
1 changed files with 7 additions and 2 deletions

View File

@ -3,9 +3,11 @@
%ifarch %{arm} %{ix86} x86_64 %ifarch %{arm} %{ix86} x86_64
%global has_luajit 1 %global has_luajit 1
%endif %endif
# PANIC: unprotected error in call to Lua API (bad light userdata pointer)
# Disabling luajit for aarch64
%ifarch aarch64 %ifarch aarch64
%if %{?fedora} >= 26 %if %{?fedora} >= 26
%global has_luajit 1 %global has_luajit 0
%endif %endif
%endif %endif
@ -30,7 +32,7 @@
Name: efl Name: efl
Version: 1.19.0 Version: 1.19.0
Release: 2%{?dist} Release: 3%{?dist}
Summary: Collection of Enlightenment libraries Summary: Collection of Enlightenment libraries
License: BSD and LGPLv2+ and GPLv2 and zlib License: BSD and LGPLv2+ and GPLv2 and zlib
URL: http://enlightenment.org/ URL: http://enlightenment.org/
@ -546,6 +548,9 @@ fi
%{_libdir}/pkgconfig/evas*.pc %{_libdir}/pkgconfig/evas*.pc
%changelog %changelog
* Mon May 15 2017 Tom Callaway <spot@fedoraproject.org> - 1.19.0-3
- disable luajit for aarch64
* Mon May 15 2017 Tom Callaway <spot@fedoraproject.org> - 1.19.0-2 * Mon May 15 2017 Tom Callaway <spot@fedoraproject.org> - 1.19.0-2
- rebuild for new tslib, luajit - rebuild for new tslib, luajit