diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 12:45:53 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 14:38:15 -0400 |
commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/yocto-poky/meta/recipes-sato/webkit | |
parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
download | blackbird-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.gz blackbird-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.zip |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-sato/webkit')
3 files changed, 40 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-Fix-gles3-header-when-gles2-is-enabled.patch new file mode 100644 index 000000000..21574072f --- /dev/null +++ b/import-layers/yocto-poky/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/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch index dfdc11601..9fc1421fd 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch +++ b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch @@ -16,6 +16,7 @@ and ends up with compile errors e.g. Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending --- Source/JavaScriptCore/shell/CMakeLists.txt | 2 +- Source/WebCore/PlatformGTK.cmake | 6 +++--- diff --git a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb b/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb index 9fac04444..c29fa7f4c 100644 --- a/import-layers/yocto-poky/meta/recipes-sato/webkit/webkitgtk_2.18.6.bb +++ b/import-layers/yocto-poky/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" |