summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeena Busireddy <neena.busireddy@freescale.com>2014-08-26 14:24:39 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2014-11-10 18:55:23 -0200
commit0c8d7284e3d4b0c9515b45464b20ac5a9b27b55e (patch)
treeb1ab4de35fbe55fa72f90504daef5853c55007c9
parent6337d6d1fabb9b24e2387275a8d844e689c31f8b (diff)
downloadmeta-freescale-0c8d7284e3d4b0c9515b45464b20ac5a9b27b55e.tar.gz
imx-base: Remove preferred version for directfb
Remove preferred version for directfb and all the directfb 1.6 files as we now use directfb 1.7. Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat
-rw-r--r--meta-fsl-arm/conf/machine/include/imx-base.inc2
-rw-r--r--meta-fsl-arm/recipes-graphics/directfb/directfb-examples-1.6.0/configure.in-Fix-string-argument-syntax.patch28
-rw-r--r--meta-fsl-arm/recipes-graphics/directfb/directfb-examples_1.6.0.bb19
-rw-r--r--meta-fsl-arm/recipes-graphics/directfb/directfb.inc73
-rw-r--r--meta-fsl-arm/recipes-graphics/directfb/directfb/configurefix.patch60
-rw-r--r--meta-fsl-arm/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch29
-rw-r--r--meta-fsl-arm/recipes-graphics/directfb/directfb/fixsepbuild.patch19
-rw-r--r--meta-fsl-arm/recipes-graphics/directfb/directfb/fusion.patch36
-rw-r--r--meta-fsl-arm/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch345
-rw-r--r--meta-fsl-arm/recipes-graphics/directfb/directfb_1.6.3.bb26
10 files changed, 0 insertions, 637 deletions
diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index cd84c181e..03d004244 100644
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -29,8 +29,6 @@ XSERVER = "xserver-xorg \
29 29
30# FIXME: Use older versions until Vivante GPU is made compatible 30# FIXME: Use older versions until Vivante GPU is made compatible
31PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.14.4" 31PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.14.4"
32PREFERRED_VERSION_directfb_mx6 = "1.6.3"
33PREFERRED_VERSION_directfb-examples_mx6 = "1.6.0"
34 32
35# Ship kernel modules 33# Ship kernel modules
36MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" 34MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
diff --git a/meta-fsl-arm/recipes-graphics/directfb/directfb-examples-1.6.0/configure.in-Fix-string-argument-syntax.patch b/meta-fsl-arm/recipes-graphics/directfb/directfb-examples-1.6.0/configure.in-Fix-string-argument-syntax.patch
deleted file mode 100644
index 0717ea6f8..000000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb-examples-1.6.0/configure.in-Fix-string-argument-syntax.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 88077ed156a714f32bb408f422278d61611ffd41 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Sat, 26 Jul 2014 16:57:46 -0300
4Subject: [PATCH] configure.in: Fix string argument syntax
5
6Upstream-Status: Submitted
7
8Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
9---
10 configure.in | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/configure.in b/configure.in
14index 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--
271.7.10.4
28
diff --git a/meta-fsl-arm/recipes-graphics/directfb/directfb-examples_1.6.0.bb b/meta-fsl-arm/recipes-graphics/directfb/directfb-examples_1.6.0.bb
deleted file mode 100644
index 3e14c1b99..000000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb-examples_1.6.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1SUMMARY = "Example DirectFB applications"
2DESCRIPTION = "The DirectFB-examples package contains a set of simple DirectFB \
3 applications that can be used to test and demonstrate various DirectFB \
4 features"
5DEPENDS = "directfb"
6SECTION = "libs"
7LICENSE = "MIT"
8
9SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \
10 file://configure.in-Fix-string-argument-syntax.patch"
11
12LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f"
13
14S = "${WORKDIR}/DirectFB-examples-${PV}"
15
16inherit autotools pkgconfig
17
18SRC_URI[md5sum] = "27619d31e8a647fdd3023a0c1779b63d"
19SRC_URI[sha256sum] = "b08293697c211b690856f76a25ad7acd4ca458b4132851e0a1e471d0bf23c821"
diff --git a/meta-fsl-arm/recipes-graphics/directfb/directfb.inc b/meta-fsl-arm/recipes-graphics/directfb/directfb.inc
deleted file mode 100644
index a23209fb5..000000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb.inc
+++ /dev/null
@@ -1,73 +0,0 @@
1SUMMARY = "Graphics abstraction library for the Linux Framebuffer Device"
2DESCRIPTION = "DirectFB is a thin library that provides developers \
3with hardware graphics acceleration, input device handling and \
4abstraction, an integrated windowing system with support for \
5translucent windows and multiple display layers on top of the \
6Linux framebuffer device."
7SECTION = "libs"
8LICENSE = "LGPLv2.1"
9LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
10
11HOMEPAGE = "http://directfb.org"
12DEPENDS = "jpeg libpng freetype zlib tslib"
13
14INC_PR = "r0"
15
16SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
17 file://configurefix.patch \
18 file://fusion.patch"
19
20S = "${WORKDIR}/DirectFB-${PV}"
21
22LDFLAGS_append =" -lts -lm"
23
24inherit autotools binconfig pkgconfig
25
26PACKAGECONFIG ??= ""
27PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper"
28
29EXTRA_OECONF = "\
30 --with-gfxdrivers=none \
31 --enable-libmpeg3=no \
32 --enable-freetype=yes \
33 --enable-sdl=no \
34 --enable-vnc=no \
35 --disable-x11 \
36 --disable-mesa \
37"
38
39#Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default
40#this will cause directfb build failure on x86 arch, so filter out it.
41TARGET_CFLAGS_x86 := "${@oe_filter_out('-fno-omit-frame-pointer', '${TARGET_CFLAGS}', d)}"
42
43#PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*"
44#
45#python populate_packages_prepend () {
46# inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers')
47# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
48#}
49
50# NOTE: monolithic packaging for now, should improve that eventually
51
52
53
54FILES_${PN}-dbg += "\
55 ${libdir}/directfb-${RV}/*/*/.debug/*.so \
56 ${libdir}/directfb-${RV}/*/.debug/*.so \
57"
58
59FILES_${PN}-dev += "\
60 ${bindir}/directfb-config \
61 ${libdir}/directfb-${RV}/systems/*.la \
62 ${libdir}/directfb-${RV}/inputdrivers/*.la \
63 ${libdir}/directfb-${RV}/interfaces/*/*.la \
64 ${libdir}/directfb-${RV}/wm/*.la \
65"
66
67FILES_${PN} += "\
68 ${libdir}/directfb-${RV}/systems/*.so \
69 ${libdir}/directfb-${RV}/inputdrivers/*.so \
70 ${libdir}/directfb-${RV}/interfaces/*/*.so \
71 ${libdir}/directfb-${RV}/wm/*.so \
72 ${datadir}/directfb-${PV} \
73"
diff --git a/meta-fsl-arm/recipes-graphics/directfb/directfb/configurefix.patch b/meta-fsl-arm/recipes-graphics/directfb/directfb/configurefix.patch
deleted file mode 100644
index dd8c01905..000000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb/configurefix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1Libtool needs these set correctly else we end up with pointless rpaths
2such as the QA warnings:
3
4WARNING: 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
5WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdfiff contains probably-redundant RPATH /usr/lib
6WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinfo contains probably-redundant RPATH /usr/lib
7WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbpenmount contains probably-redundant RPATH /usr/lib
8WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbg contains probably-redundant RPATH /usr/lib
9WARNING: 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
10WARNING: 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
11WARNING: 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
12WARNING: 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
13WARNING: 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
14WARNING: 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
15WARNING: 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
16WARNING: 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
17WARNING: 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
18WARNING: 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
19WARNING: 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
20WARNING: 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
21WARNING: 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
22WARNING: 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
23WARNING: 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
24WARNING: 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
25WARNING: 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
26WARNING: 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
27WARNING: 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
28WARNING: 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
29WARNING: 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
30WARNING: 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
31WARNING: 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
32WARNING: 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
33WARNING: 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
34WARNING: 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
35WARNING: 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
36WARNING: 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
37WARNING: 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
39Upstream-Status: Pending
40
41RP 2012/03/16
42
43Index: 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-fsl-arm/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch b/meta-fsl-arm/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch
deleted file mode 100644
index 8b99b4ee7..000000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Pending
2
3From 1d6d597050fc24769e9df2693f754bdc824a8b78 Mon Sep 17 00:00:00 2001
4From: Laurentiu Palcu <laurentiu.palcu@intel.com>
5Date: Tue, 3 Jul 2012 16:06:10 +0300
6Subject: [PATCH] fix compilation with zlib
7
8Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
9---
10 src/core/surface.c | 3 +++
11 1 file changed, 3 insertions(+)
12
13diff --git a/src/core/surface.c b/src/core/surface.c
14index 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--
281.7.9.5
29
diff --git a/meta-fsl-arm/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta-fsl-arm/recipes-graphics/directfb/directfb/fixsepbuild.patch
deleted file mode 100644
index 94a9ba5f0..000000000
--- a/meta-fsl-arm/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-fsl-arm/recipes-graphics/directfb/directfb/fusion.patch b/meta-fsl-arm/recipes-graphics/directfb/directfb/fusion.patch
deleted file mode 100644
index 1f81a6796..000000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb/fusion.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1directfb: Fix for hangs in direct_test, fusion_skirmish on exit
2
3Upstream-Status: Pending
4Signed-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-fsl-arm/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/meta-fsl-arm/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch
deleted file mode 100644
index 443df5a9d..000000000
--- a/meta-fsl-arm/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-fsl-arm/recipes-graphics/directfb/directfb_1.6.3.bb b/meta-fsl-arm/recipes-graphics/directfb/directfb_1.6.3.bb
deleted file mode 100644
index 277e9a9b5..000000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb_1.6.3.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1require directfb.inc
2
3RV = "1.6-0"
4PR = "${INC_PR}.2"
5
6DEPENDS += "sysfsutils"
7
8SRC_URI += "file://fix-compilation-with-zlib.patch \
9 file://rename-no-instrument-function-macro.patch \
10 file://fixsepbuild.patch"
11
12EXTRA_OECONF = "\
13 --enable-freetype=yes \
14 --enable-zlib \
15 --with-gfxdrivers=none \
16 --disable-sdl \
17 --disable-vnc \
18 --disable-x11 \
19 --disable-imlib2 \
20 --disable-mesa \
21"
22
23LEAD_SONAME = "libdirectfb-1.6.so.0"
24
25SRC_URI[md5sum] = "641e8e999c017770da647f9b5b890906"
26SRC_URI[sha256sum] = "7a96aced0f69b2ec0810e9923068e61c21e6b19dd593e09394c872414df75e70"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-18 22:22:48 +0000