From patchwork Sun Apr 7 17:13:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1080209 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44cgB42Czvz9sPq for ; Mon, 8 Apr 2019 03:13:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CBB0387834; Sun, 7 Apr 2019 17:13:30 +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 CviN+r2mTzb6; Sun, 7 Apr 2019 17:13:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8CD9B87860; Sun, 7 Apr 2019 17:13:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 00EA51BF316 for ; Sun, 7 Apr 2019 17:13:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EFE2B228EF for ; Sun, 7 Apr 2019 17:13:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zWOwM7yZ+K8S for ; Sun, 7 Apr 2019 17:13:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by silver.osuosl.org (Postfix) with ESMTPS id 8AB8722661 for ; Sun, 7 Apr 2019 17:13:26 +0000 (UTC) Received: from fwd23.aul.t-online.de (fwd23.aul.t-online.de [172.20.26.128]) by mailout06.t-online.de (Postfix) with SMTP id E37F341CC862; Sun, 7 Apr 2019 19:13:23 +0200 (CEST) Received: from fli4l.lan.fli4l (GoBkVcZV8hrMBXBdiccftBX6d9KrS+AsQWDCF0V6ZGstXI2W-mJFyNHYTO0vJYHgKe@[84.161.185.164]) by fwd23.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hDBM7-2UI5OC0; Sun, 7 Apr 2019 19:13:19 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:53894 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hDBM6-0006x9-4s; Sun, 07 Apr 2019 19:13:18 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 7 Apr 2019 19:13:17 +0200 Message-Id: <20190407171318.19852-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: GoBkVcZV8hrMBXBdiccftBX6d9KrS+AsQWDCF0V6ZGstXI2W-mJFyNHYTO0vJYHgKe X-TOI-MSGID: 60401cd6-ddfa-4623-8126-41a2948332a8 Subject: [Buildroot] [PATCH 1/2] package/libva: remove optional mesa3d support 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: Romain Naour 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 first step: disable mesa3d support in libva. Signed-off-by: Bernd Kuhls --- package/libva/libva.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 8a21c11b6c..d1538934e7 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -15,17 +15,14 @@ LIBVA_DEPENDENCIES = host-pkgconf libdrm # libdrm is a hard-dependency LIBVA_CONF_OPTS = \ --enable-drm \ + --disable-glx \ --with-drivers-path="/usr/lib/va" ifeq ($(BR2_PACKAGE_XORG7),y) LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes LIBVA_CONF_OPTS += --enable-x11 -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -LIBVA_DEPENDENCIES += mesa3d -LIBVA_CONF_OPTS += --enable-glx -endif else -LIBVA_CONF_OPTS += --disable-glx --disable-x11 +LIBVA_CONF_OPTS += --disable-x11 endif ifeq ($(BR2_PACKAGE_WAYLAND),y) From patchwork Sun Apr 7 17:13:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1080210 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44cgB80tPXz9sPq for ; Mon, 8 Apr 2019 03:13:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F3A9B878C8; Sun, 7 Apr 2019 17:13:31 +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 Y79+sFO9SMbL; Sun, 7 Apr 2019 17:13:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 78EEE8788E; Sun, 7 Apr 2019 17:13:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 65B831BF316 for ; Sun, 7 Apr 2019 17:13:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 62C03228EF for ; Sun, 7 Apr 2019 17:13:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5QGWd7q8t3xo for ; Sun, 7 Apr 2019 17:13:29 +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 silver.osuosl.org (Postfix) with ESMTPS id 61E4622661 for ; Sun, 7 Apr 2019 17:13:29 +0000 (UTC) Received: from fwd18.aul.t-online.de (fwd18.aul.t-online.de [172.20.26.244]) by mailout10.t-online.de (Postfix) with SMTP id 6B0A141B6195; Sun, 7 Apr 2019 19:13:27 +0200 (CEST) Received: from fli4l.lan.fli4l (EAlBk-ZFYhGDqPn6G1j2nHO-z5m2VTaVQH6n3-8IFNgY7caqrMTlQnsU9ZT8OkUwc3@[84.161.185.164]) by fwd18.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hDBM7-2hCYl60; Sun, 7 Apr 2019 19:13:19 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:53894 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hDBM6-0006x9-Kk; Sun, 07 Apr 2019 19:13:19 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 7 Apr 2019 19:13:18 +0200 Message-Id: <20190407171318.19852-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190407171318.19852-1-bernd.kuhls@t-online.de> References: <20190407171318.19852-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: EAlBk-ZFYhGDqPn6G1j2nHO-z5m2VTaVQH6n3-8IFNgY7caqrMTlQnsU9ZT8OkUwc3 X-TOI-MSGID: 63e5794a-bde9-4949-90be-d7b86820bf03 Subject: [Buildroot] [PATCH 2/2] 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: , Cc: Romain Naour 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. Added upstream patch, for details see LibreELEC PR 2403 and Kodi PR 13333. 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 9779de788c..7e7f913180 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -124,6 +124,12 @@ MESA3D_CONF_OPTS += \ --enable-shared-glapi \ --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ --enable-gallium-extra-hud +ifeq ($(BR2_PACKAGE_LIBVA),y) +MESA3D_CONF_OPTS += --enable-va +MESA3D_DEPENDENCIES += libva +else +MESA3D_CONF_OPTS += --disable-va +endif endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) @@ -165,10 +171,6 @@ endif # - it is needed for GLES (mesa3d's ./configure is a bit weird) MESA3D_CONF_OPTS += --enable-opengl --enable-dri -# libva and mesa3d have a circular dependency -# we do not need libva support in mesa3d, therefore disable this option -MESA3D_CONF_OPTS += --disable-va - # libGL is only provided for a full xorg stack ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_PROVIDES += libgl @@ -190,6 +192,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