diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-11-15 16:40:42 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-12-02 09:26:19 +0100 |
commit | 5596b52d64c30d8e66ec6e379cf69a9fc9407fb1 (patch) | |
tree | f5b6e2693561433e536ad559bde95ba78e9afe63 | |
parent | 0288b204f3c12af1561218fa0cfcdfb9a5508b47 (diff) | |
download | meta-openembedded-5596b52d64c30d8e66ec6e379cf69a9fc9407fb1.tar.gz |
obex-data-server: Fix build with new openobex version
Add missing dependency on dbus-glib-native, this is needed for
getting DBUS_BINDING_TOOL
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch | 20 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb | 7 |
2 files changed, 24 insertions, 3 deletions
diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch b/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch new file mode 100644 index 0000000000..e2c4e9ff6c --- /dev/null +++ b/meta-oe/recipes-connectivity/obex/obex-data-server/obex-data-server-0.4.6-build-fixes-1.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Submitted By: Armin K. <krejzi at email dot com> | ||
2 | Date: 2012-07-06 | ||
3 | Initial Package Version: 0.4.6 | ||
4 | Upstream Status: Unknown | ||
5 | Origin: Self | ||
6 | Description: Some build fixes. | ||
7 | |||
8 | Index: obex-data-server-0.4.6/src/ods-obex.c | ||
9 | =================================================================== | ||
10 | --- obex-data-server-0.4.6.orig/src/ods-obex.c | ||
11 | +++ obex-data-server-0.4.6/src/ods-obex.c | ||
12 | @@ -412,7 +412,7 @@ ods_obex_setup_usbtransport (OdsObexCont | ||
13 | goto err; | ||
14 | } | ||
15 | |||
16 | - interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf); | ||
17 | + interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle); | ||
18 | if (intf_num >= interfaces_num) { | ||
19 | g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number"); | ||
20 | goto err; | ||
diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb index c2c284e93d..e10b89c367 100644 --- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb +++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb | |||
@@ -2,14 +2,15 @@ DESCRIPTION = "obex-data-server is a D-Bus service providing high-level OBEX cli | |||
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPLv2" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
4 | 4 | ||
5 | DEPENDS = "gtk+ dbus-glib imagemagick openobex" | 5 | DEPENDS = "gtk+ dbus-glib dbus-glib-native imagemagick openobex" |
6 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" | 6 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" |
7 | 7 | ||
8 | SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz" | 8 | SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz \ |
9 | file://obex-data-server-0.4.6-build-fixes-1.patch \ | ||
10 | " | ||
9 | SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d" | 11 | SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d" |
10 | SRC_URI[sha256sum] = "b399465ddbd6d0217abedd9411d9d74a820effa0a6a142adc448268d3920094f" | 12 | SRC_URI[sha256sum] = "b399465ddbd6d0217abedd9411d9d74a820effa0a6a142adc448268d3920094f" |
11 | 13 | ||
12 | inherit autotools-brokensep pkgconfig | 14 | inherit autotools-brokensep pkgconfig |
13 | 15 | ||
14 | FILES_${PN} += "${datadir}/dbus-1/" | 16 | FILES_${PN} += "${datadir}/dbus-1/" |
15 | |||