summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2014-08-29 20:06:34 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-31 23:40:47 +0100
commitaf35986a8157cf77cb1048c0b6035fec38fd6d92 (patch)
treea85011d2cea30d33bf9dc73d81576f0e047cf0d5
parentc74a6dd34d9d9493b420560be3675ee29ba88114 (diff)
downloadpoky-af35986a8157cf77cb1048c0b6035fec38fd6d92.tar.gz
alsa-utils: upgrade to 1.0.28
Changelog: http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28 0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch updated. (From OE-Core rev: b2aae7176f71772a43f19b897e09291579008ad8) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb)0
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch42
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb)4
3 files changed, 29 insertions, 17 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.bb
index 968c81ee2b..968c81ee2b 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.28.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 477cd11b12..e99dd515f0 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,35 +1,44 @@
1From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001 1From 43a56fa36a12f09ccd78b3cf5e6ae197fcab501f Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 9 Oct 2011 20:06:35 +0200 3Date: Fri, 29 Aug 2014 18:58:56 +0300
4Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing 4Subject: [PATCH] alsactl: don't let systemd unit restore the volume when
5 asound.state is missing
5 6
6This avoids an error on bootup 7This avoids an error on bootup
7 8
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9
10Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 9Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
11 10
12Upstream-Status: Pending 11Upstream-Status: Pending
13 12
14Index: alsa-utils-1.0.27.2/alsactl/Makefile.am 13Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
15=================================================================== 14Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
16--- alsa-utils-1.0.27.2.orig/alsactl/Makefile.am 15---
17+++ alsa-utils-1.0.27.2/alsactl/Makefile.am 16 alsactl/Makefile.am | 7 ++++---
18@@ -36,8 +36,8 @@ install-data-hook: 17 alsactl/alsa-restore.service.in | 1 +
18 2 files changed, 5 insertions(+), 3 deletions(-)
19
20diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
21index 47f06e9..b728c06 100644
22--- a/alsactl/Makefile.am
23+++ b/alsactl/Makefile.am
24@@ -43,9 +43,10 @@ install-data-hook:
19 endif 25 endif
20 26
21 edit = \ 27 edit = \
22- $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ 28- $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
29- -e 's,@mydatadir\@,$(mydatadir),g' \
23- -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ 30- -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
24+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' \ 31+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' \
32+ -e 's,@sbindir\@,$(sbindir),g' \
33+ -e 's,@mydatadir\@,$(mydatadir),g' \
25+ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ 34+ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
26 < $< > $@ || rm $@ 35 < $< > $@ || rm $@
27 36
28 alsa-state.service: alsa-state.service.in 37 alsa-state.service: alsa-state.service.in
29Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in 38diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
30=================================================================== 39index 245a439..b017854 100644
31--- alsa-utils-1.0.27.2.orig/alsactl/alsa-restore.service.in 40--- a/alsactl/alsa-restore.service.in
32+++ alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in 41+++ b/alsactl/alsa-restore.service.in
33@@ -10,6 +10,7 @@ DefaultDependencies=no 42@@ -10,6 +10,7 @@ DefaultDependencies=no
34 After=alsa-state.service 43 After=alsa-state.service
35 Before=shutdown.target 44 Before=shutdown.target
@@ -38,3 +47,6 @@ Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in
38 47
39 [Service] 48 [Service]
40 Type=oneshot 49 Type=oneshot
50--
511.9.1
52
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
index 047fcfe5dd..2d23482c16 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
@@ -15,8 +15,8 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
15 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ 15 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
16 " 16 "
17 17
18SRC_URI[md5sum] = "b65e9a04181bd7c9db7667a4566f8dc3" 18SRC_URI[md5sum] = "361552d5b1cacd0a1e7ba09e69990211"
19SRC_URI[sha256sum] = "02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea" 19SRC_URI[sha256sum] = "f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc"
20 20
21# lazy hack. needs proper fixing in gettext.m4, see 21# lazy hack. needs proper fixing in gettext.m4, see
22# http://bugs.openembedded.org/show_bug.cgi?id=2348 22# http://bugs.openembedded.org/show_bug.cgi?id=2348