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

[Robert Liu]

When using the original pulseaudio snap on Intel NUC, pulseaudio only listed the analog output but not HDMI audio port. After some debugging, I found libasound2 has several hard-coded path variables. These modifications are used to change the paths in libasound2-data.

1. Import alsa-lib_1.1.0-0ubuntu1 source code to a new branch, https://git.launchpad.net/~robertliu/snappy-hwe-snaps/+git/pulseaudio
2. Modify alsa-lib to use the SNAP environment variable when getting the data directory
3. Add a new parts in snapcraft.yaml for alsa-lib
4. Only pack necessary files in the snap

Also export more variables in bin/pulseaudio.

[Simon Fels (morphis)]

This needs rebase or merge now that https://code.launchpad.net/~jhodapp/snappy-hwe-snaps/+git/fix-pulseaudio-slots-plugs/+merge/309604 is merged. Leaving detailed review up to Jim.

[Jim Hodapp (jhodapp)]

Thanks for the changes. Please see my comments inline below.

review: Needs Fixing (code)

[Robert Liu (robertliu)]

Jim, thank you for the comments.
I'll create a downstream branch then update the commits.

[Jim Hodapp (jhodapp)]

Not a problem, sounds good.

[Simon Fels (morphis)]

One comment inline but otherwise looks really good already. Thanks for this and sorry that this takes so long.

review: Needs Fixing

[Simon Fels (morphis)]

LGTM, but wondering why the CI doesn't pick this up. Need CI approval before we can merge this one. Will have a quick look.

review: Approve

[Simon Fels (morphis)]

I remember why. We don't allow CI for users not part of the snappy-hwe-team. Triggered a manual run of the CI now at https://jenkins.canonical.com/system-enablement/job/generic-build-snap/380/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:e697cdd85a8e8d12e590fa10dcef9d6d3177a776
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/380/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/130/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/288/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/380/rebuild

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

diff --git a/bin/pulseaudio b/bin/pulseaudio
index ff69475..d9fb85f 100755
--- a/bin/pulseaudio
+++ b/bin/pulseaudio
@@ -5,14 +5,17 @@ set -x
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
 export PULSE_STATE_PATH=$SNAP_DATA/state
 export ALSA_CONFIG_UCM=$SNAP/usr/share/alsa/ucm
+export ALSA_CONFIG_TPLG=$SNAP/usr/share/alsa/topology
 export ALSA_CONFIG_PATH=$SNAP/usr/share/alsa/alsa.conf
+export ALSA_MIXER_SIMPLE=$SNAP/usr/share/alsa/smixer.conf
 
 mkdir -p $PULSE_STATE_PATH
 
 EXTRA_ARGS=
 
 if [ -e $SNAP_DATA/config/debug ] ; then
-    EXTRA_ARGS="$EXTRA_ARGS -vvv"
+    EXTRA_ARGS="$EXTRA_ARGS -vvvv"
+	export LIBASOUND_DEBUG=1
 fi
 
 $SNAP/usr/bin/pulseaudio \
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 1abb760..abb0b5f 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -47,7 +47,38 @@ parts:
       bin/config: bin/config
       data/copyright: usr/share/doc/pulseaudio/copyright
 
+  alsa-lib:
+    plugin: autotools
+
+    source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
+    source-type: git
+    source-branch: alsa-lib/xenial/1.1.0
+
+    configflags:
+      - --prefix=/usr
+      - --sysconfdir=/etc
+      - --libexec=/usr/lib
+      - --libdir=/usr/lib
+      - --localstatedir=/var
+      - --with-plugindir=/usr/lib/alsa-lib
+      - --disable-silent-rules
+      - --disable-static
+      - --disable-python
+
+    filesets:
+      libasound2:
+        - usr/lib/libasound.so*
+        - usr/lib/alsa-lib/*
+        - usr/share/alsa/*
+
+    snap:
+      - $libasound2
+
+
   pulseaudio:
+    after:
+      - alsa-lib
+
     plugin: autotools
 
     source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
@@ -72,12 +103,6 @@ parts:
       - libasyncns-dev
       - libxcb1-dev
 
-    stage-packages:
-      # Needed for various ALSA related configuration files the alsa
-      # module inside PulseAudio requires to use any available audio
-      # device properly
-      - libasound2-data
-
     configflags:
       - --prefix=/usr
       - --sysconfdir=/etc
@@ -104,3 +129,22 @@ parts:
       - --disable-x11
       - --with-system-user=root
       - --with-system-group=root
+
+    filesets:
+      pauseaudiofiles:
+        - etc/*
+        - lib/*
+        - usr/bin/pacat
+        - usr/bin/pactl
+        - usr/bin/paplay
+        - usr/bin/parec
+        - usr/bin/pulseaudio
+        - usr/lib/libpulse-mainloop-glib.so*
+        - usr/lib/libpulse-simple.so*
+        - usr/lib/libpulse.so*
+        - usr/lib/pulse-8.0/*
+        - usr/lib/pulseaudio/*.so
+        - usr/share/pulseaudio/*
+
+    snap:
+      - $pauseaudiofiles