diff options
| author | Chih-Min Chao <cmchao@gmail.com> | 2011-03-11 16:13:28 +0800 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-03-14 09:49:41 +0100 |
| commit | 8ddc9da39ca0eaf67dbf458e8d6799bc78169a53 (patch) | |
| tree | 1162d3f232533cd1f851fe8e0fbb1a79a6f5cd0b /package/multimedia | |
| parent | 915ad4cdbba1a52e6f88b9a39d030632a1901f86 (diff) | |
alsa-utils: bump to 1.0.24.2
[Peter: fix exp10 breakage on uClibc]
Signed-off-by: Chih-Min Chao <cmchao@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/multimedia')
| -rw-r--r-- | package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch | 33 | ||||
| -rw-r--r-- | package/multimedia/alsa-utils/alsa-utils.mk | 2 |
2 files changed, 34 insertions, 1 deletions
diff --git a/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch b/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch new file mode 100644 index 000000000..f4a520a5c --- /dev/null +++ b/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch @@ -0,0 +1,33 @@ +From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard <jacmet@sunsite.dk> +Date: Mon, 14 Mar 2011 09:19:18 +0100 +Subject: [PATCH] alsamixer: fix build on uClibc + +exp10 is a glibc extension, which isn't supported on uClibc. Luckily, +exp10() is trivial to compute based on exp(), so add a wrapper for +the uClibc case. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + alsamixer/volume_mapping.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c +index 9cacad8..1c0d7c4 100644 +--- a/alsamixer/volume_mapping.c ++++ b/alsamixer/volume_mapping.c +@@ -37,6 +37,11 @@ + #include <stdbool.h> + #include "volume_mapping.h" + ++#ifdef __UCLIBC__ ++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ ++#define exp10(x) (exp((x) * log(10))) ++#endif /* __UCLIBC__ */ ++ + #define MAX_LINEAR_DB_SCALE 24 + + static inline bool use_linear_dB_scale(long dBmin, long dBmax) +-- +1.7.2.3 + diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index 4ab49d3d6..26c270bac 100644 --- a/package/multimedia/alsa-utils/alsa-utils.mk +++ b/package/multimedia/alsa-utils/alsa-utils.mk @@ -3,7 +3,7 @@ # alsa-utils # ############################################################# -ALSA_UTILS_VERSION = 1.0.23 +ALSA_UTILS_VERSION = 1.0.24.2 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils ALSA_UTILS_INSTALL_STAGING = YES |