1 |
commit: 124e529428973132dd6bb3585be907674fe5e069 |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 8 03:12:17 2020 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 8 03:12:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=124e5294 |
7 |
|
8 |
media-libs/mesa: Update for stable users |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
media-libs/mesa/Manifest | 3 +- |
14 |
media-libs/mesa/mesa-19.1.8.ebuild | 549 --------------------- |
15 |
.../{mesa-19.2.2.ebuild => mesa-19.2.8.ebuild} | 20 +- |
16 |
media-libs/mesa/metadata.xml | 2 +- |
17 |
4 files changed, 12 insertions(+), 562 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest |
20 |
index 40fe5fb..32b966d 100644 |
21 |
--- a/media-libs/mesa/Manifest |
22 |
+++ b/media-libs/mesa/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST mesa-19.1.8.tar.xz 10945480 BLAKE2B df2ce0561cd0a61f0f35a406a5a9b2384c0c5869efadabfa40b07cf96a592214aa5c6d03423598c531f117075c3b59aa5af6f9b1c5dfa5914aabe41f60b592a0 SHA512 3bcc90c17cf966ce3399434ca2d4f363c5778e52c56b8184d6cdf22ef2e4a4fdb9c3fbff5c98efc856e3535f81259608a6daa74af1f3bdce30ea251d86435c74 |
25 |
-DIST mesa-19.2.2.tar.xz 11456352 BLAKE2B b0900a486d5883759dc395a25195c46fbc90d0388840099d515713a3c1e27560ea6cf9f6bfc5987c9704593b174e26f49a4cd08ff1260b1c1b2197b56c6919b6 SHA512 a3269052c2dfb5404180d1aebd68f5b9b0cc136d634ba89fed3f60fcc9b279072e09ee2db9b485375d39e886209053841df920c9d0b975e0de2825e3da4164a5 |
26 |
+DIST mesa-19.2.8.tar.xz 11462168 BLAKE2B c49d6d3d10b4c85534a75e4bea29fc8b7526c784af5068764de623d40cbb59ecb96beb1969fa1a13815b6bd259bb98faaf42e4969792c6a75ce702d4b2e57155 SHA512 9bedc2f1a5296da96c1a2a491edaea701e70f683b26eac076e8cbef2230156d5d5ddb2330c3a2530afd4982a9893d76ded8d54bc73a98c846de0c3dfa3634c43 |
27 |
DIST mesa-19.3.1.tar.xz 11831968 BLAKE2B f4e70543bc48efa6888559606c660a837df25ceeabf4bf2141d7470f37f90e19a9d85da7c3b4f8d1b4c86d02245dbc8d58401caf9ab099609a501fc86b391987 SHA512 338d2e37122ef22cc4e27a2f3c39e23e419703a507ace99383c749a563936c5f0428cce9a68ac80d0bd2ff57be8a55f42aee0ed6d16bf6b77b4e59d428729568 |
28 |
|
29 |
diff --git a/media-libs/mesa/mesa-19.1.8.ebuild b/media-libs/mesa/mesa-19.1.8.ebuild |
30 |
deleted file mode 100644 |
31 |
index 32777b4..0000000 |
32 |
--- a/media-libs/mesa/mesa-19.1.8.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,549 +0,0 @@ |
35 |
-# Copyright 1999-2019 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
- |
40 |
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) |
41 |
- |
42 |
-inherit llvm meson multilib-minimal pax-utils python-any-r1 |
43 |
- |
44 |
-OPENGL_DIR="xorg-x11" |
45 |
- |
46 |
-MY_P="${P/_/-}" |
47 |
- |
48 |
-DESCRIPTION="OpenGL-like graphic library for Linux" |
49 |
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" |
50 |
- |
51 |
-if [[ ${PV} == 9999 ]]; then |
52 |
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" |
53 |
- EXPERIMENTAL="true" |
54 |
- inherit git-r3 |
55 |
-else |
56 |
- SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" |
57 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
58 |
-fi |
59 |
- |
60 |
-LICENSE="MIT" |
61 |
-SLOT="0" |
62 |
-RESTRICT=" |
63 |
- !test? ( test ) |
64 |
-" |
65 |
- |
66 |
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" |
67 |
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware" |
68 |
-for card in ${VIDEO_CARDS}; do |
69 |
- IUSE_VIDEO_CARDS+=" video_cards_${card}" |
70 |
-done |
71 |
- |
72 |
-IUSE="${IUSE_VIDEO_CARDS} |
73 |
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm |
74 |
- lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind |
75 |
- vdpau vulkan vulkan-overlay wayland xa xvmc" |
76 |
- |
77 |
-REQUIRED_USE=" |
78 |
- d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) |
79 |
- gles1? ( egl ) |
80 |
- gles2? ( egl ) |
81 |
- vulkan? ( dri3 |
82 |
- || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) |
83 |
- video_cards_radeonsi? ( llvm ) ) |
84 |
- vulkan-overlay? ( vulkan ) |
85 |
- wayland? ( egl gbm ) |
86 |
- video_cards_freedreno? ( gallium ) |
87 |
- video_cards_intel? ( classic ) |
88 |
- video_cards_i915? ( || ( classic gallium ) ) |
89 |
- video_cards_i965? ( classic ) |
90 |
- video_cards_iris? ( gallium ) |
91 |
- video_cards_nouveau? ( || ( classic gallium ) ) |
92 |
- video_cards_radeon? ( || ( classic gallium ) |
93 |
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) |
94 |
- video_cards_r100? ( classic ) |
95 |
- video_cards_r200? ( classic ) |
96 |
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) |
97 |
- video_cards_r600? ( gallium ) |
98 |
- video_cards_radeonsi? ( gallium llvm ) |
99 |
- video_cards_vc4? ( gallium ) |
100 |
- video_cards_virgl? ( gallium ) |
101 |
- video_cards_vivante? ( gallium gbm ) |
102 |
- video_cards_vmware? ( gallium ) |
103 |
-" |
104 |
- |
105 |
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97" |
106 |
-RDEPEND=" |
107 |
- !app-eselect/eselect-mesa |
108 |
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] |
109 |
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] |
110 |
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] |
111 |
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] |
112 |
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] |
113 |
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] |
114 |
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] |
115 |
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] |
116 |
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}] |
117 |
- libglvnd? ( |
118 |
- media-libs/libglvnd[${MULTILIB_USEDEP}] |
119 |
- !app-eselect/eselect-opengl |
120 |
- ) |
121 |
- !libglvnd? ( |
122 |
- >=app-eselect/eselect-opengl-1.3.0 |
123 |
- ) |
124 |
- gallium? ( |
125 |
- unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
126 |
- llvm? ( |
127 |
- video_cards_radeonsi? ( |
128 |
- virtual/libelf:0=[${MULTILIB_USEDEP}] |
129 |
- ) |
130 |
- video_cards_r600? ( |
131 |
- virtual/libelf:0=[${MULTILIB_USEDEP}] |
132 |
- ) |
133 |
- video_cards_radeon? ( |
134 |
- virtual/libelf:0=[${MULTILIB_USEDEP}] |
135 |
- ) |
136 |
- ) |
137 |
- lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) |
138 |
- opencl? ( |
139 |
- dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] |
140 |
- dev-libs/libclc |
141 |
- virtual/libelf:0=[${MULTILIB_USEDEP}] |
142 |
- ) |
143 |
- vaapi? ( |
144 |
- >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] |
145 |
- video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) |
146 |
- ) |
147 |
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) |
148 |
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) |
149 |
- ) |
150 |
- wayland? ( |
151 |
- >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] |
152 |
- >=dev-libs/wayland-protocols-1.8 |
153 |
- ) |
154 |
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] |
155 |
- |
156 |
- video_cards_intel? ( |
157 |
- !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) |
158 |
- ) |
159 |
- video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) |
160 |
- vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) |
161 |
-" |
162 |
-for card in ${RADEON_CARDS}; do |
163 |
- RDEPEND="${RDEPEND} |
164 |
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) |
165 |
- " |
166 |
-done |
167 |
-RDEPEND="${RDEPEND} |
168 |
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) |
169 |
-" |
170 |
- |
171 |
-# Please keep the LLVM dependency block separate. Since LLVM is slotted, |
172 |
-# we need to *really* make sure we're not pulling one than more slot |
173 |
-# simultaneously. |
174 |
-# |
175 |
-# How to use it: |
176 |
-# 1. List all the working slots (with min versions) in ||, newest first. |
177 |
-# 2. Update the := to specify *max* version, e.g. < 10. |
178 |
-# 3. Specify LLVM_MAX_SLOT, e.g. 9. |
179 |
-LLVM_MAX_SLOT="9" |
180 |
-LLVM_DEPSTR=" |
181 |
- || ( |
182 |
- sys-devel/llvm:9[${MULTILIB_USEDEP}] |
183 |
- sys-devel/llvm:8[${MULTILIB_USEDEP}] |
184 |
- sys-devel/llvm:7[${MULTILIB_USEDEP}] |
185 |
- ) |
186 |
- sys-devel/llvm:=[${MULTILIB_USEDEP}] |
187 |
-" |
188 |
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} |
189 |
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} |
190 |
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} |
191 |
-RDEPEND="${RDEPEND} |
192 |
- llvm? ( |
193 |
- opencl? ( |
194 |
- video_cards_r600? ( |
195 |
- ${CLANG_DEPSTR_AMDGPU} |
196 |
- ) |
197 |
- !video_cards_r600? ( |
198 |
- video_cards_radeonsi? ( |
199 |
- ${CLANG_DEPSTR_AMDGPU} |
200 |
- ) |
201 |
- ) |
202 |
- !video_cards_r600? ( |
203 |
- !video_cards_radeonsi? ( |
204 |
- video_cards_radeon? ( |
205 |
- ${CLANG_DEPSTR_AMDGPU} |
206 |
- ) |
207 |
- ) |
208 |
- ) |
209 |
- !video_cards_r600? ( |
210 |
- !video_cards_radeon? ( |
211 |
- !video_cards_radeonsi? ( |
212 |
- ${CLANG_DEPSTR} |
213 |
- ) |
214 |
- ) |
215 |
- ) |
216 |
- ) |
217 |
- !opencl? ( |
218 |
- video_cards_r600? ( |
219 |
- ${LLVM_DEPSTR_AMDGPU} |
220 |
- ) |
221 |
- !video_cards_r600? ( |
222 |
- video_cards_radeonsi? ( |
223 |
- ${LLVM_DEPSTR_AMDGPU} |
224 |
- ) |
225 |
- ) |
226 |
- !video_cards_r600? ( |
227 |
- !video_cards_radeonsi? ( |
228 |
- video_cards_radeon? ( |
229 |
- ${LLVM_DEPSTR_AMDGPU} |
230 |
- ) |
231 |
- ) |
232 |
- ) |
233 |
- !video_cards_r600? ( |
234 |
- !video_cards_radeon? ( |
235 |
- !video_cards_radeonsi? ( |
236 |
- ${LLVM_DEPSTR} |
237 |
- ) |
238 |
- ) |
239 |
- ) |
240 |
- ) |
241 |
- ) |
242 |
-" |
243 |
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} |
244 |
- |
245 |
-DEPEND="${RDEPEND} |
246 |
- valgrind? ( dev-util/valgrind ) |
247 |
- x11-libs/libXrandr[${MULTILIB_USEDEP}] |
248 |
- x11-base/xorg-proto |
249 |
-" |
250 |
-BDEPEND=" |
251 |
- ${PYTHON_DEPS} |
252 |
- opencl? ( |
253 |
- >=sys-devel/gcc-4.6 |
254 |
- ) |
255 |
- sys-devel/bison |
256 |
- sys-devel/flex |
257 |
- sys-devel/gettext |
258 |
- virtual/pkgconfig |
259 |
- $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") |
260 |
-" |
261 |
- |
262 |
-S="${WORKDIR}/${MY_P}" |
263 |
-EGIT_CHECKOUT_DIR=${S} |
264 |
- |
265 |
-QA_WX_LOAD=" |
266 |
-x86? ( |
267 |
- !pic? ( |
268 |
- usr/lib*/libglapi.so.0.0.0 |
269 |
- usr/lib*/libGLESv1_CM.so.1.0.0 |
270 |
- usr/lib*/libGLESv2.so.2.0.0 |
271 |
- usr/lib*/libGL.so.1.2.0 |
272 |
- usr/lib*/libOSMesa.so.8.0.0 |
273 |
- ) |
274 |
-)" |
275 |
- |
276 |
-PATCHES=( |
277 |
- "${FILESDIR}"/${PN}-18.2.4-add-disable-tls-support.patch |
278 |
-) |
279 |
- |
280 |
-llvm_check_deps() { |
281 |
- local flags=${MULTILIB_USEDEP} |
282 |
- if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi |
283 |
- then |
284 |
- flags+=",llvm_targets_AMDGPU(-)" |
285 |
- fi |
286 |
- |
287 |
- if use opencl; then |
288 |
- has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 |
289 |
- fi |
290 |
- has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" |
291 |
-} |
292 |
- |
293 |
-pkg_pretend() { |
294 |
- if use opencl; then |
295 |
- if ! use video_cards_r600 && |
296 |
- ! use video_cards_radeonsi; then |
297 |
- ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" |
298 |
- fi |
299 |
- fi |
300 |
- |
301 |
- if use vaapi; then |
302 |
- if ! use video_cards_r600 && |
303 |
- ! use video_cards_radeonsi && |
304 |
- ! use video_cards_nouveau; then |
305 |
- ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" |
306 |
- fi |
307 |
- fi |
308 |
- |
309 |
- if use vdpau; then |
310 |
- if ! use video_cards_r300 && |
311 |
- ! use video_cards_r600 && |
312 |
- ! use video_cards_radeonsi && |
313 |
- ! use video_cards_nouveau; then |
314 |
- ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" |
315 |
- fi |
316 |
- fi |
317 |
- |
318 |
- if use xa; then |
319 |
- if ! use video_cards_freedreno && |
320 |
- ! use video_cards_nouveau && |
321 |
- ! use video_cards_vmware; then |
322 |
- ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" |
323 |
- fi |
324 |
- fi |
325 |
- |
326 |
- if use xvmc; then |
327 |
- if ! use video_cards_r600 && |
328 |
- ! use video_cards_nouveau; then |
329 |
- ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" |
330 |
- fi |
331 |
- fi |
332 |
- |
333 |
- if ! use gallium; then |
334 |
- use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" |
335 |
- use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" |
336 |
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" |
337 |
- use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" |
338 |
- use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" |
339 |
- use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" |
340 |
- use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" |
341 |
- use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" |
342 |
- fi |
343 |
- |
344 |
- if ! use llvm; then |
345 |
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" |
346 |
- fi |
347 |
-} |
348 |
- |
349 |
-python_check_deps() { |
350 |
- has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" |
351 |
-} |
352 |
- |
353 |
-pkg_setup() { |
354 |
- # warning message for bug 459306 |
355 |
- if use llvm && has_version sys-devel/llvm[!debug=]; then |
356 |
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" |
357 |
- ewarn "detected! This can cause problems. For details, see bug 459306." |
358 |
- fi |
359 |
- |
360 |
- if use llvm; then |
361 |
- llvm_pkg_setup |
362 |
- fi |
363 |
- python-any-r1_pkg_setup |
364 |
-} |
365 |
- |
366 |
-multilib_src_configure() { |
367 |
- local emesonargs=() |
368 |
- |
369 |
- if use classic; then |
370 |
- # Intel code |
371 |
- dri_driver_enable video_cards_i915 i915 |
372 |
- dri_driver_enable video_cards_i965 i965 |
373 |
- if ! use video_cards_i915 && \ |
374 |
- ! use video_cards_i965; then |
375 |
- dri_driver_enable video_cards_intel i915 i965 |
376 |
- fi |
377 |
- |
378 |
- # Nouveau code |
379 |
- dri_driver_enable video_cards_nouveau nouveau |
380 |
- |
381 |
- # ATI code |
382 |
- dri_driver_enable video_cards_r100 r100 |
383 |
- dri_driver_enable video_cards_r200 r200 |
384 |
- if ! use video_cards_r100 && \ |
385 |
- ! use video_cards_r200; then |
386 |
- dri_driver_enable video_cards_radeon r100 r200 |
387 |
- fi |
388 |
- fi |
389 |
- |
390 |
- emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) |
391 |
- |
392 |
- if use gallium; then |
393 |
- emesonargs+=( |
394 |
- $(meson_use llvm) |
395 |
- $(meson_use lm-sensors lmsensors) |
396 |
- $(meson_use unwind libunwind) |
397 |
- ) |
398 |
- |
399 |
- if use video_cards_iris || |
400 |
- use video_cards_r300 || |
401 |
- use video_cards_r600 || |
402 |
- use video_cards_radeonsi || |
403 |
- use video_cards_nouveau || |
404 |
- use video_cards_vmware; then |
405 |
- emesonargs+=($(meson_use d3d9 gallium-nine)) |
406 |
- else |
407 |
- emesonargs+=(-Dgallium-nine=false) |
408 |
- fi |
409 |
- |
410 |
- if use video_cards_r600 || |
411 |
- use video_cards_radeonsi || |
412 |
- use video_cards_nouveau; then |
413 |
- emesonargs+=($(meson_use vaapi gallium-va)) |
414 |
- use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) |
415 |
- else |
416 |
- emesonargs+=(-Dgallium-va=false) |
417 |
- fi |
418 |
- |
419 |
- if use video_cards_r300 || |
420 |
- use video_cards_r600 || |
421 |
- use video_cards_radeonsi || |
422 |
- use video_cards_nouveau; then |
423 |
- emesonargs+=($(meson_use vdpau gallium-vdpau)) |
424 |
- else |
425 |
- emesonargs+=(-Dgallium-vdpau=false) |
426 |
- fi |
427 |
- |
428 |
- if use video_cards_freedreno || |
429 |
- use video_cards_nouveau || |
430 |
- use video_cards_vmware; then |
431 |
- emesonargs+=($(meson_use xa gallium-xa)) |
432 |
- else |
433 |
- emesonargs+=(-Dgallium-xa=false) |
434 |
- fi |
435 |
- |
436 |
- if use video_cards_r600 || |
437 |
- use video_cards_nouveau; then |
438 |
- emesonargs+=($(meson_use xvmc gallium-xvmc)) |
439 |
- else |
440 |
- emesonargs+=(-Dgallium-xvmc=false) |
441 |
- fi |
442 |
- |
443 |
- if use video_cards_freedreno || |
444 |
- use video_cards_vc4 || |
445 |
- use video_cards_vivante; then |
446 |
- gallium_enable -- kmsro |
447 |
- fi |
448 |
- |
449 |
- gallium_enable video_cards_vc4 vc4 |
450 |
- gallium_enable video_cards_vivante etnaviv |
451 |
- gallium_enable video_cards_vmware svga |
452 |
- gallium_enable video_cards_nouveau nouveau |
453 |
- |
454 |
- # Only one i915 driver (classic vs gallium). Default to classic. |
455 |
- if ! use classic; then |
456 |
- gallium_enable video_cards_i915 i915 |
457 |
- if ! use video_cards_i915 && \ |
458 |
- ! use video_cards_i965; then |
459 |
- gallium_enable video_cards_intel i915 |
460 |
- fi |
461 |
- fi |
462 |
- |
463 |
- gallium_enable video_cards_iris iris |
464 |
- |
465 |
- gallium_enable video_cards_r300 r300 |
466 |
- gallium_enable video_cards_r600 r600 |
467 |
- gallium_enable video_cards_radeonsi radeonsi |
468 |
- if ! use video_cards_r300 && \ |
469 |
- ! use video_cards_r600; then |
470 |
- gallium_enable video_cards_radeon r300 r600 |
471 |
- fi |
472 |
- |
473 |
- gallium_enable video_cards_freedreno freedreno |
474 |
- gallium_enable video_cards_virgl virgl |
475 |
- |
476 |
- # opencl stuff |
477 |
- emesonargs+=( |
478 |
- -Dgallium-opencl="$(usex opencl icd disabled)" |
479 |
- ) |
480 |
- fi |
481 |
- |
482 |
- if use vulkan; then |
483 |
- vulkan_enable video_cards_i965 intel |
484 |
- vulkan_enable video_cards_iris intel |
485 |
- vulkan_enable video_cards_radeonsi amd |
486 |
- fi |
487 |
- |
488 |
- # x86 hardened pax_kernel needs glx-rts, bug 240956 |
489 |
- if [[ ${ABI} == x86 ]]; then |
490 |
- emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) |
491 |
- fi |
492 |
- |
493 |
- # Disable glx tls support on musl |
494 |
- if use elibc_musl; then |
495 |
- emesonargs+=( -Dglx-tls=false ) |
496 |
- fi |
497 |
- |
498 |
- # on abi_x86_32 hardened we need to have asm disable |
499 |
- if [[ ${ABI} == x86* ]] && use pic; then |
500 |
- emesonargs+=( -Dasm=false ) |
501 |
- fi |
502 |
- |
503 |
- if use gallium; then |
504 |
- gallium_enable -- swrast |
505 |
- emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) |
506 |
- else |
507 |
- dri_driver_enable -- swrast |
508 |
- emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) |
509 |
- fi |
510 |
- |
511 |
- driver_list() { |
512 |
- local drivers="$(sort -u <<< "${1// /$'\n'}")" |
513 |
- echo "${drivers//$'\n'/,}" |
514 |
- } |
515 |
- |
516 |
- emesonargs+=( |
517 |
- $(meson_use test build-tests) |
518 |
- -Dglx=dri |
519 |
- -Dshared-glapi=true |
520 |
- $(meson_use dri3) |
521 |
- $(meson_use egl) |
522 |
- $(meson_use gbm) |
523 |
- $(meson_use gles1) |
524 |
- $(meson_use gles2) |
525 |
- $(meson_use libglvnd glvnd) |
526 |
- $(meson_use selinux) |
527 |
- -Dvalgrind=$(usex valgrind auto false) |
528 |
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") |
529 |
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") |
530 |
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") |
531 |
- $(meson_use vulkan-overlay vulkan-overlay-layer) |
532 |
- --buildtype $(usex debug debug plain) |
533 |
- -Db_ndebug=$(usex debug false true) |
534 |
- ) |
535 |
- meson_src_configure |
536 |
-} |
537 |
- |
538 |
-multilib_src_compile() { |
539 |
- meson_src_compile |
540 |
-} |
541 |
- |
542 |
-multilib_src_install() { |
543 |
- meson_src_install |
544 |
- |
545 |
- use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so* |
546 |
-} |
547 |
- |
548 |
-multilib_src_install_all() { |
549 |
- einstalldocs |
550 |
-} |
551 |
- |
552 |
-multilib_src_test() { |
553 |
- meson test -v -C "${BUILD_DIR}" -t 100 |
554 |
-} |
555 |
- |
556 |
-pkg_postinst() { |
557 |
- # Switch to the xorg implementation. |
558 |
- echo |
559 |
- eselect opengl set --use-old ${OPENGL_DIR} |
560 |
-} |
561 |
- |
562 |
-# $1 - VIDEO_CARDS flag (check skipped for "--") |
563 |
-# other args - names of DRI drivers to enable |
564 |
-dri_driver_enable() { |
565 |
- if [[ $1 == -- ]] || use $1; then |
566 |
- shift |
567 |
- DRI_DRIVERS+=("$@") |
568 |
- fi |
569 |
-} |
570 |
- |
571 |
-gallium_enable() { |
572 |
- if [[ $1 == -- ]] || use $1; then |
573 |
- shift |
574 |
- GALLIUM_DRIVERS+=("$@") |
575 |
- fi |
576 |
-} |
577 |
- |
578 |
-vulkan_enable() { |
579 |
- if [[ $1 == -- ]] || use $1; then |
580 |
- shift |
581 |
- VULKAN_DRIVERS+=("$@") |
582 |
- fi |
583 |
-} |
584 |
|
585 |
diff --git a/media-libs/mesa/mesa-19.2.2.ebuild b/media-libs/mesa/mesa-19.2.8.ebuild |
586 |
similarity index 97% |
587 |
rename from media-libs/mesa/mesa-19.2.2.ebuild |
588 |
rename to media-libs/mesa/mesa-19.2.8.ebuild |
589 |
index 121a968..3603fd8 100644 |
590 |
--- a/media-libs/mesa/mesa-19.2.2.ebuild |
591 |
+++ b/media-libs/mesa/mesa-19.2.8.ebuild |
592 |
@@ -1,9 +1,9 @@ |
593 |
-# Copyright 1999-2019 Gentoo Authors |
594 |
+# Copyright 1999-2020 Gentoo Authors |
595 |
# Distributed under the terms of the GNU General Public License v2 |
596 |
|
597 |
EAPI=7 |
598 |
|
599 |
-PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) |
600 |
+PYTHON_COMPAT=( python3_6 python3_7 ) |
601 |
|
602 |
inherit llvm meson multilib-minimal pax-utils python-any-r1 |
603 |
|
604 |
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then |
605 |
inherit git-r3 |
606 |
else |
607 |
SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" |
608 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
609 |
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
610 |
fi |
611 |
|
612 |
LICENSE="MIT" |
613 |
@@ -77,7 +77,7 @@ RDEPEND=" |
614 |
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] |
615 |
>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] |
616 |
libglvnd? ( |
617 |
- >=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}] |
618 |
+ >=media-libs/libglvnd-1.2.0-r1[${MULTILIB_USEDEP}] |
619 |
!app-eselect/eselect-opengl |
620 |
) |
621 |
!libglvnd? ( |
622 |
@@ -104,11 +104,11 @@ RDEPEND=" |
623 |
) |
624 |
vaapi? ( |
625 |
>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] |
626 |
- video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) |
627 |
) |
628 |
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) |
629 |
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) |
630 |
) |
631 |
+ selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) |
632 |
wayland? ( |
633 |
>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] |
634 |
>=dev-libs/wayland-protocols-1.8 |
635 |
@@ -462,16 +462,16 @@ multilib_src_configure() { |
636 |
vulkan_enable video_cards_radeonsi amd |
637 |
fi |
638 |
|
639 |
- # x86 hardened pax_kernel needs glx-rts, bug 240956 |
640 |
- if [[ ${ABI} == x86 ]]; then |
641 |
- emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) |
642 |
- fi |
643 |
- |
644 |
# Disable glx tls support on musl |
645 |
if use elibc_musl; then |
646 |
emesonargs+=( -Delf-tls=false ) |
647 |
fi |
648 |
|
649 |
+ # x86 hardened pax_kernel needs glx-rts, bug 240956 |
650 |
+ if [[ ${ABI} == x86 ]]; then |
651 |
+ emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) |
652 |
+ fi |
653 |
+ |
654 |
if use gallium; then |
655 |
gallium_enable -- swrast |
656 |
emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) |
657 |
|
658 |
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml |
659 |
index 81c21d9..9e9a04a 100644 |
660 |
--- a/media-libs/mesa/metadata.xml |
661 |
+++ b/media-libs/mesa/metadata.xml |
662 |
@@ -19,7 +19,6 @@ |
663 |
<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag> |
664 |
<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag> |
665 |
<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag> |
666 |
- <flag name="pic">disable optimized assembly code that is not PIC friendly</flag> |
667 |
<flag name="valgrind">Compile in valgrind memory hints</flag> |
668 |
<flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag> |
669 |
<flag name="vulkan">Enable Vulkan drivers</flag> |
670 |
@@ -29,6 +28,7 @@ |
671 |
<flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag> |
672 |
</use> |
673 |
<upstream> |
674 |
+ <remote-id type="cpe">cpe:/a:mesa3d:mesa</remote-id> |
675 |
<remote-id type="sourceforge">mesa3d</remote-id> |
676 |
</upstream> |
677 |
</pkgmetadata> |