From 8b1dda95711868907c3c1050713612d421718089 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 27 Dec 2016 17:10:30 -0600 Subject: [PATCH 1/8] Rebuild for new LibRaw. --- efl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/efl.spec b/efl.spec index 435ce58..b5f4626 100644 --- a/efl.spec +++ b/efl.spec @@ -30,7 +30,7 @@ Name: efl Version: 1.18.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -544,6 +544,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Tue Dec 27 2016 Jon Ciesla - 1.18.4-2 +- Rebuild for new LibRaw. + * Fri Dec 9 2016 Tom Callaway - 1.18.4-1 - update to 1.18.4 From cb5d817a7ff254484b19a59981926db6c573fd9e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 1 Feb 2017 19:21:00 +0100 Subject: [PATCH 2/8] Rebuild (libwebp) --- efl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/efl.spec b/efl.spec index b5f4626..1c16ec8 100644 --- a/efl.spec +++ b/efl.spec @@ -30,7 +30,7 @@ Name: efl Version: 1.18.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -544,6 +544,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Wed Feb 01 2017 Sandro Mani - 1.18.4-3 +- Rebuild (libwebp) + * Tue Dec 27 2016 Jon Ciesla - 1.18.4-2 - Rebuild for new LibRaw. From 5b3fa7be5f96b038a3b289b294ba27fc85b921b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 09:04:27 +0000 Subject: [PATCH 3/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- efl.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/efl.spec b/efl.spec index 1c16ec8..70f4f69 100644 --- a/efl.spec +++ b/efl.spec @@ -30,7 +30,7 @@ Name: efl Version: 1.18.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -544,6 +544,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.18.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 01 2017 Sandro Mani - 1.18.4-3 - Rebuild (libwebp) From 23853a007fbff3fe72d659f2099ed20f80b41a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Marcelin?= Date: Tue, 18 Apr 2017 23:32:20 +0200 Subject: [PATCH 4/8] update to 1.19.0 --- efl.spec | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/efl.spec b/efl.spec index 70f4f69..69b009b 100644 --- a/efl.spec +++ b/efl.spec @@ -29,8 +29,8 @@ Name: efl -Version: 1.18.4 -Release: 4%{?dist} +Version: 1.19.0 +Release: 1%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -40,9 +40,6 @@ Patch0: efl-1.11.4-tslibfix.patch # There is probably a way to conditionalize this in the code that could go upstream # but this works for now. Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch -# Support openssl 1.1+ -# https://phab.enlightenment.org/T4746 -Patch2: efl-1.18.2-openssl-1.1.patch BuildRequires: bullet-devel libpng-devel libjpeg-devel gstreamer1-devel zlib-devel BuildRequires: gstreamer1-plugins-base-devel libtiff-devel openssl-devel BuildRequires: curl-devel dbus-devel glibc-devel fontconfig-devel freetype-devel @@ -53,7 +50,7 @@ BuildRequires: libXrender-devel libXScrnSaver-devel libXtst-devel libXcursor-dev BuildRequires: libXp-devel libXi-devel mesa-libGL-devel mesa-libEGL-devel BuildRequires: libblkid-devel libmount-devel systemd-devel harfbuzz-devel BuildRequires: libwebp-devel tslib-devel SDL2-devel SDL-devel c-ares-devel -BuildRequires: libxkbcommon-devel uuid-devel +BuildRequires: libxkbcommon-devel uuid-devel BuildRequires: pkgconfig(poppler-cpp) >= 0.12 BuildRequires: pkgconfig(libspectre) pkgconfig(libraw) BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0 @@ -66,6 +63,7 @@ BuildRequires: doxygen systemd giflib-devel openjpeg-devel libdrm-devel %if %{use_wayland} BuildRequires: mesa-libwayland-egl-devel libwayland-client-devel >= 1.11.0 BuildRequires: libwayland-cursor-devel libwayland-server-devel +BuildRequires: wayland-protocols-devel >= 1.7 %endif BuildRequires: autoconf automake libtool gettext-devel mesa-libGLES-devel BuildRequires: mesa-libgbm-devel libinput-devel @@ -162,7 +160,7 @@ Obsoletes: eio-devel <= 1.7.10 Provides: eldbus-devel%{?_isa} = %{version}-%{release} Provides: elementary-devel = %{version}-%{release} Provides: elementary-devel%{?_isa} = %{version}-%{release} -Obsoletes: elementary-devel <= 1.17.1 +Obsoletes: elementary-devel <= 1.17.1 Provides: elocation-devel%{?_isa} = %{version}-%{release} Provides: embryo-devel = %{version}-%{release} Provides: embryo-devel%{?_isa} = %{version}-%{release} @@ -195,7 +193,6 @@ Development files for EFL. %if 0%{?fedora} <= 22 %patch1 -p1 -b .old %endif -%patch2 -p1 -b .openssl11 autoreconf -ifv # This is why hardcoding paths is bad. @@ -283,9 +280,9 @@ fi # ecore %{_bindir}/ecore_evas_convert %{_libdir}/ecore/ +%{_libdir}/ecore_con/ %{_libdir}/ecore_evas/ %{_libdir}/ecore_imf/ -%{_libdir}/ecore_x/ %{_libdir}/libecore*.so.* %{_datadir}/ecore/ %{_datadir}/ecore_imf/ @@ -304,6 +301,7 @@ fi %{_libdir}/libeet.so.* # eeze %attr(0755,root,root) %caps(cap_audit_write,cap_chown,cap_setuid,cap_sys_admin=pe) %{_bindir}/eeze_scanner +%{_bindir}/eeze_scanner_monitor %{_bindir}/eeze_disk_ls %{_bindir}/eeze_mount %{_bindir}/eeze_umount @@ -320,6 +318,7 @@ fi %{_libdir}/libefreet_trash.so.1* # eina %{_bindir}/eina_btlog +%{_bindir}/eina_modinfo %{_libdir}/libeina.so.* # eio %{_libdir}/libeio.so.1* @@ -358,7 +357,9 @@ fi %{_libdir}/emotion/ %{_libdir}/libemotion.so.1* # eo +%{_bindir}/eo_debug %{_libdir}/libeo.so.1* +%{_libdir}/libeo_dbg.so.1* %{_datadir}/gdb/auto-load/%{_libdir}/libeo.so.1* # eolian %{_bindir}/eolian_cxx @@ -510,6 +511,7 @@ fi %{_libdir}/cmake/Eo/ %{_libdir}/cmake/EoCxx/ %{_libdir}/libeo.so +%{_libdir}/libeo_dbg.so %{_libdir}/pkgconfig/eo.pc %{_libdir}/pkgconfig/eo-cxx.pc %{_datadir}/eo/ @@ -544,6 +546,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Tue Apr 18 2017 Sereinity - 1.19.0-1 +- update to 1.19.0 + * Fri Feb 10 2017 Fedora Release Engineering - 1.18.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b9c35277a1d1af9e9b206493df85e514220b5687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Marcelin?= Date: Sun, 7 May 2017 16:38:31 +0200 Subject: [PATCH 5/8] Update sources to 0.19.0 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7d117a5..ee5ca16 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /efl-1.18.2.tar.xz /efl-1.18.3.tar.xz /efl-1.18.4.tar.xz +/efl-1.19.0.tar.xz diff --git a/sources b/sources index 833c024..54643cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6dfa63a98fe5c1229d7222a076ab4095 efl-1.18.4.tar.xz +SHA512 (efl-1.19.0.tar.xz) = 1562d2e7c1ea4a003d6f343d775b24a882c51cfbf9561d1975afe863027d0bf0663ff88473236a7b97f2e7e8b1d0dfdf16faac1276da2b8ce14af540aa15974e From 17e4f00187212b44865089cac07ba5d96b9db44a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 15 May 2017 09:30:57 -0400 Subject: [PATCH 6/8] rebuild for new luajit, tslib --- efl.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/efl.spec b/efl.spec index 69b009b..f47384d 100644 --- a/efl.spec +++ b/efl.spec @@ -30,13 +30,11 @@ Name: efl Version: 1.19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz -# I think this one is Fedora specific. -Patch0: efl-1.11.4-tslibfix.patch # There is probably a way to conditionalize this in the code that could go upstream # but this works for now. Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch @@ -186,7 +184,6 @@ Development files for EFL. %prep %setup -q -%patch0 -p1 -b .tslibfix # Technically, this conditional covers "all rhel (fedora is unset and 0 < 22) and fedora 22 or less". # We currently only build for rhel7 and fedora 22. # When RHEL 8 comes out, this will need to be adjusted. @@ -546,6 +543,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Mon May 15 2017 Tom Callaway - 1.19.0-2 +- rebuild for new tslib, luajit + * Tue Apr 18 2017 Sereinity - 1.19.0-1 - update to 1.19.0 From 555ae1de226ff04b658f3f5d33b8d4a263fe9cf9 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 15 May 2017 10:14:47 -0400 Subject: [PATCH 7/8] fix luajit build where luaL_reg is undef --- efl-1.19.0-luajitfix.patch | 39 ++++++++++++++++++++++++++++++++++++++ efl.spec | 3 +++ 2 files changed, 42 insertions(+) create mode 100644 efl-1.19.0-luajitfix.patch diff --git a/efl-1.19.0-luajitfix.patch b/efl-1.19.0-luajitfix.patch new file mode 100644 index 0000000..963cfbc --- /dev/null +++ b/efl-1.19.0-luajitfix.patch @@ -0,0 +1,39 @@ +diff -up efl-1.19.0/src/lib/edje/edje_private.h.luajitfix efl-1.19.0/src/lib/edje/edje_private.h +--- efl-1.19.0/src/lib/edje/edje_private.h.luajitfix 2017-05-15 09:53:45.314265022 -0400 ++++ efl-1.19.0/src/lib/edje/edje_private.h 2017-05-15 09:55:13.508048012 -0400 +@@ -33,6 +33,9 @@ + #include + #include + #include ++#ifndef luaL_reg ++# define luaL_reg luaL_Reg ++#endif + #include + + #ifdef HAVE_EVIL +diff -up efl-1.19.0/src/lib/elua/elua_private.h.luajitfix efl-1.19.0/src/lib/elua/elua_private.h +--- efl-1.19.0/src/lib/elua/elua_private.h.luajitfix 2017-05-15 09:56:03.481791776 -0400 ++++ efl-1.19.0/src/lib/elua/elua_private.h 2017-05-15 09:56:14.867505561 -0400 +@@ -27,6 +27,9 @@ + #include + #include + #include ++#ifndef luaL_reg ++# define luaL_reg luaL_Reg ++#endif + + #include "Elua.h" + +diff -up efl-1.19.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix efl-1.19.0/src/lib/evas/filters/evas_filter_parser.c +--- efl-1.19.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix 2017-05-15 09:56:44.449766382 -0400 ++++ efl-1.19.0/src/lib/evas/filters/evas_filter_parser.c 2017-05-15 09:57:00.786361265 -0400 +@@ -13,6 +13,9 @@ + #include + #include + #include ++#ifndef luaL_reg ++# define luaL_reg luaL_Reg ++#endif + + #define FILTERS_LEGACY_COMPAT + diff --git a/efl.spec b/efl.spec index f47384d..67e3f86 100644 --- a/efl.spec +++ b/efl.spec @@ -38,6 +38,8 @@ Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz # There is probably a way to conditionalize this in the code that could go upstream # but this works for now. Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch +# If luaL_reg is not defined, define it. +Patch2: efl-1.19.0-luajitfix.patch BuildRequires: bullet-devel libpng-devel libjpeg-devel gstreamer1-devel zlib-devel BuildRequires: gstreamer1-plugins-base-devel libtiff-devel openssl-devel BuildRequires: curl-devel dbus-devel glibc-devel fontconfig-devel freetype-devel @@ -190,6 +192,7 @@ Development files for EFL. %if 0%{?fedora} <= 22 %patch1 -p1 -b .old %endif +%patch2 -p1 -b .luajitfix autoreconf -ifv # This is why hardcoding paths is bad. From a86572c2026bb7b0cea5eba85f14e7215516a4d3 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 15 May 2017 11:28:11 -0400 Subject: [PATCH 8/8] disable luajit for aarch64 --- efl.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/efl.spec b/efl.spec index 67e3f86..2d33d2d 100644 --- a/efl.spec +++ b/efl.spec @@ -3,9 +3,11 @@ %ifarch %{arm} %{ix86} x86_64 %global has_luajit 1 %endif +# PANIC: unprotected error in call to Lua API (bad light userdata pointer) +# Disabling luajit for aarch64 %ifarch aarch64 %if %{?fedora} >= 26 -%global has_luajit 1 +%global has_luajit 0 %endif %endif @@ -30,7 +32,7 @@ Name: efl Version: 1.19.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -546,6 +548,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Mon May 15 2017 Tom Callaway - 1.19.0-3 +- disable luajit for aarch64 + * Mon May 15 2017 Tom Callaway - 1.19.0-2 - rebuild for new tslib, luajit