>From upstream webkit: fd15a368fa73fe08d91cc1dd7ef05c0c5a3ae851 Webkit will fail to compile under certain circumstances. Please see https://bugs.webkit.org/show_bug.cgi?id=149172 for more details.
Signed-off-by: Pushpal Sidhu <[email protected]> --- ...ailure-with-ACCELERATED_2D_CANVAS-when-ca.patch | 35 ++++++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.8.5.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch diff --git a/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch b/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch new file mode 100644 index 0000000..5d43e0f --- /dev/null +++ b/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch @@ -0,0 +1,35 @@ +From 6ea42d4fa6f3f6dd18c37cb7b6e1faea6afefba4 Mon Sep 17 00:00:00 2001 +From: "[email protected]" <[email protected]> +Date: Tue, 15 Sep 2015 21:50:18 +0000 +Subject: [PATCH] [GTK] Build failure with ACCELERATED_2D_CANVAS when cairo-gl has + built with OpenGLESv2 support only. + https://bugs.webkit.org/show_bug.cgi?id=149172 + +Reviewed by Martin Robinson. + +No new tests, no behavior change. + +* platform/graphics/glx/GLContextGLX.cpp: +(WebCore::GLContextGLX::cairoDevice): + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@189826 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WebCore/platform/graphics/glx/GLContextGLX.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp +index 7890d8d..4ed3a43 100644 +--- a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp ++++ b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp +@@ -266,7 +266,7 @@ cairo_device_t* GLContextGLX::cairoDevice() + if (m_cairoDevice) + return m_cairoDevice; + +-#if ENABLE(ACCELERATED_2D_CANVAS) ++#if ENABLE(ACCELERATED_2D_CANVAS) && CAIRO_HAS_GLX_FUNCTIONS + m_cairoDevice = cairo_glx_device_create(sharedX11Display(), m_context); + #endif + +-- +2.6.2 + diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb index e29666a..68634a9 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 SRC_URI = "\ http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch \ + file://0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch \ file://gcc5.patch \ " SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae" -- 2.6.2 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
