diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-11-17 17:21:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 11:10:16 +0000 |
commit | 354d0bc4a38307a866888df64c9e6d9049560c0f (patch) | |
tree | 4508601de38559ebe544e1bfefdffee626d94f80 /meta/recipes-graphics/mesa/files | |
parent | bfd8c35c3f917e3806c8dfe36c98c70fbccbb3c9 (diff) | |
download | poky-354d0bc4a38307a866888df64c9e6d9049560c0f.tar.gz |
mesa: Upgrade 12.0.3 -> 13.0.1
New major release with OpenGL 4.4 support. Dependency on libudev has
been removed.
* Rebase replace_glibc_check_with_linux.patch
* Add patch to find native wayland-scanner
* Add PACKAGECONFIG[osmesa], disabled by default
* package osmesa header correctly
(From OE-Core rev: be60ffcbbdcd370f9d367db887d31a8ccc6b2519)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch | 37 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch | 25 |
2 files changed, 54 insertions, 8 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 new file mode 100644 index 0000000000..e49695bf85 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 15 Nov 2016 15:20:49 +0200 | ||
4 | Subject: [PATCH] Simplify wayland-scanner lookup | ||
5 | |||
6 | Don't use pkg-config to lookup the path of a binary that's in the path. | ||
7 | |||
8 | Alternatively we'd have to prefix the path returned by pkg-config with | ||
9 | PKG_CONFIG_SYSROOT_DIR. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
13 | --- | ||
14 | configure.ac | 7 +------ | ||
15 | 1 file changed, 1 insertion(+), 6 deletions(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index e56e35a..a92005a 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then | ||
22 | AC_MSG_ERROR([cannot build egl state tracker without EGL library]) | ||
23 | fi | ||
24 | |||
25 | -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], | ||
26 | - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, | ||
27 | - WAYLAND_SCANNER='') | ||
28 | -if test "x$WAYLAND_SCANNER" = x; then | ||
29 | - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) | ||
30 | -fi | ||
31 | +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) | ||
32 | |||
33 | # Do per-EGL platform setups and checks | ||
34 | egl_platforms=`IFS=', '; echo $with_egl_platforms` | ||
35 | -- | ||
36 | 2.1.4 | ||
37 | |||
diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch index e4461ef177..0280ee8599 100644 --- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch +++ b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch | |||
@@ -2,16 +2,25 @@ endianness check is OS wide and not specific to libc | |||
2 | 2 | ||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
4 | Upstream-Status: Pending | 4 | Upstream-Status: Pending |
5 | Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h | 5 | |
6 | =================================================================== | 6 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
7 | --- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h | 7 | --- |
8 | +++ mesa-11.1.1/src/gallium/include/pipe/p_config.h | 8 | src/util/u_endian.h | 2 +- |
9 | @@ -130,7 +130,7 @@ | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
10 | * Endian detection. | 10 | |
11 | */ | 11 | diff --git a/src/util/u_endian.h b/src/util/u_endian.h |
12 | index b9d563d..2d5eab9 100644 | ||
13 | --- a/src/util/u_endian.h | ||
14 | +++ b/src/util/u_endian.h | ||
15 | @@ -27,7 +27,7 @@ | ||
16 | #ifndef U_ENDIAN_H | ||
17 | #define U_ENDIAN_H | ||
12 | 18 | ||
13 | -#ifdef __GLIBC__ | 19 | -#if defined(__GLIBC__) || defined(ANDROID) |
14 | +#if defined(__linux__) | 20 | +#if defined(__linux__) |
15 | #include <endian.h> | 21 | #include <endian.h> |
16 | 22 | ||
17 | #if __BYTE_ORDER == __LITTLE_ENDIAN | 23 | #if __BYTE_ORDER == __LITTLE_ENDIAN |
24 | -- | ||
25 | 2.1.4 | ||
26 | |||