From d3761567f1d11efcacf69a4121b8bb4cded2ee18 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Mon, 21 Sep 2015 11:53:04 +0200 Subject: 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 +++ meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend | 14 ++++++++++++++ .../recipes-graphics/wayland/weston_1.5.0.bbappend | 14 -------------- 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend delete mode 100644 meta-agl-bsp/recipes-graphics/wayland/weston_1.5.0.bbappend (limited to 'meta-agl-bsp/recipes-graphics') 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_%.bbappend b/meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend new file mode 100644 index 000000000..a527fcf7e --- /dev/null +++ b/meta-agl-bsp/recipes-graphics/wayland/weston_%.bbappend @@ -0,0 +1,14 @@ +RRECOMMENDS_${PN}_append = " libegl-gallium llvm3.3 " + +EXTRA_OECONF_append_vexpressa9 = "\ + --enable-simple-egl-clients \ + WESTON_NATIVE_BACKEND=fbdev-backend.so \ + " +EXTRA_OECONF_append_qemux86 = "\ + --enable-simple-egl-clients \ + WESTON_NATIVE_BACKEND=fbdev-backend.so \ + " +EXTRA_OECONF_append_qemux86-64 = "\ + --enable-simple-egl-clients \ + WESTON_NATIVE_BACKEND=fbdev-backend.so \ + " diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston_1.5.0.bbappend b/meta-agl-bsp/recipes-graphics/wayland/weston_1.5.0.bbappend deleted file mode 100644 index ce963ea50..000000000 --- a/meta-agl-bsp/recipes-graphics/wayland/weston_1.5.0.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -RDEPENDS_${PN}_append = " libegl-gallium llvm3.3 " - -EXTRA_OECONF_append_vexpressa9 = "\ - --enable-simple-egl-clients \ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ - " -EXTRA_OECONF_append_qemux86 = "\ - --enable-simple-egl-clients \ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ - " -EXTRA_OECONF_append_qemux86-64 = "\ - --enable-simple-egl-clients \ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ - " -- cgit 1.2.3-korg