diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-21 13:33:30 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-21 13:36:43 +0100 |
| commit | 104ab0d94d92dfcc96d55032aef31e3fbcf98d7d (patch) | |
| tree | a7ca2021665cefec38c275752a9991417179d7fe /packages/bluez/bluez4 | |
| parent | 50dbefb8915f7694c00f257d87f679cc55da7ce5 (diff) | |
bluez4: packaging tweaks; remove bluez4-utils in favour of that
Diffstat (limited to 'packages/bluez/bluez4')
| -rw-r--r-- | packages/bluez/bluez4/hid2hci_usb_init.patch | 33 | ||||
| -rw-r--r-- | packages/bluez/bluez4/sbc-thumb.patch | 11 |
2 files changed, 44 insertions, 0 deletions
diff --git a/packages/bluez/bluez4/hid2hci_usb_init.patch b/packages/bluez/bluez4/hid2hci_usb_init.patch new file mode 100644 index 0000000000..ed15fd5a1b --- /dev/null +++ b/packages/bluez/bluez4/hid2hci_usb_init.patch @@ -0,0 +1,33 @@ +# Signed-off-by: Khem Raj <raj.khem@gmail.com> +# +# Use the new usb1 API for usb_init() and check for fails from +# usb_init (). Currently we see a crash on a system which does +# not have USB because usb_init() fails and it cleans up all initialized +# data (e.g. ctx) which is used in subsequent calls to libusb +# We return immediately if usb_init() fails for some reason. + +Index: bluez-4.24/tools/hid2hci.c +=================================================================== +--- bluez-4.24.orig/tools/hid2hci.c 2008-10-25 23:40:34.000000000 -0700 ++++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.000000000 -0800 +@@ -337,7 +337,7 @@ + int main(int argc, char *argv[]) + { + struct device_info dev[16]; +- int i, opt, num, quiet = 0, mode = HCI; ++ int i, ret, opt, num, quiet = 0, mode = HCI; + + while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) { + switch (opt) { +@@ -361,8 +361,9 @@ + argc -= optind; + argv += optind; + optind = 0; +- +- usb_init(); ++ ret = libusb_init(); ++ if (ret < 0) ++ return ret; + + num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0])); + if (num <= 0) { diff --git a/packages/bluez/bluez4/sbc-thumb.patch b/packages/bluez/bluez4/sbc-thumb.patch new file mode 100644 index 0000000000..3505426053 --- /dev/null +++ b/packages/bluez/bluez4/sbc-thumb.patch @@ -0,0 +1,11 @@ +--- bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.000000000 +0000 ++++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.000000000 +0000 +@@ -59,7 +59,7 @@ + + #define SBC_FIXED_0(val) { val = 0; } + #define MUL(a, b) ((a) * (b)) +-#ifdef __arm__ ++#if defined(__arm__) && !defined(__thumb__) + #define MULA(a, b, res) ({ \ + int tmp = res; \ + __asm__( \ |