package/efl: fix unmet dependencies

EFL's elput selects libinput but forgot to propagate its dependencies.
Which requires they be propagated further to a second sub-option, then
to a third one.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Romain Naour <romain.naour@openwide.fr>
[Thomas: fix typoes.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2017-05-08 23:11:49 +02:00 committed by Thomas Petazzoni
parent dd24d95a76
commit 31bd2b46a8

View File

@ -178,13 +178,15 @@ config BR2_PACKAGE_EFL_WAYLAND
depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine
depends on BR2_PACKAGE_EFL_EEZE # efl drm depends on BR2_PACKAGE_EFL_EEZE # efl drm
depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only 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_EFL_DRM
select BR2_PACKAGE_WAYLAND_PROTOCOLS select BR2_PACKAGE_WAYLAND_PROTOCOLS
comment "Wayland support needs udev /dev management (eeze) and OpenGL ES w/ EGL, threads" comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales"
depends on BR2_PACKAGE_WAYLAND depends on BR2_PACKAGE_WAYLAND
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ 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_EFL_EEZE \
|| !BR2_ENABLE_LOCALE
choice choice
bool "OpenGL support" bool "OpenGL support"
@ -216,6 +218,7 @@ endchoice # OpenGL support
config BR2_PACKAGE_EFL_ELPUT config BR2_PACKAGE_EFL_ELPUT
bool "Elput" bool "Elput"
depends on BR2_ENABLE_LOCALE # libinput
depends on BR2_PACKAGE_EFL_EEZE depends on BR2_PACKAGE_EFL_EEZE
select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBINPUT
select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_LIBXKBCOMMON
@ -226,23 +229,24 @@ config BR2_PACKAGE_EFL_ELPUT
libinput without having to duplicate the code in each libinput without having to duplicate the code in each
subsystem. subsystem.
comment "Elput support needs udev /dev management (eeze)" comment "Elput support needs udev /dev management (eeze), locales"
depends on !BR2_PACKAGE_EFL_EEZE depends on !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE
config BR2_PACKAGE_EFL_DRM config BR2_PACKAGE_EFL_DRM
bool "Evas DRM Engine" bool "Evas DRM Engine"
depends on BR2_PACKAGE_EFL_EEZE depends on BR2_PACKAGE_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
depends on BR2_ENABLE_LOCALE # efl-elput <- libinput
select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_EFL_ELPUT
select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_LIBXKBCOMMON 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.
comment "Evas DRM Engine needs udev /dev management (eeze) and mesa3d w/ EGL support, threads" comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads, locales"
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \
|| !BR2_PACKAGE_EFL_EEZE || !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE
comment "libevas loaders" comment "libevas loaders"