main/alsa-lib: upgrade to 1.1.2

1 files changed, 57 insertions, 44 deletions

diff --git a/main/alsa-lib/alsa-lib-poll.patch b/main/alsa-lib/alsa-lib-poll.patch
index f3d2d88d38e..4dd6ddf9388 100644
--- a/main/alsa-lib/alsa-lib-poll.patch
+++ b/main/alsa-lib/alsa-lib-poll.patch
@@ -1,6 +1,7 @@
-diff -ru alsa-lib-1.1.0.orig/aserver/aserver.c alsa-lib-1.1.0/aserver/aserver.c
---- alsa-lib-1.1.0.orig/aserver/aserver.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/aserver/aserver.c	2016-02-11 14:31:58.800479098 +0200
+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 @@
  
  #include <sys/shm.h>
@@ -10,9 +11,10 @@ diff -ru alsa-lib-1.1.0.orig/aserver/aserver.c alsa-lib-1.1.0/aserver/aserver.c
  #include <sys/un.h>
  #include <sys/uio.h>
  #include <stdio.h>
-diff -ru alsa-lib-1.1.0.orig/include/asoundlib-head.h alsa-lib-1.1.0/include/asoundlib-head.h
---- alsa-lib-1.1.0.orig/include/asoundlib-head.h	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/include/asoundlib-head.h	2016-02-11 14:31:58.800479098 +0200
+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 @@
  #include <string.h>
  #include <fcntl.h>
@@ -21,9 +23,10 @@ diff -ru alsa-lib-1.1.0.orig/include/asoundlib-head.h alsa-lib-1.1.0/include/aso
 +#include <poll.h>
  #include <errno.h>
  #include <stdarg.h>
-diff -ru alsa-lib-1.1.0.orig/include/asoundlib.h alsa-lib-1.1.0/include/asoundlib.h
---- alsa-lib-1.1.0.orig/include/asoundlib.h	2015-11-09 09:40:19.000000000 +0200
-+++ alsa-lib-1.1.0/include/asoundlib.h	2016-02-11 14:31:58.800479098 +0200
+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 @@
  #include <string.h>
  #include <fcntl.h>
@@ -33,9 +36,10 @@ diff -ru alsa-lib-1.1.0.orig/include/asoundlib.h alsa-lib-1.1.0/include/asoundli
  #include <errno.h>
  #include <stdarg.h>
  #include <endian.h>
-diff -ru alsa-lib-1.1.0.orig/include/local.h alsa-lib-1.1.0/include/local.h
---- alsa-lib-1.1.0.orig/include/local.h	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/include/local.h	2016-02-11 14:31:58.797145726 +0200
+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 @@
  #error Header defining endianness not defined
  #endif
@@ -44,22 +48,24 @@ diff -ru alsa-lib-1.1.0.orig/include/local.h alsa-lib-1.1.0/include/local.h
 +#include <poll.h>
  #include <sys/types.h>
  #include <errno.h>
- #include <linux/types.h>
-diff -ru alsa-lib-1.1.0.orig/src/control/control.c alsa-lib-1.1.0/src/control/control.c
---- alsa-lib-1.1.0.orig/src/control/control.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/src/control/control.c	2016-02-11 14:31:58.807145843 +0200
-@@ -48,7 +48,7 @@
+ #if defined(__linux__)
+diff --git a/src/control/control.c b/src/control/control.c
+index 6c00b8e..fd0c303 100644
+--- a/src/control/control.c
++++ b/src/control/control.c
+@@ -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 -ru alsa-lib-1.1.0.orig/src/control/control_shm.c alsa-lib-1.1.0/src/control/control_shm.c
---- alsa-lib-1.1.0.orig/src/control/control_shm.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/src/control/control_shm.c	2016-02-11 14:31:58.800479098 +0200
+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 @@
  #include <fcntl.h>
  #include <sys/shm.h>
@@ -69,10 +75,11 @@ diff -ru alsa-lib-1.1.0.orig/src/control/control_shm.c alsa-lib-1.1.0/src/contro
  #include <sys/un.h>
  #include <sys/uio.h>
  #include <sys/mman.h>
-diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm.c alsa-lib-1.1.0/src/pcm/pcm.c
---- alsa-lib-1.1.0.orig/src/pcm/pcm.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/src/pcm/pcm.c	2016-02-11 14:31:58.833812820 +0200
-@@ -634,7 +634,7 @@
+diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
+index f832399..e9d502a 100644
+--- a/src/pcm/pcm.c
++++ b/src/pcm/pcm.c
+@@ -650,7 +650,7 @@ playback devices.
  #include <stdarg.h>
  #include <signal.h>
  #include <ctype.h>
@@ -81,9 +88,10 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm.c alsa-lib-1.1.0/src/pcm/pcm.c
  #include <sys/mman.h>
  #include <limits.h>
  #include "pcm_local.h"
-diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_direct.c alsa-lib-1.1.0/src/pcm/pcm_direct.c
---- alsa-lib-1.1.0.orig/src/pcm/pcm_direct.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/src/pcm/pcm_direct.c	2016-02-11 14:31:58.837146193 +0200
+diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
+index c3925cc..18f1dd5 100644
+--- a/src/pcm/pcm_direct.c
++++ b/src/pcm/pcm_direct.c
 @@ -30,7 +30,7 @@
  #include <grp.h>
  #include <sys/ioctl.h>
@@ -93,9 +101,10 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_direct.c alsa-lib-1.1.0/src/pcm/pcm_dir
  #include <sys/shm.h>
  #include <sys/sem.h>
  #include <sys/wait.h>
-diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_mmap.c alsa-lib-1.1.0/src/pcm/pcm_mmap.c
---- alsa-lib-1.1.0.orig/src/pcm/pcm_mmap.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/src/pcm/pcm_mmap.c	2016-02-11 14:31:58.817145959 +0200
+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 @@
  #include <stdio.h>
  #include <malloc.h>
@@ -105,9 +114,10 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_mmap.c alsa-lib-1.1.0/src/pcm/pcm_mmap.
  #include <sys/mman.h>
  #ifdef HAVE_SYS_SHM_H
  #include <sys/shm.h>
-diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_share.c alsa-lib-1.1.0/src/pcm/pcm_share.c
---- alsa-lib-1.1.0.orig/src/pcm/pcm_share.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/src/pcm/pcm_share.c	2016-02-11 14:31:58.820479332 +0200
+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 @@
  #include <signal.h>
  #include <math.h>
@@ -117,9 +127,10 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_share.c alsa-lib-1.1.0/src/pcm/pcm_shar
  #include <pthread.h>
  #include "pcm_local.h"
  
-diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_shm.c alsa-lib-1.1.0/src/pcm/pcm_shm.c
---- alsa-lib-1.1.0.orig/src/pcm/pcm_shm.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/src/pcm/pcm_shm.c	2016-02-11 14:31:58.820479332 +0200
+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 @@
  #include <sys/ioctl.h>
  #include <sys/shm.h>
@@ -129,10 +140,11 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_shm.c alsa-lib-1.1.0/src/pcm/pcm_shm.c
  #include <sys/un.h>
  #include <sys/mman.h>
  #include <netinet/in.h>
-diff -ru alsa-lib-1.1.0.orig/src/seq/seq.c alsa-lib-1.1.0/src/seq/seq.c
---- alsa-lib-1.1.0.orig/src/seq/seq.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/src/seq/seq.c	2016-02-11 14:31:58.813812587 +0200
-@@ -777,7 +777,7 @@
+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)
  
  */
  
@@ -141,9 +153,10 @@ diff -ru alsa-lib-1.1.0.orig/src/seq/seq.c alsa-lib-1.1.0/src/seq/seq.c
  #include "seq_local.h"
  
  /****************************************************************************
-diff -ru alsa-lib-1.1.0.orig/src/shmarea.c alsa-lib-1.1.0/src/shmarea.c
---- alsa-lib-1.1.0.orig/src/shmarea.c	2015-11-09 09:39:18.000000000 +0200
-+++ alsa-lib-1.1.0/src/shmarea.c	2016-02-11 14:31:58.807145843 +0200
+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 @@
  #include <malloc.h>
  #include <string.h>