summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2014-01-28 21:27:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-29 17:38:49 +0000
commit5f4fdf87e922f648adc369965c689010ed278515 (patch)
tree22ca73dc27ef48381c66761d0df07c57e3014afd
parentd4e57a737261bf1002b351aae57e58dbfe997371 (diff)
downloadpoky-5f4fdf87e922f648adc369965c689010ed278515.tar.gz
cogl: kms: include necessary header for size_t
Fixes compilation in cases where stddef.h is not already included by EGL headers. (From OE-Core rev: 5df33fc62f2d3a5a15dc387ed26cb7da8d9fbbe1) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb2
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch33
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb
index 5e5c82b501..0ef972622c 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb
@@ -2,5 +2,7 @@ require cogl-1.0.inc
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4 4
5SRC_URI += "file://kms-include-stddef.h-before-drm.h.patch"
6
5SRC_URI[archive.md5sum] = "611a61bed04354cbfffa3dc27feb6d4f" 7SRC_URI[archive.md5sum] = "611a61bed04354cbfffa3dc27feb6d4f"
6SRC_URI[archive.sha256sum] = "75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094" 8SRC_URI[archive.sha256sum] = "75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094"
diff --git a/meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch b/meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch
new file mode 100644
index 0000000000..7cce279a19
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch
@@ -0,0 +1,33 @@
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