aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/navit
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-08-12 09:07:25 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-08-12 15:42:16 +0200
commit686b2384373eed723aab8851c64cfa46cda98967 (patch)
treeee70dfa0d3534cbac262a51d2622d5730a6be180 /recipes/navit
parent367d28ff1b6628c539bfa5ded36f924ff59f1817 (diff)
downloadopenembedded-686b2384373eed723aab8851c64cfa46cda98967.tar.gz
navit: bump SRCREV a bit
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/navit')
-rw-r--r--recipes/navit/files/navit.xml6
-rw-r--r--recipes/navit/navit-icons_svn.bb2
-rw-r--r--recipes/navit/navit.inc6
-rw-r--r--recipes/navit/navit_svn.bb2
4 files changed, 11 insertions, 5 deletions
diff --git a/recipes/navit/files/navit.xml b/recipes/navit/files/navit.xml
index 79ee4618d4..58c8c226f2 100644
--- a/recipes/navit/files/navit.xml
+++ b/recipes/navit/files/navit.xml
@@ -8,6 +8,12 @@
<graphics type="gtk_drawing_area"/>
<gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/>
<xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/gui[@type='internal'])"/>
+ <!-- or comment gtk version above and try:
+ opkg install navit-graphics-qt
+ opkg install navit-gui-qml
+ <graphics type="qt_qpainter"/>
+ <gui type="qml" enabled="yes" menubar="1" toolbar="1" statusbar="1"/>
+ -->
<xi:include href="/usr/share/navit/osd.xml"/>
<log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/>
<vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj">
diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb
index a24c80590b..34c610982a 100644
--- a/recipes/navit/navit-icons_svn.bb
+++ b/recipes/navit/navit-icons_svn.bb
@@ -18,7 +18,7 @@ inherit autotools
FILES_${PN} = " /usr/share/navit/xpm/"
-SRCREV = "3357"
+SRCREV = "3409"
#use different URL than navit_svn does, to prevent upgrade/downgrade cycle in downloads dir
SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk/navit/navit;module=xpm;proto=https \
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 6f3e63e8c9..1ee130f2b1 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -1,10 +1,10 @@
DESCRIPTION = "Navit is a car navigation system with routing engine."
LICENSE = "GPL"
SECTION = "x11/applications"
-DEPENDS = "glib-2.0 gtk+ qt4-x11-free"
-DEPENDS_shr += " gd gypsy librsvg-native"
+DEPENDS = "glib-2.0 gtk+ qt4-x11-free gd gypsy librsvg-native"
RDEPENDS_${PN} = " navit-icons ${PN}-config "
-RDEPENDS_append_shr = " fsoraw"
+RDEPENDS_${PN}_append_shr = " fsoraw"
+RDEPENDS_${PN}-gui-qml = "qt4-plugin-imageformat-svg"
RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk"
RSUGGESTS_${PN} = "flite espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool"
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index abcbaf7084..6d090356e9 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -1,6 +1,6 @@
require navit.inc
-SRCREV = "3358"
+SRCREV = "3525"
PV = "0.1.99+svnr${SRCPV}"
PR = "${INC_PR}.9"