Compare commits

..

No commits in common. "master" and "f31" have entirely different histories.
master ... f31

14 changed files with 468 additions and 188 deletions

7
.gitignore vendored
View File

@ -26,10 +26,3 @@
/efl-1.22.2.tar.xz
/efl-1.22.3.tar.xz
/efl-1.22.4.tar.xz
/efl-1.23.1.tar.xz
/efl-1.23.2.tar.xz
/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

12
efl-1.11.4-tslibfix.patch Normal file
View File

@ -0,0 +1,12 @@
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])

View File

@ -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;

View File

@ -0,0 +1,247 @@
diff -up efl-1.18.2/src/lib/eet/eet_cipher.c.fixup efl-1.18.2/src/lib/eet/eet_cipher.c
--- efl-1.18.2/src/lib/eet/eet_cipher.c.fixup 2016-10-19 10:31:31.601037298 -0400
+++ efl-1.18.2/src/lib/eet/eet_cipher.c 2016-10-19 10:43:13.258515381 -0400
@@ -475,9 +475,15 @@ eet_identity_sign(FILE *fp,
gnutls_datum_t signum = { NULL, 0 };
gnutls_privkey_t privkey;
# else /* ifdef HAVE_GNUTLS */
- EVP_MD_CTX md_ctx;
unsigned int sign_len = 0;
int cert_len = 0;
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
+ if (md_ctx == NULL)
+ return EET_ERROR_BAD_OBJECT;
+# else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+ EVP_MD_CTX md_ctx;
+# endif /* if OPENSSL_VERSION_NUMBER >= 0x10100000L */
# endif /* ifdef HAVE_GNUTLS */
/* A few check and flush pending write. */
@@ -560,6 +566,15 @@ eet_identity_sign(FILE *fp,
goto on_error;
}
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ /* Do the signature. */
+ EVP_SignInit(md_ctx, EVP_sha1());
+ EVP_SignUpdate(md_ctx, data, st_buf.st_size);
+ err = EVP_SignFinal(md_ctx,
+ sign,
+ (unsigned int *)&sign_len,
+ key->private_key);
+# else
/* Do the signature. */
EVP_SignInit(&md_ctx, EVP_sha1());
EVP_SignUpdate(&md_ctx, data, st_buf.st_size);
@@ -567,6 +582,7 @@ eet_identity_sign(FILE *fp,
sign,
(unsigned int *)&sign_len,
key->private_key);
+# endif
if (err != 1)
{
ERR_print_errors_fp(stdout);
@@ -615,6 +631,9 @@ on_error:
# else /* ifdef HAVE_GNUTLS */
if (cert)
OPENSSL_free(cert);
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_MD_CTX_free(md_ctx);
+# endif /* if OPENSSL_VERSION_NUMBER >= 0x10100000L */
# endif /* ifdef HAVE_GNUTLS */
if (sign)
@@ -739,7 +758,13 @@ eet_identity_check(const void *data_ba
const unsigned char *tmp;
EVP_PKEY *pkey;
X509 *x509;
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_MD_CTX *md_ctx = EVP_MD_CTX_new();
+ if (md_ctx == NULL)
+ return NULL;
+# else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
EVP_MD_CTX md_ctx;
+# endif /* if OPENSSL_VERSION_NUMBER >= 0x10100000L */
int err;
/* Strange but d2i_X509 seems to put 0 all over the place. */
@@ -757,10 +782,17 @@ eet_identity_check(const void *data_ba
return NULL;
}
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ /* Verify the signature */
+ EVP_VerifyInit(md_ctx, EVP_sha1());
+ EVP_VerifyUpdate(md_ctx, data_base, data_length);
+ err = EVP_VerifyFinal(md_ctx, sign, sign_len, pkey);
+# else /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
/* Verify the signature */
EVP_VerifyInit(&md_ctx, EVP_sha1());
EVP_VerifyUpdate(&md_ctx, data_base, data_length);
err = EVP_VerifyFinal(&md_ctx, sign, sign_len, pkey);
+# endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
X509_free(x509);
EVP_PKEY_free(pkey);
@@ -800,6 +832,9 @@ eet_identity_check(const void *data_ba
raw_signature_base = NULL;
raw_signature_length = NULL;
x509_length = NULL;
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_MD_CTX_free(md_ctx);
+# endif /* if OPENSSL_VERSION_NUMBER >= 0x10100000L */
return NULL;
#endif /* ifdef HAVE_SIGNATURE */
}
diff -up efl-1.18.2/src/lib/emile/emile_cipher_openssl.c.fixup efl-1.18.2/src/lib/emile/emile_cipher_openssl.c
--- efl-1.18.2/src/lib/emile/emile_cipher_openssl.c.fixup 2016-10-19 10:10:05.735351607 -0400
+++ efl-1.18.2/src/lib/emile/emile_cipher_openssl.c 2016-10-19 10:30:27.529498249 -0400
@@ -87,7 +87,11 @@ emile_binbuf_cipher(Emile_Cipher_Algorit
unsigned int crypted_length;
int opened = 0;
/* Openssl declarations*/
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_CIPHER_CTX *ctx;
+#else
EVP_CIPHER_CTX ctx;
+#endif
unsigned int *buffer = NULL;
int tmp_len;
@@ -134,17 +138,43 @@ emile_binbuf_cipher(Emile_Cipher_Algorit
/* Openssl create the corresponding cipher
AES with a 256 bit key, Cipher Block Chaining mode */
- EVP_CIPHER_CTX_init(&ctx);
- if (!EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, ik, iv))
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ ctx = EVP_CIPHER_CTX_new();
+ if (ctx == NULL)
+ goto on_error;
+
+ opened = 1;
+
+ if (!EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, ik, iv))
goto on_error;
+#else
+ EVP_CIPHER_CTX_init(&ctx);
opened = 1;
+ if (!EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, ik, iv))
+ goto on_error;
+#endif
+
memset(iv, 0, sizeof (iv));
memset(ik, 0, sizeof (ik));
pointer = (unsigned char*) eina_binbuf_string_get(result);
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ /* Openssl encrypt */
+ if (!EVP_EncryptUpdate(ctx, pointer + sizeof (int), &tmp_len,
+ (unsigned char *)buffer,
+ eina_binbuf_length_get(data) + sizeof(unsigned int)))
+ goto on_error;
+
+ /* Openssl close the cipher */
+ if (!EVP_EncryptFinal_ex(ctx, pointer + sizeof (int) + tmp_len,
+ &tmp_len))
+ goto on_error;
+
+ EVP_CIPHER_CTX_free(ctx);
+#else
/* Openssl encrypt */
if (!EVP_EncryptUpdate(&ctx, pointer + sizeof (int), &tmp_len,
(unsigned char *)buffer,
@@ -157,6 +187,8 @@ emile_binbuf_cipher(Emile_Cipher_Algorit
goto on_error;
EVP_CIPHER_CTX_cleanup(&ctx);
+#endif
+
free(buffer);
return result;
@@ -167,8 +199,11 @@ on_error:
/* Openssl error */
if (opened)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_CIPHER_CTX_free(ctx);
+#else
EVP_CIPHER_CTX_cleanup(&ctx);
-
+#endif
free(buffer);
/* General error */
@@ -186,7 +221,11 @@ emile_binbuf_decipher(Emile_Cipher_Algor
{
Eina_Binbuf *result = NULL;
unsigned int *over;
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_CIPHER_CTX *ctx;
+#else
EVP_CIPHER_CTX ctx;
+#endif
unsigned char ik[MAX_KEY_LEN];
unsigned char iv[MAX_IV_LEN];
unsigned char key_material[MAX_KEY_LEN + MAX_IV_LEN];
@@ -230,15 +269,35 @@ emile_binbuf_decipher(Emile_Cipher_Algor
eina_binbuf_append_length(result, (unsigned char*) (over + 1), tmp_len);
/* Openssl create the corresponding cipher */
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ ctx = EVP_CIPHER_CTX_new();
+ if (ctx == NULL)
+ goto on_error;
+ opened = 1;
+
+ if (!EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, ik, iv))
+ goto on_error;
+#else
EVP_CIPHER_CTX_init(&ctx);
opened = 1;
if (!EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, ik, iv))
goto on_error;
+#endif
memset(iv, 0, sizeof (iv));
memset(ik, 0, sizeof (ik));
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ /* Openssl decrypt */
+ if (!EVP_DecryptUpdate(ctx,
+ (void*) eina_binbuf_string_get(result), &tmp,
+ (void*) (over + 1), tmp_len))
+ goto on_error;
+
+ /* Openssl close the cipher*/
+ EVP_CIPHER_CTX_free(ctx);
+#else
/* Openssl decrypt */
if (!EVP_DecryptUpdate(&ctx,
(void*) eina_binbuf_string_get(result), &tmp,
@@ -247,6 +306,7 @@ emile_binbuf_decipher(Emile_Cipher_Algor
/* Openssl close the cipher*/
EVP_CIPHER_CTX_cleanup(&ctx);
+#endif
/* Get the decrypted data size */
tmp = *(unsigned int*)(eina_binbuf_string_get(result));
@@ -265,7 +325,11 @@ on_error:
memset(ik, 0, sizeof (ik));
if (opened)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_CIPHER_CTX_free(ctx);
+#else
EVP_CIPHER_CTX_cleanup(&ctx);
+#endif
eina_binbuf_free(result);

View File

@ -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-1.20.2-endian.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up efl-1.20.2/src/lib/eina/eina_debug.c.orig efl-1.20.2/src/lib/eina/eina_debug.c
--- efl-1.20.2/src/lib/eina/eina_debug.c.orig 2017-08-30 18:09:56.823901819 +0200
+++ efl-1.20.2/src/lib/eina/eina_debug.c 2017-08-30 18:10:09.023901819 +0200
@@ -60,6 +60,7 @@
#endif
#include "eina_debug.h"
+#include "eina_cpu.h"
#include "eina_types.h"
#include "eina_list.h"
#include "eina_mempool.h"

View File

@ -0,0 +1,39 @@
diff -up efl-1.21.0/src/lib/edje/edje_private.h.luajitfix efl-1.21.0/src/lib/edje/edje_private.h
--- efl-1.21.0/src/lib/edje/edje_private.h.luajitfix 2018-08-18 14:53:50.946311297 -0400
+++ efl-1.21.0/src/lib/edje/edje_private.h 2018-08-18 14:55:48.918580278 -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 _WIN32
diff -up efl-1.21.0/src/lib/elua/elua_private.h.luajitfix efl-1.21.0/src/lib/elua/elua_private.h
--- efl-1.21.0/src/lib/elua/elua_private.h.luajitfix 2018-07-27 06:22:36.000000000 -0400
+++ efl-1.21.0/src/lib/elua/elua_private.h 2018-08-18 14:53:50.946311297 -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.21.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c
--- efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c.luajitfix 2018-05-17 16:34:58.000000000 -0400
+++ efl-1.21.0/src/lib/evas/filters/evas_filter_parser.c 2018-08-18 14:53:50.946311297 -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

View File

@ -0,0 +1,14 @@
diff -up efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c.pragma efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c
--- efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c.pragma 2018-08-18 15:27:24.073708072 -0400
+++ efl-1.21.0/src/lib/efl/interfaces/efl_ui_format.c 2018-08-18 15:28:38.690980709 -0400
@@ -130,7 +130,10 @@ _default_format_cb(void *data, Eina_Strb
}
else if (sd->format_type == FORMAT_TYPE_STATIC)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
eina_strbuf_append_printf(str, sd->template);
+#pragma GCC diagnostic pop
}
else
{

View File

@ -0,0 +1,15 @@
diff -up efl-1.21.1/src/lib/evas/Evas_GL.h.khrplatform efl-1.21.1/src/lib/evas/Evas_GL.h
--- efl-1.21.1/src/lib/evas/Evas_GL.h.khrplatform 2019-02-15 19:58:49.927937159 -0500
+++ efl-1.21.1/src/lib/evas/Evas_GL.h 2019-02-15 19:58:55.970818084 -0500
@@ -4273,8 +4273,9 @@ typedef signed int GLfixed; /
#ifndef GL_ES_VERSION_2_0
/* GL types for handling large vertex buffer objects */
#include <stddef.h>
-typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t
-typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t
+#include <KHR/khrplatform.h>
+typedef khronos_intptr_t GLintptr;
+typedef khronos_ssize_t GLsizeiptr;
#endif
/* Some definitions from GLES 3.0.

View File

@ -0,0 +1,14 @@
diff -up efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c.pragma efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c
--- efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c.pragma 2019-05-02 15:05:56.681118361 -0400
+++ efl-1.22.2/src/lib/efl/interfaces/efl_ui_format.c 2019-05-02 15:07:48.641683821 -0400
@@ -124,7 +124,10 @@ _default_format_cb(void *data, Eina_Strb
}
else if (sd->format_type == FORMAT_TYPE_STATIC)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
eina_strbuf_append(str, sd->template);
+#pragma GCC diagnostic pop
}
else
{

View File

@ -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)
{

View File

@ -1,16 +0,0 @@
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'
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')
- message('ARM build - NEON enabled')
elif host_machine.cpu_family() == 'aarch64'
cpu_neon = true
cpu_neon_intrinsics = true

211
efl.spec
View File

@ -1,14 +1,17 @@
%global _hardened_build 1
%global has_luajit 1
%if 0%{?rhel} && 0%{?rhel} <= 7
%global has_luajit 0
%else
%ifarch %{arm} %{ix86} x86_64
%global has_luajit 1
%endif
# PANIC: unprotected error in call to Lua API (bad light userdata pointer)
# Disabling luajit for aarch64
# %%ifarch aarch64
# %%global has_luajit 0
# %%endif
%ifarch aarch64
%global has_luajit 0
%endif
%endif
# 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
@ -25,22 +28,19 @@
Name: efl
Version: 1.25.1
Release: 3%{?dist}
Version: 1.22.4
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
# 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
Patch1: efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
# 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
Patch2: efl-1.21.0-luajitfix.patch
# This printf is safe even if format-security disagrees
Patch3: efl-1.22.2-use-pragma-to-ignore-safe-printf.patch
%ifnarch s390 s390x
BuildRequires: libunwind-devel
@ -53,19 +53,14 @@ 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: libblkid-devel libmount-devel systemd-devel harfbuzz-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
BuildRequires: rlottie-devel
BuildRequires: libxkbcommon-devel uuid-devel libxkbcommon-x11-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
# 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
@ -75,7 +70,7 @@ BuildRequires: doxygen systemd giflib-devel openjpeg2-devel libdrm-devel
BuildRequires: wayland-devel >= 1.11.0
BuildRequires: wayland-protocols-devel >= 1.7
%endif
BuildRequires: ninja-build meson gettext-devel mesa-libGLES-devel
BuildRequires: autoconf automake libtool gettext-devel mesa-libGLES-devel
BuildRequires: mesa-libgbm-devel libinput-devel
%if 0%{?has_luajit}
BuildRequires: luajit-devel
@ -111,7 +106,7 @@ 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: embryo = %{version}-%{release}
Provides: embryo%{?_isa} = %{version}-%{release}
@ -173,7 +168,7 @@ 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%{?_isa} = %{version}-%{release}
Obsoletes: embryo-devel <= 1.7.10
@ -199,62 +194,59 @@ Development files for EFL.
%prep
%setup -q
%if 0%{?rhel} && 0%{?rhel} <= 7
#%patch1 -p1 -b .old
%patch1 -p1 -b .old
%endif
#%patch2 -p1 -b .luajitfix
%patch3 -p1 -b .noneon
%patch4 -p1 -b .checkfix
%patch2 -p1 -b .luajitfix
%patch3 -p1 -b .pragma
autoreconf -ifv
# This is why hardcoding paths is bad.
# sed -i -e 's|/opt/efl-%{version}/share/|%{_datadir}/|' \
# data/libeo.so.%{version}-gdb.py
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 \
-Dharfbuzz=true \
-Dsdl=true \
-Dbuffer=true \
-Davahi=true \
# 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-ibus \
%if %{with_scim}
-Decore-imf-loaders-disabler= \
--enable-scim \
%else
-Decore-imf-loaders-disabler=scim \
-Dglib=true \
--disable-scim \
--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb \
%endif
-Dfb=true \
--enable-fb \
%if %{use_wayland}
-Dwl=true \
--enable-wayland \
%endif
-Ddrm=true \
-Dinstall-eo-files=true \
%if 0%{?has_luajit}
-Dbindings=lua,cxx \
-Dlua-interpreter=luajit \
-Delua=true \
%else
-Dbindings=cxx \
-Dlua-interpreter=lua \
--enable-elput \
--enable-drm \
--enable-drm-hw-accel \
--with-opengl=full \
--disable-static \
--disable-cocoa \
--with-profile=release \
--enable-install-eo-files \
%if ! 0%{?has_luajit}
--enable-lua-old \
%endif
-Dphysics=true \
-Dsystemdunitdir=%{_userunitdir}
%{meson_build}
--with-systemdunitdir=%{_userunitdir}
make %{?_smp_mflags} V=1
# This makes doxygen segfault. :/
# make %{?_smp_mflags} doc V=1
%install
%{meson_install}
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
# yay pathing
%if 0%{?__isa_bits} == 64
mv %{buildroot}%{_datadir}/gdb/auto-load/usr/lib %{buildroot}%{_datadir}/gdb/auto-load%{_libdir}
%endif
# fix perms
chmod -x src/bin/edje/edje_cc_out.c
@ -277,14 +269,13 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%license COPYING licenses/COPYING.BSD licenses/COPYING.GPL licenses/COPYING.LGPL licenses/COPYING.SMALL
%doc AUTHORS COMPLIANCE NEWS README
%{_libdir}/libefl.so.1*
%{_libdir}/libefl_canvas_wl.so.1*
%{_libdir}/libefl_wl.so.1*
%{_bindir}/efl_debug
%{_bindir}/efl_debugd
%{_datadir}/icons/Enlightenment-X/
# ecore
%{_bindir}/ecore_evas_convert
%{_libdir}/ecore/
%{_libdir}/ecore_buffer/
%{_libdir}/ecore_con/
%{_libdir}/ecore_evas/
%{_libdir}/ecore_imf/
@ -334,7 +325,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
# elementary
%{_bindir}/elementary_codegen
%{_bindir}/elementary_config
%{_bindir}/elementary_perf
%{_bindir}/elementary_quicklaunch
%{_bindir}/elementary_run
%{_bindir}/elementary_test
@ -345,7 +335,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_datadir}/elementary/
%{_datadir}/icons/hicolor/*/apps/elementary.png
# elocation
# %%{_libdir}/libelocation.so.1*
%{_libdir}/libelocation.so.1*
# elput
%{_libdir}/libelput.so.1*
# elua
@ -361,7 +351,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/libembryo.so.1*
%{_libdir}/libemile.so.*
# emotion
%{_bindir}/emotion_test*
%{_libdir}/emotion/
%{_libdir}/libemotion.so.1*
# eo
@ -392,30 +381,25 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/evas/
%{_libdir}/libevas.so.*
%{_datadir}/evas/
# exactness
%{_bindir}/exactness*
%{_libdir}/libexactness*.so.*
%{_datadir}/exactness/
%files devel
%{_includedir}/efl-1/
%{_includedir}/efl-cxx-1/
%{_includedir}/efl-canvas-wl-1/
%{_bindir}/efl_canvas_wl_test*
%{_includedir}/efl-wl-1/
%{_bindir}/efl_wl_test*
%{_libdir}/cmake/Efl/
%{_libdir}/libefl.so
%{_libdir}/libefl_canvas_wl.so
%{_libdir}/libefl_wl.so
%{_libdir}/pkgconfig/efl-core.pc
%{_libdir}/pkgconfig/efl-cxx.pc
%{_libdir}/pkgconfig/efl-net.pc
%{_libdir}/pkgconfig/efl-ui.pc
%{_libdir}/pkgconfig/efl-canvas-wl.pc
%{_libdir}/pkgconfig/efl-wl.pc
%{_libdir}/pkgconfig/efl.pc
# ecore-devel
%{_includedir}/ecore-1/
%{_includedir}/ecore-audio-1/
%{_includedir}/ecore-avahi-1/
%{_includedir}/ecore-buffer-1/
%{_includedir}/ecore-con-1/
%{_includedir}/ecore-cxx-1/
%{_includedir}/ecore-drm2-1/
@ -429,7 +413,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_includedir}/ecore-ipc-1/
%{_includedir}/ecore-sdl-1/
%if %{use_wayland}
%{_includedir}/ecore-wl2-1/
%endif
%{_includedir}/ecore-x-1/
@ -482,11 +465,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/cmake/Eio/
# eldbus-devel
%{_includedir}/eldbus-1/
%{_includedir}/eldbus-cxx-1/
%{_includedir}/eldbus_cxx-1/
%{_libdir}/cmake/Eldbus/
%{_libdir}/libeldbus.so
%{_libdir}/pkgconfig/eldbus.pc
%{_libdir}/pkgconfig/eldbus-cxx.pc
# elementary-devel
%{_includedir}/elementary-1/
%{_includedir}/elementary-cxx-1/
@ -495,9 +477,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/pkgconfig/elementary.pc
%{_libdir}/pkgconfig/elementary-cxx.pc
# elocation-devel
# %%{_includedir}/elocation-1/
# %%{_libdir}/libelocation.so
# %%{_libdir}/pkgconfig/elocation.pc
%{_includedir}/elocation-1/
%{_libdir}/libelocation.so
%{_libdir}/pkgconfig/elocation.pc
# elput-devel
%{_includedir}/elput-1/
%{_libdir}/libelput.so
@ -557,7 +539,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/libethumb.so
%{_libdir}/libethumb_client.so
%{_libdir}/pkgconfig/ethumb.pc
%{_libdir}/pkgconfig/ethumb-client.pc
%{_libdir}/pkgconfig/ethumb_client.pc
# evas-devel
%{_includedir}/evas-1/
@ -566,72 +547,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_libdir}/cmake/Evas/
%{_libdir}/cmake/EvasCxx/
%{_libdir}/pkgconfig/evas*.pc
# exactness
%{_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
- Remove Patch1 efl-1.17.1-old-nomodifier-in-drm_mode_fb_cmd2.patch
- Remove Patch2 efl-1.23.1-luajitfix.patch
as luaL_reg is no longer required
* Tue May 26 2020 Tom Callaway <spot@fedoraproject.org> - 1.24.2-1
- update to 1.24.2
* Mon May 11 2020 Tom Callaway <spot@fedoraproject.org> - 1.24.1-1
- update to 1.24.1
* Mon May 11 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.23.3-6
- Rebuild for new LibRaw
* Tue May 05 2020 Sereinity <sereinity@sereinity.fr> - 1.23.3-5
- rebuilt
* Fri Jan 31 2020 Tom Callaway <spot@fedoraproject.org> - 1.23.3-4
- fix FTBFS
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 17 2020 Marek Kasik <mkasik@redhat.com> - 1.23.3-2
- Rebuild for poppler-0.84.0
* Mon Dec 2 2019 Tom Callaway <spot@fedoraproject.org> - 1.23.3-1
- update to 1.23.3
* Tue Nov 5 2019 Tom Callaway <spot@fedoraproject.org> - 1.23.2-1
- update to 1.23.2
* Wed Oct 16 2019 Tom Callaway <spot@fedoraproject.org> - 1.23.1-1
- update to 1.23.1
* Wed Sep 4 2019 Tom Callaway <spot@fedoraproject.org> - 1.22.4-1
- update to 1.22.4

View File

@ -1 +1 @@
SHA512 (efl-1.25.1.tar.xz) = cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
SHA512 (efl-1.22.4.tar.xz) = 0a9e5bd40dfeb10f4c17c64aae5c9af8f54be934b78216f6effecaf077b9f57fe704cb61ded4487472bd9451a3eeb6634b2c0d0d038e911177c2e33576ad6b6e