[oe-commits] Martin Jansa : navit: Fix build with newer freetype

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: be9ca8657b6e1e0edb3153e5fe7f7d29ec7b01dd
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=be9ca8657b6e1e0edb3153e5fe7f7d29ec7b01dd

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Jan  1 13:23:14 2014 +0100

navit: Fix build with newer freetype

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../navit/navit/freetype-include-path.patch        | 28 ++++++++++++++++++++++
 meta-oe/recipes-navigation/navit/navit_svn.bb      |  1 +
 2 files changed, 29 insertions(+)

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..288997b
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch
@@ -0,0 +1,28 @@
+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 -uNr navit.orig/navit/graphics/sdl/graphics_sdl.c navit/navit/graphics/sdl/graphics_sdl.c
+--- navit.orig/navit/graphics/sdl/graphics_sdl.c	2012-06-22 14:16:01.000000000 +0200
++++ navit/navit/graphics/sdl/graphics_sdl.c	2014-01-01 22:31:10.892948164 +0100
+@@ -84,7 +84,7 @@
+ #else
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/ftglyph.h>
++#include <ftglyph.h>
+ #endif
+ #include <event.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 \
 "