summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Rüb <christian.rueb@gmx.net>2010-01-10 18:59:43 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2010-01-10 21:39:55 +0100
commitf2934215635d101459eb15b3505843370c20c6ec (patch)
tree4804d7144af9900a41fe2f956966014ac36cf6d8
parent21499373b6952e364f93a354587421b021368b99 (diff)
navit: enable dbus plugin in navit by default
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/navit/files/navit.xml2
-rw-r--r--recipes/navit/files/plugins.xml6
-rw-r--r--recipes/navit/navit_svn.bb5
3 files changed, 11 insertions, 2 deletions
diff --git a/recipes/navit/files/navit.xml b/recipes/navit/files/navit.xml
index dafa6aa498..79ee4618d4 100644
--- a/recipes/navit/files/navit.xml
+++ b/recipes/navit/files/navit.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE config SYSTEM "navit.dtd">
<config xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/plugins)"/>
+ <xi:include href="/usr/share/navit/plugins.xml"/>
<xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/debug)"/>
<navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10" drag_bitmap="1">
diff --git a/recipes/navit/files/plugins.xml b/recipes/navit/files/plugins.xml
new file mode 100644
index 0000000000..015b05517f
--- /dev/null
+++ b/recipes/navit/files/plugins.xml
@@ -0,0 +1,6 @@
+<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="yes"/>
+ <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/>
+</plugins>
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index 5979b7e46a..71f5457276 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -1,7 +1,7 @@
require navit.inc
PV = "0.1.0+svnr${SRCPV}"
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_shr = "1"
@@ -27,12 +27,14 @@ CONFFILES_${PN} += "${datadir}/navit/navit.default.xml \
${datadir}/navit/maps.xml \
${datadir}/navit/osd.xml \
${datadir}/navit/speech.xml \
+ ${datadir}/navit/plugins.xml \
"
SRC_URI += "file://navit.xml \
file://maps.xml \
file://osd.xml \
file://speech.xml \
+ file://plugins.xml \
"
#Second launcher for shr
@@ -55,6 +57,7 @@ do_install_append() {
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
+ install -m 0644 ${WORKDIR}/plugins.xml ${D}${datadir}/navit/plugins.xml
}
do_install_append_shr() {