Merge branch 'master' into f26
This commit is contained in:
commit
fb2e63da8a
|
@ -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 <lua.h>
|
||||
#include <lualib.h>
|
||||
#include <lauxlib.h>
|
||||
+#ifndef luaL_reg
|
||||
+# define luaL_reg luaL_Reg
|
||||
+#endif
|
||||
#include <setjmp.h>
|
||||
|
||||
#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 <lua.h>
|
||||
#include <lualib.h>
|
||||
#include <lauxlib.h>
|
||||
+#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 <lua.h>
|
||||
#include <lualib.h>
|
||||
#include <lauxlib.h>
|
||||
+#ifndef luaL_reg
|
||||
+# define luaL_reg luaL_Reg
|
||||
+#endif
|
||||
|
||||
#define FILTERS_LEGACY_COMPAT
|
||||
|
11
efl.spec
11
efl.spec
|
@ -30,16 +30,16 @@
|
|||
|
||||
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
|
||||
# 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
|
||||
|
@ -186,13 +186,13 @@ 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.
|
||||
%if 0%{?fedora} <= 22
|
||||
%patch1 -p1 -b .old
|
||||
%endif
|
||||
%patch2 -p1 -b .luajitfix
|
||||
autoreconf -ifv
|
||||
|
||||
# This is why hardcoding paths is bad.
|
||||
|
@ -546,6 +546,9 @@ fi
|
|||
%{_libdir}/pkgconfig/evas*.pc
|
||||
|
||||
%changelog
|
||||
* Mon May 15 2017 Tom Callaway <spot@fedoraproject.org> - 1.19.0-2
|
||||
- rebuild for new tslib, luajit
|
||||
|
||||
* Tue Apr 18 2017 Sereinity <sereinit@fedoraproject.org> - 1.19.0-1
|
||||
- update to 1.19.0
|
||||
|
||||
|
|
Loading…
Reference in New Issue