From patchwork Sun Jul 31 12:38:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 654357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s2MTS19Dvz9sR9 for ; Sun, 31 Jul 2016 22:38:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9A43C88E02; Sun, 31 Jul 2016 12:38: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 b2AfxE4-IJq0; Sun, 31 Jul 2016 12:38:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2E627875D8; Sun, 31 Jul 2016 12:38:46 +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 007811C2578 for ; Sun, 31 Jul 2016 12:38:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F0A8E8969C for ; Sun, 31 Jul 2016 12:38:44 +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 FYlRgxYwrtM7 for ; Sun, 31 Jul 2016 12:38:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by hemlock.osuosl.org (Postfix) with ESMTPS id 91D1989673 for ; Sun, 31 Jul 2016 12:38:43 +0000 (UTC) Received: from fwd04.aul.t-online.de (fwd04.aul.t-online.de [172.20.26.149]) by mailout10.t-online.de (Postfix) with SMTP id F311441E7D47 for ; Sun, 31 Jul 2016 14:38:40 +0200 (CEST) Received: from fli4l.lan.fli4l (ZXXfaeZU8himHDX6kUNfPo1IKBivazFsZooZ9Gf8pn4GxNh6T6CkfP6-+je7gPNZLV@[84.178.240.184]) by fwd04.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1bTq0q-3hq8Tg0; Sun, 31 Jul 2016 14:38:36 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:47078 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.87) (envelope-from ) id 1bTq0p-0003v7-Jo; Sun, 31 Jul 2016 14:38:35 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 31 Jul 2016 14:38:34 +0200 Message-Id: <1469968714-27285-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.8.1 X-ID: ZXXfaeZU8himHDX6kUNfPo1IKBivazFsZooZ9Gf8pn4GxNh6T6CkfP6-+je7gPNZLV X-TOI-MSGID: 120ce971-b5a6-4710-99c0-0b8f9b8db430 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] package/x11r7/xserver_xorg-server: needs dri/dri2/dri3 for libdrm support 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" Rework dependency handling as pointed out by Thomas: http://lists.busybox.net/pipermail/buildroot/2016-July/168433.html Fixes http://autobuild.buildroot.net/results/2d3/2d38637e7904f3e382e41745a82ee1a1cf19ba71/ Signed-off-by: Bernd Kuhls --- package/x11r7/xserver_xorg-server/Config.in | 11 +++++++++-- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index df3801c..5715a56 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -55,6 +55,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER if BR2_PACKAGE_XSERVER_XORG_SERVER +config BR2_PACKAGE_XSERVER_XORG_SERVER_NEEDS_LIBDRM + bool + select BR2_PACKAGE_LIBDRM + config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 bool @@ -103,10 +107,13 @@ choice config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR bool "Modular X.org" depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \ - BR2_PACKAGE_XPROTO_DRI2PROTO) + select BR2_PACKAGE_XSERVER_XORG_SERVER_NEEDS_LIBDRM if \ + (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \ + BR2_PACKAGE_XPROTO_DRI2PROTO || \ + BR2_PACKAGE_XPROTO_DRI3PROTO) select BR2_PACKAGE_LIBPCIACCESS select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO + help This variant of the X.org server is the full-blown variant, as used by desktop GNU/Linux distributions. The drivers (for diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 85d7e98..490be0f 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -97,7 +97,7 @@ endif ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y) XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess -ifeq ($(BR2_PACKAGE_LIBDRM),y) +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NEEDS_LIBDRM),y) XSERVER_XORG_SERVER_DEPENDENCIES += libdrm XSERVER_XORG_SERVER_CONF_OPTS += --enable-libdrm else @@ -164,7 +164,7 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) XSERVER_XORG_SERVER_DEPENDENCIES += udev XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev # udev kms support depends on libdrm and dri2 -ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy) +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NEEDS_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy) XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms else XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms