diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-01-28 15:50:59 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-01-28 15:50:59 +0000 |
commit | abef72d698a0ed48580cbedef5d8e1be058f906f (patch) | |
tree | 97048de9d252ab1ab1d1b0d87a8784eedfebb33d /strata | |
parent | 1ace53a50fb168df9fda38be359da8aa66f41aed (diff) | |
parent | bed286c2ac7e45cc5bd6594225b615fc42eb2810 (diff) | |
download | definitions-abef72d698a0ed48580cbedef5d8e1be058f906f.tar.gz |
Merge branch 'baserock/pedroalvarez/fix-jsonc-pulseaudio
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: Mike Smith <mike.smith@codethink.co.uk>
Reviewed-by: Daniel Firth <dan.firth@codethink.co.uk>
Reviewed-by: Javier Jardon <jjardon@gnome.org>
Diffstat (limited to 'strata')
-rw-r--r-- | strata/audio-bluetooth.morph | 8 | ||||
-rw-r--r-- | strata/audio-bluetooth/pulseaudio.morph | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 0c67ee5c..e4dc0e68 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 @@ -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" |