Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
Date: Mon, 07 Feb 2022 19:03:34
Message-Id: 1644260570.43aaa07b64432fdc21b5a2f68716189f7991a592.mattst88@gentoo
1 commit: 43aaa07b64432fdc21b5a2f68716189f7991a592
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 7 18:34:28 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 7 19:02:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43aaa07b
7
8 media-libs/mesa: Readd IUSE="egl gbm" to 21.3.5
9
10 Closes: https://bugs.gentoo.org/828491
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 media-libs/mesa/mesa-21.3.5.ebuild | 18 +++++++++++++-----
14 1 file changed, 13 insertions(+), 5 deletions(-)
15
16 diff --git a/media-libs/mesa/mesa-21.3.5.ebuild b/media-libs/mesa/mesa-21.3.5.ebuild
17 index 7b064418bfbd..fc79dd1e10e0 100644
18 --- a/media-libs/mesa/mesa-21.3.5.ebuild
19 +++ b/media-libs/mesa/mesa-21.3.5.ebuild
20 @@ -33,15 +33,18 @@ for card in ${VIDEO_CARDS}; do
21 done
22
23 IUSE="${IUSE_VIDEO_CARDS}
24 - +classic cpu_flags_x86_sse2 d3d9 debug +gallium gles1 +gles2 +llvm
25 + +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm
26 lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
27 vulkan-overlay wayland +X xa xvmc zink +zstd"
28
29 REQUIRED_USE="
30 d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
31 + gles1? ( egl )
32 + gles2? ( egl )
33 osmesa? ( gallium )
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 @@ -61,7 +64,7 @@ REQUIRED_USE="
41 video_cards_v3d? ( gallium )
42 video_cards_vc4? ( gallium )
43 video_cards_virgl? ( gallium )
44 - video_cards_vivante? ( gallium )
45 + video_cards_vivante? ( gallium gbm )
46 video_cards_vmware? ( gallium )
47 xa? ( X )
48 xvmc? ( X )
49 @@ -381,6 +384,12 @@ multilib_src_configure() {
50 use wayland && platforms+=",wayland"
51 emesonargs+=(-Dplatforms=${platforms#,})
52
53 + if use X || use egl; then
54 + emesonargs+=(-Dglvnd=true)
55 + else
56 + emesonargs+=(-Dglvnd=false)
57 + fi
58 +
59 if use gallium; then
60 emesonargs+=(
61 $(meson_feature llvm)
62 @@ -503,9 +512,8 @@ multilib_src_configure() {
63 -Dglx=$(usex X dri disabled)
64 -Dshared-glapi=enabled
65 -Ddri3=enabled
66 - -Degl=true
67 - -Dgbm=true
68 - -Dglvnd=true
69 + $(meson_feature egl)
70 + $(meson_feature gbm)
71 $(meson_feature gles1)
72 $(meson_feature gles2)
73 $(meson_use osmesa)