diff options
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch | 51 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch | 183 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb) | 9 |
3 files changed, 3 insertions, 240 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch b/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch deleted file mode 100644 index 795e48ab2e..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 3408f8e78776b12f131e433749721602f87e0a70 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Hong H. Pham" <hong.pham@windriver.com> | ||
3 | Date: Fri, 29 Aug 2014 17:13:55 +0300 | ||
4 | Subject: [PATCH] Check if wordexp function is supported | ||
5 | |||
6 | eglibc could be configured to build without wordexp, so it is not enough | ||
7 | to check if wordexp.h exists (the header file could be installed, but it's | ||
8 | possible that the wordexp() function is not supported). An additional | ||
9 | check if wordexp() is supported by the system C library is needed. | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Signed-off-by: Hong H. Pham <hong.pham@windriver.com> | ||
14 | Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> | ||
15 | --- | ||
16 | configure.ac | 5 ++++- | ||
17 | src/userfile.c | 2 +- | ||
18 | 2 files changed, 5 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index 9490d39..b08a90a 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -295,7 +295,10 @@ fi | ||
25 | AC_SUBST(ALSA_DEPLIBS) | ||
26 | |||
27 | dnl Check for headers | ||
28 | -AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h]) | ||
29 | +AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h], | ||
30 | + dnl Make sure wordexp is supported by the C library | ||
31 | + AC_CHECK_FUNCS([wordexp]) | ||
32 | +) | ||
33 | |||
34 | dnl Check for resmgr support... | ||
35 | AC_MSG_CHECKING(for resmgr support) | ||
36 | diff --git a/src/userfile.c b/src/userfile.c | ||
37 | index 72779da..e9d13e6 100644 | ||
38 | --- a/src/userfile.c | ||
39 | +++ b/src/userfile.c | ||
40 | @@ -32,7 +32,7 @@ | ||
41 | * stores the first matchine one. The returned string is strdup'ed. | ||
42 | */ | ||
43 | |||
44 | -#ifdef HAVE_WORDEXP_H | ||
45 | +#if (defined(HAVE_WORDEXP_H) && defined(HAVE_WORDEXP)) | ||
46 | #include <wordexp.h> | ||
47 | #include <assert.h> | ||
48 | int snd_user_file(const char *file, char **result) | ||
49 | -- | ||
50 | 2.6.4 | ||
51 | |||
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 deleted file mode 100644 index 3d44585939..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch +++ /dev/null | |||
@@ -1,183 +0,0 @@ | |||
1 | From c2c13cf0c469862cd39b2a69862002331ab7c8cb Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Tue, 9 Feb 2016 14:01:18 -0800 | ||
4 | Subject: [PATCH] avoid including <sys/poll.h> directly | ||
5 | |||
6 | Fixes compiler warnings when building with musl libc. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
11 | --- | ||
12 | aserver/aserver.c | 2 +- | ||
13 | include/asoundlib-head.h | 2 +- | ||
14 | include/asoundlib.h | 2 +- | ||
15 | include/local.h | 2 +- | ||
16 | src/control/control.c | 2 +- | ||
17 | src/control/control_shm.c | 2 +- | ||
18 | src/pcm/pcm_direct.c | 2 +- | ||
19 | src/pcm/pcm_mmap.c | 2 +- | ||
20 | src/pcm/pcm_share.c | 2 +- | ||
21 | src/pcm/pcm_shm.c | 2 +- | ||
22 | src/seq/seq.c | 2 +- | ||
23 | src/shmarea.c | 2 +- | ||
24 | 12 files changed, 12 insertions(+), 12 deletions(-) | ||
25 | |||
26 | diff --git a/aserver/aserver.c b/aserver/aserver.c | ||
27 | index ac20706..46f731a 100644 | ||
28 | --- a/aserver/aserver.c | ||
29 | +++ b/aserver/aserver.c | ||
30 | @@ -20,7 +20,7 @@ | ||
31 | |||
32 | #include <sys/shm.h> | ||
33 | #include <sys/socket.h> | ||
34 | -#include <sys/poll.h> | ||
35 | +#include <poll.h> | ||
36 | #include <sys/un.h> | ||
37 | #include <sys/uio.h> | ||
38 | #include <stdio.h> | ||
39 | diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h | ||
40 | index 1ec611e..21e32c6 100644 | ||
41 | --- a/include/asoundlib-head.h | ||
42 | +++ b/include/asoundlib-head.h | ||
43 | @@ -35,6 +35,6 @@ | ||
44 | #include <string.h> | ||
45 | #include <fcntl.h> | ||
46 | #include <assert.h> | ||
47 | -#include <sys/poll.h> | ||
48 | +#include <poll.h> | ||
49 | #include <errno.h> | ||
50 | #include <stdarg.h> | ||
51 | diff --git a/include/asoundlib.h b/include/asoundlib.h | ||
52 | index 3c2766e..a546194 100644 | ||
53 | --- a/include/asoundlib.h | ||
54 | +++ b/include/asoundlib.h | ||
55 | @@ -35,7 +35,7 @@ | ||
56 | #include <string.h> | ||
57 | #include <fcntl.h> | ||
58 | #include <assert.h> | ||
59 | -#include <sys/poll.h> | ||
60 | +#include <poll.h> | ||
61 | #include <errno.h> | ||
62 | #include <stdarg.h> | ||
63 | #include <endian.h> | ||
64 | diff --git a/include/local.h b/include/local.h | ||
65 | index 317f2e3..6a43a47 100644 | ||
66 | --- a/include/local.h | ||
67 | +++ b/include/local.h | ||
68 | @@ -47,7 +47,7 @@ | ||
69 | #error Header defining endianness not defined | ||
70 | #endif | ||
71 | #include <stdarg.h> | ||
72 | -#include <sys/poll.h> | ||
73 | +#include <poll.h> | ||
74 | #include <sys/types.h> | ||
75 | #include <errno.h> | ||
76 | #if defined(__linux__) | ||
77 | diff --git a/src/control/control.c b/src/control/control.c | ||
78 | index 6c00b8e..fd0c303 100644 | ||
79 | --- a/src/control/control.c | ||
80 | +++ b/src/control/control.c | ||
81 | @@ -90,7 +90,7 @@ I/O operations. | ||
82 | #include <string.h> | ||
83 | #include <fcntl.h> | ||
84 | #include <signal.h> | ||
85 | -#include <sys/poll.h> | ||
86 | +#include <poll.h> | ||
87 | #include <stdbool.h> | ||
88 | #include "control_local.h" | ||
89 | |||
90 | diff --git a/src/control/control_shm.c b/src/control/control_shm.c | ||
91 | index bd07d4a..9a2e268 100644 | ||
92 | --- a/src/control/control_shm.c | ||
93 | +++ b/src/control/control_shm.c | ||
94 | @@ -27,7 +27,7 @@ | ||
95 | #include <fcntl.h> | ||
96 | #include <sys/shm.h> | ||
97 | #include <sys/socket.h> | ||
98 | -#include <sys/poll.h> | ||
99 | +#include <poll.h> | ||
100 | #include <sys/un.h> | ||
101 | #include <sys/uio.h> | ||
102 | #include <sys/mman.h> | ||
103 | diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c | ||
104 | index c3925cc..18f1dd5 100644 | ||
105 | --- a/src/pcm/pcm_direct.c | ||
106 | +++ b/src/pcm/pcm_direct.c | ||
107 | @@ -30,7 +30,7 @@ | ||
108 | #include <grp.h> | ||
109 | #include <sys/ioctl.h> | ||
110 | #include <sys/mman.h> | ||
111 | -#include <sys/poll.h> | ||
112 | +#include <poll.h> | ||
113 | #include <sys/shm.h> | ||
114 | #include <sys/sem.h> | ||
115 | #include <sys/wait.h> | ||
116 | diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c | ||
117 | index 1948289..4cf220a 100644 | ||
118 | --- a/src/pcm/pcm_mmap.c | ||
119 | +++ b/src/pcm/pcm_mmap.c | ||
120 | @@ -22,7 +22,7 @@ | ||
121 | #include <stdio.h> | ||
122 | #include <malloc.h> | ||
123 | #include <string.h> | ||
124 | -#include <sys/poll.h> | ||
125 | +#include <poll.h> | ||
126 | #include <sys/mman.h> | ||
127 | #ifdef HAVE_SYS_SHM_H | ||
128 | #include <sys/shm.h> | ||
129 | diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c | ||
130 | index 5d8aaf2..21a57fc 100644 | ||
131 | --- a/src/pcm/pcm_share.c | ||
132 | +++ b/src/pcm/pcm_share.c | ||
133 | @@ -34,7 +34,7 @@ | ||
134 | #include <signal.h> | ||
135 | #include <math.h> | ||
136 | #include <sys/socket.h> | ||
137 | -#include <sys/poll.h> | ||
138 | +#include <poll.h> | ||
139 | #include <pthread.h> | ||
140 | #include "pcm_local.h" | ||
141 | |||
142 | diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c | ||
143 | index a815ac6..4ee958c 100644 | ||
144 | --- a/src/pcm/pcm_shm.c | ||
145 | +++ b/src/pcm/pcm_shm.c | ||
146 | @@ -36,7 +36,7 @@ | ||
147 | #include <sys/ioctl.h> | ||
148 | #include <sys/shm.h> | ||
149 | #include <sys/socket.h> | ||
150 | -#include <sys/poll.h> | ||
151 | +#include <poll.h> | ||
152 | #include <sys/un.h> | ||
153 | #include <sys/mman.h> | ||
154 | #include <netinet/in.h> | ||
155 | diff --git a/src/seq/seq.c b/src/seq/seq.c | ||
156 | index 9279830..d2027cb 100644 | ||
157 | --- a/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) | ||
160 | |||
161 | */ | ||
162 | |||
163 | -#include <sys/poll.h> | ||
164 | +#include <poll.h> | ||
165 | #include "seq_local.h" | ||
166 | |||
167 | /**************************************************************************** | ||
168 | diff --git a/src/shmarea.c b/src/shmarea.c | ||
169 | index 9843aa8..eaa71f0 100644 | ||
170 | --- a/src/shmarea.c | ||
171 | +++ b/src/shmarea.c | ||
172 | @@ -27,7 +27,7 @@ | ||
173 | #include <malloc.h> | ||
174 | #include <string.h> | ||
175 | #include <errno.h> | ||
176 | -#include <sys/poll.h> | ||
177 | +#include <poll.h> | ||
178 | #include <sys/mman.h> | ||
179 | #include <sys/shm.h> | ||
180 | #include "list.h" | ||
181 | -- | ||
182 | 2.8.1 | ||
183 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb index acdeae13f3..c5bf107e5e 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.4.1.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.5.bb | |||
@@ -8,12 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ | |||
8 | 8 | ||
9 | BBCLASSEXTEND = "native nativesdk" | 9 | BBCLASSEXTEND = "native nativesdk" |
10 | 10 | ||
11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \ | 11 | SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2" |
12 | file://Check-if-wordexp-function-is-supported.patch \ | 12 | SRC_URI[md5sum] = "a2b465c3a5265d8a57f3ff39c6c4fc29" |
13 | file://avoid-including-sys-poll.h-directly.patch \ | 13 | SRC_URI[sha256sum] = "f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6" |
14 | " | ||
15 | SRC_URI[md5sum] = "29fa3e69122d3cf3e8f0e01a0cb1d183" | ||
16 | SRC_URI[sha256sum] = "91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76" | ||
17 | 14 | ||
18 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
19 | 16 | ||