aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vadim Kochan <vadim4j@gmail.com>2019-03-07 01:14:29 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-03-19 20:21:50 +0100
commit97634f4ef37d72a0edcacc2008cb8bce70d68c2e (patch)
tree97fca470afcfb1735901b0803d6234af93706579
parente1dfd05e05dba6da20571893994d4bd7271e598e (diff)
downloadbuildroot-97634f4ef37d72a0edcacc2008cb8bce70d68c2e.tar.gz
buildroot-97634f4ef37d72a0edcacc2008cb8bce70d68c2e.tar.bz2
package/efl: fix build with mesa
efl does not compile with mesa without OpenGL ES because it checks for GL_ES_VERSION_2_0 and declares own GLintptr and GLsizeiptr types if such version is not defined, but mesa declares them too for OpenGL version 1.5, so fix it by add check also for OpenGL 1.5 where these types are defined. Use patch from: https://git.enlightenment.org/core/efl.git/commit/?id=0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573 Fixes: http://autobuild.buildroot.net/results/62ca120f1e54e8c3ae445f98b2624b526569f007 Signed-off-by: Vadim Kochan <vadim4j@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> (cherry picked from commit 579dfd94990449be719529f8b4c0589ddd060498) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 3cd71635f7f47d2ee12df0ffed754f373ac4dbd1) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch b/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch
new file mode 100644
index 0000000000..b64a200ffb
--- /dev/null
+++ b/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch
@@ -0,0 +1,34 @@
+From d045dd99acdd47be238642d4f9384dccacde2b42 Mon Sep 17 00:00:00 2001
+From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
+Date: Sat, 15 Dec 2018 16:19:01 +0000
+Subject: [PATCH] evas gl - make GLintptr etc. also ndefed for GL_VERSION_1_5
+ fix typedef
+
+It seems that GL_VERSION_1_5 define == these provided by gl already. At
+least reading the mesa headers I do, so this should fix T7502
+
+Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
+---
+ src/lib/evas/Evas_GL.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
+index fa3e6f4..5524d82 100644
+--- a/src/lib/evas/Evas_GL.h
++++ b/src/lib/evas/Evas_GL.h
+@@ -4272,9 +4272,11 @@ typedef signed int GLfixed; // Changed khronos_int32_t
+
+ #ifndef GL_ES_VERSION_2_0
+ /* GL types for handling large vertex buffer objects */
+-#include <stddef.h>
++# ifndef GL_VERSION_1_5
++# include <stddef.h>
+ typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t
+ typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t
++# endif
+ #endif
+
+ /* Some definitions from GLES 3.0.
+--
+2.14.1
+