Merge ~ondrak/snappy-hwe-snaps/+git/pulseaudio:stable-xenial into ~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio:stable

[Ondrej Kubik]

Update of snapcraft to use modern way of snap building
adding options to alter configurations if required by hw

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

PASSED: Successfully build documentation, rev: 4a74ba660a7c2d7d7923f471607cc34fef7fb288

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

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

FAILED: Continuous integration, rev:4a74ba660a7c2d7d7923f471607cc34fef7fb288
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/444/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/476/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/476
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/476
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/476
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1268
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1010
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1057/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/444/rebuild

review: Needs Fixing (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

@ondra, please rebase and propose again against master.

Unmerged commits

4a74ba6... by Ondrej Kubik on 2019-10-01

snap: add network, network-bind plug to pulse server

Signed-off-by: Ondrej Kubik <email address hidden>

4bd2143... by Ondrej Kubik on 2019-06-14

add pulseaudio snap patch

Signed-off-by: Ondrej Kubik <email address hidden>

a9a20f4... by Ondrej Kubik on 2019-06-14

add alsa-lib snap patch

Signed-off-by: Ondrej Kubik <email address hidden>

0b6c7b9... by Ondrej Kubik on 2019-06-14

snapcraft: dummy part to triger autobuild for pulse and libsound2

Signed-off-by: Ondrej Kubik <email address hidden>

87dfa3f... by Ondrej Kubik on 2019-06-16

snapcraft: build snap from upstream source

Signed-off-by: Ondrej Kubik <email address hidden>

531a7fe... by Ondrej Kubik on 2019-06-18

glue: pulseaudion: add optional service start delay

Signed-off-by: Ondrej Kubik <email address hidden>

4259e17... by Ondrej Kubik on 2019-06-17

hooks: add support for config file modification using snap set

Signed-off-by: Ondrej Kubik <email address hidden>

a7923d3... by Ondrej Kubik on 2019-06-13

snapcraft: making configuration writable

Signed-off-by: Ondrej Kubik <email address hidden>

7f548c4... by Ondrej Kubik on 2019-06-13

snapcraft: refactor to new syntax and plugings

Signed-off-by: Ondrej Kubik <email address hidden>

b8c0cdf... by Ondrej Kubik on 2019-06-14

add gitignore

Signed-off-by: Ondrej Kubik <email address hidden>

diff --git a/.gitignore b/.gitignore
 new file mode 100644
index 0000000..3ed44be
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+parts/
+prime/
+stage/
+*.snap
+snap/plugins/__pycache__
+snap/.snapcraft/
diff --git a/alsa-lib-snap.patch b/alsa-lib-snap.patch
 new file mode 100644
index 0000000..d57a937
--- /dev/null
+++ b/alsa-lib-snap.patch
@@ -0,0 +1,181 @@
+From a763fcf93e6957f9edd8cd49948507d5a0728412 Mon Sep 17 00:00:00 2001
+From: Ondrej Kubik <[e-mail]>
+Date: Fri, 14 Jun 2019 21:32:14 +0100
+Subject: [PATCH] xenial: snap: snap changes
+
+Signed-off-by: Ondrej Kubik <[e-mail]>
+---
+ src/alisp/alisp.c     | 3 ++-
+ src/conf.c            | 7 +++++--
+ src/confmisc.c        | 4 ++--
+ src/control/control.c | 7 +++++--
+ src/dlmisc.c          | 7 +++++--
+ src/pcm/pcm.c         | 8 ++++++--
+ src/pcm/pcm_rate.c    | 5 ++++-
+ 7 files changed, 29 insertions(+), 12 deletions(-)
+
+diff --git a/src/alisp/alisp.c b/src/alisp/alisp.c
+index 3c61bb1..1474b97 100644
+--- a/src/alisp/alisp.c
++++ b/src/alisp/alisp.c
+@@ -2399,7 +2399,8 @@ struct alisp_object * F_path(struct alisp_instance *instance, struct alisp_objec
+ 	}
+ 	if (!strcmp(p1->value.s, "data")) {
+ 		delete_tree(instance, p1);
+-		return new_string(instance, ALSA_CONFIG_DIR);
++		const char *config_dir = getenv("ALSA_CONFIG_DIR");
++		return new_string(instance, config_dir ? config_dir : ALSA_CONFIG_DIR );
+ 	}
+ 	delete_tree(instance, p1);
+ 	return &alsa_lisp_nil;
+diff --git a/src/conf.c b/src/conf.c
+index a4f2a4f..29e48a9 100644
+--- a/src/conf.c
++++ b/src/conf.c
+@@ -622,6 +622,9 @@ static int get_delimstring(char **string, int delim, input_t *input);
+ static int get_char_skip_comments(input_t *input)
+ {
+ 	int c;
++	char *config_dir = getenv("ALSA_CONFIG_DIR");
++	if (!config_dir)
++		config_dir = ALSA_CONFIG_DIR;
+ 	while (1) {
+ 		c = get_char(input);
+ 		if (c == '<') {
+@@ -632,12 +635,12 @@ static int get_char_skip_comments(input_t *input)
+ 			if (err < 0)
+ 				return err;
+ 			if (!strncmp(str, "confdir:", 8)) {
+-				char *tmp = malloc(strlen(ALSA_CONFIG_DIR) + 1 + strlen(str + 8) + 1);
++				char *tmp = malloc(strlen(config_dir) + 1 + strlen(str + 8) + 1);
+ 				if (tmp == NULL) {
+ 					free(str);
+ 					return -ENOMEM;
+ 				}
+-				sprintf(tmp, ALSA_CONFIG_DIR "/%s", str + 8);
++				sprintf(tmp, "%s/%s", config_dir, str + 8);
+ 				free(str);
+ 				str = tmp;
+ 			}
+diff --git a/src/confmisc.c b/src/confmisc.c
+index ae0275f..8ca70de 100644
+--- a/src/confmisc.c
++++ b/src/confmisc.c
+@@ -584,11 +584,11 @@ int snd_func_datadir(snd_config_t **dst, snd_config_t *root ATTRIBUTE_UNUSED,
+ {
+ 	int err;
+ 	const char *id;
+-	
++	const char *config_dir = getenv("ALSA_CONFIG_DIR");
+ 	err = snd_config_get_id(src, &id);
+ 	if (err < 0)
+ 		return err;
+-	return snd_config_imake_string(dst, id, ALSA_CONFIG_DIR);
++	return snd_config_imake_string(dst, id, config_dir ? config_dir : ALSA_CONFIG_DIR);
+ }
+ #ifndef DOC_HIDDEN
+ SND_DLSYM_BUILD_VERSION(snd_func_datadir, SND_CONFIG_DLSYM_VERSION_EVALUATE);
+diff --git a/src/control/control.c b/src/control/control.c
+index 4a28cf6..7c92db9 100644
+--- a/src/control/control.c
++++ b/src/control/control.c
+@@ -835,6 +835,9 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ 	const char *lib = NULL, *open_name = NULL;
+ 	const char *id;
+ 	int (*open_func)(snd_ctl_t **, const char *, snd_config_t *, snd_config_t *, int) = NULL;
++	char *plugin_dir = getenv("ALSA_PLUGIN_DIR");
++	if (!plugin_dir)
++		plugin_dir = ALSA_PLUGIN_DIR;
+ #ifndef PIC
+ 	extern void *snd_control_open_symbols(void);
+ #endif
+@@ -912,13 +915,13 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
+ 			build_in++;
+ 		}
+ 		if (*build_in == NULL) {
+-			buf1 = malloc(strlen(str) + sizeof(ALSA_PLUGIN_DIR) + 32);
++			buf1 = malloc(strlen(str) + sizeof(plugin_dir) + 32);
+ 			if (buf1 == NULL) {
+ 				err = -ENOMEM;
+ 				goto _err;
+ 			}
+ 			lib = buf1;
+-			sprintf(buf1, "%s/libasound_module_ctl_%s.so", ALSA_PLUGIN_DIR, str);
++			sprintf(buf1, "%s/libasound_module_ctl_%s.so", plugin_dir, str);
+ 		}
+ 	}
+ #ifndef PIC
+diff --git a/src/dlmisc.c b/src/dlmisc.c
+index b36c48f..b8c4db3 100644
+--- a/src/dlmisc.c
++++ b/src/dlmisc.c
+@@ -74,10 +74,13 @@ void *snd_dlopen(const char *name, int mode)
+ 	 */
+ 	void *handle = NULL;
+ 	char *filename;
++	char *plugin_dir = getenv("ALSA_PLUGIN_DIR");
++	if (!plugin_dir)
++		plugin_dir = ALSA_PLUGIN_DIR;
+ 
+ 	if (name && name[0] != '/') {
+-		filename = malloc(sizeof(ALSA_PLUGIN_DIR) + 1 + strlen(name) + 1);
+-		strcpy(filename, ALSA_PLUGIN_DIR);
++		filename = malloc(sizeof(plugin_dir) + 1 + strlen(name) + 1);
++		strcpy(filename, plugin_dir);
+ 		strcat(filename, "/");
+ 		strcat(filename, name);
+ 		handle = dlopen(filename, mode);
+diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
+index cbbc55a..60c410f 100644
+--- a/src/pcm/pcm.c
++++ b/src/pcm/pcm.c
+@@ -2117,6 +2117,10 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ 	int (*open_func)(snd_pcm_t **, const char *, 
+ 			 snd_config_t *, snd_config_t *, 
+ 			 snd_pcm_stream_t, int) = NULL;
++	char *plugin_dir = getenv("ALSA_PLUGIN_DIR");
++	if (!plugin_dir)
++		plugin_dir = ALSA_PLUGIN_DIR;
++
+ #ifndef PIC
+ 	extern void *snd_pcm_open_symbols(void);
+ #endif
+@@ -2197,13 +2201,13 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
+ 			build_in++;
+ 		}
+ 		if (*build_in == NULL) {
+-			buf1 = malloc(strlen(str) + sizeof(ALSA_PLUGIN_DIR) + 32);
++			buf1 = malloc(strlen(str) + sizeof(plugin_dir) + 32);
+ 			if (buf1 == NULL) {
+ 				err = -ENOMEM;
+ 				goto _err;
+ 			}
+ 			lib = buf1;
+-			sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str);
++			sprintf(buf1, "%s/libasound_module_pcm_%s.so", plugin_dir, str);
+ 		}
+ 	}
+ #ifndef PIC
+diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c
+index c76db25..ae920bc 100644
+--- a/src/pcm/pcm_rate.c
++++ b/src/pcm/pcm_rate.c
+@@ -1226,11 +1226,14 @@ static int rate_open_func(snd_pcm_rate_t *rate, const char *type, int verbose)
+ 	char open_name[64], lib_name[128], *lib = NULL;
+ 	snd_pcm_rate_open_func_t open_func;
+ 	int err;
++	char *plugin_dir = getenv("ALSA_PLUGIN_DIR");
++	if (!plugin_dir)
++		plugin_dir = ALSA_PLUGIN_DIR;
+ 
+ 	snprintf(open_name, sizeof(open_name), "_snd_pcm_rate_%s_open", type);
+ 	if (!is_builtin_plugin(type)) {
+ 		snprintf(lib_name, sizeof(lib_name),
+-				 "%s/libasound_module_rate_%s.so", ALSA_PLUGIN_DIR, type);
++				 "%s/libasound_module_rate_%s.so", plugin_dir, type);
+ 		lib = lib_name;
+ 	}
+ 	open_func = snd_dlobj_cache_get(lib, open_name, NULL, verbose);
+-- 
+2.20.1
+
diff --git a/bin/client-wrapper b/glue/bin/client-wrapper
 similarity index 90%
 rename from bin/client-wrapper
 rename to glue/bin/client-wrapper
