summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/files
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-07-12 15:11:43 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:38 +0100
commitca666db8ed4b6a380982879fc874041417f0ff65 (patch)
tree63ed7c02b908796bcb94a78f5aa742d3c54afb99 /meta/recipes-graphics/mesa/files
parentdf4d8e3cd3fba7f5742be80592240fc6d7c96763 (diff)
downloadpoky-ca666db8ed4b6a380982879fc874041417f0ff65.tar.gz
mesa: Avoid installing khrplatfrom.h when not needed
Fix the conflict between mesa and userland (when former is used to provide GL and letter used to provide EGL+GLES) by not installing khrplatform.h header when its not needed. (From OE-Core rev: 6a079bf5a446c2e98e7444e04dfadaff96342b4f) 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-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch52
1 files changed, 52 insertions, 0 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
new file mode 100644
index 0000000000..be61e2edfe
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-mapi-Only-install-khrplatform.h-with-EGL-or-GLES.patch
@@ -0,0 +1,52 @@
1From 922cb47a5b950ee5545a7a3cb4cd9a88a8b15054 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 12 Jul 2017 12:21:29 +0300
4Subject: [PATCH] mapi: Only install khrplatform.h with EGL or GLES
5
6When mesa is built with "--disable-egl --disable-gles1
7--disable-gles2" the KHR platform headers are not needed.
8
9Not installing the header when not needed allows using mesa for GL
10and another implementation for GLES+EGL (as is done in practice with
11userland on raspberrypi).
12
13Upstream-Status: Pending [waiting for test results before sending]
14Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
15---
16 src/mapi/Makefile.am | 9 ++++++++-
17 1 file changed, 8 insertions(+), 1 deletion(-)
18
19diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
20index 9ff70a14fd..94c77fb82c 100644
21--- a/src/mapi/Makefile.am
22+++ b/src/mapi/Makefile.am
23@@ -188,6 +188,8 @@ es1api_libGLESv1_CM_la_LDFLAGS = \
24 $(LD_NO_UNDEFINED)
25
26 es1api_libGLESv1_CM_la_LIBADD += shared-glapi/libglapi.la
27+
28+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
29 endif
30
31 es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
32@@ -233,6 +235,12 @@ es2api_libGLESv2_la_LDFLAGS = \
33 $(LD_NO_UNDEFINED)
34
35 es2api_libGLESv2_la_LIBADD += shared-glapi/libglapi.la
36+
37+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
38+endif
39+
40+if HAVE_EGL
41+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
42 endif
43
44 es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
45@@ -243,4 +251,3 @@ es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
46 include $(top_srcdir)/install-lib-links.mk
47
48 khrdir = $(includedir)/KHR
49-khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
50--
512.13.2
52