diff options
Diffstat (limited to 'recipes-graphics')
-rw-r--r-- | recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch | 42 | ||||
-rw-r--r-- | recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch | 29 | ||||
-rw-r--r-- | recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch | 345 | ||||
-rw-r--r-- | recipes-graphics/directfb/directfb_1.7.4.bb (renamed from recipes-graphics/directfb/directfb_1.7.1.bb) | 14 |
4 files changed, 50 insertions, 380 deletions
diff --git a/recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch b/recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch new file mode 100644 index 0000000..1d54172 --- /dev/null +++ b/recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 0c1e3d1d54b7f2e637b0984ea10aef1de278ff87 Mon Sep 17 00:00:00 2001 | ||
2 | From: "yong.gan" <yong.gan@freescale.com> | ||
3 | Date: Fri, 23 May 2014 14:15:09 +0800 | ||
4 | Subject: [PATCH] Check input NULL pointer | ||
5 | |||
6 | Fix the segmentation fault in multi-instance test. | ||
7 | |||
8 | Upstream Status: Pending | ||
9 | --- | ||
10 | inputdrivers/linux_input/linux_input.c | 2 +- | ||
11 | src/core/input.c | 2 ++ | ||
12 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c | ||
15 | index e275762..35cfbdd 100644 | ||
16 | --- a/inputdrivers/linux_input/linux_input.c | ||
17 | +++ b/inputdrivers/linux_input/linux_input.c | ||
18 | @@ -1979,7 +1979,7 @@ driver_get_keymap_entry( CoreInputDevice *device, | ||
19 | unsigned short value; | ||
20 | DFBInputDeviceKeyIdentifier identifier; | ||
21 | |||
22 | - if (data->vt_fd < 0) | ||
23 | + if (data == NULL || data->vt_fd < 0) | ||
24 | return DFB_UNSUPPORTED; | ||
25 | |||
26 | /* fetch the base level */ | ||
27 | diff --git a/src/core/input.c b/src/core/input.c | ||
28 | index d77bc9f..ee23909 100644 | ||
29 | --- a/src/core/input.c | ||
30 | +++ b/src/core/input.c | ||
31 | @@ -723,6 +723,8 @@ dfb_input_core_suspend( DFBInputCore *data ) | ||
32 | driver->info.name ); | ||
33 | } | ||
34 | } | ||
35 | + if(data == NULL) | ||
36 | + return DFB_FAILURE; | ||
37 | |||
38 | direct_list_foreach (device, data->devices) { | ||
39 | InputDeviceShared *devshared; | ||
40 | -- | ||
41 | 1.9.1 | ||
42 | |||
diff --git a/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch b/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch deleted file mode 100644 index 8b99b4e..0000000 --- a/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | From 1d6d597050fc24769e9df2693f754bdc824a8b78 Mon Sep 17 00:00:00 2001 | ||
4 | From: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
5 | Date: Tue, 3 Jul 2012 16:06:10 +0300 | ||
6 | Subject: [PATCH] fix compilation with zlib | ||
7 | |||
8 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
9 | --- | ||
10 | src/core/surface.c | 3 +++ | ||
11 | 1 file changed, 3 insertions(+) | ||
12 | |||
13 | diff --git a/src/core/surface.c b/src/core/surface.c | ||
14 | index 50434a2..52f50ab 100644 | ||
15 | --- a/src/core/surface.c | ||
16 | +++ b/src/core/surface.c | ||
17 | @@ -49,6 +49,9 @@ | ||
18 | #include <gfx/convert.h> | ||
19 | #include <gfx/util.h> | ||
20 | |||
21 | +#ifdef USE_ZLIB | ||
22 | +#include <zlib.h> | ||
23 | +#endif | ||
24 | |||
25 | D_DEBUG_DOMAIN( Core_Surface, "Core/Surface", "DirectFB Core Surface" ); | ||
26 | |||
27 | -- | ||
28 | 1.7.9.5 | ||
29 | |||
diff --git a/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch deleted file mode 100644 index 443df5a..0000000 --- a/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch +++ /dev/null | |||
@@ -1,345 +0,0 @@ | |||
1 | Rename __no_instrument_function__ macro to avoid conficting redefinitions | ||
2 | of the same symbol. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
6 | |||
7 | Index: DirectFB-1.6.1/lib/direct/clock.c | ||
8 | =================================================================== | ||
9 | --- DirectFB-1.6.1.orig/lib/direct/clock.c 2012-06-29 19:01:11.000000000 +0300 | ||
10 | +++ DirectFB-1.6.1/lib/direct/clock.c 2013-01-05 18:03:24.000000000 +0200 | ||
11 | @@ -36,28 +36,28 @@ | ||
12 | |||
13 | /**********************************************************************************************************************/ | ||
14 | |||
15 | -__no_instrument_function__ | ||
16 | +__dfb_no_instrument_function__ | ||
17 | long long | ||
18 | direct_clock_get_micros( void ) | ||
19 | { | ||
20 | return direct_clock_get_time( DIRECT_CLOCK_SESSION ); | ||
21 | } | ||
22 | |||
23 | -__no_instrument_function__ | ||
24 | +__dfb_no_instrument_function__ | ||
25 | long long | ||
26 | direct_clock_get_millis( void ) | ||
27 | { | ||
28 | return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL; | ||
29 | } | ||
30 | |||
31 | -__no_instrument_function__ | ||
32 | +__dfb_no_instrument_function__ | ||
33 | long long | ||
34 | direct_clock_get_abs_micros( void ) | ||
35 | { | ||
36 | return direct_clock_get_time( DIRECT_CLOCK_REALTIME ); | ||
37 | } | ||
38 | |||
39 | -__no_instrument_function__ | ||
40 | +__dfb_no_instrument_function__ | ||
41 | long long | ||
42 | direct_clock_get_abs_millis( void ) | ||
43 | { | ||
44 | Index: DirectFB-1.6.1/lib/direct/debug.c | ||
45 | =================================================================== | ||
46 | --- DirectFB-1.6.1.orig/lib/direct/debug.c 2012-06-29 19:01:11.000000000 +0300 | ||
47 | +++ DirectFB-1.6.1/lib/direct/debug.c 2013-01-05 18:03:49.000000000 +0200 | ||
48 | @@ -48,7 +48,7 @@ | ||
49 | |||
50 | #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ | ||
51 | |||
52 | -__no_instrument_function__ | ||
53 | +__dfb_no_instrument_function__ | ||
54 | void | ||
55 | direct_debug_log( DirectLogDomain *domain, | ||
56 | unsigned int debug_level, /* 1-9, 0 = info */ | ||
57 | @@ -63,7 +63,7 @@ | ||
58 | va_end( ap ); | ||
59 | } | ||
60 | |||
61 | -__no_instrument_function__ | ||
62 | +__dfb_no_instrument_function__ | ||
63 | void | ||
64 | direct_debug_at( DirectLogDomain *domain, | ||
65 | const char *format, ... ) | ||
66 | @@ -77,7 +77,7 @@ | ||
67 | |||
68 | #endif /* DIRECT_BUILD_DEBUGS */ | ||
69 | |||
70 | -__no_instrument_function__ | ||
71 | +__dfb_no_instrument_function__ | ||
72 | void | ||
73 | direct_debug_at_always( DirectLogDomain *domain, | ||
74 | const char *format, ... ) | ||
75 | @@ -93,7 +93,7 @@ | ||
76 | |||
77 | #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ | ||
78 | |||
79 | -__no_instrument_function__ | ||
80 | +__dfb_no_instrument_function__ | ||
81 | void | ||
82 | direct_break( const char *func, | ||
83 | const char *file, | ||
84 | @@ -123,7 +123,7 @@ | ||
85 | direct_trap( "Break", SIGABRT ); | ||
86 | } | ||
87 | |||
88 | -__no_instrument_function__ | ||
89 | +__dfb_no_instrument_function__ | ||
90 | void | ||
91 | direct_assertion( const char *exp, | ||
92 | const char *func, | ||
93 | @@ -144,7 +144,7 @@ | ||
94 | direct_trap( "Assertion", SIGTRAP ); | ||
95 | } | ||
96 | |||
97 | -__no_instrument_function__ | ||
98 | +__dfb_no_instrument_function__ | ||
99 | void | ||
100 | direct_assumption( const char *exp, | ||
101 | const char *func, | ||
102 | Index: DirectFB-1.6.1/lib/direct/interface.c | ||
103 | =================================================================== | ||
104 | --- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300 | ||
105 | +++ DirectFB-1.6.1/lib/direct/interface.c 2013-01-05 18:04:56.000000000 +0200 | ||
106 | @@ -522,7 +522,7 @@ | ||
107 | |||
108 | /**************************************************************************************************/ | ||
109 | |||
110 | -__no_instrument_function__ | ||
111 | +__dfb_no_instrument_function__ | ||
112 | static InterfaceDesc * | ||
113 | allocate_interface_desc( void ) | ||
114 | { | ||
115 | @@ -543,7 +543,7 @@ | ||
116 | return &alloc_list[alloc_count++]; | ||
117 | } | ||
118 | |||
119 | -__no_instrument_function__ | ||
120 | +__dfb_no_instrument_function__ | ||
121 | static __inline__ void | ||
122 | fill_interface_desc( InterfaceDesc *desc, | ||
123 | const void *interface_ptr, | ||
124 | @@ -565,7 +565,7 @@ | ||
125 | |||
126 | /**************************************************************************************************/ | ||
127 | |||
128 | -__no_instrument_function__ | ||
129 | +__dfb_no_instrument_function__ | ||
130 | void | ||
131 | direct_dbg_interface_add( const char *func, | ||
132 | const char *file, | ||
133 | @@ -586,7 +586,7 @@ | ||
134 | direct_mutex_unlock( &alloc_lock ); | ||
135 | } | ||
136 | |||
137 | -__no_instrument_function__ | ||
138 | +__dfb_no_instrument_function__ | ||
139 | void | ||
140 | direct_dbg_interface_remove( const char *func, | ||
141 | const char *file, | ||
142 | Index: DirectFB-1.6.1/lib/direct/log.c | ||
143 | =================================================================== | ||
144 | --- DirectFB-1.6.1.orig/lib/direct/log.c 2012-06-29 19:01:11.000000000 +0300 | ||
145 | +++ DirectFB-1.6.1/lib/direct/log.c 2013-01-05 18:04:18.000000000 +0200 | ||
146 | @@ -128,7 +128,7 @@ | ||
147 | return DR_OK; | ||
148 | } | ||
149 | |||
150 | -__no_instrument_function__ | ||
151 | +__dfb_no_instrument_function__ | ||
152 | DirectResult | ||
153 | direct_log_printf( DirectLog *log, | ||
154 | const char *format, ... ) | ||
155 | @@ -197,7 +197,7 @@ | ||
156 | return DR_OK; | ||
157 | } | ||
158 | |||
159 | -__no_instrument_function__ | ||
160 | +__dfb_no_instrument_function__ | ||
161 | void | ||
162 | direct_log_lock( DirectLog *log ) | ||
163 | { | ||
164 | @@ -211,7 +211,7 @@ | ||
165 | direct_mutex_lock( &log->lock ); | ||
166 | } | ||
167 | |||
168 | -__no_instrument_function__ | ||
169 | +__dfb_no_instrument_function__ | ||
170 | void | ||
171 | direct_log_unlock( DirectLog *log ) | ||
172 | { | ||
173 | @@ -262,7 +262,7 @@ | ||
174 | |||
175 | /**********************************************************************************************************************/ | ||
176 | |||
177 | -__no_instrument_function__ | ||
178 | +__dfb_no_instrument_function__ | ||
179 | DirectLog * | ||
180 | direct_log_default( void ) | ||
181 | { | ||
182 | Index: DirectFB-1.6.1/lib/direct/log_domain.c | ||
183 | =================================================================== | ||
184 | --- DirectFB-1.6.1.orig/lib/direct/log_domain.c 2012-06-29 19:01:11.000000000 +0300 | ||
185 | +++ DirectFB-1.6.1/lib/direct/log_domain.c 2013-01-05 18:04:38.000000000 +0200 | ||
186 | @@ -69,7 +69,7 @@ | ||
187 | |||
188 | /**********************************************************************************************************************/ | ||
189 | |||
190 | -__no_instrument_function__ | ||
191 | +__dfb_no_instrument_function__ | ||
192 | static __inline__ LogDomainEntry * | ||
193 | lookup_domain( const char *name, bool sub ); | ||
194 | |||
195 | @@ -104,7 +104,7 @@ | ||
196 | return NULL; | ||
197 | } | ||
198 | |||
199 | -__no_instrument_function__ | ||
200 | +__dfb_no_instrument_function__ | ||
201 | static DirectLogLevel | ||
202 | check_domain( DirectLogDomain *domain ); | ||
203 | |||
204 | @@ -207,7 +207,7 @@ | ||
205 | /* FIXME: merge following */ | ||
206 | |||
207 | |||
208 | -__no_instrument_function__ | ||
209 | +__dfb_no_instrument_function__ | ||
210 | DirectResult | ||
211 | direct_log_domain_vprintf( DirectLogDomain *domain, | ||
212 | DirectLogLevel level, | ||
213 | @@ -268,7 +268,7 @@ | ||
214 | return DR_OK; | ||
215 | } | ||
216 | |||
217 | -__no_instrument_function__ | ||
218 | +__dfb_no_instrument_function__ | ||
219 | DirectResult | ||
220 | direct_log_domain_log( DirectLogDomain *domain, | ||
221 | DirectLogLevel level, | ||
222 | Index: DirectFB-1.6.1/lib/direct/mem.c | ||
223 | =================================================================== | ||
224 | --- DirectFB-1.6.1.orig/lib/direct/mem.c 2012-06-29 19:01:11.000000000 +0300 | ||
225 | +++ DirectFB-1.6.1/lib/direct/mem.c 2013-01-05 18:03:08.000000000 +0200 | ||
226 | @@ -121,7 +121,7 @@ | ||
227 | |||
228 | /**********************************************************************************************************************/ | ||
229 | |||
230 | -__no_instrument_function__ | ||
231 | +__dfb_no_instrument_function__ | ||
232 | static __inline__ MemDesc * | ||
233 | fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace ) | ||
234 | { | ||
235 | Index: DirectFB-1.6.1/lib/direct/messages.c | ||
236 | =================================================================== | ||
237 | --- DirectFB-1.6.1.orig/lib/direct/messages.c 2012-06-29 19:01:11.000000000 +0300 | ||
238 | +++ DirectFB-1.6.1/lib/direct/messages.c 2013-01-05 18:02:57.000000000 +0200 | ||
239 | @@ -40,7 +40,7 @@ | ||
240 | |||
241 | #if DIRECT_BUILD_TEXT | ||
242 | |||
243 | -__no_instrument_function__ | ||
244 | +__dfb_no_instrument_function__ | ||
245 | void | ||
246 | direct_messages_info( const char *format, ... ) | ||
247 | { | ||
248 | @@ -57,7 +57,7 @@ | ||
249 | direct_log_printf( NULL, "(*) %s", buf ); | ||
250 | } | ||
251 | |||
252 | -__no_instrument_function__ | ||
253 | +__dfb_no_instrument_function__ | ||
254 | void | ||
255 | direct_messages_error( const char *format, ... ) | ||
256 | { | ||
257 | @@ -76,7 +76,7 @@ | ||
258 | direct_trace_print_stack( NULL ); | ||
259 | } | ||
260 | |||
261 | -__no_instrument_function__ | ||
262 | +__dfb_no_instrument_function__ | ||
263 | void | ||
264 | direct_messages_derror( DirectResult result, const char *format, ... ) | ||
265 | { | ||
266 | @@ -95,7 +95,7 @@ | ||
267 | direct_trace_print_stack( NULL ); | ||
268 | } | ||
269 | |||
270 | -__no_instrument_function__ | ||
271 | +__dfb_no_instrument_function__ | ||
272 | void | ||
273 | direct_messages_perror( int erno, const char *format, ... ) | ||
274 | { | ||
275 | @@ -114,7 +114,7 @@ | ||
276 | direct_trace_print_stack( NULL ); | ||
277 | } | ||
278 | |||
279 | -__no_instrument_function__ | ||
280 | +__dfb_no_instrument_function__ | ||
281 | void | ||
282 | direct_messages_dlerror( const char *dlerr, const char *format, ... ) | ||
283 | { | ||
284 | @@ -133,7 +133,7 @@ | ||
285 | direct_trace_print_stack( NULL ); | ||
286 | } | ||
287 | |||
288 | -__no_instrument_function__ | ||
289 | +__dfb_no_instrument_function__ | ||
290 | void | ||
291 | direct_messages_once( const char *func, | ||
292 | const char *file, | ||
293 | @@ -155,7 +155,7 @@ | ||
294 | direct_trace_print_stack( NULL ); | ||
295 | } | ||
296 | |||
297 | -__no_instrument_function__ | ||
298 | +__dfb_no_instrument_function__ | ||
299 | void | ||
300 | direct_messages_unimplemented( const char *func, | ||
301 | const char *file, | ||
302 | @@ -166,7 +166,7 @@ | ||
303 | direct_trace_print_stack( NULL ); | ||
304 | } | ||
305 | |||
306 | -__no_instrument_function__ | ||
307 | +__dfb_no_instrument_function__ | ||
308 | void | ||
309 | direct_messages_bug( const char *func, | ||
310 | const char *file, | ||
311 | @@ -188,7 +188,7 @@ | ||
312 | direct_trace_print_stack( NULL ); | ||
313 | } | ||
314 | |||
315 | -__no_instrument_function__ | ||
316 | +__dfb_no_instrument_function__ | ||
317 | void | ||
318 | direct_messages_warn( const char *func, | ||
319 | const char *file, | ||
320 | Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h | ||
321 | =================================================================== | ||
322 | --- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h 2012-06-29 19:01:11.000000000 +0300 | ||
323 | +++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h 2013-01-05 18:06:04.000000000 +0200 | ||
324 | @@ -74,7 +74,7 @@ | ||
325 | |||
326 | #define __inline__ inline | ||
327 | #define D_UNUSED __attribute__((unused)) | ||
328 | -#define __no_instrument_function__ __attribute__((no_instrument_function)) | ||
329 | +#define __dfb_no_instrument_function__ __attribute__((no_instrument_function)) | ||
330 | #define __constructor__ __attribute__((constructor)) | ||
331 | #define __destructor__ __attribute__((destructor)) | ||
332 | #define __typeof__(x) typeof(x) | ||
333 | Index: DirectFB-1.6.1/lib/direct/util.c | ||
334 | =================================================================== | ||
335 | --- DirectFB-1.6.1.orig/lib/direct/util.c 2012-06-29 19:01:11.000000000 +0300 | ||
336 | +++ DirectFB-1.6.1/lib/direct/util.c 2013-01-05 18:03:59.000000000 +0200 | ||
337 | @@ -110,7 +110,7 @@ | ||
338 | /* | ||
339 | * translates errno to DirectResult | ||
340 | */ | ||
341 | -__no_instrument_function__ | ||
342 | +__dfb_no_instrument_function__ | ||
343 | DirectResult | ||
344 | errno2result( int erno ) | ||
345 | { | ||
diff --git a/recipes-graphics/directfb/directfb_1.7.1.bb b/recipes-graphics/directfb/directfb_1.7.4.bb index 242af61..9bc2637 100644 --- a/recipes-graphics/directfb/directfb_1.7.1.bb +++ b/recipes-graphics/directfb/directfb_1.7.4.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | require recipes-graphics/directfb/directfb.inc | 1 | require recipes-graphics/directfb/directfb.inc |
2 | 2 | ||
3 | RV = "1.7-1" | 3 | RV = "1.7-4" |
4 | 4 | ||
5 | DEPENDS += "sysfsutils" | 5 | DEPENDS += "sysfsutils" |
6 | 6 | ||
7 | SRC_URI += "file://fix-compilation-with-zlib.patch \ | 7 | SRC_URI += "file://fixsepbuild.patch \ |
8 | file://fixsepbuild.patch" | 8 | file://Check-input-NULL-pointer.patch" |
9 | 9 | ||
10 | EXTRA_OECONF = "\ | 10 | EXTRA_OECONF = "\ |
11 | --enable-freetype=yes \ | 11 | --enable-freetype=yes \ |
@@ -16,9 +16,11 @@ EXTRA_OECONF = "\ | |||
16 | --disable-x11 \ | 16 | --disable-x11 \ |
17 | --disable-imlib2 \ | 17 | --disable-imlib2 \ |
18 | --disable-mesa \ | 18 | --disable-mesa \ |
19 | --with-tests \ | ||
19 | " | 20 | " |
20 | |||
21 | LEAD_SONAME = "libdirectfb-1.7.so.0" | 21 | LEAD_SONAME = "libdirectfb-1.7.so.0" |
22 | 22 | ||
23 | SRC_URI[md5sum] = "0ef44c16a414312fd38d6764e2cb9893" | 23 | SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" |
24 | SRC_URI[sha256sum] = "dd7de38b3cd1408411b37ca28ec73e14b7672e5e28256b7bf91826240c81f519" | 24 | SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" |
25 | |||
26 | PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" | ||