summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2017-06-01 12:29:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-03 23:46:07 +0100
commit25bd6c19ce7031d62b973d306a23f5c55bc3ad5d (patch)
tree9b8e0bc985db8bdb42a6bf9936cbeac23180613d
parent6ef29897a86f3376ef9a0a7f74a4b13b97ce2144 (diff)
downloadpoky-25bd6c19ce7031d62b973d306a23f5c55bc3ad5d.tar.gz
mesa: upgrade to 17.1.1
* Costmetic changes in license.html file required new MD5 hash * Add PACKAGECONFIG option for libunwind support (new feature, disable by default) * Rebased 0001-Use-wayland-scanner-in-the-path.patch * Added zlib in DEPENDS, otherwise mesa no longer builds. * Added 0001-util-rand_xor-add-missing-include-statements.patch, sent upstream (From OE-Core rev: fa08267f1399904fed079277bc86ac1aa26c06dc) Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch12
-rw-r--r--meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch35
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb)0
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc6
-rw-r--r--meta/recipes-graphics/mesa/mesa_17.1.1.bb (renamed from meta/recipes-graphics/mesa/mesa_17.0.6.bb)5
5 files changed, 48 insertions, 10 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
index e49695bf85..eb6ff4ff04 100644
--- a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
+++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
@@ -1,4 +1,4 @@
1From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 1From c908f0c13ac81a3a52140f129a13b2bc997ff4ee Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 15 Nov 2016 15:20:49 +0200 3Date: Tue, 15 Nov 2016 15:20:49 +0200
4Subject: [PATCH] Simplify wayland-scanner lookup 4Subject: [PATCH] Simplify wayland-scanner lookup
@@ -15,23 +15,23 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
15 1 file changed, 1 insertion(+), 6 deletions(-) 15 1 file changed, 1 insertion(+), 6 deletions(-)
16 16
17diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
18index e56e35a..a92005a 100644 18index 2c7e636fac..d2b2350739 100644
19--- a/configure.ac 19--- a/configure.ac
20+++ b/configure.ac 20+++ b/configure.ac
21@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then 21@@ -2174,12 +2174,7 @@ if test "x$with_platforms" != xauto; then
22 AC_MSG_ERROR([cannot build egl state tracker without EGL library]) 22 with_egl_platforms=$with_platforms
23 fi 23 fi
24 24
25-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], 25-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
26- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, 26- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
27- WAYLAND_SCANNER='') 27- WAYLAND_SCANNER='')
28-if test "x$WAYLAND_SCANNER" = x; then 28-if test "x$WAYLAND_SCANNER" = x; then
29- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) 29- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
30-fi 30-fi
31+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) 31+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
32 32
33 # Do per-EGL platform setups and checks 33 # Do per-EGL platform setups and checks
34 egl_platforms=`IFS=', '; echo $with_egl_platforms` 34 egl_platforms=`IFS=', '; echo $with_egl_platforms`
35-- 35--
362.1.4 362.13.0
37 37
diff --git a/meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch b/meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch
new file mode 100644
index 0000000000..ffe8b96163
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-util-rand_xor-add-missing-include-statements.patch
@@ -0,0 +1,35 @@
1From a8a1081ec05634e667d6670ab7c128d536cc60a9 Mon Sep 17 00:00:00 2001
2From: Nicolas Dechesne <nicolas.dechesne@linaro.org>
3Date: Thu, 1 Jun 2017 11:59:42 +0200
4Subject: [PATCH] util/rand_xor: add missing include statements
5
6Fixes for:
7
8src/util/rand_xor.c:60:13: error: implicit declaration of function 'open' [-Werror=implicit-function-declaration]
9 int fd = open("/dev/urandom", O_RDONLY);
10 ^~~~
11src/util/rand_xor.c:60:34: error: 'O_RDONLY' undeclared (first use in this function)
12 int fd = open("/dev/urandom", O_RDONLY);
13 ^~~~~~~~
14
15Upstream-Status: Submitted [ https://lists.freedesktop.org/archives/mesa-dev/2017-June/157542.html ]
16Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
17---
18 src/util/rand_xor.c | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c
22index de05fa64b3..de04bbc284 100644
23--- a/src/util/rand_xor.c
24+++ b/src/util/rand_xor.c
25@@ -25,6 +25,7 @@
26 #if defined(__linux__)
27 #include <sys/file.h>
28 #include <unistd.h>
29+#include <fcntl.h>
30 #else
31 #include <time.h>
32 #endif
33--
342.13.0
35
diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb b/meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb
index e3604f30bb..e3604f30bb 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_17.0.6.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_17.1.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 447fd6d0df..67039a9962 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -10,11 +10,11 @@ HOMEPAGE = "http://mesa3d.org"
10BUGTRACKER = "https://bugs.freedesktop.org" 10BUGTRACKER = "https://bugs.freedesktop.org"
11SECTION = "x11" 11SECTION = "x11"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d5" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4"
14 14
15PE = "2" 15PE = "2"
16 16
17DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native" 17DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib"
18 18
19PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" 19PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa"
20 20
@@ -74,6 +74,8 @@ PACKAGECONFIG[xa] = "--enable-xa, --disable-xa"
74OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}" 74OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}"
75PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}" 75PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}"
76 76
77PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
78
77# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) 79# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
78FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" 80FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
79 81
diff --git a/meta/recipes-graphics/mesa/mesa_17.0.6.bb b/meta/recipes-graphics/mesa/mesa_17.1.1.bb
index 3f98271f21..060a279015 100644
--- a/meta/recipes-graphics/mesa/mesa_17.0.6.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.1.1.bb
@@ -4,10 +4,11 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \
4 file://replace_glibc_check_with_linux.patch \ 4 file://replace_glibc_check_with_linux.patch \
5 file://disable-asm-on-non-gcc.patch \ 5 file://disable-asm-on-non-gcc.patch \
6 file://0001-Use-wayland-scanner-in-the-path.patch \ 6 file://0001-Use-wayland-scanner-in-the-path.patch \
7 file://0001-util-rand_xor-add-missing-include-statements.patch \
7" 8"
8 9
9SRC_URI[md5sum] = "77ea38dc0ab899864b06ea2941ac31a4" 10SRC_URI[md5sum] = "a4844bc6052578574f9629458bcbb749"
10SRC_URI[sha256sum] = "89ecf3bcd0f18dcca5aaa42bf36bb52a2df33be89889f94aaaad91f7a504a69d" 11SRC_URI[sha256sum] = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef"
11 12
12#because we cannot rely on the fact that all apps will use pkgconfig, 13#because we cannot rely on the fact that all apps will use pkgconfig,
13#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 14#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER