From patchwork Fri Oct 11 21:00:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 282935 X-Patchwork-Delegate: yann.morin.1998@free.fr Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 367FA2C016E for ; Sat, 12 Oct 2013 08:00:27 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 049868B7FA; Fri, 11 Oct 2013 21:00:26 +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 89AljolCyVUz; Fri, 11 Oct 2013 21:00:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6EE0B8B7E5; Fri, 11 Oct 2013 21:00:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2FE471CE722 for ; Fri, 11 Oct 2013 21:00:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2A2568D2B8 for ; Fri, 11 Oct 2013 21:00:22 +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 Cwg98YV-ANX0 for ; Fri, 11 Oct 2013 21:00:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id D8AB78D2B2 for ; Fri, 11 Oct 2013 21:00:18 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1VUjoE-0004wc-EU; Fri, 11 Oct 2013 22:59:42 +0200 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1VUjoj-0003f0-Bz; Fri, 11 Oct 2013 23:00:13 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Fri, 11 Oct 2013 23:00:11 +0200 Message-Id: <1381525213-14034-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.8.4.rc3 Subject: [Buildroot] [PATCH 1/3] weston: improve selection of compositor X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net The way the compositor was selected in Config.in was counter-intuitive, because the fbdev backend is selected by default even if a different one is available. Instead, select the fbdev backend only if no other one was selected by the user. Also re-ordered the compositor options, putting fbdev last. This is more natural when the user wants to select both backends: after selecting the RPi backend, the fbdev is automatically unselected but the user can move one line down to select it again. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/weston/Config.in | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 4532c28..fd48fb3 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -14,6 +14,8 @@ config BR2_PACKAGE_WESTON depends on BR2_TOOLCHAIN_HAS_THREADS # wayland # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG + # Make sure at least one compositor is selected. + select BR2_PACKAGE_WESTON_FBDEV if !BR2_PACKAGE_WESTON_HAS_COMPOSITOR help Weston is the reference implementation of a Wayland compositor, and a useful compositor in its own right. @@ -24,17 +26,9 @@ config BR2_PACKAGE_WESTON if BR2_PACKAGE_WESTON -# These two options make sure at least one compositor is selected. +# Helper to make sure at least one compositor is selected. config BR2_PACKAGE_WESTON_HAS_COMPOSITOR bool -config BR2_PACKAGE_WESTON_NEEDS_ONE_COMPOSITOR - def_bool y - depends on ! BR2_PACKAGE_WESTON_HAS_COMPOSITOR - select BR2_PACKAGE_WESTON_FBDEV - -config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor" - default y config BR2_PACKAGE_WESTON_RPI bool "RPi compositor" @@ -45,4 +39,7 @@ config BR2_PACKAGE_WESTON_RPI select BR2_PACKAGE_RPI_USERLAND select BR2_PACKAGE_WESTON_HAS_COMPOSITOR +config BR2_PACKAGE_WESTON_FBDEV + bool "fbdev compositor" + endif