commit: 93b9d9dc97403326a984a056615295a163e259fa Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Jan 10 21:34:47 2024 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Jan 11 04:41:51 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b9d9dc
media-libs/mesa: Version bump to 23.3.3 Bug: https://bugs.gentoo.org/908079 Closes: https://bugs.gentoo.org/921297 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/mesa/Manifest | 1 + media-libs/mesa/files/23.3.3-big-endian.patch | 84 ++++ ...3-symbols-check-Add-_GLOBAL_OFFSET_TABLE_.patch | 31 ++ media-libs/mesa/mesa-23.3.3.ebuild | 450 +++++++++++++++++++++ 4 files changed, 566 insertions(+) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 8acb61a1b4aa..f5862d8b1b6d 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -5,3 +5,4 @@ DIST mesa-23.3.0-rc5.tar.xz 19227440 BLAKE2B 844eb3dacc6f579f1a7bff74fc20ec22021 DIST mesa-23.3.0.tar.xz 19234688 BLAKE2B 1b87d15cbe1b4c761653b7042c46eac3036f08dfcf3a0a81aa7bf6c1c0c402b05f37ce8da9d88df72e1745d66a648c2b8c161b04bf558107f548f6d8167cc798 SHA512 3568b571974a2c6c0c3a4cc614c851729962e39926f0af906ba91604f9d43c0618db7df004cbec5d9e5dbade2d6bde818608c9aa1686183994d68ad3e6ac4521 DIST mesa-23.3.1.tar.xz 19337988 BLAKE2B 73696281868e5eba6493cc34786a6c30eaf256bed2495444be9a1a5ebf1a0d4b8f00bcc3fb91ce9de3ac8ff23663e41cab17b8fe42b1048366c8e9b95aefa905 SHA512 0861fb5083e37439ad8cc0a0d8372a7c84d8665ea298dc784e2dd893162e20ae072f5ef0b860be88ecf74bc123714acbc1dec312e139b892ff40ef1887c5f4a5 DIST mesa-23.3.2.tar.xz 19365140 BLAKE2B fc97e17dd7a139056190010325f1d57978ef8618ae87731f459daedc303223f3fbce660c2361dcd518d35c709357435366c75ebfd6366daa9f0dec99b534604f SHA512 634d2b67ade2121de3f19f2cccd4bf7ceb2ac391b9366587ed1c2412444e010de8ec14a25529fdec1f43f943096422eb23cefcb8a89d2f8b20286850188b65c3 +DIST mesa-23.3.3.tar.xz 19379484 BLAKE2B 6b57e99356abccf398c5fb84953fc1490ddf516dbeed1feca8d16344a04c1c15183325752717447a34a61dd4cdda897147e3194f869d8dbadfa5c45a0c95dab5 SHA512 bed23e8324b026edd5d2b16a381ec563cf2fa9be9c8fbe8d9fb907cab9d87eef91f493fb9d4e3973d4b679e271d2a85ce48af491585638ab97f087532fc63c30 diff --git a/media-libs/mesa/files/23.3.3-big-endian.patch b/media-libs/mesa/files/23.3.3-big-endian.patch new file mode 100644 index 000000000000..6d20fcb77f5c --- /dev/null +++ b/media-libs/mesa/files/23.3.3-big-endian.patch @@ -0,0 +1,84 @@ +From 5997cf7587ce56aedac9114c0db9b250f1b54461 Mon Sep 17 00:00:00 2001 +From: Matt Turner <[email protected]> +Date: Tue, 9 Jan 2024 23:45:27 -0500 +Subject: [PATCH 1/2] nir: Fix cast + +We were wrongly telling `nir_const_value_as_uint()` that `iter` had +`bit_size` bits, but in one case it is explicitly i64. This works on +little endian platforms, but caused the nir_loop_unroll_test.fadd{,_rev} +tests to fail on big endian platforms. + +Bug: https://bugs.gentoo.org/921297 +Fixes: 268ad47c111 ("nir/loop_analyze: Handle bit sizes correctly in calculate_iterations") +Reviewed-by: Rhys Perry <[email protected]> +Reviewed-by: Ian Romanick <[email protected]> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26964> +--- + src/compiler/nir/nir_loop_analyze.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/compiler/nir/nir_loop_analyze.c b/src/compiler/nir/nir_loop_analyze.c +index b55da00b962..2b2ebfdd60f 100644 +--- a/src/compiler/nir/nir_loop_analyze.c ++++ b/src/compiler/nir/nir_loop_analyze.c +@@ -827,6 +827,7 @@ get_iteration(nir_op cond_op, nir_const_value initial, nir_const_value step, + unsigned execution_mode) + { + nir_const_value span, iter; ++ unsigned iter_bit_size = bit_size; + + switch (invert_comparison_if_needed(cond_op, invert_cond)) { + case nir_op_ine: +@@ -880,13 +881,14 @@ get_iteration(nir_op cond_op, nir_const_value initial, nir_const_value step, + iter = eval_const_binop(nir_op_fdiv, bit_size, span, + step, execution_mode); + iter = eval_const_unop(nir_op_f2i64, bit_size, iter, execution_mode); ++ iter_bit_size = 64; + break; + + default: + return -1; + } + +- uint64_t iter_u64 = nir_const_value_as_uint(iter, bit_size); ++ uint64_t iter_u64 = nir_const_value_as_uint(iter, iter_bit_size); + return iter_u64 > INT_MAX ? -1 : (int)iter_u64; + } + +-- +2.41.0 + +From 4ed0957ce75878f8a2ce769e933c5ea3a1aa2510 Mon Sep 17 00:00:00 2001 +From: Matt Turner <[email protected]> +Date: Tue, 9 Jan 2024 23:47:56 -0500 +Subject: [PATCH 2/2] nir/tests: Reenable tests that failed on big-endian + +These tests were disabled due to the bug fixed in the previous commit. + +Reviewed-by: Rhys Perry <[email protected]> +Reviewed-by: Ian Romanick <[email protected]> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26964> +--- + src/compiler/nir/tests/loop_unroll_tests.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/compiler/nir/tests/loop_unroll_tests.cpp b/src/compiler/nir/tests/loop_unroll_tests.cpp +index f9ffb1f7a1c..af9b8f87549 100644 +--- a/src/compiler/nir/tests/loop_unroll_tests.cpp ++++ b/src/compiler/nir/tests/loop_unroll_tests.cpp +@@ -144,12 +144,10 @@ UNROLL_TEST_INSERT(iadd, int, 0, 24, 4, + ige, iadd, false, TRUE, 6, 0) + UNROLL_TEST_INSERT(iadd_rev, int, 0, 24, 4, + ilt, iadd, true, TRUE, 7, 0) +-#ifndef __s390x__ + UNROLL_TEST_INSERT(fadd, float, 0.0, 24.0, 4.0, + fge, fadd, false, TRUE, 6, 0) + UNROLL_TEST_INSERT(fadd_rev, float, 0.0, 24.0, 4.0, + flt, fadd, true, TRUE, 7, 0) +-#endif + UNROLL_TEST_INSERT(imul, int, 1, 81, 3, + ige, imul, false, TRUE, 4, 0) + UNROLL_TEST_INSERT(imul_rev, int, 1, 81, 3, +-- +2.41.0 + diff --git a/media-libs/mesa/files/23.3.3-symbols-check-Add-_GLOBAL_OFFSET_TABLE_.patch b/media-libs/mesa/files/23.3.3-symbols-check-Add-_GLOBAL_OFFSET_TABLE_.patch new file mode 100644 index 000000000000..4c57f93f9bd1 --- /dev/null +++ b/media-libs/mesa/files/23.3.3-symbols-check-Add-_GLOBAL_OFFSET_TABLE_.patch @@ -0,0 +1,31 @@ +From 0ab7ea56b2558d30400a7462a05014e758c9c9c1 Mon Sep 17 00:00:00 2001 +From: Matt Turner <[email protected]> +Date: Wed, 10 Jan 2024 10:56:17 -0500 +Subject: [PATCH] symbols-check: Add _GLOBAL_OFFSET_TABLE_ + +This is exported on hppa/parisc. + +See also: https://gitlab.freedesktop.org/glvnd/libglvnd/-/merge_requests/291 + +Cc: mesa-stable +Bug: https://bugs.gentoo.org/908079 +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26978> +--- + bin/symbols-check.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bin/symbols-check.py b/bin/symbols-check.py +index 7daf603c5f9..2e014731728 100644 +--- a/bin/symbols-check.py ++++ b/bin/symbols-check.py +@@ -7,6 +7,7 @@ import subprocess + + # This list contains symbols that _might_ be exported for some platforms + PLATFORM_SYMBOLS = [ ++ '_GLOBAL_OFFSET_TABLE_', + '__bss_end__', + '__bss_start__', + '__bss_start', +-- +2.41.0 + diff --git a/media-libs/mesa/mesa-23.3.3.ebuild b/media-libs/mesa/mesa-23.3.3.ebuild new file mode 100644 index 000000000000..f79856c3076f --- /dev/null +++ b/media-libs/mesa/mesa-23.3.3.ebuild @@ -0,0 +1,450 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit llvm meson-multilib python-any-r1 linux-info + +MY_P="${P/_/-}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"; + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"; + inherit git-r3 +else + SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" +fi + +LICENSE="MIT SGI-B-2.0" +SLOT="0" +RESTRICT="!test? ( test )" + +RADEON_CARDS="r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau panfrost v3d vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm + lm-sensors opencl osmesa +proprietary-codecs selinux + test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa zink +zstd" + +REQUIRED_USE=" + d3d9? ( + || ( + video_cards_intel + video_cards_r300 + video_cards_r600 + video_cards_radeonsi + video_cards_nouveau + video_cards_vmware + ) + ) + vulkan? ( video_cards_radeonsi? ( llvm ) ) + vulkan-overlay? ( vulkan ) + video_cards_lavapipe? ( llvm vulkan ) + video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_radeonsi? ( llvm ) + vdpau? ( X ) + xa? ( X ) + zink? ( vulkan ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + video_cards_radeonsi? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3 + dev-libs/libclc[spirv(-)] + >=dev-util/spirv-tools-1.3.231.0 + virtual/libelf:0= + ) + vaapi? ( + >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] + ) + zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17. +# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15. +LLVM_MAX_SLOT="17" +LLVM_MIN_SLOT="15" +LLVM_USE_DEPS="llvm_targets_AMDGPU(+),${MULTILIB_USEDEP}" +PER_SLOT_DEPSTR=" + ( + !opencl? ( sys-devel/llvm:@SLOT@[${LLVM_USE_DEPS}] ) + opencl? ( sys-devel/clang:@SLOT@[${LLVM_USE_DEPS}] ) + opencl? ( dev-util/spirv-llvm-translator:@SLOT@ ) + ) +" +LLVM_DEPSTR=" + || ( + $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do + echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" + done) + ) + !opencl? ( <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] ) + opencl? ( <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=[${LLVM_USE_DEPS}] ) +" +RDEPEND="${RDEPEND} + llvm? ( ${LLVM_DEPSTR} ) +" +unset LLVM_MIN_SLOT {LLVM,PER_SLOT}_DEPSTR + +DEPEND="${RDEPEND} + video_cards_d3d12? ( >=dev-util/directx-headers-1.610.0[${MULTILIB_USEDEP}] ) + valgrind? ( dev-util/valgrind ) + wayland? ( >=dev-libs/wayland-protocols-1.30 ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=virtual/rust-1.62.0 + >=dev-util/bindgen-0.58.0 + ) + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + vulkan? ( + dev-util/glslang + llvm? ( + video_cards_intel? ( + amd64? ( + $(python_gen_any_dep "dev-python/ply[\${PYTHON_USEDEP}]") + ~dev-util/intel_clc-${PV} + dev-libs/libclc[spirv(-)] + ) + ) + ) + ) + wayland? ( dev-util/wayland-scanner ) +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib/libglapi.so.0.0.0 + usr/lib/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +PATCHES=( + "${FILESDIR}"/${PV}-symbols-check-Add-_GLOBAL_OFFSET_TABLE_.patch + "${FILESDIR}"/${PV}-big-endian.patch +) + +llvm_check_deps() { + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${LLVM_USE_DEPS}]" || return 1 + has_version "dev-util/spirv-llvm-translator:${LLVM_SLOT}" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${LLVM_USE_DEPS}]" +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_radeonsi && + ! use video_cards_v3d; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d" + fi + fi + + if use vaapi; then + if ! use video_cards_d3d12 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_d3d12 && + ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + if use llvm && use vulkan && use video_cards_intel && use amd64; then + python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 + fi +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_intel || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + if use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + default + sed -i -e "/^PLATFORM_SYMBOLS/a '__gentoo_check_ldflags__'," \ + bin/symbols-check.py || die # bug #830728 +} + +multilib_src_configure() { + local emesonargs=() + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use video_cards_intel || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_d3d12 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_v3d || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable -- swrast + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_intel crocus i915 iris + gallium_enable video_cards_lima lima + gallium_enable video_cards_d3d12 d3d12 + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_virgl virgl + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable zink zink + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + if use llvm && use opencl; then + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" + # See https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/docs/rusticl.rst + emesonargs+=( + $(meson_native_true gallium-rusticl) + -Drust_std=2021 + ) + fi + + if use vulkan; then + vulkan_enable video_cards_lavapipe swrast + vulkan_enable video_cards_freedreno freedreno + vulkan_enable video_cards_intel intel intel_hasvk + vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + if use llvm && use vulkan && use video_cards_intel && use amd64; then + emesonargs+=(-Dintel-clc=system) + else + emesonargs+=(-Dintel-clc=disabled) + fi + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dshared-glapi=enabled + -Ddri3=enabled + -Degl=enabled + -Dexpat=enabled + -Dgbm=enabled + -Dglvnd=true + $(meson_feature gles1) + $(meson_feature gles2) + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature unwind libunwind) + $(meson_feature zstd) + $(meson_use cpu_flags_x86_sse2 sse2) + -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +}
