[oe-commits] Frederik Sdun : Navit: Add config file for freerunner
git version control
git at git.openembedded.org
Fri Oct 9 09:47:32 UTC 2009
Module: openembedded.git
Branch: shr/import
Commit: 2842c31b09106c85a27f4e45f465ca4cae62755a
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2842c31b09106c85a27f4e45f465ca4cae62755a
Author: Frederik Sdun <frederik.sdun at googlemail.com>
Date: Thu Oct 1 11:12:41 2009 +0000
Navit: Add config file for freerunner
Signed-off-by: Frederik 'playya' Sdun <Frederik.Sdun at googlemail.com>
Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>
---
recipes/navit/files/fr-default-config.patch | 135 +++++++++++++++++++++++++++
recipes/navit/navit.inc | 4 +-
2 files changed, 138 insertions(+), 1 deletions(-)
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/navit.inc b/recipes/navit/navit.inc
index 7563a73..a08a716 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -19,7 +19,9 @@ SRC_URI_append = " \
file://navit.launcher \
file://navit.png \
"
-SRC_URI_append_shr = "file://use-fso-raw.patch;patch=1"
+SRC_URI_append_shr = "file://use-fso-raw.patch;patch=1 \
+ file://fr-default-config.patch;patch=1"
+
DEPENDS_shr += "gypsy"
do_install_append() {
More information about the Openembedded-commits
mailing list