8cbc8c vars/build.vars: build alsa_lib w/ --with-versioned=no.

Authored and Committed by Lucio Andrés Illanes Albornoz (arab, vxp) 7 years ago
    vars/build.vars: build alsa_lib w/ --with-versioned=no.
    patches/alsa-lib-1.1.4.1.local.patch: dummy-#define use_default_symbol_version()
    and ensure non-locally referenced symbols are not INTERNAL().
    
        
patches/alsa-lib-1.1.4.1.local.patch CHANGED
@@ -1,15 +1,3 @@
1
- diff -ru alsa-lib-1.1.4.1.orig/aserver/aserver.c alsa-lib-1.1.4.1/aserver/aserver.c
2
- --- alsa-lib-1.1.4.1.orig/aserver/aserver.c 2017-06-01 08:27:36.000000000 +0200
3
- +++ alsa-lib-1.1.4.1/aserver/aserver.c 2017-08-07 19:59:05.000000000 +0200
4
- @@ -20,7 +20,7 @@
5
-
6
- #include <sys/shm.h>
7
- #include <sys/socket.h>
8
- -#include <sys/poll.h>
9
- +#include <poll.h>
10
- #include <sys/un.h>
11
- #include <sys/uio.h>
12
- #include <stdio.h>
13
1
diff -ru alsa-lib-1.1.4.1.orig/include/asoundlib-head.h alsa-lib-1.1.4.1/include/asoundlib-head.h
14
2
--- alsa-lib-1.1.4.1.orig/include/asoundlib-head.h 2017-06-01 08:27:36.000000000 +0200
15
3
+++ alsa-lib-1.1.4.1/include/asoundlib-head.h 2017-08-08 21:10:17.989795195 +0200
@@ -66,24 +54,6 @@ diff -ru alsa-lib-1.1.4.1.orig/include/sound/asoc.h alsa-lib-1.1.4.1/include/sou
66
54
__le16 reserved; /* for 32bit alignment */
67
55
__le32 mclk_rate; /* MCLK or SYSCLK freqency in Hz */
68
56
__le32 bclk_rate; /* BCLK freqency in Hz */
69
- diff -ru alsa-lib-1.1.4.1.orig/src/control/control.c alsa-lib-1.1.4.1/src/control/control.c
70
- --- alsa-lib-1.1.4.1.orig/src/control/control.c 2017-06-01 08:27:36.000000000 +0200
71
- +++ alsa-lib-1.1.4.1/src/control/control.c 2017-08-08 21:08:21.870365353 +0200
72
- @@ -90,10 +90,13 @@
73
- #include <string.h>
74
- #include <fcntl.h>
75
- #include <signal.h>
76
- -#include <sys/poll.h>
77
- +#include <poll.h>
78
- #include <stdbool.h>
79
- #include "control_local.h"
80
-
81
- +//ffs?
82
- +#define DOXYGEN
83
- +
84
- /**
85
- * \brief get identifier of CTL handle
86
- * \param ctl CTL handle
87
57
diff -ru alsa-lib-1.1.4.1.orig/src/control/control_shm.c alsa-lib-1.1.4.1/src/control/control_shm.c
88
58
--- alsa-lib-1.1.4.1.orig/src/control/control_shm.c 2017-06-01 08:27:36.000000000 +0200
89
59
+++ alsa-lib-1.1.4.1/src/control/control_shm.c 2017-08-07 20:05:09.000000000 +0200
@@ -96,18 +66,6 @@ diff -ru alsa-lib-1.1.4.1.orig/src/control/control_shm.c alsa-lib-1.1.4.1/src/co
96
66
#include <sys/un.h>
97
67
#include <sys/uio.h>
98
68
#include <sys/mman.h>
99
- diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm.c alsa-lib-1.1.4.1/src/pcm/pcm.c
100
- --- alsa-lib-1.1.4.1.orig/src/pcm/pcm.c 2017-06-01 08:27:36.000000000 +0200
101
- +++ alsa-lib-1.1.4.1/src/pcm/pcm.c 2017-08-07 20:01:58.000000000 +0200
102
- @@ -651,7 +651,7 @@
103
- #include <stdarg.h>
104
- #include <signal.h>
105
- #include <ctype.h>
106
- -#include <sys/poll.h>
107
- +#include <poll.h>
108
- #include <sys/mman.h>
109
- #include <limits.h>
110
- #include "pcm_local.h"
111
69
diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm_direct.c alsa-lib-1.1.4.1/src/pcm/pcm_direct.c
112
70
--- alsa-lib-1.1.4.1.orig/src/pcm/pcm_direct.c 2017-06-01 08:27:36.000000000 +0200
113
71
+++ alsa-lib-1.1.4.1/src/pcm/pcm_direct.c 2017-08-07 20:04:20.000000000 +0200
@@ -180,15 +138,94 @@ diff -ru alsa-lib-1.1.4.1.orig/src/shmarea.c alsa-lib-1.1.4.1/src/shmarea.c
180
138
#include <sys/mman.h>
181
139
#include <sys/shm.h>
182
140
#include "list.h"
183
- diff -ru alsa-lib-1.1.4.1.orig/src/timer/timer.c alsa-lib-1.1.4.1/src/timer/timer.c
184
- --- alsa-lib-1.1.4.1.orig/src/timer/timer.c 2017-06-01 08:27:36.000000000 +0200
185
- +++ alsa-lib-1.1.4.1/src/timer/timer.c 2017-08-08 21:05:10.627280828 +0200
186
- @@ -71,6 +71,8 @@
141
+ --- alsa-lib-1.1.4.1/include/alsa-symbols.h.orig 2017-06-01 06:27:36.000000000 +0000
142
+ +++ alsa-lib-1.1.4.1/include/alsa-symbols.h 2017-09-13 16:07:27.720000000 +0000
143
+ @@ -45,6 +45,8 @@
144
+ #define use_default_symbol_version(real, name, version) \
145
+ __asm__ (".weak " ASM_NAME(#name)); \
146
+ __asm__ (ASM_NAME(#name) " = " ASM_NAME(#real))
147
+ +#elif defined(__midipix__)
148
+ +#define use_default_symbol_version(real, name, version) /* nothing */
149
+ #else
150
+ #define use_default_symbol_version(real, name, version) \
151
+ __asm__ (".weak " ASM_NAME(#name)); \
152
+ --- alsa-lib-1.1.4.1/src/control/control.c.orig 2017-06-01 06:27:36.000000000 +0000
153
+ +++ alsa-lib-1.1.4.1/src/control/control.c 2017-09-13 16:19:34.464000000 +0000
154
+ @@ -90,7 +90,7 @@
155
+ #include <string.h>
156
+ #include <fcntl.h>
157
+ #include <signal.h>
158
+ -#include <sys/poll.h>
159
+ +#include <poll.h>
160
+ #include <stdbool.h>
161
+ #include "control_local.h"
187
162
163
+ @@ -2504,11 +2504,7 @@
164
+ * \param obj CTL element id/info
165
+ * \return zero value if no dimensions are defined, otherwise positive value with count of dimensions
166
+ */
167
+ -#ifndef DOXYGEN
168
+ -int INTERNAL(snd_ctl_elem_info_get_dimensions)(const snd_ctl_elem_info_t *obj)
169
+ -#else
170
+ int snd_ctl_elem_info_get_dimensions(const snd_ctl_elem_info_t *obj)
171
+ -#endif
172
+ {
173
+ int i;
174
+
175
+ @@ -2526,11 +2522,7 @@
176
+ * \param idx The dimension index
177
+ * \return zero value if no dimension width is defined, otherwise positive value with with of specified dimension
178
+ */
179
+ -#ifndef DOXYGEN
180
+ -int INTERNAL(snd_ctl_elem_info_get_dimension)(const snd_ctl_elem_info_t *obj, unsigned int idx)
181
+ -#else
182
+ int snd_ctl_elem_info_get_dimension(const snd_ctl_elem_info_t *obj, unsigned int idx)
183
+ -#endif
184
+ {
185
+ assert(obj);
186
+ if (idx > 3)
187
+ --- alsa-lib-1.1.4.1/src/timer/timer.c.orig 2017-06-01 06:27:36.000000000 +0000
188
+ +++ alsa-lib-1.1.4.1/src/timer/timer.c 2017-09-13 16:20:57.728000000 +0000
189
+ @@ -736,11 +736,7 @@
190
+ * \param params pointer to #snd_timer_params_t structure
191
+ * \param filter The event filter bits to set
192
+ */
193
+ -#ifndef DOXYGEN
194
+ -void INTERNAL(snd_timer_params_set_filter)(snd_timer_params_t * params, unsigned int filter)
195
+ -#else
196
+ void snd_timer_params_set_filter(snd_timer_params_t * params, unsigned int filter)
197
+ -#endif
198
+ {
199
+ assert(params);
200
+ params->filter = filter;
201
+ --- alsa-lib-1.1.4.1/src/pcm/pcm.c.orig 2017-06-01 06:27:36.000000000 +0000
202
+ +++ alsa-lib-1.1.4.1/src/pcm/pcm.c 2017-09-13 16:21:58.544000000 +0000
203
+ @@ -651,7 +651,7 @@
204
+ #include <stdarg.h>
188
205
#include <signal.h>
206
+ #include <ctype.h>
207
+ -#include <sys/poll.h>
208
+ +#include <poll.h>
209
+ #include <sys/mman.h>
210
+ #include <limits.h>
211
+ #include "pcm_local.h"
212
+ --- alsa-lib-1.1.4.1/aserver/aserver.c.orig 2017-06-01 06:27:36.000000000 +0000
213
+ +++ alsa-lib-1.1.4.1/aserver/aserver.c 2017-09-13 16:24:10.272000000 +0000
214
+ @@ -20,7 +20,7 @@
189
215
190
- +#define DOXYGEN
191
- +
192
- static int snd_timer_open_conf(snd_timer_t **timer,
193
- const char *name, snd_config_t *timer_root,
194
- snd_config_t *timer_conf, int mode)
216
+ #include <sys/shm.h>
217
+ #include <sys/socket.h>
218
+ -#include <sys/poll.h>
219
+ +#include <poll.h>
220
+ #include <sys/un.h>
221
+ #include <sys/uio.h>
222
+ #include <stdio.h>
223
+ @@ -473,7 +473,7 @@
224
+ ctrl->result = snd_pcm_rewind(pcm, ctrl->u.rewind.frames);
225
+ break;
226
+ case SND_PCM_IOCTL_FORWARD:
227
+ - ctrl->result = snd_pcm_forward(pcm, ctrl->u.forward.frames);
228
+ + ctrl->result = INTERNAL(snd_pcm_forward(pcm, ctrl->u.forward.frames));
229
+ break;
230
+ case SNDRV_PCM_IOCTL_LINK:
231
+ {
file modified
+2 -0
vars/build.vars CHANGED
@@ -280,6 +280,8 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
280
280
: ${PKG_ALSA_LIB_SHA256SUM:=91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76};
281
281
: ${PKG_ALSA_LIB_VERSION:=1.1.4.1};
282
282
: ${PKG_ALSA_LIB_URL:=ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.1.4.1.tar.bz2};
283
+ : ${PKG_ALSA_LIB_CONFIGURE_ARGS_EXTRA:=--with-versioned=no};
284
+ : ${PKG_ALSA_LIB_MAKEFLAGS_BUILD_EXTRA:=V=99};
283
285
: ${PKG_APR_SHA256SUM:=09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd};
284
286
: ${PKG_APR_VERSION:=1.6.2};
285
287
: ${PKG_APR_URL:=http://mirror.yannic-bonenberger.com/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};