summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc2
-rw-r--r--packages/dbus-java/dbus-java_2.3.bb8
-rw-r--r--packages/dbus-java/dbus-java_2.4.bb8
-rw-r--r--packages/imagemagick/imagemagick_6.3.5-10.bb6
-rw-r--r--packages/libmatthew/libmatthew.inc71
-rw-r--r--packages/libmatthew/libmatthew_0.5.bb55
-rw-r--r--packages/libmatthew/libmatthew_0.7.1.bb8
-rw-r--r--packages/libmatthew/libmatthew_0.7.bb49
-rw-r--r--packages/meta/distro-feed-configs.bb30
-rw-r--r--packages/tangogps/files/.mtn2git_empty0
-rw-r--r--packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch182
-rw-r--r--packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch73
-rw-r--r--packages/tangogps/tangogps-fso_0.9.2.bb13
-rw-r--r--packages/vte/vte.inc5
-rw-r--r--packages/vte/vte_0.16.8.bb2
-rw-r--r--packages/vte/vte_0.16.9.bb2
16 files changed, 396 insertions, 118 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 62fbfec9ff..a936259fe6 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1953,7 +1953,7 @@ PREFERRED_VERSION_void11 ?= "0.2.0"
PREFERRED_VERSION_vorbis-tools ?= "1.0.1"
PREFERRED_VERSION_vpnc ?= "0.3.3"
PREFERRED_VERSION_vsftpd ?= "2.0.5"
-PREFERRED_VERSION_vte ?= "0.16.9"
+PREFERRED_VERSION_vte ?= "0.16.13"
PREFERRED_VERSION_vtun ?= "2.6"
PREFERRED_VERSION_w3cam ?= "0.7.2"
PREFERRED_VERSION_wakelan ?= "1.1"
diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb
index 71181d961d..756dd9ffe9 100644
--- a/packages/dbus-java/dbus-java_2.3.bb
+++ b/packages/dbus-java/dbus-java_2.3.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>"
-PR = "r3"
+PR = "r4"
inherit java-library
@@ -16,9 +16,9 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz
S = "${WORKDIR}/dbus-java-${PV}"
DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
-RSUGGESTS_libdbus-java = "libmatthew-java dbus"
-RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
-RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
do_compile () {
# run target .binclasses first to fix a brokenness in the Makefile
diff --git a/packages/dbus-java/dbus-java_2.4.bb b/packages/dbus-java/dbus-java_2.4.bb
index 461bcb19eb..17b7ccec68 100644
--- a/packages/dbus-java/dbus-java_2.4.bb
+++ b/packages/dbus-java/dbus-java_2.4.bb
@@ -6,10 +6,10 @@ HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
SECTION = "libs"
LICENSE = "GPLv2 AFL"
DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
-RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
-RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
-RSUGGESTS_libdbus-java = "libmatthew-java dbus"
-PR = "r0"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
+PR = "r1"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
diff --git a/packages/imagemagick/imagemagick_6.3.5-10.bb b/packages/imagemagick/imagemagick_6.3.5-10.bb
index c6e65d4c60..7b92a8252e 100644
--- a/packages/imagemagick/imagemagick_6.3.5-10.bb
+++ b/packages/imagemagick/imagemagick_6.3.5-10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "ImageMagick is an image convertion tools"
SECTION = "console/utils"
LICENSE = "GPL"
DEPENDS = "tiff"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
file://PerlMagic_MakePatch;patch=1 \
@@ -24,11 +24,11 @@ do_stage() {
}
FILES_${PN} += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.so \
+ ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \
${libdir}/ImageMagick-${IMVER}/config/ \
${datadir}/ImageMagick-${IMVER}"
-FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \
- ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a"
+FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a"
FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*"
diff --git a/packages/libmatthew/libmatthew.inc b/packages/libmatthew/libmatthew.inc
new file mode 100644
index 0000000000..d7a483e25f
--- /dev/null
+++ b/packages/libmatthew/libmatthew.inc
@@ -0,0 +1,71 @@
+DESCRIPTION = "Unix socket, debug and hexdump libraries"
+AUTHOR = "Matthew Johnson <web@matthew.ath.cx>"
+HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
+SECTION = "libs"
+LICENSE = "LGPL"
+DEPENDS = "classpath-native classpath fastjar-native virtual/javac-native"
+
+S = "${WORKDIR}/libmatthew-java-${PV}"
+
+inherit java-library
+
+# Some internal version numbers which change from time to time.
+# Allowing to override them makes this include file more
+# versatile.
+VER_CGI ?= "0.5"
+VER_DEBUG ?= "1.1"
+VER_HEXDUMP ?= "0.2"
+VER_IO ?= "0.1"
+VER_UNIX ?= "0.5"
+
+do_compile() {
+ oe_runmake \
+ JCFLAGS="-source 1.5" \
+ JAVAC="javac" \
+ JAR="fastjar" \
+ JAVAH="gjavah" \
+ INCLUDES="-I${STAGING_INCDIR}/classpath" \
+ LDFLAGS="-fpic -shared -lc ${LDFLAGS}" \
+ LD="${CC}" \
+ CFLAGS="-fpic -Wall -Os -pedantic -std=c99 -Werror"
+}
+do_install() {
+ oe_jarinstall cgi-${VER_CGI}.jar cgi.jar
+ oe_jarinstall debug-disable-${VER_DEBUG}.jar debug-disable.jar
+ oe_jarinstall debug-enable-${VER_DEBUG}.jar debug-enable.jar
+ oe_jarinstall hexdump-${VER_HEXDUMP}.jar hexdump.jar
+ oe_jarinstall io-${VER_IO}.jar io.jar
+ oe_jarinstall unix-${VER_UNIX}.jar unix.jar
+ oe_libinstall -so libcgi-java ${D}${libdir_jni}
+ oe_libinstall -so libunix-java ${D}${libdir_jni}
+}
+
+do_stage() {
+ oe_jarinstall -s cgi-${VER_CGI}.jar cgi.jar
+ oe_jarinstall -s debug-disable-${VER_DEBUG}.jar debug-disable.jar
+ oe_jarinstall -s debug-enable-${VER_DEBUG}.jar debug-enable.jar
+ oe_jarinstall -s hexdump-${VER_HEXDUMP}.jar hexdump.jar
+ oe_jarinstall -s io-${VER_IO}.jar io.jar
+ oe_jarinstall -s unix-${VER_UNIX}.jar unix.jar
+}
+
+PACKAGES = "\
+ libcgi-java libcgi-jni libcgi-jni-dbg \
+ libunixsocket-java libunixsocket-jni libunixsocket-jni-dbg \
+ ${PN}-io-java ${PN}-debug-java \
+"
+
+FILES_libcgi-java = "${datadir_java}/cgi*.jar"
+FILES_libcgi-jni = "${libdir_jni}/libcgi-java.so"
+FILES_libcgi-jni-dbg = "${libdir_jni}/.debug/libcgi-java.so"
+RDEPENDS_libcgi-java = "libcgi-jni"
+
+FILES_libunixsocket-java = "${datadir_java}/unix*.jar"
+FILES_libunixsocket-jni = "${libdir_jni}/libunix-java.so"
+FILES_libunixsocket-jni-dbg = "${libdir_jni}/.debug/libunix-java.so"
+RDEPENDS_libunixsocket-java = "libunixsocket-jni"
+
+FILES_${PN}-io-java = "${datadir_java}/io*.jar"
+
+FILES_${PN}-debug-java = "${datadir_java}/debug-*.jar ${datadir_java}/hexdump*.jar"
+
diff --git a/packages/libmatthew/libmatthew_0.5.bb b/packages/libmatthew/libmatthew_0.5.bb
deleted file mode 100644
index fb7ea3cce8..0000000000
--- a/packages/libmatthew/libmatthew_0.5.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-DESCRIPTION = "Unix socket, debug and hexdump libraries"
-LICENSE = "LGPL"
-SECTION = "libs"
-HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
-AUTHOR = "Matthew Johnson <web@matthew.ath.cx>"
-
-PR = "r1"
-
-inherit java-library
-
-DEPENDS = "classpath-native classpath fastjar-native"
-
-SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz"
-
-S = "${WORKDIR}/libmatthew-java-${PV}"
-
-do_compile() {
- oe_runmake \
- JCFLAGS="-source 1.5" \
- JAVAC="javac" \
- JAR="fastjar" \
- JAVAH="gjavah" \
- INCLUDES="-I${STAGING_INCDIR}/classpath" \
- LDFLAGS="-fpic -shared -lc ${LDFLAGS}" \
- LD="${CC}"
-}
-
-do_stage() {
- oe_jarinstall -s cgi-0.5.jar cgi.jar
- oe_jarinstall -s debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall -s debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall -s hexdump-0.1.jar hexdump.jar
- oe_jarinstall -s io-0.1.jar io.jar
- oe_jarinstall -s unix-0.2.jar unix.jar
-}
-
-do_install() {
- oe_jarinstall cgi-0.5.jar cgi.jar
- oe_jarinstall debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall hexdump-0.1.jar hexdump.jar
- oe_jarinstall io-0.1.jar io.jar
- oe_jarinstall unix-0.2.jar unix.jar
-
- oe_libinstall -so libcgi-java ${D}${libdir_jni}
- oe_libinstall -so libunix-java ${D}${libdir_jni}
-}
-
-PACKAGES += "${PN}-jni ${PN}-jni-dbg"
-
-RDEPENDS_${JPN} = "${PN}-jni"
-
-FILES_${PN}-jni = "${libdir_jni}/lib*.so"
-FILES_${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so"
-
diff --git a/packages/libmatthew/libmatthew_0.7.1.bb b/packages/libmatthew/libmatthew_0.7.1.bb
new file mode 100644
index 0000000000..2a3092cda5
--- /dev/null
+++ b/packages/libmatthew/libmatthew_0.7.1.bb
@@ -0,0 +1,8 @@
+require libmatthew.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
+ file://Makefile-0.7.patch;patch=1"
+
+
diff --git a/packages/libmatthew/libmatthew_0.7.bb b/packages/libmatthew/libmatthew_0.7.bb
index 68be750f8e..054881cf9b 100644
--- a/packages/libmatthew/libmatthew_0.7.bb
+++ b/packages/libmatthew/libmatthew_0.7.bb
@@ -1,50 +1,9 @@
-DESCRIPTION = "Unix socket, debug and hexdump libraries"
-AUTHOR = "Matthew Johnson <web@matthew.ath.cx>"
-HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
-SECTION = "libs"
-LICENSE = "LGPL"
-DEPENDS = "classpath-native classpath fastjar-native virtual/javac-native"
-RDEPENDS_${JPN} = "${PN}-jni"
-PR = "r0"
+require libmatthew.inc
+
+PR = "r1"
SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
file://Makefile-0.7.patch;patch=1"
-S = "${WORKDIR}/libmatthew-java-${PV}"
-
-inherit java-library
-
-do_compile() {
- oe_runmake \
- JCFLAGS="-source 1.5" \
- JAVAC="javac" \
- JAR="fastjar" \
- JAVAH="gjavah" \
- INCLUDES="-I${STAGING_INCDIR}/classpath" \
- LDFLAGS="-fpic -shared -lc ${LDFLAGS}" \
- LD="${CC}" \
- CFLAGS="-fpic -Wall -Os -pedantic -std=c99 -Werror"
-}
-do_install() {
- oe_jarinstall cgi-0.5.jar cgi.jar
- oe_jarinstall debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall hexdump-0.2.jar hexdump.jar
- oe_jarinstall io-0.1.jar io.jar
- oe_jarinstall unix-0.4.jar unix.jar
- oe_libinstall -so libcgi-java ${D}${libdir_jni}
- oe_libinstall -so libunix-java ${D}${libdir_jni}
-}
-do_stage() {
- oe_jarinstall -s cgi-0.5.jar cgi.jar
- oe_jarinstall -s debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall -s debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall -s hexdump-0.2.jar hexdump.jar
- oe_jarinstall -s io-0.1.jar io.jar
- oe_jarinstall -s unix-0.4.jar unix.jar
-}
-
-PACKAGES += "${PN}-jni ${PN}-jni-dbg"
+VER_UNIX ?= "0.4"
-FILES_${PN}-jni = "${libdir_jni}/lib*.so"
-FILES_${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so"
diff --git a/packages/meta/distro-feed-configs.bb b/packages/meta/distro-feed-configs.bb
new file mode 100644
index 0000000000..f30671d6d2
--- /dev/null
+++ b/packages/meta/distro-feed-configs.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Configuration files for online package repositories aka feeds"
+PR = "r0"
+
+DISTRO_FEED_PREFIX ?= "remote"
+DISTRO_FEED_URI ?= "http://my-distribution.org/remote-feed/"
+
+do_compile() {
+ mkdir -p ${S}/${sysconfdir}/opkg
+ for feed in all ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}; do
+ echo "src/gz ${DISTRO_FEED_PREFIX}-${feed} ${DISTRO_FEED_URI}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
+ done
+}
+do_install () {
+ install -d ${D}${sysconfdir}/opkg
+ install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#def distro_feed_configs(d):
+# import bb
+# parchs = bb.data.getVar( "PACKAGE_EXTRA_ARCHS", d, 1 ).split()
+# march = bb.data.getVar( "MACHINE_ARCH", d, 1 ).split()
+# archs = [ "all" ] + parchs + march
+# confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ]
+# return " ".join( confs )
+#
+#CONFFILES_${PN} += '${@distro_feed_configs(d)}'
+
+CONFFILES_${PN} += '${@ " ".join( [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in "all ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}".split() ] ) }'
diff --git a/packages/tangogps/files/.mtn2git_empty b/packages/tangogps/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tangogps/files/.mtn2git_empty
diff --git a/packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch b/packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch
new file mode 100644
index 0000000000..d5b673dfca
--- /dev/null
+++ b/packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch
@@ -0,0 +1,182 @@
+From aab817f5f2d66f1ef1e710eb6b698865d14b7fc2 Mon Sep 17 00:00:00 2001
+From: Daniel Willmann <daniel@totalueberwachung.de>
+Date: Mon, 21 Jul 2008 04:33:59 +0200
+Subject: [PATCH] Get GPS data via the gypsy interface.
+ Except for the time (which ogpsd doesn't send periodically) the interface
+ is implemented.
+
+---
+ configure.in | 2 +-
+ src/gps_functions.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/gps_functions.h | 3 +-
+ src/init.c | 6 ++-
+ 4 files changed, 103 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3661a57..cf06033 100644
+--- a/configure.in
++++ b/configure.in
+@@ -23,7 +23,7 @@ AM_GLIB_GNU_GETTEXT
+
+ AM_PROG_LIBTOOL
+
+-PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0])
++PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 gypsy])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+
+diff --git a/src/gps_functions.c b/src/gps_functions.c
+index bafbc18..57646e1 100644
+--- a/src/gps_functions.c
++++ b/src/gps_functions.c
+@@ -4,6 +4,13 @@
+ # include <config.h>
+ #endif
+
++#include <gypsy/gypsy-control.h>
++#include <gypsy/gypsy-device.h>
++#include <gypsy/gypsy-position.h>
++#include <gypsy/gypsy-accuracy.h>
++#include <gypsy/gypsy-course.h>
++#include <gypsy/gypsy-satellite.h>
++
+ #include <glib.h>
+ #include <glib/gprintf.h>
+
+@@ -630,3 +637,92 @@ get_gps()
+
+
+ }
++
++static void on_fix_status_changed(GypsyDevice *device, GypsyDeviceFixStatus status, void *user_data)
++{
++ gpsdata->fix.mode = status;
++ gpsdata->valid = status > 1;
++}
++
++static void on_position_changed(GypsyPosition *position, GypsyPositionFields fields_set,
++ int timestamp, double latitude, double longitude, double altitude, void *user_data)
++{
++ if (gpsdata->valid) {
++ gpsdata->fix.latitude = latitude;
++ gpsdata->fix.longitude = longitude;
++ gpsdata->fix.altitude = altitude;
++ }
++}
++
++static void on_accuracy_changed(GypsyAccuracy *accuracy, int fields, double pdop,
++ double hdop, double vdop, void *user_data)
++{
++ gpsdata->hdop = hdop;
++}
++
++static void on_course_changed(GypsyCourse *course, GypsyCourseFields fields_set,
++ int timestamp, double speed, double direction, double climb, void *user_data)
++{
++ gpsdata->fix.speed = speed/3.6;
++ gpsdata->fix.track = direction;
++}
++
++static void on_satellites_changed(GypsySatellite *sat, GPtrArray *sats, void *user_data)
++{
++ int i;
++
++ gpsdata->satellites_used = 0;
++ gpsdata->satellites_inview = sats->len;
++ for (i = 0; i < sats->len; i++) {
++ GypsySatelliteDetails *details = sats->pdata[i];
++
++ if (details->in_use) {
++ gpsdata->satellites_used++;
++ }
++ }
++}
++
++// typedef struct {
++// double time; /* Time of update, seconds since Unix epoch */
++// int mode; /* Mode of fix */
++// double latitude; /* Latitude in degrees (valid if mode >= 2) */
++// double longitude; /* Longitude in degrees (valid if mode >= 2) */
++// double altitude; /* Altitude in meters (valid if mode == 3) */
++// double track; /* Course made good (relative to true north) */
++// double speed; /* Speed over ground, meters/sec */
++// double bearing; /* in radian */
++// } gps_fix_t;
++//
++// typedef struct {
++// gps_fix_t fix;
++// int satellites_used;
++// int satellites_inview;
++// double hdop;
++// gboolean valid;
++// } gps_data_t;
++
++
++#define GYPSY_OBJ_PATH "/org/freedesktop/Gypsy"
++
++int setup_gypsy() {
++ gpsdata = g_new0(gps_data_t,1);
++
++ GypsyControl *gyctrl = gypsy_control_get_default();
++ GypsyDevice *gydevice = gypsy_device_new(GYPSY_OBJ_PATH);
++ GypsyPosition *gypos = gypsy_position_new(GYPSY_OBJ_PATH);
++ GypsyAccuracy *gyacc = gypsy_accuracy_new(GYPSY_OBJ_PATH);
++ GypsyCourse *gycourse = gypsy_course_new(GYPSY_OBJ_PATH);
++ GypsySatellite *gysat = gypsy_satellite_new(GYPSY_OBJ_PATH);
++
++ g_signal_connect(gydevice, "fix-status-changed", G_CALLBACK(on_fix_status_changed), NULL);
++ g_signal_connect(gypos, "position-changed", G_CALLBACK(on_position_changed), NULL);
++ g_signal_connect(gyacc, "accuracy-changed", G_CALLBACK(on_accuracy_changed), NULL);
++ g_signal_connect(gycourse, "course-changed", G_CALLBACK(on_course_changed), NULL);
++ g_signal_connect(gysat, "satellites-changed", G_CALLBACK(on_satellites_changed), NULL);
++
++ gpsdata->fix.mode = gypsy_device_get_fix_status(gydevice, NULL);
++ gpsdata->valid = gpsdata->fix.mode > 1;
++
++ return 1;
++}
++
+diff --git a/src/gps_functions.h b/src/gps_functions.h
+index 1090565..207b39f 100644
+--- a/src/gps_functions.h
++++ b/src/gps_functions.h
+@@ -1,4 +1,5 @@
+-
++int
++setup_gypsy();
+
+ void
+ get_gps();
+diff --git a/src/init.c b/src/init.c
+index 46ca583..c557ce4 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -26,7 +26,7 @@
+ #include "wp.h"
+
+ FILE *fp = NULL;
+-
++int have_gypsy = 0;
+
+
+ void
+@@ -197,7 +197,8 @@ cb_gps_timer()
+
+ printf("timer called\n");
+
+- get_gps();
++ if (!have_gypsy)
++ get_gps();
+
+
+ if(gpsdata)
+@@ -868,5 +869,6 @@ init()
+ gtk_label_set_text(GTK_LABEL(widget), "V: " VERSION " (C) Marcus Bauer, GPLv2");
+ #endif
+
++ have_gypsy = setup_gypsy();
+ timer = g_timeout_add (1000,cb_gps_timer,data);
+ }
+--
+1.5.4.5
+
diff --git a/packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch b/packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch
new file mode 100644
index 0000000000..09b2c2ad8a
--- /dev/null
+++ b/packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch
@@ -0,0 +1,73 @@
+From 2562a173716141cd9ea5c227dfa52f04ce4205f8 Mon Sep 17 00:00:00 2001
+From: Daniel Willmann <daniel@totalueberwachung.de>
+Date: Tue, 22 Jul 2008 00:22:58 +0200
+Subject: [PATCH] Try to request the GPS resource from ousaged
+
+---
+ configure.in | 2 +-
+ src/gps_functions.c | 22 ++++++++++++++++++++++
+ 2 files changed, 23 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index cf06033..2bc3cf9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -23,7 +23,7 @@ AM_GLIB_GNU_GETTEXT
+
+ AM_PROG_LIBTOOL
+
+-PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 gypsy])
++PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 dbus-glib-1 gypsy])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+
+diff --git a/src/gps_functions.c b/src/gps_functions.c
+index 57646e1..0802e67 100644
+--- a/src/gps_functions.c
++++ b/src/gps_functions.c
+@@ -11,6 +11,7 @@
+ #include <gypsy/gypsy-course.h>
+ #include <gypsy/gypsy-satellite.h>
+
++#include <dbus/dbus-glib.h>
+ #include <glib.h>
+ #include <glib/gprintf.h>
+
+@@ -705,6 +706,11 @@ static void on_satellites_changed(GypsySatellite *sat, GPtrArray *sats, void *u
+ #define GYPSY_OBJ_PATH "/org/freedesktop/Gypsy"
+
+ int setup_gypsy() {
++ DBusGConnection *connection;
++ DBusGProxy *proxy;
++ GError *error;
++ int result;
++
+ gpsdata = g_new0(gps_data_t,1);
+
+ GypsyControl *gyctrl = gypsy_control_get_default();
+@@ -723,6 +729,22 @@ int setup_gypsy() {
+ gpsdata->fix.mode = gypsy_device_get_fix_status(gydevice, NULL);
+ gpsdata->valid = gpsdata->fix.mode > 1;
+
++ error = NULL;
++ connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++ if (connection == NULL) {
++ g_printerr ("Failed to open connection to bus: %s\n",
++ error->message);
++ g_error_free (error);
++ proxy = NULL;
++ }
++
++ proxy = dbus_g_proxy_new_for_name (connection,
++ "org.freesmartphone.ousaged",
++ "/org/freesmartphone/Usage",
++ "org.freesmartphone.Usage");
++
++ dbus_g_proxy_call (proxy, "RequestResource", &error, G_TYPE_STRING, "GPS", G_TYPE_INVALID, G_TYPE_BOOLEAN, &result, G_TYPE_INVALID);
++
+ return 1;
+ }
+
+--
+1.5.4.5
+
diff --git a/packages/tangogps/tangogps-fso_0.9.2.bb b/packages/tangogps/tangogps-fso_0.9.2.bb
new file mode 100644
index 0000000000..e05b72dc29
--- /dev/null
+++ b/packages/tangogps/tangogps-fso_0.9.2.bb
@@ -0,0 +1,13 @@
+LICENSE = "GPLv2"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+DESCRIPTION = "lightweight and fast mapping application"
+DEPENDS = "curl gtk+ gconf gypsy dbus-glib"
+
+inherit autotools
+
+SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz\
+ file://0002-Get-GPS-data-via-the-gypsy-interface.patch;patch=1 \
+ file://0003-Try-to-request-the-GPS-resource-from-ousaged.patch;patch=1"
+
+S=${WORKDIR}/tangogps-${PV}
diff --git a/packages/vte/vte.inc b/packages/vte/vte.inc
index 587ea85a39..76dacff581 100644
--- a/packages/vte/vte.inc
+++ b/packages/vte/vte.inc
@@ -1,7 +1,6 @@
DESCRIPTION = "vte is a virtual terminal emulator"
LICENSE = "LGPL"
DEPENDS += " glib-2.0 gtk+ intltool-native"
-RDEPENDS = "termcap"
inherit gnome
@@ -13,5 +12,7 @@ do_stage() {
autotools_stage_all
}
-PACKAGES =+ "libvte"
+PACKAGES =+ "libvte vte-termcap"
FILES_libvte = "${libdir}/*.so*"
+RDEPENDS_libvte = "vte-termcap"
+FILES_vte-termcap = "${datadir}/vte/termcap"
diff --git a/packages/vte/vte_0.16.8.bb b/packages/vte/vte_0.16.8.bb
deleted file mode 100644
index f408632430..0000000000
--- a/packages/vte/vte_0.16.8.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require vte.inc
-PR = "r3"
diff --git a/packages/vte/vte_0.16.9.bb b/packages/vte/vte_0.16.9.bb
deleted file mode 100644
index 5875fd317f..0000000000
--- a/packages/vte/vte_0.16.9.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require vte.inc
-PR = "r4"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 08:06:16 +0000