[oe-commits] Martin Jansa : Fix navit library path. navit. xml was renamed to navit_shipped.xml in svn rev 2492.

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: 2260fcc988e32acbac1d1f3f1282129c48e655b2
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2260fcc988e32acbac1d1f3f1282129c48e655b2

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Mon Aug 24 13:16:48 2009 +0000

Fix navit library path. navit.xml was renamed to navit_shipped.xml in svn rev 2492.

---

 recipes/navit/files/navit-svn.xml-so.patch |   17 +++++++++++++++++
 recipes/navit/navit.inc                    |    1 -
 recipes/navit/navit_0.1.0.bb               |    4 ++++
 recipes/navit/navit_svn.bb                 |    4 ++++
 4 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/recipes/navit/files/navit-svn.xml-so.patch b/recipes/navit/files/navit-svn.xml-so.patch
new file mode 100644
index 0000000..bde8658
--- /dev/null
+++ b/recipes/navit/files/navit-svn.xml-so.patch
@@ -0,0 +1,17 @@
+--- navit/navit/navit_shipped.xml.orig	2009-07-19 13:08:16.000000000 +0200
++++ navit/navit/navit_shipped.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"/>
diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc
index b9f18d8..a55b586 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -17,7 +17,6 @@ SRC_URI_append = " \
                   file://navit.desktop \
                   file://navit.launcher \
                   file://navit.png \
-                  file://navit.xml-so.patch;patch=1 \
 	  	 "
 
 do_install_append() {
diff --git a/recipes/navit/navit_0.1.0.bb b/recipes/navit/navit_0.1.0.bb
index f1dfb1c..1183193 100644
--- a/recipes/navit/navit_0.1.0.bb
+++ b/recipes/navit/navit_0.1.0.bb
@@ -3,3 +3,7 @@ require navit.inc
 PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
+
+SRC_URI_append = " \
+                  file://navit.xml-so.patch;patch=1 \
+                 "
diff --git a/recipes/navit/navit_svn.bb b/recipes/navit/navit_svn.bb
index 03450e2..cc7f894 100644
--- a/recipes/navit/navit_svn.bb
+++ b/recipes/navit/navit_svn.bb
@@ -11,4 +11,8 @@ S = "${WORKDIR}/navit"
 
 SRC_URI = "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=https"
 
+SRC_URI_append = " \
+                  file://navit-svn.xml-so.patch;patch=1 \
+                 "
+
 EXTRA_AUTORECONF = " -I m4"