From 0164d6db57b7aa8cb8b1d7afbbcda06e66bc855a Mon Sep 17 00:00:00 2001 From: Peter Wagner Date: Wed, 24 May 2017 02:32:38 +0200 Subject: [PATCH] alsa-lib: update to 1.1.4 Signed-off-by: Peter Wagner --- libs/alsa-lib/Makefile | 4 +-- libs/alsa-lib/patches/002-compile_fix.patch | 12 -------- ...{001-link_fix.patch => 100-link_fix.patch} | 2 +- ...-fix_include_file_redirect_warnings.patch} | 28 +------------------ 4 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 libs/alsa-lib/patches/002-compile_fix.patch rename libs/alsa-lib/patches/{001-link_fix.patch => 100-link_fix.patch} (95%) rename libs/alsa-lib/patches/{005-fix_include_file_redirect_warnings.patch => 200-fix_include_file_redirect_warnings.patch} (72%) diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile index 5adcef455..813dcbb80 100644 --- a/libs/alsa-lib/Makefile +++ b/libs/alsa-lib/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alsa-lib -PKG_VERSION:=1.1.3 +PKG_VERSION:=1.1.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \ http://alsa.cybermirror.org/lib/ -PKG_HASH:=71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c +PKG_HASH:=82f50a09487079755d93e4c9384912196995bade6280bce9bfdcabf094bfb515 PKG_MAINTAINER:=Ted Hess , \ Peter Wagner diff --git a/libs/alsa-lib/patches/002-compile_fix.patch b/libs/alsa-lib/patches/002-compile_fix.patch deleted file mode 100644 index e490773a2..000000000 --- a/libs/alsa-lib/patches/002-compile_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/ucm/parser.c b/src/ucm/parser.c -index c98373a..f520abc 100644 ---- a/src/ucm/parser.c -+++ b/src/ucm/parser.c -@@ -32,6 +32,7 @@ - - #include "ucm_local.h" - #include -+#include - - /** The name of the environment variable containing the UCM directory */ - #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM" diff --git a/libs/alsa-lib/patches/001-link_fix.patch b/libs/alsa-lib/patches/100-link_fix.patch similarity index 95% rename from libs/alsa-lib/patches/001-link_fix.patch rename to libs/alsa-lib/patches/100-link_fix.patch index 001a8bc6f..2869dbf63 100644 --- a/libs/alsa-lib/patches/001-link_fix.patch +++ b/libs/alsa-lib/patches/100-link_fix.patch @@ -1,6 +1,6 @@ --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -418,7 +418,7 @@ clean-libLTLIBRARIES: +@@ -421,7 +421,7 @@ clean-libLTLIBRARIES: rm -f $${locs}; \ } libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES) $(EXTRA_libasound_la_DEPENDENCIES) diff --git a/libs/alsa-lib/patches/005-fix_include_file_redirect_warnings.patch b/libs/alsa-lib/patches/200-fix_include_file_redirect_warnings.patch similarity index 72% rename from libs/alsa-lib/patches/005-fix_include_file_redirect_warnings.patch rename to libs/alsa-lib/patches/200-fix_include_file_redirect_warnings.patch index 42904ab2f..a0976bd1e 100644 --- a/libs/alsa-lib/patches/005-fix_include_file_redirect_warnings.patch +++ b/libs/alsa-lib/patches/200-fix_include_file_redirect_warnings.patch @@ -1,5 +1,3 @@ -diff --git a/aserver/aserver.c b/aserver/aserver.c -index ac20706..46f731a 100644 --- a/aserver/aserver.c +++ b/aserver/aserver.c @@ -20,7 +20,7 @@ @@ -11,8 +9,6 @@ index ac20706..46f731a 100644 #include #include #include -diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h -index 1ec611e..21e32c6 100644 --- a/include/asoundlib-head.h +++ b/include/asoundlib-head.h @@ -35,6 +35,6 @@ @@ -23,8 +19,6 @@ index 1ec611e..21e32c6 100644 +#include #include #include -diff --git a/include/asoundlib.h b/include/asoundlib.h -index 3c2766e..a546194 100644 --- a/include/asoundlib.h +++ b/include/asoundlib.h @@ -35,7 +35,7 @@ @@ -36,8 +30,6 @@ index 3c2766e..a546194 100644 #include #include #include -diff --git a/include/local.h b/include/local.h -index 317f2e3..6a43a47 100644 --- a/include/local.h +++ b/include/local.h @@ -47,7 +47,7 @@ @@ -49,8 +41,6 @@ index 317f2e3..6a43a47 100644 #include #include #if defined(__linux__) -diff --git a/src/control/control.c b/src/control/control.c -index 134ba4c..6439b29 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -90,7 +90,7 @@ against the original design. @@ -62,8 +52,6 @@ index 134ba4c..6439b29 100644 #include #include "control_local.h" -diff --git a/src/control/control_shm.c b/src/control/control_shm.c -index bd07d4a..9a2e268 100644 --- a/src/control/control_shm.c +++ b/src/control/control_shm.c @@ -27,7 +27,7 @@ @@ -75,8 +63,6 @@ index bd07d4a..9a2e268 100644 #include #include #include -diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c -index 0cf740f..a28589d 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -651,7 +651,7 @@ playback devices. @@ -88,8 +74,6 @@ index 0cf740f..a28589d 100644 #include #include #include "pcm_local.h" -diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c -index 6434983..b3c0b2d 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -30,7 +30,7 @@ @@ -101,8 +85,6 @@ index 6434983..b3c0b2d 100644 #include #include #include -diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c -index 1948289..4cf220a 100644 --- a/src/pcm/pcm_mmap.c +++ b/src/pcm/pcm_mmap.c @@ -22,7 +22,7 @@ @@ -114,8 +96,6 @@ index 1948289..4cf220a 100644 #include #ifdef HAVE_SYS_SHM_H #include -diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c -index 5d8aaf2..21a57fc 100644 --- a/src/pcm/pcm_share.c +++ b/src/pcm/pcm_share.c @@ -34,7 +34,7 @@ @@ -127,8 +107,6 @@ index 5d8aaf2..21a57fc 100644 #include #include "pcm_local.h" -diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c -index a815ac6..4ee958c 100644 --- a/src/pcm/pcm_shm.c +++ b/src/pcm/pcm_shm.c @@ -36,7 +36,7 @@ @@ -140,11 +118,9 @@ index a815ac6..4ee958c 100644 #include #include #include -diff --git a/src/seq/seq.c b/src/seq/seq.c -index 9279830..d2027cb 100644 --- a/src/seq/seq.c +++ b/src/seq/seq.c -@@ -777,7 +777,7 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev) +@@ -777,7 +777,7 @@ void event_filter(snd_seq_t *seq, snd_se */ @@ -153,8 +129,6 @@ index 9279830..d2027cb 100644 #include "seq_local.h" /**************************************************************************** -diff --git a/src/shmarea.c b/src/shmarea.c -index 9843aa8..eaa71f0 100644 --- a/src/shmarea.c +++ b/src/shmarea.c @@ -27,7 +27,7 @@