From ecbbfe8aad1c8e70dc0ed2d03c3841a6759e37b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Jan 2017 23:15:09 +0000
Subject: strata/sound-server-pulseaudio: Upgrade pulseaudio to v10.0

---
 genivi/strata/genivi.morph                  |  6 ++++++
 genivi/strata/genivi/json-c.morph           |  7 +++++++
 strata/sound-server-pulseaudio.morph        | 10 ++--------
 strata/sound-server-pulseaudio/json-c.morph |  7 -------
 4 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 genivi/strata/genivi/json-c.morph
 delete mode 100644 strata/sound-server-pulseaudio/json-c.morph

diff --git a/genivi/strata/genivi.morph b/genivi/strata/genivi.morph
index 9b3a6171..2fc5b539 100644
--- a/genivi/strata/genivi.morph
+++ b/genivi/strata/genivi.morph
@@ -88,6 +88,11 @@ chunks:
   build-depends:
   - DLT-daemon
   - persistence-client-library
+- name: json-c
+  morph: genivi/strata/genivi/json-c.morph
+  repo: upstream:json-c
+  ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581
+  unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch
 - name: persistence-administrator
   morph: genivi/strata/genivi/persistence-administrator.morph
   repo: upstream:genivi/persistence-administrator
@@ -96,6 +101,7 @@ chunks:
   build-depends:
   - persistence-common-object
   - DLT-daemon
+  - json-c
   - node-state-manager
 - name: node-health-monitor
   repo: upstream:genivi/node-health-monitor
diff --git a/genivi/strata/genivi/json-c.morph b/genivi/strata/genivi/json-c.morph
new file mode 100644
index 00000000..c3d9243c
--- /dev/null
+++ b/genivi/strata/genivi/json-c.morph
@@ -0,0 +1,7 @@
+name: json-c
+kind: chunk
+description: JSON C Library
+build-system: autotools
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- install -m755 json_object_iterator.h "$DESTDIR/usr/include/json"
diff --git a/strata/sound-server-pulseaudio.morph b/strata/sound-server-pulseaudio.morph
index bf081d0b..22c1c350 100644
--- a/strata/sound-server-pulseaudio.morph
+++ b/strata/sound-server-pulseaudio.morph
@@ -30,11 +30,6 @@ chunks:
   ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa
   unpetrify-ref: baserock/morph
   build-system: autotools
-- name: json-c
-  morph: strata/sound-server-pulseaudio/json-c.morph
-  repo: upstream:json-c
-  ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581
-  unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch
 - name: libsndfile
   morph: strata/sound-server-pulseaudio/libsndfile.morph
   repo: upstream:libsndfile
@@ -67,14 +62,13 @@ chunks:
 - name: pulseaudio
   morph: strata/sound-server-pulseaudio/pulseaudio.morph
   repo: upstream:pulseaudio
-  ref: 8887f256e0f1167e579a217387a4efc5397edf93
-  unpetrify-ref: v9.0
+  ref: 84952e6a092b6a0c5b153bd7a4f6e490810681c8
+  unpetrify-ref: v10.0
   build-depends:
   - avahi
   - libsndfile
   - libatomic_ops
   - speex
-  - json-c
   - alsa-lib
   - sbc
   - webrtc-audio-processing
diff --git a/strata/sound-server-pulseaudio/json-c.morph b/strata/sound-server-pulseaudio/json-c.morph
deleted file mode 100644
index c3d9243c..00000000
--- a/strata/sound-server-pulseaudio/json-c.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: json-c
-kind: chunk
-description: JSON C Library
-build-system: autotools
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- install -m755 json_object_iterator.h "$DESTDIR/usr/include/json"
-- 
cgit v1.2.1