[oe-commits] Sebastian Krzyszkowiak : navit: don' t recommend speech-dispatcher and fix config file to work without -dev package

[git version control]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: f6d595aa193f202b3da31406f6e851529ea1025d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f6d595aa193f202b3da31406f6e851529ea1025d

Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Sun Jul 19 11:25:27 2009 +0000

navit: don't recommend speech-dispatcher and fix config file to work without -dev package

---

 recipes/navit/navit.inc    |    5 +++--
 recipes/navit/navit_svn.bb |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index e76aba7..b9f18d8 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -2,11 +2,11 @@ DESCRIPTION = "Navit is a car navigation system with routing engine."
 LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS = "glib-2.0 gtk+"
-RRECOMMENDS = "gpsd speechd flite"
+RRECOMMENDS = "gpsd espeak flite"
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned  --enable-svg2png-scaling-flag=32"
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned  --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher"
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 
@@ -17,6 +17,7 @@ SRC_URI_append = " \
                   file://navit.desktop \
                   file://navit.launcher \
                   file://navit.png \
+                  file://navit.xml-so.patch;patch=1 \
 	  	 "
 
 do_install_append() {
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index df712a0..61a4537 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -1,10 +1,12 @@
 require navit.inc
 
 PV = "0.1.0+svnrev${SRCREV}"
-PR = "r1"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
+EXTRA_OECONF += " --enable-cache-size=20971520 --with-svg2png-use-convert"
+
 S = "${WORKDIR}/navit"
 
 SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https"