index 255187c..fc66e93 100755
--- a/bin/client-wrapper
+++ b/glue/bin/client-wrapper
@@ -19,11 +19,6 @@ if [ "$(id -u)" -ne 0 ]; then
    exit 1
 fi
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
-export PULSE_CLIENTCONFIG=$SNAP/etc/pulse/client.conf
-export PULSE_RUNTIME_PATH=/var/run/pulse
-export PULSE_SYSTEM=1
-
 unset XDG_RUNTIME_DIR
 
 export HOME=$SNAP_DATA/home
diff --git a/bin/config b/glue/bin/config
 similarity index 100%
 rename from bin/config
 rename to glue/bin/config
diff --git a/bin/pulseaudio b/glue/bin/pulseaudio
 similarity index 62%
 rename from bin/pulseaudio
 rename to glue/bin/pulseaudio
index 40c9a85..e966e92 100755
--- a/bin/pulseaudio
+++ b/glue/bin/pulseaudio
@@ -2,14 +2,6 @@
 set -e
 set -x
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/pulseaudio:$SNAP/usr/lib/pulse-8.0/modules/
-export PULSE_RUNTIME_PATH=/var/run/pulse
-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=
@@ -19,12 +11,20 @@ if [ -e $SNAP_DATA/config/debug ] ; then
     export LIBASOUND_DEBUG=1
 fi
 
