From patchwork Mon Jun 9 12:15:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 357433 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 0DDF7140096 for ; Mon, 9 Jun 2014 22:15:53 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D314330697; Mon, 9 Jun 2014 12:15:51 +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 Cpnt+7B-TxYu; Mon, 9 Jun 2014 12:15:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7C6E0304D2; Mon, 9 Jun 2014 12:15:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E8E6C1BFA3B for ; Mon, 9 Jun 2014 12:15:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E3F36896A3 for ; Mon, 9 Jun 2014 12:15:47 +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 brnp67CKxoeD for ; Mon, 9 Jun 2014 12:15:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D9F0789690 for ; Mon, 9 Jun 2014 12:15:46 +0000 (UTC) Received: by mail-wi0-f179.google.com with SMTP id bs8so4149989wib.6 for ; Mon, 09 Jun 2014 05:15:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=PkR1XtGyA6GGBMO6WgxO4algNcROfGaUi6CUeqJsJaQ=; b=Smt+8v9Cb1L+PnV9mf6b+GWEwSPZv6agldc3ysjnZRuCYakJgBdIK9IF4PFu69F3Z9 qE1nJcvf+Oq1UKHBlV62pzHKI9H4bdn6l/n404ILTt5mu8TR/NBBzMRORZQY2yyUHwuD MFAul+RGCjJ0/OySGMOHtCsuA9f4XIomFXktxW3sWA3E0sesVK9B8zm0x19yB/JVvWep tXU2CJxaYRViF//UnperbZMdAn5WeXqB9UREtzf8AtkIQNXg4fnbDXr1LyQCe08RBtIE Ydmrt2LwuHiZJasAU5FmPKr2Lc1VOzSD+T48zMD71n4tWxvsRADqQSd+I3o+1kdtWGPc +KFA== X-Received: by 10.194.8.6 with SMTP id n6mr31021274wja.31.1402316144500; Mon, 09 Jun 2014 05:15:44 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id d6sm14442021wiz.4.2014.06.09.05.15.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Jun 2014 05:15:43 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 9 Jun 2014 14:15:39 +0200 Message-Id: <1402316139-7639-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.3.2 Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH] Revert "package/weston: libxkbcommon is optional" 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 From: "Yann E. MORIN" This reverts commit cf1c2eb19d3eeddca04013cfa7b2107530abf054. xkbcommon is still needed for the clients. There's no point in disabling the clients, or weston is unusable (as packaged in Buildroot.) Signed-off-by: Yann E. MORIN --- package/weston/Config.in | 11 +---------- package/weston/weston.mk | 9 +-------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/package/weston/Config.in b/package/weston/Config.in index 96ebdf1..aaef405 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -5,6 +5,7 @@ comment "weston needs udev and a toolchain w/ threads, headers >= 3.0" config BR2_PACKAGE_WESTON bool "weston" select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_LIBXKBCOMMON select BR2_PACKAGE_CAIRO select BR2_PACKAGE_CAIRO_PNG select BR2_PACKAGE_LIBPNG @@ -28,16 +29,6 @@ config BR2_PACKAGE_WESTON if BR2_PACKAGE_WESTON -config BR2_PACKAGE_WESTON_HW_KBD - bool "enable keyboard support" - default y - select BR2_PACKAGE_LIBXKBCOMMON - help - Say 'y' here if you plan on using a keyboard. - - Only say 'n' if you're going to use a virtual keyboard or any other - input method. - # Helper to make sure at least one compositor is selected. config BR2_PACKAGE_WESTON_HAS_COMPOSITOR bool diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 325cfc7..ed0707b 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -10,7 +10,7 @@ WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING -WESTON_DEPENDENCIES = host-pkgconf wayland pixman libpng \ +WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \ jpeg mtdev udev cairo WESTON_CONF_OPT = \ @@ -25,13 +25,6 @@ WESTON_CONF_OPT = \ --disable-weston-launch \ --disable-colord -ifeq ($(BR2_PACKAGE_WESTON_HW_KBD),y) -WESTON_DEPENDENCIES += libxkbcommon -WESTON_CONF_OPT += --enable-xkbcommon -else -WESTON_CONF_OPT += --disable-xkbcommon -endif - ifeq ($(BR2_PACKAGE_LIBINPUT),y) WESTON_DEPENDENCIES += libinput WESTON_CONF_OPT += --enable-libinput-backend