* [PATCH] cogl: kms: include necessary header for size_t
@ 2014-01-28 19:15 Andreas Oberritter
2014-01-28 19:21 ` Henning Heinold
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Oberritter @ 2014-01-28 19:15 UTC (permalink / raw)
To: openembedded-core
Fixes compilation in cases where stddef.h is not alrady
included by EGL headers.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb | 2 ++
.../kms-include-stddef.h-before-drm.h.patch | 33 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
create mode 100644 meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch
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 5e5c82b..0ef9726 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
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+SRC_URI += "file://kms-include-stddef.h-before-drm.h.patch"
+
SRC_URI[archive.md5sum] = "611a61bed04354cbfffa3dc27feb6d4f"
SRC_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 0000000..7cce279
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch
@@ -0,0 +1,33 @@
+Upstream-Status: Submitted [cogl@lists.freedesktop.org]
+
+From 5e4f4689308732a0570a1631169247157c59f064 Mon Sep 17 00:00:00 2001
+From: Andreas Oberritter <obi@saftware.de>
+Date: Tue, 28 Jan 2014 18:36:04 +0100
+Subject: [PATCH] kms: include stddef.h before drm.h
+
+Not doing so leads to the following error, if stddef.h is not included
+indirectly through EGL headers:
+
+| libdrm/drm.h:132:2: error: unknown type name 'size_t'
+| size_t name_len; /**< Length of name buffer */
+
+Signed-off-by: Andreas Oberritter <obi@saftware.de>
+---
+ cogl/winsys/cogl-winsys-egl-kms.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
+index f7c9cfb..144ad9b 100644
+--- a/cogl/winsys/cogl-winsys-egl-kms.c
++++ b/cogl/winsys/cogl-winsys-egl-kms.c
+@@ -40,6 +40,7 @@
+
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <stddef.h>
+ #include <drm.h>
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
+--
+1.8.3.2
+
--
1.8.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] cogl: kms: include necessary header for size_t
2014-01-28 19:15 [PATCH] cogl: kms: include necessary header for size_t Andreas Oberritter
@ 2014-01-28 19:21 ` Henning Heinold
2014-01-28 20:27 ` [PATCH v2] " Andreas Oberritter
0 siblings, 1 reply; 5+ messages in thread
From: Henning Heinold @ 2014-01-28 19:21 UTC (permalink / raw)
To: openembedded-core
On Tue, Jan 28, 2014 at 08:15:31PM +0100, Andreas Oberritter wrote:
> Fixes compilation in cases where stddef.h is not alrady
^^^^^^
nitpicking about spelling.
Bye Henning
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2] cogl: kms: include necessary header for size_t
2014-01-28 19:21 ` Henning Heinold
@ 2014-01-28 20:27 ` Andreas Oberritter
2014-01-30 14:11 ` Richard Purdie
0 siblings, 1 reply; 5+ messages in thread
From: Andreas Oberritter @ 2014-01-28 20:27 UTC (permalink / raw)
To: openembedded-core
Fixes compilation in cases where stddef.h is not already
included by EGL headers.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
:-P
meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb | 2 ++
.../kms-include-stddef.h-before-drm.h.patch | 33 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
create mode 100644 meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch
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 5e5c82b..0ef9726 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
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+SRC_URI += "file://kms-include-stddef.h-before-drm.h.patch"
+
SRC_URI[archive.md5sum] = "611a61bed04354cbfffa3dc27feb6d4f"
SRC_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 0000000..7cce279
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch
@@ -0,0 +1,33 @@
+Upstream-Status: Submitted [cogl@lists.freedesktop.org]
+
+From 5e4f4689308732a0570a1631169247157c59f064 Mon Sep 17 00:00:00 2001
+From: Andreas Oberritter <obi@saftware.de>
+Date: Tue, 28 Jan 2014 18:36:04 +0100
+Subject: [PATCH] kms: include stddef.h before drm.h
+
+Not doing so leads to the following error, if stddef.h is not included
+indirectly through EGL headers:
+
+| libdrm/drm.h:132:2: error: unknown type name 'size_t'
+| size_t name_len; /**< Length of name buffer */
+
+Signed-off-by: Andreas Oberritter <obi@saftware.de>
+---
+ cogl/winsys/cogl-winsys-egl-kms.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
+index f7c9cfb..144ad9b 100644
+--- a/cogl/winsys/cogl-winsys-egl-kms.c
++++ b/cogl/winsys/cogl-winsys-egl-kms.c
+@@ -40,6 +40,7 @@
+
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <stddef.h>
+ #include <drm.h>
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
+--
+1.8.3.2
+
--
1.8.3.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] cogl: kms: include necessary header for size_t
2014-01-28 20:27 ` [PATCH v2] " Andreas Oberritter
@ 2014-01-30 14:11 ` Richard Purdie
2014-01-30 14:54 ` Andreas Oberritter
0 siblings, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2014-01-30 14:11 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: openembedded-core
On Tue, 2014-01-28 at 21:27 +0100, Andreas Oberritter wrote:
> Fixes compilation in cases where stddef.h is not already
> included by EGL headers.
>
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
> :-P
The sad thing is it appears this wasn't tested. We added it, it causes
warnings during parsing and build failures.
I've pushed a fix but its frustrating.
Cheers,
Richard
> meta/recipes-graphics/cogl/cogl-1.0_1.16.0.bb | 2 ++
> .../kms-include-stddef.h-before-drm.h.patch | 33 ++++++++++++++++++++++
> 2 files changed, 35 insertions(+)
> create mode 100644 meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch
>
> 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 5e5c82b..0ef9726 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
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
>
> +SRC_URI += "file://kms-include-stddef.h-before-drm.h.patch"
> +
> SRC_URI[archive.md5sum] = "611a61bed04354cbfffa3dc27feb6d4f"
> SRC_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 0000000..7cce279
> --- /dev/null
> +++ b/meta/recipes-graphics/cogl/cogl-1.16.0/kms-include-stddef.h-before-drm.h.patch
> @@ -0,0 +1,33 @@
> +Upstream-Status: Submitted [cogl@lists.freedesktop.org]
> +
> +From 5e4f4689308732a0570a1631169247157c59f064 Mon Sep 17 00:00:00 2001
> +From: Andreas Oberritter <obi@saftware.de>
> +Date: Tue, 28 Jan 2014 18:36:04 +0100
> +Subject: [PATCH] kms: include stddef.h before drm.h
> +
> +Not doing so leads to the following error, if stddef.h is not included
> +indirectly through EGL headers:
> +
> +| libdrm/drm.h:132:2: error: unknown type name 'size_t'
> +| size_t name_len; /**< Length of name buffer */
> +
> +Signed-off-by: Andreas Oberritter <obi@saftware.de>
> +---
> + cogl/winsys/cogl-winsys-egl-kms.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
> +index f7c9cfb..144ad9b 100644
> +--- a/cogl/winsys/cogl-winsys-egl-kms.c
> ++++ b/cogl/winsys/cogl-winsys-egl-kms.c
> +@@ -40,6 +40,7 @@
> +
> + #include <EGL/egl.h>
> + #include <EGL/eglext.h>
> ++#include <stddef.h>
> + #include <drm.h>
> + #include <xf86drm.h>
> + #include <xf86drmMode.h>
> +--
> +1.8.3.2
> +
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] cogl: kms: include necessary header for size_t
2014-01-30 14:11 ` Richard Purdie
@ 2014-01-30 14:54 ` Andreas Oberritter
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Oberritter @ 2014-01-30 14:54 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On 30.01.2014 15:11, Richard Purdie wrote:
> On Tue, 2014-01-28 at 21:27 +0100, Andreas Oberritter wrote:
>> Fixes compilation in cases where stddef.h is not already
>> included by EGL headers.
>>
>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
>> ---
>> :-P
>
> The sad thing is it appears this wasn't tested. We added it, it causes
> warnings during parsing and build failures.
>
> I've pushed a fix but its frustrating.
I'm sorry about that. I build-tested it on dora with cogl cherry-picked
to master's version, and I verified that it applies cleanly to master.
But I missed cherry-picking commit cc41cb6 to dora, which changed cogl's
FILESPATH through clutter.bbclass.
Regards,
Andreas
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-30 14:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-28 19:15 [PATCH] cogl: kms: include necessary header for size_t Andreas Oberritter
2014-01-28 19:21 ` Henning Heinold
2014-01-28 20:27 ` [PATCH v2] " Andreas Oberritter
2014-01-30 14:11 ` Richard Purdie
2014-01-30 14:54 ` Andreas Oberritter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox