From patchwork Sun Jun 30 14:04:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124893 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=none (p=none dis=none) header.from=t-online.de 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 45cC2b41PFz9sBp for ; Mon, 1 Jul 2019 00:05:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 466F186365; Sun, 30 Jun 2019 14:05:38 +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 rN7LeOSDgj3B; Sun, 30 Jun 2019 14:05:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 63E4486272; Sun, 30 Jun 2019 14:05:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4611D1BF336 for ; Sun, 30 Jun 2019 14:05:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2DF0B81E3B for ; Sun, 30 Jun 2019 14:05:34 +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 N8Kz2RXy0LlP for ; Sun, 30 Jun 2019 14:05:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2B65D81E34 for ; Sun, 30 Jun 2019 14:05:33 +0000 (UTC) Received: from fwd35.aul.t-online.de (fwd35.aul.t-online.de [172.20.27.145]) by mailout08.t-online.de (Postfix) with SMTP id 329AF41BB585 for ; Sun, 30 Jun 2019 16:05:31 +0200 (CEST) Received: from fli4l.lan.fli4l (EAUoUEZdwhtMdpEHflxHTHucNyb9Qpxm9Etm+QYb6r+iVtXY1CsLKX70STvNsP2wrV@[91.58.12.45]) by fwd35.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhaSN-13Rdg00; Sun, 30 Jun 2019 16:05:27 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:48398) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhaSN-0001eG-2R for buildroot@buildroot.org; Sun, 30 Jun 2019 16:05:27 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 30 Jun 2019 16:04:57 +0200 Message-Id: <20190630140525.6537-4-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190630140525.6537-1-bernd.kuhls@t-online.de> References: <20190630140525.6537-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: EAUoUEZdwhtMdpEHflxHTHucNyb9Qpxm9Etm+QYb6r+iVtXY1CsLKX70STvNsP2wrV X-TOI-MSGID: 48a55f4b-481d-4b82-b9af-9dbf358103d9 Subject: [Buildroot] [PATCH 03/31] package/mesa3d: add optional support for libva 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Kodi 18.0-Leia will support vaapi on r600 and radeonsi. We need libva support in mesa3d for this. To avoid the circular dependency we switch from using mesa3d in libva to use libva in mesa3d. This patch is the second step: enable libva support in mesa3d. To fix a new configure error caused by this patch configure: error: VA requires at least one of the x11 drm or wayland platforms with this defconfig BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_LIBVA=y we add drm to mesa platforms for r600. Signed-off-by: Bernd Kuhls --- package/mesa3d/mesa3d.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 15dbc4fa3d..58f0351328 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -111,6 +111,12 @@ MESA3D_CONF_OPTS += \ -Dshared-glapi=true \ -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ -Dgallium-extra-hud=true +ifeq ($(BR2_PACKAGE_LIBVA),y) +MESA3D_CONF_OPTS += -Dgallium-va=true +MESA3D_DEPENDENCIES += libva +else +MESA3D_CONF_OPTS += -Dgallium-va=false +endif endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) @@ -151,10 +157,6 @@ endif # - Building OpenGL ES without OpenGL is not supported, so always keep opengl enabled. MESA3D_CONF_OPTS += -Dopengl=true -# libva and mesa3d have a circular dependency -# we do not need libva support in mesa3d, therefore disable this option -MESA3D_CONF_OPTS += -Dgallium-va=false - # libGL is only provided for a full xorg stack ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_PROVIDES += libgl @@ -176,6 +178,8 @@ else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y) MESA3D_PLATFORMS = drm else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI),y) MESA3D_PLATFORMS = drm +else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600),y) +MESA3D_PLATFORMS = drm endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEPENDENCIES += wayland wayland-protocols