Merge "Support QEMU build on Poky > 1.7 (weston, gallium-egl)"

diff --git a/meta-agl-bsp/recipes-graphics/mesa/mesa_10.%.bbappend b/meta-agl-bsp/recipes-graphics/mesa/mesa_10.%.bbappend
index 2561585..fca193e 100644 (file)
--- a/meta-agl-bsp/recipes-graphics/mesa/mesa_10.%.bbappend
+++ b/meta-agl-bsp/recipes-graphics/mesa/mesa_10.%.bbappend
@@ -1 +1,4 @@
+# provide "libegl-gallium" if it does not exist (poky > 1.7)
+RPROVIDES_${PN}_append = "libegl-gallium"
+
 PACKAGECONFIG_append = " gallium gallium-egl gallium-llvm"

diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston_1.5.0.bbappend b/meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend
similarity index 87%
rename from meta-agl-bsp/recipes-graphics/wayland/weston_1.5.0.bbappend
rename to meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend
index ce963ea..a527fcf 100644 (file)
--- a/meta-agl-bsp/recipes-graphics/wayland/weston_1.5.0.bbappend
+++ b/meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend
@@ -1,4 +1,4 @@
-RDEPENDS_${PN}_append = " libegl-gallium llvm3.3 "
+RRECOMMENDS_${PN}_append = " libegl-gallium llvm3.3 "
 
 EXTRA_OECONF_append_vexpressa9 = "\
     --enable-simple-egl-clients  \