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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A09B115808B for ; Mon, 7 Feb 2022 19:03:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5954E0788; Mon, 7 Feb 2022 19:03:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6ED76E077F for ; Mon, 7 Feb 2022 19:03:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E1FF2342A5C for ; Mon, 7 Feb 2022 19:03:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 540472CC for ; Mon, 7 Feb 2022 19:03:30 +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: <1644260570.43aaa07b64432fdc21b5a2f68716189f7991a592.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-21.3.5.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 43aaa07b64432fdc21b5a2f68716189f7991a592 X-VCS-Branch: master Date: Mon, 7 Feb 2022 19:03:30 +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: 51a83e32-abdc-404b-8684-a6f0746cef2f X-Archives-Hash: 6de3f8ac0c87fae2a1ceffca0fb13daf commit: 43aaa07b64432fdc21b5a2f68716189f7991a592 Author: Matt Turner gentoo org> AuthorDate: Mon Feb 7 18:34:28 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Feb 7 19:02:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43aaa07b media-libs/mesa: Readd IUSE="egl gbm" to 21.3.5 Closes: https://bugs.gentoo.org/828491 Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-21.3.5.ebuild | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/media-libs/mesa/mesa-21.3.5.ebuild b/media-libs/mesa/mesa-21.3.5.ebuild index 7b064418bfbd..fc79dd1e10e0 100644 --- a/media-libs/mesa/mesa-21.3.5.ebuild +++ b/media-libs/mesa/mesa-21.3.5.ebuild @@ -33,15 +33,18 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - +classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm + +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd" REQUIRED_USE=" d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + gles1? ( egl ) + gles2? ( egl ) osmesa? ( gallium ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) + wayland? ( egl gbm ) video_cards_crocus? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) @@ -61,7 +64,7 @@ REQUIRED_USE=" video_cards_v3d? ( gallium ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium ) + video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X ) @@ -381,6 +384,12 @@ multilib_src_configure() { use wayland && platforms+=",wayland" 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) @@ -503,9 +512,8 @@ multilib_src_configure() { -Dglx=$(usex X dri disabled) -Dshared-glapi=enabled -Ddri3=enabled - -Degl=true - -Dgbm=true - -Dglvnd=true + $(meson_feature egl) + $(meson_feature gbm) $(meson_feature gles1) $(meson_feature gles2) $(meson_use osmesa)