summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa.bb1
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc1
3 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-gl.bb b/meta/recipes-graphics/mesa/mesa-gl.bb
index 832137c818..3b55d2b77e 100644
--- a/meta/recipes-graphics/mesa/mesa-gl.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/libgl virtual/mesa"
7TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm" 7TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm"
8 8
9# At least one DRI rendering engine is required to build mesa. 9# At least one DRI rendering engine is required to build mesa.
10PACKAGECONFIG = "opengl gallium ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" 10PACKAGECONFIG = "opengl gallium ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} xmlconfig"
11 11
12PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd nouveau svga" 12PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd nouveau svga"
13PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel amd nouveau svga" 13PACKAGECONFIG:append:x86-64 = " libclc gallium-llvm intel amd nouveau svga"
diff --git a/meta/recipes-graphics/mesa/mesa.bb b/meta/recipes-graphics/mesa/mesa.bb
index db5eab5fb2..49e077b20c 100644
--- a/meta/recipes-graphics/mesa/mesa.bb
+++ b/meta/recipes-graphics/mesa/mesa.bb
@@ -6,6 +6,7 @@ PACKAGECONFIG = " \
6 ${@bb.utils.filter('DISTRO_FEATURES', 'x11 vulkan wayland glvnd', d)} \ 6 ${@bb.utils.filter('DISTRO_FEATURES', 'x11 vulkan wayland glvnd', d)} \
7 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm virgl', '', d)} \ 7 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm virgl', '', d)} \
8 ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'zink', '', d)} \ 8 ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'zink', '', d)} \
9 xmlconfig \
9" 10"
10 11
11PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd nouveau svga" 12PACKAGECONFIG:append:x86 = " libclc gallium-llvm intel amd nouveau svga"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 81b099bf6e..4b1c11be55 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -115,6 +115,7 @@ TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurse
115PACKAGECONFIG[freedreno-fdperf] = ",,libconfig" 115PACKAGECONFIG[freedreno-fdperf] = ",,libconfig"
116 116
117PACKAGECONFIG[tools] = "-Dtools=${@strip_comma('${TOOLS}')}, -Dtools='', ${TOOLS_DEPS}" 117PACKAGECONFIG[tools] = "-Dtools=${@strip_comma('${TOOLS}')}, -Dtools='', ${TOOLS_DEPS}"
118PACKAGECONFIG[xmlconfig] = "-Dxmlconfig=enabled, -Dxmlconfig=disabled, expat"
118 119
119PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" 120PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
120PACKAGECONFIG[glvnd] = "-Dglvnd=enabled, -Dglvnd=disabled, libglvnd" 121PACKAGECONFIG[glvnd] = "-Dglvnd=enabled, -Dglvnd=disabled, libglvnd"