From f913c9cceb1e4e4377e45c0514cd1d472bd60995 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Wed, 9 Mar 2016 18:37:51 +0000
Subject: Upgrade bluez to 5.37 including GENIVI service plugin

Service API patches come from:
- https://github.com/Vudentz/BlueZ/tree/service_api

Also remove not used configure options, this warning was showing up in
the build log:

    configure: WARNING: unrecognized options: --enable-alsa, --with-telephony

The dependency on alsa-lib is also not needed.

Change-Id: Ia53daaad69d9b20450d8881cbe3ca3fc6c5663bb
---
 strata/audio-bluetooth.morph       |  5 ++---
 strata/audio-bluetooth/bluez.morph | 10 ++++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 6bd8ce66..5c1ae7a7 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -34,11 +34,10 @@ chunks:
 - name: bluez
   morph: strata/audio-bluetooth/bluez.morph
   repo: upstream:bluez
-  ref: a18201b5321e8b41d2ee7c7bc7285d976fc433e6
-  unpetrify-ref: baserock/v5.17-patched
+  ref: 5eb47745978925e451523c8e8cb2ad6a53ed3863
+  unpetrify-ref: baserock/5.37+service-api
   build-depends:
   - libical
-  - alsa-lib
 - name: dbus-glib
   repo: upstream:dbus-glib
   ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c
diff --git a/strata/audio-bluetooth/bluez.morph b/strata/audio-bluetooth/bluez.morph
index f27fcf1c..e7208da7 100644
--- a/strata/audio-bluetooth/bluez.morph
+++ b/strata/audio-bluetooth/bluez.morph
@@ -4,8 +4,14 @@ description: Bluetooth protocol stack for Linux
 build-system: autotools
 configure-commands:
 - autoreconf -ivf
-- ./configure --prefix="$PREFIX" --enable-tools --enable-test --enable-alsa --enable-library
-  --with-telephony=ofono --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
+- ./configure --prefix="$PREFIX"
+              --enable-tools
+              --enable-service
+              --enable-test
+              --enable-library
+              --sysconfdir=/etc
+              --localstatedir=/var
+              --libexecdir=/lib
 install-commands:
 - make DESTDIR="$DESTDIR" install
 - mkdir -p "$DESTDIR/etc/systemd/system/bluetooth.target.wants"
-- 
cgit v1.2.1