[OE-core] [PATCH 1/2] mesa: Make gl libraries RRECOMMEND mesa-megadriver

[Jussi Kukkonen]

This makes e.g. core-image-weston actually work out-of-the-box
on hardware that uses megadriver drivers.

With typical mesa-gl use this would be unexpected: skip the
recommendation there.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen at intel.com>
---
 meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb | 3 +++
 meta/recipes-graphics/mesa/mesa.inc          | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
index fc2bca9..d55f56e 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
@@ -11,3 +11,6 @@ S = "${WORKDIR}/mesa-${PV}"
 PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 
 EXCLUDE_FROM_WORLD = "1"
+
+# GL libraries should not RRECOMMEND megadriver
+SKIP_RRECOMMENDS_MEGADRIVER = "1"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 13a8b9d..3400b1c 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -114,7 +114,10 @@ python __anonymous() {
         d.appendVar("RREPLACES_" + fullp, pkgs)
         d.appendVar("RPROVIDES_" + fullp, pkgs)
         d.appendVar("RCONFLICTS_" + fullp, pkgs)
-        
+
+        if d.getVar("SKIP_RRECOMMENDS_MEGADRIVER", False) != "1":
+            d.appendVar("RRECOMMENDS_" + fullp, "mesa-megadriver")
+
         # For -dev, the first element is both the Debian and original name
         fullp += "-dev"
         pkgs = p[1] + "-dev"
-- 
2.1.4