diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2010-06-26 16:04:00 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-30 13:18:01 +0100 |
commit | a5af9cfb4c9da5590335d4e1df88c61aaf7dcb12 (patch) | |
tree | 787905d4f73c8650c0e9502bac0c3136cc828516 /meta/packages/bluez/bluez4 | |
parent | 342c016356e4a05b7a22be1723257ca29e17678e (diff) | |
download | openembedded-core-a5af9cfb4c9da5590335d4e1df88c61aaf7dcb12.tar.gz openembedded-core-a5af9cfb4c9da5590335d4e1df88c61aaf7dcb12.tar.bz2 openembedded-core-a5af9cfb4c9da5590335d4e1df88c61aaf7dcb12.tar.xz openembedded-core-a5af9cfb4c9da5590335d4e1df88c61aaf7dcb12.zip |
bluez4: Upgraded to version 4.66
Change the local file directory name to ${PN}-${PV}
Comment for local patches
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/packages/bluez/bluez4')
-rw-r--r-- | meta/packages/bluez/bluez4/bluetooth.conf | 16 | ||||
-rw-r--r-- | meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch | 13 | ||||
-rw-r--r-- | meta/packages/bluez/bluez4/hid2hci_usb_init.patch | 33 | ||||
-rw-r--r-- | meta/packages/bluez/bluez4/sbc-thumb.patch | 11 |
4 files changed, 0 insertions, 73 deletions
diff --git a/meta/packages/bluez/bluez4/bluetooth.conf b/meta/packages/bluez/bluez4/bluetooth.conf deleted file mode 100644 index ca5e9e4f2..000000000 --- a/meta/packages/bluez/bluez4/bluetooth.conf +++ /dev/null @@ -1,16 +0,0 @@ -<!-- This configuration file specifies the required security policies - for Bluetooth core daemon to work. --> - -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- ../system.conf have denied everything, so we just punch some holes --> - - <policy context="default"> - <allow own="org.bluez"/> - <allow send_destination="org.bluez"/> - <allow send_interface="org.bluez.Agent"/> - </policy> - -</busconfig> diff --git a/meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch b/meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch deleted file mode 100644 index b1ee510e8..000000000 --- a/meta/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/packages/bluez/bluez4/hid2hci_usb_init.patch b/meta/packages/bluez/bluez4/hid2hci_usb_init.patch deleted file mode 100644 index ed15fd5a1..000000000 --- a/meta/packages/bluez/bluez4/hid2hci_usb_init.patch +++ /dev/null @@ -1,33 +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. - -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/packages/bluez/bluez4/sbc-thumb.patch b/meta/packages/bluez/bluez4/sbc-thumb.patch deleted file mode 100644 index 350542605..000000000 --- a/meta/packages/bluez/bluez4/sbc-thumb.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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__( \ |