From 17e4f00187212b44865089cac07ba5d96b9db44a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 15 May 2017 09:30:57 -0400 Subject: [PATCH 1/2] 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 2/2] 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.