emgd-driver-bin: add missing GLchar typedef to gl2.h

GLES2/gl2.h is missing the GLchar typedef, so at least gstreamer1.0-plugins-bad
fails to compile.  Khronos say the typedef should be there so patch it in.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>

2 files changed, 20 insertions, 0 deletions

diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin/glchar.patch b/common/recipes-graphics/xorg-driver/emgd-driver-bin/glchar.patch
new file mode 100644
index 00000000..2781ec96
--- /dev/null
+++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin/glchar.patch
@@ -0,0 +1,17 @@
+EMGD's gl2.h is missing the GLchar typedef, so add it.
+
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+diff --git a/usr/include/GLES2/gl2.h b/usr/include/GLES2/gl2.h
+index 8b83f3f..4fbd12e 100644
+--- a/usr/include/GLES2/gl2.h
++++ b/usr/include/GLES2/gl2.h
+@@ -21,6 +21,7 @@ typedef unsigned int    GLenum;
+ typedef unsigned char   GLboolean;
+ typedef unsigned int    GLbitfield;
+ typedef khronos_int8_t   GLbyte;
++typedef char            GLchar;
+ typedef short           GLshort;
+ typedef int             GLint;
+ typedef int             GLsizei;
diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb
index b3bf0d2c..62c3418c 100644
--- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb
+++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb
@@ -41,6 +41,7 @@ SRC_URI = "http://downloadmirror.intel.com/22865/eng/LIN_IEMGD_1_18_GOLD_3398.tg
            file://egl.pc \
            file://gles_cm.pc \
            file://glesv2.pc \
+           file://glchar.patch;apply=0 \
           "
 
 SRC_URI[md5sum] = "a165c397866d3fb70ddab318c834e49a"
@@ -127,6 +128,8 @@ do_install () {
     # Khronos development headers needed for EGL, OpenGL-ES, and OpenVG development
     ${RPM2CPIO} ${S}/emgd-devel*.rpm | cpio -id
 
+    patch -d ${S} -p1 < ${WORKDIR}/glchar.patch
+
     install -d -m 0755                                    ${D}${includedir}/EGL
     install -m 0755 ${S}/usr/include/EGL/*.h              ${D}${includedir}/EGL/
     install -d -m 0755                                    ${D}${includedir}/GLES