summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-navigation
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-08 22:51:41 +0200
commit1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch)
treea21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-navigation
downloadmeta-openembedded-1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-rw-r--r--meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb23
-rw-r--r--meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb109
-rw-r--r--meta-oe/recipes-navigation/geoclue/files/soup-session-fix.patch30
-rw-r--r--meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb31
-rw-r--r--meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch39
-rw-r--r--meta-oe/recipes-navigation/geos/geos.inc21
-rw-r--r--meta-oe/recipes-navigation/geos/geos_3.4.2.bb6
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch33
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-remove-rpath.patch45
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd-3.10/0003-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch75
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch52
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb7
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules47
-rwxr-xr-xmeta-oe/recipes-navigation/gpsd/gpsd/gpsd136
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default5
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service10
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb137
-rw-r--r--meta-oe/recipes-navigation/gypsy/files/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch114
-rw-r--r--meta-oe/recipes-navigation/gypsy/files/fixups.patch21
-rw-r--r--meta-oe/recipes-navigation/gypsy/gypsy.inc23
-rw-r--r--meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb15
-rw-r--r--meta-oe/recipes-navigation/gypsy/gypsy_git.bb22
-rw-r--r--meta-oe/recipes-navigation/libspatialite/libspatialite.inc16
-rw-r--r--meta-oe/recipes-navigation/libspatialite/libspatialite/fix-the-configure-script-and-freexl.patch200
-rw-r--r--meta-oe/recipes-navigation/libspatialite/libspatialite_3.0.1.bb9
-rw-r--r--meta-oe/recipes-navigation/monav/monav/monav.desktop10
-rw-r--r--meta-oe/recipes-navigation/monav/monav/monav.pngbin0 -> 21543 bytes
-rw-r--r--meta-oe/recipes-navigation/monav/monav_0.3.bb37
-rw-r--r--meta-oe/recipes-navigation/navit/navit-fpu.inc6
-rw-r--r--meta-oe/recipes-navigation/navit/navit.inc93
-rw-r--r--meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch16
-rw-r--r--meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch28
-rw-r--r--meta-oe/recipes-navigation/navit/navit/maps.xml24
-rw-r--r--meta-oe/recipes-navigation/navit/navit/navit.xml45
-rw-r--r--meta-oe/recipes-navigation/navit/navit/osd.xml15
-rw-r--r--meta-oe/recipes-navigation/navit/navit/plugins.xml6
-rw-r--r--meta-oe/recipes-navigation/navit/navit/speech.xml8
-rw-r--r--meta-oe/recipes-navigation/navit/navit_svn.bb11
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch33
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch125
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch62
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch71
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch15
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch14
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch15
-rw-r--r--meta-oe/recipes-navigation/omgps/omgps_svn.bb29
-rw-r--r--meta-oe/recipes-navigation/orrery/orrery/orrery.pngbin0 -> 19475 bytes
-rw-r--r--meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch59
-rw-r--r--meta-oe/recipes-navigation/orrery/orrery_2.7.bb31
-rw-r--r--meta-oe/recipes-navigation/proj/proj_4.8.0.bb14
50 files changed, 1993 insertions, 0 deletions
diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb
new file mode 100644
index 000000000..101e87e88
--- /dev/null
+++ b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.1.1.bb
@@ -0,0 +1,23 @@
1SUMMARY = "FoxtrotGPS is a map and GPS application using OpenStreetMap"
2AUTHOR = "Joshua Judson Rosen <rozzin@geekspace.com>"
3HOMEPAGE = "http://www.foxtrotgps.org/"
4SECTION = "x11/applications"
5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7DEPENDS = "curl gtk+ libglade sqlite3 libexif gpsd bluez4 intltool-native"
8
9SRC_URI = "http://www.foxtrotgps.org/releases/${BP}.tar.gz"
10SRC_URI[md5sum] = "6777d448ee9d3ba195f9d26ea90e3163"
11SRC_URI[sha256sum] = "ae9706285510554cc0813ac92522e0d1672b0ddb065307bfacfcff3c328f6adb"
12
13inherit autotools pkgconfig perlnative gconf
14
15PR = "r2"
16
17do_configure_prepend() {
18 if [ -f ${S}/configure.in ] ; then
19 mv ${S}/configure.in ${S}/configure.ac
20 fi
21}
22
23RRECOMMENDS_${PN} = "gpsd"
diff --git a/meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb b/meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb
new file mode 100644
index 000000000..b181b3ef8
--- /dev/null
+++ b/meta-oe/recipes-navigation/gdal/gdal_1.11.1.bb
@@ -0,0 +1,109 @@
1SUMMARY = "GDAL is a translator library for raster geospatial data formats"
2HOMEPAGE = "http://www.gdal.org/"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0952e17969fab12227096b5228f23149"
5
6DEPENDS = "proj sqlite3 tiff json-c"
7
8SRC_URI = "ftp://download.osgeo.org/gdal/${PV}/${BP}.tar.xz"
9
10SRC_URI[md5sum] = "2e126d7c6605691d38f3e71b945f5c73"
11SRC_URI[sha256sum] = "20e1042cff15a71038459a299732fb342428aea9912f32df30c85790fcab6302"
12
13inherit autotools-brokensep lib_package binconfig
14
15EXTRA_OECONF = "--without-perl \
16 --without-php \
17 --without-ruby \
18 --without-python \
19 \
20 --without-grass \
21 --without-libgrass \
22 --without-cfitsio \
23 --without-dds \
24 --without-gta \
25 --without-pcidsk \
26 --without-ogdi \
27 --without-fme \
28 --without-hdf4 \
29 --without-hdf5 \
30 --without-pg \
31 --without-jpeg12 \
32 --without-ogdi \
33 --without-netcdf \
34 --without-openjpeg \
35 --without-fgdb \
36 --without-ecw \
37 --without-kakadu \
38 --without-mrsid \
39 --without-jp2mrsid \
40 --without-mrsid_lidar \
41 --without-msg \
42 --without-bsb \
43 --without-grib \
44 --without-mysql \
45 --without-ingres \
46 --without-odbc \
47 --without-dods_root \
48 --without-xml2 \
49 --without-spatialite \
50 --without-pcre \
51 --without-dwgdirect \
52 --without-dwgdirect \
53 --without-idb \
54 --without-sde \
55 --without-sde-version \
56 --without-epsilon \
57 --without-webp \
58 --without-opencl \
59 --without-opencl-include \
60 --without-opencl-lib \
61 --without-freexl \
62 --without-pam \
63 --without-poppler \
64 --without-podofo \
65 --without-podofo-lib \
66 --without-podofo-extra-lib-for-test \
67 --without-static_proj4 \
68 --without-perl \
69 --without-php \
70 --without-ruby \
71 --without-python \
72 --without-java \
73 --without-mdb \
74 --without-jvm-lib \
75 --without-jvm-lib-add-rpath \
76 --without-rasdaman \
77 --without-armadillo \
78 \
79 --with-pcraster=internal \
80 --with-geotiff=internal \
81 \
82 --with-sqlite3=${STAGING_EXECPREFIXDIR} \
83 --with-libtiff=${STAGING_EXECPREFIXDIR} \
84 --with-libjson-c=${STAGING_EXECPREFIXDIR} \
85 --with-expat=${STAGING_EXECPREFIXDIR} \
86"
87
88EXTRA_OEMAKE += "INST_DATA="${datadir}/gdal""
89
90PACKAGECONFIG ?= "geos png jasper"
91PACKAGECONFIG[geos] = "--with-geos,--without-geos,geos"
92PACKAGECONFIG[lzma] = "--with-liblzma,--without-liblzma,xz"
93PACKAGECONFIG[png] = "--with-png,--without-png,libpng"
94PACKAGECONFIG[gif] = "--with-gif,--without-gif,giflib"
95PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg"
96PACKAGECONFIG[z] = "--with-libz,--without-libz,zlib"
97PACKAGECONFIG[jasper] = "--with-jasper,--without-jasper,jasper"
98PACKAGECONFIG[curl] = "--with-curl,--without-curl,curl"
99
100do_configure_prepend () {
101 # The configure script has many hardcoded paths to search
102 # for the library headers when using external libraries,
103 # workaround it.
104 sed -e 's,/usr/include,NON_EXISTENT_DIR,g' \
105 -e 's,/usr/lib,NON_EXISTENT_DIR,g' \
106 -i ${S}/configure.in
107}
108
109FILES_${PN} += "${libdir}/gdalplugins"
diff --git a/meta-oe/recipes-navigation/geoclue/files/soup-session-fix.patch b/meta-oe/recipes-navigation/geoclue/files/soup-session-fix.patch
new file mode 100644
index 000000000..70fe3f55a
--- /dev/null
+++ b/meta-oe/recipes-navigation/geoclue/files/soup-session-fix.patch
@@ -0,0 +1,30 @@
1Upstream-Status: Upstream-Status: Inappropriate [poky 9.0 has older libsoup]
2
3Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
4
5diff --git a/src/gclue-ipclient.c b/src/gclue-ipclient.c
6index 09add30..1771d5c 100644
7--- a/src/gclue-ipclient.c
8+++ b/src/gclue-ipclient.c
9@@ -83,7 +83,7 @@ gclue_ipclient_init (GClueIpclient *ipclient)
10 {
11 ipclient->priv = G_TYPE_INSTANCE_GET_PRIVATE ((ipclient), GCLUE_TYPE_IPCLIENT, GClueIpclientPrivate);
12
13- ipclient->priv->soup_session = soup_session_new ();
14+ ipclient->priv->soup_session = soup_session_sync_new ();
15 }
16
17 /**
18diff --git a/src/geoip-server/geoip-update.c b/src/geoip-server/geoip-update.c
19index 6cce7b2..ef672ba 100644
20--- a/src/geoip-server/geoip-update.c
21+++ b/src/geoip-server/geoip-update.c
22@@ -214,7 +214,7 @@ main (int argc, char **argv)
23 path = GEOIP_DATABASE_PATH;
24 }
25
26- session = soup_session_new ();
27+ session = soup_session_sync_new ();
28
29 for (i = 0; i < G_N_ELEMENTS (db_info_map); i++) {
30 SoupMessage *msg = NULL;
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb
new file mode 100644
index 000000000..a0305fb60
--- /dev/null
+++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.0.0.bb
@@ -0,0 +1,31 @@
1SUMMARY = "The Geolocation Service"
2DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \
3The primary goal of the Geoclue project is to make creating location-aware applications \
4as simple as possible, while the secondary goal is to ensure that no application \
5can access location information without explicit permission from user."
6LICENSE = "GPLv2.0+"
7SECTION = "console/network"
8
9LIC_FILES_CHKSUM = "file://COPYING;md5=8114b83a0435d8136b47bd70111ce5cd"
10
11DEPENDS = "glib-2.0 dbus dbus-glib json-glib libsoup-2.4"
12
13inherit autotools pkgconfig gtk-doc
14
15SRC_URI = " \
16 http://www.freedesktop.org/software/geoclue/releases/2.0/geoclue-${PV}.tar.xz \
17 file://soup-session-fix.patch \
18"
19
20SRC_URI[md5sum] = "401ff99d530b177c62afacef0a33efd9"
21SRC_URI[sha256sum] = "4a82f184e55a163d86e0ad69bbe1bba9960bb5094220fe1f01350bceda8c67a1"
22
23EXTRA_OECONF += " \
24 --with-dbus-service-user=root \
25 --with-dbus-sys-dir=${sysconfdir}/dbus-1/system.d \
26"
27
28FILES_${PN} += " \
29 ${datadir}/dbus-1/system-services/org.freedesktop.GeoClue2.service \
30 ${datadir}/geoclue-2.0/geoclue-interface.xml \
31"
diff --git a/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch b/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch
new file mode 100644
index 000000000..645e6f62a
--- /dev/null
+++ b/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch
@@ -0,0 +1,39 @@
1From 9d51027c228dafd7db2d0cffca1f0fc695e950fd Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Mon, 2 Dec 2013 11:33:26 -0200
4Subject: [PATCH] geos-config: Add includedir variable
5
6This fixes cross-compile as it is easier to mangle the includedir
7during sysroot generation.
8
9Upstream-Status: Pending
10
11Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
12---
13 tools/geos-config.in | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/tools/geos-config.in b/tools/geos-config.in
17index 9b45b5f..1749892 100644
18--- a/tools/geos-config.in
19+++ b/tools/geos-config.in
20@@ -1,6 +1,7 @@
21 #!/bin/sh
22 prefix=@prefix@
23 exec_prefix=@exec_prefix@
24+includedir=@includedir@
25 libdir=@libdir@
26
27 usage()
28@@ -38,7 +39,7 @@ case $1 in
29 echo @VERSION@
30 ;;
31 --cflags)
32- echo -I${prefix}/include
33+ echo -I${includedir}
34 ;;
35 --libs)
36 # TODO: make an alias for --clibs
37--
381.7.10.4
39
diff --git a/meta-oe/recipes-navigation/geos/geos.inc b/meta-oe/recipes-navigation/geos/geos.inc
new file mode 100644
index 000000000..2e308b488
--- /dev/null
+++ b/meta-oe/recipes-navigation/geos/geos.inc
@@ -0,0 +1,21 @@
1DESCRIPTION = "GEOS - Geometry Engine, Open Source"
2HOMEPAGE = "http://trac.osgeo.org/geos/"
3SECTION = "libs"
4
5LICENSE = "LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
7
8SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2"
9
10inherit autotools pkgconfig binconfig
11
12PACKAGES =+ "geoslib ${PN}-c1"
13
14DESCRIPTION_${PN}lib = "Geometry engine for Geographic Information Systems - C++ Library"
15FILES_${PN}lib += "${libdir}/libgeos-${PV}.so"
16
17DESCRIPTION_${PN}-c1 = "Geometry engine for Geographic Information Systems - C Library"
18FILES_${PN}-c1 += "${libdir}/libgeos_c.so.*"
19
20ALLOW_EMPTY_${PN} = "1"
21RDEPENDS_${PN} += "geoslib ${PN}-c1"
diff --git a/meta-oe/recipes-navigation/geos/geos_3.4.2.bb b/meta-oe/recipes-navigation/geos/geos_3.4.2.bb
new file mode 100644
index 000000000..3a9a028e8
--- /dev/null
+++ b/meta-oe/recipes-navigation/geos/geos_3.4.2.bb
@@ -0,0 +1,6 @@
1require geos.inc
2
3SRC_URI += "file://geos-config-Add-includedir-variable.patch"
4
5SRC_URI[md5sum] = "fc5df2d926eb7e67f988a43a92683bae"
6SRC_URI[sha256sum] = "15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53"
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch
new file mode 100644
index 000000000..c4134f4b5
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch
@@ -0,0 +1,33 @@
1From 3c5fb3a8691ac711ea93edf8e0b42bffc62b197e Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 24 Apr 2012 11:52:35 +0200
4Subject: [PATCH 1/4] SConstruct: respect sysroot also in SPLINTOPTS
5
6Upstream-Status: Inappropriate [embedded specific]
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
10Signed-off-by: Peter A. Bigot <pab@pabigot.com>
11---
12 SConstruct | 5 ++++-
13 1 file changed, 4 insertions(+), 1 deletion(-)
14
15diff --git a/SConstruct b/SConstruct
16index 14e2f59..f0cafa8 100644
17--- a/SConstruct
18+++ b/SConstruct
19@@ -1414,7 +1414,10 @@ def Utility(target, source, action):
20 # Report splint warnings
21 # Note: test_bits.c is unsplintable because of the PRI64 macros.
22 # If you get preprocessor or fatal errors, add +showscan.
23-splintopts = "-I/usr/include/libusb-1.0 +quiet"
24+if not env['sysroot']:
25+ splintopts = "-I/usr/include/libusb-1.0 +quiet"
26+else:
27+ splintopts = "-I%s/usr/include/libusb-1.0 +quiet" % env['sysroot']
28 # splint does not know about multi-arch, work around that
29 ma_status, ma = _getstatusoutput('dpkg-architecture -qDEB_HOST_MULTIARCH')
30 if ma_status == 0:
31--
321.8.5.5
33
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-remove-rpath.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-remove-rpath.patch
new file mode 100644
index 000000000..083a6621f
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-remove-rpath.patch
@@ -0,0 +1,45 @@
1From d090638ff983e509162d5e3b62aa4918de4aa5fa Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 24 Apr 2012 16:24:35 +0200
4Subject: [PATCH 2/4] SConstruct: remove rpath
5
6* even with correct prefix (without DESTDIR) included it's redundant
7 WARNING: QA Issue: libgps:
8 /work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0
9 contains probably-redundant RPATH /usr/lib
10* and with prefix from scons.bbclass it's invalid
11 WARNING: QA Issue: package libgps contains bad RPATH
12 /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/image/usr/lib
13 in file
14 /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0
15
16Upstream-Status: Inapppropriate [embedded specific]
17
18Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
20Signed-off-by: Peter A. Bigot <pab@pabigot.com>
21---
22 SConstruct | 7 +++++--
23 1 file changed, 5 insertions(+), 2 deletions(-)
24
25diff --git a/SConstruct b/SConstruct
26index f0cafa8..ff46713 100644
27--- a/SConstruct
28+++ b/SConstruct
29@@ -1340,8 +1340,11 @@ if qt_env:
30 binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
31
32 if env["shared"] and env["chrpath"]:
33- env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
34- % (installdir('libdir', False), ))
35+ if not env['sysroot']:
36+ env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
37+ % (installdir('libdir', False), ))
38+ else:
39+ env.AddPostAction(binaryinstall, '$CHRPATH -d "$TARGET"')
40
41 if not env['debug'] and not env['profiling'] and env['strip']:
42 env.AddPostAction(binaryinstall, '$STRIP $TARGET')
43--
441.8.5.5
45
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0003-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0003-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
new file mode 100644
index 000000000..1d8c14b57
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0003-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
@@ -0,0 +1,75 @@
1From ad7b06d375730b30f181c5efb3bf21418f296f73 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 24 Apr 2012 18:45:14 +0200
4Subject: [PATCH 3/4] SConstruct: prefix includepy with sysroot and drop
5 sysroot from python_lib_dir
6
7* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix
8 and with PYTHONPATH from OE it's pointing to native python dir
9
10 $ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/
11 $ python
12 Python 2.7.2 (default, Apr 18 2012, 09:19:59)
13 [GCC 4.6.2] on linux2
14 Type "help", "copyright", "credits" or "license" for more information.
15 >>> from distutils import sysconfig
16 >>> sysconfig.get_config_vars('INCLUDEPY')
17 ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
18 >>>
19 $ unset PYTHONPATH
20 $ python
21 Python 2.7.2 (default, Apr 18 2012, 09:19:59)
22 [GCC 4.6.2] on linux2
23 Type "help", "copyright", "credits" or "license" for more information.
24 >>> from distutils import sysconfig
25 >>> sysconfig.get_config_vars('INCLUDEPY')
26 ['/python2.7']
27 >>> import sysconfig
28 >>> sysconfig.get_config_vars('INCLUDEPY')
29 ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
30* python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
31 returns path to target sysroot
32
33Upstream-Status: Inappropriate [embedded specific]
34
35Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
36Signed-off-by: Peter A. Bigot <pab@pabigot.com>
37---
38 SConstruct | 9 +++++++++
39 1 file changed, 9 insertions(+)
40
41diff --git a/SConstruct b/SConstruct
42index ff46713..0e518e7 100644
43--- a/SConstruct
44+++ b/SConstruct
45@@ -1089,6 +1089,12 @@ else:
46 basecflags += ' -coverage'
47 ldflags += ' -coverage'
48 ldshared += ' -coverage'
49+
50+ if env['sysroot']:
51+ print "Prefixing includepy '%s' with sysroot prefix" % includepy
52+ includepy = os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], includepy))
53+ print "'%s'" % includepy
54+
55 # in case CC/CXX was set to the scan-build wrapper,
56 # ensure that we build the python modules with scan-build, too
57 if env['CC'] is None or env['CC'].find('scan-build') < 0:
58@@ -1353,11 +1359,14 @@ if not env['python']:
59 python_install = []
60 else:
61 python_lib_dir = sysconfig.get_python_lib(plat_specific=1)
62+ python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
63 python_module_dir = python_lib_dir + os.sep + 'gps'
64 python_extensions_install = python_env.Install( DESTDIR + python_module_dir,
65 python_built_extensions)
66 if not env['debug'] and not env['profiling'] and env['strip']:
67 python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET')
68+ env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \
69+ % (python_lib_dir, ))
70
71 python_modules_install = python_env.Install( DESTDIR + python_module_dir,
72 python_modules)
73--
741.8.5.5
75
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch
new file mode 100644
index 000000000..8527f0db3
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch
@@ -0,0 +1,52 @@
1From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 29 Apr 2012 00:05:59 +0200
4Subject: [PATCH 4/4] SConstruct: disable html and man docs building because
5 xmlto-native from OE is broken
6
7It will try to load dtd and fail:
8| xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1
9| xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3)
10| xmlto: Fix document syntax or use --skip-validation option
11| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
12| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
13| "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
14| ^
15| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd
16| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
17| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
18| Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate
19| mv: cannot stat `gpsctl.1': No such file or directory
20| scons: *** [gpsctl.1] Error 1
21| scons: building terminated because of errors.
22
23Upstream-Status: Inappropriate [disable feature]
24
25Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
26Signed-off-by: Peter A. Bigot <pab@pabigot.com>
27---
28 SConstruct | 4 ++--
29 1 file changed, 2 insertions(+), 2 deletions(-)
30
31diff --git a/SConstruct b/SConstruct
32index 0e518e7..c01a71b 100644
33--- a/SConstruct
34+++ b/SConstruct
35@@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size);
36
37 manbuilder = mangenerator = htmlbuilder = None
38 if env['manbuild']:
39- if config.CheckXsltproc():
40+ if False and config.CheckXsltproc():
41 mangenerator = 'xsltproc'
42 build = "xsltproc --nonet %s $SOURCE >$TARGET"
43 htmlbuilder = build % docbook_html_uri
44 manbuilder = build % docbook_man_uri
45- elif WhereIs("xmlto"):
46+ elif False and WhereIs("xmlto"):
47 mangenerator = 'xmlto'
48 xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` `dirname $TARGET`"
49 htmlbuilder = xmlto % "html-nochunks"
50--
511.8.5.5
52
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
new file mode 100644
index 000000000..d023c5de7
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb
@@ -0,0 +1,7 @@
1SUMMARY = "Machine specific gpsd config"
2LICENSE = "BSD"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb"
4
5# empty by default
6# BSP layers can add stuff like meta-openmoko example:
7#
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules b/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules
new file mode 100644
index 000000000..61143b8f6
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd/60-gpsd.rules
@@ -0,0 +1,47 @@
1# udev rules for gpsd
2# $Id$
3#
4# GPSes don't have their own USB device class. They're serial-over-USB
5# devices, so what you see is actually the ID of the serial-over-USB chip.
6# Fortunately, just two of these account for over 80% of consumer-grade
7# GPS sensors. The gpsd.hotplug.wrapper script will tell a running gpsd
8# that it should look at the device that just went active, because it
9# might be a GPS.
10#
11# The following setup works on Debian - something similar will apply on
12# other distributions:
13#
14# /etc/udev/gpsd.rules
15# /etc/udev/rules.d/025_gpsd.rules -> ../gpsd.rules
16# /lib/udev/gpsd.hotplug.wrapper
17# /lib/udev/gpsd.hotplug
18#
19# Setting the link in /etc/udev/rules.d activates the rule and determines
20# when to run it on boot (similar to init.d processing).
21
22SUBSYSTEM!="tty", GOTO="gpsd_rules_end"
23
24# Prolific Technology, Inc. PL2303 Serial Port
25ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
26# ATEN International Co., Ltd UC-232A Serial Port [pl2303]
27ATTR{idVendor}=="0557", ATTR{idProduct}=="2008", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
28# FTDI 8U232AM
29ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
30# Cypress M8/CY7C64013 (DeLorme uses these)
31ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
32# PS-360 OEM (Microsoft GPS sold with Street and Trips 2005)
33ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
34# Garmin International GPSmap, various models (tested with Garmin GPS 18 USB)
35ATTR{idVendor}=="091e", ATTR{idProduct}=="0003", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
36# Cygnal Integrated Products, Inc. CP210x Composite Device (Used by Holux m241)
37ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
38# u-blox AG, u-blox 5 (tested with Navilock NL-402U)
39ATTR{idVendor}=="1546", ATTR{idProduct}=="01a5", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
40# FTDI FT232
41ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
42# u-blox 4
43ATTR{idVendor}=="1546", ATTR{idProduct}=="01a4", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper"
44
45ACTION=="remove", RUN+="/lib/udev/gpsd.hotplug.wrapper"
46
47LABEL="gpsd_rules_end"
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd
new file mode 100755
index 000000000..ba73dafb2
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd
@@ -0,0 +1,136 @@
1#!/bin/sh
2### BEGIN INIT INFO
3# Provides: gpsd
4# Required-Start: $remote_fs $network
5# Should-Start: bluetooth dbus udev
6# Required-Stop: $remote_fs $network
7# Default-Start: 2 3 4 5
8# Default-Stop: 0 1 6
9# Short-Description: GPS (Global Positioning System) daemon start/stop script
10# Description: Start/Stop script for the gpsd service daemon,
11# which is able to monitor one or more GPS devices
12# connected to a host computer, making all data on
13# the location and movements of the sensors available
14# to be queried on TCP port 2947.
15### END INIT INFO
16
17# Author: Bernd Zeimetz <bzed@debian.org>
18#
19# Please remove the "Author" lines above and replace them
20# with your own name if you copy and modify this script.
21
22# Do NOT "set -e"
23
24# PATH should only include /usr/* if it runs after the mountnfs.sh script
25PATH=/sbin:/usr/sbin:/bin:/usr/bin
26DESC="GPS (Global Positioning System) daemon"
27NAME=gpsd
28DAEMON=/usr/sbin/$NAME
29PIDFILE=/var/run/$NAME.pid
30SCRIPTNAME=/etc/init.d/$NAME
31
32# Exit if the package is not installed
33[ -x "$DAEMON" ] || exit 0
34
35# Read configuration, if present
36[ -r /etc/default/$NAME ] && . /etc/default/$NAME
37
38if [ -z "$GPSD_SOCKET" ] && [ -z "$DEVICES" ]; then
39 GPSD_SOCKET=/var/run/gpsd.sock
40fi
41
42if [ -n "$GPSD_SOCKET" ]; then
43 GPSD_OPTIONS="$GPSD_OPTIONS -F $GPSD_SOCKET"
44fi
45
46#
47# Function that starts the daemon/service
48#
49do_start()
50{
51 # Return
52 # 0 if daemon has been started
53 # 1 if daemon was already running
54 # 2 if daemon could not be started
55 start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test \
56 -- $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES > /dev/null \
57 || return 1
58 start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
59 $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES \
60 || return 2
61}
62
63#
64# Function that stops the daemon/service
65#
66do_stop()
67{
68 # Return
69 # 0 if daemon has been stopped
70 # 1 if daemon was already stopped
71 # 2 if daemon could not be stopped
72 # other if a failure occurred
73 start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
74 RETVAL="$?"
75 [ "$RETVAL" = 2 ] && return 2
76 # Many daemons don't delete their pidfiles when they exit.
77 rm -f $PIDFILE
78 return "$RETVAL"
79}
80
81#
82# Function that sends a SIGHUP to the daemon/service
83#
84do_reload() {
85 #
86 # If the daemon can reload its configuration without
87 # restarting (for example, when it is sent a SIGHUP),
88 # then implement that here.
89 #
90 start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
91 return 0
92}
93
94case "$1" in
95 start)
96 echo "Starting $DESC" "$NAME"
97 do_start
98 exit $?
99 ;;
100 stop)
101 echo "Stopping $DESC" "$NAME"
102 do_stop
103 exit $?
104 ;;
105 status)
106 ;;
107 reload|force-reload)
108 echo "Reloading $DESC" "$NAME"
109 do_reload
110 exit $?
111 ;;
112 restart)
113 #
114 # If the "reload" option is implemented then remove the
115 # 'force-reload' alias
116 #
117 echo "Restarting $DESC" "$NAME"
118 do_stop
119 case "$?" in
120 0|1)
121 do_start
122 exit $?
123 ;;
124 *)
125 # Failed to stop
126 exit 1
127 ;;
128 esac
129 ;;
130 *)
131 echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
132 exit 3
133 ;;
134esac
135
136:
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default
new file mode 100644
index 000000000..0ceff0382
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd-default
@@ -0,0 +1,5 @@
1# If you must specify a non-NMEA driver, uncomment and modify the next line
2GPSD_SOCKET="/var/run/gpsd.sock"
3GPSD_OPTIONS=""
4GPS_DEVICES=""
5
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
new file mode 100644
index 000000000..7131a589d
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd/gpsd.service
@@ -0,0 +1,10 @@
1[Unit]
2Description=GPS (Global Positioning System) Daemon
3Requires=gpsd.socket
4
5[Service]
6EnvironmentFile=/etc/default/gpsd
7ExecStart=/usr/sbin/gpsd -N $GPS_DEVICES
8
9[Install]
10Also=gpsd.socket
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
new file mode 100644
index 000000000..6d3adc18d
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
@@ -0,0 +1,137 @@
1SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices"
2SECTION = "console/network"
3LICENSE = "BSD"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
5DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools"
6PROVIDES = "virtual/gpsd"
7
8EXTRANATIVEPATH += "chrpath-native"
9
10SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
11 file://0001-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \
12 file://0002-SConstruct-remove-rpath.patch \
13 file://0003-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \
14 file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \
15 file://gpsd-default \
16 file://gpsd \
17 file://60-gpsd.rules \
18 file://gpsd.service \
19"
20SRC_URI[md5sum] = "fc5b03aae38b9b5b6880b31924d0ace3"
21SRC_URI[sha256sum] = "706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320"
22
23inherit scons update-rc.d python-dir pythonnative systemd
24
25INITSCRIPT_NAME = "gpsd"
26INITSCRIPT_PARAMS = "defaults 35"
27
28SYSTEMD_OESCONS = "${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}"
29
30export STAGING_INCDIR
31export STAGING_LIBDIR
32
33PACKAGECONFIG ??= "bluez"
34PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez4"
35
36EXTRA_OESCONS = " \
37 sysroot=${STAGING_DIR_TARGET} \
38 libQgpsmm='false' \
39 debug='true' \
40 strip='false' \
41 systemd='${SYSTEMD_OESCONS}' \
42 ${EXTRA_OECONF} \
43"
44# this cannot be used, because then chrpath is not found and only static lib is built
45# target=${HOST_SYS}
46
47do_compile_prepend() {
48 export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
49 export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
50 export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
51
52 export BUILD_SYS="${BUILD_SYS}"
53 export HOST_SYS="${HOST_SYS}"
54}
55
56do_install() {
57 export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}"
58 export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config"
59 export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}"
60
61 export BUILD_SYS="${BUILD_SYS}"
62 export HOST_SYS="${HOST_SYS}"
63
64 export DESTDIR="${D}"
65 # prefix is used for RPATH and DESTDIR/prefix for instalation
66 ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \
67 bbfatal "scons install execution failed."
68}
69
70do_install_append() {
71 install -d ${D}/${sysconfdir}/init.d
72 install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/
73 install -d ${D}/${sysconfdir}/default
74 install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default
75
76 #support for udev
77 install -d ${D}/${sysconfdir}/udev/rules.d
78 install -m 0644 ${WORKDIR}/60-gpsd.rules ${D}/${sysconfdir}/udev/rules.d
79 install -d ${D}${base_libdir}/udev/
80 install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/
81
82 #support for python
83 install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
84 install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
85
86 #support for systemd
87 install -d ${D}${systemd_unitdir}/system/
88 install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
89 install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
90}
91
92pkg_postinst_${PN}-conf() {
93 update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10
94}
95
96pkg_postrm_${PN}-conf() {
97 update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default
98}
99
100PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils"
101
102FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc"
103
104FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
105
106RDEPENDS_${PN} = "gpsd-gpsctl"
107RRECOMMENDS_${PN} = "gpsd-conf gpsd-udev gpsd-machine-conf"
108
109SUMMARY_gpsd-udev = "udev relevant files to use gpsd hotplugging"
110FILES_gpsd-udev = "${base_libdir}/udev ${sysconfdir}/udev/*"
111RDEPENDS_gpsd-udev += "udev gpsd-conf"
112
113SUMMARY_libgpsd = "C service library used for communicating with gpsd"
114FILES_libgpsd = "${libdir}/libgpsd.so.*"
115
116SUMMARY_libgps = "C service library used for communicating with gpsd"
117FILES_libgps = "${libdir}/libgps.so.*"
118
119SUMMARY_gpsd-conf = "gpsd configuration files and init scripts"
120FILES_gpsd-conf = "${sysconfdir}"
121CONFFILES_gpsd-conf = "${sysconfdir}/default/gpsd.default"
122
123SUMMARY_gpsd-gpsctl = "Tool for tweaking GPS modes"
124FILES_gpsd-gpsctl = "${bindir}/gpsctl"
125
126SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS"
127FILES_gps-utils = "${bindir}/*"
128RDEPENDS_gps-utils = "python-pygps"
129
130SUMMARY_python-pygps = "Python bindings to gpsd"
131FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*"
132RDEPENDS_python-pygps = "python-core python-curses gpsd python-json"
133
134RPROVIDES_${PN} += "${PN}-systemd"
135RREPLACES_${PN} += "${PN}-systemd"
136RCONFLICTS_${PN} += "${PN}-systemd"
137SYSTEMD_SERVICE_${PN} = "${PN}.socket"
diff --git a/meta-oe/recipes-navigation/gypsy/files/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch b/meta-oe/recipes-navigation/gypsy/files/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch
new file mode 100644
index 000000000..063bea618
--- /dev/null
+++ b/meta-oe/recipes-navigation/gypsy/files/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch
@@ -0,0 +1,114 @@
1From 5b859b6e7c82f49d967c25398a8e75b61af9bcc0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 Jun 2013 20:58:51 -0700
4Subject: [PATCH] g_type_init() is deprecated for glib >= 2.35.0
5
6Call it for old versions.
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Upstream-Status: Pending
11---
12 examples/list-known-gps-devices.c | 4 ++--
13 examples/simple-gps-dbus.c | 3 ++-
14 examples/simple-gps-gypsy.c | 4 ++--
15 examples/simple-gps-satellites.c | 4 ++--
16 gypsy/gypsy-marshal.c | 2 +-
17 src/main.c | 4 ++--
18 6 files changed, 11 insertions(+), 10 deletions(-)
19
20diff --git a/examples/list-known-gps-devices.c b/examples/list-known-gps-devices.c
21index c7c4059..0a8b04b 100644
22--- a/examples/list-known-gps-devices.c
23+++ b/examples/list-known-gps-devices.c
24@@ -20,9 +20,9 @@ main (int argc,
25 GError *error = NULL;
26 GPtrArray *known_devices;
27 int i;
28-
29+#if !GLIB_CHECK_VERSION(2,35,0)
30 g_type_init ();
31-
32+#endif
33 discovery = gypsy_discovery_new ();
34 known_devices = gypsy_discovery_list_devices (discovery, &error);
35
36diff --git a/examples/simple-gps-dbus.c b/examples/simple-gps-dbus.c
37index f7044e6..76b18aa 100644
38--- a/examples/simple-gps-dbus.c
39+++ b/examples/simple-gps-dbus.c
40@@ -121,8 +121,9 @@ main (int argc,
41 DBusConnection *conn;
42 DBusError error;
43 GMainLoop *mainloop;
44-
45+#if !GLIB_CHECK_VERSION(2,35,0)
46 g_type_init ();
47+#endif
48 conn = get_connection ();
49
50 dbus_error_init (&error);
51diff --git a/examples/simple-gps-gypsy.c b/examples/simple-gps-gypsy.c
52index 0b6b7a6..86033d9 100644
53--- a/examples/simple-gps-gypsy.c
54+++ b/examples/simple-gps-gypsy.c
55@@ -67,9 +67,9 @@ main (int argc,
56 g_print ("Usage: %s device\n", argv[0]);
57 return 0;
58 }
59-
60+#if !GLIB_CHECK_VERSION(2,35,0)
61 g_type_init ();
62-
63+#endif
64 control = gypsy_control_get_default ();
65 path = gypsy_control_create (control, argv[1], &error);
66 if (path == NULL) {
67diff --git a/examples/simple-gps-satellites.c b/examples/simple-gps-satellites.c
68index 140c98f..9a3f95a 100644
69--- a/examples/simple-gps-satellites.c
70+++ b/examples/simple-gps-satellites.c
71@@ -42,9 +42,9 @@ main (int argc,
72 g_print ("Usage: %s device\n", argv[0]);
73 return 0;
74 }
75-
76+#if !GLIB_CHECK_VERSION(2,35,0)
77 g_type_init ();
78-
79+#endif
80 control = gypsy_control_get_default ();
81 path = gypsy_control_create (control, argv[1], &error);
82 if (path == NULL) {
83diff --git a/gypsy/gypsy-marshal.c b/gypsy/gypsy-marshal.c
84index 6964644..9ac0095 100644
85--- a/gypsy/gypsy-marshal.c
86+++ b/gypsy/gypsy-marshal.c
87@@ -5,7 +5,7 @@
88
89 #ifdef G_ENABLE_DEBUG
90 #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
91-#define g_marshal_value_peek_char(v) g_value_get_char (v)
92+#define g_marshal_value_peek_char(v) g_value_get_schar (v)
93 #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
94 #define g_marshal_value_peek_int(v) g_value_get_int (v)
95 #define g_marshal_value_peek_uint(v) g_value_get_uint (v)
96diff --git a/src/main.c b/src/main.c
97index 3e8a794..ec980e5 100644
98--- a/src/main.c
99+++ b/src/main.c
100@@ -187,9 +187,9 @@ main (int argc,
101 g_option_context_free (context);
102
103 umask (022);
104-
105+#if !GLIB_CHECK_VERSION(2,35,0)
106 g_type_init ();
107-
108+#endif
109 mainloop = g_main_loop_new (NULL, FALSE);
110
111 conn = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
112--
1131.7.9.5
114
diff --git a/meta-oe/recipes-navigation/gypsy/files/fixups.patch b/meta-oe/recipes-navigation/gypsy/files/fixups.patch
new file mode 100644
index 000000000..de4d92ea1
--- /dev/null
+++ b/meta-oe/recipes-navigation/gypsy/files/fixups.patch
@@ -0,0 +1,21 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 docs/reference/Makefile.am | 2 ++
5 1 file changed, 2 insertions(+)
6
7--- gypsy.orig/docs/reference/Makefile.am
8+++ gypsy/docs/reference/Makefile.am
9@@ -81,10 +81,12 @@ expand_content_files=
10 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
11
12 INCLUDES=-I$(top_srcdir) $(GYPSY_CFLAGS)
13 GTKDOC_LIBS=$(top_builddir)/gypsy/libgypsy.la $(GYPSY_LIBS)
14
15+EXTRA_DIST =
16+CLEANFILES =
17 # This includes the standard gtk-doc make rules, copied by gtkdocize.
18 include $(top_srcdir)/gtk-doc.make
19
20 # Other files to distribute
21 # e.g. EXTRA_DIST += version.xml.in
diff --git a/meta-oe/recipes-navigation/gypsy/gypsy.inc b/meta-oe/recipes-navigation/gypsy/gypsy.inc
new file mode 100644
index 000000000..7c93d0a19
--- /dev/null
+++ b/meta-oe/recipes-navigation/gypsy/gypsy.inc
@@ -0,0 +1,23 @@
1SUMMARY = "GPS Multiplexing Daemon"
2DESCRIPTION = "Gypsy is a GPS multiplexing daemon which allows \
3multiple clients to access GPS data from multiple GPS sources \
4concurrently. Gypsy also hides the details of parsing NMEA from the \
5client applications, passing the data as simple values for the clients \
6to use."
7LICENSE = "GPLv2.0 & LGPLv2.1"
8SECTION = "console/network"
9DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt-native libxslt"
10
11inherit autotools pkgconfig gtk-doc
12PACKAGES += "libgypsy"
13
14FILES_${PN} = " \
15 ${sysconfdir}/gypsy.conf \
16 ${sysconfdir}/dbus-1 \
17 ${libexecdir}/gypsy-daemon \
18 ${datadir}/dbus-1 \
19"
20
21FILES_libgypsy = " \
22 ${libdir}/libgypsy${SOLIBS} \
23"
diff --git a/meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb b/meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb
new file mode 100644
index 000000000..24c8987ef
--- /dev/null
+++ b/meta-oe/recipes-navigation/gypsy/gypsy_0.9.bb
@@ -0,0 +1,15 @@
1require gypsy.inc
2
3PR = "r2"
4
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
6 file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \
7 file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \
8 file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd"
9
10SRC_URI += "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz \
11 file://0001-g_type_init-is-deprecated-for-glib-2.35.0.patch \
12 "
13
14SRC_URI[md5sum] = "e2d186df9c2cc3b70a027043e22acf1a"
15SRC_URI[sha256sum] = "14e1cbe17351f408538e033ca370b4bf51ccf9c88744e236ddfb271904f154d6"
diff --git a/meta-oe/recipes-navigation/gypsy/gypsy_git.bb b/meta-oe/recipes-navigation/gypsy/gypsy_git.bb
new file mode 100644
index 000000000..6ab16e6be
--- /dev/null
+++ b/meta-oe/recipes-navigation/gypsy/gypsy_git.bb
@@ -0,0 +1,22 @@
1require gypsy.inc
2
3DEFAULT_PREFERENCE = "-1"
4
5SRCREV = "be8c9c382d2d1d37b51d29b0843045121ec90213"
6PV = "0.9+git${SRCPV}"
7PR = "r2"
8
9S = "${WORKDIR}/git"
10
11LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
12 file://COPYING.lib;md5=7fbc338309ac38fefcd64b04bb903e34 \
13 file://src/main.c;beginline=1;endline=25;md5=3fe64e27e61b289b77383a54a982cbdd \
14 file://gypsy/gypsy-time.h;beginline=1;endline=24;md5=06432ea19a7b6607428d04d9dadc37fd"
15
16SRC_URI += "git://anongit.freedesktop.org/gypsy \
17 file://fixups.patch"
18
19do_configure_prepend() {
20 # from patch 563716fc596d53f1085949a9dd11a62f39b2d624
21 test -d ${S}/m4 || mkdir -p ${S}/m4
22}
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite.inc b/meta-oe/recipes-navigation/libspatialite/libspatialite.inc
new file mode 100644
index 000000000..c8d7ec1e9
--- /dev/null
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite.inc
@@ -0,0 +1,16 @@
1DESCRIPTION = "Library extending the SQLite core to support fully fledged Spatial SQL capabilities"
2HOMEPAGE = "https://www.gaia-gis.it/fossil/libspatialite/"
3SECTION = "libs"
4DEPENDS = "proj geos sqlite3"
5
6INC_PR = "r0"
7
8LICENSE = "MPLv1.1 GPLv2+ LGPLv2.1+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e"
10
11SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz"
12
13inherit autotools pkgconfig
14
15EXTRA_OECONF = "--enable-freexl=no"
16
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/fix-the-configure-script-and-freexl.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/fix-the-configure-script-and-freexl.patch
new file mode 100644
index 000000000..0cd0c3f6a
--- /dev/null
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/fix-the-configure-script-and-freexl.patch
@@ -0,0 +1,200 @@
1From upstream fossil repo, extracted via git, dropping configure.ac for amalgamation
2
3From: sandro <sandro>
4Date: Sat, 21 Jan 2012 16:53:28 +0000
5Subject: [PATCH] fixing the ./configure script: --enable-geocallbacks=no is
6 the new default and fixing some flaws for
7 --enable-freexl=no
8
9---
10 configure | 20 ++++++++++----------
11 configure.ac | 20 ++++++++++----------
12 src/shapefiles/shapefiles.c | 2 ++
13 4 files changed, 32 insertions(+), 30 deletions(-)
14
15diff --git a/configure b/configure
16index e8cf620..917bfca 100755
17--- a/configure
18+++ b/configure
19@@ -1410,7 +1410,7 @@ Optional Features:
20 optimize for fast installation [default=yes]
21 --disable-libtool-lock avoid locking (might break parallel builds)
22 --enable-mathsql enables SQL math functions [default=yes]
23- --enable-geocallbacks enables geometry callbacks [default=yes]
24+ --enable-geocallbacks enables geometry callbacks [default=no]
25 --enable-proj enables PROJ.4 inclusion [default=yes]
26 --enable-geos enables GEOS inclusion [default=yes]
27 --enable-geosadvanced enables GEOS advanced features [default=yes]
28@@ -16980,7 +16980,7 @@ ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src
29 if test "${enable_mathsql+set}" = set; then :
30 enableval=$enable_mathsql;
31 else
32- mathsql=yes
33+ enable_mathsql=yes
34 fi
35
36 if test x"$enable_mathsql" != "xno"; then
37@@ -16998,10 +16998,10 @@ fi
38 if test "${enable_geocallbacks+set}" = set; then :
39 enableval=$enable_geocallbacks;
40 else
41- geocallbacks=yes
42+ enable_geocallbacks=no
43 fi
44
45-if test x"$enable_geocallbacks" != "xno"; then
46+if test x"$enable_geocallbacks" == "xyes"; then
47 OMIT_GEOCALLBACKS_FLAGS=
48 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_rtree_geometry_callback in -lsqlite3" >&5
49 $as_echo_n "checking for sqlite3_rtree_geometry_callback in -lsqlite3... " >&6; }
50@@ -17063,7 +17063,7 @@ fi
51 if test "${enable_proj+set}" = set; then :
52 enableval=$enable_proj;
53 else
54- proj=yes
55+ enable_proj=yes
56 fi
57
58 if test x"$enable_proj" != "xno"; then
59@@ -17153,7 +17153,7 @@ fi
60 if test "${enable_geos+set}" = set; then :
61 enableval=$enable_geos;
62 else
63- geos=yes
64+ enable_geos=yes
65 fi
66
67 if test x"$enable_geos" != "xno"; then
68@@ -17237,7 +17237,7 @@ fi
69 if test "${enable_geosadvanced+set}" = set; then :
70 enableval=$enable_geosadvanced;
71 else
72- geosadvanced=yes
73+ enable_geosadvanced=yes
74 fi
75
76 if test x"$enable_geosadvanced" != "xno"; then
77@@ -17316,7 +17316,7 @@ fi
78 if test "${enable_iconv+set}" = set; then :
79 enableval=$enable_iconv;
80 else
81- geos=yes
82+ enable_iconv=yes
83 fi
84
85 if test x"$enable_iconv" != "xno"; then
86@@ -17579,7 +17579,7 @@ fi
87 if test "${enable_freexl+set}" = set; then :
88 enableval=$enable_freexl;
89 else
90- proj=yes
91+ enable_freexl=yes
92 fi
93
94 if test x"$enable_freexl" != "xno"; then
95@@ -17669,7 +17669,7 @@ fi
96 if test "${enable_epsg+set}" = set; then :
97 enableval=$enable_epsg;
98 else
99- epsg=yes
100+ enable_epsg=yes
101 fi
102
103 if test x"$enable_epsg" != "xno"; then
104diff --git a/configure.ac b/configure.ac
105index 216cc9f..69cb6c5 100644
106--- a/configure.ac
107+++ b/configure.ac
108@@ -79,7 +79,7 @@ AC_CONFIG_FILES([Makefile \
109 #
110 AC_ARG_ENABLE(mathsql, [AS_HELP_STRING(
111 [--enable-mathsql], [enables SQL math functions [default=yes]])],
112- [], [mathsql=yes])
113+ [], [enable_mathsql=yes])
114 if test x"$enable_mathsql" != "xno"; then
115 OMIT_MATHSQL_FLAGS=
116 else
117@@ -92,9 +92,9 @@ AC_SUBST(OMIT_MATHSQL_FLAGS)
118 # --enable-geocallbacks
119 #
120 AC_ARG_ENABLE(geocallbacks, [AS_HELP_STRING(
121- [--enable-geocallbacks], [enables geometry callbacks [default=yes]])],
122- [], [geocallbacks=yes])
123-if test x"$enable_geocallbacks" != "xno"; then
124+ [--enable-geocallbacks], [enables geometry callbacks [default=no]])],
125+ [], [enable_geocallbacks=no])
126+if test x"$enable_geocallbacks" == "xyes"; then
127 OMIT_GEOCALLBACKS_FLAGS=
128 AC_CHECK_LIB(sqlite3,sqlite3_rtree_geometry_callback,,AC_MSG_ERROR([obsolete 'libsqlite3' (< v.3.7.3). please retry specifying: --disable-geocallbacks]),-lm)
129 else
130@@ -108,7 +108,7 @@ AC_SUBST(OMIT_GEOCALLBACKS_FLAGS)
131 #
132 AC_ARG_ENABLE(proj, [AS_HELP_STRING(
133 [--enable-proj], [enables PROJ.4 inclusion [default=yes]])],
134- [], [proj=yes])
135+ [], [enable_proj=yes])
136 if test x"$enable_proj" != "xno"; then
137 OMIT_PROJ_FLAGS=
138 AC_CHECK_HEADERS(proj_api.h,, [AC_MSG_ERROR([cannot find proj_api.h, bailing out])])
139@@ -124,7 +124,7 @@ AC_SUBST(OMIT_PROJ_FLAGS)
140 #
141 AC_ARG_ENABLE(geos, [AS_HELP_STRING(
142 [--enable-geos], [enables GEOS inclusion [default=yes]])],
143- [], [geos=yes])
144+ [], [enable_geos=yes])
145 if test x"$enable_geos" != "xno"; then
146 OMIT_GEOS_FLAGS=
147 AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])])
148@@ -134,7 +134,7 @@ if test x"$enable_geos" != "xno"; then
149 #
150 AC_ARG_ENABLE(geosadvanced, [AS_HELP_STRING(
151 [--enable-geosadvanced], [enables GEOS advanced features [default=yes]])],
152- [], [geosadvanced=yes])
153+ [], [enable_geosadvanced=yes])
154 if test x"$enable_geosadvanced" != "xno"; then
155 GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
156 AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos)
157@@ -152,7 +152,7 @@ AC_SUBST(OMIT_GEOS_FLAGS)
158 #
159 AC_ARG_ENABLE(iconv, [AS_HELP_STRING(
160 [--enable-iconv], [enables ICONV inclusion [default=yes]])],
161- [], [geos=yes])
162+ [], [enable_iconv=yes])
163 if test x"$enable_iconv" != "xno"; then
164 OMIT_ICONV_FLAGS=
165 AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])])
166@@ -172,7 +172,7 @@ AC_SUBST(OMIT_ICONV_FLAGS)
167 #
168 AC_ARG_ENABLE(freexl, [AS_HELP_STRING(
169 [--enable-freexl], [enables FreeXL inclusion [default=yes]])],
170- [], [proj=yes])
171+ [], [enable_freexl=yes])
172 if test x"$enable_freexl" != "xno"; then
173 OMIT_FREEXL_FLAGS=
174 AC_CHECK_HEADERS(freexl.h,, [AC_MSG_ERROR([cannot find freexl.h, bailing out])])
175@@ -188,7 +188,7 @@ AC_SUBST(OMIT_FREEXL_FLAGS)
176 #
177 AC_ARG_ENABLE(epsg, [AS_HELP_STRING(
178 [--enable-epsg], [enables full EPSG dataset support [default=yes]])],
179- [], [epsg=yes])
180+ [], [enable_epsg=yes])
181 if test x"$enable_epsg" != "xno"; then
182 OMIT_EPSG_FLAGS=
183 else
184diff --git a/src/shapefiles/shapefiles.c b/src/shapefiles/shapefiles.c
185index 4bf5fd0..09e3cd3 100644
186--- a/src/shapefiles/shapefiles.c
187+++ b/src/shapefiles/shapefiles.c
188@@ -62,7 +62,9 @@ the terms of any one of the MPL, the GPL or the LGPL.
189 #include <spatialite/gaiageo.h>
190 #include <spatialite.h>
191
192+#ifndef OMIT_FREEXL
193 #include <freexl.h>
194+#endif
195
196 #if defined(_WIN32) && !defined(__MINGW32__)
197 #define strcasecmp _stricmp
198--
1991.7.9.1
200
diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_3.0.1.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_3.0.1.bb
new file mode 100644
index 000000000..1cb72e828
--- /dev/null
+++ b/meta-oe/recipes-navigation/libspatialite/libspatialite_3.0.1.bb
@@ -0,0 +1,9 @@
1require libspatialite.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "450d1a0d9da1bd9f770b7db3f2509f69"
6SRC_URI[sha256sum] = "4983d6584069fd5ff0cfcccccee1015088dab2db177c0dc7050ce8306b68f8e6"
7
8SRC_URI =+ "file://fix-the-configure-script-and-freexl.patch"
9
diff --git a/meta-oe/recipes-navigation/monav/monav/monav.desktop b/meta-oe/recipes-navigation/monav/monav/monav.desktop
new file mode 100644
index 000000000..5e861136f
--- /dev/null
+++ b/meta-oe/recipes-navigation/monav/monav/monav.desktop
@@ -0,0 +1,10 @@
1[Desktop Entry]
2Name=MoNav
3Exec=monav
4Icon=monav
5Terminal=false
6Type=Application
7Categories=Utility;Geography;
8X-MB-SingleInstance=true
9StartupNotify=true
10Comment=Fast navigation system featuring exact routing.
diff --git a/meta-oe/recipes-navigation/monav/monav/monav.png b/meta-oe/recipes-navigation/monav/monav/monav.png
new file mode 100644
index 000000000..75b5a7962
--- /dev/null
+++ b/meta-oe/recipes-navigation/monav/monav/monav.png
Binary files differ
diff --git a/meta-oe/recipes-navigation/monav/monav_0.3.bb b/meta-oe/recipes-navigation/monav/monav_0.3.bb
new file mode 100644
index 000000000..982d68272
--- /dev/null
+++ b/meta-oe/recipes-navigation/monav/monav_0.3.bb
@@ -0,0 +1,37 @@
1DESCRIPTION = "MoNav is a fast navigation system featuring exact routing with OpenStreetMap data."
2HOMEPAGE = "http://code.google.com/p/monav"
3SECTION = "x11/applications"
4LICENSE = "GPLv3+"
5LIC_FILES_CHKSUM = "file://misc/license_template_christian;md5=d99c9b3bafdde80adee296762376348d"
6
7DEPENDS = "qt-mobility-x11"
8PR = "r1"
9
10SRC_URI = "http://monav.googlecode.com/files/${BPN}-${PV}.tar.gz \
11 file://monav.png \
12 file://monav.desktop"
13
14SRC_URI[md5sum] = "d048ccef8c6a21e8656aa4af3fcb8329"
15SRC_URI[sha256sum] = "5a3bf9e9f7368b81ba8e2f755960082fc42a2e2c78f9de645f99ba293c77ee7f"
16
17inherit qmake2 qt4x11
18
19EXTRA_QMAKEVARS_PRE="CONFIG+="release""
20QMAKE_PROFILES="monavclient.pro"
21
22do_install_append() {
23 install -d ${D}${datadir}/monav
24 install -d ${D}${datadir}/monav/images
25 cp -a ${S}/images/* ${D}${datadir}/monav/images
26
27 install -d ${D}${datadir}/icons
28 install -m 0644 ${WORKDIR}/monav.png ${D}${datadir}/icons
29
30 install -d ${D}${bindir}
31 install -m 0755 ${S}/bin/monav ${D}${bindir}/monav
32
33 install -d ${D}/${datadir}/applications
34 install -m 0644 ${WORKDIR}/monav.desktop ${D}/${datadir}/applications
35}
36
37FILES_${PN} += "${bindir}/monav ${datadir}/icons/monav.png"
diff --git a/meta-oe/recipes-navigation/navit/navit-fpu.inc b/meta-oe/recipes-navigation/navit/navit-fpu.inc
new file mode 100644
index 000000000..d9637022f
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit-fpu.inc
@@ -0,0 +1,6 @@
1
2def get_navit_fpu_setting(bb, d):
3 if d.getVar('TARGET_FPU', 1) in [ 'soft' ]:
4 return "--enable-avoid-float"
5 return ""
6
diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc
new file mode 100644
index 000000000..434743607
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit.inc
@@ -0,0 +1,93 @@
1DESCRIPTION = "Navit is a car navigation system with routing engine."
2LICENSE = "GPLv2 LGPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=ed539d099d6ce08de6ea0dfed9ecb333 \
4 file://LGPL-2;md5=3214f080875748938ba060314b4f727d \
5 file://GPL-2;md5=751419260aa954499f7abaabaa882bbe \
6"
7
8SECTION = "x11/applications"
9DEPENDS = "glib-2.0 gd gypsy librsvg-native"
10RDEPENDS_${PN} = " ${PN}-icons ${PN}-config "
11RDEPENDS_${PN}-gui-qml = "qt4-plugin-imageformat-svg"
12RRECOMMENDS_${PN} = "gpsd ${PN}-dbus ${PN}-speech-cmdline ${PN}-gui-internal ${PN}-graphics-gtk"
13RSUGGESTS_${PN} = "flite-alsa espeak ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-qt ${PN}-maptool"
14
15PE = "1"
16INC_PR = "r11"
17
18inherit autotools gettext pkgconfig
19
20PACKAGECONFIG ?= "qt"
21PACKAGECONFIG[fribidi] = "--enable-fribidi,--disable-fribidi,fribidi"
22PACKAGECONFIG[imlib2] = "--enable-imlib2,--disable-imlib2,imlib2"
23PACKAGECONFIG[sdl] = "--enable-graphics-sdl,--disable-graphics-sdl,libsdl"
24PACKAGECONFIG[gtk] = "--enable-graphics-gtk-drawing-area --enable-gui-gtk,--disable-graphics-gtk-drawing-area --disable-gui-gtk,gtk+"
25PACKAGECONFIG[qt] = "--enable-graphics-qt-qpainter --enable-gui-qml,--disable-graphics-qt-qpainter --disable-gui-qml,qt4-x11-free"
26
27EXTRA_OECONF += " \
28 --disable-binding-python \
29 --disable-samplemap \
30 --enable-avoid-unaligned \
31 --enable-svg2png-scaling-flag=32 \
32 --disable-speech-speech-dispatcher \
33 --enable-cache-size=20971520 \
34"
35
36# --enable-avoid-float \
37#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
38require navit-fpu.inc
39EXTRA_OECONF += "${@get_navit_fpu_setting(bb, d)}"
40
41PACKAGES =+ "${PN}-maptool ${PN}-config ${PN}-dbus ${PN}-speech-cmdline ${PN}-speech-dbus ${PN}-gui-gtk ${PN}-gui-internal ${PN}-gui-qml ${PN}-graphics-sdl ${PN}-graphics-gtk ${PN}-graphics-qt ${PN}-icons"
42
43EXTRA_AUTORECONF = " -I m4"
44
45CONFFILES_${PN}-config += "${datadir}/navit/navit.default.xml \
46 ${datadir}/navit/navit.xml \
47 ${datadir}/navit/maps.xml \
48 ${datadir}/navit/osd.xml \
49 ${datadir}/navit/speech.xml \
50 ${datadir}/navit/plugins.xml \
51"
52
53SRC_URI += "file://navit.xml \
54 file://maps.xml \
55 file://osd.xml \
56 file://speech.xml \
57 file://plugins.xml \
58"
59
60FILES_${PN} += "${libdir}/${PN}/*/*.so ${datadir}/icons"
61FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
62FILES_${PN}-maptool = " ${bindir}/maptool "
63FILES_${PN}-config = " ${datadir}/navit/*.xml "
64FILES_${PN}-dbus = " ${datadir}/dbus-1/services/ ${libdir}/${PN}/binding/libbinding_dbus.so "
65FILES_${PN}-speech-cmdline = " ${libdir}/${PN}/speech/libspeech_cmdline.so "
66FILES_${PN}-speech-dbus = " ${libdir}/${PN}/speech/libspeech_dbus.so "
67FILES_${PN}-gui-gtk = " ${libdir}/${PN}/gui/libgui_gtk.so "
68FILES_${PN}-gui-qml = " ${libdir}/${PN}/gui/libgui_qml.so ${datadir}/navit/skins/ "
69FILES_${PN}-gui-internal = " ${libdir}/${PN}/gui/libgui_internal.so "
70FILES_${PN}-graphics-sdl = " ${libdir}/${PN}/graphics/libgraphics_sdl.so "
71FILES_${PN}-graphics-qt = " ${libdir}/${PN}/graphics/libgraphics_qt_qpainter.so "
72FILES_${PN}-graphics-gtk = " ${libdir}/${PN}/graphics/libgraphics_gtk_drawing_area.so "
73FILES_${PN}-icons = "/usr/share/navit/xpm/"
74
75do_configure_prepend() {
76 # MOC=`$PKG_CONFIG QtGui --variable=moc_location` returns only /usr/bin/moc4 which is not available on hosts without Qt
77 sed -i "s#MOC=#MOC=${STAGING_DIR_NATIVE}#g" ${S}/configure.in
78}
79
80do_install_append() {
81 # fix QA issue
82 sed -i 's#Categories=GTK;Utility;Geography;#Categories=Graphics;#g' ${D}${datadir}/applications/navit.desktop
83
84 rm ${D}${libdir}/${PN}/*/*.la
85
86 #Use split config
87 mv ${D}${datadir}/navit/navit.xml ${D}${datadir}/navit/navit.default.xml
88 install -m 0644 ${WORKDIR}/navit.xml ${D}${datadir}/navit/navit.xml
89 install -m 0644 ${WORKDIR}/maps.xml ${D}${datadir}/navit/maps.xml
90 install -m 0644 ${WORKDIR}/osd.xml ${D}${datadir}/navit/osd.xml
91 install -m 0644 ${WORKDIR}/speech.xml ${D}${datadir}/navit/speech.xml
92 install -m 0644 ${WORKDIR}/plugins.xml ${D}${datadir}/navit/plugins.xml
93}
diff --git a/meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch b/meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch
new file mode 100644
index 000000000..be4179261
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/configure.add.imlib2.option.patch
@@ -0,0 +1,16 @@
1--- a/configure.in.orig 2014-05-10 15:57:18.146362110 +0200
2+++ b/configure.in 2014-05-10 15:59:27.859358845 +0200
3@@ -498,10 +498,13 @@
4 AC_SUBST(FRIBIDI_CFLAGS)
5 AC_SUBST(FRIBIDI_LIBS)
6
7+AC_ARG_ENABLE(imlib2, [ --disable-imlib2 disable imlib2 support], imlib2=$enableval;imlib2_reason="configure parameter", imlib2=yes)
8+if test x"${imlib2}" = "xyes"; then
9 PKG_CHECK_MODULES(IMLIB2, [imlib2], [imlib2_pkgconfig=yes], [imlib2_pkgconfig=no])
10 if test "x$imlib2_pkgconfig" = "xyes"; then
11 AC_DEFINE(HAVE_IMLIB2, 1, [Define to 1 if you have imlib2])
12 fi
13+fi
14 AC_SUBST(IMLIB2_CFLAGS)
15 AC_SUBST(IMLIB2_LIBS)
16
diff --git a/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch b/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch
new file mode 100644
index 000000000..288997bca
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/freetype-include-path.patch
@@ -0,0 +1,28 @@
1Description: Fix FTBFS caused by freetype headers path change.
2Author: Gilles Filippini <pini@debian.org>
3Bug-Debian: http://bugs.debian.org/733378
4Index: navit/navit/font/freetype/font_freetype.c
5===================================================================
6--- navit.orig/navit/font/freetype/font_freetype.c 2013-09-23 10:43:32.000000000 +0200
7+++ navit/navit/font/freetype/font_freetype.c 2013-12-30 19:54:45.000000000 +0100
8@@ -32,7 +32,7 @@
9 #if USE_FRIBIDI
10 #include <fribidi.h>
11 #endif
12-#include <freetype/ftglyph.h>
13+#include <ftglyph.h>
14 #include "point.h"
15 #include "graphics.h"
16 #include "debug.h"
17diff -uNr navit.orig/navit/graphics/sdl/graphics_sdl.c navit/navit/graphics/sdl/graphics_sdl.c
18--- navit.orig/navit/graphics/sdl/graphics_sdl.c 2012-06-22 14:16:01.000000000 +0200
19+++ navit/navit/graphics/sdl/graphics_sdl.c 2014-01-01 22:31:10.892948164 +0100
20@@ -84,7 +84,7 @@
21 #else
22 #include <ft2build.h>
23 #include FT_FREETYPE_H
24-#include <freetype/ftglyph.h>
25+#include <ftglyph.h>
26 #endif
27 #include <event.h>
28
diff --git a/meta-oe/recipes-navigation/navit/navit/maps.xml b/meta-oe/recipes-navigation/navit/navit/maps.xml
new file mode 100644
index 000000000..6f59f20c3
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/maps.xml
@@ -0,0 +1,24 @@
1 <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly -->
2 <mapset enabled="no">
3 <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map"/>
4 <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp"/>
5 <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp2.smp"/>
6 <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp3.smp"/>
7 <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp4.smp"/>
8 <map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp5.smp"/>
9 </mapset>
10
11 <!-- If you dont want to use the sample map, either set enabled="no" in the next line or remove the xml file from the maps directory -->
12 <mapset enabled="no">
13 <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/>
14 </mapset>
15
16 <!-- Mapset template for openstreetmaps -->
17 <mapset enabled="yes">
18 <map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/>
19 </mapset>
20
21 <!-- Mapset template for garmin maps -->
22 <mapset enabled="no">
23 <map type="garmin" enabled="yes" data="/path/to/img" debug="4"/>
24 </mapset>
diff --git a/meta-oe/recipes-navigation/navit/navit/navit.xml b/meta-oe/recipes-navigation/navit/navit/navit.xml
new file mode 100644
index 000000000..58c8c226f
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/navit.xml
@@ -0,0 +1,45 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE config SYSTEM "navit.dtd">
3<config xmlns:xi="http://www.w3.org/2001/XInclude">
4 <xi:include href="/usr/share/navit/plugins.xml"/>
5 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/debug)"/>
6
7 <navit center="4808 N 1134 E" zoom="256" tracking="1" orientation="-1" recent_dest="10" drag_bitmap="1">
8 <graphics type="gtk_drawing_area"/>
9 <gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/>
10 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/gui[@type='internal'])"/>
11 <!-- or comment gtk version above and try:
12 opkg install navit-graphics-qt
13 opkg install navit-gui-qml
14 <graphics type="qt_qpainter"/>
15 <gui type="qml" enabled="yes" menubar="1" toolbar="1" statusbar="1"/>
16 -->
17 <xi:include href="/usr/share/navit/osd.xml"/>
18 <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/>
19 <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj">
20 <!-- <log type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%i.gpx" flush_size="1000" flush_time="30"/> -->
21 </vehicle>
22
23 <vehicle name="Demo" profilename="car" enabled="no" active="yes" source="demo://"/>
24
25 <!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 -->
26 <tracking cdf_histsize="0"/>
27
28 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/vehicleprofile[@name='car'])"/>
29 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/vehicleprofile[@name='bike'])"/>
30 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/vehicleprofile[@name='pedestrian'])"/>
31 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/vehicleprofile[@name='horse'])"/>
32
33 <route destination_distance="50"/>
34
35 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/navigation)"/>
36
37 <xi:include href="/usr/share/navit/speech.xml"/>
38 <xi:include href="/usr/share/navit/maps.xml"/>
39
40 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/layout[@name='Car'])"/>
41 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/layout[@name='Car-dark'])"/>
42 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/layout[@name='Bike'])"/>
43 <xi:include href="/usr/share/navit/navit.default.xml" xpointer="xpointer(/config/navit/layout[@name='T@H'])"/>
44 </navit>
45</config>
diff --git a/meta-oe/recipes-navigation/navit/navit/osd.xml b/meta-oe/recipes-navigation/navit/navit/osd.xml
new file mode 100644
index 000000000..2d0f9ffdf
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/osd.xml
@@ -0,0 +1,15 @@
1 <!-- osd items allow to position display and control items directly on top of the map: -->
2 <osd enabled="no" type="compass"/>
3 <osd enabled="no" type="eta"/>
4 <osd enabled="no" type="navigation_distance_to_target"/>
5 <osd enabled="no" type="navigation"/>
6 <osd enabled="no" type="navigation_distance_to_next"/>
7 <osd enabled="no" type="navigation_next_turn"/>
8
9 <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out.
10 Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner.
11 It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. -->
12 <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/>
13 <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/>
14 <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/>
15 <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/>
diff --git a/meta-oe/recipes-navigation/navit/navit/plugins.xml b/meta-oe/recipes-navigation/navit/navit/plugins.xml
new file mode 100644
index 000000000..015b05517
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/plugins.xml
@@ -0,0 +1,6 @@
1<plugins>
2 <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/>
3 <plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/>
4 <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="yes"/>
5 <plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/>
6</plugins>
diff --git a/meta-oe/recipes-navigation/navit/navit/speech.xml b/meta-oe/recipes-navigation/navit/navit/speech.xml
new file mode 100644
index 000000000..28c49906d
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit/speech.xml
@@ -0,0 +1,8 @@
1 <!-- Navit provides speech output in text format.
2 If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second.
3 The default is text output to the shell -->
4 <!-- <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/> -->
5 <!-- <speech type="cmdline" data="espeak -s 150 -v czech '%s' &amp;"/> -->
6 <!-- <speech type="cmdline" data="flite -t '%s'"/> -->
7 <!-- <speech type="cmdline" data="/usr/local/bin/say.sh '%s'"/> -->
8 <speech type="cmdline" data="espeak '%s' &amp;"/>
diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb
new file mode 100644
index 000000000..eff1eb32f
--- /dev/null
+++ b/meta-oe/recipes-navigation/navit/navit_svn.bb
@@ -0,0 +1,11 @@
1require navit.inc
2
3SRCREV = "5310"
4PV = "0.2.0+svnr${SRCPV}"
5PR = "${INC_PR}.3"
6
7S = "${WORKDIR}/${PN}"
8SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;protocol=http \
9 file://freetype-include-path.patch \
10 file://configure.add.imlib2.option.patch \
11"
diff --git a/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch b/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch
new file mode 100644
index 000000000..6b9f465a2
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/0001-g_type_init-is-deprecated-for-glib-2.35.0.patch
@@ -0,0 +1,33 @@
1From 22bcf06637d64e40af6c152e28b31eef41e3f583 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 13 Jun 2013 02:35:22 -0700
4Subject: [PATCH] g_type_init() is deprecated for glib >= 2.35.0
5
6Call it for old versions.
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Upstream-Status: Pending
11---
12 src/main.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/src/main.c b/src/main.c
16index e984da4..a63ddf3 100644
17--- a/src/main.c
18+++ b/src/main.c
19@@ -486,9 +486,9 @@ int main(int argc, char **argv)
20 if (strcmp(argv[1], "-log2file") == 0)
21 log2console = FALSE;
22 }
23-
24+#if !GLIB_CHECK_VERSION(2,35,0)
25 g_type_init();
26-
27+#endif
28 gdk_threads_init();
29
30 gdk_threads_enter();
31--
321.7.9.5
33
diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
new file mode 100644
index 000000000..ec3bde0cd
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/fix.build.with.glib.2.34.patch
@@ -0,0 +1,125 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
4diff -uNr omgps.orig/src/dbus_intf.c omgps/src/dbus_intf.c
5--- omgps.orig/src/dbus_intf.c 2011-12-12 12:22:47.000000000 +0100
6+++ omgps/src/dbus_intf.c 2012-11-14 14:44:45.435381443 +0100
7@@ -171,7 +171,7 @@
8 gpsdata->svinfo_valid = TRUE;
9
10 int i, j;
11- GValueArray *val;
12+ GArray *val;
13 svinfo_channel_t *sv;
14
15 j = 0;
16@@ -179,16 +179,16 @@
17 val = satellites->pdata[i];
18
19 sv = &gpsdata->sv_channels[j];
20- sv->sv_id = g_value_get_uint(g_value_array_get_nth(val, 0));
21+ sv->sv_id = g_array_index(val, guint, 0);
22
23- if (g_value_get_boolean(g_value_array_get_nth(val, 1))) {
24+ if (g_array_index(val, gboolean, 1)) {
25 ++gpsdata->sv_in_use;
26 sv->flags = 0x01;
27 }
28
29- sv->elevation = (int)g_value_get_uint(g_value_array_get_nth(val, 2));
30- sv->azimuth = (int)g_value_get_uint(g_value_array_get_nth(val, 3));
31- sv->cno = g_value_get_uint(g_value_array_get_nth(val, 4));
32+ sv->elevation = (int)g_array_index(val, guint, 2);
33+ sv->azimuth = (int)g_array_index(val, guint, 3);
34+ sv->cno = g_array_index(val, guint, 4);
35 if (sv->cno > 0)
36 ++gpsdata->sv_get_signal;
37
38diff -uNr omgps.orig/src/main.c omgps/src/main.c
39--- omgps.orig/src/main.c 2011-12-12 12:22:47.000000000 +0100
40+++ omgps/src/main.c 2012-11-14 14:46:00.345402222 +0100
41@@ -489,9 +489,6 @@
42
43 g_type_init();
44
45- if (! g_thread_supported ())
46- g_thread_init(NULL);
47-
48 gdk_threads_init();
49
50 gdk_threads_enter();
51diff -uNr omgps.orig/src/tab_gpscfg.c omgps/src/tab_gpscfg.c
52--- omgps.orig/src/tab_gpscfg.c 2011-12-12 12:22:47.000000000 +0100
53+++ omgps/src/tab_gpscfg.c 2012-11-14 15:23:47.526925258 +0100
54@@ -222,7 +222,7 @@
55
56 static gboolean change_platform_model_cmd(void *model_id)
57 {
58- U1 model = (U1)(int) model_id;
59+ U1 model = (U1)GPOINTER_TO_INT(model_id);
60 int gps_dev_fd = 0;
61
62 /* non ubx means: we need open serial port
63@@ -269,7 +269,7 @@
64 static void change_platmodel_button_clicked(GtkWidget *widget, gpointer data)
65 {
66 int idx = gtk_combo_box_get_active(GTK_COMBO_BOX(platmodel_list));
67- char *model_id = (void *)(int)platmodel_values[idx];
68+ void *model_id = (void *)GINT_TO_POINTER(platmodel_values[idx]);
69
70 if (POLL_ENGINE_TEST(UBX)) {
71 gtk_widget_set_sensitive(change_platmodel_button, FALSE);
72diff -uNr omgps.orig/src/tab_menu.c omgps/src/tab_menu.c
73--- omgps.orig/src/tab_menu.c 2011-12-12 12:22:47.000000000 +0100
74+++ omgps/src/tab_menu.c 2012-11-14 15:25:08.217941513 +0100
75@@ -65,7 +65,7 @@
76
77 static void poll_button_clicked(GtkWidget *widget, gpointer data)
78 {
79- gboolean is_start_bt = (gboolean)data;
80+ gboolean is_start_bt = (gboolean) GPOINTER_TO_INT(data);
81
82 if (POLL_STATE_TEST(RUNNING) == is_start_bt)
83 return;
84diff -uNr omgps.orig/src/tab_tile.c omgps/src/tab_tile.c
85--- omgps.orig/src/tab_tile.c 2011-12-12 12:22:47.000000000 +0100
86+++ omgps/src/tab_tile.c 2012-11-14 15:25:30.392945800 +0100
87@@ -101,7 +101,7 @@
88 static gboolean set_bg_map(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
89 {
90 map_repo_t *repo;
91- gboolean clear = (gboolean)data;
92+ gboolean clear = (gboolean)GPOINTER_TO_INT(data);
93
94 int type;
95
96@@ -240,7 +240,7 @@
97
98 static void alpha_radio_toggled (GtkWidget *widget, gpointer user_data)
99 {
100- int idx = (int)user_data;
101+ int idx = (int)GPOINTER_TO_INT(user_data);
102
103 if (g_view.bg_alpha_idx == idx)
104 return;
105@@ -384,7 +384,7 @@
106
107 for (i=0; i<ALPHA_LEVELS; i++) {
108 g_signal_connect (G_OBJECT (alpha_radios[i]), "toggled",
109- G_CALLBACK (alpha_radio_toggled), (gpointer)i);
110+ G_CALLBACK (alpha_radio_toggled), GINT_TO_POINTER(i));
111 gtk_container_add(GTK_CONTAINER (alpha_hbox), alpha_radios[i]);
112 }
113
114diff -uNr omgps.orig/src/tab_view.c omgps/src/tab_view.c
115--- omgps.orig/src/tab_view.c 2011-12-12 12:22:47.000000000 +0100
116+++ omgps/src/tab_view.c 2012-11-14 15:25:47.018949453 +0100
117@@ -534,7 +534,7 @@
118
119 static void* change_zoom_routine(void *args)
120 {
121- gboolean is_zoom_in = (gboolean)args;
122+ gboolean is_zoom_in = (gboolean)GPOINTER_TO_INT(args);
123 stop = FALSE;
124
125 int hi = (is_zoom_in)?
diff --git a/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch b/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
new file mode 100644
index 000000000..3ed86d8a9
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/fix.capability.patch
@@ -0,0 +1,62 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
4we need to include config.h first to know if HAVE_SYS_CAPABILITY_H is enabled or no, otherwise
5sys/capability.h is not included and later used
6| src/network.c: In function 'can_ping':
7| src/network.c:198:2: error: 'cap_flag_value_t' undeclared (first use in this function)
8| src/network.c:198:2: note: each undeclared identifier is reported only once for each function it appears in
9| src/network.c:198:19: error: expected ';' before 'cap'
10| src/network.c:199:2: error: 'cap_t' undeclared (first use in this function)
11| src/network.c:199:8: error: expected ';' before 'caps'
12| src/network.c:200:6: error: 'caps' undeclared (first use in this function)
13| cc1: warnings being treated as errors
14| src/network.c:203:2: error: implicit declaration of function 'cap_get_flag'
15| src/network.c:203:21: error: 'CAP_SYS_NICE' undeclared (first use in this function)
16| src/network.c:203:35: error: 'CAP_EFFECTIVE' undeclared (first use in this function)
17| src/network.c:203:51: error: 'cap' undeclared (first use in this function)
18| src/network.c:204:17: error: 'CAP_CLEAR' undeclared (first use in this function)
19| src/network.c:210:1: error: control reaches end of non-void function
20| make[1]: *** [omgps-network.o] Error 1
21
22and -lcap is needed for 2 functions later (should be added only for HAVE_SYS_CAPABILITY_H enabled, but I don't care enough)
23| omgps-network.o: In function `can_ping':
24| /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/omgps-0.1+svnr109-r1/omgps/src/network.c:199: undefined reference to `cap_get_proc'
25| /OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/omgps-0.1+svnr109-r1/omgps/src/network.c:203: undefined reference to `cap_get_flag'
26| collect2: ld returned 1 exit status
27
28--- omgps.orig/src/network.c 2009-10-28 18:51:16.000000000 +0100
29+++ omgps/src/network.c 2011-05-09 09:59:11.637676772 +0200
30@@ -19,16 +19,16 @@
31 #include <assert.h>
32 #include <glib.h>
33
34-#if (HAVE_SYS_CAPABILITY_H)
35-#undef _POSIX_SOURCE
36-#include <sys/capability.h>
37-#endif
38-
39 #include "config.h"
40 #include "util.h"
41 #include "network.h"
42 #include "customized.h"
43
44+#if (HAVE_SYS_CAPABILITY_H)
45+#undef _POSIX_SOURCE
46+#include <sys/capability.h>
47+#endif
48+
49 /**
50 * Ping: reference <Unix network programming>, volume 1, third edition.
51 */
52--- omgps.orig/Makefile.am 2009-10-28 18:51:17.000000000 +0100
53+++ omgps/Makefile.am 2011-05-09 10:04:58.578676679 +0200
54@@ -33,7 +33,7 @@
55
56 omgps_CFLAGS = $(common_CFLAGS) -O2
57 omgps_LDFLAGS =
58-omgps_LDADD = @DEPENDENCIES_LIBS@ -lpython$(PY_VERSION)
59+omgps_LDADD = @DEPENDENCIES_LIBS@ -lcap -lpython$(PY_VERSION)
60
61 omgps_SOURCES = \
62 src/ctx_agps_online.c \
diff --git a/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch b/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
new file mode 100644
index 000000000..41f6471d4
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/gcc-4.4.patch
@@ -0,0 +1,71 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
4diff -uNr omgps.orig/src/include/map_repo.h omgps/src/include/map_repo.h
5--- omgps.orig/src/include/map_repo.h 2009-07-20 19:54:08.000000000 +0200
6+++ omgps/src/include/map_repo.h 2010-01-17 14:55:24.000000000 +0100
7@@ -3,6 +3,9 @@
8
9 #include <glib.h>
10 #include <gdk/gdk.h>
11+// workaround Python.h unconditionally (re)defines _XOPEN_SOURCE and _POSIX_C_SOURCE
12+#undef _XOPEN_SOURCE
13+#undef _POSIX_C_SOURCE
14 #include <Python.h>
15
16 #define MAP_MAX_BG_COLORS 5
17diff -uNr omgps.orig/src/include/py_ext.h omgps/src/include/py_ext.h
18--- omgps.orig/src/include/py_ext.h 2009-07-20 19:54:08.000000000 +0200
19+++ omgps/src/include/py_ext.h 2010-01-17 14:55:57.000000000 +0100
20@@ -4,8 +4,8 @@
21 void py_ext_init();
22 void py_ext_cleanup();
23
24-void inline py_ext_trylock();
25-void inline py_ext_lock();
26-void inline py_ext_unlock();
27+void py_ext_trylock();
28+void py_ext_lock();
29+void py_ext_unlock();
30
31 #endif /* PY_EXT_H_ */
32diff -uNr omgps.orig/src/include/uart.h omgps/src/include/uart.h
33--- omgps.orig/src/include/uart.h 2009-07-20 19:54:08.000000000 +0200
34+++ omgps/src/include/uart.h 2010-01-17 14:33:00.000000000 +0100
35@@ -12,9 +12,9 @@
36 extern void uart_cleanup();
37 extern void uart_close();
38
39-extern inline int read_with_timeout(U1 *buf, int len);
40-extern inline int write_with_timeout(U1 *buf, int len);
41-extern inline gboolean read_fixed_len(U1 *buf, int expected_len);
42+extern int read_with_timeout(U1 *buf, int len);
43+extern int write_with_timeout(U1 *buf, int len);
44+extern gboolean read_fixed_len(U1 *buf, int expected_len);
45
46 extern int sysfs_get_gps_device_power();
47 extern gboolean gps_device_power_on();
48diff -uNr omgps.orig/src/py_ext.c omgps/src/py_ext.c
49--- omgps.orig/src/py_ext.c 2009-07-20 19:54:08.000000000 +0200
50+++ omgps/src/py_ext.c 2010-01-17 14:56:46.000000000 +0100
51@@ -26,17 +26,17 @@
52 Py_Finalize();
53 }
54
55-void inline py_ext_trylock()
56+void py_ext_trylock()
57 {
58 TRYLOCK_MUTEX(&lock);
59 }
60
61-void inline py_ext_lock()
62+void py_ext_lock()
63 {
64 LOCK_MUTEX(&lock);
65 }
66
67-void inline py_ext_unlock()
68+void py_ext_unlock()
69 {
70 UNLOCK_MUTEX(&lock);
71 }
diff --git a/meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch b/meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch
new file mode 100644
index 000000000..688080573
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/gdk-pixbuf-2.26.5.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
4diff -uNr omgps/src/tab_scratch.c omgps.new/src/tab_scratch.c
5--- omgps/src/tab_scratch.c 2012-12-22 18:13:25.994788128 +0100
6+++ omgps.new/src/tab_scratch.c 2012-12-22 18:12:45.876790644 +0100
7@@ -51,7 +51,7 @@
8 }
9
10 gboolean ret = gdk_pixbuf_save (pixbuf, buf, SCREENSHOT_FILE_TYPE, &err, "tEXt::Software", "omgps", NULL);
11- gdk_pixbuf_unref(pixbuf);
12+ g_object_unref(pixbuf);
13
14 if (ret) {
15 char buf1[128];
diff --git a/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch b/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
new file mode 100644
index 000000000..290c5e6a7
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/sysfs.node.2.6.32.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
4diff -uNr omgps.orig//src/uart.c omgps/src/uart.c
5--- omgps.orig//src/uart.c 2010-08-22 23:34:09.000000000 +0200
6+++ omgps/src/uart.c 2010-08-22 23:33:54.000000000 +0200
7@@ -30,6 +30,7 @@
8 * NOTE: these file paths are subject to change according to kernel and distribution.
9 */
10 static const char *sysfs_gps_power[] = {
11+ "/sys/bus/platform/devices/gta02-pm-gps.0/power_on",
12 "/sys/bus/platform/devices/neo1973-pm-gps.0/power_on",
13 "/sys/bus/platform/devices/neo1973-pm-gps.0/pwron"
14 };
diff --git a/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch b/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
new file mode 100644
index 000000000..3ccb14ea9
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps/use.unused.variable.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Submitted
2https://code.google.com/p/omgps/issues/detail?id=15
3
4--- a/src/settings.c 2011-12-12 13:21:30.573400795 +0100
5+++ b/src/settings.c 2011-12-12 14:11:05.269606119 +0100
6@@ -278,6 +278,9 @@
7 }
8
9 ret = check_settings(errbuf, ERRBUF_LEN);
10+ if (ret == FALSE) {
11+ snprintf(errbuf, ERRBUF_LEN, "Something wrong while loading settings file");
12+ }
13
14 if (fd > 0)
15 close(fd);
diff --git a/meta-oe/recipes-navigation/omgps/omgps_svn.bb b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
new file mode 100644
index 000000000..aabdd43f1
--- /dev/null
+++ b/meta-oe/recipes-navigation/omgps/omgps_svn.bb
@@ -0,0 +1,29 @@
1SUMMARY = "GPS application for openmoko freerunner"
2HOMEPAGE = "http://omgps.googlecode.com"
3SECTION = "openmoko/applications"
4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
6DEPENDS = "gtk+ python-pygobject dbus-glib libcap"
7SRCREV = "109"
8PV = "0.1+svnr${SRCPV}"
9PR = "r2"
10S = "${WORKDIR}/${PN}"
11
12PNBLACKLIST[omgps] ?= "BROKEN: sound.c:61:35: error: 'saveptr' may be used uninitialized in this function [-Werror=maybe-uninitialized]"
13
14do_configure_prepend() {
15 sed -i "s#PY_VERSION = 2.6#PY_VERSION = ${PYTHON_BASEVERSION}#g" ${S}/Makefile.am
16 sed -i "s#PY_INC_DIR = \$(OPIEDIR)#PY_INC_DIR = ${STAGING_DIR_HOST}#g" ${S}/Makefile.am
17}
18
19SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \
20 file://gcc-4.4.patch \
21 file://sysfs.node.2.6.32.patch \
22 file://fix.capability.patch \
23 file://use.unused.variable.patch \
24 file://fix.build.with.glib.2.34.patch \
25 file://gdk-pixbuf-2.26.5.patch \
26 file://0001-g_type_init-is-deprecated-for-glib-2.35.0.patch \
27"
28
29inherit autotools pkgconfig
diff --git a/meta-oe/recipes-navigation/orrery/orrery/orrery.png b/meta-oe/recipes-navigation/orrery/orrery/orrery.png
new file mode 100644
index 000000000..d9865b70c
--- /dev/null
+++ b/meta-oe/recipes-navigation/orrery/orrery/orrery.png
Binary files differ
diff --git a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch
new file mode 100644
index 000000000..92d194de0
--- /dev/null
+++ b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch
@@ -0,0 +1,59 @@
1From: Benjamin Deering
2Subject: orrery crashing X
3Date: Thursday, September 2, 2010 - 5:25 pm
4Link: http://kerneltrap.org/mailarchive/openmoko-community/2010/9/3/13218
5
6diff -uNr orrery.orig//orrery.c orrery/orrery.c
7--- orrery.orig//orrery.c 2009-11-30 06:59:44.000000000 +0100
8+++ orrery/orrery.c 2010-11-15 22:33:17.000000000 +0100
9@@ -1238,12 +1238,44 @@
10 }
11 currentEntry = currentEntry->forwardPointer;
12 }
13- if (nDarkGreyPoints > 0)
14- gdk_draw_points(pixmap, darkGreyGC, darkGreyPoints, nDarkGreyPoints);
15- if (nGreyPoints > 0)
16- gdk_draw_points(pixmap, greyGC, greyPoints, nGreyPoints);
17- if (nWhitePoints > 0)
18- gdk_draw_points(pixmap, whiteGC, whitePoints, nWhitePoints);
19+ GdkPixbuf* starDrawingBuf = gdk_pixbuf_get_from_drawable( NULL,
20+ pixmap,
21+ gdk_colormap_get_system()
22+ , 0, 0, 0, 0, displayWidth, displayHeight);
23+ g_assert (gdk_pixbuf_get_bits_per_sample (starDrawingBuf) == 8);
24+ guchar* p;
25+ int rowstride = gdk_pixbuf_get_rowstride (starDrawingBuf);
26+ guchar* pixels = gdk_pixbuf_get_pixels (starDrawingBuf);
27+ int n_channels = gdk_pixbuf_get_n_channels (starDrawingBuf);
28+ GdkGCValues starGCval;
29+ GdkColor starColor;
30+ int pointNum;
31+ gdk_gc_get_values(darkGreyGC, &starGCval);
32+ gdk_colormap_query_color( gdk_gc_get_colormap(darkGreyGC),starGCval.foreground.pixel, &starColor );
33+ for( pointNum = 0; pointNum < nDarkGreyPoints; pointNum++) {
34+ p = pixels + darkGreyPoints[pointNum].y * rowstride + darkGreyPoints[pointNum].x * n_channels;
35+ p[0] = starColor.red & 0xff;
36+ p[1] = starColor.green & 0xff;
37+ p[2] = starColor.blue & 0xff;
38+ }
39+ gdk_gc_get_values(greyGC, &starGCval);
40+ gdk_colormap_query_color( gdk_gc_get_colormap(greyGC), starGCval.foreground.pixel, &starColor );
41+ for( pointNum = 0; pointNum < nGreyPoints; pointNum++) {
42+ p = pixels + greyPoints[pointNum].y * rowstride + greyPoints[pointNum].x * n_channels;
43+ p[0] = starColor.red & 0xff;
44+ p[1] = starColor.green & 0xff;
45+ p[2] = starColor.blue & 0xff;
46+ }
47+ gdk_gc_get_values(whiteGC, &starGCval);
48+ gdk_colormap_query_color( gdk_gc_get_colormap(whiteGC), starGCval.foreground.pixel, &starColor );
49+ for( pointNum = 0; pointNum < nWhitePoints; pointNum++) {
50+ p = pixels + whitePoints[pointNum].y * rowstride + whitePoints[pointNum].x * n_channels;
51+ p[0] = starColor.red & 0xff;
52+ p[1] = starColor.green & 0xff;
53+ p[2] = starColor.blue & 0xff;
54+ }
55+ gdk_draw_pixbuf ( pixmap , NULL , starDrawingBuf,
56+ 0, 0, 0, 0, displayWidth, displayHeight, GDK_RGB_DITHER_NORMAL, 0, 0 ) ;
57 }
58
59 void makeTimeString(char *string)
diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
new file mode 100644
index 000000000..e6cbffcf4
--- /dev/null
+++ b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
@@ -0,0 +1,31 @@
1SUMMARY = "Astronomical application which displays the night sky"
2HOMEPAGE = "http://projects.openmoko.org/projects/orrery/"
3SECTION = "x11/scientific"
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe"
6DEPENDS = "gtk+"
7
8inherit autotools-brokensep pkgconfig
9
10SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \
11 file://orrery.png \
12 file://use.GdkPixbuf.patch \
13"
14
15SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b"
16SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6"
17
18S = "${WORKDIR}/${PN}"
19
20do_configure_prepend() {
21 # fix DSO issue with binutils-2.22
22 sed -i 's/ -lrt/ -lrt -lm/g' ${S}/Makefile.am
23}
24do_install_append() {
25 install -d ${D}${datadir}/orrery
26 cp -a ${S}/data/* ${D}${datadir}/orrery
27 install -d ${D}${datadir}/icons
28 install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons
29}
30
31FILES_${PN} += "${datadir}/icons/orrery.png"
diff --git a/meta-oe/recipes-navigation/proj/proj_4.8.0.bb b/meta-oe/recipes-navigation/proj/proj_4.8.0.bb
new file mode 100644
index 000000000..b4bfaf4f3
--- /dev/null
+++ b/meta-oe/recipes-navigation/proj/proj_4.8.0.bb
@@ -0,0 +1,14 @@
1SUMMARY = "PROJ.4 - Cartographic Projections library"
2HOMEPAGE = "http://trac.osgeo.org/proj/"
3SECTION = "libs"
4
5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608"
7
8SRC_URI = "http://download.osgeo.org/proj/proj-${PV}.tar.gz"
9SRC_URI[md5sum] = "d815838c92a29179298c126effbb1537"
10SRC_URI[sha256sum] = "2db2dbf0fece8d9880679154e0d6d1ce7c694dd8e08b4d091028093d87a9d1b5"
11
12inherit autotools pkgconfig lib_package
13
14FILES_${PN} += "${datadir}/proj"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-21 10:17:58 +0000