summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-07 16:11:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-08 23:00:32 +0100
commit8a766c0587b39fcefabc0eb13a9949d9aeb01a0a (patch)
tree53854d08dd1e3a300bb3219dc3a7b562965edb1f
parent87d2e1c5b9b2392f41247e0a11ab2a213ad33470 (diff)
downloadpoky-8a766c0587b39fcefabc0eb13a9949d9aeb01a0a.tar.gz
cogl: upgrade 1.22.2 -> 1.22.4
Remove backported patch. (From OE-Core rev: 02ec648def450ee37f712e20a151fc01a0068525) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch32
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb8
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.22.4.bb8
3 files changed, 8 insertions, 40 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
deleted file mode 100644
index 2a9d8f829b..0000000000
--- a/meta/recipes-graphics/cogl/cogl-1.0/0001-Fix-an-incorrect-preprocessor-conditional.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
2Upstream-Status: Backport
3
4
5Original upstream commit follows:
6
7From b583e21d8698dbd58013320cfb47739102efdea7 Mon Sep 17 00:00:00 2001
8From: Kalev Lember <klember@redhat.com>
9Date: Wed, 19 Oct 2016 23:38:28 +0200
10Subject: [PATCH] Fix an incorrect preprocessor conditional
11
12This 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
17diff --git a/cogl/winsys/cogl-winsys-egl.c b/cogl/winsys/cogl-winsys-egl.c
18index 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--
312.11.0
32
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb
deleted file mode 100644
index 5901062a4c..0000000000
--- a/meta/recipes-graphics/cogl/cogl-1.0_1.22.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require cogl-1.0.inc
2
3SRC_URI += "file://test-backface-culling.c-fix-may-be-used-uninitialize.patch \
4 file://0001-Fix-an-incorrect-preprocessor-conditional.patch"
5SRC_URI[archive.md5sum] = "d53b708ca7c4af03d7254e46945d6b33"
6SRC_URI[archive.sha256sum] = "39a718cdb64ea45225a7e94f88dddec1869ab37a21b339ad058a9d898782c00d"
7
8LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.22.4.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.22.4.bb
new file mode 100644
index 0000000000..432025233b
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.22.4.bb
@@ -0,0 +1,8 @@
1require cogl-1.0.inc
2
3SRC_URI += "file://test-backface-culling.c-fix-may-be-used-uninitialize.patch \
4"
5SRC_URI[archive.md5sum] = "31755015a865c4af51ac84f6e53af8ab"
6SRC_URI[archive.sha256sum] = "5217bf94cbca3df63268a3b79d017725382b9e592b891d1e7dc6212590ce0de0"
7
8LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"