From patchwork Sun Jan 10 22:28:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1424327 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=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=C9cC/KdE; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DDWj55zsFz9sWt for ; Mon, 11 Jan 2021 09:29:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3C5F88636A; Sun, 10 Jan 2021 22:29:12 +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 iWZemvzBZqYp; Sun, 10 Jan 2021 22:29:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 6898B84415; Sun, 10 Jan 2021 22:29:02 +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 109831BF421 for ; Sun, 10 Jan 2021 22:28:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0DECB84016 for ; Sun, 10 Jan 2021 22:28:46 +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 8N-6EfurD8UI for ; Sun, 10 Jan 2021 22:28:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by whitealder.osuosl.org (Postfix) with ESMTPS id AF0E0846D3 for ; Sun, 10 Jan 2021 22:28:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1610317716; bh=wig/0mb+s/uJT7Lc3Ocp85CuwtUT1zAdTje9x94Ek5w=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=C9cC/KdE3LAlchnIKn5X0AkqZeS/68J/1CzJq5AKwAjeyZWBWiwhN1+hkcfJb6b4O A9yIINJjWeSK+4IyaQmKHO3tCYRDndsHLO3j/b1jv3DbBIqRP1bjo5Z4WACckQ3Nqu F/5v8Wv+PQDFB0dr13YbxbY5qjPJ3w5ej+jUkqXw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.190]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MbAcs-1kNSVY2SHA-00bYx5; Sun, 10 Jan 2021 23:28:36 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sun, 10 Jan 2021 23:28:25 +0100 Message-Id: <20210110222833.26301-5-ps.report@gmx.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210110222833.26301-1-ps.report@gmx.net> References: <20210110222833.26301-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:Rs2kFytghuLrEieC3WrOTN83fxvSVX2+P0zHSseO5OYDaXjjKdZ k+bK6xarH1y58GksaEq82HOCWc7XNuF5D+J6Y6TNbILqNM04OTCXIDcoUsaagd9bq4VpmfU twOVb4HIXrmgBc7YFyvg4PvpMSRQZprMhTxzaLrZV2s6VNZCNsd14y//4Jl2MUlzidBnHgY 4XDo0xfxoaFGsFCQjanXw== X-UI-Out-Filterresults: notjunk:1;V03:K0:vhfFX8fBY5U=:+lrwcpD93QgW50ptd2UcLA m5RdyXlw9BT0HD96zK5obe5SgzpuWDe9Ji4iZGNSnYW6y86g9uSHk0q+VvCyTNmspHQvGX+Gn pafDAHFKxLvMalKbgtJsSWRfhvYKfEo/YWkev3qldby/w4H/GFh9ZQ8Jqgu+7E+j61IYXFlk4 Rqnr+xfjuPX7hgLeFAxbsME/z7tDzAYSMwuO6l2cccCr54eSX/6E4Y8506sjgclvU3s9KKnnF J+wJYymPFxbPAPC7hp158LH+AkPrzr+ra/sqayQ6OEIbJtrQb/eC1SlrX6mK0YGKZPEoJQ5IN f/Mn65l/u9eIw8bHtpce8OZD5imIRjzxBlX2lPYjJweieHCnsJ7e4MChWMt9FXEcoGsV0Dd+L N95KxxvwgdbmoSsxSWBw0HOFNfmbz56v3l+GBwiFuUG8gjY8fcE0y/maiOwBfNuK4Gkwfgx/u HY9hpbSH5qbAe7ugtmf1zYC2Z5fWwauXQgTmlQ1JDV9PcHLUb/e3cCzFNfvRExZxLcv2iETaI TiE09UJqTITreXXx8dcDc+AYvaeMb0FGfJNiV97nGmcStcP8dXhDiJQ0xgsaKJU+7P43t1pR3 /XqCgLNkCewB8LBFVIUzxKVMw+/oL9KjJugcuCkdLQBQrEnd6ZQFNxPyH36GHTpJR7P1y8ueQ ejHAYxp6kwUEJbzNDA2zKI92Om0/O+5UPkjZAMU5X5X85C5JafxjjjHE5lWxqZhuFlLoXSr7f cgCeGUp/dX+VARs+RSfKQ7qwGKyxj/va2DHjY9TsU5aNuaHPqvI4QiXUeisx9AayYloSNApoW zZURvEC3S0vlLDRho4yVSIUpgPrMtCROzm8oYH2Hy+Hxp+fainMr2SE0Ha3qeSWdALdRHq50A 4CqpnQyi3afKzFa8JmLA== Subject: [Buildroot] [RFC v2 04/12] package/mesa3d: DRI3 with GLX needs xshmfence X-BeenThere: buildroot@busybox.net 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: Bernd Kuhls , Romain Naour , Julien Corjon , "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes for the following defconfig: BR2_arm=y BR2_cortex_a72=y BR2_ARM_FPU_NEON_VFPV4=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_DRI3=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y this configure error: .../build/mesa3d-20.3.2/meson.build:1772:6: ERROR: Dependency "xshmfence" not found, tried pkgconfig and cmake Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - new patch --- package/mesa3d/Config.in | 5 +++-- package/mesa3d/mesa3d.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7a976f4b2c..8a01fa95e2 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -17,6 +17,8 @@ if BR2_PACKAGE_MESA3D config BR2_PACKAGE_MESA3D_DRI3 bool "Enable DRI3 support" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_MESA3D_OPENGL_GLX help Enable DRI3 support. @@ -398,7 +400,7 @@ comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL bool "Vulkan Intel driver" depends on BR2_i386 || BR2_x86_64 - # depends on BR2_TOOLCHAIN_HAS_SYNC_4 because of libxshmfence only + # depends on BR2_TOOLCHAIN_HAS_SYNC_4 because of dri3/libxshmfence only # in case GLX is enabled but the following results in 'recursive # dependency detected!', so simple depend always on BR2_TOOLCHAIN_HAS_SYNC_4 # depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_MESA3D_OPENGL_GLX # libxshmfence in case GLX is enabled @@ -408,7 +410,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL select BR2_PACKAGE_EXPAT select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_MESA3D_OPENGL_GLX select BR2_PACKAGE_MESA3D_VULKAN_DRIVER - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_MESA3D_OPENGL_GLX help Vulkan driver for Intel hardware from Ivy Bridge onward. diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 967b86810f..31f1c12d63 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -38,6 +38,9 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) MESA3D_CONF_OPTS += -Ddri3=enabled +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) +MESA3D_DEPENDENCIES += xlib_libxshmfence +endif else MESA3D_CONF_OPTS += -Ddri3=disabled endif @@ -146,9 +149,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers= else -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL)$(BR2_PACKAGE_MESA3D_OPENGL_GLX),yy) -MESA3D_DEPENDENCIES += xlib_libxshmfence -endif MESA3D_CONF_OPTS += \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif