From 91c90aad055a4dfb5997a35a81048ffc321f71ff Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 27 Jan 2015 18:56:43 +0000
Subject: Update json-c to latest version to work with gcc 4.9

---
 strata/audio-bluetooth.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 0c67ee5c..282c5ed8 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -77,8 +77,8 @@ chunks:
 - name: json-c
   morph: strata/audio-bluetooth/json-c.morph
   repo: upstream:json-c
-  ref: 60a5f3dedc879db3e5dacdd3b7e3e543c2e1bae7
-  unpetrify-ref: baserock/morph
+  ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581
+  unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch
   build-depends: []
 - name: libsndfile
   morph: strata/audio-bluetooth/libsndfile.morph
-- 
cgit v1.2.1


From bed286c2ac7e45cc5bd6594225b615fc42eb2810 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 27 Jan 2015 18:57:31 +0000
Subject: Upgrade pulseaudio to 5.99.3 to support changes to json-c

---
 strata/audio-bluetooth.morph            | 4 ++--
 strata/audio-bluetooth/pulseaudio.morph | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 282c5ed8..e4dc0e68 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -89,8 +89,8 @@ chunks:
 - name: pulseaudio
   morph: strata/audio-bluetooth/pulseaudio.morph
   repo: upstream:pulseaudio
-  ref: e1b44688c0db505f70761fe76b4fed2ca6924a09
-  unpetrify-ref: baserock/morph
+  ref: 34862dbd43079d19faff31fa9ba996acc874d586
+  unpetrify-ref: v5.99.3
   build-depends:
   - libsndfile
   - libatomic_ops
diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph
index 117f3396..fa183fcb 100644
--- a/strata/audio-bluetooth/pulseaudio.morph
+++ b/strata/audio-bluetooth/pulseaudio.morph
@@ -4,10 +4,8 @@ description: PulseAudio System
 build-system: autotools
 configure-commands:
 - ./autogen.sh
-- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple
+- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple --with-systemduserunitdir=/lib/systemd/system
 install-commands:
 - make DESTDIR="$DESTDIR" install
-- mkdir -p "$DESTDIR/lib/systemd/system"
-- install -m755 pulseaudio.service "$DESTDIR/lib/systemd/system"
 - mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants"
 - ln -s /lib/systemd/system/pulseaudio.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/pulseaudio.service"
-- 
cgit v1.2.1