From 786e5c9e56514785b711db775066cbd2f8c787d8 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Wed, 25 May 2022 14:24:55 +0200
Subject: [PATCH] kirkstone migration: fix mesa build on ccmp15-dvk

An outdated 'mesa' bbappend on meta-st-stm32mp is making mesa package
fail to build, due to incorrect configure options.

mesa-22.0.0/meson.build:614:2: ERROR: Problem encountered: kmsro requires dri3 for X11 support

Override the build configuration in our layer until the bbappend gets
fixed in ST layer.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../recipes-graphics/mesa/mesa_%.bbappend       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/mesa/mesa_%.bbappend

diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/mesa/mesa_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/mesa/mesa_%.bbappend
new file mode 100644
index 000000000..090fc0827
--- /dev/null
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/mesa/mesa_%.bbappend
@@ -0,0 +1,17 @@
+# Copyright (C) 2022 Digi International.
+
+#
+# The bbappend in 'meta-st-stm32mp' layer misconfigured the PACKAGECONFIG
+# options of the mesa package, leading to a build failure. This bbappends
+# overrides the build configuration.
+#
+# @TODO: remove once the bbappend in 'meta-st-stm32mp' is fixed.
+#
+PACKAGECONFIG:ccmp15 = " \
+	gallium \
+	${@bb.utils.filter('DISTRO_FEATURES', 'x11 vulkan wayland', d)} \
+	${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm virgl', '', d)} \
+	${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'dri3', '', d)} \
+	${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
+	${@bb.utils.contains('TCLIBC', 'glibc', 'elf-tls', '', d)} \
+"