Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/
Date: Thu, 01 Apr 2021 13:03:35
Message-Id: 1617282204.5941aee9244a3a10ceff42c1fa8027c35728d8b3.anarchy@gentoo
1 commit: 5941aee9244a3a10ceff42c1fa8027c35728d8b3
2 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 1 13:03:24 2021 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 1 13:03:24 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5941aee9
7
8 media-libs/mesa: sync with ::gentoo stable
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
12
13 media-libs/mesa/Manifest | 3 +-
14 media-libs/mesa/mesa-20.2.6.ebuild | 565 ---------------------
15 .../{mesa-20.3.4.ebuild => mesa-20.3.5.ebuild} | 13 +-
16 3 files changed, 11 insertions(+), 570 deletions(-)
17
18 diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
19 index 62bd356..36782df 100644
20 --- a/media-libs/mesa/Manifest
21 +++ b/media-libs/mesa/Manifest
22 @@ -1,3 +1,2 @@
23 DIST mesa-20.1.10.tar.xz 12918420 BLAKE2B 408f4bc6eb0dc11199cd161d6914b77cb57313bca94f26794cbfd05332922c45dc216a64e33df9fad64cd41e1ad8b2de6c2e5f99cad234870f7a5b970a62dcbd SHA512 0d4016abfcc733c853d7b6c3c997ddc554a44088c0a4d9a7edb51ab5ad7d9e1234728b61ffcb9c82a6c5fee1429091a1c31cbeabcb1b50411337b99ee550d28a
24 -DIST mesa-20.2.6.tar.xz 13886924 BLAKE2B 2bc5d680979b58a77105a8058da5dfea81afe05166a44d08cf243e5760b8c66e418fd78046a2c88243f56aa85a610d052f3aaf259938668cd0f4a184e9edca46 SHA512 347b275d88c0d14cacef570ed736cac07f2e607bc4c89a16b915ec01ac57dbbe698ddf9a0ad70f034e00318403351e3c728e74c72c653acf1fc99720887fa888
25 -DIST mesa-20.3.4.tar.xz 14253372 BLAKE2B 210908f5b802b9fd0170a6f06310f39bab4aa0ca1c84914d702863f9df4d47f1720f0d3779ae804d2eef322a09f4b6cc40855efd7dc365cd84dd8f222b217998 SHA512 81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477
26 +DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497fd3a485dae4e989f22b13288a93f51bcd5e6a69b979f0bbe41599fa237c08f3bbb81cb9c6dc4c06827f8ad5f4 SHA512 481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9
27
28 diff --git a/media-libs/mesa/mesa-20.2.6.ebuild b/media-libs/mesa/mesa-20.2.6.ebuild
29 deleted file mode 100644
30 index ad23331..0000000
31 --- a/media-libs/mesa/mesa-20.2.6.ebuild
32 +++ /dev/null
33 @@ -1,565 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{7,8,9} )
40 -
41 -inherit llvm meson multilib-minimal python-any-r1 linux-info
42 -
43 -OPENGL_DIR="xorg-x11"
44 -
45 -MY_P="${P/_/-}"
46 -
47 -DESCRIPTION="OpenGL-like graphic library for Linux"
48 -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
49 -
50 -if [[ ${PV} == 9999 ]]; then
51 - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
52 - inherit git-r3
53 -else
54 - SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
55 - KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
56 -fi
57 -
58 -LICENSE="MIT"
59 -SLOT="0"
60 -RESTRICT="
61 - !test? ( test )
62 -"
63 -
64 -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
65 -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware"
66 -for card in ${VIDEO_CARDS}; do
67 - IUSE_VIDEO_CARDS+=" video_cards_${card}"
68 -done
69 -
70 -IUSE="${IUSE_VIDEO_CARDS}
71 - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm
72 - lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
73 - vulkan-overlay wayland +X xa xvmc zink +zstd"
74 -
75 -REQUIRED_USE="
76 - d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
77 - gles1? ( egl )
78 - gles2? ( egl )
79 - vulkan? ( dri3
80 - video_cards_radeonsi? ( llvm ) )
81 - vulkan-overlay? ( vulkan )
82 - wayland? ( egl gbm )
83 - video_cards_freedreno? ( gallium )
84 - video_cards_intel? ( classic )
85 - video_cards_i915? ( || ( classic gallium ) )
86 - video_cards_i965? ( classic )
87 - video_cards_iris? ( gallium )
88 - video_cards_lima? ( gallium )
89 - video_cards_nouveau? ( || ( classic gallium ) )
90 - video_cards_panfrost? ( gallium )
91 - video_cards_radeon? ( || ( classic gallium )
92 - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
93 - video_cards_r100? ( classic )
94 - video_cards_r200? ( classic )
95 - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
96 - video_cards_r600? ( gallium )
97 - video_cards_radeonsi? ( gallium llvm )
98 - video_cards_v3d? ( gallium )
99 - video_cards_vc4? ( gallium )
100 - video_cards_virgl? ( gallium )
101 - video_cards_vivante? ( gallium gbm )
102 - video_cards_vmware? ( gallium )
103 - xa? ( X )
104 - xvmc? ( X )
105 - zink? ( gallium vulkan )
106 -"
107 -
108 -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
109 -RDEPEND="
110 - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
111 - >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
112 - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
113 - gallium? (
114 - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
115 - llvm? (
116 - video_cards_radeonsi? (
117 - virtual/libelf:0=[${MULTILIB_USEDEP}]
118 - )
119 - video_cards_r600? (
120 - virtual/libelf:0=[${MULTILIB_USEDEP}]
121 - )
122 - video_cards_radeon? (
123 - virtual/libelf:0=[${MULTILIB_USEDEP}]
124 - )
125 - )
126 - lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
127 - opencl? (
128 - >=virtual/opencl-3[${MULTILIB_USEDEP}]
129 - dev-libs/libclc
130 - virtual/libelf:0=[${MULTILIB_USEDEP}]
131 - )
132 - vaapi? (
133 - >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
134 - )
135 - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
136 - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
137 - )
138 - selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
139 - wayland? (
140 - >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
141 - >=dev-libs/wayland-protocols-1.8
142 - )
143 - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
144 - video_cards_intel? (
145 - !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
146 - )
147 - video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
148 - vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
149 - X? (
150 - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
151 - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
152 - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
153 - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
154 - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
155 - >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
156 - x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
157 - )
158 - zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
159 - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
160 -"
161 -for card in ${RADEON_CARDS}; do
162 - RDEPEND="${RDEPEND}
163 - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
164 - "
165 -done
166 -RDEPEND="${RDEPEND}
167 - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
168 -"
169 -
170 -# Please keep the LLVM dependency block separate. Since LLVM is slotted,
171 -# we need to *really* make sure we're not pulling one than more slot
172 -# simultaneously.
173 -#
174 -# How to use it:
175 -# 1. List all the working slots (with min versions) in ||, newest first.
176 -# 2. Update the := to specify *max* version, e.g. < 10.
177 -# 3. Specify LLVM_MAX_SLOT, e.g. 9.
178 -LLVM_MAX_SLOT="11"
179 -LLVM_DEPSTR="
180 - || (
181 - sys-devel/llvm:11[${MULTILIB_USEDEP}]
182 - sys-devel/llvm:10[${MULTILIB_USEDEP}]
183 - sys-devel/llvm:9[${MULTILIB_USEDEP}]
184 - )
185 - <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
186 -"
187 -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
188 -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
189 -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
190 -RDEPEND="${RDEPEND}
191 - gallium? (
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 -"
244 -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
245 -
246 -DEPEND="${RDEPEND}
247 - valgrind? ( dev-util/valgrind )
248 - X? (
249 - x11-libs/libXrandr[${MULTILIB_USEDEP}]
250 - x11-base/xorg-proto
251 - )
252 -"
253 -BDEPEND="
254 - ${PYTHON_DEPS}
255 - opencl? (
256 - >=sys-devel/gcc-4.6
257 - )
258 - sys-devel/bison
259 - sys-devel/flex
260 - virtual/pkgconfig
261 - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
262 -"
263 -
264 -S="${WORKDIR}/${MY_P}"
265 -EGIT_CHECKOUT_DIR=${S}
266 -
267 -QA_WX_LOAD="
268 -x86? (
269 - usr/lib*/libglapi.so.0.0.0
270 - usr/lib*/libGLESv1_CM.so.1.1.0
271 - usr/lib*/libGLESv2.so.2.0.0
272 - usr/lib*/libGL.so.1.2.0
273 - usr/lib*/libOSMesa.so.8.0.0
274 - usr/lib/libGLX_mesa.so.0.0.0
275 -)"
276 -
277 -PATCHES=(
278 - "${FILESDIR}"/${PN}-20.2.0-add-disable-tls-support.patch
279 -)
280 -
281 -llvm_check_deps() {
282 - local flags=${MULTILIB_USEDEP}
283 - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
284 - then
285 - flags+=",llvm_targets_AMDGPU(-)"
286 - fi
287 -
288 - if use opencl; then
289 - has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
290 - fi
291 - has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
292 -}
293 -
294 -pkg_pretend() {
295 - if use vulkan; then
296 - if ! use video_cards_i965 &&
297 - ! use video_cards_iris &&
298 - ! use video_cards_radeonsi; then
299 - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi"
300 - fi
301 - fi
302 -
303 - if use opencl; then
304 - if ! use video_cards_r600 &&
305 - ! use video_cards_radeonsi; then
306 - ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
307 - fi
308 - fi
309 -
310 - if use vaapi; then
311 - if ! use video_cards_r600 &&
312 - ! use video_cards_radeonsi &&
313 - ! use video_cards_nouveau; then
314 - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
315 - fi
316 - fi
317 -
318 - if use vdpau; then
319 - if ! use video_cards_r300 &&
320 - ! use video_cards_r600 &&
321 - ! use video_cards_radeonsi &&
322 - ! use video_cards_nouveau; then
323 - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
324 - fi
325 - fi
326 -
327 - if use xa; then
328 - if ! use video_cards_freedreno &&
329 - ! use video_cards_nouveau &&
330 - ! use video_cards_vmware; then
331 - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
332 - fi
333 - fi
334 -
335 - if use xvmc; then
336 - if ! use video_cards_r600 &&
337 - ! use video_cards_nouveau; then
338 - ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
339 - fi
340 - fi
341 -
342 - if ! use gallium; then
343 - use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
344 - use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
345 - use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
346 - use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
347 - use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
348 - use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
349 - use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
350 - use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
351 - fi
352 -
353 - if ! use llvm; then
354 - use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
355 - fi
356 -}
357 -
358 -python_check_deps() {
359 - has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
360 -}
361 -
362 -pkg_setup() {
363 - # warning message for bug 459306
364 - if use llvm && has_version sys-devel/llvm[!debug=]; then
365 - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
366 - ewarn "detected! This can cause problems. For details, see bug 459306."
367 - fi
368 -
369 - if use video_cards_i965 ||
370 - use video_cards_iris ||
371 - use video_cards_radeonsi; then
372 - CONFIG_CHECK="~CHECKPOINT_RESTORE"
373 - linux-info_pkg_setup
374 - fi
375 -
376 - if use gallium && use llvm; then
377 - llvm_pkg_setup
378 - fi
379 - python-any-r1_pkg_setup
380 -}
381 -
382 -multilib_src_configure() {
383 - local emesonargs=()
384 -
385 - if use classic; then
386 - # Intel code
387 - dri_driver_enable video_cards_i915 i915
388 - dri_driver_enable video_cards_i965 i965
389 - if ! use video_cards_i915 && \
390 - ! use video_cards_i965; then
391 - dri_driver_enable video_cards_intel i915 i965
392 - fi
393 -
394 - # Nouveau code
395 - dri_driver_enable video_cards_nouveau nouveau
396 -
397 - # ATI code
398 - dri_driver_enable video_cards_r100 r100
399 - dri_driver_enable video_cards_r200 r200
400 - if ! use video_cards_r100 && \
401 - ! use video_cards_r200; then
402 - dri_driver_enable video_cards_radeon r100 r200
403 - fi
404 - fi
405 -
406 - local platforms
407 - use X && platforms+="x11"
408 - use wayland && platforms+=",wayland"
409 - emesonargs+=(-Dplatforms=${platforms#,})
410 -
411 - if use X || use egl; then
412 - emesonargs+=(-Dglvnd=true)
413 - else
414 - emesonargs+=(-Dglvnd=false)
415 - fi
416 -
417 - # Disable glx tls support on musl
418 - if use elibc_musl; then
419 - emesonargs+=( -Delf-tls=false )
420 - fi
421 -
422 - if use gallium; then
423 - emesonargs+=(
424 - $(meson_feature llvm)
425 - $(meson_feature lm-sensors lmsensors)
426 - $(meson_feature unwind libunwind)
427 - )
428 -
429 - if use video_cards_iris ||
430 - use video_cards_r300 ||
431 - use video_cards_r600 ||
432 - use video_cards_radeonsi ||
433 - use video_cards_nouveau ||
434 - use video_cards_vmware; then
435 - emesonargs+=($(meson_use d3d9 gallium-nine))
436 - else
437 - emesonargs+=(-Dgallium-nine=false)
438 - fi
439 -
440 - if use video_cards_r600 ||
441 - use video_cards_radeonsi ||
442 - use video_cards_nouveau; then
443 - emesonargs+=($(meson_feature vaapi gallium-va))
444 - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
445 - else
446 - emesonargs+=(-Dgallium-va=disabled)
447 - fi
448 -
449 - if use video_cards_r300 ||
450 - use video_cards_r600 ||
451 - use video_cards_radeonsi ||
452 - use video_cards_nouveau; then
453 - emesonargs+=($(meson_feature vdpau gallium-vdpau))
454 - else
455 - emesonargs+=(-Dgallium-vdpau=disabled)
456 - fi
457 -
458 - if use video_cards_freedreno ||
459 - use video_cards_nouveau ||
460 - use video_cards_vmware; then
461 - emesonargs+=($(meson_feature xa gallium-xa))
462 - else
463 - emesonargs+=(-Dgallium-xa=disabled)
464 - fi
465 -
466 - if use video_cards_r600 ||
467 - use video_cards_nouveau; then
468 - emesonargs+=($(meson_feature xvmc gallium-xvmc))
469 - else
470 - emesonargs+=(-Dgallium-xvmc=disabled)
471 - fi
472 -
473 - if use video_cards_freedreno ||
474 - use video_cards_lima ||
475 - use video_cards_panfrost ||
476 - use video_cards_v3d ||
477 - use video_cards_vc4 ||
478 - use video_cards_vivante; then
479 - gallium_enable -- kmsro
480 - fi
481 -
482 - gallium_enable video_cards_lima lima
483 - gallium_enable video_cards_panfrost panfrost
484 - gallium_enable video_cards_v3d v3d
485 - gallium_enable video_cards_vc4 vc4
486 - gallium_enable video_cards_vivante etnaviv
487 - gallium_enable video_cards_vmware svga
488 - gallium_enable video_cards_nouveau nouveau
489 - gallium_enable zink zink
490 -
491 - # Only one i915 driver (classic vs gallium). Default to classic.
492 - if ! use classic; then
493 - gallium_enable video_cards_i915 i915
494 - if ! use video_cards_i915 && \
495 - ! use video_cards_i965; then
496 - gallium_enable video_cards_intel i915
497 - fi
498 - fi
499 -
500 - gallium_enable video_cards_iris iris
501 -
502 - gallium_enable video_cards_r300 r300
503 - gallium_enable video_cards_r600 r600
504 - gallium_enable video_cards_radeonsi radeonsi
505 - if ! use video_cards_r300 && \
506 - ! use video_cards_r600; then
507 - gallium_enable video_cards_radeon r300 r600
508 - fi
509 -
510 - gallium_enable video_cards_freedreno freedreno
511 - gallium_enable video_cards_virgl virgl
512 -
513 - # opencl stuff
514 - emesonargs+=(
515 - -Dgallium-opencl="$(usex opencl icd disabled)"
516 - )
517 - fi
518 -
519 - if use vulkan; then
520 - vulkan_enable video_cards_i965 intel
521 - vulkan_enable video_cards_iris intel
522 - vulkan_enable video_cards_radeonsi amd
523 - fi
524 -
525 - if use gallium; then
526 - gallium_enable -- swrast
527 - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
528 - else
529 - dri_driver_enable -- swrast
530 - emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
531 - fi
532 -
533 - driver_list() {
534 - local drivers="$(sort -u <<< "${1// /$'\n'}")"
535 - echo "${drivers//$'\n'/,}"
536 - }
537 -
538 - emesonargs+=(
539 - $(meson_use test build-tests)
540 - -Dglx=$(usex X dri disabled)
541 - -Dshared-glapi=enabled
542 - $(meson_feature dri3)
543 - $(meson_feature egl)
544 - $(meson_feature gbm)
545 - $(meson_feature gles1)
546 - $(meson_feature gles2)
547 - $(meson_use selinux)
548 - $(meson_feature zstd)
549 - -Dvalgrind=$(usex valgrind auto false)
550 - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
551 - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
552 - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
553 - $(meson_use vulkan vulkan-device-select-layer)
554 - $(meson_use vulkan-overlay vulkan-overlay-layer)
555 - --buildtype $(usex debug debug plain)
556 - -Db_ndebug=$(usex debug false true)
557 - )
558 - meson_src_configure
559 -}
560 -
561 -multilib_src_compile() {
562 - meson_src_compile
563 -}
564 -
565 -multilib_src_install() {
566 - meson_src_install
567 -}
568 -
569 -multilib_src_install_all() {
570 - einstalldocs
571 -}
572 -
573 -multilib_src_test() {
574 - meson_src_test -t 100
575 -}
576 -
577 -# $1 - VIDEO_CARDS flag (check skipped for "--")
578 -# other args - names of DRI drivers to enable
579 -dri_driver_enable() {
580 - if [[ $1 == -- ]] || use $1; then
581 - shift
582 - DRI_DRIVERS+=("$@")
583 - fi
584 -}
585 -
586 -gallium_enable() {
587 - if [[ $1 == -- ]] || use $1; then
588 - shift
589 - GALLIUM_DRIVERS+=("$@")
590 - fi
591 -}
592 -
593 -vulkan_enable() {
594 - if [[ $1 == -- ]] || use $1; then
595 - shift
596 - VULKAN_DRIVERS+=("$@")
597 - fi
598 -}
599
600 diff --git a/media-libs/mesa/mesa-20.3.4.ebuild b/media-libs/mesa/mesa-20.3.5.ebuild
601 similarity index 98%
602 rename from media-libs/mesa/mesa-20.3.4.ebuild
603 rename to media-libs/mesa/mesa-20.3.5.ebuild
604 index 001daa0..469b19e 100644
605 --- a/media-libs/mesa/mesa-20.3.4.ebuild
606 +++ b/media-libs/mesa/mesa-20.3.5.ebuild
607 @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
608 inherit git-r3
609 else
610 SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
611 - KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 x86"
612 + KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
613 fi
614
615 LICENSE="MIT"
616 @@ -147,7 +147,6 @@ LLVM_DEPSTR="
617 || (
618 sys-devel/llvm:11[${MULTILIB_USEDEP}]
619 sys-devel/llvm:10[${MULTILIB_USEDEP}]
620 - sys-devel/llvm:9[${MULTILIB_USEDEP}]
621 )
622 <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
623 "
624 @@ -338,7 +337,15 @@ pkg_setup() {
625 if use video_cards_i965 ||
626 use video_cards_iris ||
627 use video_cards_radeonsi; then
628 - CONFIG_CHECK="~CHECKPOINT_RESTORE"
629 + if kernel_is -ge 5 11 3; then
630 + CONFIG_CHECK="~KCMP"
631 + elif kernel_is -ge 5 11; then
632 + CONFIG_CHECK="~CHECKPOINT_RESTORE"
633 + elif kernel_is -ge 5 10 20; then
634 + CONFIG_CHECK="~KCMP"
635 + else
636 + CONFIG_CHECK="~CHECKPOINT_RESTORE"
637 + fi
638 linux-info_pkg_setup
639 fi
Report Message
Find on MARC Find on Google Groups