Merge ~ogra/snappy-hwe-snaps/+git/pulseaudio:master into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master

Proposed by Oliver Grawert on 2017-11-03
Status: Merged
Approved by: Simon Fels on 2017-11-07
Approved revision: d5022d2f9d646f50242a844bd99d78627b2ebfb3
Merged at revision: 2f055c68e835de107fe653d42e3b0533e48df946
Proposed branch: ~ogra/snappy-hwe-snaps/+git/pulseaudio:master
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master
Diff against target: 40 lines (+1/-3)
2 files modified
bin/pulseaudio (+0/-1)
snapcraft.yaml (+1/-2)
Reviewer Review Type Date Requested Status
Simon Fels Approve on 2017-11-07
System Enablement Bot continuous-integration Approve on 2017-11-06
Jim Hodapp 2017-11-03 Approve on 2017-11-03
Review via email: mp+333211@code.launchpad.net

Commit message

Enable BlueZ 5 support.

Enable compiling modules for Bluetooth support. This change also removes
the disallow-module-loading flag because pulseaudio needs to load
module-bluez5-device after a device connects.

Description of the change

Enable compiling modules for Bluetooth support. This change also removes
the disallow-module-loading flag because pulseaudio needs to load
module-bluez5-device after a device connects.

To post a comment you must log in.
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve

PASSED: Successfully build documentation, rev: d5022d2f9d646f50242a844bd99d78627b2ebfb3

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/896/

PASSED: Successfully build documentation, rev: d5022d2f9d646f50242a844bd99d78627b2ebfb3

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/899/

Simon Fels (morphis) wrote :

LGTM, did you give this a manual test run on a device as our CI testing is not working atm?

Oliver Grawert (ogra) wrote :

loks like it finished fine in CI, but yes, i did do a test build

Simon Fels (morphis) wrote :

Yeah the build in CI finished but I've disabled test execution.

On Mon, Nov 6, 2017 at 10:16 AM, Oliver Grawert <email address hidden> wrote:

> loks like it finished fine in CI, but yes, i did do a test build
> --
> https://code.launchpad.net/~ogra/snappy-hwe-snaps/+git/
> pulseaudio/+merge/333211
> Your team Snappy HWE Team is subscribed to branch
> ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master.
>
> Launchpad-Message-Rationale: Subscriber @snappy-hwe-team
> Launchpad-Message-For: snappy-hwe-team
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:master
> Launchpad-Project: snappy-hwe-snaps
>

Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/pulseaudio b/bin/pulseaudio
2index fa1c474..8b9a797 100755
3--- a/bin/pulseaudio
4+++ b/bin/pulseaudio
5@@ -22,7 +22,6 @@ fi
6 exec $SNAP/usr/bin/pulseaudio \
7 --exit-idle-time=-1 \
8 --disallow-exit=yes \
9- --disallow-module-loading \
10 --system \
11 -F $SNAP/etc/pulse/default.pa \
12 -p $SNAP/usr/lib/pulse-8.0/modules \
13diff --git a/snapcraft.yaml b/snapcraft.yaml
14index 736791d..b4bf686 100644
15--- a/snapcraft.yaml
16+++ b/snapcraft.yaml
17@@ -109,6 +109,7 @@ parts:
18 - libudev-dev
19 - libasyncns-dev
20 - libxcb1-dev
21+ - libsbc-dev
22
23 configflags:
24 - --prefix=/usr
25@@ -121,7 +122,6 @@ parts:
26 - --disable-orc
27 - --disable-gconf
28 - --disable-bluez4
29- - --disable-bluez5
30 - --disable-esound
31 - --disable-adrian-aec
32 - --disable-gtk3
33@@ -129,7 +129,6 @@ parts:
34 - --disable-systemd-login
35 - --without-caps
36 - --disable-webrtc-aec
37- - --disable-dbus
38 - --disable-oss-output
39 - --disable-oss-wrapper
40 - --disable-jack

Subscribers

People subscribed via source and target branches