aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2015-09-24 16:55:20 +0000
committerGerrit Code Review <gerrit@172.30.200.200>2015-09-24 16:55:20 +0000
commitf2e092a90866a8ad3c62bcdeb57c33a5dc508faf (patch)
treed286eacbdcc530120a7d6cb6f9eb17180eabee1b
parent9e2504767a46bac8c92b9d438c66e7cadd1f17ec (diff)
parentd3761567f1d11efcacf69a4121b8bb4cded2ee18 (diff)
Merge "Support QEMU build on Poky > 1.7 (weston, gallium-egl)"
-rw-r--r--meta-agl-bsp/recipes-graphics/mesa/mesa_10.%.bbappend3
-rw-r--r--meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend (renamed from meta-agl-bsp/recipes-graphics/wayland/weston_1.5.0.bbappend)2
2 files changed, 4 insertions, 1 deletions
diff --git a/meta-agl-bsp/recipes-graphics/mesa/mesa_10.%.bbappend b/meta-agl-bsp/recipes-graphics/mesa/mesa_10.%.bbappend
index 25615856b..fca193e36 100644
--- 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
index ce963ea50..a527fcf7e 100644
--- 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 \