[packages/efl] - updated to 1.11.4; vim files moved to separate repo
qboosh
qboosh at pld-linux.org
Thu Jul 25 19:28:28 CEST 2024
commit e80771f5f7ec38934b2579b081471154e55127a7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jul 25 19:09:23 2024 +0200
- updated to 1.11.4; vim files moved to separate repo
efl-deps.patch | 11 +++
efl-dns.patch | 11 +++
efl-openssl1.1.patch | 249 +++++++++++++++++++++++++++++++++++++++++++++++++++
efl-sdl2.patch | 11 +++
efl-wayland.patch | 58 ------------
efl.spec | 124 +++++++++++++++++--------
6 files changed, 369 insertions(+), 95 deletions(-)
---
diff --git a/efl.spec b/efl.spec
index 9dae9b6..9ac3cad 100644
--- a/efl.spec
+++ b/efl.spec
@@ -30,15 +30,20 @@
Summary: EFL - The Enlightenment Foundation Libraries
Summary(pl.UTF-8): EFL (Enlightenment Foundation Libraries) - biblioteki tworzące Enlightment
Name: efl
-Version: 1.10.3
-Release: 9
+Version: 1.11.4
+Release: 1
License: LGPL v2.1+, BSD (depends on component)
Group: Libraries
-Source0: https://download.enlightenment.org/rel/libs/efl/%{name}-%{version}.tar.bz2
-# Source0-md5: 6b3d88134d3d27dd9b41a4a46d718a19
+#Source0: https://download.enlightenment.org/rel/libs/efl/%{name}-%{version}.tar.bz2
+# temporary URL for old versions
+Source0: http://sources.openembedded.org/%{name}-%{version}.tar.gz
+# Source0-md5: eb2bd4a2f6684211dbd5382db024137d
Patch0: %{name}-pc.patch
-Patch1: %{name}-wayland.patch
+Patch1: %{name}-openssl1.1.patch
Patch2: %{name}-am.patch
+Patch3: %{name}-dns.patch
+Patch4: %{name}-sdl2.patch
+Patch5: %{name}-deps.patch
URL: https://www.enlightenment.org/docs/efl/start
%{?with_egl:BuildRequires: EGL-devel}
BuildRequires: OpenGL-GLX-devel
@@ -126,7 +131,7 @@ BuildRequires: wayland-egl-devel >= 9.2.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# it used to be linux-gnu-ARCH before...
-%define arch_tag v-1.10
+%define arch_tag v-1.11
%description
EFL - The Enlightenment Foundation Libraries.
@@ -1680,6 +1685,20 @@ Static eldbus library.
%description -n eldbus-static -l pl.UTF-8
Statyczna biblioteka eldbus.
+%package -n eldbus-cxx-devel
+Summary: C++ API for eldbus library
+Summary(pl.UTF-8): API języka C++ do biblioteki eldbus
+Group: Development/Libraries
+Requires: eina-cxx-devel = %{version}-%{release}
+Requires: eldbus-devel = %{version}-%{release}
+Requires: libstdc++-devel
+
+%description -n eldbus-cxx-devel
+C++ API for eldbus library.
+
+%description -n eldbus-cxx-devel -l pl.UTF-8
+API języka C++ do biblioteki eldbus.
+
%package -n embryo
Summary: Enlightenment Fundation Libraries - Embryo
Summary(pl.UTF-8): Podstawowe biblioteki Enlightenmenta - Embryo
@@ -2198,6 +2217,20 @@ Framebuffer rendering engine module for Evas.
%description -n evas-engine-fb -l pl.UTF-8
Moduł silnika renderującego na framebuffer dla Evas.
+%package -n evas-engine-gl_generic
+Summary: Generic OpenGL rendering engine module for Evas
+Summary(pl.UTF-8): Moduł silnika renderującego OpenGL dla Evas
+License: BSD
+Group: Libraries
+URL: http://trac.enlightenment.org/e/wiki/Evas
+Requires: evas = %{version}-%{release}
+
+%description -n evas-engine-gl_generic
+Generic OpenGL rendering engine module for Evas.
+
+%description -n evas-engine-gl_generic -l pl.UTF-8
+Moduł silnika renderującego OpenGL dla Evas.
+
%package -n evas-engine-gl_sdl
Summary: SDL OpenGL rendering engine module for Evas
Summary(pl.UTF-8): Moduł silnika renderującego na SDL OpenGL dla Evas
@@ -2205,6 +2238,7 @@ License: BSD
Group: Libraries
URL: http://trac.enlightenment.org/e/wiki/Evas
Requires: evas = %{version}-%{release}
+Requires: evas-engine-gl_generic = %{version}-%{release}
Requires: SDL >= 1.2.0
%description -n evas-engine-gl_sdl
@@ -2220,6 +2254,7 @@ License: BSD
Group: Libraries
URL: http://trac.enlightenment.org/e/wiki/Evas
Requires: evas = %{version}-%{release}
+Requires: evas-engine-gl_generic = %{version}-%{release}
%description -n evas-engine-gl_x11
OpenGL under X11 rendering engine module for Evas.
@@ -2249,6 +2284,7 @@ License: BSD
Group: Libraries
URL: http://trac.enlightenment.org/e/wiki/Evas
Requires: evas = %{version}-%{release}
+Requires: evas-engine-gl_generic = %{version}-%{release}
Requires: wayland-egl >= 9.2.0
%description -n evas-engine-wayland_egl
@@ -2415,24 +2451,31 @@ WebP Image saver module for Evas.
%description -n evas-saver-webp -l pl.UTF-8
Moduł zapisywania obrazów WebP dla Evas.
-%package -n vim-addon-efl
-Summary: EDC syntax support for Vim
-Summary(pl.UTF-8): Obsługa składni EDC dla Vima
-Group: Applications/Editors/Vim
-Requires: vim-rt
-Obsoletes: vim-syntax-edc < 1.8
+%package -n elua
+Summary: EFL/LuaJIT executor
+Summary(pl.UTF-8): Program uruchamiający EFL/LuaJIT
+Group: Development/Languages
+Requires: ecore = %{version}-%{release}
+Requires: eina = %{version}-%{release}
+Requires: eo = %{version}-%{release}
+Requires: luajit >= 2.0.0
-%description -n vim-addon-efl
-EDC syntax support for Vim.
+%description -n elua
+EFL/LuaJIT executor.
-%description -n vim-addon-efl -l pl.UTF-8
-Obsługa składni EDC dla Vima.
+%description -n elua -l pl.UTF-8
+Program uruchamiający EFL/LuaJIT.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+%{__sed} -i -e 's/libsystemd-login/libsystemd/' configure.ac
%build
%{__libtoolize}
@@ -2476,10 +2519,6 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles
-cp -pr data/edje/vim/autoload $RPM_BUILD_ROOT%{_datadir}/vim
-cp -pr data/edje/vim/{ftdetect,ftplugin,indent,snippets,syntax} $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles
-
# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
# loadable modules
@@ -2691,10 +2730,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libecore_drm.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libecore_drm.so.1
-%dir %{_libdir}/ecore_drm
-%dir %{_libdir}/ecore_drm/bin
-%dir %{_libdir}/ecore_drm/bin/%{arch_tag}
-%attr(755,root,root) %{_libdir}/ecore_drm/bin/%{arch_tag}/ecore_drm_launch
%files -n ecore-drm-devel
%defattr(644,root,root,755)
@@ -2968,6 +3003,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libecore_x.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libecore_x.so.1
+%dir %{_libdir}/ecore_x
+%dir %{_libdir}/ecore_x/bin
+%dir %{_libdir}/ecore_x/bin/%{arch_tag}
+%attr(755,root,root) %{_libdir}/ecore_x/bin/%{arch_tag}/ecore_x_vsync
+%{_datadir}/ecore_x
%files -n ecore-x-devel
%defattr(644,root,root,755)
@@ -2994,7 +3034,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/edje_watch
%dir %{_libdir}/edje/utils
%dir %{_libdir}/edje/utils/%{arch_tag}
-%attr(755,root,root) %dir %{_libdir}/edje/utils/%{arch_tag}/epp
+%attr(755,root,root) %{_libdir}/edje/utils/%{arch_tag}/epp
%{_datadir}/edje
%{_datadir}/mime/packages/edje.xml
@@ -3191,6 +3231,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libeldbus.a
%endif
+%files -n eldbus-cxx-devel
+%defattr(644,root,root,755)
+%{_includedir}/eldbus_cxx-1
+
%files -n embryo
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/embryo_cc
@@ -3442,6 +3486,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/evas/modules/engines/fb/%{arch_tag}/module.so
%endif
+%files -n evas-engine-gl_generic
+%defattr(644,root,root,755)
+%dir %{_libdir}/evas/modules/engines/gl_generic
+%dir %{_libdir}/evas/modules/engines/gl_generic/%{arch_tag}
+%attr(755,root,root) %{_libdir}/evas/modules/engines/gl_generic/%{arch_tag}/module.so
+
%if %{with sdl}
%files -n evas-engine-gl_sdl
%defattr(644,root,root,755)
@@ -3538,15 +3588,15 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/evas/modules/savers/webp/%{arch_tag}
%attr(755,root,root) %{_libdir}/evas/modules/savers/webp/%{arch_tag}/module.so
-%files -n vim-addon-efl
-%defattr(644,root,root,755)
-%doc data/edje/vim/plugin-info.txt
-%{_datadir}/vim/autoload/edccomplete.vim
-%{_datadir}/vim/vimfiles/ftdetect/edc.vim
-%{_datadir}/vim/vimfiles/ftplugin/edc.vim
-%{_datadir}/vim/vimfiles/indent/edc.vim
-# owner?
-%dir %{_datadir}/vim/vimfiles/snippets
-%{_datadir}/vim/vimfiles/snippets/edc.snippets
-%{_datadir}/vim/vimfiles/syntax/edc.vim
-%{_datadir}/vim/vimfiles/syntax/embryo.vim
+%if %{with luajit}
+%files -n elua
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/elua
+%dir %{_datadir}/elua
+%{_datadir}/elua/apps
+%{_datadir}/elua/core
+%dir %{_datadir}/elua/modules
+%{_datadir}/elua/modules/*.lua
+%{_datadir}/elua/modules/eina
+%{_datadir}/elua/modules/xgettext
+%endif
diff --git a/efl-deps.patch b/efl-deps.patch
new file mode 100644
index 0000000..d1e1a05
--- /dev/null
+++ b/efl-deps.patch
@@ -0,0 +1,11 @@
+--- efl-1.11.4/src/Makefile_Evas.am.orig 2014-08-27 10:11:10.000000000 +0200
++++ efl-1.11.4/src/Makefile_Evas.am 2024-07-25 06:21:29.512436590 +0200
+@@ -1233,7 +1233,7 @@ modules_evas_engines_drm_module_la_LIBAD
+ @USE_EVAS_LIBS@ \
+ @USE_ECORE_DRM_LIBS@ \
+ @evas_engine_drm_libs@
+-modules_evas_engines_drm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
++modules_evas_engines_drm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ @USE_ECORE_DRM_INTERNAL_LIBS@
+ modules_evas_engines_drm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+ modules_evas_engines_drm_module_la_LIBTOOLFLAGS = --tag=disable-static
+ endif
diff --git a/efl-dns.patch b/efl-dns.patch
new file mode 100644
index 0000000..92002c7
--- /dev/null
+++ b/efl-dns.patch
@@ -0,0 +1,11 @@
+--- efl-1.11.4/src/lib/ecore_con/dns.h.orig 2014-03-10 11:45:48.000000000 +0100
++++ efl-1.11.4/src/lib/ecore_con/dns.h 2024-07-24 21:59:06.729899805 +0200
+@@ -138,7 +138,7 @@ extern int dns_debug;
+
+ #define dns_quietinit(...) \
+ DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4
++#elif 0
+ #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push")
+ #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"")
+ #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop")
diff --git a/efl-openssl1.1.patch b/efl-openssl1.1.patch
new file mode 100644
index 0000000..94d891e
--- /dev/null
+++ b/efl-openssl1.1.patch
@@ -0,0 +1,249 @@
+Partially based on git changes.
+--- efl-1.11.4/src/lib/eet/eet_cipher.c.orig 2013-03-20 19:18:03.000000000 +0100
++++ efl-1.11.4/src/lib/eet/eet_cipher.c 2024-07-24 20:54:21.660947030 +0200
+@@ -481,7 +481,11 @@ eet_identity_sign(FILE *fp,
+ gnutls_datum_t signum = { NULL, 0 };
+ gnutls_privkey_t privkey;
+ # else /* ifdef HAVE_GNUTLS */
++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++ EVP_MD_CTX *md_ctx;
++# else
+ EVP_MD_CTX md_ctx;
++# endif
+ unsigned int sign_len = 0;
+ int cert_len = 0;
+ # endif /* ifdef HAVE_GNUTLS */
+@@ -565,12 +569,24 @@ eet_identity_sign(FILE *fp,
+ }
+
+ /* Do the signature. */
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++ md_ctx = EVP_MD_CTX_new();
++ 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);
++ EVP_MD_CTX_free(md_ctx);
++#else
+ 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);
++ EVP_MD_CTX_cleanup(&md_ctx);
++#endif
+ if (err != 1)
+ {
+ ERR_print_errors_fp(stdout);
+@@ -741,7 +757,11 @@ eet_identity_check(const void *data_ba
+ const unsigned char *tmp;
+ EVP_PKEY *pkey;
+ X509 *x509;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++ EVP_MD_CTX *md_ctx;
++#else
+ EVP_MD_CTX md_ctx;
++#endif
+ int err;
+
+ /* Strange but d2i_X509 seems to put 0 all over the place. */
+@@ -760,9 +780,18 @@ eet_identity_check(const void *data_ba
+ }
+
+ /* Verify the signature */
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++ md_ctx = EVP_MD_CTX_new();
++ EVP_VerifyInit(md_ctx, EVP_sha1());
++ EVP_VerifyUpdate(md_ctx, data_base, data_length);
++ err = EVP_VerifyFinal(md_ctx, sign, sign_len, pkey);
++ EVP_MD_CTX_free(md_ctx);
++#else
+ EVP_VerifyInit(&md_ctx, EVP_sha1());
+ EVP_VerifyUpdate(&md_ctx, data_base, data_length);
+ err = EVP_VerifyFinal(&md_ctx, sign, sign_len, pkey);
++ EVP_MD_CTX_cleanup(&md_ctx);
++#endif
+
+ X509_free(x509);
+ EVP_PKEY_free(pkey);
+@@ -889,14 +918,14 @@ eet_cipher(const void *data,
+ unsigned int salt;
+ unsigned int tmp = 0;
+ int crypted_length;
+- int opened = 0;
+ # ifdef HAVE_GNUTLS
+ /* Gcrypt declarations */
++ int opened = 0;
+ gcry_error_t err = 0;
+ gcry_cipher_hd_t cipher;
+ # else /* ifdef HAVE_GNUTLS */
+ /* Openssl declarations*/
+- EVP_CIPHER_CTX ctx;
++ EVP_CIPHER_CTX *ctx = NULL;
+ unsigned int *buffer = NULL;
+ int tmp_len;
+ # endif /* ifdef HAVE_GNUTLS */
+@@ -980,27 +1009,26 @@ eet_cipher(const void *data,
+
+ /* 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))
++ ctx = EVP_CIPHER_CTX_new();
++ if (!EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, ik, iv))
+ goto on_error;
+
+- opened = 1;
+-
+ memset(iv, 0, sizeof (iv));
+ memset(ik, 0, sizeof (ik));
+
+ /* Openssl encrypt */
+- if (!EVP_EncryptUpdate(&ctx, (unsigned char *)(ret + 1), &tmp_len,
++ if (!EVP_EncryptUpdate(ctx, (unsigned char *)(ret + 1), &tmp_len,
+ (unsigned char *)buffer,
+ size + sizeof(unsigned int)))
+ goto on_error;
+
+ /* Openssl close the cipher */
+- if (!EVP_EncryptFinal_ex(&ctx, ((unsigned char *)(ret + 1)) + tmp_len,
++ if (!EVP_EncryptFinal_ex(ctx, ((unsigned char *)(ret + 1)) + tmp_len,
+ &tmp_len))
+ goto on_error;
+
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_free(ctx);
++ ctx = NULL;
+ free(buffer);
+ # endif /* ifdef HAVE_GNUTLS */
+
+@@ -1026,8 +1054,8 @@ on_error:
+
+ # else /* ifdef HAVE_GNUTLS */
+ /* Openssl error */
+- if (opened)
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ if (ctx)
++ EVP_CIPHER_CTX_cleanup(ctx);
+
+ free(buffer);
+
+@@ -1070,7 +1098,6 @@ eet_decipher(const void *data,
+ unsigned int salt;
+ int tmp_len;
+ int tmp = 0;
+- int opened = 0;
+
+ /* At least the salt and an AES block */
+ if (size < sizeof(unsigned int) + 16)
+@@ -1129,25 +1156,25 @@ eet_decipher(const void *data,
+ gcry_cipher_close(cipher);
+
+ # else /* ifdef HAVE_GNUTLS */
+- EVP_CIPHER_CTX ctx;
++ EVP_CIPHER_CTX *ctx = NULL;
+
+ /* Openssl create the corresponding cipher */
+- EVP_CIPHER_CTX_init(&ctx);
+- opened = 1;
++ ctx = EVP_CIPHER_CTX_new();
+
+- if (!EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, ik, iv))
++ if (!EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, ik, iv))
+ goto on_error;
+
+ memset(iv, 0, sizeof (iv));
+ memset(ik, 0, sizeof (ik));
+
+ /* Openssl decrypt */
+- if (!EVP_DecryptUpdate(&ctx, (unsigned char *)ret, &tmp,
++ if (!EVP_DecryptUpdate(ctx, (unsigned char *)ret, &tmp,
+ (unsigned char *)(over + 1), tmp_len))
+ goto on_error;
+
+ /* Openssl close the cipher*/
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_free(ctx);
++ ctx = NULL;
+ # endif /* ifdef HAVE_GNUTLS */
+ /* Get the decrypted data size */
+ tmp = *ret;
+@@ -1177,11 +1204,9 @@ on_error:
+ memset(iv, 0, sizeof (iv));
+ memset(ik, 0, sizeof (ik));
+
+-# ifdef HAVE_GNUTLS
+- (void)opened;
+-# else
+- if (opened)
+- EVP_CIPHER_CTX_cleanup(&ctx);
++# ifndef HAVE_GNUTLS
++ if (ctx)
++ EVP_CIPHER_CTX_free(ctx);
+
+ # endif /* ifdef HAVE_GNUTLS */
+ if (result)
+@@ -1268,7 +1293,7 @@ eet_pbkdf2_sha1(const char *key
+ int j, k;
+ # ifdef HAVE_GNUTLS
+ # else
+- HMAC_CTX hctx;
++ HMAC_CTX *hctx = NULL;
+ # endif /* ifdef HAVE_GNUTLS */
+
+ buf = alloca(salt_len + 4);
+@@ -1292,10 +1317,11 @@ eet_pbkdf2_sha1(const char *key
+ memcpy(buf + salt_len, tab, 4);
+ eet_hmac_sha1(key, key_len, buf, salt_len + 4, digest);
+ # else /* ifdef HAVE_GNUTLS */
+- HMAC_Init(&hctx, key, key_len, EVP_sha1());
+- HMAC_Update(&hctx, salt, salt_len);
+- HMAC_Update(&hctx, tab, 4);
+- HMAC_Final(&hctx, digest, NULL);
++ hctx = HMAC_CTX_new();
++ HMAC_Init(hctx, key, key_len, EVP_sha1());
++ HMAC_Update(hctx, salt, salt_len);
++ HMAC_Update(hctx, tab, 4);
++ HMAC_Final(hctx, digest, NULL);
+ # endif /* ifdef HAVE_GNUTLS */
+ memcpy(p, digest, tmp_len);
+
+@@ -1311,7 +1337,8 @@ eet_pbkdf2_sha1(const char *key
+ }
+ # ifdef HAVE_GNUTLS
+ # else
+- HMAC_cleanup(&hctx);
++ HMAC_CTX_free(hctx);
++ hctx = NULL;
+ # endif /* ifdef HAVE_GNUTLS */
+ }
+
+--- efl-1.11.4/src/lib/ecore_con/ecore_con_ssl.c.orig 2014-05-19 18:10:12.000000000 +0200
++++ efl-1.11.4/src/lib/ecore_con/ecore_con_ssl.c 2024-07-24 22:35:31.978061300 +0200
+@@ -1536,14 +1536,6 @@ _ecore_con_ssl_server_prepare_openssl(Ec
+
+ switch (ssl_type)
+ {
+- case ECORE_CON_USE_SSL3:
+- case ECORE_CON_USE_SSL3 | ECORE_CON_LOAD_CERT:
+- if (!svr->created)
+- SSL_ERROR_CHECK_GOTO_ERROR(!(svr->ssl_ctx = SSL_CTX_new(SSLv3_client_method())));
+- else
+- SSL_ERROR_CHECK_GOTO_ERROR(!(svr->ssl_ctx = SSL_CTX_new(SSLv3_server_method())));
+- break;
+-
+ case ECORE_CON_USE_TLS:
+ case ECORE_CON_USE_TLS | ECORE_CON_LOAD_CERT:
+ if (!svr->created)
+@@ -1554,6 +1546,8 @@ _ecore_con_ssl_server_prepare_openssl(Ec
+
+ case ECORE_CON_USE_MIXED:
+ case ECORE_CON_USE_MIXED | ECORE_CON_LOAD_CERT:
++ case ECORE_CON_USE_SSL3:
++ case ECORE_CON_USE_SSL3 | ECORE_CON_LOAD_CERT:
+ if (!svr->created)
+ SSL_ERROR_CHECK_GOTO_ERROR(!(svr->ssl_ctx = SSL_CTX_new(SSLv23_client_method())));
+ else
diff --git a/efl-sdl2.patch b/efl-sdl2.patch
new file mode 100644
index 0000000..354bee2
--- /dev/null
+++ b/efl-sdl2.patch
@@ -0,0 +1,11 @@
+--- efl-1.11.4/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h.orig 2014-08-27 10:11:11.000000000 +0200
++++ efl-1.11.4/src/modules/evas/engines/gl_sdl/Evas_Engine_GL_SDL.h 2024-07-25 06:29:03.180811277 +0200
+@@ -1,7 +1,7 @@
+ #ifndef _EVAS_ENGINE_GL_SDL_H
+ #define _EVAS_ENGINE_GL_SDL_H
+
+-#include <SDL/SDL.h>
++#include <SDL2/SDL.h>
+
+ typedef struct _Evas_Engine_Info_GL_SDL Evas_Engine_Info_GL_SDL;
+
diff --git a/efl-wayland.patch b/efl-wayland.patch
deleted file mode 100644
index 1026217..0000000
--- a/efl-wayland.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_engine.c.orig 2013-11-24 05:18:45.000000000 +0100
-+++ efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_engine.c 2013-12-07 12:52:11.209362982 +0100
-@@ -128,8 +128,6 @@
- /* external variables */
- int _evas_engine_wl_egl_log_dom = -1;
-
--#ifdef GL_GLES
--
- # ifndef EGL_NATIVE_PIXMAP_KHR
- # define EGL_NATIVE_PIXMAP_KHR 0x30b0
- # endif
-@@ -146,8 +144,6 @@
- unsigned int (*glsym_eglUnmapImageSEC) (void *a, void *b, int c) = NULL;
- unsigned int (*glsym_eglSwapBuffersWithDamage) (EGLDisplay a, void *b, const EGLint *d, EGLint c) = NULL;
-
--#endif
--
- /* local functions */
- static Eina_Bool
- evgl_init(Render_Engine *re)
---- efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_engine.h.orig 2013-11-04 12:58:09.000000000 +0100
-+++ efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_engine.h 2013-12-07 15:04:14.622363802 +0100
-@@ -6,8 +6,8 @@
- /* NB: This already includes wayland-client.h */
- # include <wayland-egl.h>
-
-+# include <EGL/egl.h>
- # ifdef GL_GLES
--# include <EGL/egl.h>
- /* NB: These are already included from gl_common */
- /* # include <GLES2/gl2.h> */
- /* # include <GLES2/gl2ext.h> */
-@@ -65,12 +65,10 @@
- Eina_Bool drew : 1;
- } draw;
-
--#ifdef GL_GLES
- EGLContext egl_context[1];
- EGLSurface egl_surface[1];
- EGLConfig egl_config;
- EGLDisplay egl_disp;
--#endif
-
- Eina_Bool surf : 1;
- };
---- efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_wl_main.c.orig 2013-11-04 12:58:09.000000000 +0100
-+++ efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_wl_main.c 2013-12-07 16:55:11.888751090 +0100
-@@ -170,8 +170,10 @@
- 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);
- evas_gl_common_context_resize(gw->gl_context, w, h, rot);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/efl.git/commitdiff/e80771f5f7ec38934b2579b081471154e55127a7
More information about the pld-cvs-commit
mailing list