From patchwork Mon Dec 7 21:29:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 553583 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 5919D140291 for ; Tue, 8 Dec 2015 08:31:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7364432EE0; Mon, 7 Dec 2015 21:31:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6LEYgXkx2GLU; Mon, 7 Dec 2015 21:31:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 35ECF32E7C; Mon, 7 Dec 2015 21:30:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C639A1BFD7E for ; Mon, 7 Dec 2015 21:29:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C46A3931CC for ; Mon, 7 Dec 2015 21:29:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mrX8Z+xZl6kj for ; Mon, 7 Dec 2015 21:29:43 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by hemlock.osuosl.org (Postfix) with ESMTPS id 99B9893172 for ; Mon, 7 Dec 2015 21:29:43 +0000 (UTC) Received: from adeos.localdomain (unknown [81.57.22.125]) by smtp1-g21.free.fr (Postfix) with ESMTP id 1604C94003C; Mon, 7 Dec 2015 22:28:50 +0100 (CET) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 7 Dec 2015 22:29:10 +0100 Message-Id: <1449523775-6582-9-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1449523775-6582-1-git-send-email-romain.naour@openwide.fr> References: <1449523775-6582-1-git-send-email-romain.naour@openwide.fr> Subject: [Buildroot] [PATCH v7 08/33] package/efl/libefl: add wayland dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" See: https://www.enlightenment.org/about-wayland Signed-off-by: Romain Naour Reviewed-by: "Yann E. MORIN" --- v6: use --enable/disable options v4: rename to libefl --- package/efl/libefl/Config.in | 1 + package/efl/libefl/libefl.mk | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/efl/libefl/Config.in b/package/efl/libefl/Config.in index ac871bf..3cf4b4e 100644 --- a/package/efl/libefl/Config.in +++ b/package/efl/libefl/Config.in @@ -11,6 +11,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 80eb3d8..10d0a98 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. # --disable-xinput22: disable X11 XInput v2.2+ support. # --enable-lua-old: disable Elua and remove luajit dependency. # --with-opengl=none: disable opengl support. @@ -49,7 +48,6 @@ LIBEFL_CONF_OPTS = \ --disable-image-loader-webp \ --disable-sdl \ --disable-systemd \ - --disable-wayland \ --enable-lua-old \ --with-opengl=none \ --with-x11=none @@ -141,6 +139,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