diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-10-12 19:03:56 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-10-13 11:44:16 +0200 |
| commit | 73c957f1c7772005ac71552f9e9c017305b6c437 (patch) | |
| tree | b43b1e849e0d6b2ff19dd8137ecb5996ec811748 | |
| parent | 9d183d9c50a80df9cc798fe3757fa6d76ed5efea (diff) | |
| download | ptxdist-73c957f1c7772005ac71552f9e9c017305b6c437.tar.gz ptxdist-73c957f1c7772005ac71552f9e9c017305b6c437.tar.xz | |
alsa-lib: version bump 1.0.23 -> 1.0.24.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/alsa-lib-1.0.24.1/0001-ctlparse-Respect-softfloat-configure-option.patch | 35 | ||||
| -rw-r--r-- | patches/alsa-lib-1.0.24.1/series | 1 | ||||
| -rw-r--r-- | rules/alsa-lib.in | 7 | ||||
| -rw-r--r-- | rules/alsa-lib.make | 11 |
4 files changed, 51 insertions, 3 deletions
diff --git a/patches/alsa-lib-1.0.24.1/0001-ctlparse-Respect-softfloat-configure-option.patch b/patches/alsa-lib-1.0.24.1/0001-ctlparse-Respect-softfloat-configure-option.patch new file mode 100644 index 000000000..fcc98e777 --- /dev/null +++ b/patches/alsa-lib-1.0.24.1/0001-ctlparse-Respect-softfloat-configure-option.patch @@ -0,0 +1,35 @@ +From 1720d30ad82ebb8b5f52fc08c6c610e51203fa89 Mon Sep 17 00:00:00 2001 +From: Alexander Stein <a.stein@systec-electronic.com> +Date: Thu, 19 May 2011 15:16:36 +0200 +Subject: [PATCH] ctlparse: Respect softfloat configure option + +If we want softlfoat we can't use ceil which uses libm. + +Signed-off-by: Alexander Stein <a.stein@systec-electronic.com> +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + src/control/ctlparse.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/src/control/ctlparse.c b/src/control/ctlparse.c +index a929816..a16f96a 100644 +--- a/src/control/ctlparse.c ++++ b/src/control/ctlparse.c +@@ -33,8 +33,17 @@ + + /* Function to convert from percentage to volume. val = percentage */ + ++#ifdef HAVE_SOFT_FLOAT ++static inline long int convert_prange1(long val, long min, long max) ++{ ++ long temp = val * (max - min); ++ return temp / 100 + min + ((temp % 100) == 0 ? 0 : 1); ++} ++#else ++ + #define convert_prange1(val, min, max) \ + ceil((val) * ((max) - (min)) * 0.01 + (min)) ++#endif + + #define check_range(val, min, max) \ + ((val < min) ? (min) : ((val > max) ? (max) : (val))) diff --git a/patches/alsa-lib-1.0.24.1/series b/patches/alsa-lib-1.0.24.1/series new file mode 100644 index 000000000..fc771e090 --- /dev/null +++ b/patches/alsa-lib-1.0.24.1/series @@ -0,0 +1 @@ +0001-ctlparse-Respect-softfloat-configure-option.patch diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in index cfe2de14a..393a02a8b 100644 --- a/rules/alsa-lib.in +++ b/rules/alsa-lib.in @@ -87,6 +87,13 @@ config ALSA_LIB_SEQ help Disable the sequencer component if you do not need it +config ALSA_LIB_UCM + bool + default y + prompt "use-case-manager" + help + Disable the use-case-manager component if you do not need it + config ALSA_LIB_ALISP bool default y diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make index eebe790fa..929ab4e42 100644 --- a/rules/alsa-lib.make +++ b/rules/alsa-lib.make @@ -20,8 +20,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib ALSA_LIB_SUFFIX := tar.bz2 ifdef PTXCONF_ALSA_LIB_FULL -ALSA_LIB_VERSION := 1.0.23 -ALSA_LIB_MD5 := f48b50421d8a69d2d806d9c47e534f0d +ALSA_LIB_VERSION := 1.0.24.1 +ALSA_LIB_MD5 := 7cc05f25e1d5b65da8fb3fdcd540f226 ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION) ALSA_LIB_URL := \ http://dl.ambiweb.de/mirrors/ftp.alsa-project.org/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \ @@ -63,7 +63,6 @@ ALSA_LIB_AUTOCONF := \ --enable-fast-install \ --enable-libtool-lock \ --enable-symbolic-functions \ - --disable-debug \ --disable-old-symbols \ --disable-python \ --with-tmpdir=/tmp \ @@ -119,6 +118,12 @@ else ALSA_LIB_AUTOCONF += --disable-seq endif +ifdef PTXCONF_ALSA_LIB_UCM +ALSA_LIB_AUTOCONF += --enable-ucm +else +ALSA_LIB_AUTOCONF += --disable-ucm +endif + ifdef PTXCONF_ALSA_LIB_ALISP ALSA_LIB_AUTOCONF += --enable-alisp else |