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-19 15:04:01 +0000 |
| commit | 79494ac397384af46d383ef414de372343cd4299 (patch) | |
| tree | 6338a0335126a6dd15f533f22d8d13679d423200 /meta/recipes-graphics/cogl/cogl-1.0 | |
| parent | 6ee923f2e5628a4af5581250804666934a57b904 (diff) | |
| download | openembedded-core-79494ac397384af46d383ef414de372343cd4299.tar.gz openembedded-core-79494ac397384af46d383ef414de372343cd4299.tar.bz2 openembedded-core-79494ac397384af46d383ef414de372343cd4299.zip | |
cogl-1.0: Upgrade 1.22.0 -> 1.22.2
Bug fix release. Backport a build fixing patch.
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 @@ +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Backport + + +Original upstream commit follows: + +From b583e21d8698dbd58013320cfb47739102efdea7 Mon Sep 17 00:00:00 2001 +From: Kalev Lember <klember@redhat.com> +Date: Wed, 19 Oct 2016 23:38:28 +0200 +Subject: [PATCH] Fix an incorrect preprocessor conditional + +This fixes the build with wayland wayland egl server support disabled. +--- + cogl/winsys/cogl-winsys-egl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c +index 39bfd884..4a9f3aa6 100644 +--- a/cogl/winsys/cogl-winsys-egl.c ++++ b/cogl/winsys/cogl-winsys-egl.c +@@ -1029,7 +1029,7 @@ _cogl_egl_create_image (CoglContext *ctx, + egl_ctx = EGL_NO_CONTEXT; + else + #endif +-#if COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT ++#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT + /* The WL_bind_wayland_display spec states that EGL_NO_CONTEXT is to be used + * in conjunction with the EGL_WAYLAND_BUFFER_WL target */ + if (target == EGL_WAYLAND_BUFFER_WL) +-- +2.11.0 + |