diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2017-08-10 11:37:55 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 12:35:58 +0100 |
| commit | 4473c9e846826bfb4f48cec9c6c7b1cad6666bb3 (patch) | |
| tree | 4a6cb0aff83d702c65e7e713eac278c30b9e2cbd /meta/recipes-graphics/mesa/files | |
| parent | b708cb53b46d9d82a7853bcd0f25ef6bc417bd10 (diff) | |
| download | openembedded-core-contrib-4473c9e846826bfb4f48cec9c6c7b1cad6666bb3.tar.gz | |
mesa: update to 17.1.6
Optional installation of khrplatform.h was implemented upstream by a slightly
different approach -> 0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch
can be removed.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch b/meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch deleted file mode 100644 index be61e2edfe..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 922cb47a5b950ee5545a7a3cb4cd9a88a8b15054 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed, 12 Jul 2017 12:21:29 +0300 -Subject: [PATCH] mapi: Only install khrplatform.h with EGL or GLES - -When mesa is built with "--disable-egl --disable-gles1 ---disable-gles2" the KHR platform headers are not needed. - -Not installing the header when not needed allows using mesa for GL -and another implementation for GLES+EGL (as is done in practice with -userland on raspberrypi). - -Upstream-Status: Pending [waiting for test results before sending] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - src/mapi/Makefile.am | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am -index 9ff70a14fd..94c77fb82c 100644 ---- a/src/mapi/Makefile.am -+++ b/src/mapi/Makefile.am -@@ -188,6 +188,8 @@ es1api_libGLESv1_CM_la_LDFLAGS = \ - $(LD_NO_UNDEFINED) - - es1api_libGLESv1_CM_la_LIBADD += shared-glapi/libglapi.la -+ -+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h - endif - - es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) -@@ -233,6 +235,12 @@ es2api_libGLESv2_la_LDFLAGS = \ - $(LD_NO_UNDEFINED) - - es2api_libGLESv2_la_LIBADD += shared-glapi/libglapi.la -+ -+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h -+endif -+ -+if HAVE_EGL -+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h - endif - - es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) -@@ -243,4 +251,3 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) - include $(top_srcdir)/install-lib-links.mk - - khrdir = $(includedir)/KHR --khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h --- -2.13.2 - |