diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-graphics/directfb | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-graphics/directfb')
8 files changed, 608 insertions, 0 deletions
diff --git a/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch b/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch new file mode 100644 index 0000000000..0717ea6f88 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 88077ed156a714f32bb408f422278d61611ffd41 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Sat, 26 Jul 2014 16:57:46 -0300 | ||
4 | Subject: [PATCH] configure.in: Fix string argument syntax | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | |||
8 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
9 | --- | ||
10 | configure.in | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/configure.in b/configure.in | ||
14 | index bfe1b82..e939bbd 100644 | ||
15 | --- a/configure.in | ||
16 | +++ b/configure.in | ||
17 | @@ -65,7 +65,7 @@ fi) | ||
18 | |||
19 | DIRECTFB_REQUIRED_VERSION=1.4.14 | ||
20 | |||
21 | -PKG_CHECK_MODULES(DIRECTFB, directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], | ||
22 | +PKG_CHECK_MODULES([DIRECTFB], directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], | ||
23 | AC_MSG_ERROR([$DIRECTFB_PKG_ERRORS | ||
24 | *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest version | ||
25 | *** of DirectFB is available from http://www.directfb.org/.])) | ||
26 | -- | ||
27 | 1.7.10.4 | ||
28 | |||
diff --git a/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb new file mode 100644 index 0000000000..9c3e8bf3d3 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "Example DirectFB applications" | ||
2 | DESCRIPTION = "The DirectFB-examples package contains a set of simple DirectFB \ | ||
3 | applications that can be used to test and demonstrate various DirectFB \ | ||
4 | features" | ||
5 | DEPENDS = "directfb" | ||
6 | SECTION = "libs" | ||
7 | LICENSE = "MIT" | ||
8 | |||
9 | SRC_URI = " \ | ||
10 | http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \ | ||
11 | file://configure.in-Fix-string-argument-syntax.patch \ | ||
12 | " | ||
13 | |||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f" | ||
15 | |||
16 | S = "${WORKDIR}/DirectFB-examples-${PV}" | ||
17 | |||
18 | inherit autotools pkgconfig | ||
19 | |||
20 | SRC_URI[md5sum] = "8b60c867af295481c32a8c7fc5802307" | ||
21 | SRC_URI[sha256sum] = "9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a" | ||
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc new file mode 100644 index 0000000000..669c0ffd9d --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb.inc | |||
@@ -0,0 +1,76 @@ | |||
1 | SUMMARY = "Graphics abstraction library for the Linux Framebuffer Device" | ||
2 | DESCRIPTION = "DirectFB is a thin library that provides developers \ | ||
3 | with hardware graphics acceleration, input device handling and \ | ||
4 | abstraction, an integrated windowing system with support for \ | ||
5 | translucent windows and multiple display layers on top of the \ | ||
6 | Linux framebuffer device." | ||
7 | SECTION = "libs" | ||
8 | LICENSE = "LGPLv2.1" | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" | ||
10 | |||
11 | HOMEPAGE = "http://directfb.org" | ||
12 | DEPENDS = "jpeg libpng freetype zlib tslib" | ||
13 | |||
14 | SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \ | ||
15 | file://configurefix.patch \ | ||
16 | file://fusion.patch" | ||
17 | |||
18 | S = "${WORKDIR}/DirectFB-${PV}" | ||
19 | |||
20 | LDFLAGS_append =" -lts -lm" | ||
21 | |||
22 | BINCONFIG = "${bindir}/directfb-config" | ||
23 | |||
24 | inherit autotools binconfig-disabled pkgconfig | ||
25 | |||
26 | PACKAGECONFIG ??= "" | ||
27 | PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" | ||
28 | PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" | ||
29 | PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" | ||
30 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" | ||
31 | |||
32 | EXTRA_OECONF = "\ | ||
33 | --with-gfxdrivers=none \ | ||
34 | --enable-libmpeg3=no \ | ||
35 | --enable-freetype=yes \ | ||
36 | --enable-sdl=no \ | ||
37 | --enable-vnc=no \ | ||
38 | --disable-x11 \ | ||
39 | --disable-mesa \ | ||
40 | " | ||
41 | |||
42 | #Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default | ||
43 | #this will cause directfb build failure on x86 arch, so filter out it. | ||
44 | TARGET_CFLAGS_x86 := "${@oe_filter_out('-fno-omit-frame-pointer', '${TARGET_CFLAGS}', d)}" | ||
45 | |||
46 | #PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*" | ||
47 | # | ||
48 | #python populate_packages_prepend () { | ||
49 | # inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers') | ||
50 | # do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s') | ||
51 | #} | ||
52 | |||
53 | # NOTE: monolithic packaging for now, should improve that eventually | ||
54 | |||
55 | |||
56 | |||
57 | FILES_${PN}-dbg += "\ | ||
58 | ${libdir}/directfb-${RV}/*/*/.debug/*.so \ | ||
59 | ${libdir}/directfb-${RV}/*/.debug/*.so \ | ||
60 | " | ||
61 | |||
62 | FILES_${PN}-dev += "\ | ||
63 | ${bindir}/directfb-config \ | ||
64 | ${libdir}/directfb-${RV}/systems/*.la \ | ||
65 | ${libdir}/directfb-${RV}/inputdrivers/*.la \ | ||
66 | ${libdir}/directfb-${RV}/interfaces/*/*.la \ | ||
67 | ${libdir}/directfb-${RV}/wm/*.la \ | ||
68 | " | ||
69 | |||
70 | FILES_${PN} += "\ | ||
71 | ${libdir}/directfb-${RV}/systems/*.so \ | ||
72 | ${libdir}/directfb-${RV}/inputdrivers/*.so \ | ||
73 | ${libdir}/directfb-${RV}/interfaces/*/*.so \ | ||
74 | ${libdir}/directfb-${RV}/wm/*.so \ | ||
75 | ${datadir}/directfb-${PV} \ | ||
76 | " | ||
diff --git a/meta/recipes-graphics/directfb/directfb/configurefix.patch b/meta/recipes-graphics/directfb/directfb/configurefix.patch new file mode 100644 index 0000000000..dd8c01905f --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/configurefix.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | Libtool needs these set correctly else we end up with pointless rpaths | ||
2 | such as the QA warnings: | ||
3 | |||
4 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfblayer contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbmaster contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgifft contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbdump contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinput contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbfx contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbscreen contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgiff contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinspector contains probably-redundant RPATH /usr/lib | ||
5 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdfiff contains probably-redundant RPATH /usr/lib | ||
6 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinfo contains probably-redundant RPATH /usr/lib | ||
7 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbpenmount contains probably-redundant RPATH /usr/lib | ||
8 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbg contains probably-redundant RPATH /usr/lib | ||
9 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6 contains probably-redundant RPATH /usr/lib | ||
10 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib | ||
11 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6 contains probably-redundant RPATH /usr/lib | ||
12 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib | ||
13 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_fbdev.so contains probably-redundant RPATH /usr/lib | ||
14 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_devmem.so contains probably-redundant RPATH /usr/lib | ||
15 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_dummy.so contains probably-redundant RPATH /usr/lib | ||
16 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so contains probably-redundant RPATH /usr/lib | ||
17 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so contains probably-redundant RPATH /usr/lib | ||
18 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so contains probably-redundant RPATH /usr/lib | ||
19 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so contains probably-redundant RPATH /usr/lib | ||
20 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so contains probably-redundant RPATH /usr/lib | ||
21 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so contains probably-redundant RPATH /usr/lib | ||
22 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so contains probably-redundant RPATH /usr/lib | ||
23 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_ft2.so contains probably-redundant RPATH /usr/lib | ||
24 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so contains probably-redundant RPATH /usr/lib | ||
25 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/wm/libdirectfbwm_default.so contains probably-redundant RPATH /usr/lib | ||
26 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_zytronic.so contains probably-redundant RPATH /usr/lib | ||
27 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_penmount.so contains probably-redundant RPATH /usr/lib | ||
28 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_linux_input.so contains probably-redundant RPATH /usr/lib | ||
29 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_serialmouse.so contains probably-redundant RPATH /usr/lib | ||
30 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_mutouch.so contains probably-redundant RPATH /usr/lib | ||
31 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_tslib.so contains probably-redundant RPATH /usr/lib | ||
32 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_joystick.so contains probably-redundant RPATH /usr/lib | ||
33 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_sonypi.so contains probably-redundant RPATH /usr/lib | ||
34 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_lirc.so contains probably-redundant RPATH /usr/lib | ||
35 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_wm97xx_ts.so contains probably-redundant RPATH /usr/lib | ||
36 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_ps2mouse.so contains probably-redundant RPATH /usr/lib | ||
37 | WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_keyboard.so contains probably-redundant RPATH /usr/lib | ||
38 | |||
39 | Upstream-Status: Pending | ||
40 | |||
41 | RP 2012/03/16 | ||
42 | |||
43 | Index: DirectFB-1.4.15/configure.in | ||
44 | =================================================================== | ||
45 | --- DirectFB-1.4.15.orig/configure.in 2012-03-16 13:32:23.692402879 +0000 | ||
46 | +++ DirectFB-1.4.15/configure.in 2012-03-16 13:33:22.312400960 +0000 | ||
47 | @@ -97,13 +97,6 @@ | ||
48 | AC_CHECK_SIZEOF(long long) | ||
49 | AC_CHECK_FUNCS(fork) | ||
50 | |||
51 | - | ||
52 | -## Work around libstuhl during cross build... | ||
53 | -if test "$host" != "$build"; then | ||
54 | - sys_lib_dlsearch_path_spec="" | ||
55 | - sys_lib_search_path_spec="" | ||
56 | -fi | ||
57 | - | ||
58 | AC_PATH_PROGS(PERL, perl5 perl) | ||
59 | |||
60 | AC_PATH_PROG(MAN2HTML, man2html, no) | ||
diff --git a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch new file mode 100644 index 0000000000..94a9ba5f02 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | Fix out of tree builds | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | RP 2013/03/21 | ||
6 | |||
7 | Index: 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/fusion.patch b/meta/recipes-graphics/directfb/directfb/fusion.patch new file mode 100644 index 0000000000..1f81a6796c --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/fusion.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | directfb: Fix for hangs in direct_test, fusion_skirmish on exit | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Lauren Post <lauren.post@freescale.com> | ||
5 | |||
6 | --- a/lib/fusion/fusion.c 2013-01-18 22:57:11.000000000 +0800 | ||
7 | +++ b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800 | ||
8 | @@ -2853,9 +2853,14 @@ | ||
9 | direct_mutex_lock( &world->event_dispatcher_mutex ); | ||
10 | |||
11 | while (1) { | ||
12 | - if (!world->event_dispatcher_buffers) | ||
13 | + if (!world->event_dispatcher_buffers){ | ||
14 | direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); | ||
15 | - | ||
16 | + if (world->dispatch_stop) { | ||
17 | + D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); | ||
18 | + direct_mutex_unlock( &world->event_dispatcher_mutex ); | ||
19 | + return NULL; | ||
20 | + } | ||
21 | + } | ||
22 | buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; | ||
23 | D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer ); | ||
24 | |||
25 | @@ -2872,6 +2877,11 @@ | ||
26 | //D_INFO("waiting...\n"); | ||
27 | D_ASSERT( buf->read_pos == buf->write_pos ); | ||
28 | direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); | ||
29 | + if (world->dispatch_stop) { | ||
30 | + D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); | ||
31 | + direct_mutex_unlock( &world->event_dispatcher_mutex ); | ||
32 | + return NULL; | ||
33 | + } | ||
34 | } | ||
35 | |||
36 | buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; | ||
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 new file mode 100644 index 0000000000..443df5a9da --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch | |||
@@ -0,0 +1,345 @@ | |||
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/meta/recipes-graphics/directfb/directfb_1.7.4.bb b/meta/recipes-graphics/directfb/directfb_1.7.4.bb new file mode 100644 index 0000000000..39b006e8b3 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb_1.7.4.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | require directfb.inc | ||
2 | |||
3 | RV = "1.7-4" | ||
4 | |||
5 | DEPENDS += "sysfsutils" | ||
6 | |||
7 | SRC_URI += "file://fixsepbuild.patch" | ||
8 | |||
9 | EXTRA_OECONF = "\ | ||
10 | --enable-freetype=yes \ | ||
11 | --enable-zlib \ | ||
12 | --with-gfxdrivers=none \ | ||
13 | --disable-sdl \ | ||
14 | --disable-vnc \ | ||
15 | --disable-x11 \ | ||
16 | --disable-imlib2 \ | ||
17 | --disable-mesa \ | ||
18 | " | ||
19 | |||
20 | LEAD_SONAME = "libdirectfb-1.7.so.0" | ||
21 | |||
22 | SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" | ||
23 | SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" | ||