summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorBhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com>2018-02-27 16:17:59 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 11:35:41 +0000
commit8b8445461a72d0d3bafb33470c116cbd4a8c35c8 (patch)
treeda9b174820c671c1b4cbf2eb2faafb668bc80752 /meta/recipes-sato/webkit
parentbc326572ee322f2fe1847ebffce6d3e8e1c8f923 (diff)
downloadpoky-8b8445461a72d0d3bafb33470c116cbd4a8c35c8.tar.gz
webkitgtk_2.16.6.bb: Remove gl3.h header reference
GLES 2 application cannot use gl3.h header files, remove including gl3.h when OpenGLESv2 is enabled in webkitgtk (From OE-Core rev: 23d6bd1a3b97db624eac4ad6650a1e4298ade7a2) Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch38
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.18.6.bb1
2 files changed, 39 insertions, 0 deletions
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 0000000000..21574072f1
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
@@ -0,0 +1,38 @@
1From adf3d4c9d4133bd6995590d921c0ccaec5254da9 Mon Sep 17 00:00:00 2001
2From: Bhargava Sreekantappa Gayathri
3 <bhargava.sreekantappa-gayathri@xilinx.com>
4Date: Tue, 27 Feb 2018 16:09:31 -0800
5Subject: [PATCH] Fix gles3 header when gles2 is enabled
6
7A GLES 2 application should not use gl3.h.
8Fix the gles3 header failure while compiling webkitgtk.
9
10FAILED:
11Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/GLContext.cpp.o
12 ^~~~~~~~~~~~~
13compilation terminated.
14
15Upstream-Status: Backport
16Imported patch from: https://bugs.webkit.org/show_bug.cgi?id=183008
17
18Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com>
19Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
20---
21 Source/WebCore/platform/graphics/GLContext.cpp | 1 -
22 1 file changed, 1 deletion(-)
23
24diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
25index 599dcc0..46d2fd4 100644
26--- a/Source/WebCore/platform/graphics/GLContext.cpp
27+++ b/Source/WebCore/platform/graphics/GLContext.cpp
28@@ -31,7 +31,6 @@
29 #elif USE(OPENGL_ES_2)
30 #define GL_GLEXT_PROTOTYPES 1
31 #include <GLES2/gl2.h>
32-#include <GLES3/gl3.h>
33 #endif
34
35 #if USE(GLX)
36--
372.7.4
38
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
index 9fac044441..c29fa7f4c5 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
@@ -21,6 +21,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
22 file://0001-Fix-build-with-musl.patch \ 22 file://0001-Fix-build-with-musl.patch \
23 file://fix-configure-failure-aarch64.patch \ 23 file://fix-configure-failure-aarch64.patch \
24 file://0001-Fix-gles3-header-when-gles2-is-enabled.patch \
24 " 25 "
25 26
26SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" 27SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112"