summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa/alsa-utils
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-utils')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch46
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch21
3 files changed, 82 insertions, 0 deletions
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
new file mode 100644
index 0000000000..1690ca566c
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch
@@ -0,0 +1,46 @@
1From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 9 Oct 2011 20:06:35 +0200
4Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing
5
6This avoids an error on bootup
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9---
10
11Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
12
13Upstream-Status: Pending
14
15 alsactl/Makefile.am | 2 +-
16 alsactl/alsa-restore.service.in | 1 +
17 2 files changed, 2 insertions(+), 1 deletions(-)
18
19diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
20index 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)
32diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in
33index 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--
451.6.6.1
46
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch b/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..1a20b48fd4
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Submitted [alsa-devel@alsa-project.org]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd alsa-utils-1.0.25/configure.in alsa-utils-1.0.25/configure.in
5--- alsa-utils-1.0.25/configure.in 2012-01-25 11:43:48.000000000 +0200
6+++ alsa-utils-1.0.25/configure.in 2013-01-12 10:11:51.401498722 +0200
7@@ -269,7 +269,7 @@
8 TESTSOUND="$dir/test.wav")
9 AC_SUBST(TESTSOUND)
10
11-AM_CONFIG_HEADER(include/aconfig.h)
12+AC_CONFIG_HEADERS(include/aconfig.h)
13
14 dnl Checks for typedefs, structures, and compiler characteristics.
15 AC_C_CONST
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch b/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch
new file mode 100644
index 0000000000..b2a9a956cc
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch
@@ -0,0 +1,21 @@
1uclibc does not have exp10 function which is glibc extension.
2Bur we can get the same behavior by using pow()
3
4Upstream-Status: Pending
5
6Khem Raj <raj.khem@gmail.com>
7
8Index: 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