Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/desc/, media-libs/mesa/, profiles/arch/base/, profiles/arch/x86/, ...
Date: Sat, 30 Oct 2021 23:04:32
Message-Id: 1635635053.f20b8394b687bc73339d9acbd46ff4d1f884f330.mattst88@gentoo
1 commit: f20b8394b687bc73339d9acbd46ff4d1f884f330
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 30 20:33:27 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 30 23:04:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20b8394
7
8 media-libs/mesa: Add VIDEO_CARDS=crocus
9
10 Closes: https://bugs.gentoo.org/796764
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 media-libs/mesa/mesa-9999.ebuild | 5 ++++-
14 profiles/arch/amd64/use.mask | 1 +
15 profiles/arch/base/use.mask | 1 +
16 profiles/arch/x86/use.mask | 1 +
17 profiles/desc/video_cards.desc | 1 +
18 5 files changed, 8 insertions(+), 1 deletion(-)
19
20 diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
21 index 81c434cf294..ac45323b97f 100644
22 --- a/media-libs/mesa/mesa-9999.ebuild
23 +++ b/media-libs/mesa/mesa-9999.ebuild
24 @@ -27,7 +27,7 @@ RESTRICT="
25 "
26
27 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
28 -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
29 +VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
30 for card in ${VIDEO_CARDS}; do
31 IUSE_VIDEO_CARDS+=" video_cards_${card}"
32 done
33 @@ -45,6 +45,7 @@ REQUIRED_USE="
34 vulkan? ( video_cards_radeonsi? ( llvm ) )
35 vulkan-overlay? ( vulkan )
36 wayland? ( egl gbm )
37 + video_cards_crocus? ( gallium )
38 video_cards_freedreno? ( gallium )
39 video_cards_intel? ( classic )
40 video_cards_i915? ( || ( classic gallium ) )
41 @@ -467,6 +468,7 @@ multilib_src_configure() {
42 fi
43 fi
44
45 + gallium_enable video_cards_crocus crocus
46 gallium_enable video_cards_iris iris
47
48 gallium_enable video_cards_r300 r300
49 @@ -515,6 +517,7 @@ multilib_src_configure() {
50 $(meson_use osmesa)
51 $(meson_use selinux)
52 $(meson_feature zstd)
53 + $(meson_use video_cards_crocus prefer-crocus)
54 $(meson_use cpu_flags_x86_sse2 sse2)
55 -Dvalgrind=$(usex valgrind auto disabled)
56 -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
57
58 diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
59 index b5cba9077af..6ccf21fe1f2 100644
60 --- a/profiles/arch/amd64/use.mask
61 +++ b/profiles/arch/amd64/use.mask
62 @@ -112,6 +112,7 @@
63 -input_devices_vmmouse
64 -input_devices_wacom
65 -video_cards_ast
66 +-video_cards_crocus
67 -video_cards_i915
68 -video_cards_i965
69 -video_cards_intel
70
71 diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
72 index 887839c4815..497a91c0574 100644
73 --- a/profiles/arch/base/use.mask
74 +++ b/profiles/arch/base/use.mask
75 @@ -124,6 +124,7 @@ video_cards_geode
76 # not needed on non-x86, non-amd64 systems
77 input_devices_vmmouse
78 video_cards_ast
79 +video_cards_crocus
80 video_cards_i915
81 video_cards_i965
82 video_cards_intel
83
84 diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
85 index 8a86d7306ed..8e6b5ac51c3 100644
86 --- a/profiles/arch/x86/use.mask
87 +++ b/profiles/arch/x86/use.mask
88 @@ -131,6 +131,7 @@
89 -input_devices_vmmouse
90 -input_devices_wacom
91 -video_cards_ast
92 +-video_cards_crocus
93 -video_cards_i915
94 -video_cards_i965
95 -video_cards_intel
96
97 diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
98 index 1a82d207852..e4c6adc6327 100644
99 --- a/profiles/desc/video_cards.desc
100 +++ b/profiles/desc/video_cards.desc
101 @@ -7,6 +7,7 @@
102
103 amdgpu - VIDEO_CARDS setting to build driver for AMDGPU video cards
104 ast - VIDEO_CARDS setting to build driver for ASpeedTech video cards
105 +crocus - VIDEO_CARDS setting to build driver for Intel video cards Gen4-Gen7
106 dummy - VIDEO_CARDS setting to build driver for dummy video cards
107 exynos - VIDEO_CARDS setting to build driver for Samsung Exynos video cards
108 freedreno - VIDEO_CARDS setting to build reverse-engineered driver for Qualcomm Adreno cards