[oe] [meta-oe][WIP][PATCH 4/8] navit: Fix build with newer freetype

Martin Jansa martin.jansa at gmail.com
Wed Jan 1 12:57:22 UTC 2014


Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../navit/navit/freetype-include-path.patch              | 16 ++++++++++++++++
 meta-oe/recipes-navigation/navit/navit_svn.bb            |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch

diff --git a/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch b/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch
new file mode 100644
index 0000000..b3763b0
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS caused by freetype headers path change.
+Author: Gilles Filippini <pini at debian.org>
+Bug-Debian: http://bugs.debian.org/733378
+Index: navit/navit/font/freetype/font_freetype.c
+===================================================================
+--- navit.orig/navit/font/freetype/font_freetype.c	2013-09-23 10:43:32.000000000 +0200
++++ navit/navit/font/freetype/font_freetype.c	2013-12-30 19:54:45.000000000 +0100
+@@ -32,7 +32,7 @@
+ #if USE_FRIBIDI
+ #include <fribidi.h>
+ #endif
+-#include <freetype/ftglyph.h>
++#include <ftglyph.h>
+ #include "point.h"
+ #include "graphics.h"
+ #include "debug.h"
diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb
index 6e81a4b..2661507 100644
--- a/meta-oe/recipes-navigation/navit/navit_svn.bb
+++ b/meta-oe/recipes-navigation/navit/navit_svn.bb
@@ -6,4 +6,5 @@ PR = "${INC_PR}.3"
 
 S = "${WORKDIR}/${PN}"
 SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \
+    file://freetype-include-path.patch \
 "
-- 
1.8.4.3




More information about the Openembedded-devel mailing list