GLES 2 application cannot use gl3.h header files, remove including gl3.h
when OpenGLESv2 is enabled in webkitgtk

Backported from OE-core master.

Signed-off-by: Bhargava Sreekantappa Gayathri 
<bhargava.sreekantappa-gayat...@xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-ma...@xilinx.com>
---
 ...01-Fix-gles3-header-when-gles2-is-enabled.patch | 38 ++++++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.16.6.bb       |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 
meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch

diff --git 
a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
 
b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
new file mode 100644
index 0000000..050a243
--- /dev/null
+++ 
b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
@@ -0,0 +1,38 @@
+From 4db97c245366a33200959d83a7f2f05b7eea694d Mon Sep 17 00:00:00 2001
+From: Bhargava Sreekantappa Gayathri
+ <bhargava.sreekantappa-gayat...@xilinx.com>
+Date: Fri, 23 Feb 2018 16:44:01 -0800
+Subject: [PATCH] Fix gles3 header when gles2 is enabled
+
+A GLES 2 application should not use gl3.h.
+Fix the gles3 header failure while compiling webkitgtk.
+
+FAILED:
+Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/GLContext.cpp.o
+           ^~~~~~~~~~~~~
+compilation terminated.
+
+Upstream-Status: Backport
+Imported patch from: https://bugs.webkit.org/show_bug.cgi?id=183008
+
+Signed-off-by: Bhargava Sreekantappa Gayathri 
<bhargava.sreekantappa-gayat...@xilinx.com>
+Signed-off-by: Manjukumar Matha <manjukumar.harthikote-ma...@xilinx.com>
+---
+ Source/WebCore/platform/graphics/GLContext.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Source/WebCore/platform/graphics/GLContext.cpp 
b/Source/WebCore/platform/graphics/GLContext.cpp
+index 67d60ce..45c85fb 100644
+--- a/Source/WebCore/platform/graphics/GLContext.cpp
++++ b/Source/WebCore/platform/graphics/GLContext.cpp
+@@ -28,7 +28,6 @@
+
+ #if USE(OPENGL_ES_2)
+ #include <GLES2/gl2.h>
+-#include <GLES3/gl3.h>
+ #endif
+
+ #if USE(GLX)
+--
+2.7.4
+
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb 
b/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb
index 0f126cb..7609405 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.16.6.bb
@@ -22,6 +22,7 @@ SRC_URI = 
"http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://gcc7.patch \
            file://detect-atomics-during-configure.patch \
            file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
+           file://0001-Fix-gles3-header-when-gles2-is-enabled.patch \
            "

 SRC_URI[md5sum] = "0e2d142a586e4ff79cf0324f4fdbf20c"
--
2.7.4

This email and any attachments are intended for the sole use of the named 
recipient(s) and contain(s) confidential information that may be proprietary, 
privileged or copyrighted under applicable law. If you are not the intended 
recipient, do not read, copy, or forward this email message or any attachments. 
Delete this email message and any attachments immediately.
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to