diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-02-22 13:45:17 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-02-22 13:45:17 +0000 |
| commit | 3eb08d3bc1764ec5e6be2f7e5e076661708084a9 (patch) | |
| tree | f7b4336fa12870f999f83951a563fcc74f33c7ad | |
| parent | 895a9dd1f50ff354216c15a34275b32967054936 (diff) | |
| download | aports-3eb08d3bc1764ec5e6be2f7e5e076661708084a9.tar.bz2 aports-3eb08d3bc1764ec5e6be2f7e5e076661708084a9.tar.xz | |
main/alsa-utils: upgrade to 1.0.24.2
| -rw-r--r-- | main/alsa-utils/APKBUILD | 14 | ||||
| -rw-r--r-- | main/alsa-utils/uclibc-exp10.patch | 25 |
2 files changed, 35 insertions, 4 deletions
diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD index d7263e6aec..d9e1826b01 100644 --- a/main/alsa-utils/APKBUILD +++ b/main/alsa-utils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alsa-utils -pkgver=1.0.23 -pkgrel=3 +pkgver=1.0.24.2 +pkgrel=0 pkgdesc="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)" url="http://www.alsa-project.org" arch="all" @@ -12,6 +12,7 @@ depends="dialog" subpackages="$pkgname-doc alsaconf" source="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2 alsaconf.patch + uclibc-exp10.patch alsa.initd alsa.confd " @@ -20,7 +21,11 @@ _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" -# patch -Np1 -i ../alsaconf.patch || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done return 0 } @@ -47,7 +52,8 @@ alsaconf() { install -D -m755 alsaconf/alsaconf "$subpkgdir"/usr/bin/alsaconf } -md5sums="cb0cf46029ac9549cf3a31bff6a4f4e1 alsa-utils-1.0.23.tar.bz2 +md5sums="8238cd57cb301d1c36bcf0ecb59ce6b2 alsa-utils-1.0.24.2.tar.bz2 5e65f278b5a77e3ee2821ad955c4cd91 alsaconf.patch +58c30caa1c47de084e70ca353698e976 uclibc-exp10.patch 219cd8b7b3e250895550b1d60cfc219f alsa.initd 85b1f1e759fe5953eca329237f4ac256 alsa.confd" diff --git a/main/alsa-utils/uclibc-exp10.patch b/main/alsa-utils/uclibc-exp10.patch new file mode 100644 index 0000000000..e021374a25 --- /dev/null +++ b/main/alsa-utils/uclibc-exp10.patch @@ -0,0 +1,25 @@ +diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c +index 9cacad8..f08f003 100644 +--- a/alsamixer/volume_mapping.c ++++ b/alsamixer/volume_mapping.c +@@ -109,9 +109,9 @@ static double get_normalized_volume(snd_mixer_elem_t *elem, + if (use_linear_dB_scale(min, max)) + return (value - min) / (double)(max - min); + +- normalized = exp10((value - max) / 6000.0); ++ normalized = exp(M_LN10 * (value - max) / 6000.0); + if (min != SND_CTL_TLV_DB_GAIN_MUTE) { +- min_norm = exp10((min - max) / 6000.0); ++ min_norm = exp(M_LN10 * (min - max) / 6000.0); + normalized = (normalized - min_norm) / (1 - min_norm); + } + +@@ -144,7 +144,7 @@ static int set_normalized_volume(snd_mixer_elem_t *elem, + } + + if (min != SND_CTL_TLV_DB_GAIN_MUTE) { +- min_norm = exp10((min - max) / 6000.0); ++ min_norm = exp(M_LN10 * (min - max) / 6000.0); + volume = volume * (1 - min_norm) + min_norm; + } + value = lrint_dir(6000.0 * log10(volume), dir) + max; |