summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2017-11-27 18:39:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-10 22:45:18 +0000
commit3f322dfda4ce6909554d426776187c0c2ac0cf07 (patch)
treec84eb4ad09a200bee5376248ef78ea030132e388 /meta
parentea36a9a9622dca337696999f2c643095b130b2b0 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.5.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.4.bb)0
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch12
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb)4
3 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.4.bb b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.5.bb
index fef79d9c9c..fef79d9c9c 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.4.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.5.bb
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 @@
1From 8c3e0ef9625066c2bb67ee3d2b8cd37fd44eadac Mon Sep 17 00:00:00 2001 1From b9d41b784657152a4c5683a9458dffab557f0689 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
@@ -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
24diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am 24diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
25index cac8094..ff865dc 100644 25index 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
42diff --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
43index 2884098..bac3ccc 100644 43index 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--
552.7.0.rc3 552.14.2
56 56
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb
index c8f4b861bd..f2231f34f0 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb
@@ -23,8 +23,8 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
23 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ 23 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
24 " 24 "
25 25
26SRC_URI[md5sum] = "01e3934ca5bd22a80c27289d1b0adcdc" 26SRC_URI[md5sum] = "dfe6ea147a5e07a056919591c2f5dac3"
27SRC_URI[sha256sum] = "a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca15138c9d9d" 27SRC_URI[sha256sum] = "320bd285e91db6e7fd7db3c9ec6f55b02f35449ff273c7844780ac6a5a3de2e8"
28 28
29# On build machines with python-docutils (not python3-docutils !!) installed 29# On build machines with python-docutils (not python3-docutils !!) installed
30# rst2man (not rst2man.py) is detected and compile fails with 30# rst2man (not rst2man.py) is detected and compile fails with