[gentoo-commits] repo/gentoo:master commit in: profiles/desc/, media-libs/mesa/, profiles/arch/base/, profiles/arch/x86/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/desc/, media-libs/mesa/, profiles/arch/base/, profiles/arch/x86/, ...

[Matt Turner]

commit:     f20b8394b687bc73339d9acbd46ff4d1f884f330
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 30 20:33:27 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 30 23:04:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20b8394

media-libs/mesa: Add VIDEO_CARDS=crocus

Closes: https://bugs.gentoo.org/796764
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/mesa/mesa-9999.ebuild | 5 ++++-
 profiles/arch/amd64/use.mask     | 1 +
 profiles/arch/base/use.mask      | 1 +
 profiles/arch/x86/use.mask       | 1 +
 profiles/desc/video_cards.desc   | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 81c434cf294..ac45323b97f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -27,7 +27,7 @@ RESTRICT="
 "
 
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -45,6 +45,7 @@ REQUIRED_USE="
 	vulkan? ( video_cards_radeonsi? ( llvm ) )
 	vulkan-overlay? ( vulkan )
 	wayland? ( egl gbm )
+	video_cards_crocus? ( gallium )
 	video_cards_freedreno?  ( gallium )
 	video_cards_intel?  ( classic )
 	video_cards_i915?   ( || ( classic gallium ) )
@@ -467,6 +468,7 @@ multilib_src_configure() {
 			fi
 		fi
 
+		gallium_enable video_cards_crocus crocus
 		gallium_enable video_cards_iris iris
 
 		gallium_enable video_cards_r300 r300
@@ -515,6 +517,7 @@ multilib_src_configure() {
 		$(meson_use osmesa)
 		$(meson_use selinux)
 		$(meson_feature zstd)
+		$(meson_use video_cards_crocus prefer-crocus)
 		$(meson_use cpu_flags_x86_sse2 sse2)
 		-Dvalgrind=$(usex valgrind auto disabled)
 		-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index b5cba9077af..6ccf21fe1f2 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -112,6 +112,7 @@
 -input_devices_vmmouse
 -input_devices_wacom
 -video_cards_ast
+-video_cards_crocus
 -video_cards_i915
 -video_cards_i965
 -video_cards_intel

diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 887839c4815..497a91c0574 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -124,6 +124,7 @@ video_cards_geode
 # not needed on non-x86, non-amd64 systems
 input_devices_vmmouse
 video_cards_ast
+video_cards_crocus
 video_cards_i915
 video_cards_i965
 video_cards_intel

diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 8a86d7306ed..8e6b5ac51c3 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -131,6 +131,7 @@
 -input_devices_vmmouse
 -input_devices_wacom
 -video_cards_ast
+-video_cards_crocus
 -video_cards_i915
 -video_cards_i965
 -video_cards_intel

diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
index 1a82d207852..e4c6adc6327 100644
--- a/profiles/desc/video_cards.desc
+++ b/profiles/desc/video_cards.desc
@@ -7,6 +7,7 @@
 
 amdgpu - VIDEO_CARDS setting to build driver for AMDGPU video cards
 ast - VIDEO_CARDS setting to build driver for ASpeedTech video cards
+crocus - VIDEO_CARDS setting to build driver for Intel video cards Gen4-Gen7
 dummy - VIDEO_CARDS setting to build driver for dummy video cards
 exynos - VIDEO_CARDS setting to build driver for Samsung Exynos video cards
 freedreno - VIDEO_CARDS setting to build reverse-engineered driver for Qualcomm Adreno cards