alsa-lib: Update to 1.1.2

5 files changed, 24 insertions, 22 deletions

diff --git a/media/alsa-lib/.rev b/media/alsa-lib/.rev
index e69de29b..d00491fd 100644
--- a/media/alsa-lib/.rev
+++ b/media/alsa-lib/.rev
@@ -0,0 +1 @@
+1
diff --git a/media/alsa-lib/config.h b/media/alsa-lib/config.h
index 9f0b8e7f..bce1f1f0 100644
--- a/media/alsa-lib/config.h
+++ b/media/alsa-lib/config.h
@@ -9,13 +9,13 @@
 /* #undef BUILD_HWDEP */
 #define BUILD_MIXER "1"
 #define BUILD_PCM "1"
-#undef BUILD_PCM_PLUGIN_ADPCM
-#undef BUILD_PCM_PLUGIN_ALAW
-#undef BUILD_PCM_PLUGIN_LFLOAT
-#undef BUILD_PCM_PLUGIN_MMAP_EMUL
-#undef BUILD_PCM_PLUGIN_MULAW
-#undef BUILD_PCM_PLUGIN_RATE
-#undef BUILD_PCM_PLUGIN_ROUTE
+/* #undef BUILD_PCM_PLUGIN_ADPCM */
+/* #undef BUILD_PCM_PLUGIN_ALAW */
+/* #undef BUILD_PCM_PLUGIN_LFLOAT */
+/* #undef BUILD_PCM_PLUGIN_MMAP_EMUL */
+/* #undef BUILD_PCM_PLUGIN_MULAW */
+/* #undef BUILD_PCM_PLUGIN_RATE */
+/* #undef BUILD_PCM_PLUGIN_ROUTE */
 /* #undef BUILD_RAWMIDI */
 #define BUILD_SEQ "1"
 #define BUILD_TOPOLOGY "1"
@@ -34,13 +34,14 @@
 #define PACKAGE "alsa-lib"
 #define PACKAGE_BUGREPORT ""
 #define PACKAGE_NAME "alsa-lib"
-#define PACKAGE_STRING "alsa-lib 1.1.1"
+#define PACKAGE_STRING "alsa-lib 1.1.2"
 #define PACKAGE_TARNAME "alsa-lib"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.1.1"
+#define PACKAGE_VERSION "1.1.2"
 #define SND_MAX_CARDS 32
 #define SUPPORT_ALOAD "1"
 /* #undef SUPPORT_RESMGR */
+#define THREAD_SAFE_API "1"
 #define TIME_WITH_SYS_TIME 1
 #define TMPDIR "/tmp"
 #ifndef _ALL_SOURCE
@@ -58,7 +59,7 @@
 #ifndef __EXTENSIONS__
 # define __EXTENSIONS__ 1
 #endif
-#define VERSION "1.1.1"
+#define VERSION "1.1.2"
 #define VERSIONED_SYMBOLS /**/
 /* #undef _MINIX */
 /* #undef _POSIX_1_SOURCE */
diff --git a/media/alsa-lib/gen.rc b/media/alsa-lib/gen.rc
index 45f44e3b..88157433 100644
--- a/media/alsa-lib/gen.rc
+++ b/media/alsa-lib/gen.rc
@@ -7,7 +7,7 @@ cflags\
 hdrs=(\
 	asoundef.h\
 	global.h input.h output.h error.h\
-	conf.h control.h iatomic.h\
+	conf.h control.h\
 	pcm.h pcm_old.h timer.h\
 	pcm_plugin.h\
 	pcm_rate.h\
@@ -33,7 +33,7 @@ lib libasound.a src/^(\
 	)\
 	mixer/^(bag.c mixer.c simple.c simple_none.c)\
 	pcm/^(\
-		atomic.c mask.c interval.c\
+		mask.c interval.c\
 		pcm.c pcm_params.c pcm_simple.c\
 		pcm_hw.c pcm_misc.c pcm_mmap.c pcm_symbols.c\
 		pcm_generic.c pcm_plugin.c\
diff --git a/media/alsa-lib/patch/0001-Fix-poll.h-includes.patch b/media/alsa-lib/patch/0001-Fix-poll.h-includes.patch
index e4ede2e2..b4dc2291 100644
--- a/media/alsa-lib/patch/0001-Fix-poll.h-includes.patch
+++ b/media/alsa-lib/patch/0001-Fix-poll.h-includes.patch
@@ -1,4 +1,4 @@
-From 15dd1c8eec1d53e1135a048a82cb9c9232739e5a Mon Sep 17 00:00:00 2001
+From 005c1bcf8cd87091af1106b85fb6cd39cac819ab Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 1 Jul 2016 20:08:30 -0700
 Subject: [PATCH] Fix poll.h includes
@@ -57,18 +57,18 @@ index 317f2e3..6a43a47 100644
  #include <errno.h>
  #if defined(__linux__)
 diff --git a/src/control/control.c b/src/control/control.c
-index 8a5d530..2f20db5 100644
+index 6c00b8e..fd0c303 100644
 --- a/src/control/control.c
 +++ b/src/control/control.c
-@@ -48,7 +48,7 @@ and IEC958 structure.
+@@ -90,7 +90,7 @@ I/O operations.
  #include <string.h>
  #include <fcntl.h>
  #include <signal.h>
 -#include <sys/poll.h>
 +#include <poll.h>
+ #include <stdbool.h>
  #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
@@ -83,10 +83,10 @@ index bd07d4a..9a2e268 100644
  #include <sys/uio.h>
  #include <sys/mman.h>
 diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
-index 203e7a5..b5cc07b 100644
+index f832399..e9d502a 100644
 --- a/src/pcm/pcm.c
 +++ b/src/pcm/pcm.c
-@@ -634,7 +634,7 @@ playback devices.
+@@ -650,7 +650,7 @@ playback devices.
  #include <stdarg.h>
  #include <signal.h>
  #include <ctype.h>
@@ -96,7 +96,7 @@ index 203e7a5..b5cc07b 100644
  #include <limits.h>
  #include "pcm_local.h"
 diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
-index 14de734..b0d50f8 100644
+index c3925cc..18f1dd5 100644
 --- a/src/pcm/pcm_direct.c
 +++ b/src/pcm/pcm_direct.c
 @@ -30,7 +30,7 @@
@@ -109,7 +109,7 @@ index 14de734..b0d50f8 100644
  #include <sys/sem.h>
  #include <sys/wait.h>
 diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c
-index 5c4fbe1..2cfa7db 100644
+index 1948289..4cf220a 100644
 --- a/src/pcm/pcm_mmap.c
 +++ b/src/pcm/pcm_mmap.c
 @@ -22,7 +22,7 @@
@@ -148,7 +148,7 @@ index a815ac6..4ee958c 100644
  #include <sys/mman.h>
  #include <netinet/in.h>
 diff --git a/src/seq/seq.c b/src/seq/seq.c
-index 4405e68..2e44b47 100644
+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)
@@ -174,5 +174,5 @@ index 9843aa8..eaa71f0 100644
  #include <sys/shm.h>
  #include "list.h"
 -- 
-2.9.0
+2.9.2
 
diff --git a/media/alsa-lib/src b/media/alsa-lib/src
-Subproject 6a610e56aeef5048136336f7f54db05f061ee4d
+Subproject 1bf144013cffdeb41a5df3a11a8eb2596c5ea2b