From d8403d109b32eb79b408929e5c1c31c42aa54626 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@theqtcompany.com>
Date: Mon, 10 Nov 2014 10:18:57 +0200
Subject: [PATCH] imx53qsb: glTexImage2D has incorrect function declaration
glTexImage2D function declared in amd-gpu-bin-mx51 package (gl.h) has
incorrect parameter types, which cases Qt5 build to fail.
Change-Id: Ib45a4d9c1f94a0e2213488e8f447eb443feb05d3
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
.../0001-fix-glTexImage2D-API.patch | 26 +++++++++++++++++++
.../amd-gpu-bin-mx51_11.09.01.bbappend} | 6 +++--
2 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch
rename meta-fsl-extras/recipes/{amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend => amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend} (84%)
diff --git a/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch
new file mode 100644
index 00000000..0a3cd769
--- /dev/null
+++ b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51/0001-fix-glTexImage2D-API.patch
@@ -0,0 +1,26 @@
+From ec1c2b5f637145e2a473820401ab96ecf0f16def Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Mon, 8 Sep 2014 10:23:46 +0300
+Subject: [PATCH] fix glTexImage2D API
+
+internalformat should be GLint and not GLenum.
+---
+ usr/include/GLES2/gl2.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/include/GLES2/gl2.h b/usr/include/GLES2/gl2.h
+index c0e3a44..5aa6c26 100755
+--- a/usr/include/GLES2/gl2.h
++++ b/usr/include/GLES2/gl2.h
+@@ -579,7 +579,7 @@ GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask);
+ GL_APICALL void GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+ GL_APICALL void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+ GL_APICALL void GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
+-GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels);
++GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
+ GL_APICALL void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
+ GL_APICALL void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);
+ GL_APICALL void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
+--
+1.8.3.2
+
diff --git a/meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend
similarity index 84%
rename from meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
rename to meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend
index 40075c0a..23480a88 100644
--- a/meta-fsl-extras/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
+++ b/meta-fsl-extras/recipes/amd-gpu-bin-mx51/amd-gpu-bin-mx51_11.09.01.bbappend
@@ -20,5 +20,7 @@
##
#############################################################################
-# dependency to x11 only when distro features have it
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+ file://0001-fix-glTexImage2D-API.patch \
+ "
--
GitLab