diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-14 14:54:56 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-14 14:55:07 +0000 |
commit | f2bc4c6a4828903d770f52efcd38750a46df0e2e (patch) | |
tree | 497fa8f3eccf49e1329d3141edb94259510258f2 /meta/recipes-multimedia/alsa/alsa-utils-1.0.25 | |
parent | 8a2dcd4224520866791b00c5d0d270ea86e320bd (diff) | |
download | poky-f2bc4c6a4828903d770f52efcd38750a46df0e2e.tar.gz |
alsa-utils: Add rename accidently dropped during patch merge
(From OE-Core rev: 96b7e1780c3a25bc19022b66a9d92a9ccf22dc59)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-utils-1.0.25')
3 files changed, 111 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch new file mode 100644 index 0000000000..1690ca566c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Sun, 9 Oct 2011 20:06:35 +0200 | ||
4 | Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing | ||
5 | |||
6 | This avoids an error on bootup | ||
7 | |||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
9 | --- | ||
10 | |||
11 | Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | alsactl/Makefile.am | 2 +- | ||
16 | alsactl/alsa-restore.service.in | 1 + | ||
17 | 2 files changed, 2 insertions(+), 1 deletions(-) | ||
18 | |||
19 | diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am | ||
20 | index 5cfc415..c3768c4 100644 | ||
21 | --- a/alsactl/Makefile.am | ||
22 | +++ b/alsactl/Makefile.am | ||
23 | @@ -34,7 +34,7 @@ install-data-hook: | ||
24 | endif | ||
25 | |||
26 | edit = \ | ||
27 | - $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ | ||
28 | + $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ | ||
29 | |||
30 | alsa-store.service: alsa-store.service.in | ||
31 | $(edit) | ||
32 | diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in | ||
33 | index e97d196..3b76710 100644 | ||
34 | --- a/alsactl/alsa-restore.service.in | ||
35 | +++ b/alsactl/alsa-restore.service.in | ||
36 | @@ -4,6 +4,7 @@ DefaultDependencies=no | ||
37 | After=sysinit.target | ||
38 | Before=shutdown.target | ||
39 | Conflicts=shutdown.target | ||
40 | +ConditionPathExists=@localstatedir@/lib/alsa/asound.state | ||
41 | |||
42 | [Service] | ||
43 | Type=oneshot | ||
44 | -- | ||
45 | 1.6.6.1 | ||
46 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch new file mode 100644 index 0000000000..9936dedf17 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/ncursesfix.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | Rebase the patch to fit 1.0.24.2 | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> | ||
6 | |||
7 | diff -ruN alsa-utils-1.0.24.2-orig//configure.in alsa-utils-1.0.24.2/configure.in | ||
8 | --- alsa-utils-1.0.24.2-orig//configure.in 2011-04-13 13:51:20.337665010 +0800 | ||
9 | +++ alsa-utils-1.0.24.2/configure.in 2011-04-13 13:51:54.437664986 +0800 | ||
10 | @@ -127,34 +127,16 @@ | ||
11 | NCURSESLIBSUFFIX="" | ||
12 | CURSES_NLS="no" | ||
13 | if test "$curseslib" = "ncursesw" -o \( "$curseslib" = "auto" -a "$USE_NLS" = "yes" \); then | ||
14 | - AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes]) | ||
15 | - if test "$ncursesw5_config" = "yes"; then | ||
16 | - CURSESINC="<ncurses.h>" | ||
17 | - CURSESLIB=`ncursesw5-config --libs` | ||
18 | - CURSESLIBDIR=`ncursesw5-config --libdir` | ||
19 | - CURSES_CFLAGS=`ncursesw5-config --cflags` | ||
20 | - curseslib="ncursesw" | ||
21 | - else | ||
22 | AC_CHECK_LIB(ncursesw, initscr, | ||
23 | [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"]) | ||
24 | - fi | ||
25 | if test -n "$CURSESINC"; then | ||
26 | NCURSESLIBSUFFIX="w" | ||
27 | CURSES_NLS="yes" | ||
28 | fi | ||
29 | fi | ||
30 | if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then | ||
31 | - AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes]) | ||
32 | - if test "$ncurses5_config" = "yes"; then | ||
33 | - CURSESINC="<ncurses.h>" | ||
34 | - CURSESLIB=`ncurses5-config --libs` | ||
35 | - CURSESLIBDIR=`ncurses5-config --libdir` | ||
36 | - CURSES_CFLAGS=`ncurses5-config --cflags` | ||
37 | - curseslib="ncurses" | ||
38 | - else | ||
39 | AC_CHECK_LIB(ncurses, initscr, | ||
40 | [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; curseslib="ncurses"]) | ||
41 | - fi | ||
42 | fi | ||
43 | if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then | ||
44 | AC_CHECK_LIB(curses, initscr, | ||
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch new file mode 100644 index 0000000000..b2a9a956cc --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils-1.0.25/uclibc-exp10-replacement.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | uclibc does not have exp10 function which is glibc extension. | ||
2 | Bur we can get the same behavior by using pow() | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | Index: alsa-utils-1.0.24.2/alsamixer/volume_mapping.c | ||
9 | =================================================================== | ||
10 | --- alsa-utils-1.0.24.2.orig/alsamixer/volume_mapping.c | ||
11 | +++ alsa-utils-1.0.24.2/alsamixer/volume_mapping.c | ||
12 | @@ -36,6 +36,9 @@ | ||
13 | #include <math.h> | ||
14 | #include <stdbool.h> | ||
15 | #include "volume_mapping.h" | ||
16 | +#ifdef __UCLIBC__ | ||
17 | +#define exp10(x) (pow(10, (x))) | ||
18 | +#endif /* __UCLIBC__ */ | ||
19 | |||
20 | #define MAX_LINEAR_DB_SCALE 24 | ||
21 | |||