From 46886b51c29b1c1108c85087cba4dbf22c6fa79d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 19 Jun 2026 08:30:53 +0200 Subject: [PATCH] package/mesa3d: restrict Gallium VA-API support to supported drivers This patch fixes a build error introduced by buildroot commit 460700d38e1bb9ddb83bf8de81d69a2448099165 which took not into account that only certain drivers support Gallium VA-API: ../output-1/build/mesa3d-26.1.2/meson.build:742:3: ERROR: Feature gallium-va cannot be enabled: VA state tracker requires at least one of the following gallium drivers: r600, radeonsi, nouveau, d3d12 (with option gallium-d3d12-video), virgl. Fixes: https://autobuild.buildroot.net/results/16b/16b2a63b444d7f84ceab5134ce9ff63e910537a7/ which includes configure option -Dgallium-drivers=etnaviv,r300. Signed-off-by: Bernd Kuhls Signed-off-by: Romain Naour --- package/mesa3d/Config.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index e4a444efbb..e184039150 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -197,6 +197,7 @@ comment "llvmpipe driver needs llvm" config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU bool "Gallium nouveau driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_VA_SUPPORTED_DRIVER select BR2_PACKAGE_LIBDRM_NOUVEAU select BR2_PACKAGE_LLVM_RTTI if BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_RUSTICL_SUPPORTED_DRIVER @@ -236,6 +237,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 (BR2_PACKAGE_MESA3D_LLVM && (BR2_TOOLCHAIN_USES_UCLIBC || \ BR2_TOOLCHAIN_USES_GLIBC)) # elfutils select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_VA_SUPPORTED_DRIVER select BR2_PACKAGE_LIBDRM_RADEON select BR2_PACKAGE_LLVM_AMDGPU if BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_ELFUTILS if BR2_PACKAGE_MESA3D_LLVM @@ -254,6 +256,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI depends on BR2_USE_MMU # libdrm depends on BR2_i386 || BR2_x86_64 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_VA_SUPPORTED_DRIVER select BR2_PACKAGE_MESA3D_HOST_NATIVE_CONTEXT_SUPPORTED_DRIVER select BR2_PACKAGE_LIBDRM_AMDGPU select BR2_PACKAGE_LIBDRM_RADEON @@ -325,6 +328,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL bool "Gallium virgl driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_GALLIUM_VA_SUPPORTED_DRIVER select BR2_PACKAGE_MESA3D_OPENGL_EGL help virgl is the 3D acceleration backend for the virtio-gpu @@ -507,17 +511,20 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES endif # BR2_PACKAGE_MESA3D_DRIVER +config BR2_PACKAGE_MESA3D_GALLIUM_VA_SUPPORTED_DRIVER + bool + config BR2_PACKAGE_MESA3D_GALLIUM_VA bool "Gallium VA-API" - depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + depends on BR2_PACKAGE_MESA3D_GALLIUM_VA_SUPPORTED_DRIVER # circular dependency: mesa3d -> libva -> libgl -> mesa3d depends on !BR2_PACKAGE_MESA3D_OPENGL_GLX || BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_LIBVA help Enable VA-API video acceleration support in Gallium drivers. -comment "Gallium VA-API needs a gallium driver, incompatible with GLX w/o libglvnd" - depends on !BR2_PACKAGE_MESA3D_GALLIUM_DRIVER || \ +comment "Gallium VA-API needs a supported gallium driver, incompatible with GLX w/o libglvnd" + depends on !BR2_PACKAGE_MESA3D_GALLIUM_VA_SUPPORTED_DRIVER || \ (BR2_PACKAGE_MESA3D_OPENGL_GLX && !BR2_PACKAGE_LIBGLVND) config BR2_PACKAGE_MESA3D_PATENTED_VIDEO_CODECS