diff options
author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-29 18:04:27 +0100 |
---|---|---|
committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-29 18:04:27 +0100 |
commit | bf035c64c444738709c1655c1d5bc6de8f876d6c (patch) | |
tree | 7118d61567699df5f714c40561d604d96b24a651 /packages | |
parent | 2a4c3b782ed6a35787879c8c41ca69e7940dc31b (diff) | |
parent | e8fc49f319a93a458405075aceba12eb5b9ca3f1 (diff) | |
download | openembedded-bf035c64c444738709c1655c1d5bc6de8f876d6c.tar.gz |
Merge branch 'fso/milestone5' of git@git.openembedded.net:openembedded into fso/milestone5
Diffstat (limited to 'packages')
-rw-r--r-- | packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch | 13 | ||||
-rw-r--r-- | packages/bluez/bluez4_4.27.bb | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch b/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch new file mode 100644 index 0000000000..b1ee510e8b --- /dev/null +++ b/packages/bluez/bluez4/fix-dfutool-usb-declaration-mismatch.patch @@ -0,0 +1,13 @@ +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/packages/bluez/bluez4_4.27.bb b/packages/bluez/bluez4_4.27.bb index c0d5c19c2e..89bd3b62b0 100644 --- a/packages/bluez/bluez4_4.27.bb +++ b/packages/bluez/bluez4_4.27.bb @@ -4,10 +4,11 @@ PRIORITY = "optional" DEPENDS = "gst-plugins-base alsa-lib libusb1 dbus-glib" HOMEPAGE = "http://www.bluez.org" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "\ http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ + file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \ file://sbc-thumb.patch;patch=1 \ file://hid2hci_usb_init.patch;patch=1 \ " |