fix mesa version for yocto morty 55/8155/2
authorRonan <ronan.lemartret@iot.bzh>
Mon, 9 Jan 2017 10:49:14 +0000 (11:49 +0100)
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tue, 10 Jan 2017 19:41:44 +0000 (19:41 +0000)
Change-Id: I6ef9fb754a2d71aff1eae78ffde40c45a86362b5
Signed-off-by: Ronan <ronan.lemartret@iot.bzh>
meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa-wayland.inc [new file with mode: 0644]
meta-agl-bsp/meta-rcar-gen3/recipes-graphics/mesa/mesa_12.%.bbappend [new file with mode: 0644]

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 (file)
index 0000000..d290c3c
--- /dev/null
@@ -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 (file)
index 0000000..cb00a30
--- /dev/null
@@ -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)}"