From c095ae793f61d19391ebd8cf737356b519b16c43 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Sat, 12 Apr 2025 01:09:16 +0300 Subject: [PATCH] mesa: handle svga Gallium driver through PACKAGECONFIG too For the sake of uniformity add the svga PACKAGECONFIG and use it to guard inclusion of the svga Gallium driver. (From OE-Core rev: 0fa6c2e6eb6c0b5eadb447bfa01a9b0930f9a9da) Signed-off-by: Dmitry Baryshkov Signed-off-by: Richard Purdie --- meta/recipes-graphics/mesa/mesa.inc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 9ddcdcd48b..fb76b5b1cc 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -89,10 +89,10 @@ PACKAGECONFIG = " \ # skip all Rust dependencies if we are not building OpenCL" INHIBIT_DEFAULT_RUST_DEPS = "${@bb.utils.contains('PACKAGECONFIG', 'opencl', '', '1', d)}" -PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd" -PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel amd" -PACKAGECONFIG:append:i686 = " libclc gallium-llvm intel amd" -PACKAGECONFIG:append:class-native = " libclc gallium-llvm amd" +PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd svga" +PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel amd svga" +PACKAGECONFIG:append:i686 = " libclc gallium-llvm intel amd svga" +PACKAGECONFIG:append:class-native = " libclc gallium-llvm amd svga" # "gbm" requires "opengl" PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" @@ -177,13 +177,11 @@ GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'amd', ',radeon GALLIUMDRIVERS_LLVMPIPE = ",llvmpipe" # llvmpipe crashes on x32 GALLIUMDRIVERS_LLVMPIPE:x86-x32 = "" -GALLIUMDRIVERS_LLVM = ",r300,nouveau${GALLIUMDRIVERS_LLVMPIPE}${GALLIUMDRIVERS_IRIS}${GALLIUMDRIVERS_RADEONSI}" -GALLIUMDRIVERS_LLVM:append:x86 = ",svga" -GALLIUMDRIVERS_LLVM:append:x86-64 = ",svga" -# i686 is a 32 bit override for mesa-native -GALLIUMDRIVERS_LLVM:append:i686 = ",svga" +GALLIUMDRIVERS_SVGA = "${@bb.utils.contains('PACKAGECONFIG', 'svga', ',svga', '', d)}" +GALLIUMDRIVERS_LLVM = ",r300,nouveau${GALLIUMDRIVERS_LLVMPIPE}${GALLIUMDRIVERS_IRIS}${GALLIUMDRIVERS_RADEONSI}${GALLIUMDRIVERS_SVGA}" PACKAGECONFIG[amd] = "" +PACKAGECONFIG[svga] = "" PACKAGECONFIG[virgl] = "" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', '${GALLIUMDRIVERS_LLVM}', '', d)}"