Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Romain Naour <romain.naour@gmail.com>
To: buildroot@buildroot.org
Cc: Romain Naour <romain.naour@gmail.com>,
	Fabrice Fontaine <fontaine.fabrice@gmail.com>
Subject: [Buildroot] [PATCH 4/5] package/efl: handle input option
Date: Sat, 29 Jan 2022 23:46:50 +0100	[thread overview]
Message-ID: <20220129224651.1282263-4-romain.naour@gmail.com> (raw)
In-Reply-To: <20220129224651.1282263-1-romain.naour@gmail.com>

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: use BR2_PACKAGE_EFL_LIBINPUT for BR2_PACKAGE_EFL_DRM]
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
v2: rework BR2_PACKAGE_EFL_DRM
---
 package/efl/Config.in | 19 +++++++++++++++----
 package/efl/efl.mk    |  7 +++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/package/efl/Config.in b/package/efl/Config.in
index 21845ba306..bc89f2609b 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_LIBINPUT
+	bool "Enable libinput support (recommended)"
+	default y
+	depends on BR2_PACKAGE_HAS_UDEV # libinput
+	select BR2_PACKAGE_EFL_EEZE
+	select BR2_PACKAGE_LIBINPUT
+	select BR2_PACKAGE_LIBXKBCOMMON
+	help
+	  Libinput is used to support gesture recognition.
+
+comment "libinput needs udev /dev management (eeze)"
+	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 (eeze)
+	depends on BR2_PACKAGE_HAS_UDEV # elput, 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_LIBINPUT
 	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..021afa8204 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_LIBINPUT),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
-- 
2.31.1

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

  parent reply	other threads:[~2022-01-29 22:47 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-29 22:46 [Buildroot] [PATCH 1/5] package/efl: bump to version 1.26.1 Romain Naour
2022-01-29 22:46 ` [Buildroot] [PATCH 2/5] package/enlightenment: bump to version 0.25.1 Romain Naour
2022-01-30 14:00   ` Thomas Petazzoni via buildroot
2022-01-29 22:46 ` [Buildroot] [PATCH 3/5] package/efl: rework eeze handling in Kconfig Romain Naour
2022-01-30 14:02   ` Thomas Petazzoni via buildroot
2022-01-30 17:40     ` Romain Naour
2022-01-30 20:44       ` Thomas Petazzoni via buildroot
2022-01-29 22:46 ` Romain Naour [this message]
2022-01-30 14:05   ` [Buildroot] [PATCH 4/5] package/efl: handle input option Thomas Petazzoni via buildroot
2022-01-29 22:46 ` [Buildroot] [PATCH 5/5] docs/manual/adding-packages-directory.txt: reorder select/depends Romain Naour
2022-01-30 14:12   ` Thomas Petazzoni via buildroot
2022-01-30 14:00 ` [Buildroot] [PATCH 1/5] package/efl: bump to version 1.26.1 Thomas Petazzoni via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220129224651.1282263-4-romain.naour@gmail.com \
    --to=romain.naour@gmail.com \
    --cc=buildroot@buildroot.org \
    --cc=fontaine.fabrice@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox