[oe-commits] org.oe.dev merge of '017fd59a29d14dbd3c9a86e2bccaadc64909892a'
rwhitby commit
oe at amethyst.openembedded.net
Sun Apr 27 13:50:19 UTC 2008
merge of '017fd59a29d14dbd3c9a86e2bccaadc64909892a'
and 'efd9ac5db96b1872b9947299a1e10d54a34a86a3'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 37904b42e420b3ac5865f0832c2966dd7a6b91aa
ViewMTN: http://monotone.openembedded.org/revision/info/37904b42e420b3ac5865f0832c2966dd7a6b91aa
Files:
1
packages/images/unslung-image.bb
packages/meta/slugos-packages.bb
packages/openocd/openocd_svn.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/gnash/gnash.inc
packages/gnash/gnash_0.8.1.bb
packages/gpsdrive/gpsdrive-2.10pre4
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/ipkg/files/ipkg_bugfix.patch
packages/multitap-pad
packages/multitap-pad/files
packages/multitap-pad/files/80multitappad
packages/multitap-pad/multitap-pad_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
packages/perl/libwww-perl-native_5.808.bb
packages/perl/libwww-perl_5.808.bb
packages/openmoko2/openmoko-dialer2/fic-gta01
packages/openmoko2/openmoko-dialer2/fic-gta02
packages/qtopia-phone
packages/qtopia-phone/files
packages/qtopia-phone/files/fic-gta01
packages/qtopia-phone/files/fic-gta02
packages/qtopia-phone/qtopia-phone-x11
packages/qtopia-phone/qtopia-phone-x11/fic-gta02
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d
packages/images/openmoko-qtopia-image.bb
packages/images/openmoko-qtopia-x11-image.bb
packages/openmoko-tools/pty-forward-native.bb
packages/openmoko-tools/serial-forward.bb
packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
packages/qtopia-phone/files/fic-gta01/device-conf
packages/qtopia-phone/files/fic-gta01/device-conf.old
packages/qtopia-phone/files/fic-gta01/qplatformdefs.h
packages/qtopia-phone/files/fic-gta02/device-conf
packages/qtopia-phone/files/fic-gta02/device-conf.old
packages/qtopia-phone/files/fic-gta02/qplatformdefs.h
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia
packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
packages/qtopia-phone/qtopia-phone.inc
packages/qtopia-phone/qtopia-phone_4.3.0.bb
packages/qtopia-phone/qtopia-phone_4.3.1.bb
packages/qtopia-phone/qtopia-phone_arch.inc
packages/tasks/task-openmoko-qtopia-x11.bb
packages/tasks/task-openmoko-qtopia.bb
classes/sourcepkg.bbclass
conf/distro/include/sane-srcrevs.inc
packages/alsa/alsa-state.bb
Diffs:
#
# mt diff -r017fd59a29d14dbd3c9a86e2bccaadc64909892a -r37904b42e420b3ac5865f0832c2966dd7a6b91aa
#
#
#
# patch "packages/images/unslung-image.bb"
# from [e4cf81045fb8a8e211e464905d1b307c49987663]
# to [738ce981801bef8a0c76499a9524887eeb1547ff]
#
# patch "packages/meta/slugos-packages.bb"
# from [a8de050f9b9bde46ec2fe91cdf9d93c69da445cb]
# to [46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb]
#
# patch "packages/openocd/openocd_svn.bb"
# from [ff4b08ed923a74c3efa4730980288907a11baeb7]
# to [5863de22800841c9bcd0fe5b4014ef3d911f91a2]
#
============================================================
--- packages/images/unslung-image.bb e4cf81045fb8a8e211e464905d1b307c49987663
+++ packages/images/unslung-image.bb 738ce981801bef8a0c76499a9524887eeb1547ff
@@ -100,4 +100,12 @@ nslu2_pack_image () {
-m ${STAGING_FIRMWARE_DIR}/NPE-B \
-t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin
+ slugimage -F -p \
+ -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
+ -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \
+ -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \
+ -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ -m ${STAGING_FIRMWARE_DIR}/NPE-B \
+ -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
+ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin
}
============================================================
--- packages/meta/slugos-packages.bb a8de050f9b9bde46ec2fe91cdf9d93c69da445cb
+++ packages/meta/slugos-packages.bb 46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r50"
+PR = "r51"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -176,6 +176,7 @@ SLUGOS_PACKAGES = "\
openobex-apps \
openntpd \
openobex \
+ openocd \
openssh \
openvpn \
patch \
@@ -216,6 +217,7 @@ SLUGOS_PACKAGES = "\
sudo \
sysfsutils \
tar \
+ task-mokogateway-everything \
tcpdump \
thttpd \
tiff \
@@ -262,7 +264,6 @@ SLUGOS_BROKEN_PACKAGES = "\
pwc \
qc-usb-messenger \
syslog-ng \
- openocd task-mokogateway-everything \
task-native-sdk \
unionfs-modules unionfs-utils \
wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
============================================================
--- packages/openocd/openocd_svn.bb ff4b08ed923a74c3efa4730980288907a11baeb7
+++ packages/openocd/openocd_svn.bb 5863de22800841c9bcd0fe5b4014ef3d911f91a2
@@ -2,7 +2,7 @@ PV = "0.0+r${SRCREV}"
HOMEPAGE = "http://openocd.berlios.de/"
LICENSE = "GPL"
PV = "0.0+r${SRCREV}"
-PR = "r1"
+PR = "r2"
inherit autotools
@@ -10,4 +10,5 @@ S = "${WORKDIR}/trunk"
file://openocd-link-static.patch;patch=1"
S = "${WORKDIR}/trunk"
+DEPENDS = "libftdi"
EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"
#
# mt diff -refd9ac5db96b1872b9947299a1e10d54a34a86a3 -r37904b42e420b3ac5865f0832c2966dd7a6b91aa
#
#
#
# delete "conf/distro/include/preferred-om-2008-versions.inc"
#
# delete "packages/gnash/gnash.inc"
#
# delete "packages/gnash/gnash_0.8.1.bb"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
#
# delete "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#
# delete "packages/ipkg/files/ipkg_bugfix.patch"
#
# delete "packages/multitap-pad"
#
# delete "packages/multitap-pad/files"
#
# delete "packages/multitap-pad/files/80multitappad"
#
# delete "packages/multitap-pad/multitap-pad_svn.bb"
#
# delete "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
#
# delete "packages/perl/libwww-perl-native_5.808.bb"
#
# delete "packages/perl/libwww-perl_5.808.bb"
#
# add_dir "packages/gpsdrive/gpsdrive-2.10pre4"
#
# add_dir "packages/multitap-pad"
#
# add_dir "packages/multitap-pad/files"
#
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta01"
#
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta02"
#
# add_dir "packages/qtopia-phone"
#
# add_dir "packages/qtopia-phone/files"
#
# add_dir "packages/qtopia-phone/files/fic-gta01"
#
# add_dir "packages/qtopia-phone/files/fic-gta02"
#
# add_dir "packages/qtopia-phone/qtopia-phone-x11"
#
# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02"
#
# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d"
#
# add_file "conf/distro/include/preferred-om-2008-versions.inc"
# content [45c4fabe80b7601dd86c45ad8f64a6773594d4e7]
#
# add_file "packages/gnash/gnash.inc"
# content [66c805eb5cfd0e18a89770e022d4420ee9013566]
#
# add_file "packages/gnash/gnash_0.8.1.bb"
# content [50014de2c3904a6950c775be0eda4815399cb573]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
# content [f7d05fac53703548b59b528f752366847140744e]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
# content [47e014d89d9957ea970e01aced2dc553d3722236]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
# content [b9c3b9e051b269ab097c36a70c58b6d218e0d55d]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
# content [6ef8f7d5db97dd3541a0bfe44325bd07296baf1b]
#
# add_file "packages/gpsdrive/gpsdrive_2.10pre4.bb"
# content [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
#
# add_file "packages/images/openmoko-qtopia-image.bb"
# content [85858c01bf04fa98f230120b45029c9ffc41a05c]
#
# add_file "packages/images/openmoko-qtopia-x11-image.bb"
# content [fd1679f4eb35ac9f3302c6a11f82e975921a169f]
#
# add_file "packages/multitap-pad/files/80multitappad"
# content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
#
# add_file "packages/multitap-pad/multitap-pad_svn.bb"
# content [8f2b626f58690dd52e509cacab5977c5f52270e2]
#
# add_file "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
# content [4e424e0c74d42282c80ac2738e417b8dc7014e80]
#
# add_file "packages/openmoko-tools/pty-forward-native.bb"
# content [17c7e0ad0fe30607be9326cec651ccf4ee86b4b8]
#
# add_file "packages/openmoko-tools/serial-forward.bb"
# content [32434a87a886be4c262ea2f13af0375bae297e48]
#
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
# content [43b8c9925bee93d59e2aefd4c7eec71d0b796197]
#
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
# content [d1c708f7f915fa250e20a84fa9d4512440442a4f]
#
# add_file "packages/perl/libwww-perl-native_5.808.bb"
# content [66723b8808de2c5758435a88b9640bc8777d89be]
#
# add_file "packages/perl/libwww-perl_5.808.bb"
# content [c76a162b7e6844022d4b9826386bfeed71c6328e]
#
# add_file "packages/qtopia-phone/files/fic-gta01/device-conf"
# content [33f77c8d4d680c25796f493f054c0e6581439476]
#
# add_file "packages/qtopia-phone/files/fic-gta01/device-conf.old"
# content [7cf2ef99b35315048f286f7f0027ed5c6d609862]
#
# add_file "packages/qtopia-phone/files/fic-gta01/qplatformdefs.h"
# content [4548b7c6203d64cb5ba410f46ff363427f46e675]
#
# add_file "packages/qtopia-phone/files/fic-gta02/device-conf"
# content [33f77c8d4d680c25796f493f054c0e6581439476]
#
# add_file "packages/qtopia-phone/files/fic-gta02/device-conf.old"
# content [7cf2ef99b35315048f286f7f0027ed5c6d609862]
#
# add_file "packages/qtopia-phone/files/fic-gta02/qplatformdefs.h"
# content [4548b7c6203d64cb5ba410f46ff363427f46e675]
#
# add_file "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia"
# content [54bf1406f00aebb9f05186ae64e99cd38f45ef0b]
#
# add_file "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
# content [14600d791e31540ce23ce74084b05c424a136b7f]
#
# add_file "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# content [8d6511f3785b690662798bf6a7814f77ef203bca]
#
# add_file "packages/qtopia-phone/qtopia-phone.inc"
# content [3a88780f98fdd8af1ad280d0c3e688bf14e81001]
#
# add_file "packages/qtopia-phone/qtopia-phone_4.3.0.bb"
# content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]
#
# add_file "packages/qtopia-phone/qtopia-phone_4.3.1.bb"
# content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]
#
# add_file "packages/qtopia-phone/qtopia-phone_arch.inc"
# content [15641411049adbe933692115529c6bac3f43cfef]
#
# add_file "packages/tasks/task-openmoko-qtopia-x11.bb"
# content [38da0e6335542addd488373f6e8cee974a877a58]
#
# add_file "packages/tasks/task-openmoko-qtopia.bb"
# content [4367872d7b461db04275d0f119b597e45eb0811b]
#
# patch "classes/sourcepkg.bbclass"
# from [4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3]
# to [e4c6fac480eaea68ccd24d95a5878b9f5e41b464]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [521cedb389bc68d1f7ab5ea2240153394d425295]
# to [60843bd58bfb4bf8187725d3994059d432a796a3]
#
# patch "packages/alsa/alsa-state.bb"
# from [fa1e4194e6ae098938b0dfb04b2a91debdf76cd9]
# to [f5ed106d3dce9fc8b495243ae43e56a3127b312e]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 45c4fabe80b7601dd86c45ad8f64a6773594d4e7
+++ conf/distro/include/preferred-om-2008-versions.inc 45c4fabe80b7601dd86c45ad8f64a6773594d4e7
@@ -0,0 +1,15 @@
+PREFERRED_VERSION_asterisk = "1.4.17"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus-glib = "0.74"
+PREFERRED_VERSION_gnash = "0.8.2"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_intltool = "0.35.5"
+PREFERRED_VERSION_intltool-native = "0.35.5"
+PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_midori = "0.0.17"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.9"
+
============================================================
--- packages/gnash/gnash.inc 66c805eb5cfd0e18a89770e022d4420ee9013566
+++ packages/gnash/gnash.inc 66c805eb5cfd0e18a89770e022d4420ee9013566
@@ -0,0 +1,38 @@
+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPL-2"
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
+ "
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-gui=gtk \
+ --enable-renderer=cairo \
+ --enable-media=none \
+ --disable-klash \
+ --enable-z \
+ --enable-jpeg \
+ --disable-glext \
+ --enable-Xft \
+ --enable-expat \
+ --enable-mad \
+ --enable-cairo \
+ --disable-plugin \
+ --disable-cygnal \
+ --with-top-level=${STAGING_DIR_HOST}/usr \
+ "
+
+PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
+
+FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
+FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"
+FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"
+FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"
+FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
+FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
+FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
+
+PARALLEL_MAKE = ""
============================================================
--- packages/gnash/gnash_0.8.1.bb 50014de2c3904a6950c775be0eda4815399cb573
+++ packages/gnash/gnash_0.8.1.bb 50014de2c3904a6950c775be0eda4815399cb573
@@ -0,0 +1 @@
+require gnash.inc
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch f7d05fac53703548b59b528f752366847140744e
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch f7d05fac53703548b59b528f752366847140744e
@@ -0,0 +1,128 @@
+diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl
+--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl 2008-01-04 19:01:35.000000000 +0100
+@@ -35,6 +35,7 @@
+ modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk>
+ modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au>
+ modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
++modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
+ Version svn-$Version
+ ";
+
+@@ -176,6 +177,25 @@
+ 15812 => 3 ,
+ 7906 => 2,
+ 3953 => 1
++ },
++ openstreetmap_tah => {
++ 256*576000 => 1,
++ 128*576000 => 2,
++ 64*576000 => 3,
++ 32*576000 => 4,
++ 16*576000 => 5,
++ 8*576000 => 6,
++ 4*576000 => 7,
++ 2*576000 => 8,
++ 576000 => 9,
++ 288000 => 10,
++ 144000 => 11,
++ 72000 => 12,
++ 36000 => 13,
++ 18000 => 14,
++ 9000 => 15,
++ 4500 => 16,
++ 2250 => 17
+ }
+ };
+
+@@ -331,7 +351,6 @@
+ exit();
+ }
+
+-
+ # Verify that we have the options that we need
+ pod2usage(1) if (&error_check);
+
+@@ -417,6 +436,13 @@
+ print "+-----------------------------------------------------------+\n";
+ print "| Landsat Maps are Copyright, ..... |\n";
+ print "| They are free for non commercial use. |\n";
++}elsif ( $mapserver eq 'openstreetmap_tah' ){
++ print "+-----------------------------------------------------------+\n";
++ print "| OpenStreetmap Maps are Copyright by the OpenStreetmap |\n";
++ print "| project. |\n";
++ print "| They are free for use under the terms of the |\n";
++ print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n";
++ print "| license. See http://www.openstreetmap.org for details. |\n";
+ } elsif ( ! $force) {
+ print "You are violating the map servers copyright!\n";
+ print "Are you sure you want to continue? [y|n] ";
+@@ -700,6 +726,11 @@
+ {
+ ($url,$mapscale)=googlemap_url($lati,$long,$scale);
+ }
++ elsif ( $mapserver eq 'openstreetmap_tah')
++ {
++ $filename=~s/\.gif/.png/;
++ ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);
++ }
+ else
+ {
+ print "Unknown map sever :", $mapserver, "\n";
+@@ -935,6 +966,37 @@
+ return ($url,$mapscale);
+ }
+
++#############################################################################
++sub openstreetmap_tah_url($$$){
++ my $lati = shift;
++ my $long = shift;
++ my $scale = shift;
++
++ my $mapscale = $scale;
++ my $zoom = undef;
++ for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
++ next unless $s == $scale;
++ $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
++ $mapscale = $s;
++ last;
++ }
++
++ unless ( $zoom ) {
++ print "Error calculating Zoomlevel for Scale: $scale\n";
++ return (undef,undef);
++ }
++
++ if ($debug) {
++ print "\n";
++ print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
++ print "lat: $lati\n";
++ print "lon: $long\n";
++ }
++
++ my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
++# print "$url\n";
++ return ($url,$mapscale);
++}
+
+ #############################################################################
+ sub eniro_url($$$){
+@@ -2284,7 +2346,7 @@
+ =item B<--mapserver <MAPSERVER>>
+
+ Mapserver to download from. Default: 'expedia'.
+-Currently can use: landsat or expedia.
++Currently usable: landsat, expedia or openstreetmap_tah.
+
+ geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs,
+ but they are !!!NOT!!!! in the right scale.
+@@ -2294,6 +2356,9 @@
+
+ landsat covers the whole world with satelite Photos
+
++openstreetmap_tah: Free maps from the OpenStreetmap Tiles at Home project, see
++ http://www.openstreetmap.org and http://tah.openstreetmap.org.
++
+ gov_au is for Australia
+
+ incrementp for japanese Maps
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch 47e014d89d9957ea970e01aced2dc553d3722236
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch 47e014d89d9957ea970e01aced2dc553d3722236
@@ -0,0 +1,18 @@
+Index: src/map_handler.c
+===================================================================
+--- aa/src/map_handler.c (Revision 1699)
++++ aa/src/map_handler.c (Revision 1700)
+@@ -660,9 +660,12 @@
+ if (maploaded)
+ gdk_pixbuf_unref (image);
+
++#ifdef MAPNIK
+ if ( !strcmp (filename,"mapnik") ) {
+ limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+- } else {
++ } else
++#endif
++ {
+ limage = gdk_pixbuf_new_from_file (filename, NULL);
+ if (limage == NULL)
+ {
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b9c3b9e051b269ab097c36a70c58b6d218e0d55d
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b9c3b9e051b269ab097c36a70c58b6d218e0d55d
@@ -0,0 +1,96 @@
+diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am
+--- gpsdrive-2.10pre4.orig/src/Makefile.am 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/src/Makefile.am 2007-12-28 18:50:29.000000000 +0100
+@@ -14,14 +14,14 @@
+ -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \
+ -DLIBDIR=\"${libdir}\" \
+ -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \
+- ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\
+- -I/usr/include/ \
+- -I/usr/local/include \
+- -I/opt/boost_1_35/include/boost-1_35 \
+- -I/usr/local/include/freetype2 \
+- -I/usr/include/freetype2 \
++ ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}
++# -I/usr/include/ \
++# -I/usr/local/include \
++# -I/opt/boost_1_35/include/boost-1_35 \
++# -I/usr/local/include/freetype2 \
++# -I/usr/include/freetype2 \
+ -I. \
+- -L/usr/local/lib
++# -L/usr/local/lib
+
+ # -I/usr/include/dbus-1.0/
+
+diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure
+--- gpsdrive-2.10pre4.orig/configure 2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/configure 2008-01-06 14:49:11.000000000 +0100
+@@ -35950,10 +35950,13 @@
+ # Yep, its ebil, but I does not know better...
+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`
+ # default on debian should be: /usr/share/perl5/
+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`
+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`
+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`
+
++# hard co%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list