+# on some hw, hw requires init steps before pulseaudio can be started
+# as we do not have socket activated service yet, add optional delayed start
+DELAY=$(snapctl get pulseaudio.delay-service)
+if [ -n "${DELAY}" ]; then
+  # ignore any error is delay is boggus number
+  sleep ${DELAY} || true
+fi
+
 $SNAP/usr/bin/pulseaudio \
     --exit-idle-time=-1 \
     --disallow-exit=yes \
     --disallow-module-loading \
     --system \
-    -F $SNAP/etc/pulse/default.pa \
-    -p $SNAP/usr/lib/pulse-8.0/modules \
+    -F ${SNAP_DATA}/etc/pulse/default.pa \
+    -p ${SNAP}/usr/lib/pulse-8.0/modules \
     -n \
     $EXTRA_ARGS
diff --git a/data/copyright b/glue/usr/share/doc/pulseaudio/copyright
 similarity index 100%
 rename from data/copyright
 rename to glue/usr/share/doc/pulseaudio/copyright
diff --git a/pulseaudio-snap.patch b/pulseaudio-snap.patch
 new file mode 100644
index 0000000..4ffbcdb
--- /dev/null
+++ b/pulseaudio-snap.patch
@@ -0,0 +1,89 @@
+From e0eaeecf7b028a238c9ba4c8fd15e794eaefc2af Mon Sep 17 00:00:00 2001
+From: Ondrej Kubik <[e-mail]>
+Date: Fri, 14 Jun 2019 22:01:35 +0100
+Subject: [PATCH] xenial: snap: snap changes
+
+Signed-off-by: Ondrej Kubik <[e-mail]>
+---
+ configure.ac                  |  2 +-
+ src/daemon/main.c             | 12 ++++++------
+ src/modules/alsa/alsa-mixer.c |  6 ++++--
+ 3 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9250c05d..f8e7673c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -177,7 +177,7 @@ esac
+ #### Compiler flags ####
+ 
+ AX_APPEND_COMPILE_FLAGS(
+-    [-Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -fno-common -fdiagnostics-show-option -fdiagnostics-color=auto],
++    [-Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -fno-common -fdiagnostics-show-option -fdiagnostics-color=auto -fomit-frame-pointer],
+     [], [-pedantic -Werror])
+ 
+ AS_CASE([" $CFLAGS "], [*" -O0 "*], [], [
+diff --git a/src/daemon/main.c b/src/daemon/main.c
+index c2f47b69..f4887554 100644
+--- a/src/daemon/main.c
++++ b/src/daemon/main.c
+@@ -175,16 +175,16 @@ static int change_user(void) {
+         return -1;
+     }
+ 
+-    if (!pa_streq(pw->pw_dir, PA_SYSTEM_RUNTIME_PATH))
+-        pa_log_warn(_("Home directory of user '%s' is not '%s', ignoring."), PA_SYSTEM_USER, PA_SYSTEM_RUNTIME_PATH);
++    if (!pa_streq(pw->pw_dir, getenv("PULSE_RUNTIME_PATH")))
++        pa_log_warn(_("Home directory of user '%s' is not '%s', ignoring."), PA_SYSTEM_USER, getenv("PULSE_RUNTIME_PATH"));
+ 
+-    if (pa_make_secure_dir(PA_SYSTEM_RUNTIME_PATH, 0755, pw->pw_uid, gr->gr_gid, true) < 0) {
+-        pa_log(_("Failed to create '%s': %s"), PA_SYSTEM_RUNTIME_PATH, pa_cstrerror(errno));
++    if (pa_make_secure_dir(getenv("PULSE_RUNTIME_PATH"), 0755, pw->pw_uid, gr->gr_gid, true) < 0) {
++        pa_log(_("Failed to create '%s': %s"), getenv("PULSE_RUNTIME_PATH"), pa_cstrerror(errno));
+         return -1;
+     }
+ 
+-    if (pa_make_secure_dir(PA_SYSTEM_STATE_PATH, 0700, pw->pw_uid, gr->gr_gid, true) < 0) {
+-        pa_log(_("Failed to create '%s': %s"), PA_SYSTEM_STATE_PATH, pa_cstrerror(errno));
++    if (pa_make_secure_dir(getenv("PULSE_STATE_PATH"), 0700, pw->pw_uid, gr->gr_gid, true) < 0) {
++        pa_log(_("Failed to create '%s': %s"), getenv("PULSE_STATE_PATH"), pa_cstrerror(errno));
+         return -1;
+     }
+ 
+diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
+index 1fe2a024..4cbc8277 100644
+--- a/src/modules/alsa/alsa-mixer.c
++++ b/src/modules/alsa/alsa-mixer.c
+@@ -2529,10 +2529,11 @@ static int path_verify(pa_alsa_path *p) {
+ }
+ 
+ static const char *get_default_paths_dir(void) {
++    const char *alsa_paths_dir = getenv("PULSE_ALSA_PATHS_DIR");
+     if (pa_run_from_build_tree())
+         return PA_SRCDIR "/modules/alsa/mixer/paths/";
+     else
+-        return PA_ALSA_PATHS_DIR;
++        return alsa_paths_dir ? alsa_paths_dir : PA_ALSA_PATHS_DIR;
+ }
+ 
+ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa_direction_t direction) {
+@@ -4365,6 +4366,7 @@ pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel
+     char *fn;
+     int r;
+     void *state;
++    const char *alsa_profile_sets_dir = getenv("PULSE_ALSA_PROFILE_SETS_DIR");
+ 
+     static pa_config_item items[] = {
+         /* [General] */
+@@ -4409,7 +4411,7 @@ pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel
+ 
+     fn = pa_maybe_prefix_path(fname,
+                               pa_run_from_build_tree() ? PA_SRCDIR "/modules/alsa/mixer/profile-sets/" :
+-                              PA_ALSA_PROFILE_SETS_DIR);
++                              alsa_profile_sets_dir ? alsa_profile_sets_dir : PA_ALSA_PROFILE_SETS_DIR);
+ 
+     r = pa_config_parse(fn, NULL, items, NULL, false, ps);
+     pa_xfree(fn);
+-- 
+2.20.1
+
diff --git a/quiltrc b/quiltrc
 new file mode 100644
index 0000000..f2568ce
--- /dev/null
+++ b/quiltrc
@@ -0,0 +1,6 @@
+for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+    if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+        export QUILT_PATCHES=debian/patches
+        break
+    fi
+done
diff --git a/snap/hooks/configure b/snap/hooks/configure
 new file mode 100755
index 0000000..844be89
--- /dev/null
+++ b/snap/hooks/configure
@@ -0,0 +1,201 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if [ -e $SNAP_DATA/config/debug ] ; then
+    DEBUG=1
+    set -x
+fi
+
+exec >> $SNAP_COMMON/hook.log 2>&1
+echo "$(date '+%Y-%m-%d %H:%M:%S') $(basename $0): Entering hook"
+
+# traverse in three directories
+# -etc/pulse
+# -usr/share/alsa
+# -usr/share/pulseaudio
+# when file config is reached, it has three values, filaname, remove and add
+# - filename: is relative file path, without $SNAP_DATA part
+# - remove: list of strings to be removed from given file
+#            this can be multi line value, each line is process separatelly
+# - add: list of strings to be appended to given file
+#            this could be multi line value, all lines are appended to config file
+# - replace: list of pairs match replace values, values on separate lines
+#            at least two lines needed match <> replace
+#
+# example:
+# snap set pulseaudio etc.pulse.default-pa='{"filename": "etc/pulse/default.pa", "remove": "", "add": "load-module module-alsa-sink device=hw:0,0\nload-module module-alsa-source device=hw:0,1"}'
+# snap set pulseaudio etc.pulse='{"daemon-conf": { "filename": "etc/pulse/daemon.conf", "remove": "", "add": "" }, "default-pa": { "filename": "etc/pulse/default.pa", "remove": "", "add": "load-module module-alsa-sink device=hw:0,0\nload-module module-alsa-source device=hw:0,1"}'
+# snap set pulseaudio etc.pulse='{"daemon-conf": { "filename": "etc/pulse/daemon.conf", "remove": "", "add": "" }, "default-pa": { "filename": "etc/pulse/default.pa", "remove": "load-module module-alsa-sink device=.*\nload-module module-alsa-source device=.*", "add": "load-module module-alsa-sink device=hw:0,0\nload-module module-alsa-source device=hw:0,1"}}'
+# snap set pulseaudio etc.pulse.default-pa='{"filename": "etc/pulse/default.pa", "replace": ".*load-module module-alsa-sink.*\nload-module module-alsa-sink device=hw:0,0\n.*load-module module-alsa-source.*\nload-module module-alsa-source device=hw:0,1"}'
+# providing way to alter configuration files through snap set command
+# not full example of supported config options
+# {
+#   "etc": {
+#     "pulse": {
+#       "client-conf": {
+#         "filename": "etc/pulse/client.conf",
+#         "replace": ""
+#         "remove": "",
+#         "add": ""
+#       },
+#       "daemon-conf": {
+#         "filename": "etc/pulse/daemon.conf",
+#         "remove": "",
+#         "add": ""
+#       },
+#       "default-pa": {
+#         "filename": "etc/pulse/default.pa",
+#         "replace": ".*load-module module-alsa-sink.*\nload-module module-alsa-sink device=hw:0,0\n.*load-module module-alsa-source.*\nload-module module-alsa-source device=hw:0,1",
+#         "remove": "load-module module-alsa-sink device=.*\nload-module module-alsa-source device=.*",
+#         "add": "load-module module-alsa-sink device=hw:0,0\nload-module module-alsa-source device=hw:0,1"
+#       },
+#       "system-pa": {
+#         "filename": "etc/pulse/system.pa",
+#         "remove": "",
+#         "add": ""
+#       }
+#     }
+#   },
+#   "usr": {
+#     "share": {
+#       "alsa": {
+#         "alsa-conf": {
+#           "filename": "usr/share/alsa/alsa.conf",
+#           "remove": "",
+#           "add": ""
+#         },
+#         "topology": {
+#           "broadwell": {
+#             "filename": "usr/share/alsa/topology/broadwell/broadwell.conf",
+#             "remove": "",
+#             "add": ""
+#           }
+#         }
+#       },
+#       "pulseaudio": {
+#         "alsa-mixer": {
+#           "paths": {
+#             "analog-output-conf": {
+#               "filename": "usr/share/pulseaudio/alsa-mixer/paths/analog-output.conf",
+#               "remove": "",
+#               "add": ""
+#             }
+#           },
+#           "profile-sets": {
+#             "default-conf": {
+#               "filename": "usr/share/pulseaudio/alsa-mixer/profile-sets/default.conf",
+#               "remove": "",
+#               "add": ""
+#             }
+#           }
+#         }
+#       }
+#     }
+#   }
+# }
+
+process_file_remove() {
+  filename="${1}"
+  shift
+  remove="${@}"
+  if [ -n "${remove}" ]; then
+    # remove all matching lines from config, there could be more patterns, process by lines
+    while read -r line
+    do
+      if [ -n "${line}" ]; then
+        echo "removing from [${filename}] strings [$line]"
+        sed -i "s/$(echo ${line} | sed -e 's/\\/\\\\/g; s/\//\\\//g; s/&/\\\&/g')//g" ${SNAP_DATA}/${filename}
+      fi
+    done < <(echo "${remove}")
+  fi
+}
+
+process_file_add() {
+  filename="${1}"
+  shift
+  add="${@}"
+  if [ -n "${add}" ]; then
+    echo "adding from [${filename}] strings [$add]"
+    [ "${DEBUG}" = "1" ] && echo -e "\n# start: added by snap configure" >> ${SNAP_DATA}/${filename}
+    echo "${add}" >> ${SNAP_DATA}/${filename}
+    [ "${DEBUG}" = "1" ] &&  echo -e "# end: added by snap configure" >> ${SNAP_DATA}/${filename}
+  fi
+}
+
+process_file_replace() {
+  filename="${1}"
+  shift
+  if [ -n "${@}" ]; then
+    # we need to process two lines at the time, first line is match, following line is replacing value
+    while read -r match
+    do
+      read -r replace
+      if [ -n "${match}" ] && [ -n "${replace}" ]; then
+        echo "replace from [${filename}] string [${match}] with [${replace}]"
+        sed -i "s/$(echo ${match} | sed -e 's/\\/\\\\/g; s/\//\\\//g; s/&/\\\&/g')/$(echo ${replace} | sed -e 's/\\/\\\\/g; s/\//\\\//g; s/&/\\\&/g')/g" ${SNAP_DATA}/${filename}
+      fi
+    done < <(echo "${@}")
+  fi
+}
+
+process_line() {
+  [ "${DEBUG}" = "1" ] && echo "process_line << $@"
+  # each line starts with key name and end with variable
+  local key=$1
+  shift
+  # check if we have valid json in first place
+  if ! jq -e . >/dev/null 2>&1 <<<"$@"; then
+    type -p handle_key_value && handle_key_value ${key} $@
+    return
+  fi
+  filename=$(echo $@ | jq -r '.filename')
+  # if we have filename, no need to traverse further
+  if [ "${filename}" == "null" ]; then
+      type -p processing_top_key_start && processing_top_key_start ${key}
+      while read -r line
+      do
+          process_line ${key}.${line}
+      done < <(echo "$@" | jq -r 'keys[] as $k | "\($k) \(.[$k] )"')
+      type -p processing_top_key_end && processing_top_key_end ${key}
+  else
+      ADD=$(echo $@ | jq -r '.add')
+      [ "${ADD}" == "null" ] && ADD=""
+      REMOVE=$(echo $@ | jq -r '.remove')
+      [ "${REMOVE}" == "null" ] && REMOVE=""
+      REPLACE=$(echo $@ | jq -r '.replace')
+      [ "${REPLACE}" == "null" ] && REPLACE=""
+      type -p process_file_replace && process_file_replace "${filename}" "${REPLACE}"
+      type -p process_file_remove && process_file_remove "${filename}" "${REMOVE}"
+      type -p process_file_add    && process_file_add    "${filename}" "${ADD}"
+  fi
+}
+
+CONFIGURATION="etc usr"
+
+echo "Process config changes"
+
+for conf in $CONFIGURATION
+do
+  [ "${DEBUG}" = "1" ] && echo "processing: ${conf}"
+  # only process if we get valid json
+  key_val=$(snapctl get -d "${conf}")
+  if jq -e . >/dev/null 2>&1 <<<"${key_val}"; then
+    process_line $(jq -r 'keys[] as $k | "\($k) \(.[$k] )"' <<< $(snapctl get -d ${conf}))
+  fi
+done
+
+# restart pulse service
+snapctl restart ${SNAP_INSTANCE_NAME}.pulseaudio
diff --git a/snap/hooks/install b/snap/hooks/install
 new file mode 100755
index 0000000..db735a4
--- /dev/null
+++ b/snap/hooks/install
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+#
+# Copyright (C) 2016 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -x
+exec >> $SNAP_COMMON/hook.log 2>&1
+echo "$(date '+%Y-%m-%d %H:%M:%S') $(basename $0): Entering hook"
+
+# copy initial client configuration
+mkdir -p ${SNAP_DATA}/var/lib/pulse
+mkdir -p ${SNAP_DATA}/etc
+mkdir -p ${SNAP_DATA}/usr/share
+
+cp -r ${SNAP}/etc/pulse            ${SNAP_DATA}/etc
+cp -r ${SNAP}/usr/share/alsa       ${SNAP_DATA}/usr/share
+cp -r ${SNAP}/usr/share/pulseaudio ${SNAP_DATA}/usr/share
diff --git a/snap/hooks/post-refresh b/snap/hooks/post-refresh
 new file mode 100755
index 0000000..83eecc4
--- /dev/null
+++ b/snap/hooks/post-refresh
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# Copyright (C) 2016 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -x
+exec >> ${SNAP_COMMON}/hook.log 2>&1
+echo "$(date '+%Y-%m-%d %H:%M:%S') $(basename $0): Entering hook"
+
+# make sure we have initial configuration handy
+mkdir -p ${SNAP_DATA}/var/lib/pulse
+mkdir -p ${SNAP_DATA}/etc
+mkdir -p ${SNAP_DATA}/usr/share
+
+cp -r -n ${SNAP}/etc/pulse            ${SNAP_DATA}/etc
+cp -r -n ${SNAP}/usr/share/alsa       ${SNAP_DATA}/usr/share
+cp -r -n ${SNAP}/usr/share/pulseaudio ${SNAP_DATA}/usr/share
+
+# clean snapctl as we cannot do it from configure hooks
+# so we not repeaase same steps again
+snapctl set env=""
+snapctl set usr=""
diff --git a/snapcraft.yaml b/snap/snapcraft.yaml
 similarity index 50%
 rename from snapcraft.yaml
 rename to snap/snapcraft.yaml
index 605243c..172eaa1 100644
--- a/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,4 @@
 name: pulseaudio
-version: 8.0-4
 summary: PulseAudio sound server
 description: |
   PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
@@ -10,27 +9,62 @@ description: |
   https://code.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
 grade: stable
 confinement: strict
+adopt-info: pulseaudio
+base: core
+
+environment:
+  PATH:                      ${SNAP}/usr/sbin:${SNAP}/usr/bin:${SNAP}/sbin:${SNAP}/bin:${PATH}
+  LD_LIBRARY_PATH:           ${LD_LIBRARY_PATH}:${SNAP}/usr/lib/pulseaudio:${SNAP}/usr/lib/pulse-8.0/modules/:${SNAP}/lib:${SNAP}/usr/lib:${SNAP}/lib/${SNAPCRAFT_ARCH_TRIPLET}:${SNAP}/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}
+  PULSE_DLPATH:              ${SNAP}/usr/lib/pulse-8.0/modules
+  PULSE_CLIENTCONFIG:        ${SNAP_DATA}/etc/pulse/client.conf
+  PULSE_RUNTIME_PATH:        /var/run/pulse
+  PULSE_SYSTEM:              1
+  PULSE_STATE_PATH:          ${SNAP_DATA}/state
+  PULSE_SCRIPT:              ${SNAP_DATA}/etc/pulse/default.pa
+  PULSE_CONFIG:              ${SNAP_DATA}/etc/pulse/daemon.conf
+  PULSE_CONFIG_PATH:         ${SNAP_DATA}/var/lib/pulse
+  PULSE_ALSA_PATHS_DIR:      ${SNAP_DATA}/usr/share/pulseaudio/alsa-mixer
+  ALSA_CONFIG_UCM:           ${SNAP_DATA}/usr/share/alsa/ucm
+  ALSA_CONFIG_TPLG:          ${SNAP_DATA}/usr/share/alsa/topology
+  ALSA_CONFIG_PATH:          ${SNAP_DATA}/usr/share/alsa/alsa.conf
+  ALSA_MIXER_SIMPLE:         ${SNAP_DATA}/usr/share/alsa/smixer.conf
+  ALSA_CONFIG_DIR:           ${SNAP_DATA}/usr/share/alsa/
+  ALSA_CONFIG_UCM_VAR:       ${SNAP_DATA}/usr/share/alsa/ucm
+  ALSA_CONFIG_TPLG_VAR:      ${SNAP_DATA}/usr/share/alsa/topology
+  ALSA_PLUGIN_DIR:           ${SNAP}/usr/lib/alsa-lib
+  ALSA_MIXER_SIMPLE_MODULES: ${SNAP}/usr/lib/alsa-lib/smixer
+  ALSA_MIXER_SIMPLE_MPYTHON: ${SNAP}/usr/lib/alsa-lib/smixer/python/main.py
 
 apps:
   pulseaudio:
     command: bin/pulseaudio
     daemon: simple
-    slots: [service]
+    slots:
+      - service
+    plugs:
+      - network
+      - network-bind
+
   pactl:
     command: bin/client-wrapper usr/bin/pactl
-    plugs: [client, network]
-    aliases:
-      - pactl
+    plugs:
+      - client
+      - network
+
   paplay:
     command: bin/client-wrapper usr/bin/paplay
-    plugs: [client, home, network]
-    aliases:
-      - paplay
+    plugs:
+      - client
+      - home
+      - network
+
   parec:
     command: bin/client-wrapper usr/bin/parec
-    plugs: [client, home, network]
-    aliases:
-      - parec
+    plugs:
+      - client
+      - home
+      - network
+
   config:
     command: bin/config
 
@@ -43,21 +77,21 @@ plugs:
     interface: pulseaudio
 
 parts:
-  pulseaudio-common:
-    plugin: copy
-    files:
-      bin/pulseaudio: bin/pulseaudio
-      bin/client-wrapper: bin/client-wrapper
-      bin/config: bin/config
-      data/copyright: usr/share/doc/pulseaudio/copyright
+  glue:
+    plugin: dump
+    source: glue
 
   alsa-lib:
     plugin: autotools
-
-    source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
+    source: https://git.launchpad.net/ubuntu/+source/alsa-lib
     source-type: git
-    source-branch: alsa-lib/xenial/1.1.0
-
+    source-branch: ubuntu/xenial
+    override-pull: |
+      snapcraftctl pull
+      rm -rf manual
+      [ -z "${SNAPCRAFT_PROJECT_DIR}" ] && SNAPCRAFT_PROJECT_DIR="../../.."
+      quilt push -afq --leave-rejects --quiltrc=${SNAPCRAFT_PROJECT_DIR}/quiltrc
+      git apply ${SNAPCRAFT_PROJECT_DIR}/alsa-lib-snap.patch
     configflags:
       - --prefix=/usr
       - --sysconfdir=/etc
@@ -68,27 +102,26 @@ parts:
       - --disable-silent-rules
       - --disable-static
       - --disable-python
-
-    filesets:
-      libasound2:
-        - usr/lib/libasound.so*
-        - usr/lib/alsa-lib/*
-        - usr/share/alsa/*
-
-    snap:
-      - $libasound2
+    stage:
+      - usr/lib/libasound.so*
+      - usr/lib/alsa-lib
+      - usr/share/alsa
 
 
   pulseaudio:
     after:
       - alsa-lib
-
     plugin: autotools
-
-    source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/pulseaudio
+    source: https://git.launchpad.net/ubuntu/+source/pulseaudio
     source-type: git
-    source-branch: pulseaudio/8.0
-
+    source-branch: ubuntu/xenial
+    override-pull: |
+      snapcraftctl pull
+      snapcraftctl set-version $(git describe --tags | cut -c 19-)
+      rm -rf manual
+      [ -z "${SNAPCRAFT_PROJECT_DIR}" ] && SNAPCRAFT_PROJECT_DIR="../../.."
+      quilt push -afq --leave-rejects --quiltrc=../../../quiltrc
+      git apply ${SNAPCRAFT_PROJECT_DIR}/pulseaudio-snap.patch
     build-packages:
       - intltool
       - libasound2-dev
@@ -106,7 +139,8 @@ parts:
       - libudev-dev
       - libasyncns-dev
       - libxcb1-dev
-
+      - libsbc-dev
+      - quilt
     configflags:
       - --prefix=/usr
       - --sysconfdir=/etc
@@ -133,22 +167,44 @@ parts:
       - --disable-x11
       - --with-system-user=root
       - --with-system-group=root
-
-    filesets:
-      wanted:
-        - 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:
-      - $wanted
+    stage-packages:
+      - libavahi-client3
+      - libavahi-common3
+      - libasyncns0
+      - libflac8
+      - libltdl7
+      - libtdb1
+      - libogg0
+      - libsndfile1
+      - libspeexdsp1
+      - libvorbis0a
+      - libvorbisenc2
+      - libxcb1
+      - liborc-0.4-0
+      - libxdmcp6
+      - libxau6
+      - libsbc1
+      - jq
+    stage:
+      - etc
+      - lib
+      - usr/bin/pacat
+      - usr/bin/pactl
+      - usr/bin/paplay
+      - usr/bin/parec
+      - usr/bin/pulseaudio
+      - usr/bin/jq
+      - usr/lib
+      - usr/share/pulseaudio
+
+  # part to simulate pulseaudio and alsa dependencies, to trigger auto builds
+  # as we build from source,we don't actually consume binaries
+  dummy-pulse:
+    plugin: nil
+    stage-packages:
+      - pulseaudio
+      - libasound2
+    stage:
+      - -*
+    prime:
+      - -*