summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch41
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb1
2 files changed, 42 insertions, 0 deletions
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 000000000..fcd2f684b
--- /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,41 @@
1From 621d946e56efac2c779b83b1a5c6b645169c4ebd Mon Sep 17 00:00:00 2001
2From: "Brian A. Lloyd" <brian.lloyd@familyhonor.net>
3Date: Wed, 1 Oct 2014 12:35:18 +0300
4Subject: [PATCH] Add config.h include to src/lx_memory.c
5
6The src/lx_memory.c file uses the xf86.h header file. This file must have
7HAVE_STRNDUP defined before calling it when the building platform has a strndup
8function. When using config.h, this file doesn't have that define and so fails
9to compile.
10
11The attached patch adds the conditional config.h to this file so it may compile
12on the affected platforms.
13
14The patch is trivial and may be included and used under whatever licensing
15desired.
16
17Closes: Free Desktop Bug #84541
18
19Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net>
20Upstream-Status: Backport
21---
22 src/lx_memory.c | 3 +++
23 1 file changed, 3 insertions(+)
24
25diff --git a/src/lx_memory.c b/src/lx_memory.c
26index f26d280..992446f 100644
27--- a/src/lx_memory.c
28+++ b/src/lx_memory.c
29@@ -22,6 +22,9 @@
30 * contributors may be used to endorse or promote products derived from this
31 * software without specific prior written permission.
32 */
33+#if HAVE_CONFIG_H
34+#include "config.h"
35+#endif
36
37 #include "xf86.h"
38 #include "geode.h"
39--
402.1.1
41
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 4e8df46c7..478d08805 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
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36"
4SUMMARY = "X.org server -- Geode GX2/LX display driver" 4SUMMARY = "X.org server -- Geode GX2/LX display driver"
5PR = "${INC_PR}.0" 5PR = "${INC_PR}.0"
6 6
7SRC_URI += "file://0001-Add-config.h-include-to-src-lx_memory.c.patch"
7SRC_URI[md5sum] = "35fa387f6a33f6b22a56ce4bda424392" 8SRC_URI[md5sum] = "35fa387f6a33f6b22a56ce4bda424392"
8SRC_URI[sha256sum] = "38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7" 9SRC_URI[sha256sum] = "38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7"
9 10