From patchwork Mon Feb 6 13:25:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 724495 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vH7WN5NK2z9s2G for ; Tue, 7 Feb 2017 00:25:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BpDGmFuF"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CC6FD87E19; Mon, 6 Feb 2017 13:25:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id onfJ_OWm2TJm; Mon, 6 Feb 2017 13:25:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CDFC087D2A; Mon, 6 Feb 2017 13:25:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7720D1BFF17 for ; Mon, 6 Feb 2017 13:25:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 74ED187929 for ; Mon, 6 Feb 2017 13:25:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 42DjKsVNfZ+3 for ; Mon, 6 Feb 2017 13:25:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 59DB5863E7 for ; Mon, 6 Feb 2017 13:25:15 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id u63so21914268wmu.2 for ; Mon, 06 Feb 2017 05:25:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CI8GIzejrxPNguPZowtX/WMcNvLhFUmgS0L48PqoTOE=; b=BpDGmFuFqMtZrt3vy0JIDSb+NCmV2AUz6vB9BMN5SYiKpqcyIx1l9EZJFoT6iyClkJ ZVgpKsySglodf8irvIZQS3WAFMIjGSv2MXOicBbDj+93aNaC28YrUK1RxWoIoZm5/VVR 7kuvwZdGxd2r3C7bAFFgq1qo6EmeWscSTBeW1NAEG+FX9wA6LmeJ/YV7xca4u3wM/2Gn INLEJgfz23rhH2endif/iKpW+2Qxz9YG1vvq9JRmVHeZHHXDcwk1xWWzebygH5NgJTB/ MdS4104Q3UQX8EeED02S+zYgk0UncOgZQEVAvIbOodI8J9rc9qEH7miKpHaCO2A6mTn9 kmVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CI8GIzejrxPNguPZowtX/WMcNvLhFUmgS0L48PqoTOE=; b=SpRsuUG2Q1kAyenF7PjrB5sn9ByTCZckYesG9x5tZMBTv//wUybqi8PEherwC/9CfS YtjgmGU72FNVj/QorESUzvDrnpykLiUYU/fyt+IU2geRUV0CDaqRZUzd2H3WQkLGMlFJ CRQNDA7P77OylQbzmlsp3/Ms06mZSh8PCAgMbzZ6t2MPGnD1RriSvBYWsZaHxOpwzRbd cOQ0mBuX9dFt0dulIDclcGiZJWR3NZL+ZQNPb/Tn7v4xxSEvIj7koHp5AlpXkKoonbTJ BQkhvgP9jpbwKkpE717pdEPPMeDBOoRik+dAAQrIOkJw93z/BjAAoSQH5c24EW2Oekhu ws2A== X-Gm-Message-State: AMke39nXT/MBNFfhg5NLVT9VZ1/SxrXyYaGSQbYyuPSeskL6nZaLd6Msr/Yf4eiFI2E5Jw== X-Received: by 10.28.212.82 with SMTP id l79mr8326155wmg.101.1486387513819; Mon, 06 Feb 2017 05:25:13 -0800 (PST) Received: from atlas.localdomain ([2620:0:1055:fd00:23d1:adfb:2d63:6869]) by smtp.gmail.com with ESMTPSA id z134sm12779742wmc.20.2017.02.06.05.25.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Feb 2017 05:25:12 -0800 (PST) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 6 Feb 2017 14:25:10 +0100 Message-Id: <20170206132510.6247-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.3 Cc: Romain Naour , Gustavo Sverzut Barbieri Subject: [Buildroot] [PATCH v2] efl: do not force dependency on libudev by making eeze a config option. 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" From: Gustavo Sverzut Barbieri Although highly recommended to be enabled, EFL's eeze can be disabled and thus no dependency on libudev or dynamic device management. Since 'BR2_PACKAGE_HAS_UDEV' has two ways to be satisfied (eudev or systemd) we can't automatically select it, instead show a comment and use 'depends on'. Signed-off-by: Gustavo Sverzut Barbieri [Romain: - Propagate the eeze dependency to enlightenment - Remove udev provider from eeze comment in efl's Config.in] Signed-off-by: Romain Naour --- v2: Propagate the eeze dependency to enlightenment Remove udev provider from eeze comment in efl's Config.in since we don't explicitely name all possible providers in comment. --- package/efl/Config.in | 25 ++++++++++++++++++++++--- package/efl/efl.mk | 9 ++++++++- package/enlightenment/Config.in | 5 ++++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 8b06a49..79346b3 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_EFL depends on BR2_HOST_GCC_AT_LEAST_4_7 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_HAS_UDEV # libudev depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads depends on BR2_USE_MMU @@ -37,6 +36,19 @@ config BR2_PACKAGE_EFL_BULLET simply not tested so you are on your own in terms of ensuring everything works if you do this. +config BR2_PACKAGE_EFL_EEZE + bool "Enable eeze (udev) support (recommended)" + depends on BR2_PACKAGE_HAS_UDEV # libudev + default y + help + Eeze is EFL's hardware abstraction layer on top of udev. + Having it off will disable some hardware detection, such as + 'drm' graphics engine or 'elput', as well as mounting + removable media. + +comment "eeze needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_EFL_FONTCONFIG bool "Enable fontconfig support (recommended)" select BR2_PACKAGE_FONTCONFIG @@ -98,6 +110,7 @@ config BR2_PACKAGE_EFL_PULSEAUDIO config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT bool "Enable libmount support (recommended)" + depends on BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT # libblkid is part of required tools, see EFL's README. @@ -108,9 +121,13 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT devices etc... and disabling this will hurt support for Enlightenment and its filemanager. +comment "efl's libmount support needs eeze" + depends on !BR2_PACKAGE_EFL_EEZE + config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool default y if BR2_PACKAGE_EFL_BULLET && \ + BR2_PACKAGE_EFL_EEZE && \ BR2_PACKAGE_EFL_FONTCONFIG && \ BR2_PACKAGE_EFL_GSTREAMER1 && \ BR2_PACKAGE_EFL_LIBFRIBIDI && \ @@ -198,6 +215,7 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_ELPUT bool "Elput" + depends on BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON help @@ -208,6 +226,7 @@ config BR2_PACKAGE_EFL_ELPUT config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" + depends on BR2_PACKAGE_EFL_EEZE depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d select BR2_PACKAGE_EFL_ELPUT @@ -279,8 +298,8 @@ config BR2_PACKAGE_EFL_SVG endif # BR2_PACKAGE_EFL -comment "efl needs udev /dev management and a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP \ +comment "efl needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" + depends on !BR2_INSTALL_LIBSTDCPP \ || !BR2_HOST_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS diff --git a/package/efl/efl.mk b/package/efl/efl.mk index ab08946..1e54f72 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -20,7 +20,7 @@ EFL_LICENSE_FILES = \ EFL_INSTALL_STAGING = YES EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ - jpeg luajit lz4 udev zlib + jpeg luajit lz4 zlib # Configure options: # --disable-lua-old: build elua for the target. @@ -59,6 +59,13 @@ else EFL_CONF_OPTS += --disable-cxx-bindings endif +ifeq ($(BR2_PACKAGE_EFL_EEZE),y) +EFL_DEPENDENCIES += udev +EFL_CONF_OPTS += --enable-libeeze +else +EFL_CONF_OPTS += --disable-libeeze +endif + ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux EFL_CONF_OPTS += --enable-libmount diff --git a/package/enlightenment/Config.in b/package/enlightenment/Config.in index b5d889b..2e2bd57 100644 --- a/package/enlightenment/Config.in +++ b/package/enlightenment/Config.in @@ -9,10 +9,12 @@ config BR2_PACKAGE_ENLIGHTENMENT # libedbus -> dbus, efl libraries depends on BR2_USE_MMU depends on BR2_PACKAGE_EFL + depends on BR2_PACKAGE_HAS_UDEV # efl (eeze) -> libudev depends on BR2_PACKAGE_XORG7 # libevas-generic-loaders-svg -> librsvg -> pango -> harfbuzz depends on BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_EFL_X_XLIB + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start select BR2_PACKAGE_EFL_SVG @@ -28,5 +30,6 @@ config BR2_PACKAGE_ENLIGHTENMENT comment "enlightenment needs a toolchain w/ wchar, C++, threads" depends on BR2_PACKAGE_EFL && BR2_PACKAGE_XORG7 && BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_HAS_SYNC_4