summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2016-02-17 18:56:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 07:39:32 +0000
commita231a4e86a09c10a89871fb532f1b33000f8b001 (patch)
tree26776a8167b4711639558d362e6a4e905c7e3419 /meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
parent1adbb73d0d45fb989332b561c4cd9d5b8169c7e3 (diff)
downloadpoky-a231a4e86a09c10a89871fb532f1b33000f8b001.tar.gz
alsa-utils: 1.0.29 -> 1.1.0
Changelog: http://alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0 This release introduces two new tools: - alsatplg for converting topology data from text representation to a binary format consumed by the kernel - alsabat; "bat" stands for "basic audio tester" Backported a patch from upstream that renames bat to alsabat. Rebased patch "0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch". Dropped patches "alsa-utils-aplay-interrupt-signal-handling.patch" and "assume-storing-is-success-if-not-sound-card-device.patch", because the issues have been fixed upstream. (From OE-Core rev: 0b10c468cee39520bb8f7330222fb177ceff249d) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch20
1 files changed, 12 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
index e99dd515f0..e578dfe743 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
+++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
@@ -1,4 +1,4 @@
1From 43a56fa36a12f09ccd78b3cf5e6ae197fcab501f Mon Sep 17 00:00:00 2001 1From 8c3e0ef9625066c2bb67ee3d2b8cd37fd44eadac Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Fri, 29 Aug 2014 18:58:56 +0300 3Date: Fri, 29 Aug 2014 18:58:56 +0300
4Subject: [PATCH] alsactl: don't let systemd unit restore the volume when 4Subject: [PATCH] alsactl: don't let systemd unit restore the volume when
@@ -12,16 +12,20 @@ Upstream-Status: Pending
12 12
13Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 13Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
14Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> 14Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
15
16Rebased on 1.1.0.
17
18Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
15--- 19---
16 alsactl/Makefile.am | 7 ++++--- 20 alsactl/Makefile.am | 7 ++++---
17 alsactl/alsa-restore.service.in | 1 + 21 alsactl/alsa-restore.service.in | 1 +
18 2 files changed, 5 insertions(+), 3 deletions(-) 22 2 files changed, 5 insertions(+), 3 deletions(-)
19 23
20diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am 24diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
21index 47f06e9..b728c06 100644 25index cac8094..ff865dc 100644
22--- a/alsactl/Makefile.am 26--- a/alsactl/Makefile.am
23+++ b/alsactl/Makefile.am 27+++ b/alsactl/Makefile.am
24@@ -43,9 +43,10 @@ install-data-hook: 28@@ -38,9 +38,10 @@ install-data-hook:
25 endif 29 endif
26 30
27 edit = \ 31 edit = \
@@ -36,17 +40,17 @@ index 47f06e9..b728c06 100644
36 40
37 alsa-state.service: alsa-state.service.in 41 alsa-state.service: alsa-state.service.in
38diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in 42diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
39index 245a439..b017854 100644 43index 2884098..bac3ccc 100644
40--- a/alsactl/alsa-restore.service.in 44--- a/alsactl/alsa-restore.service.in
41+++ b/alsactl/alsa-restore.service.in 45+++ b/alsactl/alsa-restore.service.in
42@@ -10,6 +10,7 @@ DefaultDependencies=no 46@@ -8,6 +8,7 @@ Description=Save/Restore Sound Card State
47 ConditionPathExists=!@daemonswitch@
48 ConditionPathExistsGlob=/dev/snd/control*
43 After=alsa-state.service 49 After=alsa-state.service
44 Before=shutdown.target
45 Conflicts=shutdown.target
46+ConditionPathExists=@localstatedir@/lib/alsa/asound.state 50+ConditionPathExists=@localstatedir@/lib/alsa/asound.state
47 51
48 [Service] 52 [Service]
49 Type=oneshot 53 Type=oneshot
50-- 54--
511.9.1 552.7.0.rc3
52 56