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:02:33 +0000 |
| commit | be60ffcbbdcd370f9d367db887d31a8ccc6b2519 (patch) | |
| tree | 95dbb6a3c2a2a2a19b116fc438e7b6c794dfaab7 /meta/recipes-graphics/mesa/files | |
| parent | 1875ea92546d23abcab1b40b562477a0016f712d (diff) | |
| download | openembedded-core-contrib-be60ffcbbdcd370f9d367db887d31a8ccc6b2519.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
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ +From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 15 Nov 2016 15:20:49 +0200 +Subject: [PATCH] Simplify wayland-scanner lookup + +Don't use pkg-config to lookup the path of a binary that's in the path. + +Alternatively we'd have to prefix the path returned by pkg-config with +PKG_CONFIG_SYSROOT_DIR. + +Upstream-Status: Pending +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e56e35a..a92005a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then + AC_MSG_ERROR([cannot build egl state tracker without EGL library]) + fi + +-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, +- WAYLAND_SCANNER='') +-if test "x$WAYLAND_SCANNER" = x; then +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) +-fi ++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) + + # Do per-EGL platform setups and checks + egl_platforms=`IFS=', '; echo $with_egl_platforms` +-- +2.1.4 + 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 Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h -=================================================================== ---- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h -+++ mesa-11.1.1/src/gallium/include/pipe/p_config.h -@@ -130,7 +130,7 @@ - * Endian detection. - */ + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + src/util/u_endian.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/u_endian.h b/src/util/u_endian.h +index b9d563d..2d5eab9 100644 +--- a/src/util/u_endian.h ++++ b/src/util/u_endian.h +@@ -27,7 +27,7 @@ + #ifndef U_ENDIAN_H + #define U_ENDIAN_H --#ifdef __GLIBC__ +-#if defined(__GLIBC__) || defined(ANDROID) +#if defined(__linux__) #include <endian.h> #if __BYTE_ORDER == __LITTLE_ENDIAN +-- +2.1.4 + |