From patchwork Tue May 24 13:04:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 625615 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 3rDbGs09ZJz9snk for ; Tue, 24 May 2016 23:04:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B939A6B4A; Tue, 24 May 2016 13:04:51 +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 TBVE8KIFykug; Tue, 24 May 2016 13:04:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 024F5A6AE1; Tue, 24 May 2016 13:04:49 +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 151131C11DC for ; Tue, 24 May 2016 13:04:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 131BA92375 for ; Tue, 24 May 2016 13:04:48 +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 20y7a-ys+ozI for ; Tue, 24 May 2016 13:04:46 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7298B923F2 for ; Tue, 24 May 2016 13:04:46 +0000 (UTC) Received: from asgard (cpe-186-22-138-122.telecentro-reversos.com.ar [186.22.138.122] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.1/8.15.1) with ESMTPSA id u4OD4dWX000767 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 24 May 2016 13:04:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1464095083; bh=IEg8pBwx6U5gY5nYswRhXXAn3FxQfi/LKoDqAGHxC7s=; h=From:To:Cc:Subject:Date; b=rFojFwX5Jv5EzxHjC4lPgtQAA6vboLPqt19DvgPDFYRSC6zirDSu5uOf7FXkiWBED lAA+hjwpbxb3uELlwqq4R/NWa/2KiJnrxhxZfy1IK870mIXGHtsse4Ai26LxyuxHP6 KDIug1Xxvo2zQuhwMifoBpac7qLy6ucKMOeXgwLw= Received: by asgard (sSMTP sendmail emulation); Tue, 24 May 2016 10:04:37 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 24 May 2016 10:04:37 -0300 Message-Id: <1464095077-9405-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.7.3 X-Virus-Scanned: clamav-milter 0.99 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] xserver_xorg-server: add explicit handling for xwayland 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" It's normally autodetected, which can lead to unexpected/unhandled results. configure checks for libdrm, libepoxy and wayland, however a proper libxcomposite check is missing thus it can lead to build failure under some odd conditions. There's no autobuilder failure to quote here, however there's a mailing list post that exemplifies this: http://lists.busybox.net/pipermail/buildroot/2016-May/161793.html Signed-off-by: Gustavo Zacarias --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 31f6d0d..69e9151 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -80,6 +80,14 @@ XSERVER_XORG_SERVER_CONF_OPTS += \ --disable-systemd-logind endif +# Xwayland support needs libdrm, libepoxy, wayland and libxcomposite +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY)$(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),yyyy) +XSERVER_XORG_SERVER_CONF_OPTS += --enable-wayland +XSERVER_XORG_SERVER_DEPENDENCIES += libdrm libepoxy wayland xlib_libXcomposite +else +XSERVER_XORG_SERVER_CONF_OPTS += --disable-wayland +endif + # Present protocol only required for xserver 1.15+, but does not matter if # enabled for older versions as they don't use it (not even optionally). ifeq ($(BR2_PACKAGE_XPROTO_PRESENTPROTO),y)