[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1917/8267] alsa-lib: 1.1.1 -> 1.1.2

[Emmanuele Bassi <ebassi src gnome org>]

commit 400e2628f1072a39e897ca02cde6a7a37cbb95e1
Author: Tanu Kaskinen <tanuk iki fi>
Date:   Wed Aug 17 14:20:29 2016 +0300

    alsa-lib: 1.1.1 -> 1.1.2
    
    Changelog:
    http://www.alsa-project.org/main/index.php/Changes_v1.1.1_v1.1.2
    
    Removed upstreamed patch:
    0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch
    
    Rebased avoid-including-sys-poll.h-directly.patch
    
    (From OE-Core rev: 4d3ec9312d9f721f57d0afc08ec1512709f75d17)
    
    Signed-off-by: Tanu Kaskinen <tanuk iki fi>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...fix-appl-pointer-not-correct-when-mmap_co.patch |  137 --------------------
 .../avoid-including-sys-poll.h-directly.patch      |   20 ++--
 .../alsa/{alsa-lib_1.1.1.bb => alsa-lib_1.1.2.bb}  |    5 +-
 3 files changed, 12 insertions(+), 150 deletions(-)
---
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch 
b/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch
index b8b1cb6..3d44585 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch
+++ b/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch
@@ -1,4 +1,4 @@
-From 7dcf46969e85c881c901df4b49309e9091cad16a Mon Sep 17 00:00:00 2001
+From c2c13cf0c469862cd39b2a69862002331ab7c8cb Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <armccurdy gmail com>
 Date: Tue, 9 Feb 2016 14:01:18 -0800
 Subject: [PATCH] avoid including <sys/poll.h> directly
@@ -24,7 +24,7 @@ Signed-off-by: Andre McCurdy <armccurdy gmail com>
  12 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/aserver/aserver.c b/aserver/aserver.c
-index 1579da7..ef64248 100644
+index ac20706..46f731a 100644
 --- a/aserver/aserver.c
 +++ b/aserver/aserver.c
 @@ -20,7 +20,7 @@
@@ -62,7 +62,7 @@ index 3c2766e..a546194 100644
  #include <stdarg.h>
  #include <endian.h>
 diff --git a/include/local.h b/include/local.h
-index b429f5d..e05898f 100644
+index 317f2e3..6a43a47 100644
 --- a/include/local.h
 +++ b/include/local.h
 @@ -47,7 +47,7 @@
@@ -75,18 +75,18 @@ index b429f5d..e05898f 100644
  #include <errno.h>
  #if defined(__linux__)
 diff --git a/src/control/control.c b/src/control/control.c
-index 4a28cf6..071c5db 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
@@ -101,7 +101,7 @@ index bd07d4a..9a2e268 100644
  #include <sys/uio.h>
  #include <sys/mman.h>
 diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
-index fd3877c..52ac093 100644
+index c3925cc..18f1dd5 100644
 --- a/src/pcm/pcm_direct.c
 +++ b/src/pcm/pcm_direct.c
 @@ -30,7 +30,7 @@
@@ -114,7 +114,7 @@ index fd3877c..52ac093 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 @@
@@ -153,7 +153,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 620ca3f..681cef1 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)
@@ -179,5 +179,5 @@ index 9843aa8..eaa71f0 100644
  #include <sys/shm.h>
  #include "list.h"
 -- 
-1.9.1
+2.8.1
 
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb
similarity index 88%
rename from meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb
rename to meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb
index 4fb7cca..ff47576 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.2.bb
@@ -17,10 +17,9 @@ ARM_INSTRUCTION_SET = "arm"
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \
            file://Check-if-wordexp-function-is-supported.patch \
            file://avoid-including-sys-poll.h-directly.patch \
-           file://0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch \
 "
-SRC_URI[md5sum] = "881060d2c568f7f49db82c58df2f9ddc"
-SRC_URI[sha256sum] = "8ac76c3144ed2ed49da7622ab65ac5415205913ccbedde877972383cbc234269"
+SRC_URI[md5sum] = "1946e6438b8262a7b8fdadacd0e06ba7"
+SRC_URI[sha256sum] = "d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6"
 
 inherit autotools pkgconfig