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 5361E15815E for ; Thu, 1 Feb 2024 23:43:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E9B7E2A63; Thu, 1 Feb 2024 23:43:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 70D87E2A63 for ; Thu, 1 Feb 2024 23:43:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9CA8F343241 for ; Thu, 1 Feb 2024 23:43:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA00FBC0 for ; Thu, 1 Feb 2024 23:43:12 +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: <1706830977.e3473afeac9dbe9e820f658c783c46416ee30d8c.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-24.0.0.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: e3473afeac9dbe9e820f658c783c46416ee30d8c X-VCS-Branch: master Date: Thu, 1 Feb 2024 23:43:12 +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: 8a3ddf1b-d6b3-468a-804d-9ed85430c538 X-Archives-Hash: 3b300a7e790592ebf3a1e709bed79391 commit: e3473afeac9dbe9e820f658c783c46416ee30d8c Author: Matt Turner gentoo org> AuthorDate: Thu Feb 1 23:40:16 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Feb 1 23:42:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3473afe media-libs/mesa: Revert "Add VIDEO_CARDS=swrast" This reverts commit 46b2f0ab301a02e8763e461140b317e6dcd707bc. Users of the proprietary NVIDIA driver will likely have media-libs/mesa installed with no VIDEO_CARDS set, and without a driver present the configuration step fails. Bug: https://bugs.gentoo.org/920752 Closes: https://bugs.gentoo.org/923494 Signed-off-by: Matt Turner gentoo.org> media-libs/mesa/mesa-24.0.0.ebuild | 9 ++++----- media-libs/mesa/mesa-9999.ebuild | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/media-libs/mesa/mesa-24.0.0.ebuild b/media-libs/mesa/mesa-24.0.0.ebuild index 28a5b5573daa..7d7f3b5ed165 100644 --- a/media-libs/mesa/mesa-24.0.0.ebuild +++ b/media-libs/mesa/mesa-24.0.0.ebuild @@ -25,7 +25,7 @@ SLOT="0" RESTRICT="!test? ( test )" RADEON_CARDS="r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel swrast lima nouveau panfrost v3d vc4 virgl vivante vmware" +VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware" for card in ${VIDEO_CARDS}; do IUSE_VIDEO_CARDS+=" video_cards_${card}" done @@ -47,9 +47,8 @@ REQUIRED_USE=" video_cards_vmware ) ) - osmesa? ( video_cards_swrast ) vulkan-overlay? ( vulkan ) - video_cards_swrast? ( vulkan? ( llvm ) ) + video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) vdpau? ( X ) @@ -341,7 +340,7 @@ multilib_src_configure() { gallium_enable -- kmsro fi - gallium_enable video_cards_swrast swrast + gallium_enable -- swrast gallium_enable video_cards_freedreno freedreno gallium_enable video_cards_intel crocus i915 iris gallium_enable video_cards_lima lima @@ -373,7 +372,7 @@ multilib_src_configure() { fi if use vulkan; then - vulkan_enable video_cards_swrast swrast + vulkan_enable video_cards_lavapipe swrast vulkan_enable video_cards_freedreno freedreno vulkan_enable video_cards_intel intel intel_hasvk vulkan_enable video_cards_d3d12 microsoft-experimental diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 28a5b5573daa..7d7f3b5ed165 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -25,7 +25,7 @@ SLOT="0" RESTRICT="!test? ( test )" RADEON_CARDS="r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel swrast lima nouveau panfrost v3d vc4 virgl vivante vmware" +VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware" for card in ${VIDEO_CARDS}; do IUSE_VIDEO_CARDS+=" video_cards_${card}" done @@ -47,9 +47,8 @@ REQUIRED_USE=" video_cards_vmware ) ) - osmesa? ( video_cards_swrast ) vulkan-overlay? ( vulkan ) - video_cards_swrast? ( vulkan? ( llvm ) ) + video_cards_lavapipe? ( llvm vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) vdpau? ( X ) @@ -341,7 +340,7 @@ multilib_src_configure() { gallium_enable -- kmsro fi - gallium_enable video_cards_swrast swrast + gallium_enable -- swrast gallium_enable video_cards_freedreno freedreno gallium_enable video_cards_intel crocus i915 iris gallium_enable video_cards_lima lima @@ -373,7 +372,7 @@ multilib_src_configure() { fi if use vulkan; then - vulkan_enable video_cards_swrast swrast + vulkan_enable video_cards_lavapipe swrast vulkan_enable video_cards_freedreno freedreno vulkan_enable video_cards_intel intel intel_hasvk vulkan_enable video_cards_d3d12 microsoft-experimental