summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Pretzsch <apr@cn-eng.de>2019-06-28 17:25:46 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-06-29 11:23:14 +0200
commit78636b431999b03e93e9dfea38d2bac23e4fa026 (patch)
treea377e8e3a6ef988949ecd3d3392aaab3edc61daf
parent59a84cd142236ceef4a6c65926f53b171e0772a0 (diff)
downloadptxdist-78636b431999b03e93e9dfea38d2bac23e4fa026.tar.gz
ptxdist-78636b431999b03e93e9dfea38d2bac23e4fa026.tar.xz
alsa-lib: version bump 1.1.7 -> 1.1.9
http mirror dl.ambiweb.de for ftp.alsa-project.org is gone. Replace it with official 'FTP via HTTP (web) access' mirror at 'https://www.alsa-project.org/files/pub/'. Patch '0001-add-largefile-support.patch' is still required, but should be refreshed someday by PTX: Applying patch 0001-add-largefile-support.patch patching file configure.ac Hunk #2 succeeded at 709 (offset 43 lines). As far as I can see from git commit log, no spectacular changes. User visible target changes 1.1.7 -> 1.1.9: - some minor bugfixes and improvements - conf: pcm dmix - add CHANNELS argument - a lot of UCM config file changes, additions, include updates User visible build changes 1.1.7 -> 1.1.9: - deprecated header /usr/include/asoundlib.h is gone - deprecated header /usr/include/sys/asoundlib.h is still there - deprecated (backward compatibility due to old mistake) extra include path '-I${includedir}/alsa' in alsa.pc is gone. See alsa-lib commit fc0e54c. Replace '#include <asoundlib.h>' with '#include <alsa/asoundlib.h>' in faulty code, as it should have been right from the start. Signed-off-by: Andreas Pretzsch <apr@cn-eng.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/alsa-lib-1.1.9/0001-add-largefile-support.patch (renamed from patches/alsa-lib-1.1.7/0001-add-largefile-support.patch)0
l---------patches/alsa-lib-1.1.9/autogen.sh (renamed from patches/alsa-lib-1.1.7/autogen.sh)0
-rw-r--r--patches/alsa-lib-1.1.9/series (renamed from patches/alsa-lib-1.1.7/series)0
-rw-r--r--rules/alsa-lib.in4
-rw-r--r--rules/alsa-lib.make6
5 files changed, 6 insertions, 4 deletions
diff --git a/patches/alsa-lib-1.1.7/0001-add-largefile-support.patch b/patches/alsa-lib-1.1.9/0001-add-largefile-support.patch
index 27b5480f7..27b5480f7 100644
--- a/patches/alsa-lib-1.1.7/0001-add-largefile-support.patch
+++ b/patches/alsa-lib-1.1.9/0001-add-largefile-support.patch
diff --git a/patches/alsa-lib-1.1.7/autogen.sh b/patches/alsa-lib-1.1.9/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/alsa-lib-1.1.7/autogen.sh
+++ b/patches/alsa-lib-1.1.9/autogen.sh
diff --git a/patches/alsa-lib-1.1.7/series b/patches/alsa-lib-1.1.9/series
index f96f3345c..f96f3345c 100644
--- a/patches/alsa-lib-1.1.7/series
+++ b/patches/alsa-lib-1.1.9/series
diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in
index 7361f1226..ec5134d32 100644
--- a/rules/alsa-lib.in
+++ b/rules/alsa-lib.in
@@ -103,7 +103,9 @@ config ALSA_LIB_UCM
config ALSA_LIB_ALISP
bool
default y
- # necessary files missing in the tarball for version 1.1.7
+ # alisp itself broken in 1.1.7 builds now (alsa-lib commit 639d404),
+ # but then targets SI7018/sndo[cp]-mixer.alisp in src/conf/cards/
+ # fail (missing in tarball, present in git tree).
depends on BROKEN
prompt "alisp"
help
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index b8e1105a8..698b232aa 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -20,11 +20,11 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
ALSA_LIB_SUFFIX := tar.bz2
ifdef PTXCONF_ALSA_LIB_FULL
-ALSA_LIB_VERSION := 1.1.7
-ALSA_LIB_MD5 := 51ca1283e27e7dc10207ccce33919cf2
+ALSA_LIB_VERSION := 1.1.9
+ALSA_LIB_MD5 := e6d429dbdcfaa0f034d907fa6dc3735e
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) \
+ https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \
ftp://ftp.alsa-project.org/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX)
endif