From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1E1E1382C5 for ; Tue, 1 Dec 2020 23:06:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A1C1E08A0; Tue, 1 Dec 2020 23:06:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5140E08A0 for ; Tue, 1 Dec 2020 23:06:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23D5A340D56 for ; Tue, 1 Dec 2020 23:06:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8709C46F for ; Tue, 1 Dec 2020 23:06:03 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1606863951.8d462cceb526ad5500b58de2ad571ffee4fd505c.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-20.3.0_rc3.ebuild media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 8d462cceb526ad5500b58de2ad571ffee4fd505c X-VCS-Branch: master Date: Tue, 1 Dec 2020 23:06:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d3c37919-7c68-4a11-a870-c9e449bdb425 X-Archives-Hash: d38b4a5a4ced5cecea8cab8fd7144998 commit: 8d462cceb526ad5500b58de2ad571ffee4fd505c Author: Matt Turner gentoo org> AuthorDate: Tue Dec 1 23:00:37 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Dec 1 23:05:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d462cce media-libs/mesa: Allow building with USE="-X -egl" Closes: https://bugs.gentoo.org/739598 Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-20.3.0_rc3.ebuild | 7 ++++++- media-libs/mesa/mesa-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/media-libs/mesa/mesa-20.3.0_rc3.ebuild b/media-libs/mesa/mesa-20.3.0_rc3.ebuild index 7326bb94a60..17952ddce99 100644 --- a/media-libs/mesa/mesa-20.3.0_rc3.ebuild +++ b/media-libs/mesa/mesa-20.3.0_rc3.ebuild @@ -372,6 +372,12 @@ multilib_src_configure() { use wayland && platforms+=",wayland" [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) + if use X || use egl; then + emesonargs+=(-Dglvnd=true) + else + emesonargs+=(-Dglvnd=false) + fi + if use gallium; then emesonargs+=( $(meson_feature llvm) @@ -492,7 +498,6 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) - -Dglvnd=true -Dshared-glapi=enabled $(meson_feature dri3) $(meson_feature egl) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 72ea1d60ab5..2e217a5233a 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -371,6 +371,12 @@ multilib_src_configure() { use wayland && platforms+=",wayland" [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) + if use X || use egl; then + emesonargs+=(-Dglvnd=true) + else + emesonargs+=(-Dglvnd=false) + fi + if use gallium; then emesonargs+=( $(meson_feature llvm) @@ -491,7 +497,6 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) - -Dglvnd=true -Dshared-glapi=enabled $(meson_feature dri3) $(meson_feature egl)