From: Cristian Iorga <cristian.iorga@intel.com>
Date: Wed, 11 Dec 2013 17:24:01 +0000 (+0200)
Subject: bluez5: upgrade to 5.12
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~35122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c968a803a45620efbd0dc7979a7c1b6d28473a6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bluez5: upgrade to 5.12

- Configure options no longer available were removed.
- The content of patch directory was generic, so the name
of directory is now generic.
- Switched to xz format for tarball
(40% decrease in download size).

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 2e25d86e552..e08dff4ca5c 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -11,11 +11,10 @@ DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
 RCONFLICTS_${PN} = "bluez4"
 
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles"
-PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
 PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
 
 SRC_URI = "\
-    ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
+    ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
     file://bluetooth.conf \
 "
 S = "${WORKDIR}/bluez-${PV}"
@@ -23,15 +22,7 @@ S = "${WORKDIR}/bluez-${PV}"
 inherit autotools pkgconfig systemd
 
 EXTRA_OECONF = "\
-  --disable-gstreamer \
-  --enable-usb \
   --enable-tools \
-  --enable-bccmd \
-  --enable-hid2hci \
-  --enable-dfutool \
-  --disable-hidd \
-  --disable-pand \
-  --disable-dund \
   --disable-cups \
   --enable-test \
   --enable-datafiles \
diff --git a/meta/recipes-connectivity/bluez5/bluez5-5.10/bluetooth.conf b/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf
similarity index 100%
rename from meta/recipes-connectivity/bluez5/bluez5-5.10/bluetooth.conf
rename to meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.10.bb b/meta/recipes-connectivity/bluez5/bluez5_5.10.bb
deleted file mode 100644
index 57dd4ff1419..00000000000
--- a/meta/recipes-connectivity/bluez5/bluez5_5.10.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require bluez5.inc
-
-SRC_URI[md5sum] = "9bcc1d81e392e5be27fb11b1aad71abe"
-SRC_URI[sha256sum] = "39360c4c58158cb1d5dcc56d34a0a676d8868ef8c82b3083fc7396be5e8c3963"
-
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.12.bb b/meta/recipes-connectivity/bluez5/bluez5_5.12.bb
new file mode 100644
index 00000000000..126ab112080
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.12.bb
@@ -0,0 +1,5 @@
+require bluez5.inc
+
+SRC_URI[md5sum] = "5d37e581107b3d6f91b81194a5006407"
+SRC_URI[sha256sum] = "75ef574f15f356d03bd54f1a8ba26abe63bf3d1326a9fa12d63a762ddf40617e"
+