summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc2
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch33
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb8
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb6
4 files changed, 7 insertions, 42 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index a4a85506ff..e25968e468 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -1,6 +1,6 @@
1SUMMARY = "Modern 3D graphics API with associated utility APIs" 1SUMMARY = "Modern 3D graphics API with associated utility APIs"
2HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" 2HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
3LICENSE = "LGPLv2.1+" 3LICENSE = "MIT"
4 4
5inherit clutter 5inherit clutter
6 6
diff --git a/meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch b/meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch
deleted file mode 100644
index 7cce279a19..0000000000
--- a/meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Submitted [cogl@lists.freedesktop.org]
2
3From 5e4f4689308732a0570a1631169247157c59f064 Mon Sep 17 00:00:00 2001
4From: Andreas Oberritter <obi@saftware.de>
5Date: Tue, 28 Jan 2014 18:36:04 +0100
6Subject: [PATCH] kms: include stddef.h before drm.h
7
8Not doing so leads to the following error, if stddef.h is not included
9indirectly through EGL headers:
10
11| libdrm/drm.h:132:2: error: unknown type name 'size_t'
12| size_t name_len; /**< Length of name buffer */
13
14Signed-off-by: Andreas Oberritter <obi@saftware.de>
15---
16 cogl/winsys/cogl-winsys-egl-kms.c | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
20index f7c9cfb..144ad9b 100644
21--- a/cogl/winsys/cogl-winsys-egl-kms.c
22+++ b/cogl/winsys/cogl-winsys-egl-kms.c
23@@ -40,6 +40,7 @@
24
25 #include <EGL/egl.h>
26 #include <EGL/eglext.h>
27+#include <stddef.h>
28 #include <drm.h>
29 #include <xf86drm.h>
30 #include <xf86drmMode.h>
31--
321.8.3.2
33
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb
deleted file mode 100644
index 521158e7e4..0000000000
--- a/meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require cogl-1.0.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4
5SRC_URI += "file://kms-include-stddef.h-before-drm.h.patch"
6
7SRC_URI[archive.md5sum] = "aaf32bde135cf3815aa3221726bad71e"
8SRC_URI[archive.sha256sum] = "65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7"
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb
new file mode 100644
index 0000000000..375b079b4f
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb
@@ -0,0 +1,6 @@
1require cogl-1.0.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
4
5SRC_URI[archive.md5sum] = "994a29f5c02768367b6f035bfe456ba6"
6SRC_URI[archive.sha256sum] = "a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e"