mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 02:00:04 +00:00
Code Issues Projects Releases Wiki Activity

webkitgtk_2.16.6.bb: Remove gl3.h header reference

Browse Source 
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>
This commit is contained in:
Bhargava Sreekantappa Gayathri
2018-02-27 16:17:59 -08:00
committed by Richard Purdie
parent bc326572ee
commit 8b8445461a
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch
+38
View File
@@ -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
meta/recipes-sato/webkit/webkitgtk_2.18.6.bb
+1
View File
@@ -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"