From: Romain Naour <romain.naour@openwide.fr>
Date: Tue, 15 Dec 2015 22:40:15 +0000 (+0100)
Subject: package/efl/libefl: add wayland dependency
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8cfa13ba3705386bb312a9673ea616c493426b6;p=buildroot.git

package/efl/libefl: add wayland dependency

See:
https://www.enlightenment.org/about-wayland

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in
index 6788bb3690..7d635d9736 100644
--- a/package/efl/libefl/Config.in
+++ b/package/efl/libefl/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBEFL
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_JPEG # Emile needs libjpeg
 	select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency
+	select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
 	select BR2_PACKAGE_UTIL_LINUX
 	# libblkid is part of required tools, see EFL's README.
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
diff --git a/package/efl/libefl/libefl.mk b/package/efl/libefl/libefl.mk
index 184604b221..e21d89cea9 100644
--- a/package/efl/libefl/libefl.mk
+++ b/package/efl/libefl/libefl.mk
@@ -35,7 +35,6 @@ LIBEFL_GETTEXTIZE = YES
 # --disable-image-loader-webp: disable webp support.
 # --disable-sdl: disable sdl2 support.
 # --disable-systemd: disable systemd support.
-# --disable-wayland: disable wayland support.
 # --enable-lua-old: disable Elua and remove luajit dependency.
 # --with-opengl=none: disable opengl support.
 # --with-x11=none: remove dependency on X.org.
@@ -48,7 +47,6 @@ LIBEFL_CONF_OPTS = \
 	--disable-image-loader-webp \
 	--disable-sdl \
 	--disable-systemd \
-	--disable-wayland \
 	--enable-lua-old \
 	--with-opengl=none \
 	--with-x11=none
@@ -140,6 +138,13 @@ else
 LIBEFL_CONF_OPTS += --with-crypto=none
 endif # BR2_PACKAGE_OPENSSL
 
+ifeq ($(BR2_PACKAGE_WAYLAND),y)
+LIBEFL_DEPENDENCIES += wayland libxkbcommon
+LIBEFL_CONF_OPTS += --enable-wayland
+else
+LIBEFL_CONF_OPTS += --disable-wayland
+endif
+
 # Loaders that need external dependencies needs to be --enable-XXX=yes
 # otherwise the default is '=static'.
 # All other loaders are statically built-in