From patchwork Mon May 6 09:54:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1095775 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=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="uUhwFcRK"; dkim-atps=neutral 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 44yJ4n3w7Yz9s9T for ; Mon, 6 May 2019 19:55:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7B0DA248F6; Mon, 6 May 2019 09:55:01 +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 4NFc1c2X2AOa; Mon, 6 May 2019 09:54:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B54C523B9B; Mon, 6 May 2019 09:54:58 +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 85EFD1BF399 for ; Mon, 6 May 2019 09:54:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 82756865C4 for ; Mon, 6 May 2019 09:54:57 +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 uCBNknkNZzxd for ; Mon, 6 May 2019 09:54:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8BB0086569 for ; Mon, 6 May 2019 09:54:56 +0000 (UTC) Received: by mail-wm1-f43.google.com with SMTP id m20so5056562wmg.1 for ; Mon, 06 May 2019 02:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jpJk7pe27suUz0K+LaJEAFYy5ESRdWGo/ZU41vSoIl0=; b=uUhwFcRK3IaGbuTjoxLSzaKhPLTo5CSPHx1hNmdDJtgNo/Hgu9626PkRiFzTMu4m8x ptQE6ZWFmDeCZMxTEG0UJUsu3gIZAuOd/c1u45fGflMhZGu+9ngzEi0nuN4XCPRb/H19 tK8UScpiHRWXW8LZZnaFzTKQGI6Cz1qz+PA+DvvQq7kcSLHWTg/fc/hPlWthOAi133Z5 FNu/vdlm6B64fV3T+PleLrh52DFzY+EG3tLa11cSG+vs0Pa+sYV1pIW36ZYqSqJXadjd ODBlsBYhs9DXKuOdZfEzDHJKzff/FdVA+s4iSkXUnfVTTn4DBg3FH3j5cF4+l3X4S3a7 HI5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jpJk7pe27suUz0K+LaJEAFYy5ESRdWGo/ZU41vSoIl0=; b=ku5SHrlj3HwjVaq9zbhpJpIo66CYBeO2Xr7mLeQw7oabSzQp+I6evLSQHDZ6whnoTx HBfj1BFJ1YhgcjqEZDwn/cGE/jH+8Q4t653qofmwRqaumDZXn4JHr5G7pFlRlsNmwF5C uz5OUX4VWg6lmARDy1Co/QZgrCRipiRJMOzSZfQSiBEZ+uusLnrWsR0VLJgBjg/q9oSz 52avE+pmr4sgmmrUfhavPjA093sTQXEUYWOeWKMXpkv763dhVVmbWRLSLeBUbw97RxC6 MXUDUnU/aPTxJwsryKAcUuTEULVzo8vQu2+eSv/3l96n8XnBDMVChE3qyOPfRtSZyR0G XDVQ== X-Gm-Message-State: APjAAAUbnajDuqFFMKABN7CMojkSRgomLuNRcvboibgeNeQoQe8u7NfU 9gumIQIfiUVjNyUHZCnBz1D/Y5fEgTA= X-Google-Smtp-Source: APXvYqyHSg5bADS+5X6+iwnPe4+YHug0BKLuMv/2pQGJHzOHKHCSZk/0etfSlv6O1fAgbRE/e7yXZQ== X-Received: by 2002:a1c:c8:: with SMTP id 191mr15651244wma.44.1557136494934; Mon, 06 May 2019 02:54:54 -0700 (PDT) Received: from ASN-evian.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id h81sm28244730wmf.33.2019.05.06.02.54.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:54:54 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 6 May 2019 11:54:43 +0200 Message-Id: <20190506095451.26522-1-romain.naour@smile.fr> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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 Mon May 6 09:54:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1095773 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=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="tT10fkIn"; dkim-atps=neutral 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 44yJ4n3wgwz9sB8 for ; Mon, 6 May 2019 19:55:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 47DF18742F; Mon, 6 May 2019 09:55:03 +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 3XxR2T96Ir-9; Mon, 6 May 2019 09:55:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 99B9D87009; Mon, 6 May 2019 09:55: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 7482C1BF399 for ; Mon, 6 May 2019 09:54:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7147A86569 for ; Mon, 6 May 2019 09:54:58 +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 Fg94M-bH1eeH for ; Mon, 6 May 2019 09:54:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 87FD6865C4 for ; Mon, 6 May 2019 09:54:57 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id s18so4817379wmh.0 for ; Mon, 06 May 2019 02:54:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8lptIU+e3ii+z/1HhAmQvH5HIY+60inoeIx+dkjGi0w=; b=tT10fkInHIwYMXrCkQYvxUTzoInLUUAF79E5jU8lvyYP71sucsmrQs4HCzKNR1ikqT 57laeg9npkY0EQmXOVH71a6VN/q7h2HB5bsg9F39rAT17dFvlr+gstHj8f2IMufclzxw wqUKYdPl/5zvRvk/h/FYAKqOckr5YVD35gMXeJgm/PDIR2U2NWxJid7YSZhAdJKNax9v 0HB0Xog8PL3HEwUjoX8mfLHNFfIMDCzHnAijmt7ByGVEzjnAyBn8A0/qk9MJYSarOkrm nouOI/3eb+LCFKoAOQ+980WmlnNMStkuMY3GMCqm650Ap4gl+zFNMqyvqmDvvgj6wxIY gBZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8lptIU+e3ii+z/1HhAmQvH5HIY+60inoeIx+dkjGi0w=; b=QxBp/JevawdU3py+G8vGrfrlWI//kOBvhRJyOsp6X985aRNzLj2R+zvOvffI08LEOW TW7Ddc9SnCdRCyO/hQhAJIwlo21er7gWf3UunKnM7+yV3xfHkWxRMioX24WLCitsR3Yg ydfmPH/B2mVMg0tGlC/vhXhDz7m19KmGvt6xLMeg0jDl32YWFzGuf0xBElhQ1JfnDQnL poLw3ApoRiT6rthxqZdFW35VQiqgka/n6QZyFTmCuv4ZBxLN0RafZiFjWNKqIVjNoxOF 7hep8/b5acrlJlhh5CgT3nf/E8HfkFtMEYPyYAsJ98nxTsVu51/ozsADcU9MSroiot4A +cmg== X-Gm-Message-State: APjAAAWfBc9O4/wKAMaaRW4j2gzkyMfpj+0CgmPTQLwW07r7RJf+EQWt 1N1IcvCPJuknVbsPQMOyauUVwygBzR0= X-Google-Smtp-Source: APXvYqzqXbx1hPQUusWFDiZu8BZIh9LKySJfc0GlD919CAgd9nGuOUbA1au+kdxvM47Aa/cGKHKXzQ== X-Received: by 2002:a1c:c18c:: with SMTP id r134mr5380334wmf.124.1557136495959; Mon, 06 May 2019 02:54:55 -0700 (PDT) Received: from ASN-evian.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id h81sm28244730wmf.33.2019.05.06.02.54.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:54:55 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 6 May 2019 11:54:44 +0200 Message-Id: <20190506095451.26522-2-romain.naour@smile.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095451.26522-1-romain.naour@smile.fr> References: <20190506095451.26522-1-romain.naour@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This option is renamed in order to match the naming used by the meson buildsystem. Signed-off-by: Romain Naour --- 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 a32cbcb6f2..f0dfa90e5a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2019.05" +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_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR bool "compositor moved to gst1-plugins-base" select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR 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 576e8f0a2d..fde74dfd65 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 Mon May 6 09:54:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1095776 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=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="2AMPp6BP"; dkim-atps=neutral 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 44yJ4s2MY6z9s7T for ; Mon, 6 May 2019 19:55:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 419F986FAE; Mon, 6 May 2019 09:55:05 +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 ogw5J0aXeYQP; Mon, 6 May 2019 09:55:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B073D874CF; Mon, 6 May 2019 09:55:04 +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 E3EA01BF399 for ; Mon, 6 May 2019 09:55:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 246D724400 for ; Mon, 6 May 2019 09:55:03 +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 I304MnE2Niqn for ; Mon, 6 May 2019 09:55:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by silver.osuosl.org (Postfix) with ESMTPS id 6F7882474E for ; Mon, 6 May 2019 09:54:59 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id a12so6309095wrn.4 for ; Mon, 06 May 2019 02:54:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j/9JYmOLEAh5HsCQABDYva0L0l8N34zY1dDzAjmCnyw=; b=2AMPp6BPzcDXV5kEUa/6qd5n0QsJ0e3D4ujB27OL9PPrIsge283he4ykd14gk/KIgv gYqoE3bnQYvNQ+sMJ/oGlv/9PSw5iixATgMwYToxJWNDGsXCpacfSWkTPMFMqp7/MI8B 2i3ccFoXNNu9jhCErWUp+/eVJjbS9HhlRNfA13B69t6hf9n8aw6dk4ptLtFEBHhjct9U E7/bKlqU078M+s3z3LOx3SjiiwVJIPVxu5GfJDmb821ie5Znfqxpm6isaYMbIAayeUqt hQ012l0MmzHgWl+EMzupHjl/ZnPJGBjKBCHres4OXqirdltkTcllpdjiy9m/HsiZ5Mgy dvNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j/9JYmOLEAh5HsCQABDYva0L0l8N34zY1dDzAjmCnyw=; b=shs8cSRSh/2sN5vwV1nuaDYv6yhSf6g/wt6NfMq8hOrC6K97VOaeUgBoFAH5d/Atpw 90ZONTkG8vyUhruyct053MWVpLXL0metLjHCsKAwoSl7L4kYVkx7JMtH+SwBVcba0QGb 0fv1WLJ2wC+Amb1wpBW+4AzVsg29ABwK0MCXLjHTTYlot6TFXQI+ZL74LcdDm7i5vYB/ gbgPgyqVBlRbOrBADt/fZVCUZewMF/i39ehRedm8yQS79dnh/4cYX4ZtzZ/8x8KWlSP1 JqF3u5T0B+7UmVG6duxUrno9SedSYpZ1fZTUr5u+xMOlqGDLKpl5C1DB/wp+sXgsZyFX RAEw== X-Gm-Message-State: APjAAAUoYFEMH/CSkktOhnJdj4uQzRmHI29wLSIz3vJQqkqg4h7PVBvJ P9AhYuNXZggnIA10WYzS2Ts5GB8q+LQ= X-Google-Smtp-Source: APXvYqwpg8jJf3PJspyWy9naK5fmgqXbNp5b+jzQ+O3SG/13yMtSn2MOtKhFdF0CRYNdFjigm37c/w== X-Received: by 2002:adf:ce0c:: with SMTP id p12mr543554wrn.19.1557136497917; Mon, 06 May 2019 02:54:57 -0700 (PDT) Received: from ASN-evian.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id h81sm28244730wmf.33.2019.05.06.02.54.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:54:57 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 6 May 2019 11:54:46 +0200 Message-Id: <20190506095451.26522-4-romain.naour@smile.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095451.26522-1-romain.naour@smile.fr> References: <20190506095451.26522-1-romain.naour@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 4/9] package/mesa3d: Only one swrast provider can be built 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" https://cgit.freedesktop.org/mesa/mesa/commit/?id=de24d61765011ed4bfc169b8ad8cf67e86b1f3bd Signed-off-by: Romain Naour --- package/mesa3d/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 9bb95c3fd6..6ec395723a 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -173,11 +173,15 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST bool "Gallium swrast driver" + depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help This is a software opengl implementation using the Gallium3D infrastructure. +comment "Gallium swrast: Only one swrast provider can be built" + depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" depends on BR2_ARM_CPU_HAS_NEON || BR2_aarch64 From patchwork Mon May 6 09:54:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1095777 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=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="VN/sNXfi"; dkim-atps=neutral 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 44yJ4w2t7Hz9s7T for ; Mon, 6 May 2019 19:55:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id CA62823A18; Mon, 6 May 2019 09:55:10 +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 muVDNLzHGUjH; Mon, 6 May 2019 09:55:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4C3C924400; Mon, 6 May 2019 09:55:08 +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 0E5291BF399 for ; Mon, 6 May 2019 09:55:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4348524723 for ; Mon, 6 May 2019 09:55:03 +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 30w3ol+pkX3d for ; Mon, 6 May 2019 09:55:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by silver.osuosl.org (Postfix) with ESMTPS id C6CA623A18 for ; Mon, 6 May 2019 09:55:00 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id e11so3360204wrs.0 for ; Mon, 06 May 2019 02:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L4txkOXga6L5w5KKA8Qeo98a5Ln8O7NjkLQ5qvPp2JQ=; b=VN/sNXfisB/e6eTZXPyf51yPqrWqS4KVQZVdibqwe4RG9JmkCRUXnfuQ7e58bAAf2T HWEqj653vwcAxsaTBXFbs6iLughOAigxEdSpLu/hZ2DUbhzbTyssoIG0oIEQCeo3hEK0 UdxtFk17Wf/T/70whN4EdyTotxHzMBlsCQkKHnm4rpyUiK14uiOKg4WeTeu9tBoOqVMN mrVydJxWS89xiYMBHpC8VzbA3Guw7OofZUIKczoe89IHaDbWzVOdIb6jxGUWIJAs9rIw ampE6tf3Uh4tS4idziYdlPOvuG85dNwTDSvjP3BQ3b+SVf5TcOc93nrA3ARp+RT2QCQ7 RKBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L4txkOXga6L5w5KKA8Qeo98a5Ln8O7NjkLQ5qvPp2JQ=; b=CozE7sW164qvH45Dqs8g70FrKLkMkZNQ1gzEohcv9dabjfnlTxBmPkGSRXVyF2Rleu CV6TcDMAVBVVdUgV22jN0hijuUhMfoUMMkIt8OBgU0iFsOzz1SEEsZqDhkFkdw9f1Bi6 TiG+WTs/zxfDVCLVNdOjBxh0yyyQSLd4FrCfqWmYtCx8DtVZ63ixtUq6Up1fQVUlQliD P2YHb1qc7rUiSwNd2AT+pzBrWDNLlpUcPV9hbsYaQsEScTfAqvwysuw/82RMVnA+gsI4 7wPxz/wKoI8jpbnWM8fyuRYPg4U/TTZkue1+rb3NUl4T/xpElX96lvpQduh+E/snHMqZ tEVA== X-Gm-Message-State: APjAAAWXrbiiAfF9BmvelG1WJafz6YU5EzBMiyAOd+bfDWXAd2hFXJ8a 1gS5ttD/ZYu+w/bT+L0YmeNLNs/eaiw= X-Google-Smtp-Source: APXvYqz0Nu28ox04uiEwf9lNF4aHKXtI6C4eqVqqrH/A9NCIOT6HaNoBAXH1dm7EcXYVuFsEPH0ayQ== X-Received: by 2002:a05:6000:c2:: with SMTP id q2mr6561544wrx.324.1557136499285; Mon, 06 May 2019 02:54:59 -0700 (PDT) Received: from ASN-evian.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id h81sm28244730wmf.33.2019.05.06.02.54.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:54:58 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 6 May 2019 11:54:47 +0200 Message-Id: <20190506095451.26522-5-romain.naour@smile.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095451.26522-1-romain.naour@smile.fr> References: <20190506095451.26522-1-romain.naour@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" "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 --- 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 fde74dfd65..70aa2e4866 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 Mon May 6 09:54:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1095780 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=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="tu+STz5A"; dkim-atps=neutral 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 44yJ532HrBz9s9G for ; Mon, 6 May 2019 19:55:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 77D8424400; Mon, 6 May 2019 09:55:17 +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 dAmRKRHDucIf; Mon, 6 May 2019 09:55:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 34E8924B59; Mon, 6 May 2019 09:55:09 +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 11CDC1BF96B for ; Mon, 6 May 2019 09:55:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0A7F3854C9 for ; Mon, 6 May 2019 09:55:04 +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 uIa68sUMUM9h for ; Mon, 6 May 2019 09:55:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 163CC85534 for ; Mon, 6 May 2019 09:55:01 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id o189so4006102wmb.1 for ; Mon, 06 May 2019 02:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U9cogSWufyVTYAKxdAXgZo5YOB0dPO3QiGHqINBsZAE=; b=tu+STz5AtooDXf7Rd5fe7vjtv0tPOiryRSRBh70rH8OWLJtLz38T+L+vmy2cAzrNb3 tSUhhbUgkJuNflCWSdCOZh3YwLS9/SklGeB1/fo5Hetcvs78KliliScCktIJ6WfjJJDQ saOhCUYYl5/6zR0JFaWN2svdNUW2xIc+rVtvr0010I9golsY+0eiBhKHT+fYX5YubBi8 ep08K3iYxS41STC9XCHX6tqKZgRGWtmamP2ejyavDsmitkhzUwXMbT0XQqhyNehOBJFK Oh1LEZXZcpP0F8EWAvlvfML0fCgyJEq8aNnIFHfbMAv3PQaPJct1r9x0RIUZzNNKUePA HL3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U9cogSWufyVTYAKxdAXgZo5YOB0dPO3QiGHqINBsZAE=; b=VmbDlGzH7upIKz1hQ9B/4DdqQYQgdnIpaM1Hr05i9M63+qW/fCjOv/cchgsLOOhbHz Z2fXU2/CmqwoTHkBEENYdksambAnqpgWOHCCpkOgCk4Dkb73z+y9AAFIM79m4yYjWA/M Ia6LK+Gm6NTTQGNNm3lHE/TilDD8p8lQNv2JnH7rymyRK03WzAVVNMazG4G2/SE+IXal Nyqpwgz/J+faCpdbYVnVdgq+oyJHdrrKpGemf5vxTSYcNRfPjAdbImcx5afQqg9iU8cs U1M4DQ7iV5TVJ1T8w0neYlUzrAwX417mWSMoTS0jGK2kw2BHK9JXZKJU7PAvP53+RC1i NQyQ== X-Gm-Message-State: APjAAAVdji2OCOiJ0LpIJ0Gyczny/eKR8Cs8CL4M40H/qUtPSuQIZpya UDqSdWLllUABMkBtkXisnL8i5cja5fI= X-Google-Smtp-Source: APXvYqw4+ernzBaI5zehPoX69iPO9wXpx7n5/3wtgb3qi9ai6kNiJ01G2pjDDSS6HjPh3o+IxbKMoQ== X-Received: by 2002:a7b:ce10:: with SMTP id m16mr9721277wmc.36.1557136500003; Mon, 06 May 2019 02:55:00 -0700 (PDT) Received: from ASN-evian.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id h81sm28244730wmf.33.2019.05.06.02.54.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:54:59 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 6 May 2019 11:54:48 +0200 Message-Id: <20190506095451.26522-6-romain.naour@smile.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095451.26522-1-romain.naour@smile.fr> References: <20190506095451.26522-1-romain.naour@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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 70aa2e4866..271353b72e 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 Mon May 6 09:54:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1095778 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=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="HQsJtqk6"; dkim-atps=neutral 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 44yJ4y6gVJz9s9G for ; Mon, 6 May 2019 19:55:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5E7C5876F4; Mon, 6 May 2019 09:55:11 +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 GaTpXBOe9Gth; Mon, 6 May 2019 09:55:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 047D1874CF; Mon, 6 May 2019 09:55:10 +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 5F43C1BF399 for ; Mon, 6 May 2019 09:55:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5BA8A85521 for ; Mon, 6 May 2019 09:55:04 +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 ynrRtYK5ZC7t for ; Mon, 6 May 2019 09:55:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9EFD685BEE for ; Mon, 6 May 2019 09:55:03 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id p21so14952371wmc.0 for ; Mon, 06 May 2019 02:55:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rOwa7mGp5bdfDy7jTRWfgFxvhxt6Lj1IqXTej+4RrGQ=; b=HQsJtqk6i8gBgISiSC00fcBBo/Lfi2Ju/QjK/cpLDVfGQu1Sf/BxrjpIl/i+wvjwFu OITVZrbqFnJNFPzgWr4CIWZmzFKptrob11rDilORD3YJSR7HGBasRMh0yOm13jPtaNpr llIAoWLzE9jS1xEEwT39KzifBPqyrCiSkhFv7c1pHGo1stpyqbBTOXpiv8WJ/AE1MG8S 8iCgMIoF3JWQBl9X5DsQtk06mJ/N93QrdgQdcsFAp/GKM/amKjtoa6xd2PtJEtHEQ5M6 b4dln1Sh3a+qW1GCKIfGorQ1/8du5RGpEC8N+HjNQW7UfSGQnIJsXUuyPDNPvV82crxB +Pdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rOwa7mGp5bdfDy7jTRWfgFxvhxt6Lj1IqXTej+4RrGQ=; b=ED0NGFs0JcRy7B+wI67bM2n4IWEdoTkQVR01FUPUZzrAzPIJwXArCznCKzxQbmUa36 0dcQxD0bIVPsNJHPDo0uoWnlO0xSPHT7LdL2VT8NYYVUGXXjUzoBqaWmcp0sCJ4OU6M0 z2eQ1E2AoaP5KfyltBVuLLKyraUUAPOJUdw+MXflzQiAnMcYJMZKdpEFD6ZPStXVE3cT RMJPmBbp4oSe1QuNV4gbJZ476thUGszaShSYaubTPW5j0YURFBntdnWGjHr6rr6e2Tbm qoxC//GfvShnZRIY+5rQInLE66SH4mfDfyJUXJTY4hihylVOgt3P1PxTfgBcNjhtOwhB Nitg== X-Gm-Message-State: APjAAAVJZde0H0jxVPHuTz1PX7OfWzJl7VZOEX++740j/C4OanuhA13W Ha39VlWXa+Kv5JX/Hzspuw2pdRn642o= X-Google-Smtp-Source: APXvYqxHpOVtfWvK8EdXwjwKXQmjmbKIuA/rkQByXDLKpb7zGcHDcXfYf6mynST+8XrzR3qzMKFnTg== X-Received: by 2002:a1c:a914:: with SMTP id s20mr16220498wme.55.1557136501995; Mon, 06 May 2019 02:55:01 -0700 (PDT) Received: from ASN-evian.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id h81sm28244730wmf.33.2019.05.06.02.55.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:55:00 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 6 May 2019 11:54:49 +0200 Message-Id: <20190506095451.26522-7-romain.naour@smile.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095451.26522-1-romain.naour@smile.fr> References: <20190506095451.26522-1-romain.naour@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- package/mesa3d/Config.in | 12 ++++++++++++ package/mesa3d/mesa3d.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) 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 271353b72e..426676a520 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -72,7 +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) +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) MESA3D_DEPENDENCIES += \ xlib_libX11 \ xlib_libXext \ From patchwork Mon May 6 09:54:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1095781 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=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="aLAf5lCS"; dkim-atps=neutral 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 44yJ550bj2z9s7T for ; Mon, 6 May 2019 19:55:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A35E8855CE; Mon, 6 May 2019 09:55:19 +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 gTOJLNOf6gCi; Mon, 6 May 2019 09:55:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id DB7AC85BEE; Mon, 6 May 2019 09:55:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 3A5CA1BF96B for ; Mon, 6 May 2019 09:55:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9CE9C87635 for ; Mon, 6 May 2019 09:55:13 +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 PouVw5zyW1TX for ; Mon, 6 May 2019 09:55:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id D678D8768B for ; Mon, 6 May 2019 09:55:05 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id o189so4006345wmb.1 for ; Mon, 06 May 2019 02:55:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Akx8T/78Eqh+CrCmEAWs5SdZS1JnYyjxYw2yi8QEI8=; b=aLAf5lCSJTZ4pXzhWrYp29izk3kutEulLw+1yr2ZMxAE8r0/6AvdWHVeWl/nUVZh6L uQzzw/2T+i3z3XylgJ5sWhXbnIF/i5zzhqs10wV8m9/qgEbUj71cBlTcrRx5Q4wLTBRV /xtpeOxb6GWNBfIbXQXwKmBePD6C3JbjWF62DTzyZfdxkRF70NIXqZxuovCdWbl3f3vA tzW2pAIWjd1Bw1M/0zv2OZavXpNuWDtBJkLo5BT2LuxVeKMg+uayCDLguladukLBqCj0 AFgtyGFjuswSDUZ/w3DwzMnBEQIHrMMQk9dx6R+T7hTvGyTa3Ik/bYV/mrZFGtacN1QP f/Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Akx8T/78Eqh+CrCmEAWs5SdZS1JnYyjxYw2yi8QEI8=; b=Xu9xugOMV/EeGPjkki2g/EHdfAuQ77gEfN1NOtdxUkJ90WaVxPw0RJ+2J++ANNq2Nu x8rf0x1jb86vUQfxmj5FEmyqiqP+qtbvZBbhjp5WI5ccXxb1pG/PL3xV+4AhXI41puOh 2tex57pfq/4mjMHNCSZvLXO3XRwbeKT7d0B5emAmfQtAOROYINeBjc1BHpYCqXtLd2zR 9POIwVRGo10uck+CEMjNWif9Otxx0aHjekaXlRviNF41HbCrNCojoqavSBnzRaeCE6a6 +nuRedDtJI/lxtz23Mo9OIHfsEjq0khYv9tbXvd220KFpCjR26txSZEQbUl0NIAkLB2M xVJQ== X-Gm-Message-State: APjAAAW2SSPUfRtbldeiNzI6F+K6/4/Iq0ym5cOcrOOTw0pFoZxtCXkz ZRRwoPYk1w8p37b4oLxSWr6VMM3kjqk= X-Google-Smtp-Source: APXvYqwwaBg9NTfmAgeI+/eilmt14C/abuE3eG0cOCnLJ6gtmPME1fX0rfxk/ZSmrgC+/4KQBOiXkw== X-Received: by 2002:a7b:c5ce:: with SMTP id n14mr16934227wmk.18.1557136503755; Mon, 06 May 2019 02:55:03 -0700 (PDT) Received: from ASN-evian.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id h81sm28244730wmf.33.2019.05.06.02.55.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:55:02 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 6 May 2019 11:54:50 +0200 Message-Id: <20190506095451.26522-8-romain.naour@smile.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095451.26522-1-romain.naour@smile.fr> References: <20190506095451.26522-1-romain.naour@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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: Bernd Kuhls , Vicente Olivert Riera , Peter Seiderer , Romain Naour , Romain Naour , Valentin Korenblit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Bernd Kuhls 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 --- 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 426676a520..81074f96a6 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) @@ -82,16 +73,21 @@ MESA3D_DEPENDENCIES += \ xlib_libXxf86vm \ xorgproto \ libxcb -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 @@ -111,63 +107,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) @@ -194,57 +189,58 @@ 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_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 Mon May 6 09:54:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1095779 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=smile.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=smile-fr.20150623.gappssmtp.com header.i=@smile-fr.20150623.gappssmtp.com header.b="EdYBVrGa"; 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 44yJ526wrcz9s7T for ; Mon, 6 May 2019 19:55:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 96090865C4; Mon, 6 May 2019 09:55:14 +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 wL7hKOco7uw9; Mon, 6 May 2019 09:55:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EA0AC867D0; Mon, 6 May 2019 09:55:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id F2FA81BF96A for ; Mon, 6 May 2019 09:55:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EEE70874CF for ; Mon, 6 May 2019 09:55:09 +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 lpGpIx2Q5J6P for ; Mon, 6 May 2019 09:55:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9BDF58733F for ; Mon, 6 May 2019 09:55:07 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id o25so3849958wmf.2 for ; Mon, 06 May 2019 02:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LOYB8TCO0rFGfjAkaLHBgoLciyFcDi6ghBePY9d1ht8=; b=EdYBVrGaLm3krlmJE2x8H+mr89eTMg13gYYrf7Go/mPMMM7aOAy9wlQdj9gIHOTWh4 c5Bm+fPloDqTJdSnNIlnc44RjCW3iJ0Y7dqnj47dAzueHxAnrEmrlquEIFmkIk0Rb6w+ FoKGeyh95r8cPzYEItBiBSaSGynuJg/I7b/ayEGGJWzg6gKGA2bT8A62VQxWRBX0z81G Xfho0CR2Y/RbUajYkIRvuM6Y56rsrCSkfcq/WxJXU/KpKPdZJBs33V2BUpMWdxaHivFl 4zjfZTLjDKaXtswxbWzxWwT5T4zqcm43Jcs1HV1zc5nKl//N3eGg9vfAaTb1RPfx/vGG tpoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LOYB8TCO0rFGfjAkaLHBgoLciyFcDi6ghBePY9d1ht8=; b=AVhYwtCZB1AVw0fF7z0lfmvrhHKIcppmmJ0I5k0y45QwRCzd/KreOQh6r8vp98ZX4P KTyJyV+5iC2TU2wV+B6Y/PrB2QQVDN/nsVWIAJ5CiOq6r3uB9QVquvsC+VZnXmvpH7Jh 2n3VKSuzTEVnQqNfzmKU5Z+eJRdZifTPZclW5ceOdLuRpAgQpajhH7LPDJS2sVQ5KyUe msix2D+vDjR4hINYLR4+t8en/RI9tLd+OgAn9kyfU23834flFWJefLu085Y8BA10up/H XHCuUe7CbUzJ4MJfRSkYv4YLALn4jNlhPT3SlhCPLo8EJLgu0Vw8LkyaT/gvVF9iz85A z62g== X-Gm-Message-State: APjAAAVt9xGzl8DtBHvl7Y+lluoxWSjGseLpxj4pYzJdl4m+gE1BRQW+ UyVnF7vpZ7o5kFlzR9ytoO5IPkmF+80= X-Google-Smtp-Source: APXvYqy5XoRJ0GXQ6XlO/0ADBT+FiTjBT2DqwFuumWc35U3glDPX6qq7kPmkLRm5XCBvKpjOiRLrEA== X-Received: by 2002:a1c:4e0c:: with SMTP id g12mr1609985wmh.93.1557136506108; Mon, 06 May 2019 02:55:06 -0700 (PDT) Received: from ASN-evian.nantes.intranet (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id h81sm28244730wmf.33.2019.05.06.02.55.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2019 02:55:04 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 6 May 2019 11:54:51 +0200 Message-Id: <20190506095451.26522-9-romain.naour@smile.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506095451.26522-1-romain.naour@smile.fr> References: <20190506095451.26522-1-romain.naour@smile.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 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: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Quote from mesa3d meson.build: "kmsro driver requires one or more renderonly drivers (vc4, etnaviv, freedreno)". Signed-off-by: Romain Naour --- 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.