From 37f81333f74286adfe76ea53c2b701b0117e0776 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 30 Mar 2019 08:53:10 +0100 Subject: 20190330.1 global branch merge. Signed-off-by: Matteo Bernardini --- .../0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 libraries/efl/0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573.patch (limited to 'libraries/efl/0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573.patch') diff --git a/libraries/efl/0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573.patch b/libraries/efl/0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573.patch new file mode 100644 index 0000000000..e7cc95aa95 --- /dev/null +++ b/libraries/efl/0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573.patch @@ -0,0 +1,31 @@ +From 0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573 Mon Sep 17 00:00:00 2001 +From: "Carsten Haitzler (Rasterman)" +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 + +@fix +--- + 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 b6b642400f..4f67b1695f 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 ++# ifndef GL_VERSION_1_5 ++# include + typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t + typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t ++# endif + #endif + + /* Some definitions from GLES 3.0. -- cgit v1.2.3