Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Tom Callaway | 74eed3bb1f | |
Tom Callaway | 385e845a22 | |
Tom Callaway | 109b32a67d | |
Tom Callaway | a690c6e78d |
|
@ -1,12 +0,0 @@
|
||||||
diff -up efl-1.18.0/configure.ac.tslibfix efl-1.18.0/configure.ac
|
|
||||||
--- efl-1.18.0/configure.ac.tslibfix 2016-08-29 15:35:41.784900935 -0400
|
|
||||||
+++ efl-1.18.0/configure.ac 2016-08-29 15:35:48.936847061 -0400
|
|
||||||
@@ -3442,7 +3442,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo]
|
|
||||||
EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [efl])
|
|
||||||
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])
|
|
86
efl.spec
86
efl.spec
|
@ -3,11 +3,6 @@
|
||||||
%ifarch %{arm} %{ix86} x86_64
|
%ifarch %{arm} %{ix86} x86_64
|
||||||
%global has_luajit 1
|
%global has_luajit 1
|
||||||
%endif
|
%endif
|
||||||
%ifarch aarch64
|
|
||||||
%if %{?fedora} >= 26
|
|
||||||
%global has_luajit 1
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Look, you probably don't want this. scim is so 2012. ibus is the new hotness.
|
# Look, you probably don't want this. scim is so 2012. ibus is the new hotness.
|
||||||
# Enabling this means you'll almost certainly need to pass ECORE_IMF_MODULE=xim
|
# Enabling this means you'll almost certainly need to pass ECORE_IMF_MODULE=xim
|
||||||
|
@ -29,14 +24,12 @@
|
||||||
|
|
||||||
|
|
||||||
Name: efl
|
Name: efl
|
||||||
Version: 1.18.1
|
Version: 1.17.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?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/
|
||||||
Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz
|
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
|
# There is probably a way to conditionalize this in the code that could go upstream
|
||||||
# but this works for now.
|
# but this works for now.
|
||||||
Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
|
Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
|
||||||
|
@ -51,17 +44,13 @@ BuildRequires: libXp-devel libXi-devel mesa-libGL-devel mesa-libEGL-devel
|
||||||
BuildRequires: libblkid-devel libmount-devel systemd-devel harfbuzz-devel
|
BuildRequires: libblkid-devel libmount-devel systemd-devel harfbuzz-devel
|
||||||
BuildRequires: libwebp-devel tslib-devel SDL2-devel SDL-devel c-ares-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
|
|
||||||
BuildRequires: pkgconfig(cairo) >= 1.0.0
|
|
||||||
%if %{with_scim}
|
%if %{with_scim}
|
||||||
BuildRequires: scim-devel
|
BuildRequires: scim-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: ibus-devel
|
BuildRequires: ibus-devel
|
||||||
BuildRequires: doxygen systemd giflib-devel openjpeg-devel libdrm-devel
|
BuildRequires: doxygen systemd giflib-devel openjpeg-devel libdrm-devel
|
||||||
%if %{use_wayland}
|
%if %{use_wayland}
|
||||||
BuildRequires: mesa-libwayland-egl-devel libwayland-client-devel >= 1.11.0
|
BuildRequires: mesa-libwayland-egl-devel libwayland-client-devel
|
||||||
BuildRequires: libwayland-cursor-devel libwayland-server-devel
|
BuildRequires: libwayland-cursor-devel libwayland-server-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: autoconf automake libtool gettext-devel mesa-libGLES-devel
|
BuildRequires: autoconf automake libtool gettext-devel mesa-libGLES-devel
|
||||||
|
@ -95,9 +84,6 @@ Provides: eio = %{version}-%{release}
|
||||||
Provides: eio%{?_isa} = %{version}-%{release}
|
Provides: eio%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: eio <= 1.7.10
|
Obsoletes: eio <= 1.7.10
|
||||||
Provides: eldbus%{?_isa} = %{version}-%{release}
|
Provides: eldbus%{?_isa} = %{version}-%{release}
|
||||||
Provides: elementary = %{version}-%{release}
|
|
||||||
Provides: elementary%{?_isa} = %{version}-%{release}
|
|
||||||
Obsoletes: elementary <= 1.17.1
|
|
||||||
Provides: elocation%{?_isa} = %{version}-%{release}
|
Provides: elocation%{?_isa} = %{version}-%{release}
|
||||||
Provides: elua%{?_isa} = %{version}-%{release}
|
Provides: elua%{?_isa} = %{version}-%{release}
|
||||||
Provides: embryo = %{version}-%{release}
|
Provides: embryo = %{version}-%{release}
|
||||||
|
@ -115,9 +101,6 @@ Obsoletes: ethumb <= 1.7.10
|
||||||
Provides: evas = %{version}-%{release}
|
Provides: evas = %{version}-%{release}
|
||||||
Provides: evas%{?_isa} = %{version}-%{release}
|
Provides: evas%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: evas <= 1.7.10
|
Obsoletes: evas <= 1.7.10
|
||||||
Provides: evas-generic-loaders = %{version}-%{release}
|
|
||||||
Provides: evas-generic-loaders%{?_isa} = %{version}-%{release}
|
|
||||||
Obsoletes: evas-generic-loaders <= 1.17.0
|
|
||||||
Provides: libeina = %{version}-%{release}
|
Provides: libeina = %{version}-%{release}
|
||||||
Provides: libeina%{?_isa} = %{version}-%{release}
|
Provides: libeina%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: libeina <= 1.7.10
|
Obsoletes: libeina <= 1.7.10
|
||||||
|
@ -157,9 +140,6 @@ Provides: eio-devel = %{version}-%{release}
|
||||||
Provides: eio-devel%{?_isa} = %{version}-%{release}
|
Provides: eio-devel%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: eio-devel <= 1.7.10
|
Obsoletes: eio-devel <= 1.7.10
|
||||||
Provides: eldbus-devel%{?_isa} = %{version}-%{release}
|
Provides: eldbus-devel%{?_isa} = %{version}-%{release}
|
||||||
Provides: elementary-devel = %{version}-%{release}
|
|
||||||
Provides: elementary-devel%{?_isa} = %{version}-%{release}
|
|
||||||
Obsoletes: elementary-devel <= 1.17.1
|
|
||||||
Provides: elocation-devel%{?_isa} = %{version}-%{release}
|
Provides: elocation-devel%{?_isa} = %{version}-%{release}
|
||||||
Provides: embryo-devel = %{version}-%{release}
|
Provides: embryo-devel = %{version}-%{release}
|
||||||
Provides: embryo-devel%{?_isa} = %{version}-%{release}
|
Provides: embryo-devel%{?_isa} = %{version}-%{release}
|
||||||
|
@ -185,7 +165,6 @@ Development files for EFL.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .tslibfix
|
|
||||||
# Technically, this conditional covers "all rhel (fedora is unset and 0 < 22) and fedora 22 or less".
|
# 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.
|
# We currently only build for rhel7 and fedora 22.
|
||||||
# When RHEL 8 comes out, this will need to be adjusted.
|
# When RHEL 8 comes out, this will need to be adjusted.
|
||||||
|
@ -218,12 +197,10 @@ sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
|
||||||
%if %{use_wayland}
|
%if %{use_wayland}
|
||||||
--enable-wayland \
|
--enable-wayland \
|
||||||
%endif
|
%endif
|
||||||
--enable-elput \
|
|
||||||
--enable-drm \
|
--enable-drm \
|
||||||
--enable-drm-hw-accel \
|
--enable-drm-hw-accel \
|
||||||
--with-opengl=full \
|
--with-opengl=full \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--disable-cocoa \
|
|
||||||
--with-profile=release \
|
--with-profile=release \
|
||||||
%ifarch %{arm} aarch64
|
%ifarch %{arm} aarch64
|
||||||
--disable-neon \
|
--disable-neon \
|
||||||
|
@ -239,10 +216,6 @@ make %{?_smp_mflags} V=1
|
||||||
%install
|
%install
|
||||||
make install DESTDIR=%{buildroot}
|
make install DESTDIR=%{buildroot}
|
||||||
|
|
||||||
# There is probably a better place to fix this, but I couldn't untangle it.
|
|
||||||
sed -i 's|ecore_sdl|ecore-sdl|g' %{buildroot}%{_libdir}/pkgconfig/elementary.pc
|
|
||||||
sed -i 's|ecore_sdl|ecore-sdl|g' %{buildroot}%{_libdir}/pkgconfig/elementary-cxx.pc
|
|
||||||
|
|
||||||
# fix perms
|
# fix perms
|
||||||
chmod -x src/bin/edje/edje_cc_out.c
|
chmod -x src/bin/edje/edje_cc_out.c
|
||||||
|
|
||||||
|
@ -275,7 +248,6 @@ fi
|
||||||
%{_libdir}/libefl.so.1*
|
%{_libdir}/libefl.so.1*
|
||||||
%{_bindir}/efl_debug
|
%{_bindir}/efl_debug
|
||||||
%{_bindir}/efl_debugd
|
%{_bindir}/efl_debugd
|
||||||
%{_datadir}/icons/Enlightenment-X/
|
|
||||||
# ecore
|
# ecore
|
||||||
%{_bindir}/ecore_evas_convert
|
%{_bindir}/ecore_evas_convert
|
||||||
%{_libdir}/ecore/
|
%{_libdir}/ecore/
|
||||||
|
@ -322,22 +294,8 @@ fi
|
||||||
# eldbus
|
# eldbus
|
||||||
%{_bindir}/eldbus-codegen
|
%{_bindir}/eldbus-codegen
|
||||||
%{_libdir}/libeldbus.so.1*
|
%{_libdir}/libeldbus.so.1*
|
||||||
# elementary
|
|
||||||
%{_bindir}/elementary_codegen
|
|
||||||
%{_bindir}/elementary_config
|
|
||||||
%{_bindir}/elementary_quicklaunch
|
|
||||||
%{_bindir}/elementary_run
|
|
||||||
%{_bindir}/elementary_test
|
|
||||||
%{_bindir}/elm_prefs_cc
|
|
||||||
%{_libdir}/libelementary.so.1*
|
|
||||||
%{_libdir}/elementary/
|
|
||||||
%{_datadir}/applications/elementary*.desktop
|
|
||||||
%{_datadir}/elementary/
|
|
||||||
%{_datadir}/icons/elementary.png
|
|
||||||
# elocation
|
# elocation
|
||||||
%{_libdir}/libelocation.so.1*
|
%{_libdir}/libelocation.so.1*
|
||||||
# elput
|
|
||||||
%{_libdir}/libelput.so.1*
|
|
||||||
# elua
|
# elua
|
||||||
%if 0%{?has_luajit}
|
%if 0%{?has_luajit}
|
||||||
%{_bindir}/elua
|
%{_bindir}/elua
|
||||||
|
@ -390,10 +348,11 @@ fi
|
||||||
# ecore-devel
|
# ecore-devel
|
||||||
%{_includedir}/ecore-1/
|
%{_includedir}/ecore-1/
|
||||||
%{_includedir}/ecore-audio-1/
|
%{_includedir}/ecore-audio-1/
|
||||||
|
%{_includedir}/ecore-audio-cxx-1/
|
||||||
%{_includedir}/ecore-avahi-1/
|
%{_includedir}/ecore-avahi-1/
|
||||||
%{_includedir}/ecore-con-1/
|
%{_includedir}/ecore-con-1/
|
||||||
%{_includedir}/ecore-cxx-1/
|
%{_includedir}/ecore-cxx-1/
|
||||||
%{_includedir}/ecore-drm2-1/
|
%{_includedir}/ecore-drm-1/
|
||||||
%{_includedir}/ecore-evas-1/
|
%{_includedir}/ecore-evas-1/
|
||||||
%{_includedir}/ecore-fb-1/
|
%{_includedir}/ecore-fb-1/
|
||||||
%{_includedir}/ecore-file-1/
|
%{_includedir}/ecore-file-1/
|
||||||
|
@ -404,6 +363,7 @@ fi
|
||||||
%{_includedir}/ecore-ipc-1/
|
%{_includedir}/ecore-ipc-1/
|
||||||
%{_includedir}/ecore-sdl-1/
|
%{_includedir}/ecore-sdl-1/
|
||||||
%if %{use_wayland}
|
%if %{use_wayland}
|
||||||
|
%{_includedir}/ecore-wayland-1/
|
||||||
%{_includedir}/ecore-wl2-1/
|
%{_includedir}/ecore-wl2-1/
|
||||||
%endif
|
%endif
|
||||||
%{_includedir}/ecore-x-1/
|
%{_includedir}/ecore-x-1/
|
||||||
|
@ -461,21 +421,10 @@ fi
|
||||||
%{_libdir}/cmake/Eldbus/
|
%{_libdir}/cmake/Eldbus/
|
||||||
%{_libdir}/libeldbus.so
|
%{_libdir}/libeldbus.so
|
||||||
%{_libdir}/pkgconfig/eldbus.pc
|
%{_libdir}/pkgconfig/eldbus.pc
|
||||||
# elementary-devel
|
|
||||||
%{_includedir}/elementary-1/
|
|
||||||
%{_includedir}/elementary-cxx-1/
|
|
||||||
%{_libdir}/cmake/Elementary/
|
|
||||||
%{_libdir}/libelementary.so
|
|
||||||
%{_libdir}/pkgconfig/elementary.pc
|
|
||||||
%{_libdir}/pkgconfig/elementary-cxx.pc
|
|
||||||
# elocation-devel
|
# elocation-devel
|
||||||
%{_includedir}/elocation-1/
|
%{_includedir}/elocation-1/
|
||||||
%{_libdir}/libelocation.so
|
%{_libdir}/libelocation.so
|
||||||
%{_libdir}/pkgconfig/elocation.pc
|
%{_libdir}/pkgconfig/elocation.pc
|
||||||
# elput-devel
|
|
||||||
%{_includedir}/elput-1/
|
|
||||||
%{_libdir}/libelput.so
|
|
||||||
%{_libdir}/pkgconfig/elput.pc
|
|
||||||
# elua-devel
|
# elua-devel
|
||||||
%if 0%{?has_luajit}
|
%if 0%{?has_luajit}
|
||||||
%{_includedir}/elua-1/
|
%{_includedir}/elua-1/
|
||||||
|
@ -540,27 +489,8 @@ fi
|
||||||
%{_libdir}/pkgconfig/evas*.pc
|
%{_libdir}/pkgconfig/evas*.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Sep 21 2016 Tom Callaway <spot@fedoraproject.org> - 1.18.1-1
|
* Mon May 15 2017 Tom Callaway <spot@fedoraproject.org> - 1.17.2-2
|
||||||
- update to 1.18.1
|
- rebuild for newer tslib
|
||||||
|
|
||||||
* Mon Sep 19 2016 Peter Robinson <pbrobinson@fedoraproject.org> 1.18.0-5
|
|
||||||
- aarch64 now has LuaJIT
|
|
||||||
|
|
||||||
* Wed Aug 31 2016 Tom Callaway <spot@fedoraproject.org> - 1.18.0-4
|
|
||||||
- explicitly disable cocoa. we are not osx. sloppy configure gets it wrong.
|
|
||||||
- fix typo in elementary pc files
|
|
||||||
|
|
||||||
* Wed Aug 31 2016 Tom Callaway <spot@fedoraproject.org> - 1.18.0-3
|
|
||||||
- properly provide/obsolete evas-generic-loaders
|
|
||||||
|
|
||||||
* Wed Aug 31 2016 Tom Callaway <spot@fedoraproject.org> - 1.18.0-2
|
|
||||||
- properly provide/obsolete elementary-devel
|
|
||||||
|
|
||||||
* Mon Aug 29 2016 Tom Callaway <spot@fedoraproject.org> - 1.18.0-1
|
|
||||||
- update to 1.18.0
|
|
||||||
|
|
||||||
* Mon Aug 29 2016 Igor Gnatenko <ignatenko@redhat.com> - 1.17.2-2
|
|
||||||
- Rebuild for LuaJIT 2.1.0
|
|
||||||
|
|
||||||
* Fri Jul 15 2016 Ding-Yi Chen <dchen@redhat.com> - 1.17.2-1
|
* Fri Jul 15 2016 Ding-Yi Chen <dchen@redhat.com> - 1.17.2-1
|
||||||
- update to 1.17.2
|
- update to 1.17.2
|
||||||
|
|
Loading…
Reference in New Issue