diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2009-08-24 13:16:48 +0000 |
|---|---|---|
| committer |   Angus Ainslie <nytowl@openmoko.org> | 2009-08-25 23:26:38 -0600 |
| commit | a0cb94509c0f92480d870fb3fe99bc7236ae1198 (patch) | |
| tree | 971c72f488d2960e93ed18606eef3f6205374913 | |
| parent | 89c3e606c1a2dd3040bbbca64bcdd98a9187c84d (diff) | |
| download | openembedded-a0cb94509c0f92480d870fb3fe99bc7236ae1198.tar.gz | |
Fix navit library path. navit.xml was renamed to navit_shipped.xml in svn rev 2492.
| -rw-r--r-- | recipes/navit/files/navit-svn.xml-so.patch | 17 | ||||
| -rw-r--r-- | recipes/navit/navit.inc | 1 | ||||
| -rw-r--r-- | recipes/navit/navit_0.1.0.bb | 4 | ||||
| -rw-r--r-- | 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 0000000000..bde8658c60 --- /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 b9f18d86fd..a55b586c1c 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 f1dfb1ceb4..11831930ef 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 61a4537e15..7989243db4 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" |