diff options
author | Kang Kai <kai.kang@windriver.com> | 2012-03-14 17:03:40 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-14 13:17:43 +0000 |
commit | f7c743040e8469d6727d4ea4b3d29fd7c8db48f5 (patch) | |
tree | eee8b2bb50858e7fa4d3b191c9f79a90372ca2b6 /meta | |
parent | 1a467d8d8c28b444873d8ee39a5a2f753fd0c2af (diff) | |
download | poky-f7c743040e8469d6727d4ea4b3d29fd7c8db48f5.tar.gz |
alsa-utils: update to 1.0.25
Update to version 1.0.25, and update patch
0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
because rejected when apply it.
(From OE-Core rev: 23694c3dd5ce3c997f616804e7b01a784c46ff0b)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | 4 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb) | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch index 55e180aa0c..1690ca566c 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.24.2/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | |||
@@ -24,8 +24,8 @@ index 5cfc415..c3768c4 100644 | |||
24 | endif | 24 | endif |
25 | 25 | ||
26 | edit = \ | 26 | edit = \ |
27 | - sed $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ | 27 | - $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ |
28 | + sed $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ | 28 | + $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ |
29 | 29 | ||
30 | alsa-store.service: alsa-store.service.in | 30 | alsa-store.service: alsa-store.service.in |
31 | $(edit) | 31 | $(edit) |
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb index 82200c9c0b..879a11747b 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.25.bb | |||
@@ -3,10 +3,10 @@ HOMEPAGE = "http://www.alsa-project.org" | |||
3 | BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" | 3 | BUGTRACKER = "https://bugtrack.alsa-project.org/alsa-bug/login_page.php" |
4 | SECTION = "console/utils" | 4 | SECTION = "console/utils" |
5 | LICENSE = "GPLv2+" | 5 | LICENSE = "GPLv2+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ |
7 | file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" | 7 | file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" |
8 | DEPENDS = "alsa-lib ncurses libsamplerate0" | 8 | DEPENDS = "alsa-lib ncurses libsamplerate0" |
9 | PR = "r6" | 9 | PR = "r0" |
10 | 10 | ||
11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ | 11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ |
12 | file://ncursesfix.patch \ | 12 | file://ncursesfix.patch \ |
@@ -14,8 +14,8 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ | |||
14 | file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ | 14 | file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI[md5sum] = "8238cd57cb301d1c36bcf0ecb59ce6b2" | 17 | SRC_URI[md5sum] = "f81f9dcb9a014fd32cb3a70066a5b9a9" |
18 | SRC_URI[sha256sum] = "95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2" | 18 | SRC_URI[sha256sum] = "2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c" |
19 | 19 | ||
20 | # lazy hack. needs proper fixing in gettext.m4, see | 20 | # lazy hack. needs proper fixing in gettext.m4, see |
21 | # http://bugs.openembedded.org/show_bug.cgi?id=2348 | 21 | # http://bugs.openembedded.org/show_bug.cgi?id=2348 |