Signed-off-by: Ladislav Michl <[email protected]>
---
Changes:
-v2: just use --with-pcm-plugins=all unconditionally
.../0001-add-largefile-support.patch | 0
.../autogen.sh | 0
.../series | 0
rules/alsa-lib.make | 19 +++++++------------
4 files changed, 7 insertions(+), 12 deletions(-)
rename patches/{alsa-lib-1.1.4.1 =>
alsa-lib-1.1.6}/0001-add-largefile-support.patch (100%)
rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/autogen.sh (100%)
rename patches/{alsa-lib-1.1.4.1 => alsa-lib-1.1.6}/series (100%)
diff --git a/patches/alsa-lib-1.1.4.1/0001-add-largefile-support.patch
b/patches/alsa-lib-1.1.6/0001-add-largefile-support.patch
similarity index 100%
rename from patches/alsa-lib-1.1.4.1/0001-add-largefile-support.patch
rename to patches/alsa-lib-1.1.6/0001-add-largefile-support.patch
diff --git a/patches/alsa-lib-1.1.4.1/autogen.sh
b/patches/alsa-lib-1.1.6/autogen.sh
similarity index 100%
rename from patches/alsa-lib-1.1.4.1/autogen.sh
rename to patches/alsa-lib-1.1.6/autogen.sh
diff --git a/patches/alsa-lib-1.1.4.1/series b/patches/alsa-lib-1.1.6/series
similarity index 100%
rename from patches/alsa-lib-1.1.4.1/series
rename to patches/alsa-lib-1.1.6/series
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 4e150d42a..f3fe93aad 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.1.4.1
-ALSA_LIB_MD5 := 29fa3e69122d3cf3e8f0e01a0cb1d183
+ALSA_LIB_VERSION := 1.1.6
+ALSA_LIB_MD5 := 2f981a8f7897c59ec2ddc44916d33788
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)
\
@@ -43,13 +43,11 @@ ALSA_LIB_LICENSE := LGPL-2.1-or-later
# Prepare
# ----------------------------------------------------------------------------
-ALSA_LIB_PATH := PATH=$(CROSS_PATH)
-ALSA_LIB_ENV := $(CROSS_ENV)
-
#
# autoconf
#
-ALSA_LIB_AUTOCONF := \
+ALSA_LIB_CONF_TOOL := autoconf
+ALSA_LIB_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
$(GLOBAL_LARGE_FILE_OPTION) \
--enable-shared \
@@ -77,14 +75,11 @@ ALSA_LIB_AUTOCONF := \
--with-pthread \
--with-librt \
--with-alsa-devdir=/dev/snd \
- --with-aload-devdir=/dev
-
-ifdef PTXCONF_ALSA_LIB_PCM
-ALSA_LIB_AUTOCONF += --with-pcm-plugins=all
-endif
+ --with-aload-devdir=/dev \
+ --with-pcm-plugins=all
ifdef PTXCONF_ALSA_LIB_LIGHT
-ALSA_LIB_AUTOCONF += \
+ALSA_LIB_CONF_OPT += \
--enable-everyhing \
--enable-tlv \
--enable-timer \
--
2.19.1
_______________________________________________
ptxdist mailing list
[email protected]
