diff options
| author |   Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com> | 2018-02-27 16:17:59 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-03 17:08:30 +0000 |
| commit | 23d6bd1a3b97db624eac4ad6650a1e4298ade7a2 (patch) | |
| tree | d0cac5cb9b5aadcf83dadde3bcbaad4b67da30a7 /meta/recipes-sato | |
| parent | d939ba92445cb646983744f08e62288e05d3ac0a (diff) | |
| download | openembedded-core-contrib-23d6bd1a3b97db624eac4ad6650a1e4298ade7a2.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
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>
Diffstat (limited to 'meta/recipes-sato')
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.18.6.bb | 1 |
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 00000000000..21574072f17 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch @@ -0,0 +1,38 @@ +From adf3d4c9d4133bd6995590d921c0ccaec5254da9 Mon Sep 17 00:00:00 2001 +From: Bhargava Sreekantappa Gayathri + <bhargava.sreekantappa-gayathri@xilinx.com> +Date: Tue, 27 Feb 2018 16:09:31 -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-gayathri@xilinx.com> +Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@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 599dcc0..46d2fd4 100644 +--- a/Source/WebCore/platform/graphics/GLContext.cpp ++++ b/Source/WebCore/platform/graphics/GLContext.cpp +@@ -31,7 +31,6 @@ + #elif USE(OPENGL_ES_2) + #define GL_GLEXT_PROTOTYPES 1 + #include <GLES2/gl2.h> +-#include <GLES3/gl3.h> + #endif + + #if USE(GLX) +-- +2.7.4 + diff --git a/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb index 9fac0444415..c29fa7f4c5c 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 \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://0001-Fix-build-with-musl.patch \ file://fix-configure-failure-aarch64.patch \ + file://0001-Fix-gles3-header-when-gles2-is-enabled.patch \ " SRC_URI[md5sum] = "c1a548595135ee75ad3bf2e18ac83112" |