package/efl: bump to version 1.23.2
PATCH v3 1/5 package/efl: bump to version 1.23.2
- Remove upstream patch [1].
- Switch to meson build system.
- The cryptography backends is now mandatory, use openssl for the host and use openssl by default for the target if gnutls is not selected.
- Add host-giflib since the dependency can't be disabled anymore. (even by adding gif in HOST_EFL_EVAS_LOADERS_DISABLER).
- Disable explicitely meson build options that was not previously handled (avahi, emotion, ecore-imf-loarders...)
- Elput support is now enabled through drm meson option [2], remove BR2_PACKAGE_EFL_ELPUT.
- Update license file hash (csharp licensing information, cxx bindings licensing)
- Add COPYING.images and licenses/COPYING.ASL license file.
- The evas png loader is now mandatory [3]
(even by adding png in EFL_EVAS_LOADERS_DISABLER).
- Same for the evas gif loader [4].
- Backport an upstream patch to fix the evas build with -Dwl=false.
- Update indentation of hash file (two spaces)
See:
https://www.enlightenment.org/news/efl-1.23.0
https://www.enlightenment.org/news/efl-1.23.1
https://www.enlightenment.org/news/efl-1.23.2
[1] https://git.enlightenment.org/core/efl.git/commit/?id=c46a8143916f0d3f66bbdffc7107c97c88df212d
[2] https://git.enlightenment.org/core/efl.git/tree/meson.build?h=v1.23.3#n297
[3] https://git.enlightenment.org/core/efl.git/tree/src/modules/evas/meson.build?h=v1.23.3#n2
[4] https://git.enlightenment.org/core/efl.git/tree/src/modules/evas/meson.build?h=v1.23.3#n4
--- Config.in.legacy | 18 ++ ...EINA_VALUE_EMPTY-during-library-init.patch | 51 --- ...-evas-fix-compilation-with-Dwl-false.patch | 31 ++ package/efl/Config.in | 40 +-- package/efl/efl.hash | 22 +- package/efl/efl.mk | 304 ++++++++---------- package/enlightenment/Config.in | 1 - 7 files changed, 209 insertions(+), 258 deletions(-) delete mode 100644 package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch create mode 100644 package/efl/0001-evas-fix-compilation-with-Dwl-false.patch
Config.in.legacy +18 -0
@@ -206,6 +206,24 @@ config BR2_PACKAGE_EZXML The ezXML package was removed as it is affected by several CVEs and is not maintained anymore (no release since 2006). +config BR2_PACKAGE_EFL_GIF + bool "efl evas gif loader is mandatory" + select BR2_LEGACY + help + Since efl 1.23.x, the evas gif loader can't be disabled. + +config BR2_PACKAGE_EFL_PNG + bool "efl evas png loader is mandatory" + select BR2_LEGACY + help + Since efl 1.23.x, the evas png loader can't be disabled. + +config BR2_PACKAGE_EFL_ELPUT + bool "efl elput is enabled by efl drm option" + select BR2_LEGACY + help + Since efl 1.23.x, the drm option enable the elput library. + config BR2_PACKAGE_COLLECTD_LVM bool "lvm support in collectd was removed" select BR2_LEGACY
package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch deleted +0 -51
51 lines not on this page · raw message
package/efl/0001-evas-fix-compilation-with-Dwl-false.patch new file +31 -0
@@ -0,0 +1,31 @@ +From e1c289912c4ad68380f8b317c6c91d25b5b73814 Mon Sep 17 00:00:00 2001 +From: Boris Faure <[email protected]> +Date: Thu, 2 Jan 2020 11:38:31 +0000 +Subject: [PATCH] evas: fix compilation with -Dwl=false + +Reviewed-by: Chris Michael <[email protected]> +Reviewed-by: Marcel Hollerbach <[email protected]> +Differential Revision: https://phab.enlightenment.org/D10994 + +(cherry picked from commit a2afcfc872c29bd2c4a60fdafbc655c90f938d1e) +Signed-off-by: Romain Naour <[email protected]> +--- + src/modules/evas/engines/gl_drm/evas_engine.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c +index a5b4c7a4c8..8c1d6013e7 100644 +--- a/src/modules/evas/engines/gl_drm/evas_engine.c ++++ b/src/modules/evas/engines/gl_drm/evas_engine.c +@@ -3,8 +3,6 @@ + #include "../gl_common/evas_gl_define.h" + #include "../software_generic/evas_native_common.h" + +-#include <wayland-client.h> +- + #ifdef HAVE_DLSYM + # include <dlfcn.h> /* dlopen,dlclose,etc */ + #else +-- +2.24.1 +
package/efl/Config.in +10 -30
@@ -11,8 +11,11 @@ config BR2_PACKAGE_EFL depends on BR2_PACKAGE_LUAJIT select BR2_PACKAGE_DBUS select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JPEG # Emile needs libjpeg select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS && BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_LZ4 select BR2_PACKAGE_ZLIB help
@@ -216,58 +219,35 @@ config BR2_PACKAGE_EFL_OPENGL_NONE endchoice # OpenGL support -config BR2_PACKAGE_EFL_ELPUT - bool "Elput" - depends on BR2_PACKAGE_EFL_EEZE - select BR2_PACKAGE_LIBINPUT - select BR2_PACKAGE_LIBXKBCOMMON - help - The elput library is an efl abstraction for the libinput - library which can be used by various other subsystems - (ecore_fb, ecore_drm, etc) to handle interfacing with - libinput without having to duplicate the code in each - subsystem. - -comment "Elput support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE - config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" depends on BR2_PACKAGE_EFL_EEZE depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBINPUT # For elput select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. + Since efl 1.23.x, the drm option enable the elput library + which is an efl abstraction for the libinput library which + can be used by various other subsystems (ecore_fb, ecore_drm, + etc) to handle interfacing with libinput without having to + duplicate the code in each subsystem. + comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ || !BR2_PACKAGE_EFL_EEZE comment "libevas loaders" -config BR2_PACKAGE_EFL_PNG - bool "libevas png loader" - select BR2_PACKAGE_LIBPNG - help - This enables the loader code that loads png files using - libpng. - config BR2_PACKAGE_EFL_JPEG bool "libevas jpeg loader" help This enables the loader code that loads jpeg files using libjpeg. -config BR2_PACKAGE_EFL_GIF - bool "libevas gif loader" - select BR2_PACKAGE_GIFLIB - help - This enables the loader code that loads gif files using - giflib. - config BR2_PACKAGE_EFL_TIFF bool "libevas tiff loader" select BR2_PACKAGE_TIFF
package/efl/efl.hash +12 -10
@@ -1,11 +1,13 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.3.tar.xz.sha256 -sha256 7e7a4199b1e90d400dab2491db6032f8e0b26bab65ec19c9f8a97a82394331c8 efl-1.22.3.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.23.2.tar.xz.sha256sum +sha256 ba8d9e4a4690a6c917c98ec090fffa6ffe005ab911811b8d443aa155ad95d493 efl-1.23.2.tar.xz -sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE -sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37 COPYING -sha256 af4ffe7ed1795a6e9cd3b3ce8747fdc45da449ff58cf35b8027c0699a66fd5cf licenses/COPYING.BSD -sha256 e60d07dfb2c5264f9f405fa52bf0d4f85429dd9ae1bc2ffcff8af1924ef720d1 licenses/COPYING.FTL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/COPYING.GPL -sha256 ae2d99bf2a8e8310281bdbe5e8b78cbe5e89bfead8c01e67a8c68b530efcf25a licenses/COPYING.LGPL -sha256 2996a1c43ee757f9c997a829d82bdd584052323e73cf02ff8126c6fbd95c2d87 licenses/COPYING.NGINX-MIT -sha256 d847c749aa38b8d864665fc4e5c80e2f2a505e414fafe9712e85b5154e908218 licenses/COPYING.SMALL +sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE +sha256 aacde32f865e7166fd8efb117f6a3436c8c6fbe8cce0e4501cb2dbe8c10c86f6 COPYING +sha256 e5133b4034a4749a781e2220ffb230b60a282b88861f1124d69a58abd5143994 COPYING.images +sha256 c95bae1d1ce0235ecccd3560b772ec1efb97f348a79f0fbe0a634f0c2ccefe2c licenses/COPYING.ASL +sha256 af4ffe7ed1795a6e9cd3b3ce8747fdc45da449ff58cf35b8027c0699a66fd5cf licenses/COPYING.BSD +sha256 e60d07dfb2c5264f9f405fa52bf0d4f85429dd9ae1bc2ffcff8af1924ef720d1 licenses/COPYING.FTL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licenses/COPYING.GPL +sha256 ae2d99bf2a8e8310281bdbe5e8b78cbe5e89bfead8c01e67a8c68b530efcf25a licenses/COPYING.LGPL +sha256 2996a1c43ee757f9c997a829d82bdd584052323e73cf02ff8126c6fbd95c2d87 licenses/COPYING.NGINX-MIT +sha256 d847c749aa38b8d864665fc4e5c80e2f2a505e414fafe9712e85b5154e908218 licenses/COPYING.SMALL
package/efl/efl.mk +138 -166
492 lines not on this page · raw message
package/enlightenment/Config.in +0 -1
@@ -17,7 +17,6 @@ config BR2_PACKAGE_ENLIGHTENMENT select BR2_PACKAGE_EFL_X_XLIB select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start - select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start select BR2_PACKAGE_EFL_SVG select BR2_PACKAGE_XCB_UTIL_KEYSYMS help
Signature · 1 line
2.25.4
PATCH v3 2/5 package/efl: bump to version 1.24.3
- Remove upstream patch [1].
- evas-modules option removed since all evas-modules are now built shared. [2]
- Make sure that mono is disabled [3].
- gstreamer support removed from emotion & evas [4].
- emotion-loaders-disabler & emotion-generic-loaders-disabler removed [5].
- Add openjpeg dependency for jp2k evas loader [6] otherwise the build system fail when only libjpeg.so is provided (jpeg-turbo or libjpeg).
- Update COMPLIANCE file hash due to esacpe library removal [7].
- Update COPYING file hash due to new csharp,cxx libraries and esacpe,emotion
removal [8].
- Remove bullet dependency from recommended option for efl [9].
- Add new patches to fix build with "Unknown variable" issue with meson.
- Fix Evas_Engine_GL_Drm.h include path.
[1] https://git.enlightenment.org/core/efl.git/commit/?id=a2afcfc872c29bd2c4a60fdafbc655c90f938d1e
https://git.enlightenment.org/core/efl.git/commit/?id=c245b576aad09ac5faeb800de7f7c4fef87c6363
[2] https://git.enlightenment.org/core/efl.git/commit/?id=6d8e39a6425e721eb40e0cb1e67f1cbf5b223cc0
[3] https://git.enlightenment.org/core/efl.git/commit/?id=17a81bee4a53891e44a165a14ca20027f9aa0824
[4] https://git.enlightenment.org/core/efl.git/commit/?id=b8dc80c144fec54a521987535c57b995748ccece
[5] https://git.enlightenment.org/core/efl.git/commit/?id=075bab83c4288b5de20f6acfc6b0459656ea85e0
[6] https://git.enlightenment.org/core/efl.git/commit/?id=8ec6e28b7cc568a8bb636de90b2dd10f19db2be3
[7] https://git.enlightenment.org/core/efl.git/commit/?id=f3d9b8ee703621cfbb52a03d346335148318af7a
[8] https://git.enlightenment.org/core/efl.git/commit/?id=40a980174b7e29e6946f7425bd7a238ae45900f8
https://git.enlightenment.org/core/efl.git/commit/?id=a3ade15d5a45e7d564b7c1304f561af9c4203991 https://git.enlightenment.org/core/efl.git/commit/?id=31da42a0503556a59c190efcb0a79331e828bf6c
[9] https://git.enlightenment.org/core/efl.git/commit/?id=523a64d2265c13a82ba73022d10919f0e392bab2
See:
https://www.enlightenment.org/news/efl-1.24.0
https://www.enlightenment.org/news/efl-1.24.1
https://www.enlightenment.org/news/efl-1.24.2
https://www.enlightenment.org/news/efl-1.24.3
---
v3 fix openjpeg dependency
remove bullet from recommended dependency
update to 1.24.3
Review by upstream: https://sourceforge.net/p/enlightenment/mailman/message/37065780/
v2 update COMPLIANCE and COPYING files hash.
--- ...meson.build-add-single-quote-for-env.patch | 33 +++ ...-evas-fix-compilation-with-Dwl-false.patch | 31 --- ...cc-10-which-has-fno-common-enabled-b.patch | 222 ------------------ ...es-drm-meson.build-use-gl_deps-as-en.patch | 36 +++ ...es-drm-meson.build-fix-gl_drm-includ.patch | 37 +++ package/efl/Config.in | 7 +- package/efl/efl.hash | 8 +- package/efl/efl.mk | 15 +- 8 files changed, 119 insertions(+), 270 deletions(-) create mode 100644 package/efl/0001-doc-meson.build-add-single-quote-for-env.patch delete mode 100644 package/efl/0001-evas-fix-compilation-with-Dwl-false.patch delete mode 100644 package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch create mode 100644 package/efl/0002-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch create mode 100644 package/efl/0003-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch
package/efl/0001-doc-meson.build-add-single-quote-for-env.patch new file +33 -0
@@ -0,0 +1,33 @@ +From bc7992c483a5a188b893a0f0a23d9205274a4485 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Sat, 1 Aug 2020 01:38:24 +0200 +Subject: [PATCH] doc/meson.build: add single quote for env + +Meson trigger an error due to missing sigle quote for env: + +efl-1.24.3/doc/meson.build:114:2: ERROR: Unknown variable "env" + +Upstream status: +https://sourceforge.net/p/enlightenment/mailman/message/37075003/ + +Signed-off-by: Romain Naour <[email protected]> +--- + doc/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/meson.build b/doc/meson.build +index 5ad389828c..11e2b6446b 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -113,7 +113,7 @@ foreach text_filter_property : text_filter_properties + + doc_target += custom_target('preview_text_filters_'+name, + command: [ +- env, 'EFL_RUN_IN_TREE=1', ++ 'env', 'EFL_RUN_IN_TREE=1', + 'EFL_EVAS_FILTER_LUA_PREFIX=' + join_paths(meson.source_root(), 'src', 'lib', 'evas'), + preview_text_filter.full_path(), text, filter_code.stdout(), '@OUTPUT@', font, size + ], +-- +2.25.4 +
package/efl/0001-evas-fix-compilation-with-Dwl-false.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From e1c289912c4ad68380f8b317c6c91d25b5b73814 Mon Sep 17 00:00:00 2001 -From: Boris Faure <[email protected]> -Date: Thu, 2 Jan 2020 11:38:31 +0000 -Subject: [PATCH] evas: fix compilation with -Dwl=false - -Reviewed-by: Chris Michael <[email protected]> -Reviewed-by: Marcel Hollerbach <[email protected]> -Differential Revision: https://phab.enlightenment.org/D10994 - -(cherry picked from commit a2afcfc872c29bd2c4a60fdafbc655c90f938d1e) -Signed-off-by: Romain Naour <[email protected]> ---- - src/modules/evas/engines/gl_drm/evas_engine.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c b/src/modules/evas/engines/gl_drm/evas_engine.c -index a5b4c7a4c8..8c1d6013e7 100644 ---- a/src/modules/evas/engines/gl_drm/evas_engine.c -+++ b/src/modules/evas/engines/gl_drm/evas_engine.c -@@ -3,8 +3,6 @@ - #include "../gl_common/evas_gl_define.h" - #include "../software_generic/evas_native_common.h" - --#include <wayland-client.h> -- - #ifdef HAVE_DLSYM - # include <dlfcn.h> /* dlopen,dlclose,etc */ - #else --- -2.24.1 -
package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch deleted +0 -222
222 lines not on this page · raw message
package/efl/0002-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch new file +36 -0
@@ -0,0 +1,36 @@ +From f6b8b53fdd1cb63219f61e783479bf8d221649b3 Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Sat, 1 Aug 2020 02:25:47 +0200 +Subject: [PATCH] ecore_evas/engines/drm/meson.build: use "gl_deps" as engine + dependencies + +Meson trigger an error since "engine_gl_drm" variable doesn't exist. + +src/modules/ecore_evas/engines/drm/meson.build:10:2: ERROR: Unknown variable "engine_gl_drm". + +Instead use "gl_deps" as engine dependencies. + +Upstream status: +https://sourceforge.net/p/enlightenment/mailman/message/37075016/ + +Signed-off-by: Romain Naour <[email protected]> +--- + src/modules/ecore_evas/engines/drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build +index 584cc56159..de645f1093 100644 +--- a/src/modules/ecore_evas/engines/drm/meson.build ++++ b/src/modules/ecore_evas/engines/drm/meson.build +@@ -7,7 +7,7 @@ engine_deps = [ecore_drm2, ecore_input, eeze, elput, libdrm, engine_drm] + + if get_option('opengl') != 'none' + config_h.set('BUILD_ECORE_EVAS_GL_DRM', '1') +- engine_deps += [engine_gl_drm] ++ engine_deps += [gl_deps] + endif + + engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm')) +-- +2.25.4 +
package/efl/0003-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 83c62fd6b53bd5d3f46c59362ef4fdac9090fd8d Mon Sep 17 00:00:00 2001 +From: Romain Naour <[email protected]> +Date: Sat, 1 Aug 2020 01:01:00 +0200 +Subject: [PATCH] ecore_evas/engines/drm/meson.build: fix "gl_drm" include + directory + +The Evas_Engine_GL_Drm.h file is in "gl_drm" directory, not "drm". + +../src/modules/ecore_evas/engines/drm/ecore_evas_drm.c:23:11: fatal error: Evas_Engine_GL_Drm.h: No such file or directory + 23 | # include <Evas_Engine_GL_Drm.h> + | ^~~~~~~~~~~~~~~~~~~~~~ +compilation terminated. + +Upstream status: +https://sourceforge.net/p/enlightenment/mailman/message/37075004/ + +Signed-off-by: Romain Naour <[email protected]> +--- + src/modules/ecore_evas/engines/drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/ecore_evas/engines/drm/meson.build b/src/modules/ecore_evas/engines/drm/meson.build +index de645f1093..205468750a 100644 +--- a/src/modules/ecore_evas/engines/drm/meson.build ++++ b/src/modules/ecore_evas/engines/drm/meson.build +@@ -10,7 +10,7 @@ if get_option('opengl') != 'none' + engine_deps += [gl_deps] + endif + +-engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'drm')) ++engine_include_dir += include_directories(join_paths('..', '..', '..', 'evas', 'engines', 'gl_drm')) + + shared_module(mod_full_name, engine_src, + include_directories : config_dir + [engine_include_dir], +-- +2.25.4 +
package/efl/Config.in +3 -4
@@ -26,8 +26,7 @@ config BR2_PACKAGE_EFL if BR2_PACKAGE_EFL config BR2_PACKAGE_EFL_BULLET - bool "Enable bullet support (recommended)" - default y + bool "Enable bullet support" select BR2_PACKAGE_BULLET help If you have chosen to disable physics support, this disables
@@ -131,8 +130,7 @@ comment "efl's libmount support needs udev /dev management (eeze)" config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool - default y if BR2_PACKAGE_EFL_BULLET && \ - BR2_PACKAGE_EFL_EEZE && \ + default y if BR2_PACKAGE_EFL_EEZE && \ BR2_PACKAGE_EFL_FONTCONFIG && \ BR2_PACKAGE_EFL_GSTREAMER1 && \ BR2_PACKAGE_EFL_LIBFRIBIDI && \
@@ -244,6 +242,7 @@ comment "libevas loaders" config BR2_PACKAGE_EFL_JPEG bool "libevas jpeg loader" + select BR2_PACKAGE_OPENJPEG help This enables the loader code that loads jpeg files using libjpeg.
package/efl/efl.hash +4 -4
@@ -1,8 +1,8 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.23.2.tar.xz.sha256sum -sha256 ba8d9e4a4690a6c917c98ec090fffa6ffe005ab911811b8d443aa155ad95d493 efl-1.23.2.tar.xz +# From https://download.enlightenment.org/rel/libs/efl/efl-1.24.3.tar.xz.sha256sum +sha256 de95c6e673c170c1e21382918b122417c091c643e7dcaced89aa785529625c2a efl-1.24.3.tar.xz -sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE -sha256 aacde32f865e7166fd8efb117f6a3436c8c6fbe8cce0e4501cb2dbe8c10c86f6 COPYING +sha256 d666b6b2df9f5b791f85c299c65516cb55528b02a807603de246f65f4918ae22 COMPLIANCE +sha256 5bceb52d65debe420bc520f2992807740dc928b7fdc3c2e9a74b5889177ddf4c COPYING sha256 e5133b4034a4749a781e2220ffb230b60a282b88861f1124d69a58abd5143994 COPYING.images sha256 c95bae1d1ce0235ecccd3560b772ec1efb97f348a79f0fbe0a634f0c2ccefe2c licenses/COPYING.ASL sha256 af4ffe7ed1795a6e9cd3b3ce8747fdc45da449ff58cf35b8027c0699a66fd5cf licenses/COPYING.BSD
package/efl/efl.mk +6 -9
@@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.23.2 +EFL_VERSION = 1.24.3 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT
@@ -35,10 +35,9 @@ EFL_CONF_OPTS = \ -Davahi=false \ -Dbuild-examples=false \ -Dbuild-tests=false \ + -Ddotnet=false \ -Decore-imf-loaders-disabler=ibus,scim,xim \ -Delua=true \ - -Demotion-generic-loaders-disabler=vlc \ - -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine \ -Dembedded-lz4=false \ -Dlua-interpreter=luajit \ -Dnetwork-backend=none \
@@ -199,16 +198,15 @@ endif EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) -# Evas loaders are shared by default. -EFL_CONF_OPTS += -Devas-modules=shared - # json evas loader is disabled by default by upstream. # Disable libspectre (ps). # Keep all other evas loader enabled or handled below. EFL_EVAS_LOADERS_DISABLER = gst json ps # efl already depends on jpeg. -ifeq ($(BR2_PACKAGE_EFL_JPEG),) +ifeq ($(BR2_PACKAGE_EFL_JPEG),y) +EFL_DEPENDENCIES += openjpeg +else EFL_EVAS_LOADERS_DISABLER += jp2k endif
@@ -307,14 +305,13 @@ HOST_EFL_CONF_OPTS += \ -Dbuild-examples=false \ -Dbuild-tests=false \ -Dcrypto=openssl \ + -Ddotnet=false \ -Decore-imf-loaders-disabler=ibus,scim,xim \ -Dedje-sound-and-video=false \ -Deeze=false \ -Delogind=false \ -Delua=true \ -Dembedded-lz4=true \ - -Demotion-generic-loaders-disabler=vlc \ - -Demotion-loaders-disabler=gstreamer,gstreamer1,libvlc,xine \ -Dfontconfig=false \ -Dfribidi=false \ -Dglib=true \
Signature · 1 line
2.25.4
Thomas Petazzoni
AppliedPATCH v3 2/5 package/efl: bump to version 1.24.3
Quoted 40 lines · On Sat, 1 Aug 2020 16:20:32 +0200 Romain Naour <[email protected]> wrote:
- Remove upstream patch [1].
- evas-modules option removed since all evas-modules are now built shared. [2]
- Make sure that mono is disabled [3].
- gstreamer support removed from emotion & evas [4].
- emotion-loaders-disabler & emotion-generic-loaders-disabler removed [5].
- Add openjpeg dependency for jp2k evas loader [6] otherwise the build system fail when only libjpeg.so is provided (jpeg-turbo or libjpeg).
- Update COMPLIANCE file hash due to esacpe library removal [7].
- Update COPYING file hash due to new csharp,cxx libraries and esacpe,emotionremoval [8].- Remove bullet dependency from recommended option for efl [9].
- Add new patches to fix build with "Unknown variable" issue with meson.
- FixEvas_Engine_GL_Drm.hinclude path.[1] https://git.enlightenment.org/core/efl.git/commit/?id=a2afcfc872c29bd2c4a60fdafbc655c90f938d1e
https://git.enlightenment.org/core/efl.git/commit/?id=c245b576aad09ac5faeb800de7f7c4fef87c6363[2] https://git.enlightenment.org/core/efl.git/commit/?id=6d8e39a6425e721eb40e0cb1e67f1cbf5b223cc0
[3] https://git.enlightenment.org/core/efl.git/commit/?id=17a81bee4a53891e44a165a14ca20027f9aa0824
[4] https://git.enlightenment.org/core/efl.git/commit/?id=b8dc80c144fec54a521987535c57b995748ccece
[5] https://git.enlightenment.org/core/efl.git/commit/?id=075bab83c4288b5de20f6acfc6b0459656ea85e0
[6] https://git.enlightenment.org/core/efl.git/commit/?id=8ec6e28b7cc568a8bb636de90b2dd10f19db2be3
[7] https://git.enlightenment.org/core/efl.git/commit/?id=f3d9b8ee703621cfbb52a03d346335148318af7a
[8] https://git.enlightenment.org/core/efl.git/commit/?id=40a980174b7e29e6946f7425bd7a238ae45900f8https://git.enlightenment.org/core/efl.git/commit/?id=a3ade15d5a45e7d564b7c1304f561af9c4203991 https://git.enlightenment.org/core/efl.git/commit/?id=31da42a0503556a59c190efcb0a79331e828bf6c[9] https://git.enlightenment.org/core/efl.git/commit/?id=523a64d2265c13a82ba73022d10919f0e392bab2
See:
https://www.enlightenment.org/news/efl-1.24.0
https://www.enlightenment.org/news/efl-1.24.1
https://www.enlightenment.org/news/efl-1.24.2
https://www.enlightenment.org/news/efl-1.24.3Signed-off-by Romain Naour <[email protected]>---
v3 fix openjpeg dependency
remove bullet from recommended dependency
update to 1.24.3
Review by upstream: https://sourceforge.net/p/enlightenment/mailman/message/37065780/
v2 update COMPLIANCE and COPYING files hash.
Quoted 15 lines
--- ...meson.build-add-single-quote-for-env.patch | 33 +++ ...-evas-fix-compilation-with-Dwl-false.patch | 31 --- ...cc-10-which-has-fno-common-enabled-b.patch | 222 ------------------ ...es-drm-meson.build-use-gl_deps-as-en.patch | 36 +++ ...es-drm-meson.build-fix-gl_drm-includ.patch | 37 +++ package/efl/Config.in | 7 +- package/efl/efl.hash | 8 +- package/efl/efl.mk | 15 +- 8 files changed, 119 insertions(+), 270 deletions(-) create mode 100644 package/efl/0001-doc-meson.build-add-single-quote-for-env.patch delete mode 100644 package/efl/0001-evas-fix-compilation-with-Dwl-false.patch delete mode 100644 package/efl/0002-Fix-build-with-gcc-10-which-has-fno-common-enabled-b.patch create mode 100644 package/efl/0002-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch create mode 100644 package/efl/0003-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 3/5 package/terminology: bump to version 1.8.0
In reply to Romain NaourSee:
https://www.enlightenment.org/news/2020-07-26-terminology-1.8.0
--- package/terminology/terminology.hash | 6 +++--- package/terminology/terminology.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
package/terminology/terminology.hash +3 -3
@@ -1,3 +1,3 @@ -# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.6.0.tar.xz.sha256sum -sha256 b95cb05653afe0dad77fc038a8d5276c02a9c08d64ac97ddf0cee8087d27bd77 terminology-1.6.0.tar.xz -sha256 a907d434f4691990ed8f2826ff7546672e9934a26c798351da12ed544dadc628 COPYING +# From https://download.enlightenment.org/rel/apps/terminology/terminology-1.8.0.tar.xz.sha256sum +sha256 c6f5b003412f25507277702cabe1a11d7190971343c1d6030aa7d3fe5b45765f terminology-1.8.0.tar.xz +sha256 6863ee700fc82b9c3b82a1627136f6935a9eb68e6a64491f20e00b4023c33622 COPYING
package/terminology/terminology.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -TERMINOLOGY_VERSION = 1.6.0 +TERMINOLOGY_VERSION = 1.8.0 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology TERMINOLOGY_LICENSE = BSD-2-Clause
Signature · 1 line
2.25.4
Thomas Petazzoni
AppliedPATCH v3 3/5 package/terminology: bump to version 1.8.0
Quoted 8 lines · On Sat, 1 Aug 2020 16:20:33 +0200 Romain Naour <[email protected]> wrote:
See:
https://www.enlightenment.org/news/2020-07-26-terminology-1.8.0Signed-off-by Romain Naour <[email protected]>--- package/terminology/terminology.hash | 6 +++--- package/terminology/terminology.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 4/5 package/enlightenment: bump to version 0.24.2
In reply to Romain Naour - Disable new dependency on polkit for now.
- Add OFL license for fonts.
- Update COPYING file hash.
- Update indentation in hash file (two spaces)
See:
https://www.enlightenment.org/news/e24.2
enlightenment 0.24 require efl >= 1.24.
--- package/enlightenment/enlightenment.hash | 7 ++++--- package/enlightenment/enlightenment.mk | 10 ++++++---- 2 files changed, 10 insertions(+), 7 deletions(-)
package/enlightenment/enlightenment.hash +4 -3
@@ -1,3 +1,4 @@ -# From https://www.enlightenment.org/news/e23_release -sha256 b8c5d040875576d3d3ad8572644f92a65e21291bcee6b0d62f74fbfd482afdf8 enlightenment-0.23.0.tar.xz -sha256 34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350 COPYING +# From https://www.enlightenment.org/news/e24.2 +sha256 be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1 enlightenment-0.24.2.tar.xz +sha256 17dda7902d3e1a743f91cf2545f474be93f612768a9e9022593d788ecc83935a COPYING +sh&256 f4ba47ef8f4ff588202e721ab10f0208a3fa678147e7f928e6b2820f2e646e13 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt
package/enlightenment/enlightenment.mk +6 -4
@@ -4,11 +4,12 @@ # ################################################################################ -ENLIGHTENMENT_VERSION = 0.23.0 +ENLIGHTENMENT_VERSION = 0.24.2 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment -ENLIGHTENMENT_LICENSE = BSD-2-Clause -ENLIGHTENMENT_LICENSE_FILES = COPYING +ENLIGHTENMENT_LICENSE = BSD-2-Clause, OFL-1.1 (font) +ENLIGHTENMENT_LICENSE_FILES = COPYING \ + src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt ENLIGHTENMENT_DEPENDENCIES = \ host-pkgconf \
@@ -20,7 +21,8 @@ ENLIGHTENMENT_CONF_OPTS = \ -Dedje-cc=$(HOST_DIR)/bin/edje_cc \ -Deet=$(HOST_DIR)/bin/eet \ -Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \ - -Dpam=false + -Dpam=false \ + -Dpolkit=false # enlightenment.pc and /usr/lib/enlightenment/modules/*.so ENLIGHTENMENT_INSTALL_STAGING = YES
Signature · 1 line
2.25.4
PATCH v3 4/5 package/enlightenment: bump to version 0.24.2
package/enlightenment/enlightenment.hash line 4
Quoted 12 lines · On Sat, 1 Aug 2020 16:20:34 +0200 Romain Naour <[email protected]> wrote:
package/enlightenment/enlightenment.hash +4
-3@@ -1,3 +1,4 @@ -# From https://www.enlightenment.org/news/e23_release -sha256 b8c5d040875576d3d3ad8572644f92a65e21291bcee6b0d62f74fbfd482afdf8 enlightenment-0.23.0.tar.xz -sha256 34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350 COPYING +# From https://www.enlightenment.org/news/e24.2 +sha256 be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1 enlightenment-0.24.2.tar.xz +sha256 17dda7902d3e1a743f91cf2545f474be93f612768a9e9022593d788ecc83935a COPYING +sh&256 f4ba47ef8f4ff588202e721ab10f0208a3fa678147e7f928e6b2820f2e646e13 src/modules/wl_weekeyboard/themes/default/fonts/LICENSE.txt
^^^^ typo here (reported by "make check-package")
I fixed that and applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 5/5 package/efl: keep X11 input 2.2+ enabled
In reply to Romain NaourSince efl 1.23, X11 input 2.2+ has been enabled by default [1].
From [2]:
"It would be a pretty unusual system to have x and no xinput2.2 support."
While at it, enable explicitely X11 input 2 (enabled by default).
[1] https://git.enlightenment.org/core/efl.git/commit/?id=cf005ac54abdea843e5731765e41e5088275249f
[2] https://sourceforge.net/p/enlightenment/mailman/message/37065780/
--- package/efl/efl.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
package/efl/efl.mk +4 -4
@@ -28,7 +28,6 @@ EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ # Configure options: # elua=true: build elua for the target. # sdl=false: disable sdl2 support. -# xinput22=false: disable X11 XInput v2.2+ support. # embedded-lz4=false: use liblz4 from lz4 package. # network-backend=none: disable connman networkmanager. EFL_CONF_OPTS = \
@@ -43,8 +42,7 @@ EFL_CONF_OPTS = \ -Dnetwork-backend=none \ -Dpixman=false \ -Dsdl=false \ - -Dvnc-server=false \ - -Dxinput22=false + -Dvnc-server=false EFL_BINDINGS = luajit
@@ -154,7 +152,9 @@ EFL_CONF_OPTS += -Dfb=false endif ifeq ($(BR2_PACKAGE_EFL_X_XLIB),y) -EFL_CONF_OPTS += -Dx11=true +EFL_CONF_OPTS += -Dx11=true \ + -Dxinput2=true \ + -Dxinput22=true EFL_DEPENDENCIES += \ xlib_libX11 \
Signature · 1 line
2.25.4
Thomas Petazzoni
AppliedPATCH v3 5/5 package/efl: keep X11 input 2.2+ enabled
Quoted 7 lines · On Sat, 1 Aug 2020 16:20:35 +0200 Romain Naour <[email protected]> wrote:
Since efl 1.23, X11 input 2.2+ has been enabled by default [1].
From [2]:
"It would be a pretty unusual system to have x and no xinput2.2 support."While at it, enable explicitely X11 input 2 (enabled by default).
Quoted 7 lines
[1] https://git.enlightenment.org/core/efl.git/commit/?id=cf005ac54abdea843e5731765e41e5088275249f
[2] https://sourceforge.net/p/enlightenment/mailman/message/37065780/Signed-off-by Romain Naour <[email protected]>--- package/efl/efl.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v3 1/5 package/efl: bump to version 1.23.2
In reply to Romain NaourQuoted 23 lines · On Sat, 1 Aug 2020 16:20:31 +0200 Romain Naour <[email protected]> wrote:
- Remove upstream patch [1].
- Switch to meson build system.
- The cryptography backends is now mandatory, use openssl for the host and use openssl by default for the target if gnutls is not selected.
- Add host-giflib since the dependency can't be disabled anymore. (even by adding gif inHOST_EFL_EVAS_LOADERS_DISABLER).
- Disable explicitely meson build options that was not previously handled (avahi, emotion, ecore-imf-loarders...)
- Elput support is now enabled through drm meson option [2], removeBR2_PACKAGE_EFL_ELPUT.
- Update license file hash (csharp licensing information, cxx bindings licensing)
- Add COPYING.images and licenses/COPYING.ASL license file.
- The evas png loader is now mandatory [3]
(even by adding png inEFL_EVAS_LOADERS_DISABLER).
- Same for the evas gif loader [4].
- Backport an upstream patch to fix the evas build with -Dwl=false.
- Update indentation of hash file (two spaces)See:
https://www.enlightenment.org/news/efl-1.23.0
https://www.enlightenment.org/news/efl-1.23.1
https://www.enlightenment.org/news/efl-1.23.2
Quoted 8 lines
[1] https://git.enlightenment.org/core/efl.git/commit/?id=c46a8143916f0d3f66bbdffc7107c97c88df212d
[2] https://git.enlightenment.org/core/efl.git/tree/meson.build?h=v1.23.3#n297
[3] https://git.enlightenment.org/core/efl.git/tree/src/modules/evas/meson.build?h=v1.23.3#n2
[4] https://git.enlightenment.org/core/efl.git/tree/src/modules/evas/meson.build?h=v1.23.3#n4Signed-off-by Romain Naour <[email protected]>--- Config.in.legacy | 18 ++
This file had improper indentation (reported by "make check-package") so I fixed that and applied!
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com