From 113e0174e378a0ece420dc2909e7613f4baaf87e Mon Sep 17 00:00:00 2001 From: Ronan Date: Fri, 13 Jan 2017 10:22:23 +0100 Subject: fix directory name for mesa recipes Change-Id: I3409d1c2e30992ef69d8f6a429a029e7b6c66b3a Signed-off-by: Ronan --- .../recipes-graphics/mesa/mesa-wayland.inc | 2 +- ...tat-s_ISHCR-implict-declaration-build-err.patch | 35 ++++++++++++++++++++++ ...tat-s_ISHCR-implict-declaration-build-err.patch | 35 ---------------------- 3 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 meta-rcar-gen2/recipes-graphics/mesa/mesa/0001-dri2-Fix-fstat-s_ISHCR-implict-declaration-build-err.patch delete mode 100644 meta-rcar-gen2/recipes-graphics/mesa/mesa_10.6.3/0001-dri2-Fix-fstat-s_ISHCR-implict-declaration-build-err.patch (limited to 'meta-rcar-gen2') diff --git a/meta-rcar-gen2/recipes-graphics/mesa/mesa-wayland.inc b/meta-rcar-gen2/recipes-graphics/mesa/mesa-wayland.inc index 572c1a7..be051ca 100644 --- a/meta-rcar-gen2/recipes-graphics/mesa/mesa-wayland.inc +++ b/meta-rcar-gen2/recipes-graphics/mesa/mesa-wayland.inc @@ -2,7 +2,7 @@ PACKAGECONFIG[gles] = "--enable-gles1 --disable-gles2" PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=wayland" -FILESEXTRAPATHS_prepend := "${THISDIR}/mesa_10.6.3/:" +FILESEXTRAPATHS_prepend := "${THISDIR}/mesa/:" SRC_URI += "file://0001-dri2-Fix-fstat-s_ISHCR-implict-declaration-build-err.patch" # Disable the gbm modules of mesa diff --git a/meta-rcar-gen2/recipes-graphics/mesa/mesa/0001-dri2-Fix-fstat-s_ISHCR-implict-declaration-build-err.patch b/meta-rcar-gen2/recipes-graphics/mesa/mesa/0001-dri2-Fix-fstat-s_ISHCR-implict-declaration-build-err.patch new file mode 100644 index 0000000..909e0d0 --- /dev/null +++ b/meta-rcar-gen2/recipes-graphics/mesa/mesa/0001-dri2-Fix-fstat-s_ISHCR-implict-declaration-build-err.patch @@ -0,0 +1,35 @@ +From 2a44bbb7e8604cfb3cb5b04be70e26ad2ecb739e Mon Sep 17 00:00:00 2001 +From: Stephen Lawrence +Date: Thu, 10 Mar 2016 14:58:48 +0000 +Subject: [PATCH] dri2: Fix fstat, s_ISHCR implict declaration build error + +platform_wayland.c in Mesa 10.6.3 can fail to build with +the following build errors: +a/2_10.6.3-r0/mesa-10.6.3/src/egl/drivers/dri2/platform_wayland.c:847:4: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration] +| if (fstat(fd, &render)) +| ^ +/mesa/2_10.6.3-r0/mesa-10.6.3/src/egl/drivers/dri2/platform_wayland.c:850:4: error: implicit declaration of function 'S_ISCHR' [-Werror=implicit-function-declaration] +| if (!S_ISCHR(render.st_mode)) +| ^ +| cc1: some warnings being treated as errors + +Fix the error by including sys/stat.h +--- + src/egl/drivers/dri2/platform_wayland.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c +index 9914b68..131e0ec 100644 +--- a/src/egl/drivers/dri2/platform_wayland.c ++++ b/src/egl/drivers/dri2/platform_wayland.c +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include "egl_dri2.h" + #include "egl_dri2_fallbacks.h" +-- +1.9.1 + diff --git a/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.6.3/0001-dri2-Fix-fstat-s_ISHCR-implict-declaration-build-err.patch b/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.6.3/0001-dri2-Fix-fstat-s_ISHCR-implict-declaration-build-err.patch deleted file mode 100644 index 909e0d0..0000000 --- a/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.6.3/0001-dri2-Fix-fstat-s_ISHCR-implict-declaration-build-err.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2a44bbb7e8604cfb3cb5b04be70e26ad2ecb739e Mon Sep 17 00:00:00 2001 -From: Stephen Lawrence -Date: Thu, 10 Mar 2016 14:58:48 +0000 -Subject: [PATCH] dri2: Fix fstat, s_ISHCR implict declaration build error - -platform_wayland.c in Mesa 10.6.3 can fail to build with -the following build errors: -a/2_10.6.3-r0/mesa-10.6.3/src/egl/drivers/dri2/platform_wayland.c:847:4: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration] -| if (fstat(fd, &render)) -| ^ -/mesa/2_10.6.3-r0/mesa-10.6.3/src/egl/drivers/dri2/platform_wayland.c:850:4: error: implicit declaration of function 'S_ISCHR' [-Werror=implicit-function-declaration] -| if (!S_ISCHR(render.st_mode)) -| ^ -| cc1: some warnings being treated as errors - -Fix the error by including sys/stat.h ---- - src/egl/drivers/dri2/platform_wayland.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c -index 9914b68..131e0ec 100644 ---- a/src/egl/drivers/dri2/platform_wayland.c -+++ b/src/egl/drivers/dri2/platform_wayland.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include "egl_dri2.h" - #include "egl_dri2_fallbacks.h" --- -1.9.1 - -- cgit 1.2.3-korg