navit: Fix navit.xml to search for the proper library extensions

diff --git a/packages/navit/files/navit.xml-so.patch b/packages/navit/files/navit.xml-so.patch
new file mode 100644 (file)
index 0000000..c374756
--- /dev/null
+++ b/packages/navit/files/navit.xml-so.patch
@@ -0,0 +1,13 @@
+--- 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/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb
index d0c1c55..35730e9 100644 (file)
--- a/packages/navit/navit_0.0.3.bb
+++ b/packages/navit/navit_0.0.3.bb
@@ -1,7 +1,8 @@
 require navit.inc
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
+          file://navit.xml-so.patch;patch=1"
 
 EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"

diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb
index 8b10c90..d35d9dd 100644 (file)
--- a/packages/navit/navit_cvs.bb
+++ b/packages/navit/navit_cvs.bb
@@ -1,11 +1,12 @@
 require navit.inc
 
 PV = "0.0.3+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 S = "${WORKDIR}/navit"
 
-SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit"
+SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
+           file://navit.xml-so.patch;patch=1"
 
 EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"