bluez-utils-dbus: work around some alignment issues in hcid

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 (file)
index 0000000..276281c
--- /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 e54ff67..3248b65 100644 (file)
--- 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 b5a5e14..10f70d3 100644 (file)
--- 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 \