diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2017-11-27 18:39:34 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-10 22:45:18 +0000 |
commit | 3f322dfda4ce6909554d426776187c0c2ac0cf07 (patch) | |
tree | c84eb4ad09a200bee5376248ef78ea030132e388 /meta/recipes-multimedia/alsa/alsa-utils | |
parent | ea36a9a9622dca337696999f2c643095b130b2b0 (diff) | |
download | poky-3f322dfda4ce6909554d426776187c0c2ac0cf07.tar.gz |
alsa-utils: 1.1.4 -> 1.1.5
Changes:
http://www.alsa-project.org/main/index.php/Changes_v1.1.4_v1.1.5
Rebased 0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch.
(From OE-Core rev: 8313d9521360a32ab42b00018a95050017cdb1bd)
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-utils')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | 12 |
1 files changed, 6 insertions, 6 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 e578dfe743..907ca5ce0e 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 @@ | |||
1 | From 8c3e0ef9625066c2bb67ee3d2b8cd37fd44eadac Mon Sep 17 00:00:00 2001 | 1 | From b9d41b784657152a4c5683a9458dffab557f0689 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Fri, 29 Aug 2014 18:58:56 +0300 | 3 | Date: Fri, 29 Aug 2014 18:58:56 +0300 |
4 | Subject: [PATCH] alsactl: don't let systemd unit restore the volume when | 4 | Subject: [PATCH] alsactl: don't let systemd unit restore the volume when |
@@ -22,7 +22,7 @@ Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> | |||
22 | 2 files changed, 5 insertions(+), 3 deletions(-) | 22 | 2 files changed, 5 insertions(+), 3 deletions(-) |
23 | 23 | ||
24 | diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am | 24 | diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am |
25 | index cac8094..ff865dc 100644 | 25 | index 90fab9d..190525a 100644 |
26 | --- a/alsactl/Makefile.am | 26 | --- a/alsactl/Makefile.am |
27 | +++ b/alsactl/Makefile.am | 27 | +++ b/alsactl/Makefile.am |
28 | @@ -38,9 +38,10 @@ install-data-hook: | 28 | @@ -38,9 +38,10 @@ install-data-hook: |
@@ -40,17 +40,17 @@ index cac8094..ff865dc 100644 | |||
40 | 40 | ||
41 | alsa-state.service: alsa-state.service.in | 41 | alsa-state.service: alsa-state.service.in |
42 | diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in | 42 | diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in |
43 | index 2884098..bac3ccc 100644 | 43 | index 80fd5fd..6beb36d 100644 |
44 | --- a/alsactl/alsa-restore.service.in | 44 | --- a/alsactl/alsa-restore.service.in |
45 | +++ b/alsactl/alsa-restore.service.in | 45 | +++ b/alsactl/alsa-restore.service.in |
46 | @@ -8,6 +8,7 @@ Description=Save/Restore Sound Card State | 46 | @@ -7,6 +7,7 @@ |
47 | Description=Save/Restore Sound Card State | ||
47 | ConditionPathExists=!@daemonswitch@ | 48 | ConditionPathExists=!@daemonswitch@ |
48 | ConditionPathExistsGlob=/dev/snd/control* | 49 | ConditionPathExistsGlob=/dev/snd/control* |
49 | After=alsa-state.service | ||
50 | +ConditionPathExists=@localstatedir@/lib/alsa/asound.state | 50 | +ConditionPathExists=@localstatedir@/lib/alsa/asound.state |
51 | 51 | ||
52 | [Service] | 52 | [Service] |
53 | Type=oneshot | 53 | Type=oneshot |
54 | -- | 54 | -- |
55 | 2.7.0.rc3 | 55 | 2.14.2 |
56 | 56 | ||