summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-rcar-gen2/recipes-graphics/mesa/mesa-wayland.inc15
-rw-r--r--meta-rcar-gen2/recipes-graphics/mesa/mesa_10.6.3/0001-dri2-wayland-fixup-gcc5-build.patch28
2 files changed, 41 insertions, 2 deletions
diff --git a/meta-rcar-gen2/recipes-graphics/mesa/mesa-wayland.inc b/meta-rcar-gen2/recipes-graphics/mesa/mesa-wayland.inc
index a69d7d6..e9b4459 100644
--- a/meta-rcar-gen2/recipes-graphics/mesa/mesa-wayland.inc
+++ b/meta-rcar-gen2/recipes-graphics/mesa/mesa-wayland.inc
@@ -2,8 +2,19 @@
PACKAGECONFIG[gles] = "--enable-gles1 --disable-gles2"
PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=wayland"
-FILESEXTRAPATHS_append := ":${THISDIR}/mesa_10.1.3/"
-SRC_URI += "file://0001-egl_dri2-fix-wayland_platform-when-drm_platform-is-n.patch"
+python do_srcrev_check() {
+ if d.getVar('SRCREV') == 'INVALID':
+ d.setVar('SRCREV', '"%s"' % d.getVarFlags('SRC_URI')['md5sum'])
+}
+do_patch[prefuncs] += "do_srcrev_check"
+
+# mesa v10.1.3 == ba6dbe2b9cab0b4de840c996b9b6a3ad
+# mesa v10.6.3 == 553e525d2f20ed48fca8f1ec3176fd83
+FILESEXTRAPATHS_append := ":${THISDIR}/mesa_10.1.3/:${THISDIR}/mesa_10.6.3/"
+SRC_URI += " \
+ file://0001-egl_dri2-fix-wayland_platform-when-drm_platform-is-n.patch;rev="ba6dbe2b9cab0b4de840c996b9b6a3ad" \
+ file://0001-dri2-wayland-fixup-gcc5-build.patch;rev="553e525d2f20ed48fca8f1ec3176fd83" \
+"
# Disable the gbm modules of mesa
EXTRA_OECONF_rcar-gen2 := "${@'${EXTRA_OECONF}'.replace('--enable-gbm', '--disable-gbm')}"
diff --git a/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.6.3/0001-dri2-wayland-fixup-gcc5-build.patch b/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.6.3/0001-dri2-wayland-fixup-gcc5-build.patch
new file mode 100644
index 0000000..7e29bb1
--- /dev/null
+++ b/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.6.3/0001-dri2-wayland-fixup-gcc5-build.patch
@@ -0,0 +1,28 @@
+From c219bad8412666983867d5144a4b552acaf5d827 Mon Sep 17 00:00:00 2001
+From: Yannick Gicquel <yannick.gicquel@iot.bzh>
+Date: Wed, 6 Jan 2016 14:04:23 +0100
+Subject: [PATCH] dri2: wayland: fixup gcc5 build
+
+Some standards headers were missing for fstat() syscall.
+
+Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh>
+---
+ src/egl/drivers/dri2/platform_wayland.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
+index 9914b68..f12a70a 100644
+--- a/src/egl/drivers/dri2/platform_wayland.c
++++ b/src/egl/drivers/dri2/platform_wayland.c
+@@ -36,6 +36,8 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <xf86drm.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/mman.h>
+
+ #include "egl_dri2.h"
+--
+1.9.1
+