diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-08 22:51:41 +0200 |
commit | 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e (patch) | |
tree | a21a5fc103bb3bd65ecd85ed22be5228fc54e447 /meta-oe/recipes-navigation/gypsy | |
download | meta-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/gypsy')
5 files changed, 195 insertions, 0 deletions
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 @@ | |||
1 | From 5b859b6e7c82f49d967c25398a8e75b61af9bcc0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 12 Jun 2013 20:58:51 -0700 | ||
4 | Subject: [PATCH] g_type_init() is deprecated for glib >= 2.35.0 | ||
5 | |||
6 | Call it for old versions. | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | |||
10 | Upstream-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 | |||
20 | diff --git a/examples/list-known-gps-devices.c b/examples/list-known-gps-devices.c | ||
21 | index 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 | |||
36 | diff --git a/examples/simple-gps-dbus.c b/examples/simple-gps-dbus.c | ||
37 | index 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); | ||
51 | diff --git a/examples/simple-gps-gypsy.c b/examples/simple-gps-gypsy.c | ||
52 | index 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) { | ||
67 | diff --git a/examples/simple-gps-satellites.c b/examples/simple-gps-satellites.c | ||
68 | index 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) { | ||
83 | diff --git a/gypsy/gypsy-marshal.c b/gypsy/gypsy-marshal.c | ||
84 | index 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) | ||
96 | diff --git a/src/main.c b/src/main.c | ||
97 | index 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 | -- | ||
113 | 1.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 @@ | |||
1 | Upstream-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 @@ | |||
1 | SUMMARY = "GPS Multiplexing Daemon" | ||
2 | DESCRIPTION = "Gypsy is a GPS multiplexing daemon which allows \ | ||
3 | multiple clients to access GPS data from multiple GPS sources \ | ||
4 | concurrently. Gypsy also hides the details of parsing NMEA from the \ | ||
5 | client applications, passing the data as simple values for the clients \ | ||
6 | to use." | ||
7 | LICENSE = "GPLv2.0 & LGPLv2.1" | ||
8 | SECTION = "console/network" | ||
9 | DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt-native libxslt" | ||
10 | |||
11 | inherit autotools pkgconfig gtk-doc | ||
12 | PACKAGES += "libgypsy" | ||
13 | |||
14 | FILES_${PN} = " \ | ||
15 | ${sysconfdir}/gypsy.conf \ | ||
16 | ${sysconfdir}/dbus-1 \ | ||
17 | ${libexecdir}/gypsy-daemon \ | ||
18 | ${datadir}/dbus-1 \ | ||
19 | " | ||
20 | |||
21 | FILES_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 @@ | |||
1 | require gypsy.inc | ||
2 | |||
3 | PR = "r2" | ||
4 | |||
5 | LIC_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 | |||
10 | SRC_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 | |||
14 | SRC_URI[md5sum] = "e2d186df9c2cc3b70a027043e22acf1a" | ||
15 | SRC_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 @@ | |||
1 | require gypsy.inc | ||
2 | |||
3 | DEFAULT_PREFERENCE = "-1" | ||
4 | |||
5 | SRCREV = "be8c9c382d2d1d37b51d29b0843045121ec90213" | ||
6 | PV = "0.9+git${SRCPV}" | ||
7 | PR = "r2" | ||
8 | |||
9 | S = "${WORKDIR}/git" | ||
10 | |||
11 | LIC_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 | |||
16 | SRC_URI += "git://anongit.freedesktop.org/gypsy \ | ||
17 | file://fixups.patch" | ||
18 | |||
19 | do_configure_prepend() { | ||
20 | # from patch 563716fc596d53f1085949a9dd11a62f39b2d624 | ||
21 | test -d ${S}/m4 || mkdir -p ${S}/m4 | ||
22 | } | ||