summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-07-31 17:49:19 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-03 10:33:09 +0100
commit4813e2d56585d276c7c8ddd2c13d3b41feb231a6 (patch)
tree98205f67cebae85db273b1822eee0ce1de8f1fa9 /meta
parent6d5d0c41a7cc52e429bfd69ea0ec9215f8150b51 (diff)
downloadpoky-4813e2d56585d276c7c8ddd2c13d3b41feb231a6.tar.gz
alsa-utils: upgrade to 1.0.27.2
obsolete_automake_macros.patch, uclibc-exp10-replacement.patch patches removed; included in upstream. (From OE-Core rev: f74b10cbbecdabcbef695bbdfd26ca4c35c7d369) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.26.bb)0
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch40
-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
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb (renamed from meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb)7
5 files changed, 19 insertions, 64 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.26.bb b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.bb
index a3fa1d076b..a3fa1d076b 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.26.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils-alsaconf_1.0.27.2.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 1690ca566c..477cd11b12 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
@@ -6,41 +6,35 @@ Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.
6This avoids an error on bootup 6This avoids an error on bootup
7 7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9---
10 9
11Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 10Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459
12 11
13Upstream-Status: Pending 12Upstream-Status: Pending
14 13
15 alsactl/Makefile.am | 2 +- 14Index: alsa-utils-1.0.27.2/alsactl/Makefile.am
16 alsactl/alsa-restore.service.in | 1 + 15===================================================================
17 2 files changed, 2 insertions(+), 1 deletions(-) 16--- alsa-utils-1.0.27.2.orig/alsactl/Makefile.am
18 17+++ alsa-utils-1.0.27.2/alsactl/Makefile.am
19diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am 18@@ -36,8 +36,8 @@ install-data-hook:
20index 5cfc415..c3768c4 100644
21--- a/alsactl/Makefile.am
22+++ b/alsactl/Makefile.am
23@@ -34,7 +34,7 @@ install-data-hook:
24 endif 19 endif
25 20
26 edit = \ 21 edit = \
27- $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ 22- $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \
28+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ 23- -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
24+ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' \
25+ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \
26 < $< > $@ || rm $@
29 27
30 alsa-store.service: alsa-store.service.in 28 alsa-state.service: alsa-state.service.in
31 $(edit) 29Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in
32diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in 30===================================================================
33index e97d196..3b76710 100644 31--- alsa-utils-1.0.27.2.orig/alsactl/alsa-restore.service.in
34--- a/alsactl/alsa-restore.service.in 32+++ alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in
35+++ b/alsactl/alsa-restore.service.in 33@@ -10,6 +10,7 @@ DefaultDependencies=no
36@@ -4,6 +4,7 @@ DefaultDependencies=no 34 After=alsa-state.service
37 After=sysinit.target
38 Before=shutdown.target 35 Before=shutdown.target
39 Conflicts=shutdown.target 36 Conflicts=shutdown.target
40+ConditionPathExists=@localstatedir@/lib/alsa/asound.state 37+ConditionPathExists=@localstatedir@/lib/alsa/asound.state
41 38
42 [Service] 39 [Service]
43 Type=oneshot 40 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
deleted file mode 100644
index 1a20b48fd4..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
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
deleted file mode 100644
index b2a9a956cc..0000000000
--- a/meta/recipes-multimedia/alsa/alsa-utils/uclibc-exp10-replacement.patch
+++ /dev/null
@@ -1,21 +0,0 @@
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
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
index e0bf75532c..a894171732 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.26.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
@@ -6,16 +6,13 @@ LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 6LIC_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"
8DEPENDS = "alsa-lib ncurses libsamplerate0 udev" 8DEPENDS = "alsa-lib ncurses libsamplerate0 udev"
9PR = "r0"
10 9
11SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ 10SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
12 file://uclibc-exp10-replacement.patch \
13 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \ 11 file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
14 file://obsolete_automake_macros.patch \
15 " 12 "
16 13
17SRC_URI[md5sum] = "4dcf1017fafc91603af96705c073eca9" 14SRC_URI[md5sum] = "b65e9a04181bd7c9db7667a4566f8dc3"
18SRC_URI[sha256sum] = "f85f2a3aa6e78475bbe35b0cad3a8cabb99f45ebc5f37962f2137b8df8b081e7" 15SRC_URI[sha256sum] = "02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea"
19 16
20# lazy hack. needs proper fixing in gettext.m4, see 17# lazy hack. needs proper fixing in gettext.m4, see
21# http://bugs.openembedded.org/show_bug.cgi?id=2348 18# http://bugs.openembedded.org/show_bug.cgi?id=2348