diff options
| -rw-r--r-- | meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf (renamed from meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf) | 0 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez/bluez4_4.96.bb (renamed from meta/recipes-connectivity/bluez/bluez4_4.82.bb) | 6 |
5 files changed, 2 insertions, 73 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch deleted file mode 100644 index 27dead092..000000000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch +++ /dev/null @@ -1,20 +0,0 @@ -# bluez4: add compile patch fixing some usb declaration mismatch -# Author: Michael 'Mickey' Lauer <mickey@vanille-media.de> -# Date: Thu Jan 29 16:52:21 2009 +0000 -# -# Acquired from OpenEmbedded -Upstream-Status: Pending - -Index: bluez-4.27/tools/dfutool.c -=================================================================== ---- bluez-4.27.orig/tools/dfutool.c -+++ bluez-4.27/tools/dfutool.c -@@ -59,7 +59,7 @@ - #endif - - #ifdef NEED_USB_GET_BUSSES --static inline struct usb_bus *usb_get_busses(void) -+inline struct usb_bus *usb_get_busses(void) - { - return usb_busses; - } diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch deleted file mode 100644 index e8a58e5cc..000000000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch +++ /dev/null @@ -1,35 +0,0 @@ -# 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. - -Upstream-Status: Inappropriate [not used] - -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/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch deleted file mode 100644 index 881cb9cd8..000000000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Acquired from OpenEmbedded -Upstream-Status: Inappropriate [embedded specific] - ---- 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__( \ diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf index ca5e9e4f2..ca5e9e4f2 100644 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf +++ b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf diff --git a/meta/recipes-connectivity/bluez/bluez4_4.82.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb index 9895006f5..ebd284948 100644 --- a/meta/recipes-connectivity/bluez/bluez4_4.82.bb +++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb @@ -19,13 +19,11 @@ PR = "r0" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ - file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \ - file://sbc-thumb.patch;patch=1 \ file://bluetooth.conf \ " -SRC_URI[md5sum] = "b9e5de607e5e43c868c35c68fe6f189f" -SRC_URI[sha256sum] = "75dc506f5346e1eb803f44294ae02406e806e309d9c9bda1de7ed235ff794b6d" +SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518" +SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99" S = "${WORKDIR}/bluez-${PV}" inherit autotools |