From patchwork Sat May 14 17:56:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631108 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tWP1lxDz9s5V for ; Sun, 15 May 2022 03:57:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id ECF434098F; Sat, 14 May 2022 17:57:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uBMNxzXQJXZ0; Sat, 14 May 2022 17:57:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id EE9434090E; Sat, 14 May 2022 17:57:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 51BD01BF947 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 3D4DB400A6 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id foKVDvWajtJf for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by smtp2.osuosl.org (Postfix) with ESMTPS id 106A1408DB for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) Received: from fwd86.dcpf.telekom.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout10.t-online.de (Postfix) with SMTP id 854486622; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd86.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-2G5rpz0; Sat, 14 May 2022 19:56:13 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-F0; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:03 +0200 Message-Id: <20220514175612.2510884-10-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550973-000116DC-919598D2/0/0 CLEAN NORMAL X-TOI-MSGID: dbb8af03-d38e-49b2-830d-fa40bc216496 Subject: [Buildroot] [PATCH 10/19] package/x11r7/xdriver_xf86-video-mga: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA=y Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-mga/Config.in | 4 ---- .../x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in index 15fb3b9f87..bac5e62442 100644 --- a/package/x11r7/xdriver_xf86-video-mga/Config.in +++ b/package/x11r7/xdriver_xf86-video-mga/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA bool "xf86-video-mga" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help Matrox video driver - -comment "xf86-video-mga needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 3c668a5c98..24f2da2cce 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -12,7 +12,9 @@ XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri endif