>From 1085177146db3db7f156a951191e756fca28e863 Mon Sep 17 00:00:00 2001
From: Fred Baksik <fred.bak...@mrcy.com>
Date: Thu, 19 Dec 2019 14:16:56 -0500
Subject: [PATCH] mesa: Allow building the virgl driver to be configurable
If a .bbappend file sets GALLIUMDRIVERS then virgl is always being
appended to the list of drivers to be built. Make virgl an optional
component.
Signed-off-by: Fred Baksik <fred.bak...@mrcy.com>
---
meta/recipes-graphics/mesa/mesa.inc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 9ad9f2e370..87f167c507 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -67,7 +67,7 @@ EXTRA_OEMESON = " \
"
PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland
vulkan', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl
egl gles gbm dri gallium', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl
egl gles gbm dri gallium virgl', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11
dri3', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan',
'dri3', '', d)} \
elf-tls \
@@ -132,10 +132,11 @@ GALLIUMDRIVERS_LLVM33_ENABLED =
"${@oe.utils.version_less_or_equal('MESA_LLVM_RE
GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if
${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
PACKAGECONFIG[r600] = ""
+PACKAGECONFIG[virgl] = ""
GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm',
',${GALLIUMDRIVERS_LLVM}', '', d)}"
GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600',
',r600', '', d)}"
-GALLIUMDRIVERS_append = ",virgl"
+GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl',
',virgl', '', d)}"
PACKAGECONFIG[gallium] = "-Dgallium-drivers=${GALLIUMDRIVERS},
-Dgallium-drivers=''"
PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false,
llvm${MESA_LLVM_RELEASE} llvm-native \
--
2.17.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
