mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-07 14:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

bluez4: Added new recipe 4.96 and removed 4.82 version

Browse Source 
* 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>
This commit is contained in:
Noor Ahsan
2011-08-12 13:04:11 +05:00
committed by Richard Purdie
parent e7981ad10d
commit c7dbcf85c9
5 changed files with 2 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
View File

@@ -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;
}

35
meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
View File

@@ -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) {

14
meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
View File

@@ -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__( \

0
meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf → meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
View File

6
meta/recipes-connectivity/bluez/bluez4_4.82.bb → meta/recipes-connectivity/bluez/bluez4_4.96.bb
View File

@@ -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