[Buildroot] [PATCHv2 1/2] package/efl: rework eeze handling in Kconfig

[Buildroot] [PATCHv2 1/2] package/efl: rework eeze handling in Kconfig

[Romain Naour]

Commit [1] added eeze dependency using "depends on" to several efl
options (drm, libmount) instead of selecting eeze and propagate the
udev reverse dependency.

[1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
v2: simplify the commit log
    Remove the "eeze" between parenthesis
---
 package/efl/Config.in | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/package/efl/Config.in b/package/efl/Config.in
index eb9c7aebd9..4c78bef7c8 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -115,7 +115,8 @@ config BR2_PACKAGE_EFL_PULSEAUDIO
 config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT
 	bool "Enable libmount support (recommended)"
 	default y
-	depends on BR2_PACKAGE_EFL_EEZE
+	depends on BR2_PACKAGE_HAS_UDEV # efl-eeze
+	select BR2_PACKAGE_EFL_EEZE
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	# libblkid is part of required tools, see EFL's README.
@@ -125,8 +126,8 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT
 	  devices etc... and disabling this will hurt support for
 	  Enlightenment and its filemanager.
 
-comment "efl's libmount support needs udev /dev management (eeze)"
-	depends on !BR2_PACKAGE_EFL_EEZE
+comment "efl's libmount support needs udev /dev management "
+	depends on !BR2_PACKAGE_HAS_UDEV
 
 config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG
 	bool
@@ -173,16 +174,16 @@ config BR2_PACKAGE_EFL_WAYLAND
 	depends on BR2_PACKAGE_WAYLAND
 	depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm
 	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine
-	depends on BR2_PACKAGE_EFL_EEZE # efl drm
+	depends on BR2_PACKAGE_HAS_UDEV # efl drm, efl-eeze
 	depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only
 	depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput
 	select BR2_PACKAGE_EFL_DRM
 	select BR2_PACKAGE_WAYLAND_PROTOCOLS
 
-comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales"
+comment "Wayland support needs udev /dev management, OpenGL ES w/ EGL, threads, locales"
 	depends on BR2_PACKAGE_WAYLAND
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \
-		|| !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \
+		|| !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \
 		|| !BR2_ENABLE_LOCALE
 
 choice
@@ -215,9 +216,10 @@ endchoice # OpenGL support
 
 config BR2_PACKAGE_EFL_DRM
 	bool "Evas DRM Engine"
-	depends on BR2_PACKAGE_EFL_EEZE
+	depends on BR2_PACKAGE_HAS_UDEV # efl-eeze
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm
 	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d
+	select BR2_PACKAGE_EFL_EEZE
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_LIBINPUT # For elput
 	select BR2_PACKAGE_LIBXKBCOMMON
@@ -230,9 +232,9 @@ config BR2_PACKAGE_EFL_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"
+comment "Evas DRM Engine needs udev /dev management, mesa3d w/ EGL support, threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \
-		|| !BR2_PACKAGE_EFL_EEZE
+		|| !BR2_PACKAGE_HAS_UDEV
 
 comment "libevas loaders"
 
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCHv2 2/2] package/efl: handle input option

[Romain Naour]

From: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input
option on target which was added (and enabled by default) by
https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be
resulting in the following build failure when eeze is disabled:

../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze".

Fixes:
 - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Romain:
  Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the
  upstream name.
  use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM
  remove duplicate libxkbcommon in EFL_DEPENDENCIES]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
v2: rework BR2_PACKAGE_EFL_DRM
---
 package/efl/Config.in | 19 +++++++++++++++----
 package/efl/efl.mk    |  9 +++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 4c78bef7c8..c4f82b92e3 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI
 	  so you may also trigger code paths with bugs that are never
 	  normally used.
 
+config BR2_PACKAGE_EFL_ELPUT
+	bool "Enable elput support (recommended)"
+	default y
+	depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze
+	select BR2_PACKAGE_EFL_EEZE
+	select BR2_PACKAGE_LIBINPUT
+	select BR2_PACKAGE_LIBXKBCOMMON
+	help
+	  Eplut is used to support gesture recognition.
+
+comment "elput needs udev /dev management"
+	depends on !BR2_PACKAGE_HAS_UDEV
+
 config BR2_PACKAGE_EFL_LIBSNDFILE
 	bool "Enable libsndfile support (recommended)"
 	default y
@@ -216,13 +229,11 @@ endchoice # OpenGL support
 
 config BR2_PACKAGE_EFL_DRM
 	bool "Evas DRM Engine"
-	depends on BR2_PACKAGE_HAS_UDEV # efl-eeze
+	depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-eeze
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm
 	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d
-	select BR2_PACKAGE_EFL_EEZE
+	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.
 
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index 43a2dc4fcb..bb0bd3f76d 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -67,6 +67,13 @@ else
 EFL_CONF_OPTS += -Deeze=false
 endif
 
+ifeq ($(BR2_PACKAGE_EFL_ELPUT),y)
+EFL_DEPENDENCIES += libinput libxkbcommon
+EFL_CONF_OPTS += -Dinput=true
+else
+EFL_CONF_OPTS += -Dinput=false
+endif
+
 ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y)
 EFL_DEPENDENCIES += util-linux
 EFL_CONF_OPTS += -Dlibmount=true
@@ -204,8 +211,6 @@ else
 EFL_CONF_OPTS += -Dwl=false
 endif
 
-EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon)
-
 # json evas loader is disabled by default by upstream.
 # Disable libspectre (ps).
 # Keep all other evas loader enabled or handled below.
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCHv2 2/2] package/efl: handle input option

[Arnout Vandecappelle]

On 24/02/2022 17:25, Romain Naour wrote:
> From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> 
> Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input
> option on target which was added (and enabled by default) by
> https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be
> resulting in the following build failure when eeze is disabled:
> 
> ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze".
> 
> Fixes:
>   - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> [Romain:
>    Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the
>    upstream name.
>    use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM
>    remove duplicate libxkbcommon in EFL_DEPENDENCIES]
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
> v2: rework BR2_PACKAGE_EFL_DRM
> ---
>   package/efl/Config.in | 19 +++++++++++++++----
>   package/efl/efl.mk    |  9 +++++++--
>   2 files changed, 22 insertions(+), 6 deletions(-)
> 
> diff --git a/package/efl/Config.in b/package/efl/Config.in
> index 4c78bef7c8..c4f82b92e3 100644
> --- a/package/efl/Config.in
> +++ b/package/efl/Config.in
> @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI
>   	  so you may also trigger code paths with bugs that are never
>   	  normally used.
>   
> +config BR2_PACKAGE_EFL_ELPUT
> +	bool "Enable elput support (recommended)"
> +	default y
> +	depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze
> +	select BR2_PACKAGE_EFL_EEZE
> +	select BR2_PACKAGE_LIBINPUT
> +	select BR2_PACKAGE_LIBXKBCOMMON
> +	help
> +	  Eplut is used to support gesture recognition.
> +
> +comment "elput needs udev /dev management"
> +	depends on !BR2_PACKAGE_HAS_UDEV
> +
>   config BR2_PACKAGE_EFL_LIBSNDFILE
>   	bool "Enable libsndfile support (recommended)"
>   	default y
> @@ -216,13 +229,11 @@ endchoice # OpenGL support
>   
>   config BR2_PACKAGE_EFL_DRM
>   	bool "Evas DRM Engine"
> -	depends on BR2_PACKAGE_HAS_UDEV # efl-eeze
> +	depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-eeze
>   	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm
>   	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d
> -	select BR2_PACKAGE_EFL_EEZE
> +	select BR2_PACKAGE_EFL_ELPUT

  Is this really true? The description of elput says that it's about gesture 
recognition, I don't see how that's related to the DRM backend. And the help 
text below is saying something like "you can use input gestures both on drm and 
fb", so it's weird that elput is only required for drm...

>   	select BR2_PACKAGE_LIBDRM
> -	select BR2_PACKAGE_LIBINPUT # For elput

  There was a corresponding _DEPENDENCIES += in the .mk file, I removed that 
since it's covered by elput.

  With that change, both applied to master, thanks.

  Regards,
  Arnout


> -	select BR2_PACKAGE_LIBXKBCOMMON
>   	help
>   	  This option enable building support for the Evas DRM Engine.
>   
> diff --git a/package/efl/efl.mk b/package/efl/efl.mk
> index 43a2dc4fcb..bb0bd3f76d 100644
> --- a/package/efl/efl.mk
> +++ b/package/efl/efl.mk
> @@ -67,6 +67,13 @@ else
>   EFL_CONF_OPTS += -Deeze=false
>   endif
>   
> +ifeq ($(BR2_PACKAGE_EFL_ELPUT),y)
> +EFL_DEPENDENCIES += libinput libxkbcommon
> +EFL_CONF_OPTS += -Dinput=true
> +else
> +EFL_CONF_OPTS += -Dinput=false
> +endif
> +
>   ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y)
>   EFL_DEPENDENCIES += util-linux
>   EFL_CONF_OPTS += -Dlibmount=true
> @@ -204,8 +211,6 @@ else
>   EFL_CONF_OPTS += -Dwl=false
>   endif
>   
> -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon)
> -
>   # json evas loader is disabled by default by upstream.
>   # Disable libspectre (ps).
>   # Keep all other evas loader enabled or handled below.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCHv2 1/2] package/efl: rework eeze handling in Kconfig

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > Commit [1] added eeze dependency using "depends on" to several efl
 > options (drm, libmount) instead of selecting eeze and propagate the
 > udev reverse dependency.

 > [1] e026c3bdb8f493b3fc21de7c45e3edbc47e03128

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>
 > ---
 > v2: simplify the commit log
 >     Remove the "eeze" between parenthesis

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCHv2 2/2] package/efl: handle input option

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > Commit 2d7a3e48c574c05346b66f79cdb75ecdfa7f074e forgot to manage input
 > option on target which was added (and enabled by default) by
 > https://git.enlightenment.org/core/efl.git/commit/?id=0c2cf7e1bf7ca547655d25aaea30d081101b42be
 > resulting in the following build failure when eeze is disabled:

 > ../output-1/build/efl-1.26.0/src/lib/elput/meson.build:1:0: ERROR: Unknown variable "eeze".

 > Fixes:
 >  - http://autobuild.buildroot.org/results/4a840c54bad9748b5748738378a0352d02de1f7e

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > [Romain:
 >   Rename BR2_PACKAGE_EFL_LIBINPUT to BR2_PACKAGE_EFL_ELPUT to match the
 >   upstream name.
 >   use BR2_PACKAGE_EFL_ELPUT for BR2_PACKAGE_EFL_DRM
 >   remove duplicate libxkbcommon in EFL_DEPENDENCIES]
 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot