summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-12-23 10:15:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:08:20 +0000
commitac35e3cabd3217ba0cb38a003a747e7bfa78fd72 (patch)
treea0a603f5b4e73cc875f7c93abad15ee164d7c80c /meta/recipes-graphics
parent7b8c6b81ca12814ed4846fb8435108548e62394d (diff)
downloadpoky-ac35e3cabd3217ba0cb38a003a747e7bfa78fd72.tar.gz
directfb: upgrade to 1.7.6
- Drop fixsepbuild.patch which has been merged to 1.7.6 - Drop obsolete rename-no-instrument-function-macro.patch (From OE-Core rev: 15c0ee00550b9e5aac04da598393a614a45bc8a9) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/directfb/directfb/fixsepbuild.patch19
-rw-r--r--meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch345
-rw-r--r--meta/recipes-graphics/directfb/directfb_1.7.6.bb (renamed from meta/recipes-graphics/directfb/directfb_1.7.4.bb)8
3 files changed, 3 insertions, 369 deletions
diff --git a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch
deleted file mode 100644
index 94a9ba5f02..0000000000
--- a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Fix out of tree builds
2
3Upstream-Status: Pending
4
5RP 2013/03/21
6
7Index: DirectFB-1.6.1/configure.in
8===================================================================
9--- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000
10+++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000
11@@ -111,7 +111,7 @@
12 AC_PATH_TOOL(FLUXCOMP, fluxcomp)
13 AC_SUBST(FLUXCOMP)
14 if test -z "$FLUXCOMP"; then
15- if ! test -e src/core/CoreDFB.cpp; then
16+ if ! test -e $srcdir/src/core/CoreDFB.cpp; then
17 AC_MSG_ERROR([
18 *** DirectFB compilation requires fluxcomp ***
19
diff --git a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch
deleted file mode 100644
index 443df5a9da..0000000000
--- a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch
+++ /dev/null
@@ -1,345 +0,0 @@
1Rename __no_instrument_function__ macro to avoid conficting redefinitions
2of the same symbol.
3
4Upstream-Status: Pending
5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
6
7Index: 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 {
44Index: 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,
102Index: 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,
142Index: 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 {
182Index: 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,
222Index: 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 {
235Index: 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,
320Index: 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)
333Index: 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/meta/recipes-graphics/directfb/directfb_1.7.4.bb b/meta/recipes-graphics/directfb/directfb_1.7.6.bb
index 39b006e8b3..d25d98746f 100644
--- a/meta/recipes-graphics/directfb/directfb_1.7.4.bb
+++ b/meta/recipes-graphics/directfb/directfb_1.7.6.bb
@@ -1,11 +1,9 @@
1require directfb.inc 1require directfb.inc
2 2
3RV = "1.7-4" 3RV = "1.7-6"
4 4
5DEPENDS += "sysfsutils" 5DEPENDS += "sysfsutils"
6 6
7SRC_URI += "file://fixsepbuild.patch"
8
9EXTRA_OECONF = "\ 7EXTRA_OECONF = "\
10 --enable-freetype=yes \ 8 --enable-freetype=yes \
11 --enable-zlib \ 9 --enable-zlib \
@@ -19,5 +17,5 @@ EXTRA_OECONF = "\
19 17
20LEAD_SONAME = "libdirectfb-1.7.so.0" 18LEAD_SONAME = "libdirectfb-1.7.so.0"
21 19
22SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" 20SRC_URI[md5sum] = "8a7bb06b3f58599b230b4cf314004512"
23SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" 21SRC_URI[sha256sum] = "44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 19:33:42 +0000