efl version bump to 1.24.0
v2 cover efl version bump to 1.24.0
A previous version bump to 1.23.3 was posted long time ago [1] but since then efl 1.24.0 has been released.
Provide the version bump using two patches since the first patch switch the build system to meson and the second patch change some other options dependencies. This is indented to ease the review.
The series can be merged as is or by squashing them into one commit.
[1] http://patchwork.ozlabs.org/project/buildroot/patch/20200104011453.516356-1-romain.naour at gmail.com/
Romain Naour (2):
package/efl: bump to version 1.23.3
package/efl: bump to version 1.24.0
Config.in.legacy | 18 ++ ...EINA_VALUE_EMPTY-during-library-init.patch | 51 --- package/efl/Config.in | 42 +-- package/efl/efl.hash | 22 +- package/efl/efl.mk | 301 ++++++++---------- package/enlightenment/Config.in | 1 - 6 files changed, 175 insertions(+), 260 deletions(-) delete mode 100644 package/efl/0001-eina-set-EINA_VALUE_EMPTY-during-library-init.patch
Signature · 1 line
2.25.4
PATCH v2 1/2 package/efl: bump to version 1.23.3
- 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
---
v2: Rebase on master (2020.05.git)
--- 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
@@ -146,6 +146,24 @@ endif comment "Legacy options removed in 2020.05" +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
@@ -10,10 +10,13 @@ config BR2_PACKAGE_EFL depends on !BR2_STATIC_LIBS # dlfcn.h 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 # https://phab.enlightenment.org/T2728 select BR2_PACKAGE_LUAJIT # Lua support broken + select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS && BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_LZ4 select BR2_PACKAGE_ZLIB help
@@ -217,58 +220,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 v2 2/2 package/efl: bump to version 1.24.0
In reply to Romain NaourRemove 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].
Replace jpeg by openjpeg [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].
[1] https://git.enlightenment.org/core/efl.git/commit/?id=a2afcfc872c29bd2c4a60fdafbc655c90f938d1e
[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
See:
https://www.enlightenment.org/news/efl-1.24.0
---
v2 update COMPLIANCE and COPYING files hash.
...-evas-fix-compilation-with-Dwl-false.patch | 31 ------------------- package/efl/Config.in | 2 +- package/efl/efl.hash | 8 ++--- package/efl/efl.mk | 15 +++------ 4 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 package/efl/0001-evas-fix-compilation-with-Dwl-false.patch
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/Config.in +1 -1
@@ -11,7 +11,7 @@ config BR2_PACKAGE_EFL select BR2_PACKAGE_DBUS select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_GIFLIB - select BR2_PACKAGE_JPEG # Emile needs libjpeg + select BR2_PACKAGE_OPENJPEG # Emile needs libopenjpeg select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency select BR2_PACKAGE_LIBPNG # https://phab.enlightenment.org/T2728
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.0.tar.xz.sha256sum +sha256 b3b96e443c5e36a93e5fe443304ecb661a4707ef921385bf7d9ff24c9e980cfa efl-1.24.0.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 +5 -10
@@ -4,7 +4,7 @@ # ################################################################################ -EFL_VERSION = 1.23.2 +EFL_VERSION = 1.24.0 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
@@ -23,7 +23,7 @@ EFL_LICENSE_FILES = \ EFL_INSTALL_STAGING = YES EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ - giflib jpeg libpng luajit lz4 zlib + giflib openjpeg libpng luajit lz4 zlib # Configure options: # elua=true: build elua for the target.
@@ -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,15 +198,12 @@ 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. +# efl already depends on openjpeg. ifeq ($(BR2_PACKAGE_EFL_JPEG),) EFL_EVAS_LOADERS_DISABLER += jp2k endif
@@ -307,14 +303,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