diff options
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | packages/freesmartphone/fso-gpsd_git.bb | 6 | ||||
| -rw-r--r-- | packages/images/fso-image.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-omap/beagleboard/beagle-asoc.diff | 212 | ||||
| -rw-r--r-- | packages/linux/linux-omap/beagleboard/defconfig | 24 | ||||
| -rw-r--r-- | packages/linux/linux-omap_git.bb | 7 | ||||
| -rw-r--r-- | packages/tangogps/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch | 182 | ||||
| -rw-r--r-- | packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch | 73 | ||||
| -rw-r--r-- | packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch | 18 | ||||
| -rw-r--r-- | packages/tangogps/tangogps-fso_0.9.2.bb | 11 | ||||
| -rw-r--r-- | packages/tangogps/tangogps.inc | 6 | ||||
| -rw-r--r-- | packages/tangogps/tangogps_0.9.0.3.bb | 5 | ||||
| -rw-r--r-- | packages/tangogps/tangogps_0.9.3.bb | 3 |
14 files changed, 241 insertions, 310 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 6add80f7b4..2dce2bc738 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -44,7 +44,7 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-frameworkd ?= "248637c1264624aa08de40c2bbea96c418e0702e" -SRCREV_pn-fso-gpsd ?= "a79873ad595d7b524727daf06810a130fe002277" +SRCREV_pn-fso-gpsd ?= "cee8114fe8fab30f2dd6c49207e03f59cdca7929" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" diff --git a/packages/freesmartphone/fso-gpsd_git.bb b/packages/freesmartphone/fso-gpsd_git.bb index 2f99ea9760..85cb5194b5 100644 --- a/packages/freesmartphone/fso-gpsd_git.bb +++ b/packages/freesmartphone/fso-gpsd_git.bb @@ -2,10 +2,14 @@ DESCRIPTION = "gspd compatibility layer for frameworkd" LICENSE = "GPL" SECTION = "network" DEPENDS = "dbus-glib" -PV = "0.5+gitr${SRCREV}" +PV = "0.6+${PR}+gitr${SRCREV}" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/fso-gpsd.git;protocol=git;branch=master" S = "${WORKDIR}/git" inherit autotools + +RPROVIDES_${PN} = "gpsd" +RCONFLICTS_${PN} = "gpsd" +RREPLACES_${PN} = "gpsd" diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index 15075f022c..d65a01500d 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -80,7 +80,7 @@ GTK_INSTALL = "\ openmoko-calculator2 \ openmoko-terminal2 \ gpe-scap \ - tangogps-fso \ + tangogps \ " GAMES_INSTALL = "\ diff --git a/packages/linux/linux-omap/beagleboard/beagle-asoc.diff b/packages/linux/linux-omap/beagleboard/beagle-asoc.diff new file mode 100644 index 0000000000..6763d85c32 --- /dev/null +++ b/packages/linux/linux-omap/beagleboard/beagle-asoc.diff @@ -0,0 +1,212 @@ +From: Felipe Contreras <felipe.contreras@gmail.com> +To: linux-omap@vger.kernel.org +Cc: Felipe Contreras <felipe.contreras@gmail.com> +Subject: [PATCH] alsa: add Beagleboard SoC configuration. + +This is exactly the same as the overo configuration. It might make sense +to have them in a single one. + +Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> +--- + +This was suggested by Koen Kooi. + + sound/soc/omap/Kconfig | 8 ++ + sound/soc/omap/Makefile | 2 + + sound/soc/omap/omap3beagle.c | 149 ++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 159 insertions(+), 0 deletions(-) + create mode 100644 sound/soc/omap/omap3beagle.c + +diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig +index d7b8939..ebad024 100644 +--- a/sound/soc/omap/Kconfig ++++ b/sound/soc/omap/Kconfig +@@ -22,3 +22,11 @@ config SND_OMAP_SOC_OVERO + help + Say Y if you want to add support for SoC audio on the Gumstix Overo. + ++config SND_OMAP_SOC_OMAP3_BEAGLE ++ tristate "SoC Audio support for OMAP3 Beagle" ++ depends on SND_OMAP_SOC && MACH_OMAP3_BEAGLE ++ select SND_OMAP_SOC_MCBSP ++ select SND_SOC_TWL4030 ++ help ++ Say Y if you want to add support for SoC audio on the Beagleboard. ++ +diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile +index b96b97b..09fd0bb 100644 +--- a/sound/soc/omap/Makefile ++++ b/sound/soc/omap/Makefile +@@ -8,7 +8,9 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o + # OMAP Machine Support + snd-soc-n810-objs := n810.o + snd-soc-overo-objs := overo.o ++snd-soc-omap3beagle-objs := omap3beagle.o + + obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o + obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o ++obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o + +diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c +new file mode 100644 +index 0000000..1d0e398 +--- /dev/null ++++ b/sound/soc/omap/omap3beagle.c +@@ -0,0 +1,149 @@ ++/* ++ * omap3beagle.c -- SoC audio for OMAP3 Beagle ++ * ++ * Author: Steve Sakoman <steve@sakoman.com> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ * ++ */ ++ ++#include <linux/clk.h> ++#include <linux/platform_device.h> ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/soc.h> ++#include <sound/soc-dapm.h> ++ ++#include <asm/mach-types.h> ++#include <mach/hardware.h> ++#include <mach/gpio.h> ++#include <mach/mcbsp.h> ++ ++#include "omap-mcbsp.h" ++#include "omap-pcm.h" ++#include "../codecs/twl4030.h" ++ ++static int omap3beagle_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; ++ struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; ++ int ret; ++ ++ /* Set codec DAI configuration */ ++ ret = snd_soc_dai_set_fmt(codec_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_ERR "can't set codec DAI configuration\n"); ++ return ret; ++ } ++ ++ /* Set cpu DAI configuration */ ++ ret = snd_soc_dai_set_fmt(cpu_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_ERR "can't set cpu DAI configuration\n"); ++ return ret; ++ } ++ ++ /* Set the codec system clock for DAC and ADC */ ++ ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, ++ SND_SOC_CLOCK_IN); ++ if (ret < 0) { ++ printk(KERN_ERR "can't set codec system clock\n"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_ops omap3beagle_ops = { ++ .hw_params = omap3beagle_hw_params, ++}; ++ ++/* Digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link omap3beagle_dai = { ++ .name = "TWL4030", ++ .stream_name = "TWL4030", ++ .cpu_dai = &omap_mcbsp_dai[0], ++ .codec_dai = &twl4030_dai, ++ .ops = &omap3beagle_ops, ++}; ++ ++/* Audio machine driver */ ++static struct snd_soc_machine snd_soc_machine_omap3beagle = { ++ .name = "omap3beagle", ++ .dai_link = &omap3beagle_dai, ++ .num_links = 1, ++}; ++ ++/* Audio subsystem */ ++static struct snd_soc_device omap3beagle_snd_devdata = { ++ .machine = &snd_soc_machine_omap3beagle, ++ .platform = &omap_soc_platform, ++ .codec_dev = &soc_codec_dev_twl4030, ++}; ++ ++static struct platform_device *omap3beagle_snd_device; ++ ++static int __init omap3beagle_soc_init(void) ++{ ++ int ret; ++ ++ printk(KERN_INFO "OMAP3 Beagle SoC init\n"); ++ if (!machine_is_omap3_beagle()) { ++ printk(KERN_ERR "Not OMAP3 Beagle!\n"); ++ return -ENODEV; ++ } ++ ++ omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!omap3beagle_snd_device) { ++ printk(KERN_ERR "Platform device allocation failed\n"); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(omap3beagle_snd_device, &omap3beagle_snd_devdata); ++ omap3beagle_snd_devdata.dev = &omap3beagle_snd_device->dev; ++ *(unsigned int *)omap3beagle_dai.cpu_dai->private_data = 1; /* McBSP2 */ ++ ++ ret = platform_device_add(omap3beagle_snd_device); ++ if (ret) ++ goto err1; ++ ++ return 0; ++ ++err1: ++ printk(KERN_ERR "Unable to add platform device\n"); ++ platform_device_put(omap3beagle_snd_device); ++ ++ return ret; ++} ++ ++static void __exit omap3beagle_soc_exit(void) ++{ ++ platform_device_unregister(omap3beagle_snd_device); ++} ++ ++module_init(omap3beagle_soc_init); ++module_exit(omap3beagle_soc_exit); ++ ++MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>"); ++MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle"); ++MODULE_LICENSE("GPL"); +-- +1.6.0.1 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + diff --git a/packages/linux/linux-omap/beagleboard/defconfig b/packages/linux/linux-omap/beagleboard/defconfig index 7de6a0aa90..9b9b941da1 100644 --- a/packages/linux/linux-omap/beagleboard/defconfig +++ b/packages/linux/linux-omap/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.27-rc5-omap1 -# Thu Sep 4 18:30:13 2008 +# Linux kernel version: 2.6.27-rc7-omap1 +# Thu Sep 25 12:46:23 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -215,6 +215,7 @@ CONFIG_ARCH_OMAP3430=y # CONFIG_MACH_OMAP_3430SDP is not set # CONFIG_MACH_OMAP3EVM is not set CONFIG_MACH_OMAP3_BEAGLE=y +# CONFIG_MACH_OVERO is not set CONFIG_OMAP_TICK_GPTIMER=12 # @@ -329,7 +330,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y -CONFIG_ARM_ERRATUM_451034=y +CONFIG_ARM_ERRATUM_451034=n # # Userspace binary formats @@ -920,7 +921,6 @@ CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y - # # I2C GPIO expanders: # @@ -1267,7 +1267,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_OMAP=y CONFIG_FB_OMAP_VIDEO_MODE="1024x768@60" # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set -CONFIG_OMAP_FB_LCD_OMAP3BEAGLE=y # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=8 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set @@ -1333,6 +1332,9 @@ CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y CONFIG_SND_SOC=y CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y +CONFIG_SND_SOC_TWL4030=y # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y @@ -1361,7 +1363,7 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set CONFIG_USB_SUSPEND=y -CONFIG_USB_OTG=y +# CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set CONFIG_USB_MON=y @@ -1386,14 +1388,13 @@ CONFIG_USB_MUSB_SOC=y # # OMAP 343x high speed USB support # -# CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_MUSB_HOST=y # CONFIG_USB_MUSB_PERIPHERAL is not set -CONFIG_USB_MUSB_OTG=y -CONFIG_USB_GADGET_MUSB_HDRC=y +# CONFIG_USB_MUSB_OTG is not set +# CONFIG_USB_GADGET_MUSB_HDRC is not set CONFIG_USB_MUSB_HDRC_HCD=y # CONFIG_MUSB_PIO_ONLY is not set CONFIG_USB_INVENTRA_DMA=y -CONFIG_MUSB_USE_SYSTEM_DMA_RX=y # CONFIG_USB_TI_CPPI_DMA is not set # CONFIG_USB_MUSB_DEBUG is not set @@ -1527,7 +1528,8 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA25X is not set -# CONFIG_USB_GADGET_M66592 is not set +CONFIG_USB_GADGET_M66592=y +CONFIG_USB_M66592=y # CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index ca64345522..ec9e2c0f9c 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -6,10 +6,10 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm" -SRCREV = "c434c15d28c82d92e55897bd265c423e9ab69362" +SRCREV = "9d1dff8638c9e96a401e1885f9948662e9ff9636" PV = "2.6.26+2.6.27-rc6+${PR}+git${SRCREV}" -PR = "r6" +PR = "r7" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -37,7 +37,8 @@ temporarely-disabled = " \ " SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ - " + file://beagle-asoc.diff;patch=1 \ + " SRC_URI_append_omap3evm = " \ file://OMAP3EVM_TWL4030-Keypad-irq-error-fix.patch;patch=1 \ diff --git a/packages/tangogps/files/.mtn2git_empty b/packages/tangogps/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/tangogps/files/.mtn2git_empty +++ /dev/null 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 deleted file mode 100644 index d5b673dfca..0000000000 --- a/packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch +++ /dev/null @@ -1,182 +0,0 @@ -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 deleted file mode 100644 index 09b2c2ad8a..0000000000 --- a/packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch +++ /dev/null @@ -1,73 +0,0 @@ -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/files/0004-Update-fix-timestamp-from-gypsy.patch b/packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch deleted file mode 100644 index d427108cc7..0000000000 --- a/packages/tangogps/files/0004-Update-fix-timestamp-from-gypsy.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- tangogps-0.9.2/src/gps_functions.c~ 2008-08-15 05:54:26.000000000 +0930 -+++ tangogps-0.9.2/src/gps_functions.c 2008-08-15 23:29:19.000000000 +0930 -@@ -649,6 +649,7 @@ - int timestamp, double latitude, double longitude, double altitude, void *user_data) - { - if (gpsdata->valid) { -+ gpsdata->fix.time = timestamp; - gpsdata->fix.latitude = latitude; - gpsdata->fix.longitude = longitude; - gpsdata->fix.altitude = altitude; -@@ -664,6 +665,7 @@ - static void on_course_changed(GypsyCourse *course, GypsyCourseFields fields_set, - int timestamp, double speed, double direction, double climb, void *user_data) - { -+ gpsdata->fix.time = timestamp; - gpsdata->fix.speed = speed/3.6; - gpsdata->fix.track = direction; - } diff --git a/packages/tangogps/tangogps-fso_0.9.2.bb b/packages/tangogps/tangogps-fso_0.9.2.bb deleted file mode 100644 index 22b65e7f4a..0000000000 --- a/packages/tangogps/tangogps-fso_0.9.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require tangogps.inc - -PR = "r1" - -RDEPENDS = "frameworkd" - -SRC_URI += "\ - 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 \ - file://0004-Update-fix-timestamp-from-gypsy.patch;patch=1 \ -" diff --git a/packages/tangogps/tangogps.inc b/packages/tangogps/tangogps.inc index 4c9e427cdd..90789377d1 100644 --- a/packages/tangogps/tangogps.inc +++ b/packages/tangogps/tangogps.inc @@ -4,10 +4,12 @@ HOMEPAGE = "http://tangogps.org/" SECTION = "x11/applications" LICENSE = "GPLv2" PRIORITY = "optional" -DEPENDS = "curl gtk+ gconf gypsy" -RRECOMMENDS = "gpsd" +DEPENDS = "curl gtk+ gconf sqlite3" SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz" S = "${WORKDIR}/tangogps-${PV}" inherit autotools pkgconfig + +RRECOMMENDS = "gpsd" + diff --git a/packages/tangogps/tangogps_0.9.0.3.bb b/packages/tangogps/tangogps_0.9.0.3.bb deleted file mode 100644 index a023594b53..0000000000 --- a/packages/tangogps/tangogps_0.9.0.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -require tangogps.inc - -DEPENDS += "gpsd" -RDEPENDS = "gpsd" -PR = "r2" diff --git a/packages/tangogps/tangogps_0.9.3.bb b/packages/tangogps/tangogps_0.9.3.bb index 83465c1da9..59020fd6bd 100644 --- a/packages/tangogps/tangogps_0.9.3.bb +++ b/packages/tangogps/tangogps_0.9.3.bb @@ -1,4 +1,3 @@ require tangogps.inc +PR = "r3" -DEPENDS += "sqlite3" -PR = "r1" |