mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/efl: handle input option

Browse Source 
Commit 2d7a3e48c5 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>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine
2022-02-24 17:25:17 +01:00
committed by Arnout Vandecappelle (Essensium/Mind)
parent c7229db872
commit 70ad44ffd0
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
package/efl/Config.in
View File

@@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI
so you may also trigger code paths with bugs that are never so you may also trigger code paths with bugs that are never
normally used. 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 config BR2_PACKAGE_EFL_LIBSNDFILE
bool "Enable libsndfile support (recommended)" bool "Enable libsndfile support (recommended)"
default y default y
@@ -216,13 +229,11 @@ endchoice # OpenGL support
config BR2_PACKAGE_EFL_DRM config BR2_PACKAGE_EFL_DRM
bool "Evas DRM Engine" 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_TOOLCHAIN_HAS_THREADS # libdrm
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d 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_LIBDRM
select BR2_PACKAGE_LIBINPUT # For elput
select BR2_PACKAGE_LIBXKBCOMMON
help help
This option enable building support for the Evas DRM Engine. This option enable building support for the Evas DRM Engine.

11
package/efl/efl.mk
View File

@@ -67,6 +67,13 @@ else
EFL_CONF_OPTS += -Deeze=false EFL_CONF_OPTS += -Deeze=false
endif 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) ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y)
EFL_DEPENDENCIES += util-linux EFL_DEPENDENCIES += util-linux
EFL_CONF_OPTS += -Dlibmount=true EFL_CONF_OPTS += -Dlibmount=true
@@ -192,7 +199,7 @@ endif
ifeq ($(BR2_PACKAGE_EFL_DRM),y) ifeq ($(BR2_PACKAGE_EFL_DRM),y)
EFL_CONF_OPTS += -Ddrm=true EFL_CONF_OPTS += -Ddrm=true
EFL_DEPENDENCIES += libdrm libegl libinput mesa3d EFL_DEPENDENCIES += libdrm libegl mesa3d
else else
EFL_CONF_OPTS += -Ddrm=false EFL_CONF_OPTS += -Ddrm=false
endif endif
@@ -204,8 +211,6 @@ else
EFL_CONF_OPTS += -Dwl=false EFL_CONF_OPTS += -Dwl=false
endif endif
EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon)
# json evas loader is disabled by default by upstream. # json evas loader is disabled by default by upstream.
# Disable libspectre (ps). # Disable libspectre (ps).
# Keep all other evas loader enabled or handled below. # Keep all other evas loader enabled or handled below.