From 207b25ecf12e60f60014c0e80fb3252313557ab3 Mon Sep 17 00:00:00 2001 From: Nicolas Aguirre Date: Tue, 16 Jun 2015 23:36:45 +0200 Subject: [PATCH] Fix various error in GLES includes while building EFL 1.14 --- ...KHR-EGLTimeKHR-and-GLChar-definition.patch | 47 +++++++++++++++++++ recipes-graphics/libgles/sunxi-mali_git.bb | 3 +- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 recipes-graphics/libgles/sunxi-mali/0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch diff --git a/recipes-graphics/libgles/sunxi-mali/0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch b/recipes-graphics/libgles/sunxi-mali/0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch new file mode 100644 index 0000000..92cb2c1 --- /dev/null +++ b/recipes-graphics/libgles/sunxi-mali/0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch @@ -0,0 +1,47 @@ +From fcdde5440976bb2c204789e13313c4d77cb263b7 Mon Sep 17 00:00:00 2001 +From: Nicolas Aguirre +Date: Tue, 16 Jun 2015 23:06:29 +0200 +Subject: [PATCH] Add EGLSyncKHR EGLTimeKHR and GLChar definition + +--- + include/EGL/eglext.h | 4 +++- + include/GLES2/gl2.h | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h +index 25cfcb8..ec482d8 100644 +--- a/include/EGL/eglext.h ++++ b/include/EGL/eglext.h +@@ -36,7 +36,6 @@ extern "C" { + /* Current version at http://www.khronos.org/registry/egl/ */ + /* $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $ */ + #define EGL_EGLEXT_VERSION 3 +- + #ifndef EGL_KHR_config_attribs + #define EGL_KHR_config_attribs 1 + #define EGL_CONFORMANT_KHR 0x3042 /* EGLConfig attribute */ +@@ -44,6 +43,9 @@ extern "C" { + #define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR 0x0040 /* EGL_SURFACE_TYPE bitfield */ + #endif + ++typedef void *EGLSyncKHR; ++typedef uint64_t EGLTimeKHR; ++ + #ifndef EGL_KHR_lock_surface + #define EGL_KHR_lock_surface 1 + #define EGL_READ_SURFACE_BIT_KHR 0x0001 /* EGL_LOCK_USAGE_HINT_KHR bitfield */ +diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h +index 59e376c..90d96bb 100644 +--- a/include/GLES2/gl2.h ++++ b/include/GLES2/gl2.h +@@ -32,6 +32,7 @@ typedef unsigned int GLuint; + typedef khronos_float_t GLfloat; + typedef khronos_float_t GLclampf; + typedef khronos_int32_t GLfixed; ++typedef char GLchar; + + /* GL types for handling large vertex buffer objects */ + typedef khronos_intptr_t GLintptr; +-- +1.9.1 + diff --git a/recipes-graphics/libgles/sunxi-mali_git.bb b/recipes-graphics/libgles/sunxi-mali_git.bb index b82ddf6..c1f0ea7 100644 --- a/recipes-graphics/libgles/sunxi-mali_git.bb +++ b/recipes-graphics/libgles/sunxi-mali_git.bb @@ -15,7 +15,8 @@ inherit distro_features_check REQUIRED_DISTRO_FEATURES = "opengl" SRCREV_pn-${PN} = "d343311efc8db166d8371b28494f0f27b6a58724" -SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git" +SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git \ + file://0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch" S = "${WORKDIR}/git"