[oe-commits] org.oe.dev merge of 'acd8437858f09a96cbc55521caf58591895661d7'

[oe commit]

merge of 'acd8437858f09a96cbc55521caf58591895661d7'
     and 'd131b2a91c76f28316eb023acdc7d81fb7a42044'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 78b6c1ae6ce1ab33492438f1e093c7eeabc8bdee
ViewMTN: http://monotone.openembedded.org/revision/info/78b6c1ae6ce1ab33492438f1e093c7eeabc8bdee
Files:
1
conf/distro/include/fso-autorev.inc
packages/viking
packages/viking/viking-0.9.6
packages/viking/viking-0.9.6/viking-openaerialmap.patch
packages/viking/viking-0.9.6/viking-parallel-build.patch
packages/viking/viking_0.9.6.bb
Diffs:

#
# mt diff -racd8437858f09a96cbc55521caf58591895661d7 -r78b6c1ae6ce1ab33492438f1e093c7eeabc8bdee
#
#
#
# patch "conf/distro/include/fso-autorev.inc"
#  from [d62be855a73965d9e957103353793b910d68a183]
#    to [6ab6e0c1ed13f2c79a9e52e672f533921c44af0c]
#
============================================================
--- conf/distro/include/fso-autorev.inc	d62be855a73965d9e957103353793b910d68a183
+++ conf/distro/include/fso-autorev.inc	6ab6e0c1ed13f2c79a9e52e672f533921c44af0c
@@ -2,7 +2,7 @@ SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-fso-sounds = "${AUTOREV}"
 SRCREV_pn-gsm0710muxd = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
-SRCREV_pn-illume = ${AUTOREV}"
+SRCREV_pn-illume = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
 SRCREV_pn-mickeydbus = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"


#
# mt diff -rd131b2a91c76f28316eb023acdc7d81fb7a42044 -r78b6c1ae6ce1ab33492438f1e093c7eeabc8bdee
#
#
#
# add_dir "packages/viking"
# 
# add_dir "packages/viking/viking-0.9.6"
# 
# add_file "packages/viking/viking-0.9.6/viking-openaerialmap.patch"
#  content [4e162dd93824a13d994a6a30fd45ab7d539d0cff]
# 
# add_file "packages/viking/viking-0.9.6/viking-parallel-build.patch"
#  content [07fa4faf2e82a53368edadac84e1c82ff7c7037d]
# 
# add_file "packages/viking/viking_0.9.6.bb"
#  content [d3279cf5523247d9ec23a4cac5a1287bb47b0678]
#
============================================================
--- packages/viking/viking-0.9.6/viking-openaerialmap.patch	4e162dd93824a13d994a6a30fd45ab7d539d0cff
+++ packages/viking/viking-0.9.6/viking-openaerialmap.patch	4e162dd93824a13d994a6a30fd45ab7d539d0cff
@@ -0,0 +1,49 @@
+Author: Stanislav Brabec <sbrabec at suse.cz>
+
+This patch adds support for OpenAerialMap, asking server to provide OSM-compatible tiles.
+This solution is not the fastest one, but it is far the simplest solution.
+
+================================================================================
+--- viking-0.9.6/src/osm.c
++++ viking-0.9.6/src/osm.c
+@@ -36,6 +36,7 @@
+ static int osm_maplint_download ( MapCoord *src, const gchar *dest_fn );
+ static int osm_mapnik_download ( MapCoord *src, const gchar *dest_fn );
+ static int osm_osmarender_download ( MapCoord *src, const gchar *dest_fn );
++static int oam_download ( MapCoord *src, const gchar *dest_fn );
+ static int bluemarble_download ( MapCoord *src, const gchar *dest_fn );
+ 
+ static DownloadOptions osm_options = { NULL, 0, a_check_map_file };
+@@ -45,12 +46,16 @@
+   VikMapsLayer_MapType osmarender_type = { 12, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_osmarender_download };
+   VikMapsLayer_MapType mapnik_type = { 13, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_mapnik_download };  VikMapsLayer_MapType maplint_type = { 14, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, osm_maplint_download };
+ 
++  VikMapsLayer_MapType oam_type = { 17, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, oam_download };
++
+   VikMapsLayer_MapType bluemarble_type = { 15, 256, 256, VIK_VIEWPORT_DRAWMODE_MERCATOR, osm_coord_to_mapcoord, osm_mapcoord_to_center_coord, bluemarble_download };
+ 
+   maps_layer_register_type("OpenStreetMap (Osmarender)", 12, &osmarender_type);
+   maps_layer_register_type("OpenStreetMap (Mapnik)", 13, &mapnik_type);
+   maps_layer_register_type("OpenStreetMap (Maplint)", 14, &maplint_type);
+ 
++  maps_layer_register_type("OpenAerialMap", 17, &oam_type);
++
+   maps_layer_register_type("BlueMarble", 15, &bluemarble_type);
+ }
+ 
+@@ -126,6 +131,15 @@
+    g_free ( uri );
+    return res;
+ }
++
++static int oam_download ( MapCoord *src, const gchar *dest_fn )
++{
++   int res = -1;
++   gchar *uri = g_strdup_printf ( "/tiles/1.0.0/openaerialmap-900913/%d/%d/%d.jpg", 17-src->scale, src->x, src->y );
++   res = a_http_download_get_url ( "tile.openaerialmap.org", uri, dest_fn, &osm_options );
++   g_free ( uri );
++   return res;
++}
+ 
+ static int bluemarble_download ( MapCoord *src, const gchar *dest_fn )
+ {
============================================================
--- packages/viking/viking-0.9.6/viking-parallel-build.patch	07fa4faf2e82a53368edadac84e1c82ff7c7037d
+++ packages/viking/viking-0.9.6/viking-parallel-build.patch	07fa4faf2e82a53368edadac84e1c82ff7c7037d
@@ -0,0 +1,15 @@
+Index: viking-0.9.6/src/icons/Makefile.am
+===================================================================
+--- viking-0.9.6.orig/src/icons/Makefile.am	2008-07-27 20:25:34.000000000 +0000
++++ viking-0.9.6/src/icons/Makefile.am	2008-09-05 14:15:29.000000000 +0000
+@@ -134,8 +134,8 @@
+ 
+ .png.png_h:
+ 	gdk-pixbuf-csource --name="`basename $< .png`" --struct --extern $< > $@
+-	cat $@ | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > temp.h
+-	mv temp.h $@
++	cat $@ | sed -e 's/\(pixel_data: ..\)/\1 (unsigned char \*)/' > temp$@.h
++	mv temp$@.h $@
+ 
+ INCLUDES        = @GTK_CFLAGS@
+ AM_CFLAGS       = -Wall -g -D_GNU_SOURCE
============================================================
--- packages/viking/viking_0.9.6.bb	d3279cf5523247d9ec23a4cac5a1287bb47b0678
+++ packages/viking/viking_0.9.6.bb	d3279cf5523247d9ec23a4cac5a1287bb47b0678
@@ -0,0 +1,16 @@
+DESCRIPTION = "program to manage GPS data"
+HOMEPAGE = "http://viking.sourceforge.net/"
+SECTION = "x11/applications"
+DEPENDS = "gpsd gtk+"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/viking/viking-${PV}.tar.gz \
+	file://viking-openaerialmap.patch;patch=1 \
+	file://viking-parallel-build.patch;patch=1"
+
+# libgps is linked with c++
+#export CC='${CC} -lstdc++'
+LDFLAGS += "-lstdc++"
+
+inherit autotools