sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Jussi Kukkonen 2016-12-19 15:35:45 +02:00 committed by Richard Purdie
parent 018c695b43
commit 1f129c1598
3 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch Normal file
View File

@ -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

7
meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb
View File

@ -1,7 +0,0 @@
require cogl-1.0.inc
SRC_URI += "file://test-backface-culling.c-fix-may-be-used-uninitialize.patch"
LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
SRC_URI[archive.md5sum] = "ab684ec96848d79d22757fb3064820c8"
SRC_URI[archive.sha256sum] = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"

8
meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb Normal file
View File

@ -0,0 +1,8 @@
require cogl-1.0.inc
SRC_URI += "file://test-backface-culling.c-fix-may-be-used-uninitialize.patch \
file://0001-Fix-an-incorrect-preprocessor-conditional.patch"
SRC_URI[archive.md5sum] = "d53b708ca7c4af03d7254e46945d6b33"
SRC_URI[archive.sha256sum] = "39a718cdb64ea45225a7e94f88dddec1869ab37a21b339ad058a9d898782c00d"
LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"