-navit (0.2.0~svn2916+dfsg.1-1maemo2) unstable; urgency=low
+navit (0.2.0~svn2931+dfsg.1-1maemo1) unstable; urgency=low
- * explicit enable espeak
+ * new svn version
+ * libgps fix was apllied upsream
+ * new memleak fixes patch
+ * don't make all png, except the system icons
+ * modfied internal gui and OSD looks like on n810
- -- Henning Heinold <h.heinold@tarent.de> Sun, 24 Jan 2010 01:37:02 +0100
+ -- Henning Heinold <h.heinold@tarent.de> Thu, 28 Jan 2010 11:43:56 +0100
navit (0.2.0~svn2916+dfsg.1-1maemo1) unstable; urgency=low
Index: navit/autogen.sh
===================================================================
---- navit.orig/autogen.sh 2010-01-17 03:05:32.132879754 +0100
-+++ navit/autogen.sh 2010-01-17 03:36:38.909365617 +0100
+--- navit.orig/autogen.sh 2010-01-28 11:24:04.714556309 +0100
++++ navit/autogen.sh 2010-01-28 11:24:54.500388740 +0100
@@ -5,7 +5,10 @@
LIBTOOL=libtool
fi
then
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:33:26.152712378 +0100
-+++ navit/configure.in 2010-01-17 03:36:38.909365617 +0100
+--- navit.orig/configure.in 2010-01-28 11:24:44.803720291 +0100
++++ navit/configure.in 2010-01-28 11:24:54.500388740 +0100
@@ -142,9 +142,16 @@
AC_USE_SYSTEM_EXTENSIONS
Index: navit/navit/xpm/desktop_icons/navit.desktop
===================================================================
---- navit.orig/navit/xpm/desktop_icons/navit.desktop 2010-01-23 14:31:06.324779308 +0100
-+++ navit/navit/xpm/desktop_icons/navit.desktop 2010-01-23 20:04:46.779444054 +0100
+--- navit.orig/navit/xpm/desktop_icons/navit.desktop 2010-01-28 11:43:38.984022100 +0100
++++ navit/navit/xpm/desktop_icons/navit.desktop 2010-01-28 11:43:43.717355306 +0100
@@ -1,5 +1,7 @@
[Desktop Entry]
+Encoding=UTF-8
Index: navit/navit/xpm/desktop_icons/navit.svg
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ navit/navit/xpm/desktop_icons/navit.svg 2010-01-23 02:29:35.249486235 +0100
++++ navit/navit/xpm/desktop_icons/navit.svg 2010-01-31 01:49:26.259775002 +0100
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+</svg>
Index: navit/navit/xpm/Makefile.am
===================================================================
---- navit.orig/navit/xpm/Makefile.am 2010-01-23 02:29:35.242819639 +0100
-+++ navit/navit/xpm/Makefile.am 2010-01-23 02:30:04.981567498 +0100
-@@ -188,6 +188,12 @@
- SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
- %.png:$(srcdir)/*.svg
- SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
+--- navit.orig/navit/xpm/Makefile.am 2010-01-31 01:49:26.253113406 +0100
++++ navit/navit/xpm/Makefile.am 2010-01-31 01:49:51.828945268 +0100
+@@ -184,26 +184,12 @@
+ endif
+
+ if USE_SVG2PNG
+-%.png: $(srcdir)/*.svgz
+- SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
+-%.png: $(srcdir)/*.svg
+- SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
+-
+-pngs = $(addsuffix .png,$(basename $(svgs)))
+-xsize = $(word 1,$(subst x, ,$(scale)))
+-ysize = $(word $(words $(scale)),$(subst x, ,$(scale)))
+-comma =,
+-
+-if USE_SVG2PNG_SCALES
+-pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs))))
+-endif
+-if USE_SVG2PNG_SCALES_FLAG
+-pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
+-endif
+-if USE_SVG2PNG_SCALES_NAV
+-pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs))))
+-endif
+-xpm_DATA += $(pngs)
+desktop_icons/48x48/navit.png:
+ -install -d desktop_icons/48x48/
+ rsvg-convert -w 48 -h 48 -f png -o desktop_icons/48x48/navit.png desktop_icons/navit.svg
+desktop_icons/64x64/navit.png:
+ -install -d desktop_icons/64x64/
+ rsvg-convert -w 64 -h 64 -f png -o desktop_icons/64x64/navit.png desktop_icons/navit.svg
- pngs = $(addsuffix .png,$(basename $(svgs)))
- xsize=$(word 1,$(subst x, ,$(scale)))
- ysize=$(word $(words $(scale)),$(subst x, ,$(scale)))
-@@ -214,14 +220,21 @@
+ endif
+
+ DESKTOPFILEdir=$(datadir)/applications
+@@ -216,14 +202,21 @@
ICON128dir=$(datadir)/icons/hicolor/128x128/apps
ICON128_DATA = desktop_icons/128x128/navit.png
Index: navit/navit/font/freetype/font_freetype.c
===================================================================
---- navit.orig/navit/font/freetype/font_freetype.c 2010-01-17 03:55:07.399254807 +0100
-+++ navit/navit/font/freetype/font_freetype.c 2010-01-17 03:55:21.181754146 +0100
+--- navit.orig/navit/font/freetype/font_freetype.c 2010-01-28 11:24:04.671222855 +0100
++++ navit/navit/font/freetype/font_freetype.c 2010-01-28 11:24:58.047467156 +0100
@@ -5,8 +5,8 @@
#include <ft2build.h>
#include <glib.h>
+++ /dev/null
-To cope both with libgps18 and libgps19
-Index: navit/configure.in
-===================================================================
---- navit.orig/configure.in 2010-01-17 03:33:23.351880510 +0100
-+++ navit/configure.in 2010-01-17 03:33:26.152712378 +0100
-@@ -790,7 +790,17 @@
- AC_ARG_ENABLE(vehicle-gpsd, [ --disable-vehicle-gpsd disable vehicle type gpsd], vehicle_gpsd=$enableval;vehicle_gpsd_reason="configure parameter")
- if test "x${vehicle_gpsd}" = xyes
- then
-- AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h" )
-+ PKG_CHECK_MODULES([GPSD], [libgps], have_libgps="yes", have_libgps="no")
-+ if test "x$have_libgps" = "xyes"; then
-+ AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have libgps.)
-+ PKG_CHECK_MODULES([LIBGPS19], [libgps >= 2.90], have_libgps19="yes", have_libgps19="no")
-+ if test "x$have_libgps19" = "xyes"; then
-+ AC_DEFINE([HAVE_LIBGPS19],[],Define to 1 if you have libgps19.)
-+ fi
-+ else
-+ vehicle_gpsd=no; vehicle_gpsd_reason="no libgps"
-+ fi
-+dnl AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h" )
- fi
- AC_SUBST(GPSD_CFLAGS)
- AC_SUBST(GPSD_LIBS)
-Index: navit/navit/attr_def.h
-===================================================================
---- navit.orig/navit/attr_def.h 2010-01-17 03:05:32.136219088 +0100
-+++ navit/navit/attr_def.h 2010-01-17 03:33:26.152712378 +0100
-@@ -231,7 +231,9 @@
- ATTR(gc_type)
- ATTR(layout)
- ATTR(position_nmea)
-+#ifndef HAVE_LIBGPS19
- ATTR(gpsd_query)
-+#endif
- ATTR(on_eof)
- ATTR(command)
- ATTR(src)
-Index: navit/navit/vehicle/gpsd/vehicle_gpsd.c
-===================================================================
---- navit.orig/navit/vehicle/gpsd/vehicle_gpsd.c 2010-01-17 03:05:32.342468912 +0100
-+++ navit/navit/vehicle/gpsd/vehicle_gpsd.c 2010-01-17 03:33:26.152712378 +0100
-@@ -36,7 +36,9 @@
-
- static struct vehicle_priv {
- char *source;
-+#ifndef HAVE_LIBGPS19
- char *gpsd_query;
-+#endif
- struct callback_list *cbl;
- struct callback *cb;
- struct event_watch *evwatch;
-@@ -69,8 +71,12 @@
- static void vehicle_gpsd_io(struct vehicle_priv *priv);
-
- static void
-+#ifdef HAVE_LIBGPS19
-+vehicle_gpsd_callback(struct gps_data_t *data, char *buf, size_t len)
-+#else
- vehicle_gpsd_callback(struct gps_data_t *data, char *buf, size_t len,
- int level)
-+#endif
- {
- char *pos,*nmea_data_buf;
- int i=0,sats_signal=0;
-@@ -108,16 +114,32 @@
- data->set &= ~ALTITUDE_SET;
- }
- if (data->set & SATELLITE_SET) {
-+#ifdef HAVE_LIBGPS19
-+ if(data->satellites_visible > 0) {
-+#else
- if(data->satellites > 0) {
-+#endif
- sats_signal=0;
-+#ifdef HAVE_LIBGPS19
-+ for( i=0;i<data->satellites_visible;i++) {
-+#else
- for( i=0;i<data->satellites;i++) {
-+#endif
- if (data->ss[i] > 0)
- sats_signal++;
- }
- }
-+#ifdef HAVE_LIBGPS19
-+ if (priv->sats_used != data->satellites_used || priv->sats != data->satellites_visible || priv->sats_signal != sats_signal ) {
-+#else
- if (priv->sats_used != data->satellites_used || priv->sats != data->satellites || priv->sats_signal != sats_signal ) {
-+#endif
- priv->sats_used = data->satellites_used;
-+#ifdef HAVE_LIBGPS19
-+ priv->sats = data->satellites_visible;
-+#else
- priv->sats = data->satellites;
-+#endif
- priv->sats_signal = sats_signal;
- callback_list_call_attr_0(priv->cbl, attr_position_sats);
- }
-@@ -135,10 +157,17 @@
- priv->fix_time = data->fix.time;
- data->set &= ~TIME_SET;
- }
-+#ifdef HAVE_LIBGPS19
-+ if (data->set & DOP_SET) {
-+ dbg(1, "pdop : %g\n", data->dop.pdop);
-+ priv->hdop = data->dop.pdop;
-+ data->set &= ~DOP_SET;
-+#else
- if (data->set & PDOP_SET) {
- dbg(1, "pdop : %g\n", data->pdop);
- priv->hdop = data->hdop;
- data->set &= ~PDOP_SET;
-+#endif
- }
- if (data->set & LATLON_SET) {
- priv->geo.lat = data->fix.latitude;
-@@ -180,7 +209,11 @@
- dbg(0,"gps_open failed for '%s'. Retrying in %d seconds. Have you started gpsd?\n", priv->source, priv->retry_interval);
- return TRUE;
- }
-+#ifdef HAVE_LIBGPS19
-+ gps_stream(priv->gps, WATCH_ENABLE, NULL);
-+#else
- gps_query(priv->gps, priv->gpsd_query);
-+#endif
- gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
- priv->cb = callback_new_1(callback_cast(vehicle_gpsd_io), priv);
- priv->evwatch = event_add_watch((void *)priv->gps->gps_fd, event_watch_cond_read, priv->cb);
-@@ -268,8 +301,10 @@
- vehicle_gpsd_close(priv);
- if (priv->source)
- g_free(priv->source);
-+#ifndef HAVE_LIBGPS19
- if (priv->gpsd_query)
- g_free(priv->gpsd_query);
-+#endif
- g_free(priv);
- }
-
-@@ -350,12 +385,17 @@
- *cbl, struct attr **attrs)
- {
- struct vehicle_priv *ret;
-+#ifdef HAVE_LIBGPS19
-+ struct attr *source, *retry_int;
-+#else
- struct attr *source, *query, *retry_int;
-+#endif
-
- dbg(1, "enter\n");
- source = attr_search(attrs, NULL, attr_source);
- ret = g_new0(struct vehicle_priv, 1);
- ret->source = g_strdup(source->u.str);
-+#ifndef HAVE_LIBGPS19
- query = attr_search(attrs, NULL, attr_gpsd_query);
- if (query) {
- ret->gpsd_query = g_strconcat(query->u.str, "\n", NULL);
-@@ -363,6 +403,7 @@
- ret->gpsd_query = g_strdup("w+x\n");
- }
- dbg(1,"Format string for gpsd_query: %s\n",ret->gpsd_query);
-+#endif
- retry_int = attr_search(attrs, NULL, attr_retry_interval);
- if (retry_int) {
- ret->retry_interval = retry_int->u.num;
-Index: navit/navit/attr.h
-===================================================================
---- navit.orig/navit/attr.h 2010-01-17 03:05:32.136219088 +0100
-+++ navit/navit/attr.h 2010-01-17 03:33:26.152712378 +0100
-@@ -25,6 +25,7 @@
- #endif
-
- #include "projection.h"
-+#include "config.h"
-
- enum item_type;
-
-Index: navit/navit/map/garmin/Makefile.am
-===================================================================
---- navit.orig/navit/map/garmin/Makefile.am 2010-01-17 03:05:32.168714241 +0100
-+++ navit/navit/map/garmin/Makefile.am 2010-01-17 03:33:26.152712378 +0100
-@@ -20,7 +20,7 @@
- gentypes_SOURCES=gentypes.c
-
- gentypes.$(OBJEXT): gentypes.c
-- $(CC_FOR_BUILD) -I$(top_srcdir)/navit -c -o $@ $<
-+ $(CC_FOR_BUILD) -I$(top_srcdir)/navit -I$(top_srcdir) -c -o $@ $<
-
- gentypes$(EXEEXT): $(gentypes_OBJECTS) $(gentypes_DEPENDENCIES)
- @rm -f gentypes$(EXEEXT)
--- /dev/null
+Index: navit/navit/font/freetype/font_freetype.c
+===================================================================
+--- navit.orig/navit/font/freetype/font_freetype.c 2010-01-28 22:50:40.680020207 +0100
++++ navit/navit/font/freetype/font_freetype.c 2010-01-28 22:51:12.632935443 +0100
+@@ -5,8 +5,8 @@
+ #include <ft2build.h>
+ #include <glib.h>
+ #include FT_FREETYPE_H
+-#ifdef USE_CACHING
+-#undef USE_CACHING
++#ifndef USE_CACHING
++#define USE_CACHING 1
+ #endif
+ #if USE_CACHING
+ #include FT_CACHE_H
+@@ -132,11 +132,10 @@
+ if (glyph_bbox.yMax > bbox.yMax)
+ bbox.yMax = glyph_bbox.yMax;
+ p = g_utf8_next_char(p);
+-#if USE_CACHING
++
+ FT_Done_Glyph(glyph);
++#if USE_CACHING
+ FTC_Node_Unref(anode, manager);
+-#else
+- FT_Done_Glyph(glyph);
+ #endif
+ }
+ if (bbox.xMin > bbox.xMax) {
+@@ -239,8 +238,9 @@
+
+ curr->dx = glyph->advance.x >> 10;
+ curr->dy = -glyph->advance.y >> 10;
+-#if USE_CACHING
++
+ FT_Done_Glyph(glyph);
++#if USE_CACHING
+ FTC_Node_Unref(anode, manager);
+ #endif
+ p = g_utf8_next_char(p);
+@@ -265,6 +265,9 @@
+ static void
+ font_destroy(struct graphics_font_priv *font)
+ {
++#ifndef USE_CACHING
++ FT_Done_Face(((struct font_freetype_font*) font)->face);
++#endif
+ g_free(font);
+ /* TODO: free font->face */
+ }
+@@ -292,25 +295,34 @@
+ {
+ FT_Error ret;
+ char *fontfile,*fontindex;
++
+ if (! face_id)
+ return FT_Err_Invalid_Handle;
++
+ fontfile=g_strdup((char *)face_id);
+ dbg(1,"fontfile=%s\n", fontfile);
+ fontindex=strrchr(fontfile,'/');
++
+ if (! fontindex) {
++ dbg(0,"Error while getting the fontindex");
+ g_free(fontfile);
+ return FT_Err_Invalid_Handle;
+ }
++
+ *fontindex++='\0';
+ dbg(1,"new face %s %d\n", fontfile, atoi(fontindex));
+ ret = FT_New_Face( library, fontfile, atoi(fontindex), aface );
+ if(ret) {
+- dbg(0,"Error while creating freetype face: %d\n", ret);
+- return ret;
++ dbg(0,"Error while creating freetype face: %d\n", ret);
++ g_free(fontfile);
++ return ret;
+ }
++
+ if((ret = FT_Select_Charmap(*aface, FT_ENCODING_UNICODE))) {
+- dbg(0,"Error while creating freetype face: %d\n", ret);
++ dbg(0,"Error while creating freetype face: %d\n", ret);
+ }
++
++ g_free(fontfile);
+ return 0;
+ }
+ #endif
Workaround for unhandled attrs in MG
Index: navit/navit/map/mg/town.c
===================================================================
---- navit.orig/navit/map/mg/town.c 2010-01-17 03:05:32.172047388 +0100
-+++ navit/navit/map/mg/town.c 2010-01-17 03:33:31.236045197 +0100
+--- navit.orig/navit/map/mg/town.c 2010-01-28 11:24:04.764555911 +0100
++++ navit/navit/map/mg/town.c 2010-01-28 11:24:47.414141125 +0100
@@ -105,7 +105,8 @@
twn->attr_next=attr_none;
return 1;
Don't build map/poi_geodownload by default
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:33:20.545214274 +0100
-+++ navit/configure.in 2010-01-17 03:33:23.351880510 +0100
+--- navit.orig/configure.in 2010-01-28 11:24:42.078308401 +0100
++++ navit/configure.in 2010-01-28 11:24:44.803720291 +0100
@@ -36,6 +36,7 @@
plugins=yes; plugins_reason=default
postgresql=yes; postgresql_reason=default
Handle the removal of embedded libespeak from upstream-svn
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:33:15.418553637 +0100
-+++ navit/configure.in 2010-01-17 03:33:17.828547947 +0100
-@@ -873,7 +873,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:36.890387435 +0100
++++ navit/configure.in 2010-01-28 11:24:39.321636269 +0100
+@@ -882,7 +882,6 @@
navit/speech/espeak/Makefile
navit/speech/speech_dispatcher/Makefile
navit/support/Makefile
Handles the removal of embedded ezxml from upstream-svn.
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:32:59.335222202 +0100
-+++ navit/configure.in 2010-01-17 03:33:03.828549386 +0100
-@@ -876,7 +876,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:23.667887733 +0100
++++ navit/configure.in 2010-01-28 11:24:26.251220086 +0100
+@@ -885,7 +885,6 @@
navit/speech/speech_dispatcher/Makefile
navit/support/Makefile
navit/support/espeak/Makefile
Handles the removal of embedded glib from upstream-svn.
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:32:47.882299831 +0100
-+++ navit/configure.in 2010-01-17 03:32:53.128965783 +0100
-@@ -879,7 +879,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:08.511222460 +0100
++++ navit/configure.in 2010-01-28 11:24:18.133722146 +0100
+@@ -888,7 +888,6 @@
navit/support/Makefile
navit/support/espeak/Makefile
navit/support/ezxml/Makefile
iHandles the removal of embedded mdbtools from upstream-svn.
Index: navit/navit/map/poi_geodownload/Makefile.am
===================================================================
---- navit.orig/navit/map/poi_geodownload/Makefile.am 2010-01-17 03:05:32.172047388 +0100
-+++ navit/navit/map/poi_geodownload/Makefile.am 2010-01-17 03:32:59.331885127 +0100
+--- navit.orig/navit/map/poi_geodownload/Makefile.am 2010-01-28 11:24:05.161223044 +0100
++++ navit/navit/map/poi_geodownload/Makefile.am 2010-01-28 11:24:23.667887733 +0100
@@ -1,7 +1,6 @@
-SUBDIRS=libmdb
include $(top_srcdir)/Makefile.inc
libmap_poi_geodownload_la_LDFLAGS = -module -avoid-version
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:32:55.768965678 +0100
-+++ navit/configure.in 2010-01-17 03:32:59.335222202 +0100
-@@ -849,8 +849,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:20.940395365 +0100
++++ navit/configure.in 2010-01-28 11:24:23.667887733 +0100
+@@ -858,8 +858,6 @@
navit/map/binfile/Makefile
navit/map/garmin/Makefile
navit/map/poi_geodownload/Makefile
Handle the removal of embedded libpng from upstream-svn.
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:33:12.435215128 +0100
-+++ navit/configure.in 2010-01-17 03:33:15.418553637 +0100
-@@ -874,7 +874,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:34.500803653 +0100
++++ navit/configure.in 2010-01-28 11:24:36.890387435 +0100
+@@ -883,7 +883,6 @@
navit/speech/speech_dispatcher/Makefile
navit/support/Makefile
navit/support/espeak/Makefile
Handles the removal of the embedded mini-libc from upstream-svn.
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:32:53.128965783 +0100
-+++ navit/configure.in 2010-01-17 03:32:55.768965678 +0100
-@@ -879,7 +879,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:18.133722146 +0100
++++ navit/configure.in 2010-01-28 11:24:20.940395365 +0100
+@@ -888,7 +888,6 @@
navit/support/Makefile
navit/support/espeak/Makefile
navit/support/ezxml/Makefile
Nothing to build from navit/support.
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:33:17.828547947 +0100
-+++ navit/configure.in 2010-01-17 03:33:20.545214274 +0100
-@@ -872,7 +872,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:39.321636269 +0100
++++ navit/configure.in 2010-01-28 11:24:42.078308401 +0100
+@@ -881,7 +881,6 @@
navit/speech/dbus/Makefile
navit/speech/espeak/Makefile
navit/speech/speech_dispatcher/Makefile
navit/vehicle/file/Makefile
Index: navit/navit/Makefile.am
===================================================================
---- navit.orig/navit/Makefile.am 2010-01-17 03:32:47.882299831 +0100
-+++ navit/navit/Makefile.am 2010-01-17 03:33:20.545214274 +0100
+--- navit.orig/navit/Makefile.am 2010-01-28 11:24:08.511222460 +0100
++++ navit/navit/Makefile.am 2010-01-28 11:24:42.078308401 +0100
@@ -1,10 +1,10 @@
include $(top_srcdir)/Makefile.inc
comma=,
Handles the removal of embedded ttf-liberation from upstream-svn.
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:32:43.728972472 +0100
-+++ navit/configure.in 2010-01-17 03:32:47.882299831 +0100
-@@ -855,7 +855,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:05.284556117 +0100
++++ navit/configure.in 2010-01-28 11:24:08.511222460 +0100
+@@ -864,7 +864,6 @@
navit/fib-1.1/Makefile
navit/font/Makefile
navit/font/freetype/Makefile
navit/graphics/gd/Makefile
Index: navit/navit/Makefile.am
===================================================================
---- navit.orig/navit/Makefile.am 2010-01-17 03:32:43.735633320 +0100
-+++ navit/navit/Makefile.am 2010-01-17 03:32:47.882299831 +0100
+--- navit.orig/navit/Makefile.am 2010-01-28 11:24:05.291222979 +0100
++++ navit/navit/Makefile.am 2010-01-28 11:24:08.511222460 +0100
@@ -4,12 +4,9 @@
if PLUGINS
SUBDIRS += .
Handle the removal of win32 specific parts from upstream-svn.
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:33:06.341882540 +0100
-+++ navit/configure.in 2010-01-17 03:33:08.708548445 +0100
-@@ -861,11 +861,9 @@
+--- navit.orig/configure.in 2010-01-28 11:24:28.997470291 +0100
++++ navit/configure.in 2010-01-28 11:24:32.027887002 +0100
+@@ -870,11 +870,9 @@
navit/graphics/null/Makefile
navit/graphics/sdl/Makefile
navit/graphics/qt_qpainter/Makefile
navit/osd/Makefile
navit/osd/core/Makefile
navit/speech/Makefile
-@@ -877,7 +875,6 @@
+@@ -886,7 +884,6 @@
navit/support/Makefile
navit/support/espeak/Makefile
navit/support/libpng/Makefile
navit/vehicle/android/Makefile
Index: navit/navit/gui/Makefile.am
===================================================================
---- navit.orig/navit/gui/Makefile.am 2010-01-17 03:05:32.165381006 +0100
-+++ navit/navit/gui/Makefile.am 2010-01-17 03:33:08.708548445 +0100
+--- navit.orig/navit/gui/Makefile.am 2010-01-28 11:24:05.031222813 +0100
++++ navit/navit/gui/Makefile.am 2010-01-28 11:24:32.027887002 +0100
@@ -5,6 +5,3 @@
if GUI_GTK
SUBDIRS += gtk
-endif
Index: navit/navit/graphics/Makefile.am
===================================================================
---- navit.orig/navit/graphics/Makefile.am 2010-01-17 03:05:32.162047510 +0100
-+++ navit/navit/graphics/Makefile.am 2010-01-17 03:33:08.708548445 +0100
+--- navit.orig/navit/graphics/Makefile.am 2010-01-28 11:24:05.037889640 +0100
++++ navit/navit/graphics/Makefile.am 2010-01-28 11:24:32.027887002 +0100
@@ -14,9 +14,6 @@
if USE_GRAPHICS_SDL
SUBDIRS+=sdl
Handles the removal of embedded wordexp from upstream-svn.
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:33:08.708548445 +0100
-+++ navit/configure.in 2010-01-17 03:33:12.435215128 +0100
-@@ -875,7 +875,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:32.027887002 +0100
++++ navit/configure.in 2010-01-28 11:24:34.500803653 +0100
+@@ -884,7 +884,6 @@
navit/support/Makefile
navit/support/espeak/Makefile
navit/support/libpng/Makefile
Handles the removal of embedded zlib from upstream-svn.
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:33:03.828549386 +0100
-+++ navit/configure.in 2010-01-17 03:33:06.341882540 +0100
-@@ -879,7 +879,6 @@
+--- navit.orig/configure.in 2010-01-28 11:24:26.251220086 +0100
++++ navit/configure.in 2010-01-28 11:24:28.997470291 +0100
+@@ -888,7 +888,6 @@
navit/support/libpng/Makefile
navit/support/win32/Makefile
navit/support/wordexp/Makefile
Revert part of svn2859 which lead to null pointer
Index: navit/navit/graphics.c
===================================================================
---- navit.orig/navit/graphics.c 2010-01-17 03:29:04.289821917 +0100
-+++ navit/navit/graphics.c 2010-01-17 03:33:33.758545997 +0100
-@@ -2258,7 +2258,7 @@
+--- navit.orig/navit/graphics.c 2010-01-28 11:24:04.741222833 +0100
++++ navit/navit/graphics.c 2010-01-28 11:24:52.064135191 +0100
+@@ -2202,7 +2202,7 @@
return;
}
}
item=map_rect_get_item_byid(mr, item->id_hi, item->id_lo);
count=item_coord_get(item, ca, item->type < type_line ? 1: max);
if (!item_attr_get(item, attr_label, &attr))
-@@ -2269,7 +2269,7 @@
+@@ -2213,7 +2213,7 @@
map_convert_free(str);
} else
display_add(dl, item, count, ca, attr.u.str);
Index: navit/configure.in
===================================================================
---- navit.orig/configure.in 2010-01-17 03:57:45.000000000 +0100
-+++ navit/configure.in 2010-01-17 03:58:01.441732498 +0100
+--- navit.orig/configure.in 2010-01-28 11:24:54.500388740 +0100
++++ navit/configure.in 2010-01-28 11:25:00.401640057 +0100
@@ -211,6 +211,13 @@
], [
AC_MSG_RESULT(no)
AC_SUBST(HILDON_CFLAGS)
Index: navit/navit/Makefile.am
===================================================================
---- navit.orig/navit/Makefile.am 2010-01-17 03:57:45.000000000 +0100
-+++ navit/navit/Makefile.am 2010-01-17 03:58:01.441732498 +0100
+--- navit.orig/navit/Makefile.am 2010-01-28 11:24:42.078308401 +0100
++++ navit/navit/Makefile.am 2010-01-28 11:25:00.401640057 +0100
@@ -18,7 +18,7 @@
endif
Index: navit/navit/attr_def.h
===================================================================
---- navit.orig/navit/attr_def.h 2010-01-17 03:57:45.000000000 +0100
-+++ navit/navit/attr_def.h 2010-01-17 03:58:01.441732498 +0100
-@@ -276,6 +276,7 @@
+--- navit.orig/navit/attr_def.h 2010-01-28 11:24:04.621222786 +0100
++++ navit/navit/attr_def.h 2010-01-28 11:25:00.401640057 +0100
+@@ -274,6 +274,7 @@
ATTR(filter)
ATTR(daylayout)
ATTR(nightlayout)
ATTR(user_name)
Index: navit/navit/gui/internal/gui_internal.c
===================================================================
---- navit.orig/navit/gui/internal/gui_internal.c 2010-01-17 03:56:03.000000000 +0100
-+++ navit/navit/gui/internal/gui_internal.c 2010-01-17 03:58:01.441732498 +0100
-@@ -4365,6 +4365,9 @@
+--- navit.orig/navit/gui/internal/gui_internal.c 2010-01-28 11:24:04.627889542 +0100
++++ navit/navit/gui/internal/gui_internal.c 2010-01-28 11:25:00.404973203 +0100
+@@ -4369,6 +4369,9 @@
graphics_draw_mode(this->gra, draw_mode_end);
this->win->fullscreen(this->win, attr->u.num > 0);
graphics_draw_mode(this->gra, draw_mode_begin);
return 1;
Index: navit/navit/navit.h
===================================================================
---- navit.orig/navit/navit.h 2010-01-17 03:56:03.000000000 +0100
-+++ navit/navit/navit.h 2010-01-17 03:58:01.445071550 +0100
+--- navit.orig/navit/navit.h 2010-01-28 11:24:04.634556515 +0100
++++ navit/navit/navit.h 2010-01-28 11:25:00.404973203 +0100
@@ -61,6 +61,10 @@
void navit_ignore_graphics_events(struct navit *this_, int ignore);
int navit_handle_button(struct navit *this_, int pressed, int button, struct point *p, struct callback *popup_callback);
struct navit *navit_new(struct attr *parent, struct attr **attrs);
Index: navit/navit/xpm/Makefile.am
===================================================================
---- navit.orig/navit/xpm/Makefile.am 2010-01-17 03:56:03.000000000 +0100
-+++ navit/navit/xpm/Makefile.am 2010-01-17 03:58:01.445071550 +0100
-@@ -205,7 +205,11 @@
+--- navit.orig/navit/xpm/Makefile.am 2010-01-28 11:24:04.641222748 +0100
++++ navit/navit/xpm/Makefile.am 2010-01-28 11:25:00.404973203 +0100
+@@ -207,7 +207,11 @@
endif
DESKTOPFILEdir=$(datadir)/applications
ICON128dir=$(datadir)/icons/hicolor/128x128/apps
ICON128_DATA = desktop_icons/128x128/navit.png
-diff --git a/navit/navit.c b/navit/navit.c
-index eb92e8b..83a3b88 100644
---- a/navit/navit.c
-+++ b/navit/navit.c
+Index: navit/navit/navit.c
+===================================================================
+--- navit.orig/navit/navit.c 2010-01-28 11:24:04.647889371 +0100
++++ navit/navit/navit.c 2010-01-28 11:25:00.404973203 +0100
@@ -61,7 +61,9 @@
#include "messages.h"
#include "vehicleprofile.h"
/**
* @defgroup navit the navit core instance. navit is the object containing nearly everything: A set of maps, one or more vehicle, a graphics object for rendering the map, a gui object for displaying the user interface, a route object, a navigation object and so on. Be warned that it is theoretically possible to have more than one navit object
* @{
-@@ -138,8 +140,15 @@ struct navit {
+@@ -138,8 +140,15 @@
int prevTs;
int graphics_flags;
int zoom_min, zoom_max;
struct gui *main_loop_gui;
struct attr_iter {
-@@ -160,6 +169,102 @@ static void navit_cmd_set_center_cursor(struct navit *this_);
+@@ -160,6 +169,102 @@
static void navit_cmd_announcer_toggle(struct navit *this_);
static void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv);
+ dbg(2,"setting fullscreen to %s\n", fullscreen == 0 ? "no":"yes");
+ this_->fullscreen = (fullscreen == 1);
+}
-+
++
+/**
+ * * Tell osso to unblank the screen
+ * *
void
navit_add_mapset(struct navit *this_, struct mapset *ms)
{
-@@ -681,6 +786,10 @@ navit_new(struct attr *parent, struct attr **attrs)
+@@ -681,6 +786,10 @@
this_->prevTs=0;
transform_setup(this_->trans, ¢er, zoom, (this_->orientation != -1) ? this_->orientation : 0);
for (;*attrs; attrs++) {
navit_set_attr_do(this_, *attrs, 1);
-@@ -1031,8 +1140,6 @@ navit_add_bookmark(struct navit *this_, struct pcoord *c, const char *descriptio
+@@ -1031,8 +1140,6 @@
callback_list_call_attr_0(this_->attr_cbl, attr_bookmark_map);
}
static void
navit_add_bookmarks_from_file(struct navit *this_)
{
-@@ -1395,6 +1502,19 @@ navit_init(struct navit *this_)
+@@ -1395,6 +1502,19 @@
navit_window_items_new(this_);
#endif
+ dbg(0, "error initiating osso context\n");
+ }
+ osso_hw_set_event_cb(this_->osso_context, NULL, osso_cb_hw_state, NULL);
-+
++
+ /* add callback to unblank screen on gps event */
+ navit_add_callback(this_, callback_new_attr_1(callback_cast(navit_osso_display_on), attr_position_coord_geo, this_));
+#endif
messagelist_init(this_->messages);
navit_set_cursors(this_);
-@@ -1746,6 +1866,14 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
+@@ -1746,6 +1866,14 @@
attr_updated=(this_->center_timeout != attr->u.num);
this_->center_timeout = attr->u.num;
break;
case attr_tracking:
attr_updated=(this_->tracking_flag != !!attr->u.num);
this_->tracking_flag=!!attr->u.num;
-@@ -2447,6 +2575,12 @@ navit_block(struct navit *this_, int block)
+@@ -2448,6 +2576,12 @@
void
navit_destroy(struct navit *this_)
{
+#ifdef HAVE_OSSO
+ dbg(1,"Disconnecting from osso\n");
+ osso_deinitialize(this_->osso_context);
-+#endif
++#endif
+
/* TODO: destroy objects contained in this_ */
if (this_->vehicle)
remove-espeak
remove-support
no-default-poi-geodownload
-libgps-2.90-fix
mg-unhandled-attr
revert-part-of-svn2859
autotools.patch
desktop_icons.patch
desktop_file.patch
xml_config.patch
+memfixes.patch
Index: navit/navit/navit_shipped.xml
===================================================================
---- navit.orig/navit/navit_shipped.xml 2010-01-23 20:31:03.565946503 +0100
-+++ navit/navit/navit_shipped.xml 2010-01-23 22:11:45.138676412 +0100
-@@ -38,7 +38,7 @@
+--- navit.orig/navit/navit_shipped.xml 2010-01-28 11:46:24.887339124 +0100
++++ navit/navit/navit_shipped.xml 2010-01-28 15:32:31.515572482 +0100
+@@ -38,9 +38,9 @@
<!--
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" fullscreen="1" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> -->
- <gui type="internal" enabled="yes"><![CDATA[
+- <gui type="internal" enabled="yes"><![CDATA[
++ <gui type="internal" fullscreen="1" font_size="350" icon_xs="32" icon_s="96" icon_l="96" enabled="yes"><![CDATA[
<html>
-@@ -83,23 +83,48 @@
+ <a name='Main Menu'><text>Main menu</text>
+ <a href='#Actions'><img src='gui_actions'>Actions</img></a>
+@@ -49,7 +49,7 @@
+ <a href='#Settings'><img src='gui_settings'><text>Settings</text></img></a>
+ <a href='#Tools'><img src='gui_tools'><text>Tools</text></img></a>
+ <a href='#Route'><img src='gui_settings'><text>Route</text></img></a>
+- <img src='gui_about' onclick='about()'><text>About</text></img>
++ <img src='gui_tools' onclick='about()'><text>About</text></img>
+ </a>
+ <a name='Actions'><text>Actions</text>
+ <img src='gui_bookmark' onclick='bookmarks()'><text>Bookmarks</text></img>
+@@ -84,23 +84,49 @@
]]></gui>
<!-- for a debug log -->
<log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/>
<osd enabled="no" type="navigation_distance_to_next"/>
<osd enabled="no" type="navigation_next_turn"/>
-+ <osd enabled="yes" type="compass" x="-110" y="-60" font_size="250" w="60" h="60" background_color="#000000c8"/>
-+ <osd enabled="yes" type="gps_status" x="-50" y="-60" w="50" h="40" background_color="#000000c8"/>
-+ <osd enabled="yes" type="text" label="${vehicle.position_sats_signal}/${vehicle.position_qual}" x="-50" y="-20"
-+ font_size="250" w="50" h="20" align="0" background_color="#000000c8"/>
-+ <osd enabled="yes" type="text" label="${vehicle.position_speed}" x="0" y="-60" font_size="400" w="110" h="60"
-+ align="4" background_color="#000000c8"/>
-+ <osd enabled="yes" type="text" label="ETA: ${navigation.item.destination_time[arrival]}" x="110" y="-30"
++ <osd enabled="yes" type="compass" x="-110" y="-60" font_size="250" w="60" h="60" background_color="#000000c8"/>
++ <osd enabled="yes" type="gps_status" x="-50" y="-60" w="50" h="40" background_color="#000000c8"/>
++ <osd enabled="yes" type="text" label="${vehicle.position_sats_signal}/${vehicle.position_qual}" x="-50" y="-20"
++ font_size="250" w="50" h="20" align="0" background_color="#000000c8"/>
++ <osd enabled="yes" type="text" label="${vehicle.position_speed}" x="0" y="-60" font_size="400" w="110" h="60"
++ align="4" background_color="#000000c8"/>
++ <osd enabled="yes" type="text" label="ETA: ${navigation.item.destination_time[arrival]}" x="110" y="-30"
+ font_size="300" w="170" h="30" align="4" background_color="#000000c8"/>
-+ <osd enabled="yes" type="text" label="${navigation.item.destination_length[named]}" x="280" y="-30"
-+ font_size="300" w="170" h="30" align="4" background_color="#000000c8"/>
-+ <osd enabled="yes" type="text" label="${navigation.item.destination_time[remaining]}" x="450" y="-30"
-+ font_size="300" w="240" h="30" align="4" background_color="#000000c8"/>
-+ <osd enabled="yes" type="text" label="In ${navigation.item[1].length[named]} " x="0" y="0" font_size="500"
-+ w="245" h="40" align="4" background_color="#000000c8"/>
-+ <osd enabled="yes" type="navigation_next_turn" x="245" y="0" font_size="500" w="60" h="40" background_color="#000000c8"
-+ icon_src="$NAVIT_SHAREDIR/xpm/%s_wh_48_48.png" />
-+ <osd enabled="yes" type="text" label="Onto ${navigation.item[1].street_name}" x="305" y="0" font_size="500"
-+ w="495" h="40" align="4" background_color="#000000c8"/>
-+ <osd enabled="yes" type="text" label="${navigation.item.street_name}" x="110" y="-60" font_size="500"
-+ w="580" h="30" align="0" background_color="#000000c8"/>
++ <osd enabled="yes" type="text" label="${navigation.item.destination_length[named]}" x="280" y="-30"
++ font_size="300" w="170" h="30" align="4" background_color="#000000c8"/>
++ <osd enabled="yes" type="text" label="${navigation.item.destination_time[remaining]}" x="450" y="-30"
++ font_size="300" w="240" h="30" align="4" background_color="#000000c8"/>
++ <osd enabled="yes" type="text" label="In ${navigation.item[1].length[named]} " x="0" y="0" font_size="500"
++ w="245" h="40" align="4" background_color="#000000c8"/>
++ <osd enabled="yes" type="navigation_next_turn" x="245" y="0" font_size="500" w="60" h="40" background_color="#000000c8"
++ icon_src="$NAVIT_SHAREDIR/xpm/%s.svg" />
++ <osd enabled="yes" type="text" label="Onto ${navigation.item[1].street_name}" x="305" y="0" font_size="500"
++ w="495" h="40" align="4" background_color="#000000c8"/>
++ <osd enabled="yes" type="text" label="${navigation.item.street_name}" x="110" y="-60" font_size="500"
++ w="580" h="30" align="0" background_color="#000000c8"/>
+
<!-- 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.
- <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"/>
-+ <osd enabled="yes" type="button" x="0" y="0" command="gui.fullscreen=!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="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj">
++ <osd enabled="yes" type="button" x="-60" y="50" command="zoom_in()" src="gui_zoom_in.svg"/>
++ <osd enabled="yes" type="button" x="-60" y="130" command="gui.fullscreen=!gui.fullscreen" src="gui_fullscreen.svg"/>
++ <osd enabled="yes" type="button" x="-60" y="220" command="zoom_out()" src="gui_zoom_out.svg"/>
++ <osd enabled="yes" type="button" x="-70" y="290" command="gui.menu()" src="gui_menu.svg"/>
+
+ <!-- allow user customize the OSD -->
+ <xi:include href="/home/user/.navit/OSD.xml"/>
-
-- <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj">
++
+ <!-- On n900 we are using maemo vehicle -->
+ <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="maemo">
<!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): -->
<log enabled="no" 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"/>
</vehicle>
-@@ -354,8 +379,12 @@
+@@ -355,8 +381,12 @@
<!-- 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="flite -t '%s'"/> -->
+ <!-- on n900 espeak works pretty good, but user have to enable it, put this line with enabled="yes"
+ into the speech.xml file -->
-+ <speech type="espeak" enabled="no"/>
++ <speech type="cmdline" data="espeak '%s'" enabled="no"/>
+ <xi:include href="/home/user/.navit/speech.xml"/>
<!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly -->
<mapset enabled="no">
-@@ -368,10 +397,15 @@
+@@ -369,10 +399,16 @@
</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 template for userdefined maps on n900 -->
+ <mapset enabled="yes">
++ <map type="binfile" enabled="yes" data="/home/user/MyDocs/map.bin"/>
+ <xi:include href="/home/user/.navit/maps.xml"/>
+ </mapset>
+
<!-- Mapset template for openstreetmaps -->
<mapset enabled="no">
<map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/>
+@@ -1520,7 +1556,7 @@
+ <icon src="unknown.xpm"/>
+ </itemgra>
+ <itemgra item_types="announcement" order="7-">
+- <icon src="gui_sound_32_32.png"/>
++ <icon src="gui_sound.svg"/>
+ <circle color="#FF089C" radius="10" text_size="7"/>
+ </itemgra>
+ </layer>
+@@ -1542,7 +1578,7 @@
+ <icon src="mini_roundabout.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_airport" order="5-">
+- <icon src="airport.png"/>
++ <icon src="airport.svg"/>
+ </itemgra>
+ <itemgra item_types="town_ghost" order="10-">
+ <icon src="ghost_town.xpm"/>
+@@ -1557,13 +1593,13 @@
+ <icon src="car_dealer.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_fuel" order="12-">
+- <icon src="fuel.png"/>
++ <icon src="fuel.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_shopping" order="12-">
+- <icon src="shopping.png"/>
++ <icon src="shopping.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_attraction" order="11-">
+- <icon src="attraction.png"/>
++ <icon src="attraction.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_cafe" order="12-">
+ <icon src="cafe.xpm"/>
+@@ -1575,7 +1611,7 @@
+ <icon src="bridge.xpm"/>
+ </itemgra>
+ <itemgra item_types="highway_exit" order="11-">
+- <icon src="exit.png"/>
++ <icon src="exit.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_camp_rv" order="12-">
+ <icon src="camping.xpm"/>
+@@ -1584,16 +1620,16 @@
+ <icon src="museum.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_hospital" order="12-">
+- <icon src="hospital.png"/>
++ <icon src="hospital.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_dining" order="12-">
+ <icon src="dining.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_fastfood" order="12-">
+- <icon src="fastfood.png"/>
++ <icon src="fastfood.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_police" order="12-">
+- <icon src="police.png"/>
++ <icon src="police.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_auto_club" order="12-">
+ <icon src="auto_club.xpm"/>
+@@ -1602,7 +1638,7 @@
+ <icon src="car_dealer.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_bank" order="12-">
+- <icon src="bank.png"/>
++ <icon src="bank.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_bay" order="12-">
+ <icon src="bay.xpm"/>
+@@ -1611,7 +1647,7 @@
+ <icon src="bend.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_boat_ramp" order="12-">
+- <icon src="boat_ramp.png"/>
++ <icon src="boat_ramp.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_border_station" order="12-">
+ <icon src="border_station.xpm"/>
+@@ -1620,10 +1656,10 @@
+ <icon src="bowling.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_bus_station" order="11-">
+- <icon src="bus.png"/>
++ <icon src="bus.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_bus_stop" order="12-">
+- <icon src="bus.png"/>
++ <icon src="bus.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_business_service" order="12-">
+ <icon src="bussines_service.xpm"/>
+@@ -1641,10 +1677,10 @@
+ <icon src="cemetery.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_church" order="11-">
+- <icon src="church.png"/>
++ <icon src="church.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_cinema" order="12-">
+- <icon src="cinema.png"/>
++ <icon src="cinema.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_communication" order="12-">
+ <icon src="communication.xpm"/>
+@@ -1662,7 +1698,7 @@
+ <icon src="dam.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_danger_area" order="12-">
+- <icon src="danger_16_16.png"/>
++ <icon src="danger.svg" w="16" h="16"/>
+ </itemgra>
+ <itemgra item_types="poi_danger_sea_wreck" order="12-">
+ <icon src="dangerous.xpm"/>
+@@ -1683,7 +1719,7 @@
+ <icon src="fair.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_firebrigade" order="12-">
+- <icon src="firebrigade.png"/>
++ <icon src="firebrigade.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_fish" order="9-">
+ <icon src="fish.xpm"/>
+@@ -1764,7 +1800,7 @@
+ <icon src="oil_field.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_peak" order="7-">
+- <icon src="peak.png"/>
++ <icon src="peak.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_personal_service" order="12-">
+ <icon src="personal_service.xpm"/>
+@@ -1773,7 +1809,7 @@
+ <icon src="pharmacy.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_post_office,poi_post_box" order="13-">
+- <icon src="post.png"/>
++ <icon src="post.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_public_office" order="12-">
+ <icon src="public_office.xpm"/>
+@@ -1929,7 +1965,7 @@
+ <icon src="gc_webcam.xpm"/>
+ </itemgra>
+ <itemgra item_types="traffic_signals" order="13-">
+- <icon src="traffic_signals.png"/>
++ <icon src="traffic_signals.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_wifi" order="13-">
+ <icon src="wifi.xpm"/>
+@@ -1978,13 +2014,13 @@
+ <icon src="viewpoint.xpm"/>
+ </itemgra>
+ <itemgra item_types="tec_common" order="11-">
+- <icon src="tec_common.png" w="24" h="24"/>
++ <icon src="tec_common.svg" w="24" h="24"/>
+ </itemgra>
+ <itemgra item_types="vehicle" order="0-">
+- <icon src="gui_vehicle_16_16.png" />
++ <icon src="gui_vehicle.svg" h="16" w="16"/>
+ </itemgra>
+ <itemgra item_types="vehicle_pedestrian" order="0-">
+- <icon src="gui_vehicle_pedestrian_16_16.png" />
++ <icon src="gui_vehicle_pedestrian.svg" h="16" w="16"/>
+ </itemgra>
+ </layer>
+ <layer name="POI Labels">
+@@ -2793,7 +2829,7 @@
+ <polyline color="#3f3f3f" width="1"/>
+ </itemgra>
+ <itemgra item_types="poi_airport" order="5-">
+- <icon src="airport.png"/>
++ <icon src="airport.svg"/>
+ </itemgra>
+ <itemgra item_types="town_ghost" order="0-">
+ <icon src="ghost_town.xpm"/>
+@@ -2808,13 +2844,13 @@
+ <icon src="car_dealer.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_fuel" order="10-">
+- <icon src="fuel.png"/>
++ <icon src="fuel.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_shopping" order="10-">
+- <icon src="shopping.png"/>
++ <icon src="shopping.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_attraction" order="8-">
+- <icon src="attraction.png"/>
++ <icon src="attraction.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_cafe" order="12-">
+ <icon src="cafe.xpm"/>
+@@ -2826,7 +2862,7 @@
+ <icon src="bridge.xpm"/>
+ </itemgra>
+ <itemgra item_types="highway_exit" order="11-">
+- <icon src="exit.png"/>
++ <icon src="exit.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_camp_rv" order="9-">
+ <icon src="camping.xpm"/>
+@@ -2835,11 +2871,11 @@
+ <icon src="museum.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_hospital" order="12-">
+- <icon src="hospital.png"/>
++ <icon src="hospital.svg"/>
+ </itemgra>
+ <!-- not really usefull -->
+ <!--
+- <itemgra item_types="point_unkn" order="0-">
++ <itemgra item_types="point_unknown" order="0-">
+ <circle color="#8080ff" radius="3"/>
+ </itemgra>
+ -->
+@@ -2847,10 +2883,10 @@
+ <icon src="dining.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_fastfood" order="12-">
+- <icon src="fastfood.png"/>
++ <icon src="fastfood.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_police" order="12-">
+- <icon src="police.png"/>
++ <icon src="police.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_auto_club" order="0-">
+ <icon src="auto_club.xpm"/>
+@@ -2859,7 +2895,7 @@
+ <icon src="autoservice.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_bank" order="12-">
+- <icon src="bank.png"/>
++ <icon src="bank.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_bay" order="0-">
+ <icon src="bay.xpm"/>
+@@ -2868,7 +2904,7 @@
+ <icon src="bend.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_boat_ramp" order="12-">
+- <icon src="boat_ramp.png"/>
++ <icon src="boat_ramp.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_border_station" order="0-">
+ <icon src="border_station.xpm"/>
+@@ -2877,10 +2913,10 @@
+ <icon src="bowling.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_bus_station" order="12-">
+- <icon src="bus.png"/>
++ <icon src="bus.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_bus_stop" order="12-">
+- <icon src="bus.png"/>
++ <icon src="bus.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_business_service" order="0-">
+ <icon src="bussines_service.xpm"/>
+@@ -2898,10 +2934,10 @@
+ <icon src="cemetery.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_church" order="11-">
+- <icon src="church.png"/>
++ <icon src="church.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_cinema" order="12-">
+- <icon src="cinema.png"/>
++ <icon src="cinema.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_communication" order="0-">
+ <icon src="communication.xpm"/>
+@@ -2919,7 +2955,7 @@
+ <icon src="dam.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_danger_area" order="12-">
+- <icon src="danger_16_16.png"/>
++ <icon src="danger.svg" h="16" w="16"/>
+ </itemgra>
+ <itemgra item_types="poi_danger_sea_wreck" order="0-">
+ <icon src="dangerous.xpm"/>
+@@ -2940,7 +2976,7 @@
+ <icon src="fair.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_firebrigade" order="12-">
+- <icon src="firebrigade.png"/>
++ <icon src="firebrigade.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_fish" order="0-">
+ <icon src="fish.xpm"/>
+@@ -3021,7 +3057,7 @@
+ <icon src="oil_field.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_peak" order="6-">
+- <icon src="peak.png"/>
++ <icon src="peak.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_personal_service" order="0-">
+ <icon src="personal_service.xpm"/>
+@@ -3030,7 +3066,7 @@
+ <icon src="pharmacy.xpm"/>
+ </itemgra>
+ <itemgra item_types="poi_post_office,poi_post_box" order="13-">
+- <icon src="post.png"/>
++ <icon src="post.svg"/>
+ </itemgra>
+ <itemgra item_types="poi_public_office" order="0-">
+ <icon src="public_office.xpm"/>
+@@ -3189,7 +3225,7 @@
+ <icon src="gc_webcam.xpm"/>
+ </itemgra>
+ <itemgra item_types="traffic_signals" order="13-">
+- <icon src="traffic_signals.png"/>
++ <icon src="traffic_signals.svg"/>
+ </itemgra>
+ <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
+ <polygon color="#041a06"/>
+@@ -3243,13 +3279,13 @@
+ <icon src="viewpoint.xpm"/>
+ </itemgra>
+ <itemgra item_types="tec_common" order="11-">
+- <icon src="tec_common.png" w="24" h="24"/>
++ <icon src="tec_common.svg" w="24" h="24"/>
+ </itemgra>
+ <itemgra item_types="vehicle" order="0-">
+- <icon src="gui_vehicle_16_16.png" />
++ <icon src="gui_vehicle.svg" h="16" w="16"/>
+ </itemgra>
+ <itemgra item_types="vehicle_pedestrian" order="0-">
+- <icon src="gui_vehicle_pedestrian_16_16.png" />
++ <icon src="gui_vehicle_pedestrian.svg" h="16" w="16"/>
+ </itemgra>
+ </layer>
+ <layer name="POI Labels">
+@@ -4590,17 +4626,17 @@
+ <!-- !!!!...POIs...!!!! -->
+ <!-- amenity=bank -->
+ <itemgra item_types="poi_bank" order="14-">
+- <icon src="bank.png"/>
++ <icon src="bank.svg"/>
+ <circle color="#000000" radius="3" text_size="7"/>
+ </itemgra>
+ <!-- amenity=fuel -->
+ <itemgra item_types="poi_fuel" order="14-">
+- <icon src="fuel.png"/>
++ <icon src="fuel.svg"/>
+ <circle color="#000000" radius="3" text_size="7"/>
+ </itemgra>
+ <!-- amenity=hospitalg -->
+ <itemgra item_types="poi_hospital" order="14-">
+- <icon src="hospital.png"/>
++ <icon src="hospital.svg"/>
+ <circle color="#000000" radius="3" text_size="7"/>
+ </itemgra>
+ <!-- amenity=parking -->
+@@ -4609,7 +4645,7 @@
+ </itemgra>
+ <!-- amenity=police -->
+ <itemgra item_types="poi_police" order="14-">
+- <icon src="police.png"/>
++ <icon src="police.svg"/>
+ <circle color="#000000" radius="3" text_size="7"/>
+ </itemgra>
+ <!-- amenity=restaurant -->
DEB_CONFIGURE_EXTRA_FLAGS += --prefix=/opt/navit
# scale all gui icons
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-svg2png-scaling="32 48 64" \
- --enable-svg2png-scaling-flag="16 24 32" \
- --enable-svg2png-scaling-nav="16 32 48 64"
+#DEB_CONFIGURE_EXTRA_FLAGS += --enable-svg2png-scaling="32 48 64" \
+# --enable-svg2png-scaling-flag="16 24 32" \
+# --enable-svg2png-scaling-nav="16 32 48 64"
# Force svg2png conversion using rsvg-convert since it is the most reliable
# ATM
projects / navit-package / commitdiff