From 8bfd1a4e9122d62521bfe71b33579019ba95640d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 6 Dec 2009 11:46:35 +0100 Subject: [PATCH] navit: change to INC_PR, bump srcrev, split icons and config for navit_svn * xpm stuff is updated maybe about 6 times a year, sources are updated few times every day * with navit-icons in separate package we don't need to download 3,5MB package, every time we bump SRCREV because of software fix * navit-icons SRCREV will be changed only if there is new icon needed for newer navit SRCREV * big package was installed by opkg really slow * provide 2 desktop icons one with Display blanking disabled ie for car navigation, second with only CPU requested ie if you're using navit on foot or bike and want longer battery life * splitted configs are easier to modify, also provide better defaults for freerunner layout Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 3 +- recipes/navit/files/maps.xml | 24 +++++++++ recipes/navit/files/navit.desktop | 2 +- recipes/navit/files/navit.xml | 39 ++++++++++++++ recipes/navit/files/osd.xml | 15 ++++++ recipes/navit/files/shr/navit.desktop | 10 ++++ recipes/navit/files/shr/navit.launcher | 57 ++++++++++++++++++++ recipes/navit/files/shr/navit.png | Bin 0 -> 8299 bytes recipes/navit/files/shr/navitD.desktop | 10 ++++ recipes/navit/files/shr/navitD.png | Bin 0 -> 8341 bytes recipes/navit/files/shr/osd.xml | 44 ++++++++++++++++ recipes/navit/files/speech.xml | 8 +++ recipes/navit/navit-icons/configure.in | 69 +++++++++++++++++++++++++ recipes/navit/navit-icons_svn.bb | 29 +++++++++++ recipes/navit/navit.inc | 3 ++ recipes/navit/navit_svn.bb | 53 ++++++++++++++++++- 16 files changed, 362 insertions(+), 4 deletions(-) create mode 100644 recipes/navit/files/maps.xml create mode 100644 recipes/navit/files/navit.xml create mode 100644 recipes/navit/files/osd.xml create mode 100644 recipes/navit/files/shr/navit.desktop create mode 100644 recipes/navit/files/shr/navit.launcher create mode 100644 recipes/navit/files/shr/navit.png create mode 100644 recipes/navit/files/shr/navitD.desktop create mode 100644 recipes/navit/files/shr/navitD.png create mode 100644 recipes/navit/files/shr/osd.xml create mode 100644 recipes/navit/files/speech.xml create mode 100644 recipes/navit/navit-icons/configure.in create mode 100644 recipes/navit/navit-icons_svn.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ac8be08ced..17c896ef51 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -185,7 +185,8 @@ 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 ?= "2846" +SRCREV_pn-navit-icons ?= "2618" SRCREV_pn-neod ?= "4617" SRCREV_pn-neomis ?= "6" SRCREV_pn-net-snmp ?= "17367" diff --git a/recipes/navit/files/maps.xml b/recipes/navit/files/maps.xml new file mode 100644 index 0000000000..6f59f20c39 --- /dev/null +++ b/recipes/navit/files/maps.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipes/navit/files/navit.desktop b/recipes/navit/files/navit.desktop index 085c8c9238..05ecc1d4ee 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.xml b/recipes/navit/files/navit.xml new file mode 100644 index 0000000000..cce85aaf2f --- /dev/null +++ b/recipes/navit/files/navit.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recipes/navit/files/osd.xml b/recipes/navit/files/osd.xml new file mode 100644 index 0000000000..2d0f9ffdf4 --- /dev/null +++ b/recipes/navit/files/osd.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/recipes/navit/files/shr/navit.desktop b/recipes/navit/files/shr/navit.desktop new file mode 100644 index 0000000000..d313d6a63e --- /dev/null +++ b/recipes/navit/files/shr/navit.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Navit +Comment=GPS Navigation +Exec=fsoraw -r CPU,GPS -- navit +Icon=navit +Terminal=false +Type=Application +Categories=GTK; +MimeType=text/x-vcard; +StartupNotify=true diff --git a/recipes/navit/files/shr/navit.launcher b/recipes/navit/files/shr/navit.launcher new file mode 100644 index 0000000000..68baaeb956 --- /dev/null +++ b/recipes/navit/files/shr/navit.launcher @@ -0,0 +1,57 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2008 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: navit.launcher +# Date: 20080105 (YMD) +# +################################################################################# +# +# 20080105 - v0.0.1 - Initial release +# 20090818 - - Zoff addons and fixes +# 20091025 - - Zoff check if navit already running +# 20091122 - - Zoff use fsoraw, use correct LANG setting +# +# +################################################################################# + +# On devices with low memory (< 512Mb?) Navit will segfault on start. +# This can be worked around by doing +# "echo 1 > /proc/sys/vm/overcommit_memory" + +# check if navit already running: +pgrep '^navit$' +not_running=$? + +if [ $not_running == 0 ]; then + echo "navit already running !!" +else + echo "ok starting navit ..." + + # HINT: to get correct LANG setting + . /etc/profile + + # HINT: we need that for streetname search + export LC_ALL='' + unset LC_ALL + + # HINT: that should be set in illume, but atm its not + # export LANG=de_AT.utf8 + + if test "`cat /proc/meminfo | grep ^MemTotal | awk '{print $2}'`" -lt "500000" + then + if test "$USER" = "root" + then + echo "Enabling low-mem workaround..." + OLD=`cat /proc/sys/vm/overcommit_memory` + echo 1 > /proc/sys/vm/overcommit_memory + navit.real $* + echo ${OLD} > /proc/sys/vm/overcommit_memory + exit + else + echo "I need root-privs to enable the low-mem workaround!" + fi + fi + navit.real $* +fi diff --git a/recipes/navit/files/shr/navit.png b/recipes/navit/files/shr/navit.png new file mode 100644 index 0000000000000000000000000000000000000000..76156d033474af98f65fe86f25a9ec9fb59475ab GIT binary patch literal 8299 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 + + + + + + + + + + + + + + + + + + + + + diff --git a/recipes/navit/files/speech.xml b/recipes/navit/files/speech.xml new file mode 100644 index 0000000000..28c49906d9 --- /dev/null +++ b/recipes/navit/files/speech.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/recipes/navit/navit-icons/configure.in b/recipes/navit/navit-icons/configure.in new file mode 100644 index 0000000000..25259007e8 --- /dev/null +++ b/recipes/navit/navit-icons/configure.in @@ -0,0 +1,69 @@ +AC_INIT(navit, 0.2.0) +SOURCE_MODE=svn + +AM_INIT_AUTOMAKE +AM_CONFIG_HEADER(config.h) + +AC_SUBST(SOURCE_MODE) +AM_CONDITIONAL(SOURCE_MODE_SVN, [test "x${SOURCE_MODE}" = "xsvn"]) + +if test "x${SOURCE_MODE}" = "xsvn" ; then + USE_MAINTAINER_MODE=yes +else + USE_MAINTAINER_MODE=no +fi + +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is enabled by default (reason of inclusion of this function) + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) + +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +AM_MAINTAINER_MODE + +# svg +AC_ARG_ENABLE(svg, [ --disable-svg disable Scalable Vector Graphics], enable_svg=$enableval, enable_svg=yes) +AC_ARG_ENABLE(svg2png, [ --disable-svg2png disable conversion of svgs to pngs], enable_svg2png=$enableval, enable_svg2png=yes) +AC_ARG_ENABLE(svg2png-scaling, [ --enable-svg2png-scaling enable conversion of svgs to pngs with specified sizes], SVG2PNG_SCALES=$enableval, SVG2PNG_SCALES="8 16 32 48 96") +AC_ARG_ENABLE(svg2png-scaling-flag, [ --enable-svg2png-scaling-flag enable conversion of flag svgs to pngs with specified sizes], SVG2PNG_SCALES_FLAG=$enableval, SVG2PNG_SCALES_FLAG="8 16 32 48 96") +AC_ARG_ENABLE(svg2png-scaling-nav, [ --enable-svg2png-scaling-nav enable conversion of nav svgs to pngs with specified sizes], SVG2PNG_SCALES_NAV=$enableval, SVG2PNG_SCALES_NAV="8 16 32 48 96") +AC_ARG_WITH(svg2png-use-convert, [ --with-svg2png-use-convert use imagemagick's convert for png creation], SVG2PNG_CONVERTER="convert") +AC_ARG_WITH(svg2png-use-rsvg-convert, [ --with-svg2png-use-rsvg-convert use librsvg's rsvg-convert for png creation], SVG2PNG_CONVERTER="rsvg-convert") +AC_ARG_WITH(svg2png-use-inkscape, [ --with-svg2png-use-inkscape use inkscapes internal convert routines for png creation], SVG2PNG_CONVERTER="inkscape") +AC_ARG_WITH(svg2png-use-ksvgtopng4, [ --with-svg2png-use-ksvgtopng4 use kde4's ksvgtopng4 for png creation], SVG2PNG_CONVERTER="ksvgtopng4") +AC_ARG_WITH(svg2png-use-ksvgtopng, [ --with-svg2png-use-ksvgtopng use kde3's convert for png creation], SVG2PNG_CONVERTER="ksvgtopng") +if test "x${enable_svg2png}" = "xyes" ; then + if test "x${SVG2PNG_CONVERTER}" = "x"; then + SVG2PNG_CONVERTER="ksvgtopng ksvgtopng4 rsvg-convert inkscape convert" + fi + AC_PATH_PROGS([SVG2PNG], ${SVG2PNG_CONVERTER}, [none]) + if test "x${SVG2PNG}" = "xnone"; then + enable_svg2png="no" + fi +fi +AC_SUBST(SVG2PNG) +AC_SUBST(SVG2PNG_SCALES) +AC_SUBST(SVG2PNG_SCALES_FLAG) +AC_SUBST(SVG2PNG_SCALES_NAV) +AM_CONDITIONAL(USE_SVG2PNG_SCALES, test "x${SVG2PNG_SCALES}" != "xyes" -a "x${SVG2PNG_SCALES}" != "x") +AM_CONDITIONAL(USE_SVG2PNG_SCALES_FLAG, test "x${SVG2PNG_SCALES_FLAG}" != "xyes" -a "x${SVG2PNG_SCALES_FLAG}" != "x") +AM_CONDITIONAL(USE_SVG2PNG_SCALES_NAV, test "x${SVG2PNG_SCALES_NAV}" != "xyes" -a "x${SVG2PNG_SCALES_NAV}" != "x") +AM_CONDITIONAL(USE_SVG2PNG, test "x${enable_svg2png}" = "xyes") +AM_CONDITIONAL(USE_SVG, test "x${enable_svg}" = "xyes") + +AC_CONFIG_FILES([ +Makefile +]) + +AC_OUTPUT + diff --git a/recipes/navit/navit-icons_svn.bb b/recipes/navit/navit-icons_svn.bb new file mode 100644 index 0000000000..09961deb7c --- /dev/null +++ b/recipes/navit/navit-icons_svn.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Navit is a car navigation system with routing engine." +LICENSE = "GPL" +SECTION = "x11/applications" +DEPENDS = "glib-2.0 gtk+" +RRECOMMENDS = "gpsd espeak flite" + +PV = "0.1.0+svnr${SRCPV}" +PR = "r0" + +DEPENDS_shr += " librsvg-native" +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" + +S = "${WORKDIR}/xpm" + +inherit autotools + +FILES_${PN} = " /usr/share/navit/xpm/" + +#use different URL than navit_svn doest, 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 \ + file://configure.in" + +do_configure_prepend() { + cp ${WORKDIR}/configure.in ${S}/ + # replace include with just xpmdir variable + sed -i 's#.*Makefile.inc.*#xpmdir=$(pkgdatadir)/xpm#g' ${S}/Makefile.am + # don't install desktopfile and icons + sed -i 's/^\(EXTRADIST.*\) $(DESKTOPFILE_DATA) $(ICON128_DATA) $(ICON22_DATA) \(.*\)$/\1\2/g' ${S}/Makefile.am +} diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc index fa250ffac9..0b0c36470d 100644 --- a/recipes/navit/navit.inc +++ b/recipes/navit/navit.inc @@ -4,6 +4,9 @@ SECTION = "x11/applications" DEPENDS = "glib-2.0 gtk+" RRECOMMENDS = "gpsd speechd flite" +PE = "1" +INC_PR = "r4" + inherit autotools EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb index 833eb4714e..3323611210 100644 --- a/recipes/navit/navit_svn.bb +++ b/recipes/navit/navit_svn.bb @@ -1,12 +1,61 @@ require navit.inc -PV = "0.1.0+svnrev${SRCREV}" -PR = "r2" +PV = "0.1.0+svnr${SRCPV}" +PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_shr = "1" S = "${WORKDIR}/navit" +# use espeak instead speechd +RRECOMMENDS = "gpsd espeak flite" + +EXTRA_OECONF += "--enable-avoid-unaligned --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher" + SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https" EXTRA_AUTORECONF = " -I m4" + +FILES_${PN} += " ${datadir}/dbus-1/services/ " + +CONFFILES_${PN} += "${datadir}/navit/navit.default.xml \ + ${datadir}/navit/navit.xml \ + ${datadir}/navit/maps.xml \ + ${datadir}/navit/osd.xml \ + ${datadir}/navit/speech.xml \ + " + +SRC_URI += "file://navit.xml \ + file://maps.xml \ + file://osd.xml \ + file://speech.xml \ + " + +#Second launcher for shr +SRC_URI_append_shr = "file://navitD.desktop \ + file://navitD.png \ + " + +DEPENDS_append_shr = " gypsy" +RDEPENDS_append_shr = " fsoraw" + +do_configure_prepend() { + #Remove xpm building, replaced by icons in own package + sed -i 's/\(.*SUBDIRS.*\) xpm\( \|$\)\(.*\)/\1\2\3/g' ${S}/navit/Makefile.am +} + +do_install_append() { + #Use split config + mv ${D}${datadir}/navit/navit.xml ${D}${datadir}/navit/navit.default.xml + install -m 0644 ${WORKDIR}/navit.xml ${D}${datadir}/navit/navit.xml + install -m 0644 ${WORKDIR}/maps.xml ${D}${datadir}/navit/maps.xml + install -m 0644 ${WORKDIR}/osd.xml ${D}${datadir}/navit/osd.xml + install -m 0644 ${WORKDIR}/speech.xml ${D}${datadir}/navit/speech.xml +} + +do_install_append_shr() { + #Install second launcher for shr + install -m 0644 ${WORKDIR}/navitD.desktop ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/navitD.png ${D}${datadir}/pixmaps/ +} -- 2.39.5