diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-12-19 15:35:45 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-20 15:22:16 +0000 |
commit | 1f129c1598b130d9700b0b74f903f296bed72024 (patch) | |
tree | 44bb249982fb020aaaa1991550fc749aaca90c30 /meta/recipes-graphics/cogl/cogl-1.0 | |
parent | 018c695b43bd3d4ba81646dcb5d23640950b16d9 (diff) | |
download | poky-1f129c1598b130d9700b0b74f903f296bed72024.tar.gz |
cogl-1.0: Upgrade 1.22.0 -> 1.22.2
Bug fix release. Backport a build fixing patch.
(From OE-Core rev: 79494ac397384af46d383ef414de372343cd4299)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/cogl/cogl-1.0')
-rw-r--r-- | meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch b/meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch new file mode 100644 index 0000000000..2a9d8f829b --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
2 | Upstream-Status: Backport | ||
3 | |||
4 | |||
5 | Original upstream commit follows: | ||
6 | |||
7 | From b583e21d8698dbd58013320cfb47739102efdea7 Mon Sep 17 00:00:00 2001 | ||
8 | From: Kalev Lember <klember@redhat.com> | ||
9 | Date: Wed, 19 Oct 2016 23:38:28 +0200 | ||
10 | Subject: [PATCH] Fix an incorrect preprocessor conditional | ||
11 | |||
12 | This fixes the build with wayland wayland egl server support disabled. | ||
13 | --- | ||
14 | cogl/winsys/cogl-winsys-egl.c | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c | ||
18 | index 39bfd884..4a9f3aa6 100644 | ||
19 | --- a/cogl/winsys/cogl-winsys-egl.c | ||
20 | +++ b/cogl/winsys/cogl-winsys-egl.c | ||
21 | @@ -1029,7 +1029,7 @@ _cogl_egl_create_image (CoglContext *ctx, | ||
22 | egl_ctx = EGL_NO_CONTEXT; | ||
23 | else | ||
24 | #endif | ||
25 | -#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT | ||
26 | +#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT | ||
27 | /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used | ||
28 | * in conjunction with the EGL_WAYLAND_BUFFER_WL target */ | ||
29 | if (target == EGL_WAYLAND_BUFFER_WL) | ||
30 | -- | ||
31 | 2.11.0 | ||
32 | |||