From: Tanu Kaskinen Date: Mon, 27 Nov 2017 16:39:34 +0000 (+0200) Subject: alsa-utils: 1.1.4 -> 1.1.5 X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~19406 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8313d9521360a32ab42b00018a95050017cdb1bd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Tanu Kaskinen Signed-off-by: Ross Burton --- 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 similarity index 100% rename from meta/recipes-multimedia/alsa/alsa-utils-scripts_1.1.4.bb rename to 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 e578dfe743d..907ca5ce0e5 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 @@ -From 8c3e0ef9625066c2bb67ee3d2b8cd37fd44eadac Mon Sep 17 00:00:00 2001 +From b9d41b784657152a4c5683a9458dffab557f0689 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 Aug 2014 18:58:56 +0300 Subject: [PATCH] alsactl: don't let systemd unit restore the volume when @@ -22,7 +22,7 @@ Signed-off-by: Tanu Kaskinen 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am -index cac8094..ff865dc 100644 +index 90fab9d..190525a 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -38,9 +38,10 @@ install-data-hook: @@ -40,17 +40,17 @@ index cac8094..ff865dc 100644 alsa-state.service: alsa-state.service.in diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in -index 2884098..bac3ccc 100644 +index 80fd5fd..6beb36d 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in -@@ -8,6 +8,7 @@ Description=Save/Restore Sound Card State +@@ -7,6 +7,7 @@ + Description=Save/Restore Sound Card State ConditionPathExists=!@daemonswitch@ ConditionPathExistsGlob=/dev/snd/control* - After=alsa-state.service +ConditionPathExists=@localstatedir@/lib/alsa/asound.state [Service] Type=oneshot -- -2.7.0.rc3 +2.14.2 diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb similarity index 97% rename from meta/recipes-multimedia/alsa/alsa-utils_1.1.4.bb rename to meta/recipes-multimedia/alsa/alsa-utils_1.1.5.bb index c8f4b861bdc..f2231f34f06 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 \ file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ " -SRC_URI[md5sum] = "01e3934ca5bd22a80c27289d1b0adcdc" -SRC_URI[sha256sum] = "a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca15138c9d9d" +SRC_URI[md5sum] = "dfe6ea147a5e07a056919591c2f5dac3" +SRC_URI[sha256sum] = "320bd285e91db6e7fd7db3c9ec6f55b02f35449ff273c7844780ac6a5a3de2e8" # On build machines with python-docutils (not python3-docutils !!) installed # rst2man (not rst2man.py) is detected and compile fails with