diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2005-09-21 10:19:38 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-21 10:19:38 +0000 |
| commit | 1aa844cac6e6034826f9bf1b8fc59d49b7125599 (patch) | |
| tree | 194ea449285ad649dce82d81cfaac50dcb6d53e8 /packages | |
| parent | 2ad15bdfcbaf3578a0e0d7531edc13efa5b495a4 (diff) | |
| parent | a85249ab9a0a40ea959e48becb11003cae8fe8e9 (diff) | |
merge of 7d60c571444743e7ddfdd9c52895c6b38850a8e5
and 9a585ac85d681727fb65515f8c7f6612395d0ffc
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch | 42 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils-dbus_2.20.bb | 3 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils.inc | 2 |
3 files changed, 45 insertions, 2 deletions
diff --git a/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch b/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch new file mode 100644 index 0000000000..276281c14e --- /dev/null +++ b/packages/bluez/bluez-utils-dbus/hcid-alignment-fix.patch @@ -0,0 +1,42 @@ +--- bluez-utils-2.20/hcid/dbus.c.orig 2005-09-21 11:27:26 +0200 ++++ bluez-utils-2.20/hcid/dbus.c 2005-09-21 11:27:35 +0200 +@@ -120,6 +121,7 @@ + DBusMessage *message; + #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC + uint8_t *addr = (uint8_t *) &ci->bdaddr; ++ uint32_t ci_out = ci->out; + #else + DBusMessageIter iter; + #endif +@@ -138,7 +140,7 @@ + bacpy(&req->bda, &ci->bdaddr); + + #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC +- dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci->out, ++ dbus_message_append_args(message, DBUS_TYPE_BOOLEAN, &ci_out, + DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, + &addr, sizeof(bdaddr_t), DBUS_TYPE_INVALID); + #else +@@ -261,6 +263,8 @@ + DBusMessage *message; + #ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC + DBusMessageIter iter; ++#else ++ int32_t tmp_rssi = rssi; + #endif + char *local_addr, *peer_addr; + bdaddr_t tmp; +@@ -276,11 +280,12 @@ + } + + #ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC ++ + dbus_message_append_args(message, + DBUS_TYPE_STRING, &local_addr, + DBUS_TYPE_STRING, &peer_addr, + DBUS_TYPE_UINT32, &class, +- DBUS_TYPE_INT32, &rssi, ++ DBUS_TYPE_INT32, &tmp_rssi, + DBUS_TYPE_INVALID); + #else + dbus_message_append_iter_init(message, &iter); diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb index e54ff67085..3248b652f0 100644 --- a/packages/bluez/bluez-utils-dbus_2.20.bb +++ b/packages/bluez/bluez-utils-dbus_2.20.bb @@ -1,5 +1,6 @@ include bluez-utils.inc DEPENDS += "dbus" -SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1" +SRC_URI += "file://smash.patch;patch=1 \ + file://hcid-alignment-fix.patch;patch=1" EXTRA_OECONF += "--with-dbus" diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index b5a5e14970..10f70d384c 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "bluez-libs-${PV} pcmcia-cs" RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils" LICENSE = "GPL" -PR = "r6" +PR = "r7" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ |