From 825d4db413e5c6c439c070a0a9ea80c4accb3bc8 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 2 Apr 2015 09:49:33 -0400 Subject: [PATCH 01/10] initial package --- efl-1.11.4-tslibfix.patch | 12 + efl-1.13.1-drm-fixes.patch | 26 ++ efl-1.13.1-fsf-address-fix.patch | 91 +++++++ efl.spec | 439 +++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 569 insertions(+) create mode 100644 efl-1.11.4-tslibfix.patch create mode 100644 efl-1.13.1-drm-fixes.patch create mode 100644 efl-1.13.1-fsf-address-fix.patch create mode 100644 efl.spec diff --git a/efl-1.11.4-tslibfix.patch b/efl-1.11.4-tslibfix.patch new file mode 100644 index 0000000..87aa16d --- /dev/null +++ b/efl-1.11.4-tslibfix.patch @@ -0,0 +1,12 @@ +diff -up efl-1.11.4/configure.ac.tslibfix efl-1.11.4/configure.ac +--- efl-1.11.4/configure.ac.tslibfix 2014-10-26 21:42:40.831031217 -0400 ++++ efl-1.11.4/configure.ac 2014-10-26 21:42:55.458006364 -0400 +@@ -2661,7 +2661,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eco + EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo]) + EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina]) + +-EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib]) ++EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib-0.0]) + EFL_ADD_FEATURE([ECORE_FB], [tslib]) + + EFL_EVAL_PKGS([ECORE_FB]) diff --git a/efl-1.13.1-drm-fixes.patch b/efl-1.13.1-drm-fixes.patch new file mode 100644 index 0000000..aa52ee8 --- /dev/null +++ b/efl-1.13.1-drm-fixes.patch @@ -0,0 +1,26 @@ +diff -up efl-1.13.1/src/modules/evas/engines/gl_drm/evas_drm_main.c.fixme efl-1.13.1/src/modules/evas/engines/gl_drm/evas_drm_main.c +--- efl-1.13.1/src/modules/evas/engines/gl_drm/evas_drm_main.c.fixme 2015-02-27 14:40:14.458467898 -0500 ++++ efl-1.13.1/src/modules/evas/engines/gl_drm/evas_drm_main.c 2015-02-27 14:40:31.853332094 -0500 +@@ -221,8 +221,10 @@ eng_window_new(Evas_Engine_Info_GL_Drm * + return NULL; + } + ++#ifdef GL_GLES + gw->gl_context->egldisp = gw->egl_disp; + gw->gl_context->eglctxt = gw->egl_context[0]; ++#endif + + eng_window_use(gw); + glsym_evas_gl_common_context_resize(gw->gl_context, w, h, rot); +diff -up efl-1.13.1/src/modules/evas/engines/gl_drm/evas_engine.h.fixme efl-1.13.1/src/modules/evas/engines/gl_drm/evas_engine.h +--- efl-1.13.1/src/modules/evas/engines/gl_drm/evas_engine.h.fixme 2015-02-27 14:40:51.648179559 -0500 ++++ efl-1.13.1/src/modules/evas/engines/gl_drm/evas_engine.h 2015-02-27 14:41:04.801079322 -0500 +@@ -10,6 +10,8 @@ + + #define GL_GLEXT_PROTOTYPES + #include ++#include ++#include + #include + #include + #include "../gl_generic/Evas_Engine_GL_Generic.h" diff --git a/efl-1.13.1-fsf-address-fix.patch b/efl-1.13.1-fsf-address-fix.patch new file mode 100644 index 0000000..156adb4 --- /dev/null +++ b/efl-1.13.1-fsf-address-fix.patch @@ -0,0 +1,91 @@ +diff -up efl-1.13.1/src/bin/edje/epp/cppalloc.c.noaddy efl-1.13.1/src/bin/edje/epp/cppalloc.c +--- efl-1.13.1/src/bin/edje/epp/cppalloc.c.noaddy 2015-02-27 15:17:31.361456345 -0500 ++++ efl-1.13.1/src/bin/edje/epp/cppalloc.c 2015-02-27 15:17:40.397389751 -0500 +@@ -16,8 +16,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++ * along with this program; if not, see . + * + * In other words, you are welcome to use, share and improve this program. + * You are forbidden to forbid anyone else to use, share and improve +diff -up efl-1.13.1/src/bin/edje/epp/cpperror.c.noaddy efl-1.13.1/src/bin/edje/epp/cpperror.c +--- efl-1.13.1/src/bin/edje/epp/cpperror.c.noaddy 2015-02-27 15:15:41.334267241 -0500 ++++ efl-1.13.1/src/bin/edje/epp/cpperror.c 2015-02-27 15:16:50.293759012 -0500 +@@ -16,8 +16,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++ * along with this program; if not, see . + * + * In other words, you are welcome to use, share and improve this program. + * You are forbidden to forbid anyone else to use, share and improve +diff -up efl-1.13.1/src/bin/edje/epp/cppexp.c.noaddy efl-1.13.1/src/bin/edje/epp/cppexp.c +--- efl-1.13.1/src/bin/edje/epp/cppexp.c.noaddy 2015-02-27 15:17:02.579668466 -0500 ++++ efl-1.13.1/src/bin/edje/epp/cppexp.c 2015-02-27 15:17:20.407537075 -0500 +@@ -13,8 +13,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++ * along with this program; if not, see . + * + * In other words, you are welcome to use, share and improve this program. + * You are forbidden to forbid anyone else to use, share and improve +diff -up efl-1.13.1/src/bin/edje/epp/cpphash.c.noaddy efl-1.13.1/src/bin/edje/epp/cpphash.c +--- efl-1.13.1/src/bin/edje/epp/cpphash.c.noaddy 2015-02-27 15:18:45.989906337 -0500 ++++ efl-1.13.1/src/bin/edje/epp/cpphash.c 2015-02-27 15:18:55.706834724 -0500 +@@ -16,8 +16,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++ * along with this program; if not, see . + * + * In other words, you are welcome to use, share and improve this program. + * You are forbidden to forbid anyone else to use, share and improve +diff -up efl-1.13.1/src/bin/edje/epp/cpplib.c.noaddy efl-1.13.1/src/bin/edje/epp/cpplib.c +--- efl-1.13.1/src/bin/edje/epp/cpplib.c.noaddy 2015-02-27 15:18:24.378065615 -0500 ++++ efl-1.13.1/src/bin/edje/epp/cpplib.c 2015-02-27 15:18:35.423984207 -0500 +@@ -16,8 +16,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++ * along with this program; if not, see . + * + * In other words, you are welcome to use, share and improve this program. + * You are forbidden to forbid anyone else to use, share and improve +diff -up efl-1.13.1/src/bin/edje/epp/cpplib.h.noaddy efl-1.13.1/src/bin/edje/epp/cpplib.h +--- efl-1.13.1/src/bin/edje/epp/cpplib.h.noaddy 2015-02-27 15:17:49.679321344 -0500 ++++ efl-1.13.1/src/bin/edje/epp/cpplib.h 2015-02-27 15:18:01.774232204 -0500 +@@ -13,8 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICU + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +-along with this program; if not, write to the Free Software +-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++along with this program; if not, see . + + In other words, you are welcome to use, share and improve this program. + You are forbidden to forbid anyone else to use, share and improve +diff -up efl-1.13.1/src/bin/edje/epp/cppmain.c.noaddy efl-1.13.1/src/bin/edje/epp/cppmain.c +--- efl-1.13.1/src/bin/edje/epp/cppmain.c.noaddy 2015-02-27 15:15:04.640537672 -0500 ++++ efl-1.13.1/src/bin/edje/epp/cppmain.c 2015-02-27 15:15:27.094372189 -0500 +@@ -14,8 +14,7 @@ + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ++ * along with this program; if not, see . + * + * In other words, you are welcome to use, share and improve this program. + * You are forbidden to forbid anyone else to use, share and improve diff --git a/efl.spec b/efl.spec new file mode 100644 index 0000000..ec84521 --- /dev/null +++ b/efl.spec @@ -0,0 +1,439 @@ +%global _hardened_build 1 + +Name: efl +Version: 1.13.1 +Release: 7%{?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 +# https://phab.enlightenment.org/T2158 +Patch1: efl-1.13.1-drm-fixes.patch +# https://phab.enlightenment.org/T2157 +Patch2: efl-1.13.1-fsf-address-fix.patch +BuildRequires: bullet-devel libpng-devel libjpeg-devel gstreamer1-devel zlib-devel +BuildRequires: gstreamer1-plugins-base-devel luajit-devel libtiff-devel openssl-devel +BuildRequires: curl-devel dbus-devel glibc-devel fontconfig-devel freetype-devel +BuildRequires: fribidi-devel pulseaudio-libs-devel libsndfile-devel libX11-devel +BuildRequires: libXau-devel libXcomposite-devel libXdamage-devel libXdmcp-devel +BuildRequires: libXext-devel libXfixes-devel libXinerama-devel libXrandr-devel +BuildRequires: libXrender-devel libXScrnSaver-devel libXtst-devel libXcursor-devel +BuildRequires: libXp-devel libXi-devel mesa-libGL-devel mesa-libEGL-devel +BuildRequires: libblkid-devel libmount-devel systemd-devel harfbuzz-devel +BuildRequires: libwebp-devel scim-devel tslib-devel SDL2-devel SDL-devel c-ares-devel +BuildRequires: doxygen, systemd, libwayland-client-devel giflib-devel +BuildRequires: mesa-libwayland-egl-devel, openjpeg-devel, libdrm-devel +BuildRequires: autoconf, automake, libtool, gettext-devel, mesa-libGLES-devel +BuildRequires: mesa-libgbm-devel, libinput-devel +# These are convenience provides to aid in migration +Provides: e_dbus%{?_isa} = %{version}-%{release} +Provides: e_dbus = %{version}-%{release} +Obsoletes: e_dbus <= 1.7.10 +Provides: ecore = %{version}-%{release} +Provides: ecore%{?_isa} = %{version}-%{release} +Obsoletes: ecore <= 1.7.10 +Provides: edje = %{version}-%{release} +Provides: edje%{?_isa} = %{version}-%{release} +Obsoletes: edje <= 1.7.10 +Provides: eet = %{version}-%{release} +Provides: eet%{?_isa} = %{version}-%{release} +Obsoletes: eet <= 1.7.10 +Provides: eeze = %{version}-%{release} +Provides: eeze%{?_isa} = %{version}-%{release} +Obsoletes: eeze <= 1.7.10 +Provides: efreet = %{version}-%{release} +Provides: efreet%{?_isa} = %{version}-%{release} +Obsoletes: efreet <= 1.7.10 +Provides: eina%{?_isa} = %{version}-%{release} +Provides: eio = %{version}-%{release} +Provides: eio%{?_isa} = %{version}-%{release} +Obsoletes: eio <= 1.7.10 +Provides: eldbus%{?_isa} = %{version}-%{release} +Provides: elocation%{?_isa} = %{version}-%{release} +Provides: elua%{?_isa} = %{version}-%{release} +Provides: embryo = %{version}-%{release} +Provides: embryo%{?_isa} = %{version}-%{release} +Obsoletes: embryo <= 1.7.10 +Provides: emotion = %{version}-%{release} +Provides: emotion%{?_isa} = %{version}-%{release} +Obsoletes: emotion <= 1.7.10 +Provides: eo%{?_isa} = %{version}-%{release} +Provides: eolian%{?_isa} = %{version}-%{release} +Provides: ephysics%{?_isa} = %{version}-%{release} +Provides: ethumb = %{version}-%{release} +Provides: ethumb%{?_isa} = %{version}-%{release} +Obsoletes: ethumb <= 1.7.10 +Provides: evas = %{version}-%{release} +Provides: evas%{?_isa} = %{version}-%{release} +Obsoletes: evas <= 1.7.10 +Provides: libeina = %{version}-%{release} +Provides: libeina%{?_isa} = %{version}-%{release} +Obsoletes: libeina <= 1.7.10 + +%description +EFL is a collection of libraries for handling many common tasks a +developer may have such as data structures, communication, rendering, +widgets and more. + +%package devel +Summary: Development files for EFL +Requires: efl%{?_isa} = %{version}-%{release} +Requires: pkgconfig, libX11-devel +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +Provides: e_dbus-devel%{?_isa} = %{version}-%{release} +Provides: e_dbus-devel = %{version}-%{release} +Obsoletes: e_dbus-devel <= 1.7.10 +Provides: ecore-devel = %{version}-%{release} +Provides: ecore-devel%{?_isa} = %{version}-%{release} +Obsoletes: ecore-devel <= 1.7.10 +Provides: edje-devel = %{version}-%{release} +Provides: edje-devel%{?_isa} = %{version}-%{release} +Obsoletes: edje-devel <= 1.7.10 +Provides: eet-devel = %{version}-%{release} +Provides: eet-devel%{?_isa} = %{version}-%{release} +Obsoletes: eet-devel <= 1.7.10 +Provides: eeze-devel = %{version}-%{release} +Provides: eeze-devel%{?_isa} = %{version}-%{release} +Obsoletes: eeze-devel <= 1.7.10 +Provides: efreet-devel = %{version}-%{release} +Provides: efreet-devel%{?_isa} = %{version}-%{release} +Obsoletes: efreet-devel <= 1.7.10 +Provides: eina-devel%{?_isa} = %{version}-%{release} +Provides: eio-devel = %{version}-%{release} +Provides: eio-devel%{?_isa} = %{version}-%{release} +Obsoletes: eio-devel <= 1.7.10 +Provides: eldbus-devel%{?_isa} = %{version}-%{release} +Provides: elocation-devel%{?_isa} = %{version}-%{release} +Provides: embryo-devel = %{version}-%{release} +Provides: embryo-devel%{?_isa} = %{version}-%{release} +Obsoletes: embryo-devel <= 1.7.10 +Provides: emotion-devel = %{version}-%{release} +Provides: emotion-devel%{?_isa} = %{version}-%{release} +Obsoletes: emotion-devel <= 1.7.10 +Provides: eo-devel%{?_isa} = %{version}-%{release} +Provides: eolian-devel%{?_isa} = %{version}-%{release} +Provides: ephysics-devel%{?_isa} = %{version}-%{release} +Provides: ethumb-devel = %{version}-%{release} +Provides: ethumb-devel%{?_isa} = %{version}-%{release} +Obsoletes: ethumb-devel <= 1.7.10 +Provides: evas-devel = %{version}-%{release} +Provides: evas-devel%{?_isa} = %{version}-%{release} +Obsoletes: evas-devel <= 1.7.10 +Provides: libeina-devel = %{version}-%{release} +Provides: libeina-devel%{?_isa} = %{version}-%{release} +Obsoletes: libeina-devel <= 1.7.10 + +%description devel +Development files for EFL. + +%prep +%setup -q +%patch0 -p1 -b .tslibfix +%patch1 -p1 -b .drmfix +%patch2 -p1 -b .fsffix +autoreconf -ifv + +%build +# The arm-wide disablement of neon is not right +# but i'm not sure which targets allow for neon at compile. +%configure \ + --enable-xinput22 \ + --enable-systemd \ + --enable-image-loader-webp \ + --enable-harfbuzz \ + --enable-sdl \ + --enable-scim \ + --enable-fb \ + --enable-wayland \ + --enable-drm \ + --enable-drm-hw-accel \ + --with-opengl=full \ + --disable-static \ + --with-profile=release \ +%ifarch %{arm} + --disable-neon \ +%endif + --with-systemdunitdir=%{_unitdir} +make %{?_smp_mflags} V=1 +# This makes doxygen segfault. :/ +# make %{?_smp_mflags} doc V=1 + +%install +make install DESTDIR=%{buildroot} + +# fix perms +chmod -x src/bin/edje/edje_cc_out.c + +find %{buildroot} -name '*.la' -exec rm -f {} ';' + +%find_lang %{name} + +%post +/sbin/ldconfig +%systemd_post efreet.service +%systemd_post ethumb.service +/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +fi +/sbin/ldconfig +%systemd_postun_with_restart efreet.service +%systemd_postun_with_restart ethumb.service + +%posttrans +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : + +%preun +%systemd_preun efreet.service +%systemd_preun ethumb.service + +%files -f %{name}.lang +%{!?_licensedir:%global license %%doc} +%license COPYING licenses/COPYING.BSD licenses/COPYING.GPL licenses/COPYING.LGPL licenses/COPYING.SMALL +%doc AUTHORS COMPLIANCE NEWS README +%{_libdir}/libefl.so.1* +# ecore +%{_bindir}/ecore_evas_convert +%{_libdir}/ecore/ +%{_libdir}/ecore_evas/ +%{_libdir}/ecore_imf/ +%{_libdir}/ecore_x/ +%{_libdir}/libecore*.so.* +%{_datadir}/ecore/ +%{_datadir}/ecore_imf/ +%{_datadir}/ecore_x/ +# edje +%{_bindir}/edje* +%{_datadir}/mime/packages/edje.xml +%{_libdir}/edje/ +%{_libdir}/libedje.so.1* +# eet +%{_bindir}/diffeet +%{_bindir}/eet +%{_bindir}/vieet +%{_libdir}/libeet.so.* +# eeze +%{_bindir}/eeze_* +%{_libdir}/eeze/ +%{_libdir}/libeeze.so.1* +# efreet +%{_bindir}/efreetd +%{_unitdir}/efreet.service +# we don't depend on dbus, but we want clean dir ownership here. +%dir %{_datadir}/dbus-1/ +%dir %{_datadir}/dbus-1/services/ +%{_datadir}/dbus-1/services/org.enlightenment.Efreet.service +%{_libdir}/efreet/ +%{_libdir}/libefreet.so.1* +%{_libdir}/libefreet_mime.so.1* +%{_libdir}/libefreet_trash.so.1* +# eina +%{_libdir}/libeina.so.* +# eio +%{_libdir}/libeio.so.1* +# eldbus +%{_bindir}/eldbus-codegen +%{_libdir}/libeldbus.so.1* +# elocation +%{_libdir}/libelocation.so.1* +# elua +%{_bindir}/elua +%{_datadir}/elua/ +%{_libdir}/libelua.so.1* +# embryo +%{_bindir}/embryo_cc +%{_libdir}/libembryo.so.1* +# emotion +%{_libdir}/emotion/ +%{_libdir}/libemotion.so.1* +# eo +%{_libdir}/libeo.so.1* +# eolian +%{_bindir}/eolian_cxx +%{_bindir}/eolian_gen +%{_libdir}/libeolian.so.1* +# ephysics +%{_libdir}/libephysics.so.1* +# ethumb +%{_bindir}/ethumb +%{_bindir}/ethumbd +%{_bindir}/ethumbd_client +%{_unitdir}/ethumb.service +%{_libdir}/ethumb/ +%{_libdir}/ethumb_client/ +%{_libdir}/libethumb.so.1* +%{_libdir}/libethumb_client.so.1* +%{_datadir}/dbus-1/services/org.enlightenment.Ethumb.service +%{_datadir}/ethumb +%{_datadir}/ethumb_client +# evas +%{_bindir}/evas_* +%{_libdir}/evas/ +%{_libdir}/libevas.so.* +%{_datadir}/evas/ + +%files devel +%{_includedir}/efl-1/ +%{_includedir}/efl-cxx-1/ +%{_libdir}/cmake/Efl/ +%{_libdir}/libefl.so +%{_libdir}/pkgconfig/efl-cxx.pc +%{_libdir}/pkgconfig/efl.pc +# ecore-devel +%{_includedir}/ecore-1/ +%{_includedir}/ecore-audio-1/ +%{_includedir}/ecore-audio-cxx-1/ +%{_includedir}/ecore-avahi-1/ +%{_includedir}/ecore-con-1/ +%{_includedir}/ecore-cxx-1/ +%{_includedir}/ecore-drm-1/ +%{_includedir}/ecore-evas-1/ +%{_includedir}/ecore-fb-1/ +%{_includedir}/ecore-file-1/ +%{_includedir}/ecore-imf-1/ +%{_includedir}/ecore-imf-evas-1/ +%{_includedir}/ecore-input-1/ +%{_includedir}/ecore-input-evas-1/ +%{_includedir}/ecore-ipc-1/ +%{_includedir}/ecore-sdl-1/ +%{_includedir}/ecore-wayland-1/ +%{_includedir}/ecore-x-1/ +%{_libdir}/cmake/Ecore*/ +%{_libdir}/libecore*.so +%{_libdir}/pkgconfig/ecore*.pc +# edje-devel +%{_libdir}/libedje.so +%{_libdir}/pkgconfig/edje*.pc +%{_datadir}/edje +%{_includedir}/edje-* +%{_libdir}/cmake/Edje/ +# eet-devel +%{_includedir}/eet-1/ +%{_includedir}/eet-cxx-1/ +%{_libdir}/cmake/Eet/ +%{_libdir}/cmake/EetCxx/ +%{_libdir}/pkgconfig/eet*.pc +%{_libdir}/libeet.so +# eeze-devel +%{_includedir}/eeze-1/ +%{_libdir}/cmake/Eeze/ +%{_libdir}/libeeze.so +%{_datadir}/eeze/ +%{_libdir}/pkgconfig/eeze.pc +# efreet-devel +%{_includedir}/efreet-1/ +%{_libdir}/cmake/Efreet/ +%{_libdir}/libefreet.so +%{_libdir}/libefreet_mime.so +%{_libdir}/libefreet_trash.so +%{_datadir}/efreet/ +%{_libdir}/pkgconfig/efreet.pc +%{_libdir}/pkgconfig/efreet-mime.pc +%{_libdir}/pkgconfig/efreet-trash.pc +# eina-devel +%{_bindir}/eina-bench-cmp +%{_includedir}/eina-1/ +%{_includedir}/eina-cxx-1/ +%{_libdir}/cmake/Eina*/ +%{_libdir}/pkgconfig/eina*.pc +%{_libdir}/libeina.so +# eio-devel +%{_includedir}/eio-1/ +%{_libdir}/libeio.so +%{_libdir}/pkgconfig/eio.pc +# eldbus-devel +%{_includedir}/eldbus-1/ +%{_includedir}/eldbus_cxx-1/ +%{_libdir}/cmake/Eldbus/ +%{_libdir}/libeldbus.so +%{_libdir}/pkgconfig/eldbus.pc +# elocation-devel +%{_includedir}/elocation-1/ +%{_libdir}/libelocation.so +%{_libdir}/pkgconfig/elocation.pc +# elua-devel +%{_includedir}/elua-1/ +%{_libdir}/libelua.so +%{_libdir}/pkgconfig/elua.pc +%{_libdir}/cmake/Elua/ +# embryo-devel +%{_includedir}/embryo-1/ +%{_libdir}/libembryo.so +%{_libdir}/pkgconfig/embryo.pc +%{_datadir}/embryo/ +# emotion-devel +%{_includedir}/emotion-1/ +%{_libdir}/cmake/Emotion/ +%{_libdir}/libemotion.so +%{_libdir}/pkgconfig/emotion.pc +%{_datadir}/emotion/ +# eo-devel +%{_includedir}/eo-1/ +%{_includedir}/eo-cxx-1/ +%{_libdir}/cmake/Eo/ +%{_libdir}/cmake/EoCxx/ +%{_libdir}/libeo.so +%{_libdir}/pkgconfig/eo.pc +%{_libdir}/pkgconfig/eo-cxx.pc +%{_datadir}/eo/ +%{_datadir}/gdb/auto-load/%{_libdir}/libeo.so* +# eolian-devel +%{_includedir}/eolian-1/ +%{_includedir}/eolian-cxx-1/ +%{_libdir}/cmake/Eolian/ +%{_libdir}/cmake/EolianCxx/ +%{_libdir}/pkgconfig/eolian.pc +%{_libdir}/pkgconfig/eolian-cxx.pc +%{_libdir}/libeolian.so +%{_datadir}/eolian/ +# ephysics-devel +%{_includedir}/ephysics-1/ +%{_libdir}/libephysics.so +%{_libdir}/pkgconfig/ephysics.pc +# ethumb-devel +%{_includedir}/ethumb-1/ +%{_includedir}/ethumb-client-1/ +%{_libdir}/cmake/Ethumb/ +%{_libdir}/cmake/EthumbClient/ +%{_libdir}/libethumb.so +%{_libdir}/libethumb_client.so +%{_libdir}/pkgconfig/ethumb.pc +%{_libdir}/pkgconfig/ethumb_client.pc +# evas-devel +%{_includedir}/evas-1/ +%{_includedir}/evas-cxx-1/ +%{_libdir}/libevas.so +%{_libdir}/cmake/Evas/ +%{_libdir}/cmake/EvasCxx/ +%{_libdir}/pkgconfig/evas*.pc + +%changelog +* Tue Mar 31 2015 Tom Callaway - 1.13.1-7 +- add dbus dir ownership + +* Mon Mar 30 2015 Tom Callaway - 1.13.1-6 +- fix provides/obsoletes to replace old split out packages with efl +- add scriptlets for mimeinfo handling +- mark COPYING as a license file + +* Wed Mar 18 2015 Tom Callaway - 1.13.1-5 +- own cmake dirs, not just cmake files + +* Mon Mar 16 2015 Tom Callaway - 1.13.1-4 +- drop incorrect patch, do not enable gl-drm + +* Thu Mar 5 2015 Tom Callaway - 1.13.1-3 +- add e_dbus Provides/Obsoletes + +* Fri Feb 27 2015 Tom Callaway - 1.13.1-1 +- drop subpackages +- update to 1.13.1 + +* Mon Dec 15 2014 Tom Callaway - 1.12.2-1 +- initial package diff --git a/sources b/sources index e69de29..b8ff649 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0552eed3f337a1268aff4a476c6a5fa7 efl-1.13.1.tar.xz From 5badb34f40402d5725af135273201ba888fde998 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 6 Apr 2015 09:50:41 -0400 Subject: [PATCH 02/10] 1.13.2 --- efl.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/efl.spec b/efl.spec index ec84521..1e19a83 100644 --- a/efl.spec +++ b/efl.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: efl -Version: 1.13.1 -Release: 7%{?dist} +Version: 1.13.2 +Release: 1%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -414,6 +414,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Mon Apr 6 2015 Tom Callaway - 1.13.2-1 +- update to 1.13.2 + * Tue Mar 31 2015 Tom Callaway - 1.13.1-7 - add dbus dir ownership diff --git a/sources b/sources index b8ff649..f042a43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0552eed3f337a1268aff4a476c6a5fa7 efl-1.13.1.tar.xz +1eee67c86eb473ba8096e1fe781b9e47 efl-1.13.2.tar.xz From 2d6ab9e6bbb520d5b318d9d8833c583a3e1da0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 8 Apr 2015 03:30:59 -0400 Subject: [PATCH 03/10] - use luajit only where available --- efl.spec | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/efl.spec b/efl.spec index 1e19a83..9fe64a3 100644 --- a/efl.spec +++ b/efl.spec @@ -1,8 +1,12 @@ %global _hardened_build 1 +%ifarch %{arm} %{ix86} x86_64 +%global has_luajit 1 +%endif + Name: efl Version: 1.13.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib URL: http://enlightenment.org/ @@ -14,7 +18,7 @@ Patch1: efl-1.13.1-drm-fixes.patch # https://phab.enlightenment.org/T2157 Patch2: efl-1.13.1-fsf-address-fix.patch BuildRequires: bullet-devel libpng-devel libjpeg-devel gstreamer1-devel zlib-devel -BuildRequires: gstreamer1-plugins-base-devel luajit-devel libtiff-devel openssl-devel +BuildRequires: gstreamer1-plugins-base-devel libtiff-devel openssl-devel BuildRequires: curl-devel dbus-devel glibc-devel fontconfig-devel freetype-devel BuildRequires: fribidi-devel pulseaudio-libs-devel libsndfile-devel libX11-devel BuildRequires: libXau-devel libXcomposite-devel libXdamage-devel libXdmcp-devel @@ -27,6 +31,11 @@ BuildRequires: doxygen, systemd, libwayland-client-devel giflib-devel BuildRequires: mesa-libwayland-egl-devel, openjpeg-devel, libdrm-devel BuildRequires: autoconf, automake, libtool, gettext-devel, mesa-libGLES-devel BuildRequires: mesa-libgbm-devel, libinput-devel +%if 0%{?has_luajit} +BuildRequires: luajit-devel +%else +BuildRequires: lua-devel +%endif # These are convenience provides to aid in migration Provides: e_dbus%{?_isa} = %{version}-%{release} Provides: e_dbus = %{version}-%{release} @@ -156,6 +165,9 @@ autoreconf -ifv --with-profile=release \ %ifarch %{arm} --disable-neon \ +%endif +%if ! 0%{?has_luajit} + --enable-lua-old \ %endif --with-systemdunitdir=%{_unitdir} make %{?_smp_mflags} V=1 @@ -243,9 +255,13 @@ fi # elocation %{_libdir}/libelocation.so.1* # elua +%if 0%{?has_luajit} %{_bindir}/elua %{_datadir}/elua/ %{_libdir}/libelua.so.1* +%else +%exclude %{_datadir}/elua/ +%endif # embryo %{_bindir}/embryo_cc %{_libdir}/libembryo.so.1* @@ -358,10 +374,14 @@ fi %{_libdir}/libelocation.so %{_libdir}/pkgconfig/elocation.pc # elua-devel +%if 0%{?has_luajit} %{_includedir}/elua-1/ %{_libdir}/libelua.so %{_libdir}/pkgconfig/elua.pc %{_libdir}/cmake/Elua/ +%else +%exclude %{_libdir}/cmake/Elua/ +%endif # embryo-devel %{_includedir}/embryo-1/ %{_libdir}/libembryo.so @@ -414,6 +434,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Wed Apr 8 2015 Dan Horák - 1.13.2-2 +- use luajit only where available + * Mon Apr 6 2015 Tom Callaway - 1.13.2-1 - update to 1.13.2 From a032ea7d83aca443a0544b226ac532552a59ad21 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 28 May 2015 17:12:31 -0400 Subject: [PATCH 04/10] 1.14.0, disable wayland by default --- efl.spec | 46 ++++++++++++++++++++++++++++++++++------------ sources | 2 +- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/efl.spec b/efl.spec index 9fe64a3..6f7fb6d 100644 --- a/efl.spec +++ b/efl.spec @@ -4,19 +4,17 @@ %global has_luajit 1 %endif +%global use_wayland 0 + Name: efl -Version: 1.13.2 -Release: 2%{?dist} +Version: 1.14.0 +Release: 1%{?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 -# https://phab.enlightenment.org/T2158 -Patch1: efl-1.13.1-drm-fixes.patch -# https://phab.enlightenment.org/T2157 -Patch2: efl-1.13.1-fsf-address-fix.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 @@ -27,10 +25,12 @@ 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 scim-devel tslib-devel SDL2-devel SDL-devel c-ares-devel -BuildRequires: doxygen, systemd, libwayland-client-devel giflib-devel -BuildRequires: mesa-libwayland-egl-devel, openjpeg-devel, libdrm-devel -BuildRequires: autoconf, automake, libtool, gettext-devel, mesa-libGLES-devel -BuildRequires: mesa-libgbm-devel, libinput-devel +BuildRequires: doxygen systemd giflib-devel openjpeg-devel libdrm-devel +%if %{use_wayland} +BuildRequires: mesa-libwayland-egl-devel libwayland-client-devel +%endif +BuildRequires: autoconf automake libtool gettext-devel mesa-libGLES-devel +BuildRequires: mesa-libgbm-devel libinput-devel %if 0%{?has_luajit} BuildRequires: luajit-devel %else @@ -142,8 +142,6 @@ Development files for EFL. %prep %setup -q %patch0 -p1 -b .tslibfix -%patch1 -p1 -b .drmfix -%patch2 -p1 -b .fsffix autoreconf -ifv %build @@ -157,7 +155,9 @@ autoreconf -ifv --enable-sdl \ --enable-scim \ --enable-fb \ +%if %{use_wayland} --enable-wayland \ +%endif --enable-drm \ --enable-drm-hw-accel \ --with-opengl=full \ @@ -220,6 +220,7 @@ fi %{_datadir}/ecore/ %{_datadir}/ecore_imf/ %{_datadir}/ecore_x/ +%{_libdir}/libector.so.* # edje %{_bindir}/edje* %{_datadir}/mime/packages/edje.xml @@ -228,6 +229,7 @@ fi # eet %{_bindir}/diffeet %{_bindir}/eet +%{_bindir}/eetpack %{_bindir}/vieet %{_libdir}/libeet.so.* # eeze @@ -265,6 +267,7 @@ fi # embryo %{_bindir}/embryo_cc %{_libdir}/libembryo.so.1* +%{_libdir}/libemile.so.* # emotion %{_libdir}/emotion/ %{_libdir}/libemotion.so.1* @@ -318,11 +321,16 @@ fi %{_includedir}/ecore-input-evas-1/ %{_includedir}/ecore-ipc-1/ %{_includedir}/ecore-sdl-1/ +%if %{use_wayland} %{_includedir}/ecore-wayland-1/ +%endif %{_includedir}/ecore-x-1/ %{_libdir}/cmake/Ecore*/ %{_libdir}/libecore*.so %{_libdir}/pkgconfig/ecore*.pc +%{_includedir}/ector-1/ +%{_libdir}/libector.so +%{_libdir}/pkgconfig/ector.pc # edje-devel %{_libdir}/libedje.so %{_libdir}/pkgconfig/edje*.pc @@ -361,8 +369,11 @@ fi %{_libdir}/libeina.so # eio-devel %{_includedir}/eio-1/ +%{_includedir}/eio-cxx-1/ %{_libdir}/libeio.so %{_libdir}/pkgconfig/eio.pc +%{_libdir}/pkgconfig/eio-cxx.pc +%{_libdir}/cmake/Eio/ # eldbus-devel %{_includedir}/eldbus-1/ %{_includedir}/eldbus_cxx-1/ @@ -387,6 +398,10 @@ fi %{_libdir}/libembryo.so %{_libdir}/pkgconfig/embryo.pc %{_datadir}/embryo/ +%{_includedir}/emile-1/ +%{_libdir}/cmake/Emile/ +%{_libdir}/libemile.so +%{_libdir}/pkgconfig/emile.pc # emotion-devel %{_includedir}/emotion-1/ %{_libdir}/cmake/Emotion/ @@ -434,6 +449,13 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Thu May 28 2015 Tom Callaway - 1.14.0-1 +- update to 1.14.0 +- disable wayland support (bz 1214597) + +* Sat May 02 2015 Kalev Lember - 1.13.2-3 +- Rebuilt for GCC 5 C++11 ABI change + * Wed Apr 8 2015 Dan Horák - 1.13.2-2 - use luajit only where available diff --git a/sources b/sources index f042a43..4d1088f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1eee67c86eb473ba8096e1fe781b9e47 efl-1.13.2.tar.xz +d3f5b093c5a404f509c74db38f671e13 efl-1.14.0.tar.xz From 5380e4c4804f66b592a08a6a64fc2da19ec45e8b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 3 Jun 2015 08:20:20 -0400 Subject: [PATCH 05/10] 1.14.1 --- efl.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/efl.spec b/efl.spec index 6f7fb6d..010344e 100644 --- a/efl.spec +++ b/efl.spec @@ -7,7 +7,7 @@ %global use_wayland 0 Name: efl -Version: 1.14.0 +Version: 1.14.1 Release: 1%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib @@ -449,6 +449,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Wed Jun 3 2015 Tom Callaway - 1.14.1-1 +- update to 1.14.1 + * Thu May 28 2015 Tom Callaway - 1.14.0-1 - update to 1.14.0 - disable wayland support (bz 1214597) diff --git a/sources b/sources index 4d1088f..28f550f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3f5b093c5a404f509c74db38f671e13 efl-1.14.0.tar.xz +8138024f4b4c20e24ffac997f7bdfd14 efl-1.14.1.tar.xz From 32f016f1ea8b04c8b5e9fbdc85b9089834f569f8 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 28 Aug 2015 13:21:35 -0400 Subject: [PATCH 06/10] 1.15.1 --- .gitignore | 1 + efl.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b12caf5..b244664 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /efl-1.14.1.tar.xz /efl-1.14.2.tar.xz /efl-1.15.0.tar.xz +/efl-1.15.1.tar.xz diff --git a/efl.spec b/efl.spec index bc7f345..e322bd9 100644 --- a/efl.spec +++ b/efl.spec @@ -12,7 +12,7 @@ %global use_wayland 0 Name: efl -Version: 1.15.0 +Version: 1.15.1 Release: 1%{?dist} Summary: Collection of Enlightenment libraries License: BSD and LGPLv2+ and GPLv2 and zlib @@ -466,6 +466,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Fri Aug 28 2015 Tom Callaway - 1.15.1-1 +- update to 1.15.1 + * Mon Aug 10 2015 Tom Callaway - 1.15.0-1 - update to 1.15.0 diff --git a/sources b/sources index a87b1f0..94beeaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8429b7ccd4e287abf9544da378749341 efl-1.15.0.tar.xz +b7e57880566f67e3375fcd33d8143dde efl-1.15.1.tar.xz From ac88402b05175732eb164f313c96865524532718 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 14 Sep 2015 14:42:15 -0400 Subject: [PATCH 07/10] fix lua compile with modern lua (thanks to Rafael Fonseca) --- efl-1.15.1-fixlua.patch | 12 ++++++++++++ efl.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 efl-1.15.1-fixlua.patch diff --git a/efl-1.15.1-fixlua.patch b/efl-1.15.1-fixlua.patch new file mode 100644 index 0000000..b2fcf21 --- /dev/null +++ b/efl-1.15.1-fixlua.patch @@ -0,0 +1,12 @@ +diff -up efl-1.15.1/src/lib/evas/filters/evas_filter_parser.c.fixlua efl-1.15.1/src/lib/evas/filters/evas_filter_parser.c +--- efl-1.15.1/src/lib/evas/filters/evas_filter_parser.c.fixlua 2015-09-14 14:27:24.317751813 -0400 ++++ efl-1.15.1/src/lib/evas/filters/evas_filter_parser.c 2015-09-14 14:26:51.541956262 -0400 +@@ -2431,7 +2431,7 @@ _lua_backtrace(lua_State *L) + if (!lua_isstring(L, 1)) /* 'message' not a string? */ + return 1; /* keep it intact */ + ERR("Lua error: %s", lua_tolstring(L, 1, NULL)); +- lua_getfield(L, LUA_GLOBALSINDEX, "debug"); ++ lua_getglobal(L, "debug"); + if (!lua_istable(L, -1)) + { + lua_pop(L, 1); diff --git a/efl.spec b/efl.spec index e322bd9..fe8c7c3 100644 --- a/efl.spec +++ b/efl.spec @@ -13,13 +13,16 @@ Name: efl Version: 1.15.1 -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 +# Fix lua compilation with lua 5.2+ +# https://phab.enlightenment.org/T2728 +Patch1: efl-1.15.1-fixlua.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 @@ -151,6 +154,7 @@ Development files for EFL. %prep %setup -q %patch0 -p1 -b .tslibfix +%patch1 -p1 -b .fixlua autoreconf -ifv # This is why hardcoding paths is bad. @@ -466,6 +470,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Mon Sep 14 2015 Tom Callaway - 1.15.1-2 +- fix compilation against current lua (thanks to Rafael Fonseca) + * Fri Aug 28 2015 Tom Callaway - 1.15.1-1 - update to 1.15.1 From 23102a12640502c2ff78baf6e5e307176a720b4a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 11 Nov 2015 11:47:34 -0500 Subject: [PATCH 08/10] drop unnecessary patch --- efl.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/efl.spec b/efl.spec index b0f71d2..16c6afd 100644 --- a/efl.spec +++ b/efl.spec @@ -20,9 +20,6 @@ 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 -# Fix lua compilation with lua 5.2+ -# https://phab.enlightenment.org/T2728 -Patch1: efl-1.15.1-fixlua.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 @@ -154,7 +151,6 @@ Development files for EFL. %prep %setup -q %patch0 -p1 -b .tslibfix -%patch1 -p1 -b .fixlua autoreconf -ifv # This is why hardcoding paths is bad. From 10e3d94f64fcb081853b887a143abbbf14e559b0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 13 Jun 2016 16:33:02 -0400 Subject: [PATCH 09/10] fix old targets --- efl.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/efl.spec b/efl.spec index fe21a66..749b49c 100644 --- a/efl.spec +++ b/efl.spec @@ -25,13 +25,16 @@ Name: efl Version: 1.17.1 -Release: 1%{?dist} +Release: 1%{?dist}.1 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 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 @@ -164,6 +167,12 @@ 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 autoreconf -ifv # This is why hardcoding paths is bad. @@ -482,6 +491,9 @@ fi %{_libdir}/pkgconfig/evas*.pc %changelog +* Mon Jun 13 2016 Tom Callaway - 1.17.1-1.1 +- fix old targets (rhel7, f22) + * Mon Jun 13 2016 Tom Callaway - 1.17.1-1 - update to 1.17.1 From 0e8aed963d95d61b76122cd2aca51f86e8da3cc0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 13 Jun 2016 16:45:41 -0400 Subject: [PATCH 10/10] missing patch --- efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch diff --git a/efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch b/efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch new file mode 100644 index 0000000..392c396 --- /dev/null +++ b/efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch @@ -0,0 +1,12 @@ +diff -up efl-1.17.1/src/lib/ecore_drm/ecore_drm_fb.c.old efl-1.17.1/src/lib/ecore_drm/ecore_drm_fb.c +--- efl-1.17.1/src/lib/ecore_drm/ecore_drm_fb.c.old 2016-06-13 16:13:15.168379067 -0400 ++++ efl-1.17.1/src/lib/ecore_drm/ecore_drm_fb.c 2016-06-13 16:13:43.240229369 -0400 +@@ -37,7 +37,7 @@ _ecore_drm_fb_create2(int fd, Ecore_Drm_ + memcpy(cmd.handles, hdls, 4 * sizeof(hdls[0])); + memcpy(cmd.pitches, pitches, 4 * sizeof(pitches[0])); + memcpy(cmd.offsets, offsets, 4 * sizeof(offsets[0])); +- memcpy(cmd.modifier, modifiers, 4 * sizeof(modifiers[0])); ++ /* memcpy(cmd.modifier, modifiers, 4 * sizeof(modifiers[0])); */ + + if (drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &cmd)) + return EINA_FALSE;