diff options
Diffstat (limited to 'meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch')
-rw-r--r-- | meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch | 35 |
1 files changed, 0 insertions, 35 deletions
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 deleted file mode 100644 index e95c0e4a22..0000000000 --- a/meta/recipes-sato/webkit/files/0002-GTK-Build-failure-with-ACCELERATED_2D_CANVAS-when-ca.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 6ea42d4fa6f3f6dd18c37cb7b6e1faea6afefba4 Mon Sep 17 00:00:00 2001 | ||
2 | From: "clopez@igalia.com" <clopez@igalia.com> | ||
3 | Date: Tue, 15 Sep 2015 21:50:18 +0000 | ||
4 | Subject: [PATCH] [GTK] Build failure with ACCELERATED_2D_CANVAS when cairo-gl has | ||
5 | built with OpenGLESv2 support only. | ||
6 | |||
7 | When cairo-gl is built with GLX and ACCELERATED_2D_CANVAS if cairo-gl was only | ||
8 | built with OpenGLESv2, cairo-glx is not enabled causing | ||
9 | Source/WebCore/platform/graphics/glx/GLContextGLX.cpp to reference an undeclared | ||
10 | function and cause a compliation error. Adding an extra check resolves this | ||
11 | build failure. | ||
12 | |||
13 | Upstream-Status: Backport [webkit-2.10.0] | ||
14 | |||
15 | Signed-off-by: Pushpal Sidhu <psidhu@gateworks.com> | ||
16 | --- | ||
17 | Source/WebCore/platform/graphics/glx/GLContextGLX.cpp | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp | ||
21 | index 7890d8d..4ed3a43 100644 | ||
22 | --- a/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp | ||
23 | +++ b/Source/WebCore/platform/graphics/glx/GLContextGLX.cpp | ||
24 | @@ -266,7 +266,7 @@ cairo_device_t* GLContextGLX::cairoDevice() | ||
25 | if (m_cairoDevice) | ||
26 | return m_cairoDevice; | ||
27 | |||
28 | -#if ENABLE(ACCELERATED_2D_CANVAS) | ||
29 | +#if ENABLE(ACCELERATED_2D_CANVAS) && CAIRO_HAS_GLX_FUNCTIONS | ||
30 | m_cairoDevice = cairo_glx_device_create(sharedX11Display(), m_context); | ||
31 | #endif | ||
32 | |||
33 | -- | ||
34 | 2.6.2 | ||
35 | |||