summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez
diff options
context:
space:
mode:
authorNoor Ahsan <noor_ahsan@mentor.com>2011-08-12 08:04:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-15 14:26:16 (GMT)
commitc7dbcf85c9e22e6fc65a9232bf8ba1b7facbec84 (patch)
treea9b33623a82d1c602ccbf6bd181dec94f1c9f0c2 /meta/recipes-connectivity/bluez
parente7981ad10d3990d72b739a6b38f655ce7604eaa1 (diff)
downloadpoky-c7dbcf85c9e22e6fc65a9232bf8ba1b7facbec84.tar.gz
bluez4: Added new recipe 4.96 and removed 4.82 version
* Added new recipe 4.96 and removed 4.82 version and its files. (From OE-Core rev: 000d5244e21837338614ef4450f54c8744fffcd6) Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez')
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch20
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch35
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch14
-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 27dead0..0000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1# bluez4: add compile patch fixing some usb declaration mismatch
2# Author: Michael 'Mickey' Lauer <mickey@vanille-media.de>
3# Date: Thu Jan 29 16:52:21 2009 +0000
4#
5# Acquired from OpenEmbedded
6Upstream-Status: Pending
7
8Index: bluez-4.27/tools/dfutool.c
9===================================================================
10--- bluez-4.27.orig/tools/dfutool.c
11+++ bluez-4.27/tools/dfutool.c
12@@ -59,7 +59,7 @@
13 #endif
14
15 #ifdef NEED_USB_GET_BUSSES
16-static inline struct usb_bus *usb_get_busses(void)
17+inline struct usb_bus *usb_get_busses(void)
18 {
19 return usb_busses;
20 }
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 e8a58e5..0000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1# Signed-off-by: Khem Raj <raj.khem@gmail.com>
2#
3# Use the new usb1 API for usb_init() and check for fails from
4# usb_init (). Currently we see a crash on a system which does
5# not have USB because usb_init() fails and it cleans up all initialized
6# data (e.g. ctx) which is used in subsequent calls to libusb
7# We return immediately if usb_init() fails for some reason.
8
9Upstream-Status: Inappropriate [not used]
10
11Index: bluez-4.24/tools/hid2hci.c
12===================================================================
13--- bluez-4.24.orig/tools/hid2hci.c 2008-10-25 23:40:34.000000000 -0700
14+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.000000000 -0800
15@@ -337,7 +337,7 @@
16 int main(int argc, char *argv[])
17 {
18 struct device_info dev[16];
19- int i, opt, num, quiet = 0, mode = HCI;
20+ int i, ret, opt, num, quiet = 0, mode = HCI;
21
22 while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
23 switch (opt) {
24@@ -361,8 +361,9 @@
25 argc -= optind;
26 argv += optind;
27 optind = 0;
28-
29- usb_init();
30+ ret = libusb_init();
31+ if (ret < 0)
32+ return ret;
33
34 num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
35 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 881cb9c..0000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1# Acquired from OpenEmbedded
2Upstream-Status: Inappropriate [embedded specific]
3
4--- bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.000000000 +0000
5+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.000000000 +0000
6@@ -59,7 +59,7 @@
7
8 #define SBC_FIXED_0(val) { val = 0; }
9 #define MUL(a, b) ((a) * (b))
10-#ifdef __arm__
11+#if defined(__arm__) && !defined(__thumb__)
12 #define MULA(a, b, res) ({ \
13 int tmp = res; \
14 __asm__( \
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
index ca5e9e4..ca5e9e4 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 9895006..ebd2849 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"
19 19
20SRC_URI = "\ 20SRC_URI = "\
21 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ 21 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
22 file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
23 file://sbc-thumb.patch;patch=1 \
24 file://bluetooth.conf \ 22 file://bluetooth.conf \
25" 23"
26 24
27SRC_URI[md5sum] = "b9e5de607e5e43c868c35c68fe6f189f" 25SRC_URI[md5sum] = "296111afac49e3f9035085ac14daf518"
28SRC_URI[sha256sum] = "75dc506f5346e1eb803f44294ae02406e806e309d9c9bda1de7ed235ff794b6d" 26SRC_URI[sha256sum] = "c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99"
29S = "${WORKDIR}/bluez-${PV}" 27S = "${WORKDIR}/bluez-${PV}"
30 28
31inherit autotools 29inherit autotools