From d3761567f1d11efcacf69a4121b8bb4cded2ee18 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Mon, 21 Sep 2015 11:53:04 +0200 Subject: [PATCH] Support QEMU build on Poky > 1.7 (weston, gallium-egl) Allow to build newer versions of Weston. "gallium-egl" disappeared from Poky > 1.7 (because it disappeared from upstream Mesa, too). Still try to detect and build it if it exists, but do not fail otherwise. Change-Id: I01c3988e2da6a4fe66a80e5a5b1262cc6c1da727 Signed-off-by: Manuel Bachmann --- meta-agl-bsp/recipes-graphics/mesa/mesa_10.%.bbappend | 3 +++ .../wayland/{weston_1.5.0.bbappend => weston_%.bbappend} | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) rename meta-agl-bsp/recipes-graphics/wayland/{weston_1.5.0.bbappend => weston_%.bbappend} (87%) 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 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 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 \ -- 2.16.6