aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Krzyszkowiak <seba.dos1@gmail.com>2009-07-19 11:25:27 +0000
committerAngus Ainslie <nytowl@openmoko.org>2009-08-25 23:24:30 -0600
commitf6d595aa193f202b3da31406f6e851529ea1025d (patch)
tree4a5ada0239d96812a424b1841947d8a8dcaeca00
parent79e953889744b03f7e458e36e87701c1f9375f4b (diff)
downloadopenembedded-f6d595aa193f202b3da31406f6e851529ea1025d.tar.gz
navit: don't recommend speech-dispatcher and fix config file to work without -dev package
-rw-r--r--recipes/navit/navit.inc5
-rw-r--r--recipes/navit/navit_svn.bb4
2 files changed, 6 insertions, 3 deletions
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index e76aba71e3..b9f18d86fd 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 df712a0eb2..61a4537e15 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"