diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2016-08-17 14:20:29 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-18 09:27:52 +0100 |
commit | 400e2628f1072a39e897ca02cde6a7a37cbb95e1 (patch) | |
tree | ba72a6b7dadd205bc537100035f6ef4462cb8994 /meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch | |
parent | 9800b4d9ffda22466066ab1d301e4730e61726e0 (diff) | |
download | poky-400e2628f1072a39e897ca02cde6a7a37cbb95e1.tar.gz |
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>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch | 20 |
1 files changed, 10 insertions, 10 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 b8b1cb6546..3d44585939 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 @@ | |||
1 | From 7dcf46969e85c881c901df4b49309e9091cad16a Mon Sep 17 00:00:00 2001 | 1 | From c2c13cf0c469862cd39b2a69862002331ab7c8cb Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Tue, 9 Feb 2016 14:01:18 -0800 | 3 | Date: Tue, 9 Feb 2016 14:01:18 -0800 |
4 | Subject: [PATCH] avoid including <sys/poll.h> directly | 4 | Subject: [PATCH] avoid including <sys/poll.h> directly |
@@ -24,7 +24,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
24 | 12 files changed, 12 insertions(+), 12 deletions(-) | 24 | 12 files changed, 12 insertions(+), 12 deletions(-) |
25 | 25 | ||
26 | diff --git a/aserver/aserver.c b/aserver/aserver.c | 26 | diff --git a/aserver/aserver.c b/aserver/aserver.c |
27 | index 1579da7..ef64248 100644 | 27 | index ac20706..46f731a 100644 |
28 | --- a/aserver/aserver.c | 28 | --- a/aserver/aserver.c |
29 | +++ b/aserver/aserver.c | 29 | +++ b/aserver/aserver.c |
30 | @@ -20,7 +20,7 @@ | 30 | @@ -20,7 +20,7 @@ |
@@ -62,7 +62,7 @@ index 3c2766e..a546194 100644 | |||
62 | #include <stdarg.h> | 62 | #include <stdarg.h> |
63 | #include <endian.h> | 63 | #include <endian.h> |
64 | diff --git a/include/local.h b/include/local.h | 64 | diff --git a/include/local.h b/include/local.h |
65 | index b429f5d..e05898f 100644 | 65 | index 317f2e3..6a43a47 100644 |
66 | --- a/include/local.h | 66 | --- a/include/local.h |
67 | +++ b/include/local.h | 67 | +++ b/include/local.h |
68 | @@ -47,7 +47,7 @@ | 68 | @@ -47,7 +47,7 @@ |
@@ -75,18 +75,18 @@ index b429f5d..e05898f 100644 | |||
75 | #include <errno.h> | 75 | #include <errno.h> |
76 | #if defined(__linux__) | 76 | #if defined(__linux__) |
77 | diff --git a/src/control/control.c b/src/control/control.c | 77 | diff --git a/src/control/control.c b/src/control/control.c |
78 | index 4a28cf6..071c5db 100644 | 78 | index 6c00b8e..fd0c303 100644 |
79 | --- a/src/control/control.c | 79 | --- a/src/control/control.c |
80 | +++ b/src/control/control.c | 80 | +++ b/src/control/control.c |
81 | @@ -48,7 +48,7 @@ and IEC958 structure. | 81 | @@ -90,7 +90,7 @@ I/O operations. |
82 | #include <string.h> | 82 | #include <string.h> |
83 | #include <fcntl.h> | 83 | #include <fcntl.h> |
84 | #include <signal.h> | 84 | #include <signal.h> |
85 | -#include <sys/poll.h> | 85 | -#include <sys/poll.h> |
86 | +#include <poll.h> | 86 | +#include <poll.h> |
87 | #include <stdbool.h> | ||
87 | #include "control_local.h" | 88 | #include "control_local.h" |
88 | 89 | ||
89 | /** | ||
90 | diff --git a/src/control/control_shm.c b/src/control/control_shm.c | 90 | diff --git a/src/control/control_shm.c b/src/control/control_shm.c |
91 | index bd07d4a..9a2e268 100644 | 91 | index bd07d4a..9a2e268 100644 |
92 | --- a/src/control/control_shm.c | 92 | --- a/src/control/control_shm.c |
@@ -101,7 +101,7 @@ index bd07d4a..9a2e268 100644 | |||
101 | #include <sys/uio.h> | 101 | #include <sys/uio.h> |
102 | #include <sys/mman.h> | 102 | #include <sys/mman.h> |
103 | diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c | 103 | diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c |
104 | index fd3877c..52ac093 100644 | 104 | index c3925cc..18f1dd5 100644 |
105 | --- a/src/pcm/pcm_direct.c | 105 | --- a/src/pcm/pcm_direct.c |
106 | +++ b/src/pcm/pcm_direct.c | 106 | +++ b/src/pcm/pcm_direct.c |
107 | @@ -30,7 +30,7 @@ | 107 | @@ -30,7 +30,7 @@ |
@@ -114,7 +114,7 @@ index fd3877c..52ac093 100644 | |||
114 | #include <sys/sem.h> | 114 | #include <sys/sem.h> |
115 | #include <sys/wait.h> | 115 | #include <sys/wait.h> |
116 | diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c | 116 | diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c |
117 | index 5c4fbe1..2cfa7db 100644 | 117 | index 1948289..4cf220a 100644 |
118 | --- a/src/pcm/pcm_mmap.c | 118 | --- a/src/pcm/pcm_mmap.c |
119 | +++ b/src/pcm/pcm_mmap.c | 119 | +++ b/src/pcm/pcm_mmap.c |
120 | @@ -22,7 +22,7 @@ | 120 | @@ -22,7 +22,7 @@ |
@@ -153,7 +153,7 @@ index a815ac6..4ee958c 100644 | |||
153 | #include <sys/mman.h> | 153 | #include <sys/mman.h> |
154 | #include <netinet/in.h> | 154 | #include <netinet/in.h> |
155 | diff --git a/src/seq/seq.c b/src/seq/seq.c | 155 | diff --git a/src/seq/seq.c b/src/seq/seq.c |
156 | index 620ca3f..681cef1 100644 | 156 | index 9279830..d2027cb 100644 |
157 | --- a/src/seq/seq.c | 157 | --- a/src/seq/seq.c |
158 | +++ b/src/seq/seq.c | 158 | +++ b/src/seq/seq.c |
159 | @@ -777,7 +777,7 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev) | 159 | @@ -777,7 +777,7 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev) |
@@ -179,5 +179,5 @@ index 9843aa8..eaa71f0 100644 | |||
179 | #include <sys/shm.h> | 179 | #include <sys/shm.h> |
180 | #include "list.h" | 180 | #include "list.h" |
181 | -- | 181 | -- |
182 | 1.9.1 | 182 | 2.8.1 |
183 | 183 | ||