1 |
commit: 49f74728707b8ba74ca68acc34918c7100914587 |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 25 14:49:42 2021 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 25 14:49:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=49f74728 |
7 |
|
8 |
media-libs/mesa: sync with ::gentoo stable |
9 |
|
10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
media-libs/mesa/Manifest | 2 +- |
14 |
.../{mesa-21.1.7.ebuild => mesa-21.2.5.ebuild} | 34 ++++++++++++---------- |
15 |
media-libs/mesa/metadata.xml | 3 +- |
16 |
3 files changed, 21 insertions(+), 18 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest |
19 |
index 513939a4..7ca05367 100644 |
20 |
--- a/media-libs/mesa/Manifest |
21 |
+++ b/media-libs/mesa/Manifest |
22 |
@@ -1 +1 @@ |
23 |
-DIST mesa-21.1.7.tar.xz 15391776 BLAKE2B a9138f189ef953d5efa4e287fbbe795ef2539c113dc7e0f565d3f35dcfaa59ab08674bf37fda196ba34e5963637c3ebb133db40b558bd275e29c8387b1acfdfa SHA512 1fd677437f292c30fbf08bfef8c1088557841f426090ccba20ab2a222b08fb5c3ec48a7a0301466e03a23019d09414c700a4f5e299479cacd6972a9f3ba030c8 |
24 |
+DIST mesa-21.2.5.tar.xz 15829684 BLAKE2B a5d00d6c566e699acd1f8cfcf1b52024c92cfa8a4cc9a6fb1d6493526ea0d65790ed97c47c5c174d4369e589caf1a361351df6d43aba89f818970f87f9a81059 SHA512 aaa1ebaa1e18eea76c3784c9a65942c3e417c1079d7bf75dcede574999dc459fb4d68d041cf2f767afb9cbfa834a985e0a4edd5a56b0fc90f8fdc506359aa5da |
25 |
|
26 |
diff --git a/media-libs/mesa/mesa-21.1.7.ebuild b/media-libs/mesa/mesa-21.2.5.ebuild |
27 |
similarity index 93% |
28 |
rename from media-libs/mesa/mesa-21.1.7.ebuild |
29 |
rename to media-libs/mesa/mesa-21.2.5.ebuild |
30 |
index 242a0454..c5830db8 100644 |
31 |
--- a/media-libs/mesa/mesa-21.1.7.ebuild |
32 |
+++ b/media-libs/mesa/mesa-21.2.5.ebuild |
33 |
@@ -3,12 +3,10 @@ |
34 |
|
35 |
EAPI=7 |
36 |
|
37 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
38 |
+PYTHON_COMPAT=( python3_{7..10} ) |
39 |
|
40 |
inherit llvm meson-multilib python-any-r1 linux-info |
41 |
|
42 |
-OPENGL_DIR="xorg-x11" |
43 |
- |
44 |
MY_P="${P/_/-}" |
45 |
|
46 |
DESCRIPTION="OpenGL-like graphic library for Linux" |
47 |
@@ -29,25 +27,25 @@ RESTRICT=" |
48 |
" |
49 |
|
50 |
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" |
51 |
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware" |
52 |
+VIDEO_CARDS="${RADEON_CARDS} crocus freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware" |
53 |
for card in ${VIDEO_CARDS}; do |
54 |
IUSE_VIDEO_CARDS+=" video_cards_${card}" |
55 |
done |
56 |
|
57 |
IUSE="${IUSE_VIDEO_CARDS} |
58 |
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm |
59 |
+ +classic cpu_flags_x86_sse2 d3d9 debug +egl +gallium +gbm gles1 +gles2 +llvm |
60 |
lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan |
61 |
vulkan-overlay wayland +X xa xvmc zink +zstd" |
62 |
|
63 |
REQUIRED_USE=" |
64 |
- d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) |
65 |
+ d3d9? ( || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) |
66 |
gles1? ( egl ) |
67 |
gles2? ( egl ) |
68 |
osmesa? ( gallium ) |
69 |
- vulkan? ( dri3 |
70 |
- video_cards_radeonsi? ( llvm ) ) |
71 |
+ vulkan? ( video_cards_radeonsi? ( llvm ) ) |
72 |
vulkan-overlay? ( vulkan ) |
73 |
wayland? ( egl gbm ) |
74 |
+ video_cards_crocus? ( gallium ) |
75 |
video_cards_freedreno? ( gallium ) |
76 |
video_cards_intel? ( classic ) |
77 |
video_cards_i915? ( || ( classic gallium ) ) |
78 |
@@ -73,7 +71,7 @@ REQUIRED_USE=" |
79 |
zink? ( gallium vulkan ) |
80 |
" |
81 |
|
82 |
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105" |
83 |
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.107" |
84 |
RDEPEND=" |
85 |
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] |
86 |
>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] |
87 |
@@ -142,12 +140,12 @@ RDEPEND="${RDEPEND} |
88 |
# 1. List all the working slots (with min versions) in ||, newest first. |
89 |
# 2. Update the := to specify *max* version, e.g. < 10. |
90 |
# 3. Specify LLVM_MAX_SLOT, e.g. 9. |
91 |
-LLVM_MAX_SLOT="12" |
92 |
+LLVM_MAX_SLOT="13" |
93 |
LLVM_DEPSTR=" |
94 |
|| ( |
95 |
+ sys-devel/llvm:13[${MULTILIB_USEDEP}] |
96 |
sys-devel/llvm:12[${MULTILIB_USEDEP}] |
97 |
sys-devel/llvm:11[${MULTILIB_USEDEP}] |
98 |
- sys-devel/llvm:10[${MULTILIB_USEDEP}] |
99 |
) |
100 |
<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}] |
101 |
" |
102 |
@@ -261,11 +259,12 @@ llvm_check_deps() { |
103 |
|
104 |
pkg_pretend() { |
105 |
if use vulkan; then |
106 |
- if ! use video_cards_i965 && |
107 |
+ if ! use video_cards_freedreno && |
108 |
+ ! use video_cards_i965 && |
109 |
! use video_cards_iris && |
110 |
! use video_cards_radeonsi && |
111 |
! use video_cards_v3d; then |
112 |
- ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d" |
113 |
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, i965, iris, radeonsi, or v3d" |
114 |
fi |
115 |
fi |
116 |
|
117 |
@@ -479,6 +478,7 @@ multilib_src_configure() { |
118 |
fi |
119 |
fi |
120 |
|
121 |
+ gallium_enable video_cards_crocus crocus |
122 |
gallium_enable video_cards_iris iris |
123 |
|
124 |
gallium_enable video_cards_r300 r300 |
125 |
@@ -499,6 +499,7 @@ multilib_src_configure() { |
126 |
fi |
127 |
|
128 |
if use vulkan; then |
129 |
+ vulkan_enable video_cards_freedreno freedreno |
130 |
vulkan_enable video_cards_i965 intel |
131 |
vulkan_enable video_cards_iris intel |
132 |
vulkan_enable video_cards_radeonsi amd |
133 |
@@ -519,7 +520,7 @@ multilib_src_configure() { |
134 |
$(meson_use test build-tests) |
135 |
-Dglx=$(usex X dri disabled) |
136 |
-Dshared-glapi=enabled |
137 |
- $(meson_feature dri3) |
138 |
+ -Ddri3=enabled |
139 |
$(meson_feature egl) |
140 |
$(meson_feature gbm) |
141 |
$(meson_feature gles1) |
142 |
@@ -527,7 +528,10 @@ multilib_src_configure() { |
143 |
$(meson_use osmesa) |
144 |
$(meson_use selinux) |
145 |
$(meson_feature zstd) |
146 |
- -Dvalgrind=$(usex valgrind auto false) |
147 |
+ $(meson_use video_cards_crocus prefer-crocus) |
148 |
+ $(meson_use video_cards_iris prefer-iris) |
149 |
+ $(meson_use cpu_flags_x86_sse2 sse2) |
150 |
+ -Dvalgrind=$(usex valgrind auto disabled) |
151 |
-Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") |
152 |
-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") |
153 |
-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") |
154 |
|
155 |
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml |
156 |
index a2a3def6..2b18aba1 100644 |
157 |
--- a/media-libs/mesa/metadata.xml |
158 |
+++ b/media-libs/mesa/metadata.xml |
159 |
@@ -1,5 +1,5 @@ |
160 |
<?xml version="1.0" encoding="UTF-8"?> |
161 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
162 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
163 |
<pkgmetadata> |
164 |
<maintainer type="project"> |
165 |
<email>x11@g.o</email> |
166 |
@@ -8,7 +8,6 @@ |
167 |
<use> |
168 |
<flag name="classic">Build drivers based on the classic architecture.</flag> |
169 |
<flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag> |
170 |
- <flag name="dri3">Enable DRI3 support.</flag> |
171 |
<flag name="egl">Enable EGL support.</flag> |
172 |
<flag name="gallium">Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag> |
173 |
<flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag> |