summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2017-01-19 23:15:09 (GMT)
committerJavier Jardón <jjardon@gnome.org>2017-02-09 10:46:27 (GMT)
commit1d609103b503cffb338b9e02625c878edde96065 (patch)
tree07cb586c9fe12e33a03dcb6423947dc80af6b8f1
parentd9ee7ccc266e684e737d8a54bd42f3d63694de99 (diff)
downloaddefinitions-staging/jjardon/pulseaudio_v10.tar.gz
strata/sound-server-pulseaudio: Upgrade pulseaudio to v10.0staging/jjardon/pulseaudio_v10
-rw-r--r--genivi/strata/genivi.morph6
-rw-r--r--genivi/strata/genivi/json-c.morph (renamed from strata/sound-server-pulseaudio/json-c.morph)0
-rw-r--r--strata/sound-server-pulseaudio.morph10
3 files changed, 8 insertions, 8 deletions
diff --git a/genivi/strata/genivi.morph b/genivi/strata/genivi.morph
index 9b3a617..2fc5b53 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/strata/sound-server-pulseaudio/json-c.morph b/genivi/strata/genivi/json-c.morph
index c3d9243..c3d9243 100644
--- a/strata/sound-server-pulseaudio/json-c.morph
+++ b/genivi/strata/genivi/json-c.morph
diff --git a/strata/sound-server-pulseaudio.morph b/strata/sound-server-pulseaudio.morph
index bf081d0..22c1c35 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