mesa: switch mesa to swrast renderer for mx8mm machine, resolve build issue

After mesa update to 19.1.0, the OSMesa is not anymore explicitly set to
'classic' rather than defaults to 'none'. If the DRI driver is included
in the build and neither gl nor 'classic' osmesa is used - this causes
the build to fail.

This commit disables the gallium for mx8mm, sets the dri drivers to
swrast and explicitly defines the 'classic' osmesa to be built.

gallium is disabled since current support state of i.MX8M Mini GPU in
gallium is unknown.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>

diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index 9f183db9265e80a0823cb6cd92ed137271f3371e..629603b32921595e10dfed32ea95a8b0e8e46070 100644 (file)
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -19,6 +19,19 @@ PACKAGECONFIG_append_use-mainline-bsp = " gallium"
 GALLIUMDRIVERS_append_use-mainline-bsp_armv7a = ",etnaviv,kmsro,vc4"
 GALLIUMDRIVERS_append_use-mainline-bsp_armv7ve = ",etnaviv,kmsro,vc4"
 
+# Define the osmesa block in PACKAGECONFIG for target, this block is
+# not defined in the master recipe, effectively causing the osmesa
+# feature to be disabled and -Dosmesa=none set.
+PACKAGECONFIG_append_mx8mm = " osmesa"
+
+# Solve 'Problem encountered: OSMesa classic requires dri (classic) swrast.'
+# by defining the dri swrast for mx8mm machine
+DRIDRIVERS_append_mx8mm = "swrast"
+
+# Solve 'ERROR: Problem encountered: Only one swrast provider can be built'
+# by excluding gallium support, dri is used together with 'classic' mesa backend.
+PACKAGECONFIG_remove_mx8mm = "gallium"
+
 BACKEND = \
     "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
         bb.utils.contains('DISTRO_FEATURES',     'x11',     'x11', \