diff options
| author |   Ronan <ronan.lemartret@iot.bzh> | 2017-01-09 11:49:14 +0100 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-01-10 19:41:44 +0000 |
| commit | cdf51bba328e285d5c2871e2f81728c0bd0521a5 (patch) | |
| tree | 5cba9df770b7f767fa46bed526748b6cbce6dd2e | |
| parent | f33718a8d0be1e39ce2b3f6a527aa805ccd8df22 (diff) | |
fix mesa version for yocto morty
Change-Id: I6ef9fb754a2d71aff1eae78ffde40c45a86362b5
Signed-off-by: Ronan <ronan.lemartret@iot.bzh>
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa-wayland.inc | 36 | ||||
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa_12.%.bbappend | 7 |
2 files changed, 43 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa-wayland.inc b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa-wayland.inc new file mode 100644 index 000000000..d290c3c73 --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa-wayland.inc @@ -0,0 +1,36 @@ +# FIXME: can not override PACKAGECONFIG. +PACKAGECONFIG[gles] = "--enable-gles1 --disable-gles2" +PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=wayland" + +# Disable the gbm modules of mesa +EXTRA_OECONF_rcar-gen3 := \ + "${@'${EXTRA_OECONF}'.replace('--enable-gbm', '--disable-gbm')}" +# Remove the gbm and egl packages. These are provided in other recipes. +PACKAGES_remove_rcar-gen3 = " \ + libgbm-dev libgbm \ + libegl-mesa-dev libegl-mesa \ + libegl-dev libegl \ + libgles2-mesa libgles2-mesa-dev \ +" +INSTALLED_HEADER = "src/egl/wayland/wayland-egl/wayland-egl-priv.h" + +# Remove the x11 configure +PACKAGECONFIG_rcar-gen3 := "${@'${PACKAGECONFIG}'.replace('x11', '')}" + +do_install_append_rcar-gen3() { + # Remove libegl-mesa modules and headers + rm -f ${D}/${libdir}/libEGL.la + rm -f ${D}/${libdir}/libEGL.so* + rm -f ${D}/${libdir}/pkgconfig/egl.pc + rm -rf ${D}/${includedir}/EGL + rm -rf ${D}/${includedir}/KHR + + # install required header for wayland + install -d ${D}/usr/include + install -m 644 ${S}/${INSTALLED_HEADER} ${D}/usr/include/ +} + +FILES_libwayland-egl-dev += " \ + /usr/include \ + /usr/include/*.h \ +" diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa_12.%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa_12.%.bbappend new file mode 100644 index 000000000..cb00a309e --- /dev/null +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa_12.%.bbappend @@ -0,0 +1,7 @@ +require include/gles-control.inc + +include mesa-wayland.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "${@base_conditional('USE_GLES_WAYLAND', '1', \ + 'file://0001-Mesa-include-the-stat.h-for-fixing-compile-errors.patch', '', d)}" |