[oe] [oe-commits] Khem Raj : libdivecomputer: Update to 0.4.2

[Martin Jansa]

On Fri, Oct 03, 2014 at 10:36:36PM +0000, git at git.openembedded.org wrote:
> Module: meta-openembedded.git
> Branch: master-next
> Commit: ff593ed015a0f62d05ab91676034779242c2edc4
> URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ff593ed015a0f62d05ab91676034779242c2edc4
> 
> Author: Khem Raj <raj.khem at gmail.com>
> Date:   Mon Sep 29 20:52:58 2014 -0700
> 
> libdivecomputer: Update to 0.4.2

This is breaking subsurface

| In file included from libdivecomputer.c:9:0:
| libdivecomputer.h:15:19: fatal error: utils.h: No such file or directory
|  #include <utils.h>
|                    ^

which could be resolved by cherry-picking
http://git.hohndel.org/?p=subsurface.git;a=commit;h=57af78b

But then there are couple move issues with old subsurface and new libdivecomputer

| libdivecomputer.h:22:2: error: unknown type name 'device_type_t'
|   device_type_t type;
|   ^
| libdivecomputer.h:25:2: error: unknown type name 'device_devinfo_t'
|   device_devinfo_t devinfo;
|   ^
| libdivecomputer.h:26:2: error: unknown type name 'device_clock_t'
|   device_clock_t clock;
|   ^
| libdivecomputer.h:32:2: error: unknown type name 'device_type_t'
|   device_type_t type;
|   ^
| libdivecomputer.c:25:8: error: unknown type name 'parser_status_t'
|  static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
|         ^
| libdivecomputer.c:25:62: error: unknown type name 'parser_t'
|  static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
|                                                               ^
| libdivecomputer.c:90:46: error: unknown type name 'parser_t'
|  static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
|                                               ^
| libdivecomputer.c:121:68: error: unknown type name 'parser_sample_value_t'
|  static void handle_event(struct dive *dive, struct sample *sample, parser_sample_value_t value)
|                                                                     ^
| libdivecomputer.c:159:11: error: unknown type name 'parser_sample_type_t'
|  sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
|            ^
| libdivecomputer.c:159:38: error: unknown type name 'parser_sample_value_t'
|  sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata)
|                                       ^
| libdivecomputer.c:212:47: error: unknown type name 'parser_t'
|  static int parse_samples(struct dive **divep, parser_t *parser)
|                                                ^
| libdivecomputer.c: In function 'dive_cb':
| libdivecomputer.c:241:2: error: unknown type name 'parser_t'
|   parser_t *parser = NULL;
|   ^
| libdivecomputer.c:247:2: warning: implicit declaration of function 'create_parser' [-Wimplicit-function-declaration]
|   rc = create_parser(devdata, &parser);
|   ^
| libdivecomputer.c:248:12: error: 'PARSER_STATUS_SUCCESS' undeclared (first use in this function)
|   if (rc != PARSER_STATUS_SUCCESS) {
|             ^
| libdivecomputer.c:248:12: note: each undeclared identifier is reported only once for each function it appears in
| libdivecomputer.c:253:2: warning: implicit declaration of function 'parser_set_data' [-Wimplicit-function-declaration]
|   rc = parser_set_data(parser, data, size);
|   ^

and upgrading subsurface switches also the UI to qt, so in the end
I haven't upgraded it, because I cannot test it in runtime anyway.

Can you look into it?
Otherwise I'll PNBLACKLIST it next week as other than this and xf86-video-geode we have clean world build state.

> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> 
> ---
> 
>  .../recipes-extended/libdivecomputer/libdivecomputer_git.bb | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
> index 1154dc0..6c4f4a0 100644
> --- a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
> +++ b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
> @@ -2,18 +2,19 @@ DESCRIPTION = "Libdivecomputer is a cross-platform and open source library for c
>  HOMEPAGE = "http://www.divesoftware.org/libdc/"
>  
>  LICENSE = "LGPLv2.1"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
>  
>  DEPENDS = "libusb1"
>  
>  inherit autotools pkgconfig
>  
> -PV = "0.0.0"
> -PR = "r1"
> +PV = "0.4.2+gitr${SRCPV}"
> +
> +SRCREV = "5f765f91430f16932d96b3777404420aa2dd4c7c"
> +SRC_URI = "git://git.libdivecomputer.org/libdivecomputer.git \
> +           file://fix-ar.patch \
> +          "
>  
> -SRCREV = "b7a6be15ca58cc8f89fbc8fa1a4c840e13d51092"
> -SRC_URI = "git://libdivecomputer.git.sourceforge.net/gitroot/libdivecomputer/libdivecomputer \
> -file://fix-ar.patch"
>  S = "${WORKDIR}/git"
>  
>  
> 
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20141005/9155efb7/attachment-0002.sig>