From patchwork Sat Jun 29 17:25:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124817 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45bgWz024jz9s3l for ; Sun, 30 Jun 2019 03:25:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0B8AE85B73; Sat, 29 Jun 2019 17:25:46 +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 q9aGBvof06rf; Sat, 29 Jun 2019 17:25:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4F2108543A; Sat, 29 Jun 2019 17:25:45 +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 38E551BF83A for ; Sat, 29 Jun 2019 17:25:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 35AD58543A for ; Sat, 29 Jun 2019 17:25:42 +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 ZqQtCAQZjYmU for ; Sat, 29 Jun 2019 17:25:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3EA99853D3 for ; Sat, 29 Jun 2019 17:25:41 +0000 (UTC) Received: from fwd24.aul.t-online.de (fwd24.aul.t-online.de [172.20.26.129]) by mailout02.t-online.de (Postfix) with SMTP id 571A3419CBB5; Sat, 29 Jun 2019 19:25:39 +0200 (CEST) Received: from fli4l.lan.fli4l (TuSyyTZvgh9i-Qkz5CnFQg6Up+ErVfL3NCZ6F-mlJnu9dUExzaGv1-0GGiJllTQgmG@[91.58.12.45]) by fwd24.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhH6U-34Lh0S0; Sat, 29 Jun 2019 19:25:34 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44768) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhH6T-0001bm-CM; Sat, 29 Jun 2019 19:25:33 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 29 Jun 2019 19:25:24 +0200 Message-Id: <20190629172532.26231-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: TuSyyTZvgh9i-Qkz5CnFQg6Up+ErVfL3NCZ6F-mlJnu9dUExzaGv1-0GGiJllTQgmG X-TOI-MSGID: c44f8422-02be-4df5-bebd-d006bcd73047 Subject: [Buildroot] [PATCH v4 1/9] package/python3-mako: new package 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: =?utf-8?q?Andr=C3=A9_Hentschel?= , Asaf Kahlon , Spenser Gilliland , Romain Naour , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Romain Naour host-python3-mako will be used by python 3 only script used in the build system of mesa3d package. There is no way to force building host-oython-mako for python2 and python3 [1]. [1] http://patchwork.ozlabs.org/patch/1084248/ Signed-off-by: Romain Naour Signed-off-by: Bernd Kuhls --- v4: no changes package/python-mako/python-mako.mk | 2 ++ package/python3-mako/python3-mako.hash | 1 + package/python3-mako/python3-mako.mk | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 120000 package/python3-mako/python3-mako.hash create mode 100644 package/python3-mako/python3-mako.mk diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 0d06dc4986..f8478cf031 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,6 +4,8 @@ # ################################################################################ +# Please keep in sync with +# package/python3-mako/python3-mako.mk PYTHON_MAKO_VERSION = 1.0.6 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz PYTHON_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e diff --git a/package/python3-mako/python3-mako.hash b/package/python3-mako/python3-mako.hash new file mode 120000 index 0000000000..068be91fb0 --- /dev/null +++ b/package/python3-mako/python3-mako.hash @@ -0,0 +1 @@ +../python-mako/python-mako.hash \ No newline at end of file diff --git a/package/python3-mako/python3-mako.mk b/package/python3-mako/python3-mako.mk new file mode 100644 index 0000000000..41249bb040 --- /dev/null +++ b/package/python3-mako/python3-mako.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# python3-mako +# +################################################################################ + +# Please keep in sync with +# package/python-mako/python-mako.mk +PYTHON3_MAKO_VERSION = 1.0.6 +PYTHON3_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz +PYTHON3_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e +PYTHON3_MAKO_SETUP_TYPE = setuptools +PYTHON3_MAKO_LICENSE = MIT +PYTHON3_MAKO_LICENSE_FILES = LICENSE +HOST_PYTHON3_MAKO_DL_SUBDIR = python-mako +HOST_PYTHON3_MAKO_NEEDS_HOST_PYTHON = python3 + +# In host build, setup.py tries to download markupsafe if it is not installed +HOST_PYTHON3_MAKO_DEPENDENCIES = host-python-markupsafe + +$(eval $(host-python-package)) From patchwork Sat Jun 29 17:25:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124820 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45bgX06KPGz9sBr for ; Sun, 30 Jun 2019 03:25:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B48E885C9D; Sat, 29 Jun 2019 17:25:48 +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 3qTy1V9mTYm3; Sat, 29 Jun 2019 17:25:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id F150185BC4; Sat, 29 Jun 2019 17:25:47 +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 796021BF83A for ; Sat, 29 Jun 2019 17:25:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 717168543A for ; Sat, 29 Jun 2019 17:25:43 +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 LUWMi2KIEBcp for ; Sat, 29 Jun 2019 17:25:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4652E853D9 for ; Sat, 29 Jun 2019 17:25:41 +0000 (UTC) Received: from fwd24.aul.t-online.de (fwd24.aul.t-online.de [172.20.26.129]) by mailout02.t-online.de (Postfix) with SMTP id 5B9E1419CBB7; Sat, 29 Jun 2019 19:25:39 +0200 (CEST) Received: from fli4l.lan.fli4l (rfkMR8Zcoh5tZ7yMquNT9SnkF8d4L6c8WOlAOd-a5XkRwRWh5W2ICrBmY0HJvIJgol@[91.58.12.45]) by fwd24.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhH6U-351lUO0; Sat, 29 Jun 2019 19:25:34 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44768) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhH6T-0001bm-TZ; Sat, 29 Jun 2019 19:25:34 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 29 Jun 2019 19:25:25 +0200 Message-Id: <20190629172532.26231-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190629172532.26231-1-bernd.kuhls@t-online.de> References: <20190629172532.26231-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: rfkMR8Zcoh5tZ7yMquNT9SnkF8d4L6c8WOlAOd-a5XkRwRWh5W2ICrBmY0HJvIJgol X-TOI-MSGID: 438f757f-a8b8-49ea-8157-c2823a92921d Subject: [Buildroot] [PATCH v4 2/9] package/mesa3d: rename OSMesa option 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: =?utf-8?q?Andr=C3=A9_Hentschel?= , Asaf Kahlon , Spenser Gilliland , Romain Naour , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Romain Naour This option is renamed in order to match the naming used by the meson buildsystem. Signed-off-by: Romain Naour Signed-off-by: Bernd Kuhls --- v4: rebased (Bernd) Config.in.legacy | 7 +++++++ package/mesa3d-demos/mesa3d-demos.mk | 2 +- package/mesa3d/Config.in | 8 ++++---- package/mesa3d/mesa3d.mk | 2 +- package/wine/wine.mk | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7a7f8814ed..44933ba45d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2019.08" +config BR2_PACKAGE_MESA3D_OSMESA + bool "mesa OSMesa option renamed" + select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + help + The option was renamed in order to match the naming used + by the meson buildsystem. + config BR2_PACKAGE_XAPP_MKFONTDIR bool "mkfontdir is now included in xapp_mkfontscale" select BR2_PACKAGE_XAPP_MKFONTSCALE diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index ddff9b9ed9..e9aa44dc2e 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -61,7 +61,7 @@ ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr # osmesa support depends on glut -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) MESA3D_DEMOS_CONF_OPTS += --enable-osmesa else MESA3D_DEMOS_CONF_OPTS += --disable-osmesa diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 3f44e94229..bd05116aca 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -265,11 +265,11 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= comment "Off-screen Rendering" -config BR2_PACKAGE_MESA3D_OSMESA - bool "OSMesa library" +config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + bool "OSMesa (classic) library" help - The OSMesa API provides functions for making off-screen - renderings. + The OSMesa classic API provides functions for + making off-screen renderings. if BR2_PACKAGE_MESA3D_DRIVER diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b1799067ee..81736c83d3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -156,7 +156,7 @@ endif # APIs -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) MESA3D_CONF_OPTS += --enable-osmesa else MESA3D_CONF_OPTS += --disable-osmesa diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 78fa860ecf..a09fcdff23 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -195,7 +195,7 @@ else WINE_CONF_OPTS += --without-ldap endif -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d else From patchwork Sat Jun 29 17:25:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124823 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 45bgXD4klgz9s3l for ; Sun, 30 Jun 2019 03:26:04 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7C4EB88175; Sat, 29 Jun 2019 17:26:02 +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 xL2J-3-tNutd; Sat, 29 Jun 2019 17:25:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5EDBC87E8F; Sat, 29 Jun 2019 17:25:55 +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 295571BF83A for ; Sat, 29 Jun 2019 17:25:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2051F204D2 for ; Sat, 29 Jun 2019 17:25:52 +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 XLyV8kUJMu2n for ; Sat, 29 Jun 2019 17:25:51 +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 silver.osuosl.org (Postfix) with ESMTPS id EAA6D204C7 for ; Sat, 29 Jun 2019 17:25:50 +0000 (UTC) Received: from fwd05.aul.t-online.de (fwd05.aul.t-online.de [172.20.27.149]) by mailout08.t-online.de (Postfix) with SMTP id 354E541D64D6; Sat, 29 Jun 2019 19:25:49 +0200 (CEST) Received: from fli4l.lan.fli4l (bjIS-6ZQrhNhOro7-LvHcgMKsRX3AckvdWpocQDyTVBYUR47LsCL+vz0grASG+RwG6@[91.58.12.45]) by fwd05.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhH6V-2Rcozo0; Sat, 29 Jun 2019 19:25:35 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44768) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhH6U-0001bm-Fs; Sat, 29 Jun 2019 19:25:34 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 29 Jun 2019 19:25:26 +0200 Message-Id: <20190629172532.26231-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190629172532.26231-1-bernd.kuhls@t-online.de> References: <20190629172532.26231-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: bjIS-6ZQrhNhOro7-LvHcgMKsRX3AckvdWpocQDyTVBYUR47LsCL+vz0grASG+RwG6 X-TOI-MSGID: 3e3bc513-a3d3-44e2-bf75-aae868d61722 Subject: [Buildroot] [PATCH v4 3/9] package/mesa3d: add OSMesa classic needs dri swrast 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: =?utf-8?q?Andr=C3=A9_Hentschel?= , Asaf Kahlon , Spenser Gilliland , Romain Naour , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Romain Naour The meson build system now check if dri swrast is enabled when OSMesa classic is enabled. See: https://cgit.freedesktop.org/mesa/mesa/commit/?id=cbbd5bb889a2c271a504c379f36a7cb717a85af4 Signed-off-by: Romain Naour Signed-off-by: Bernd Kuhls --- v4: rebased (Bernd) Config.in.legacy | 1 + package/mesa3d/Config.in | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Config.in.legacy b/Config.in.legacy index 44933ba45d..754a08ee73 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -148,6 +148,7 @@ comment "Legacy options removed in 2019.08" config BR2_PACKAGE_MESA3D_OSMESA bool "mesa OSMesa option renamed" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC help The option was renamed in order to match the naming used diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index bd05116aca..9bb95c3fd6 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -267,10 +267,14 @@ comment "Off-screen Rendering" config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC bool "OSMesa (classic) library" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST help The OSMesa classic API provides functions for making off-screen renderings. +comment "OSMesa classic requires dri (classic) swrast" + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + if BR2_PACKAGE_MESA3D_DRIVER comment "Additional API Support" From patchwork Sat Jun 29 17:25:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124815 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 45bgWz0P3Nz9s4Y for ; Sun, 30 Jun 2019 03:25:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 65EDB87E97; Sat, 29 Jun 2019 17:25:46 +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 t2iZzJfgFgdD; Sat, 29 Jun 2019 17:25:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 823F8876F4; Sat, 29 Jun 2019 17:25:44 +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 322B11BF83A for ; Sat, 29 Jun 2019 17:25:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2F6E1853D3 for ; Sat, 29 Jun 2019 17:25:41 +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 SKorH7Gcf7AV for ; Sat, 29 Jun 2019 17:25:39 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 3A695853D9 for ; Sat, 29 Jun 2019 17:25:39 +0000 (UTC) Received: from fwd21.aul.t-online.de (fwd21.aul.t-online.de [172.20.27.66]) by mailout06.t-online.de (Postfix) with SMTP id 8853B41B20AB; Sat, 29 Jun 2019 19:25:36 +0200 (CEST) Received: from fli4l.lan.fli4l (JbFKT+ZZQh1O8cFsayrw4qSk1FNj5U08E3JPVvl91x7OigRjtieA02GcCntanBUgPo@[91.58.12.45]) by fwd21.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhH6W-4Ppgae0; Sat, 29 Jun 2019 19:25:36 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44768) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhH6V-0001bm-9m; Sat, 29 Jun 2019 19:25:35 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 29 Jun 2019 19:25:28 +0200 Message-Id: <20190629172532.26231-5-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190629172532.26231-1-bernd.kuhls@t-online.de> References: <20190629172532.26231-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: JbFKT+ZZQh1O8cFsayrw4qSk1FNj5U08E3JPVvl91x7OigRjtieA02GcCntanBUgPo X-TOI-MSGID: 90d97e89-90b5-4c9d-bed3-041d08456108 Subject: [Buildroot] [PATCH v4 5/9] package/mesa3d: add xvmc option 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: =?utf-8?q?Andr=C3=A9_Hentschel?= , Asaf Kahlon , Spenser Gilliland , Romain Naour , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Romain Naour "XVMC state tracker requires at least one of the following gallium drivers: r600, nouveau." https://cgit.freedesktop.org/mesa/mesa/commit/?id=22a817af8a89eb3c762fc3e07b443a3ce37d7416 Signed-off-by: Romain Naour Signed-off-by: Bernd Kuhls --- v4: no changes package/mesa3d/Config.in | 14 ++++++++++++++ package/mesa3d/mesa3d.mk | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 6ec395723a..72548adf57 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -312,6 +312,20 @@ config BR2_PACKAGE_PROVIDES_LIBGLES config BR2_PACKAGE_PROVIDES_LIBOPENCL default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL +config BR2_PACKAGE_MESA3D_XVMC + bool "XvMC state tracker" + depends on BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + select BR2_PACKAGE_XLIB_LIBXVMC + help + XVMC state tracker (needs r600 or nouveau gallium drivers). + +comment "XvMC depends on X.org and needs gallium drivers: r600, nouveau" + depends on !BR2_PACKAGE_XORG7 + depends on !BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ + || !BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 + endif # BR2_PACKAGE_MESA3D comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library" diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 81736c83d3..5fb6c5aee9 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -220,7 +220,7 @@ else MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2 endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) +ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) MESA3D_DEPENDENCIES += xlib_libXvMC MESA3D_CONF_OPTS += --enable-xvmc else From patchwork Sat Jun 29 17:25:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124819 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45bgX03X0Nz9sBp for ; Sun, 30 Jun 2019 03:25:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3E9F1204CF; Sat, 29 Jun 2019 17:25:49 +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 nhg+voFy+4Qb; Sat, 29 Jun 2019 17:25:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AD48E204C5; Sat, 29 Jun 2019 17:25:46 +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 351581BF83A for ; Sat, 29 Jun 2019 17:25:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2BAA186BAD for ; Sat, 29 Jun 2019 17:25:43 +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 6l8pg1WwpwWc for ; Sat, 29 Jun 2019 17:25:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by whitealder.osuosl.org (Postfix) with ESMTPS id 79F6D85C9A for ; Sat, 29 Jun 2019 17:25:40 +0000 (UTC) Received: from fwd12.aul.t-online.de (fwd12.aul.t-online.de [172.20.26.241]) by mailout09.t-online.de (Postfix) with SMTP id D8D284223A9F; Sat, 29 Jun 2019 19:25:37 +0200 (CEST) Received: from fli4l.lan.fli4l (SmgvTqZ-ghm-g1LYjyClB9YKdL203Jzi9rdqjYAubhGv37tl1bbrceVhtjaDwI2QwR@[91.58.12.45]) by fwd12.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhH6W-0PXcem0; Sat, 29 Jun 2019 19:25:36 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44768) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhH6V-0001bm-S8; Sat, 29 Jun 2019 19:25:36 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 29 Jun 2019 19:25:29 +0200 Message-Id: <20190629172532.26231-6-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190629172532.26231-1-bernd.kuhls@t-online.de> References: <20190629172532.26231-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: SmgvTqZ-ghm-g1LYjyClB9YKdL203Jzi9rdqjYAubhGv37tl1bbrceVhtjaDwI2QwR X-TOI-MSGID: aa8867d9-c582-4451-bef1-98824798c46a Subject: [Buildroot] [PATCH v4 6/9] package/mesa3d: Gallium xa state tracker is only available for nouveau and svga Gallium drivers 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: =?utf-8?q?Andr=C3=A9_Hentschel?= , Asaf Kahlon , Spenser Gilliland , Romain Naour , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Romain Naour i915 and freedreno Gallium drivers are not currently supported by mesa3d package. https://cgit.freedesktop.org/mesa/mesa/commit/?id=0ba909f0f111824223bc38563d1a6bc73e69c2cc Signed-off-by: Romain Naour Signed-off-by: Bernd Kuhls --- v4: no changes package/mesa3d/Config.in | 6 +++--- package/mesa3d/mesa3d.mk | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 72548adf57..eba218efb2 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -80,6 +80,9 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER config BR2_PACKAGE_MESA3D_DRIVER bool +# Gallium xa state tracker. +# Quote from mesa3d meson.build: "XA state tracker requires at least +# one of the following gallium drivers: nouveau, freedreno, i915, svga. config BR2_PACKAGE_MESA3D_NEEDS_XA bool @@ -129,7 +132,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 select BR2_PACKAGE_LLVM_AMDGPU if BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM - select BR2_PACKAGE_MESA3D_NEEDS_XA help Driver for ATI/AMD Radeon R600/R700/HD5000/HD6000 GPUs. @@ -151,7 +153,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI select BR2_PACKAGE_LLVM_AMDGPU select BR2_PACKAGE_ELFUTILS select BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS - select BR2_PACKAGE_MESA3D_NEEDS_XA help Driver for ATI/AMD Radeon HD7000/HD8000/Rx200 GPUs. @@ -188,7 +189,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_LIBDRM_VC4 - select BR2_PACKAGE_MESA3D_NEEDS_XA select BR2_PACKAGE_MESA3D_OPENGL_EGL help Driver for Broadcom VC4 (rpi2/3) GPUs. diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5fb6c5aee9..caa38771e6 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -83,7 +83,6 @@ MESA3D_DEPENDENCIES += \ xorgproto \ libxcb MESA3D_CONF_OPTS += --enable-glx --disable-mangling -# quote from mesa3d configure "Building xa requires at least one non swrast gallium driver." ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) MESA3D_CONF_OPTS += --enable-xa else From patchwork Sat Jun 29 17:25:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124818 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 45bgWz4tfmz9sBb for ; Sun, 30 Jun 2019 03:25:51 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 04AC685EF9; Sat, 29 Jun 2019 17:25:50 +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 Nkm77+T9DEF7; Sat, 29 Jun 2019 17:25:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2072486BEC; Sat, 29 Jun 2019 17:25:49 +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 03C2D1BF83A for ; Sat, 29 Jun 2019 17:25:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 01248204C5 for ; Sat, 29 Jun 2019 17:25:44 +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 7nqHSHLgifGc for ; Sat, 29 Jun 2019 17:25:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by silver.osuosl.org (Postfix) with ESMTPS id 60AC820358 for ; Sat, 29 Jun 2019 17:25:42 +0000 (UTC) Received: from fwd01.aul.t-online.de (fwd01.aul.t-online.de [172.20.27.147]) by mailout09.t-online.de (Postfix) with SMTP id 355484223A9C; Sat, 29 Jun 2019 19:25:40 +0200 (CEST) Received: from fli4l.lan.fli4l (ToEUuTZ6ohOP6FR9vXaC5SmxKTXa2mb-QvyvOEefalK5UcoXwDk0mandQlCZvLYwW9@[91.58.12.45]) by fwd01.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhH6X-3OojiK0; Sat, 29 Jun 2019 19:25:37 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44768) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhH6W-0001bm-Dd; Sat, 29 Jun 2019 19:25:36 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 29 Jun 2019 19:25:30 +0200 Message-Id: <20190629172532.26231-7-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190629172532.26231-1-bernd.kuhls@t-online.de> References: <20190629172532.26231-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: ToEUuTZ6ohOP6FR9vXaC5SmxKTXa2mb-QvyvOEefalK5UcoXwDk0mandQlCZvLYwW9 X-TOI-MSGID: 723eacb6-8330-4bf0-a4f5-14cd42244c3c Subject: [Buildroot] [PATCH v4 7/9] package/mesa3d: add a new option to enable GLX 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: =?utf-8?q?Andr=C3=A9_Hentschel?= , Asaf Kahlon , Spenser Gilliland , Romain Naour , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Romain Naour When switching to meson build system, enabling GLX support require at least one DRI or Gallium dirver. So add a dependency on BR2_PACKAGE_MESA3D_DRIVER for BR2_PACKAGE_MESA3D_OPENGL_GLX option. quoting the meson build system: "dri based GLX requires at least one DRI driver." [1] "Even when building just gallium drivers the user probably wants dri." [2] [1] https://cgit.freedesktop.org/mesa/mesa/tree/meson.build?h=19.0#n340 [2] https://cgit.freedesktop.org/mesa/mesa/tree/meson.build?h=19.0#n266 Signed-off-by: Romain Naour [Bernd: moved x11 dependencies from glx condition to xorg7 condition to fix build error with enabled egl without glx] Signed-off-by: Bernd Kuhls --- v4: fixed EGL build error (Bernd) package/mesa3d/Config.in | 12 ++++++++++++ package/mesa3d/mesa3d.mk | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index eba218efb2..ceed097d71 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -281,6 +281,18 @@ comment "OSMesa classic requires dri (classic) swrast" if BR2_PACKAGE_MESA3D_DRIVER +comment "OpenGL API Support" + +config BR2_PACKAGE_MESA3D_OPENGL_GLX + bool "OpenGL GLX" + depends on BR2_PACKAGE_XORG7 + help + Enable GLX graphic acceleration (OpenGL + X11). + GLX support needs X11 and at least one DRI or Gallium driver. + +comment "OpenGL GLX support needs X11" + depends on !BR2_PACKAGE_XORG7 + comment "Additional API Support" config BR2_PACKAGE_MESA3D_OPENGL_EGL diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index caa38771e6..648a99adfd 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -72,16 +72,7 @@ MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh" MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh" endif -ifeq ($(BR2_PACKAGE_XORG7),y) -MESA3D_DEPENDENCIES += \ - xlib_libX11 \ - xlib_libXext \ - xlib_libXdamage \ - xlib_libXfixes \ - xlib_libXrandr \ - xlib_libXxf86vm \ - xorgproto \ - libxcb +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) MESA3D_CONF_OPTS += --enable-glx --disable-mangling ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) MESA3D_CONF_OPTS += --enable-xa @@ -196,6 +187,15 @@ MESA3D_DEPENDENCIES += wayland wayland-protocols MESA3D_PLATFORMS += wayland endif ifeq ($(BR2_PACKAGE_XORG7),y) +MESA3D_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXdamage \ + xlib_libXfixes \ + xlib_libXrandr \ + xlib_libXxf86vm \ + xorgproto \ + libxcb MESA3D_PLATFORMS += x11 endif From patchwork Sat Jun 29 17:25:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124822 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 45bgX71Yqhz9s4Y for ; Sun, 30 Jun 2019 03:25:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C1E5F87E58; Sat, 29 Jun 2019 17:25:57 +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 DJ3-B2bDvIKT; Sat, 29 Jun 2019 17:25:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 860A68777C; Sat, 29 Jun 2019 17:25:53 +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 94EA71BF83A for ; Sat, 29 Jun 2019 17:25:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8EB0985B73 for ; Sat, 29 Jun 2019 17:25:45 +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 SzfVT5E7l6wk for ; Sat, 29 Jun 2019 17:25:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 52678853D3 for ; Sat, 29 Jun 2019 17:25:42 +0000 (UTC) Received: from fwd09.aul.t-online.de (fwd09.aul.t-online.de [172.20.27.151]) by mailout09.t-online.de (Postfix) with SMTP id 3F9E14223AA1; Sat, 29 Jun 2019 19:25:40 +0200 (CEST) Received: from fli4l.lan.fli4l (bKP9duZrYhsE7AT1B6-w-eT6lcbbOdTmg89y6hGLp0ngOF7Q0YHTH9MWm+vHBH+gJb@[91.58.12.45]) by fwd09.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhH6Y-1ls8a80; Sat, 29 Jun 2019 19:25:38 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44768) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhH6W-0001bm-TT; Sat, 29 Jun 2019 19:25:38 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 29 Jun 2019 19:25:31 +0200 Message-Id: <20190629172532.26231-8-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190629172532.26231-1-bernd.kuhls@t-online.de> References: <20190629172532.26231-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: bKP9duZrYhsE7AT1B6-w-eT6lcbbOdTmg89y6hGLp0ngOF7Q0YHTH9MWm+vHBH+gJb X-TOI-MSGID: bc572c5a-b2aa-46f3-8b58-22badc44a56c Subject: [Buildroot] [PATCH v4 8/9] package/mesa3d: switch build system to meson 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: =?utf-8?q?Andr=C3=A9_Hentschel?= , Vicente Olivert Riera , Asaf Kahlon , Peter Seiderer , Spenser Gilliland , Romain Naour , Romain Naour , Valentin Korenblit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update patches for meson: 0002-configure.ac-invert-order-for-wayland-scanner-check.patch 0003-set-LIBCLC_INCLUDEDIR.patch Disable unused options that are set to "auto" mode. (valgrind, gallium-omx, power8). Remove --disable-static option since there is no meson equivalent. Remove --disable-mangling since it's not yet supported by meson. Use r100 instead of radeon as DRI name for BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON. Add a new depedency on host-python3-mako since we can't use generated headers from the release archive [2]. [1] http://patchwork.ozlabs.org/patch/1084248/ [2] http://lists.busybox.net/pipermail/buildroot/2019-April/249057.html Signed-off-by: Bernd Kuhls Signed-off-by: Romain Naour Cc: Peter Seiderer --- v4: no changes v2: rebase on mesa 19.0.3 Fix typo -Degl=true=false Fixes: build without x11 by removing -Dglx=dri (Peter Seiderer) Doesn't use -Dglx=auto, instead use the new BR2_PACKAGE_MESA3D_OPENGL_GLX Remove workaround patch for python-mako, add host-python3-mako dependency ...vert-order-for-wayland-scanner-check.patch | 51 -------- ...d-scanner-provided-by-wayland-scanne.patch | 52 ++++++++ ...t-proper-value-for-LIBCLC_INCLUDEDIR.patch | 39 ++++++ .../mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch | 37 ------ package/mesa3d/Config.in | 3 +- package/mesa3d/mesa3d.mk | 118 +++++++++--------- 6 files changed, 149 insertions(+), 151 deletions(-) delete mode 100644 package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch create mode 100644 package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch create mode 100644 package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch delete mode 100644 package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch diff --git a/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch b/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch deleted file mode 100644 index 5135528795..0000000000 --- a/package/mesa3d/0002-configure.ac-invert-order-for-wayland-scanner-check.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ef96bac7cbbb11b98606864ead0f731dd5b71d5a Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 17 Nov 2016 15:36:54 -0300 -Subject: [PATCH] configure.ac: invert order for wayland-scanner check - -When cross-compiling the .pc file might point to the wrong -wayland-scanner binary (target rather than host) resulting in a -non-executable and wrong scanner. -Try searching the PATH first, and if that fails fall back into -pkg-config. - -[Vincent: tweak patch for 17.1.1 version] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Vicente Olivert Riera -[Romain: rebase on 18.1] -Signed-off-by: Romain Naour -[Bernd rebase on 18.3] -Signed-off-by: Bernd Kuhls ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1fbdcc6c7..dcf87e7dd6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1841,17 +1841,16 @@ - fi - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - -- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -+ if test "x$WAYLAND_SCANNER" = x; then -+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, - WAYLAND_SCANNER='') -+ fi - PKG_CHECK_EXISTS([wayland-scanner >= 1.15], - AC_SUBST(SCANNER_ARG, 'private-code'), - AC_SUBST(SCANNER_ARG, 'code')) - -- if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) -- fi -- - if test "x$WAYLAND_SCANNER" = "x:"; then - AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) - fi --- -2.14.3 diff --git a/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch b/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch new file mode 100644 index 0000000000..784b27c4a2 --- /dev/null +++ b/package/mesa3d/0002-meson-use-wayland-scanner-provided-by-wayland-scanne.patch @@ -0,0 +1,52 @@ +From 0e107f7bac8d84d8fb2bb5b83bfb4474348a82c1 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 17 Apr 2019 22:47:05 +0200 +Subject: [PATCH] meson: use wayland-scanner provided by wayland-scanner-path + +When cross-compiling the .pc file might point to the wrong +wayland-scanner binary (target rather than host) resulting in a +non-executable and wrong scanner. +First try by using the path provided by wayland-scanner-path, +and if that fails fall back into pkg-config. + +Based on the patch for autotools provided by Gustavo Zacarias. + +Signed-off-by: Romain Naour +--- + meson.build | 5 ++++- + meson_options.txt | 6 ++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6c4f1508855..ef0532b2cfb 100644 +--- a/meson.build ++++ b/meson.build +@@ -1319,7 +1319,10 @@ endif + + if with_platform_wayland + dep_wl_scanner = dependency('wayland-scanner', native: true) +- prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) ++ prog_wl_scanner = get_option('wayland-scanner-path') ++ if prog_wl_scanner == '' ++ prog_wl_scanner = find_program(dep_wl_scanner.get_pkgconfig_variable('wayland_scanner')) ++ endif + if dep_wl_scanner.version().version_compare('>= 1.15') + wl_scanner_arg = 'private-code' + else +diff --git a/meson_options.txt b/meson_options.txt +index ccf70659ff7..59ff8df8337 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -324,3 +324,9 @@ option( + value : true, + description : 'Enable direct rendering in GLX and EGL for DRI', + ) ++option( ++ 'wayland-scanner-path', ++ type : 'string', ++ value : '', ++ description : 'Locations to wayland-scanner binary. Default: use path from pkg-config' ++) +-- +2.20.1 + diff --git a/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch new file mode 100644 index 0000000000..072d79a213 --- /dev/null +++ b/package/mesa3d/0003-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch @@ -0,0 +1,39 @@ +From 7b46756a99aca7f27a45c3b99460f088570f6f53 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 17 Apr 2019 23:07:42 +0200 +Subject: [PATCH] meson: Set proper value for LIBCLC_INCLUDEDIR + +LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation +will look for OpenCL "headers" on the target, when building the OpenCL +kernels. + +The value returned by pkg-config for includedir is relevant when +cross-compiling, on the build machine. But in this specific case, we +really need a value that is valid on the target. + +Those headers are installed by the libclc package in /usr/share so +that they are not removed by Buildroot target-finalize logic. + +Based on the patch for autotools provided by Valentin Korenblit. + +Signed-off-by: Romain Naour +--- + src/gallium/state_trackers/clover/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build +index 62ac5f5278d..ecdeb39669c 100644 +--- a/src/gallium/state_trackers/clover/meson.build ++++ b/src/gallium/state_trackers/clover/meson.build +@@ -49,7 +49,7 @@ libclllvm = static_library( + include_directories : clover_incs, + cpp_args : [ + cpp_vis_args, +- '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')), ++ '-DLIBCLC_INCLUDEDIR="/usr/share"', + '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), + '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( + dep_llvm.get_configtool_variable('libdir'), 'clang', +-- +2.20.1 + diff --git a/package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch b/package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch deleted file mode 100644 index 42ae826a36..0000000000 --- a/package/mesa3d/0003-set-LIBCLC_INCLUDEDIR.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 94bceeb621e36f3188c6246a763def8695526578 Mon Sep 17 00:00:00 2001 -From: Valentin Korenblit -Date: Sat, 20 Oct 2018 10:56:23 +0200 -Subject: [PATCH] Set proper value for LIBCLC_INCLUDEDIR - -LIBCLC_INCLUDEDIR is the location where mesa3d OpenCL implementation -will look for OpenCL "headers" on the target, when building the OpenCL -kernels. - -The value returned by pkg-config for includedir is relevant when -cross-compiling, on the build machine. But in this specific case, we -really need a value that is valid on the target. - -Those headers are installed by the libclc package in /usr/share so -that they are not removed by Buildroot target-finalize logic. - -Signed-off-by: Valentin Korenblit ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 864dcae..cc2390b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2429,7 +2429,7 @@ if test "x$enable_opencl" = xyes; then - PKG_CONFIG_PATH environment variable. - By default libclc.pc is installed to /usr/local/share/pkgconfig/]) - else -- LIBCLC_INCLUDEDIR=`$PKG_CONFIG --variable=includedir libclc` -+ LIBCLC_INCLUDEDIR="/usr/share" - LIBCLC_LIBEXECDIR=`$PKG_CONFIG --variable=libexecdir libclc` - AC_SUBST([LIBCLC_INCLUDEDIR]) - AC_SUBST([LIBCLC_LIBEXECDIR]) --- -2.7.4 - diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index ceed097d71..569628d28b 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -87,8 +87,7 @@ config BR2_PACKAGE_MESA3D_NEEDS_XA bool # Quote from mesa3d meson.build: "kmsro driver requires one or more -# renderonly drivers (vc4, etnaviv, freedreno)". But only vc4 support -# is available by using the (deprecated) autotools build system. +# renderonly drivers (vc4, etnaviv, freedreno)". config BR2_PACKAGE_MESA3D_GALLIUM_KMSRO bool diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 648a99adfd..1f9b85bd8e 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -21,31 +21,24 @@ MESA3D_PROVIDES = MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ + host-python3-mako \ expat \ libdrm \ zlib -# Disable assembly usage. -MESA3D_CONF_OPTS = --disable-asm - -# autotools are deprecated in favour of meson, for now force autotools -MESA3D_CONF_OPTS += --enable-autotools - -# Disable static, otherwise configure will fail with: "Cannot enable both static -# and shared." -ifeq ($(BR2_SHARED_STATIC_LIBS),y) -MESA3D_CONF_OPTS += --disable-static -endif +MESA3D_CONF_OPTS = \ + -Dasm=false \ + -Dgallium-omx=disabled \ + -Dpower8=false \ + -Dvalgrind=false ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm -MESA3D_CONF_OPTS += \ - --with-llvm-prefix=$(STAGING_DIR)/usr \ - --enable-llvm-shared-libs \ - --enable-llvm +MESA3D_CONF_ENV += LLVM_CONFIG=$(STAGING_DIR)/usr/bin/llvm-config +MESA3D_CONF_OPTS += -Dllvm=true else # Avoid automatic search of llvm-config -MESA3D_CONF_OPTS += --disable-llvm +MESA3D_CONF_OPTS += -Dllvm=false endif # Disable opencl-icd: OpenCL lib will be named libOpenCL instead of @@ -53,11 +46,9 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) MESA3D_PROVIDES += libopencl MESA3D_DEPENDENCIES += clang libclc -MESA3D_CONF_OPTS += --enable-opencl \ - --disable-opencl-icd \ - --with-clang-libdir=$(STAGING_DIR)/usr/lib +MESA3D_CONF_OPTS += -Dgallium-opencl=standalone else -MESA3D_CONF_OPTS += --disable-opencl +MESA3D_CONF_OPTS += -Dgallium-opencl=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) @@ -73,16 +64,21 @@ MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh" endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) -MESA3D_CONF_OPTS += --enable-glx --disable-mangling +# Disable-mangling not yet supported by meson build system. +# glx: +# dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi +# xlib : xlib conflicts with any dri driver +# gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. +MESA3D_CONF_OPTS += -Dglx=dri ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) -MESA3D_CONF_OPTS += --enable-xa +MESA3D_CONF_OPTS += -Dgallium-xa=true else -MESA3D_CONF_OPTS += --disable-xa +MESA3D_CONF_OPTS += -Dgallium-xa=false endif else MESA3D_CONF_OPTS += \ - --disable-glx \ - --disable-xa + -Dglx=disabled \ + -Dgallium-xa=false endif # Drivers @@ -102,63 +98,62 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 # Vulkan Drivers MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) MESA3D_CONF_OPTS += \ - --without-gallium-drivers \ - --disable-gallium-extra-hud + -Dgallium-drivers= \ + -Dgallium-extra-hud=false else MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ - --enable-gallium-extra-hud + -Dshared-glapi=true \ + -Dgallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \ + -Dgallium-extra-hud=true endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ - --without-dri-drivers --disable-dri3 + -Ddri-drivers= -Ddri3=false else ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -MESA3D_CONF_OPTS += --enable-dri3 +MESA3D_CONF_OPTS += -Ddri3=true else -MESA3D_CONF_OPTS += --disable-dri3 +MESA3D_CONF_OPTS += -Ddri3=false endif MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --enable-driglx-direct \ - --with-dri-driverdir=/usr/lib/dri \ - --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) + -Dshared-glapi=true \ + -Dglx-direct=true \ + -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) endif ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ - --without-vulkan-drivers + -Dvulkan-drivers= else MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ - --enable-dri3 \ - --with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) + -Ddri3=true \ + -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif # APIs ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) -MESA3D_CONF_OPTS += --enable-osmesa +MESA3D_CONF_OPTS += -Dosmesa=classic else -MESA3D_CONF_OPTS += --disable-osmesa +MESA3D_CONF_OPTS += -Dosmesa=none endif # Always enable OpenGL: -# - it is needed for GLES (mesa3d's ./configure is a bit weird) -MESA3D_CONF_OPTS += --enable-opengl --enable-dri +# - 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 += --disable-va +MESA3D_CONF_OPTS += -Dgallium-va=false # libGL is only provided for a full xorg stack ifeq ($(BR2_PACKAGE_XORG7),y) @@ -185,6 +180,7 @@ endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEPENDENCIES += wayland wayland-protocols MESA3D_PLATFORMS += wayland +MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner endif ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_DEPENDENCIES += \ @@ -200,51 +196,51 @@ MESA3D_PLATFORMS += x11 endif MESA3D_CONF_OPTS += \ - --with-platforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) + -Dplatforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MESA3D_PROVIDES += libegl MESA3D_CONF_OPTS += \ - --enable-gbm \ - --enable-egl + -Dgbm=true \ + -Degl=true else MESA3D_CONF_OPTS += \ - --disable-egl + -Degl=false endif ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) MESA3D_PROVIDES += libgles -MESA3D_CONF_OPTS += --enable-gles1 --enable-gles2 +MESA3D_CONF_OPTS += -Dgles1=true -Dgles2=true else -MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2 +MESA3D_CONF_OPTS += -Dgles1=false -Dgles2=false endif ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) MESA3D_DEPENDENCIES += xlib_libXvMC -MESA3D_CONF_OPTS += --enable-xvmc +MESA3D_CONF_OPTS += -Dgallium-xvmc=true else -MESA3D_CONF_OPTS += --disable-xvmc +MESA3D_CONF_OPTS += -Dgallium-xvmc=false endif ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -MESA3D_CONF_OPTS += --enable-libunwind +MESA3D_CONF_OPTS += -Dlibunwind=true MESA3D_DEPENDENCIES += libunwind else -MESA3D_CONF_OPTS += --disable-libunwind +MESA3D_CONF_OPTS += -Dlibunwind=false endif ifeq ($(BR2_PACKAGE_LIBVDPAU),y) MESA3D_DEPENDENCIES += libvdpau -MESA3D_CONF_OPTS += --enable-vdpau +MESA3D_CONF_OPTS += -Dgallium-vdpau=true else -MESA3D_CONF_OPTS += --disable-vdpau +MESA3D_CONF_OPTS += -Dgallium-vdpau=false endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) -MESA3D_CONF_OPTS += --enable-lmsensors +MESA3D_CONF_OPTS += -Dlmsensors=true MESA3D_DEPENDENCIES += lm-sensors else -MESA3D_CONF_OPTS += --disable-lmsensors +MESA3D_CONF_OPTS += -Dlmsensors=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From patchwork Sat Jun 29 17:25:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124821 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45bgX60HCjz9s3l for ; Sun, 30 Jun 2019 03:25:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2D3EB204DC; Sat, 29 Jun 2019 17:25:56 +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 nGl-jvNC1T3j; Sat, 29 Jun 2019 17:25:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 482C0204C8; Sat, 29 Jun 2019 17:25:54 +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 520ED1BF83A for ; Sat, 29 Jun 2019 17:25:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4E2FD86D05 for ; Sat, 29 Jun 2019 17:25:51 +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 OTKnaLecr6ek for ; Sat, 29 Jun 2019 17:25:49 +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 whitealder.osuosl.org (Postfix) with ESMTPS id BA70486C53 for ; Sat, 29 Jun 2019 17:25:49 +0000 (UTC) Received: from fwd11.aul.t-online.de (fwd11.aul.t-online.de [172.20.27.152]) by mailout10.t-online.de (Postfix) with SMTP id D256941889E5; Sat, 29 Jun 2019 19:25:47 +0200 (CEST) Received: from fli4l.lan.fli4l (S+-TBTZCghoVZKOTbjGidPd9sx9HuDK1hIbkFn-AGoWx-K4FO6gMpt9ayDKCzfkZI3@[91.58.12.45]) by fwd11.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhH6Y-3Wur1E0; Sat, 29 Jun 2019 19:25:38 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:44768) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhH6Y-0001bm-2R; Sat, 29 Jun 2019 19:25:38 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 29 Jun 2019 19:25:32 +0200 Message-Id: <20190629172532.26231-9-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190629172532.26231-1-bernd.kuhls@t-online.de> References: <20190629172532.26231-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: S+-TBTZCghoVZKOTbjGidPd9sx9HuDK1hIbkFn-AGoWx-K4FO6gMpt9ayDKCzfkZI3 X-TOI-MSGID: 03ed52b3-fd7a-4ee9-9224-cbe6f62bdbfe Subject: [Buildroot] [PATCH v4 9/9] package/mesa3d: select kmsro for etnaviv 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: =?utf-8?q?Andr=C3=A9_Hentschel?= , Asaf Kahlon , Spenser Gilliland , Romain Naour , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Romain Naour Quote from mesa3d meson.build: "kmsro driver requires one or more renderonly drivers (vc4, etnaviv, freedreno)". Signed-off-by: Romain Naour Signed-off-by: Bernd Kuhls --- v4: no changes package/mesa3d/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 569628d28b..5dd3895956 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -97,6 +97,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV + select BR2_PACKAGE_MESA3D_GALLIUM_KMSRO select BR2_PACKAGE_MESA3D_OPENGL_EGL help Mesa driver for Vivante GPUs.