Compare commits
No commits in common. "master" and "f32" have entirely different histories.
|
|
@ -31,5 +31,3 @@
|
|||
/efl-1.23.3.tar.xz
|
||||
/efl-1.24.2.tar.xz
|
||||
/efl-1.24.3.tar.xz
|
||||
/efl-1.25.0.tar.xz
|
||||
/efl-1.25.1.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
diff -up efl-1.25.0/meson.build.noneon efl-1.25.0/meson.build
|
||||
--- efl-1.25.0/meson.build.noneon 2020-09-22 15:23:31.483346900 -0400
|
||||
+++ efl-1.25.0/meson.build 2020-09-22 15:23:54.264503743 -0400
|
||||
@@ -177,12 +177,6 @@ if get_option('native-arch-optimization'
|
||||
diff -up efl-1.23.1/meson.build.noneon efl-1.23.1/meson.build
|
||||
--- efl-1.23.1/meson.build.noneon 2019-10-16 17:24:32.291167994 -0400
|
||||
+++ efl-1.23.1/meson.build 2019-10-16 17:24:51.001778207 -0400
|
||||
@@ -169,12 +169,6 @@ if get_option('native-arch-optimization'
|
||||
config_h.set10('BUILD_SSE3', true)
|
||||
native_arch_opt_c_args = [ '-msse3' ]
|
||||
message('x86 build - MMX + SSE3 enabled')
|
||||
- elif host_machine.cpu_family() == 'arm'
|
||||
- cpu_neon = true
|
||||
- config_h.set10('BUILD_NEON', true)
|
||||
- add_project_arguments('-mfpu=neon', language: 'c')
|
||||
- add_project_arguments('-ftree-vectorize', language: 'c')
|
||||
- add_global_arguments('-mfpu=neon', language: 'c')
|
||||
- add_global_arguments('-ftree-vectorize', language: 'c')
|
||||
- message('ARM build - NEON enabled')
|
||||
elif host_machine.cpu_family() == 'aarch64'
|
||||
cpu_neon = true
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
diff -up efl-1.25.0/src/tests/eldbus/eldbus_fake_server.c.checkfix efl-1.25.0/src/tests/eldbus/eldbus_fake_server.c
|
||||
--- efl-1.25.0/src/tests/eldbus/eldbus_fake_server.c.checkfix 2020-09-22 13:54:51.000000000 -0400
|
||||
+++ efl-1.25.0/src/tests/eldbus/eldbus_fake_server.c 2020-09-22 15:24:41.384828189 -0400
|
||||
@@ -170,11 +170,11 @@ _fake_server_name_request_cb(void *data
|
||||
{
|
||||
const char *name, *text;
|
||||
if (eldbus_message_error_get(msg, &name, &text))
|
||||
- ck_abort_msg("error on _fake_server_name_request_cb: %s %s", name, text);
|
||||
+ fail("error on _fake_server_name_request_cb: %s %s", name, text);
|
||||
|
||||
unsigned int reply;
|
||||
if (!eldbus_message_arguments_get(msg, "u", &reply))
|
||||
- ck_abort_msg("error geting arguments on _fake_server_name_request_cb");
|
||||
+ fail("error geting arguments on _fake_server_name_request_cb");
|
||||
|
||||
if (ELDBUS_NAME_REQUEST_REPLY_PRIMARY_OWNER != reply)
|
||||
{
|
||||
47
efl.spec
47
efl.spec
|
|
@ -25,8 +25,8 @@
|
|||
|
||||
|
||||
Name: efl
|
||||
Version: 1.25.1
|
||||
Release: 3%{?dist}
|
||||
Version: 1.24.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Collection of Enlightenment libraries
|
||||
License: BSD and LGPLv2+ and GPLv2 and zlib
|
||||
URL: http://enlightenment.org/
|
||||
|
|
@ -37,10 +37,7 @@ Source0: http://download.enlightenment.org/rel/libs/efl/efl-%{version}.tar.xz
|
|||
# If luaL_reg is not defined, define it.
|
||||
#Patch2: efl-1.23.1-luajitfix.patch
|
||||
# Our armv7 builds do not use neon
|
||||
Patch3: efl-1.25.0-no-neon.patch
|
||||
# This is hacky, but it gets us building in rawhide again.
|
||||
# Upstream efl probably needs to rework how they use check in their C tests
|
||||
Patch4: efl-1.25.0-check-fix.patch
|
||||
Patch3: efl-1.23.1-no-neon.patch
|
||||
|
||||
%ifnarch s390 s390x
|
||||
BuildRequires: libunwind-devel
|
||||
|
|
@ -53,7 +50,7 @@ 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: libXi-devel mesa-libGL-devel mesa-libEGL-devel
|
||||
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 libxkbcommon-x11-devel avahi-devel
|
||||
|
|
@ -62,10 +59,6 @@ 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
|
||||
# Disable libavif support for now
|
||||
# https://phab.enlightenment.org/T8844
|
||||
# efl 1.25.1 or git master fails to compile with libavif v0.8.2
|
||||
#BuildRequires: pkgconfig(libavif)
|
||||
%if %{with_scim}
|
||||
BuildRequires: scim-devel
|
||||
%endif
|
||||
|
|
@ -203,18 +196,16 @@ Development files for EFL.
|
|||
%endif
|
||||
#%patch2 -p1 -b .luajitfix
|
||||
%patch3 -p1 -b .noneon
|
||||
%patch4 -p1 -b .checkfix
|
||||
|
||||
# This is why hardcoding paths is bad.
|
||||
# sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
|
||||
# data/libeo.so.%{version}-gdb.py
|
||||
|
||||
%build
|
||||
# Disable libavif support for now
|
||||
%{meson} \
|
||||
-Dxinput22=true \
|
||||
-Dsystemd=true \
|
||||
-Devas-loaders-disabler=json,avif \
|
||||
-Devas-loaders-disabler=json \
|
||||
-Dharfbuzz=true \
|
||||
-Dsdl=true \
|
||||
-Dbuffer=true \
|
||||
|
|
@ -232,9 +223,8 @@ Development files for EFL.
|
|||
-Ddrm=true \
|
||||
-Dinstall-eo-files=true \
|
||||
%if 0%{?has_luajit}
|
||||
-Dbindings=lua,cxx \
|
||||
-Dbindings=luajit,cxx \
|
||||
-Dlua-interpreter=luajit \
|
||||
-Delua=true \
|
||||
%else
|
||||
-Dbindings=cxx \
|
||||
-Dlua-interpreter=lua \
|
||||
|
|
@ -570,31 +560,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
|
|||
%{_libdir}/libexactness*.so
|
||||
|
||||
%changelog
|
||||
* Tue Oct 27 2020 Mamoru TASAKA <mtasaka@fedoraprojet.org> - 1.25.1-3
|
||||
- Disable libavif support for now (bug 1891658)
|
||||
|
||||
* Fri Oct 23 10:33:37 CEST 2020 Nils Philippsen <nils@tiptoe.de> - 1.25.1-2
|
||||
- rebuild for new libavif
|
||||
|
||||
* Mon Oct 12 2020 Tom Callaway <spot@fedoraproject.org> - 1.25.1-1
|
||||
- update to 1.25.1
|
||||
|
||||
* Wed Sep 30 2020 Adam Jackson <ajax@redhat.com> - 1.25.0-2
|
||||
- Drop unused BuildRequires: libXp-devel
|
||||
|
||||
* Tue Sep 22 2020 Tom Callaway <spot@fedoraproject.org> - 1.25.0-1
|
||||
- update to 1.25.0
|
||||
|
||||
* Wed Aug 5 2020 Tom Callaway <spot@fedoraproject.org> - 1.24.3-4
|
||||
- fix build against check in rawhide
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.3-3
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 20 2020 Ding-Yi Chen <dchen@redhat.com> - 1.24.3-1
|
||||
- update to 1.24.3
|
||||
- Remove meson flag -Dopengl=full
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (efl-1.25.1.tar.xz) = cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
|
||||
SHA512 (efl-1.24.3.tar.xz) = 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
|
||||
|
|
|
|||
Loading…
Reference in New Issue