1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00

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>
This commit is contained in:
Cristian Iorga
2014-08-29 20:06:34 +03:00
committed by Richard Purdie
parent c74a6dd34d
commit af35986a81
3 changed files with 29 additions and 17 deletions
@@ -1,35 +1,44 @@
From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001 From 43a56fa36a12f09ccd78b3cf5e6ae197fcab501f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net> From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sun, 9 Oct 2011 20:06:35 +0200 Date: Fri, 29 Aug 2014 18:58:56 +0300
Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing Subject: [PATCH] alsactl: don't let systemd unit restore the volume when
asound.state is missing
This avoids an error on bootup This avoids an error on bootup
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
Upstream-Status: Pending Upstream-Status: Pending
Index: alsa-utils-1.0.27.2/alsactl/Makefile.am Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
=================================================================== Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
--- alsa-utils-1.0.27.2.orig/alsactl/Makefile.am ---
+++ alsa-utils-1.0.27.2/alsactl/Makefile.am alsactl/Makefile.am | 7 ++++---
@@ -36,8 +36,8 @@ install-data-hook: alsactl/alsa-restore.service.in | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
index 47f06e9..b728c06 100644
--- a/alsactl/Makefile.am
+++ b/alsactl/Makefile.am
@@ -43,9 +43,10 @@ install-data-hook:
endif endif
edit = \ edit = \
- $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ - $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
- -e 's,@mydatadir\@,$(mydatadir),g' \
- -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ - -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' \ + $(SED) -e 's,@localstatedir\@,$(localstatedir),g' \
+ -e 's,@sbindir\@,$(sbindir),g' \
+ -e 's,@mydatadir\@,$(mydatadir),g' \
+ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ + -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
< $< > $@ || rm $@ < $< > $@ || rm $@
alsa-state.service: alsa-state.service.in alsa-state.service: alsa-state.service.in
Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
=================================================================== index 245a439..b017854 100644
--- alsa-utils-1.0.27.2.orig/alsactl/alsa-restore.service.in --- a/alsactl/alsa-restore.service.in
+++ alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in
@@ -10,6 +10,7 @@ DefaultDependencies=no @@ -10,6 +10,7 @@ DefaultDependencies=no
After=alsa-state.service After=alsa-state.service
Before=shutdown.target Before=shutdown.target
@@ -38,3 +47,6 @@ Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in
[Service] [Service]
Type=oneshot Type=oneshot
--
1.9.1
@@ -15,8 +15,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 \ file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
" "
SRC_URI[md5sum] = "b65e9a04181bd7c9db7667a4566f8dc3" SRC_URI[md5sum] = "361552d5b1cacd0a1e7ba09e69990211"
SRC_URI[sha256sum] = "02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea" SRC_URI[sha256sum] = "f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc"
# lazy hack. needs proper fixing in gettext.m4, see # lazy hack. needs proper fixing in gettext.m4, see
# http://bugs.openembedded.org/show_bug.cgi?id=2348 # http://bugs.openembedded.org/show_bug.cgi?id=2348