* Please review, update, cleanup before pushing to oe.dev!
---
conf/distro/include/sane-srcrevs.inc | 2 +-
recipes/navit/files/fr-default-config.patch | 135 +++++++++++++++++++++++++++
recipes/navit/files/navit-svn.xml-so.patch | 17 ++++
recipes/navit/files/navit.desktop | 2 +-
recipes/navit/files/navit.service | 3 +
recipes/navit/files/navit.xml-so.patch | 30 ++++---
recipes/navit/files/use-fso-raw.patch | 13 +++
recipes/navit/navit.inc | 19 ++--
recipes/navit/navit_svn.bb | 2 +-
9 files changed, 199 insertions(+), 24 deletions(-)
create mode 100644 recipes/navit/files/fr-default-config.patch
create mode 100644 recipes/navit/files/navit-svn.xml-so.patch
create mode 100644 recipes/navit/files/navit.service
create mode 100644 recipes/navit/files/use-fso-raw.patch
diff --git a/conf/distro/include/sane-srcrevs.inc
b/conf/distro/include/sane-srcrevs.inc
index 5c8eda2..04db3cf 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -194,7 +194,7 @@ SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
SRCREV_pn-multitap-pad ?= "373"
SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "1096"
+SRCREV_pn-navit ?= "2720"
SRCREV_pn-neod ?= "4617"
SRCREV_pn-net-snmp ?= "17367"
SRCREV_pn-netsurf ?= "3859"
diff --git a/recipes/navit/files/fr-default-config.patch
b/recipes/navit/files/fr-default-config.patch
new file mode 100644
index 0000000..1a6df72
--- /dev/null
+++ b/recipes/navit/files/fr-default-config.patch
@@ -0,0 +1,135 @@
+Index: navit/navit/navit_shipped.xml
+===================================================================
+--- navit/navit/navit_shipped.xml (Revision 2614)
++++ navit/navit/navit_shipped.xml (Arbeitskopie)
+@@ -10,6 +10,7 @@
+ <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/>
+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so"
active="no"/>
+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so"
active="no"/>
++ <plugin path="$NAVIT_LIBDIR/binding/libbinding_dbus.so" active="yes"/>
+ </plugins>
+
+ <debug name="navit:do_draw" level="0"/>
+@@ -26,38 +27,55 @@
+ [-][D]D.d[d]... [-][D][D]D.d[d]...
+ [-]0xX [-]0xX -->
+
+- <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1"
recent_dest="10">
++ <!-- center="4800 N 850 E" -->
++ <navit zoom="256" tracking="1" orientation="0" recent_dest="10"
tracking="1" autozoom_active="1">
+ <!-- Use one of gtk_drawing_area, qt_qpainter or sdl. For cegui, use
opengl -->
+- <graphics type="gtk_drawing_area"/>
+ <!-- The following line let you select which graphical user interface
you'd like to use.
+ Options include internal (optimized for touch screen devices),
gtk (useful for desktop computers) and cegui.
+ In case of the internal GUI, you can even influence the size of
the text and of the icons in the toolbar and the viewport.
+ Here's an example for a freerunner: -->
+- <!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96"
icon_l="96"/> -->
++ <gui type="internal" font_size="350" icon_xs="48" icon_s="96"
icon_l="96" fullscreen="1"/>
++ <!-- <graphics type="sdl"/> -->
++ <graphics type="gtk_drawing_area"/>
+ <!-- Normally it is sufficient to use -->
+ <!-- <gui type="internal" /> -->
+
+- <gui type="gtk" menubar="1" toolbar="1" statusbar="1"/>
++ <!-- <gui type="gtk" menubar="1" toolbar="1" statusbar="1"/> -->
+
+ <!-- for a debug log -->
+ <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt"
flush_size="1000" flush_time="30"/>
+ <!-- osd items allow to position display and control items directly
on top of the map: -->
+- <osd enabled="no" type="compass"/>
+- <osd enabled="no" type="eta"/>
+- <osd enabled="no" type="navigation_distance_to_target"/>
+- <osd enabled="no" type="navigation"/>
+- <osd enabled="no" type="navigation_distance_to_next"/>
++ <!-- <osd enabled="yes" type="compass"/>
++ <osd enabled="yes" type="eta"/>
++ <osd enabled="yes" type="navigation_distance_to_target"/>
++ <osd enabled="yes" type="navigation"/>
++ <osd enabled="yes" type="navigation_distance_to_next"/>
+ <osd enabled="no" type="navigation_next_turn"/>
++ -->
++ <!--top -->
++ <osd enabled="yes" type="text" label="${navigation.item.street_name}
${navigation.item[1].street_name_systematic}" x="0" y="0" w="480" h="30"
align="0" background_color="#000000cc" font_size="300" />
++ <osd enabled="yes" type="navigation_next_turn" x="330" y="30" w="150"
h="150"/>
++ <osd enabled="yes" type="button" x="0" y="30" w="60" h="60"
command="gui.fullscreen()" src="toggle_fullscreen.xpm"/>
++ <osd enabled="yes" type="text"
label="${navigation.item[1].length[named]}" x="330" y="180" w="150" h="50"
align="0" font_size="450"/>
++ <!-- bottom -->
++ <osd enabled="yes" type="button" x="-96" y="-121" command="zoom_in()"
src="zoom_in.xpm" background_color="#000000cc" />
++ <osd enabled="yes" type="button" x="0" y="-121" command="zoom_out()"
src="zoom_out.xpm" background_color="#000000cc" />
++ <osd enabled="yes" type="text" label="${vehicle.position_speed}" x="96"
y="-50" w="288" h="25" align="0" background_color="#000000cc" font_size="280"/>
++ <osd enabled="yes" type="text"
label="ETA:${navigation.item.destination_time[arrival]}" x="0" y="-25" w="160"
h="25" align="4" background_color="#000000cc" font_size="350" />
++ <osd enabled="yes" type="text"
label="TL:${navigation.item.destination_time[remaining]}" x="160" y="-25"
w="160" h="25" align="4" background_color="#000000cc" font_size="350" />
++ <osd enabled="yes" type="text"
label="Dist:${navigation.item.destination_length[named]}" x="320" y="-25"
w="160" h="25" align="4" background_color="#000000cc" font_size="350" />
+
++
++
+ <!-- Commands include gui_internal_menu, gui_internal_fullscreen,
zoom_in and zoom_out.
+ Usage of negative values change the button origins. x="0" y="0"
specifies the top left, x="-0" y="-0" the bottom right corner.
+ It's always the top left corner of the icon, so you need to
consider the icon's size when you enter the values. -->
+- <osd enabled="no" type="button" x="0" y="0"
command="gui.fullscreen()" src="toggle_fullscreen.xpm"/>
+- <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()"
src="menu.xpm"/>
+- <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()"
src="zoom_in.xpm"/>
+- <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()"
src="zoom_out.xpm"/>
+-
+- <vehicle name="Local GPS" profilename="car" enabled="yes" active="1"
source="gpsd://localhost" gpsd_query="w+xj">
++<!-- <osd enabled="yes" type="button" x="0" y="0"
command="gui.fullscreen()" src="toggle_fullscreen.xpm"/>
++ <osd enabled="yes" type="button" x="-96" y="0" command="gui.menu()"
src="menu.xpm"/>
++ <osd enabled="yes" type="button" x="-96" y="-96" command="zoom_in()"
src="zoom_in.xpm"/>
++ <osd enabled="yes" type="button" x="0" y="-96" command="zoom_out()"
src="zoom_out.xpm"/>
++-->
++<vehicle name="Gypsy" profilename="car" enabled="yes" active="1"
source="gypsy:/dev/ttySAC2" gpsd_query="w+xj" color="#00ff00" follow="10">
+ <!-- Navit can write a tracklog in several formats (gpx, nmea or
textfile): -->
+ <!-- <log type="gpx"
attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius"
data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> -->
+ <cursor w="26" h="26">
+@@ -85,7 +103,7 @@
+ <!-- For SDL, you should add follow="1" to have the view centered on
your position -->
+ <!-- <vehicle name="Meins" enabled="yes" source="gpsd://localhost"
color="#0000ff" follow="1"/> -->
+
+- <vehicle name="Demo" profilename="car" enabled="no" active="yes"
source="demo://">
++ <vehicle name="Demo" profilename="car" enabled="no" active="yes"
source="demo://" follow="10">
+ <cursor w="26" h="26">
+ <itemgra>
+ <circle color="#0000ff" radius="24" width="2">
+@@ -353,33 +371,33 @@
+ <!-- Navit provides speech output in text format.
+ If you have a speech synthesizer like festival lite installed,
you can get turn by turn directions out of navit. Please set the "cps"-value to
how many characters your tts engine approximately speaks per second.
+ The default is text output to the shell -->
+- <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to
let navit say:' '%s'" cps="15"/>
++ <speech type="cmdline" data="espeak --stdout -v ${LANG%%_*} '%s' |
aplay" cps="15"/>
+ <!-- <speech type="cmdline" data="flite -t '%s'"/> -->
+
+ <!-- If you have the reiseplaner maps installed, set enabled="yes" in
the next line and set the path correctly -->
+- <mapset enabled="no">
++ <!-- <mapset enabled="no">
+ <map type="mg" enabled="yes"
data="/opt/reiseplaner/travel/DE.map"/>
+ <map type="mg" enabled="yes"
data="/opt/reiseplaner/travel/DE.map/smp1.smp"/>
+ <map type="mg" enabled="yes"
data="/opt/reiseplaner/travel/DE.map/smp2.smp"/>
+ <map type="mg" enabled="yes"
data="/opt/reiseplaner/travel/DE.map/smp3.smp"/>
+ <map type="mg" enabled="yes"
data="/opt/reiseplaner/travel/DE.map/smp4.smp"/>
+ <map type="mg" enabled="yes"
data="/opt/reiseplaner/travel/DE.map/smp5.smp"/>
+- </mapset>
++ </mapset> -->
+
+ <!-- If you dont want to use the sample map, either set enabled="no"
in the next line or remove the xml file from the maps directory -->
+- <mapset enabled="yes">
++ <!-- <mapset enabled="no">
+ <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/>
+- </mapset>
++ </mapset> -->
+
+ <!-- Mapset template for openstreetmaps -->
+- <mapset enabled="no">
+- <map type="binfile" enabled="yes"
data="/media/mmc2/MapsNavit/osm_europe.bin"/>
++ <mapset enabled="yes">
++ <map type="binfile" enabled="yes" active="1"
data="/usr/share/navit/maps/*.bin"/>
+ </mapset>
+
+ <!-- Mapset template for garmin maps -->
+- <mapset enabled="no">
++ <!-- <mapset enabled="no">
+ <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/>
+- </mapset>
++ </mapset> -->
+
+ <layout name="Car" color="#ffefb7" font="Liberation Sans">
+ <layer name="polygons">
diff --git a/recipes/navit/files/navit-svn.xml-so.patch
b/recipes/navit/files/navit-svn.xml-so.patch
new file mode 100644
index 0000000..bde8658
--- /dev/null
+++ b/recipes/navit/files/navit-svn.xml-so.patch
@@ -0,0 +1,17 @@
+--- navit/navit/navit_shipped.xml.orig 2009-07-19 13:08:16.000000000 +0200
++++ navit/navit/navit_shipped.xml 2009-07-19 13:09:12.000000000 +0200
+@@ -6,10 +6,10 @@
+ on upgrade. Rather copy it to ~/.navit/. Please read wiki -->
+ <config xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <plugins>
+- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so"
ondemand="yes"/>
+- <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/>
+- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so"
active="no"/>
+- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so"
active="no"/>
++ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0"
ondemand="yes"/>
++ <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so.0"/>
++ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so.0"
active="no"/>
++ <plugin
path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0" active="no"/>
+ </plugins>
+
+ <debug name="navit:do_draw" level="0"/>
diff --git a/recipes/navit/files/navit.desktop
b/recipes/navit/files/navit.desktop
index 085c8c9..05ecc1d 100644
--- a/recipes/navit/files/navit.desktop
+++ b/recipes/navit/files/navit.desktop
@@ -2,7 +2,7 @@
Name=Navit
Comment=GPS Navigation
Exec=navit
-Icon=navit.png
+Icon=navit
Terminal=false
Type=Application
Categories=GTK;
diff --git a/recipes/navit/files/navit.service
b/recipes/navit/files/navit.service
new file mode 100644
index 0000000..add181c
--- /dev/null
+++ b/recipes/navit/files/navit.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.navit_project.navit
+Exec=/usr/bin/navit
diff --git a/recipes/navit/files/navit.xml-so.patch
b/recipes/navit/files/navit.xml-so.patch
index c374756..9151bc4 100644
--- a/recipes/navit/files/navit.xml-so.patch
+++ b/recipes/navit/files/navit.xml-so.patch
@@ -1,13 +1,17 @@
---- navit-0.0.3/src/navit.xml.orig 2008-01-01 15:24:43.000000000 +0000
-+++ navit-0.0.3/src/navit.xml 2008-01-01 15:25:01.000000000 +0000
-@@ -1,8 +1,8 @@
- <?xml version="1.0" encoding="utf-8"?>
- <!DOCTYPE navit SYSTEM "navit.dtd">
- <plugins>
-- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so"/>
-- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so"
active="no" />
-+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0"/>
-+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0"
active="no" />
- </plugins>
- <debug name="navit:do_draw" level="0" />
- <!--
+--- navit/navit/navit.xml.orig 2009-07-19 13:08:16.000000000 +0200
++++ navit/navit/navit.xml 2009-07-19 13:09:12.000000000 +0200
+@@ -6,10 +6,10 @@
+ on upgrade. Rather copy it to ~/.navit/. Please read wiki -->
+ <config xmlns:xi="http://www.w3.org/2001/XInclude";>
+ <plugins>
+- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so"
ondemand="yes"/>
+- <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/>
+- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so"
active="no"/>
+- <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so"
active="no"/>
++ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so.0"
ondemand="yes"/>
++ <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so.0"/>
++ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so.0"
active="no"/>
++ <plugin
path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so.0" active="no"/>
+ </plugins>
+
+ <debug name="navit:do_draw" level="0"/>
diff --git a/recipes/navit/files/use-fso-raw.patch
b/recipes/navit/files/use-fso-raw.patch
new file mode 100644
index 0000000..9b412fe
--- /dev/null
+++ b/recipes/navit/files/use-fso-raw.patch
@@ -0,0 +1,13 @@
+--- a/../navit.launcher
++++ b/../navit.launcher
+@@ -25,6 +25,6 @@ then
+ fi
+ fi
+
+-navit.real $*
++fsoraw -r CPU,GPS -- navit.real $*
+
+
+--
+1.6.0.4
+
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 8ad439d..ca39c07 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -2,31 +2,34 @@ 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"
+
+PE = "1"
inherit autotools
-EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap
--enable-avoid-float --enable-avoid-unaligned"
+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"
-FILES_${PN} += "${libdir}/${PN}/*/*.so"
+FILES_${PN} += "${libdir}/${PN}/*/*.so ${datadir}/dbus-1/services/
${datadir}/icons/*/*/apps/navit.png"
FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+FILES_${PN}-dev += "${libdir}/${PN}/*/*.la"
SRC_URI_append = " \
file://navit.desktop \
file://navit.launcher \
- file://navit.png \
"
+SRC_URI_append_shr = "file://use-fso-raw.patch;patch=1"
+# file://fr-default-config.patch;patch=1"
+
+DEPENDS_shr += "gypsy"
+RDEPENDS_shr += "fsoraw"
do_install_append() {
install -d ${D}${datadir}/applications/
install -m 0644 ${WORKDIR}/navit.desktop ${D}${datadir}/applications/
- install -d ${D}${datadir}/pixmaps/
- install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/
mv ${D}${bindir}/navit ${D}${bindir}/navit.real
install -m 0755 ${WORKDIR}/navit.launcher ${D}${bindir}/navit
-
- rm ${D}${libdir}/${PN}/*/*.la
}
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index 833eb47..ec50008 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -3,7 +3,7 @@ require navit.inc
PV = "0.1.0+svnrev${SRCREV}"
PR = "r2"
-DEFAULT_PREFERENCE = "-1"
+EXTRA_OECONF_shr += " --enable-cache-size=20971520 --with-svg2png-use-convert"
S = "${WORKDIR}/navit"
--
1.6.5.3
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
