[oe-commits] Martin Jansa : navit: final sync with oe.dev
git version control
git at git.openembedded.org
Sun Dec 6 11:28:02 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: f2022371599d2d84cf9a24ddd97b1ee0e35a048a
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f2022371599d2d84cf9a24ddd97b1ee0e35a048a
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Sun Dec 6 12:27:49 2009 +0100
navit: final sync with oe.dev
---
recipes/navit/files/navit.xml-so.patch | 30 +++++++++++---------------
recipes/navit/navit.inc | 36 ++-----------------------------
recipes/navit/navit_svn.bb | 7 +-----
3 files changed, 17 insertions(+), 56 deletions(-)
diff --git a/recipes/navit/files/navit.xml-so.patch b/recipes/navit/files/navit.xml-so.patch
index 9151bc4..c374756 100644
--- a/recipes/navit/files/navit.xml-so.patch
+++ b/recipes/navit/files/navit.xml-so.patch
@@ -1,17 +1,13 @@
---- 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"/>
+--- 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" />
+ <!--
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 5ac831c..0b0c364 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -2,60 +2,30 @@ DESCRIPTION = "Navit is a car navigation system with routing engine."
LICENSE = "GPL"
SECTION = "x11/applications"
DEPENDS = "glib-2.0 gtk+"
-RRECOMMENDS = "gpsd espeak flite"
+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 --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher"
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
-FILES_${PN} += "${libdir}/${PN}/*/*.so ${datadir}/dbus-1/services/ ${datadir}/icons/*/*/apps/navit.png"
+FILES_${PN} += "${libdir}/${PN}/*/*.so"
FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
-FILES_${PN}-dev += "${libdir}/${PN}/*/*.la"
-
-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_append = " \
file://navit.desktop \
file://navit.png \
- file://navit.xml \
- file://maps.xml \
- file://osd.xml \
- file://speech.xml \
"
-SRC_URI_append_shr = "file://navitD.desktop \
- file://navitD.png \
- "
-
-DEPENDS_append_shr = " gypsy"
-RDEPENDS_append_shr = " fsoraw"
do_install_append() {
install -d ${D}${datadir}/applications/
install -m 0644 ${WORKDIR}/navit.desktop ${D}${datadir}/applications/
- install -m 0644 ${WORKDIR}/navitD.desktop ${D}${datadir}/applications/
-
install -d ${D}${datadir}/pixmaps/
install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/
- install -m 0644 ${WORKDIR}/navitD.png ${D}${datadir}/pixmaps/
-
- #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
- #FIXME: don't install those in the first place,
- #FIXME: rather then deleting post-install?
rm ${D}${libdir}/${PN}/*/*.la
}
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index f07a6f8..7660d01 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -13,15 +13,10 @@ RRECOMMENDS = "gpsd espeak flite"
DEPENDS_shr += " librsvg-native"
RDEPENDS = " navit-icons"
-EXTRA_OECONF += "--enable-avoid-unaligned --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher --enable-cache-size=20971520"
+EXTRA_OECONF += " --enable-svg2png-scaling-flag=32 --disable-speech-speech-dispatcher --enable-cache-size=20971520"
SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https"
-do_configure_prepend() {
- #Remove xpm building
- sed -i 's/\(.*SUBDIRS.*\) xpm\( \|$\)\(.*\)/\1\2\3/g' ${S}/navit/Makefile.am
-}
-
EXTRA_AUTORECONF = " -I m4"
FILES_${PN} += " ${datadir}/dbus-1/services/ "
More information about the Openembedded-commits
mailing list