[PATCH 0/1] xf-86-video-geode missing config.h include

[PATCH 0/1] xf-86-video-geode missing config.h include

[Brian Lloyd]

This backports a fix already applied to development branh of xf86-video-geode to latest release since next release could be a ways away.  This allows compiling xf86-video-geode against the latest linux-yocto kernels.

Brian Lloyd (1):
  Backports inclusion of config.h to be compatible with newer kernels.

 ...1-Add-config.h-include-to-src-lx_memory.c.patch | 40 ++++++++++++++++++++++
 .../xorg-driver/xf86-video-geode_2.11.16.bb        |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch

-- 
1.9.3

[PATCH 1/1] Backports inclusion of config.h to be compatible with newer kernels.

[Brian Lloyd]

Signed-off-by: Brian Lloyd <blloyd@familyhonor.net>
---
 ...1-Add-config.h-include-to-src-lx_memory.c.patch | 40 ++++++++++++++++++++++
 .../xorg-driver/xf86-video-geode_2.11.16.bb        |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch
new file mode 100644
index 0000000..d07c4c4
--- /dev/null
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch
@@ -0,0 +1,40 @@
+From 621d946e56efac2c779b83b1a5c6b645169c4ebd Mon Sep 17 00:00:00 2001
+From: "Brian A. Lloyd" <brian.lloyd@familyhonor.net>
+Date: Wed, 1 Oct 2014 12:35:18 +0300
+Subject: [PATCH 1/1] Add config.h include to src/lx_memory.c
+
+The src/lx_memory.c file uses the xf86.h header file.  This file must have
+HAVE_STRNDUP defined before calling it when the building platform has a strndup
+function.  When using config.h, this file doesn't have that define and so fails
+to compile.
+
+The attached patch adds the conditional config.h to this file so it may compile
+on the affected platforms.
+
+The patch is trivial and may be included and used under whatever licensing
+desired.
+
+Closes: Free Desktop Bug #84541
+
+Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net>
+---
+ src/lx_memory.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/lx_memory.c b/src/lx_memory.c
+index f26d280..992446f 100644
+--- a/src/lx_memory.c
++++ b/src/lx_memory.c
+@@ -22,6 +22,9 @@
+  * contributors may be used to endorse or promote products derived from this
+  * software without specific prior written permission.
+  */
++#if HAVE_CONFIG_H
++#include "config.h"
++#endif
+ 
+ #include "xf86.h"
+ #include "geode.h"
+-- 
+1.9.3
+
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb
index 4e8df46..c09063d 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb
@@ -1,6 +1,6 @@
 require recipes-graphics/xorg-driver/xorg-driver-video.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36"
-
+SRC_URI += "file://0001-Add-config.h-include-to-src-lx_memory.c.patch"
 SUMMARY = "X.org server -- Geode GX2/LX display driver"
 PR = "${INC_PR}.0"
 
-- 
1.9.3

Re: [PATCH 0/1] xf-86-video-geode missing config.h include

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1175 bytes --]

On Sun, Oct 05, 2014 at 11:00:09PM -0500, Brian Lloyd wrote:
> This backports a fix already applied to development branh of xf86-video-geode to latest release since next release could be a ways away.  This allows compiling xf86-video-geode against the latest linux-yocto kernels.

I've already sent similar patch for oe-devel ML list where this change
belongs and I plan to merge it tonight.

But thanks for getting it fixed in upstream!

Regards,

> Brian Lloyd (1):
>   Backports inclusion of config.h to be compatible with newer kernels.
> 
>  ...1-Add-config.h-include-to-src-lx_memory.c.patch | 40 ++++++++++++++++++++++
>  .../xorg-driver/xf86-video-geode_2.11.16.bb        |  2 +-
>  2 files changed, 41 insertions(+), 1 deletion(-)
>  create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch
> 
> -- 
> 1.9.3
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]