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 debug, I found libasound2 has several hard-coded path variables. These modifications are used to change the paths in libasound2-data.

1. Copy usr/share/alsa from stage of pulseaudio
2. Add the $SNAP environment variable before 'datadir' in alsa/alsa.conf
3. "confdir" which is used by alsa/cards/*.conf
4. Use stage of libasound2-data-patch instead of pulseaudio's

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.

4ff410e... by Robert Liu on 2016-11-03

* rebase to jhodapp

[Jim Hodapp (jhodapp)]

Not a problem, sounds good.

3b203f5... by Robert Liu on 2016-11-21

Using local libasound2 and libasound2-data

Unmerged commits

3b203f5... by Robert Liu on 2016-11-21

Using local libasound2 and libasound2-data

4ff410e... by Robert Liu on 2016-11-03

* rebase to jhodapp

50f0ad8... by Robert Liu on 2016-10-28

* modify script name in Makefile

baf496b... by Robert Liu on 2016-10-28

* move libasound2-data patch related files to a sub directory

5300c7b... by Robert Liu on 2016-10-27

* add more ALSA config environments and rewrite the pathes in libasound2-data

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/libasound2-data-patch/Makefile b/libasound2-data-patch/Makefile
 new file mode 100644
index 0000000..419b2e5
--- /dev/null
+++ b/libasound2-data-patch/Makefile
@@ -0,0 +1,13 @@
+all:
+	@echo "copy files needed ..."
+	@cp -a ../../pulseaudio/install/usr/share/alsa alsa
+	@echo "apply patches ..."
+	@./patch-libasound2-data.sh
+
+install:
+	@mkdir -p $(DESTDIR)/usr/share/
+	@cp -a alsa $(DESTDIR)/usr/share/
+
+clean:
+	@echo "remove files"
+	@rm -rf alsa
diff --git a/libasound2-data-patch/patch-libasound2-data.sh b/libasound2-data-patch/patch-libasound2-data.sh
 new file mode 100755
index 0000000..9831d2b
--- /dev/null
+++ b/libasound2-data-patch/patch-libasound2-data.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+## debug path
+echo PWD=`pwd`
+
+# replace "confdir:" in usr/share/alsa/cards/*
+## confdir is hardcoded in libasound, there are only two ways to change this:
+##  1. change to /snap/pulseaudio/current/usr/share/alsa/
+##  2. modify libasound source and build it
+## Use the easy way (1) to achive this
+## TODO: use fixed version 'current' is not a good idea
+find alsa/cards/ -type f | xargs perl -i -pe 's/<confdir:/<\/snap\/pulseaudio\/current\/usr\/share\/alsa\//g'
+
+# add path of snap to config
+## insert $SNAP path (/snap/pulseaudio/VER/) before alsa datadir path (/usr/share/alsa)
+sed -i 's/{ @func datadir }/{\n\t\t\t\t\t\t@func getenv\n\t\t\t\t\t\tvars [ SNAP ]\n\t\t\t\t\t\tdefault 0\n\t\t\t\t\t}\n\t\t\t\t\t{ @func datadir }/g' alsa/alsa.conf
+
diff --git a/snapcraft.yaml b/snapcraft.yaml
index a7dd7e5..6482f32 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: pulseaudio
-version: 8.0-1
+version: 8.0-2
 summary: PulseAudio sound server
 description: |
   PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
@@ -27,6 +27,12 @@ apps:
     plugs: [client]
   config:
     command: bin/config
+slots:
+    service:
+        interface: pulseaudio
+plugs:
+    client:
+        interface: pulseaudio
 
 slots:
   service:
@@ -47,7 +53,38 @@ parts:
       bin/config: bin/config
       data/copyright: usr/share/doc/pulseaudio/copyright
 
+  alsa-lib:
+    plugin: autotools
+
+    source: https://git.launchpad.net/~robertliu/snappy-hwe-snaps/+git/pulseaudio
+    source-type: git
+    source-branch: alsa-lib/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 +109,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 +135,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