[oe-commits] org.oe.dev navit: Fix navit.xml to search for the proper library extensions

[coredump2 commit]

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

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 32469c96ab1a3618ca64f20e5c114dc8a2ce631c
ViewMTN: http://monotone.openembedded.org/revision/info/32469c96ab1a3618ca64f20e5c114dc8a2ce631c
Files:
1
packages/navit/files/navit.xml-so.patch
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
Diffs:

#
# mt diff -rbc99dc2db85d728b06d198abe611e989797af107 -r32469c96ab1a3618ca64f20e5c114dc8a2ce631c
#
# 
# 
# add_file "packages/navit/files/navit.xml-so.patch"
#  content [694e52c8dc0912d4a96e1cdea77181dc8ee36473]
# 
# patch "packages/navit/navit_0.0.3.bb"
#  from [889d14a50f20feacdb3bfe544505a50b469248d1]
#    to [45cadbb58c918bee75079075b7ef9d209507941e]
# 
# patch "packages/navit/navit_cvs.bb"
#  from [df4f34394db1e519bb35df38f60d90b0c1a13b71]
#    to [68ae9f449982f15699c5e966c7d4cd4b8ccd2f73]
# 
============================================================
--- packages/navit/files/navit.xml-so.patch	694e52c8dc0912d4a96e1cdea77181dc8ee36473
+++ packages/navit/files/navit.xml-so.patch	694e52c8dc0912d4a96e1cdea77181dc8ee36473
@@ -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" />
+ <!--
============================================================
--- packages/navit/navit_0.0.3.bb	889d14a50f20feacdb3bfe544505a50b469248d1
+++ packages/navit/navit_0.0.3.bb	45cadbb58c918bee75079075b7ef9d209507941e
@@ -1,7 +1,8 @@ require navit.inc
 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"
============================================================
--- packages/navit/navit_cvs.bb	df4f34394db1e519bb35df38f60d90b0c1a13b71
+++ packages/navit/navit_cvs.bb	68ae9f449982f15699c5e966c7d4cd4b8ccd2f73
@@ -1,11 +1,12 @@ PV = "0.0.3+cvs${SRCDATE}"
 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"