diff options
12 files changed, 0 insertions, 547 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 deleted file mode 100644 index 0717ea6f88..0000000000 --- a/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 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 deleted file mode 100644 index 7907c5c0da..0000000000 --- a/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 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://downloads.yoctoproject.org/mirror/sources/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 deleted file mode 100644 index 46e0838f79..0000000000 --- a/meta/recipes-graphics/directfb/directfb.inc +++ /dev/null | |||
| @@ -1,80 +0,0 @@ | |||
| 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 sysfsutils" | ||
| 13 | |||
| 14 | SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ | ||
| 15 | file://configurefix.patch \ | ||
| 16 | file://fusion.patch \ | ||
| 17 | file://bashism.patch \ | ||
| 18 | file://0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch \ | ||
| 19 | file://compar_fn_t.patch \ | ||
| 20 | file://union-sigval.patch \ | ||
| 21 | file://use-PTHREAD_MUTEX_RECURSIVE.patch \ | ||
| 22 | file://fix-client-gfx_state-initialisation.patch \ | ||
| 23 | " | ||
| 24 | |||
| 25 | S = "${WORKDIR}/DirectFB-${PV}" | ||
| 26 | |||
| 27 | LDFLAGS_append =" -lts -lm" | ||
| 28 | |||
| 29 | # Workaround for linking issues seen with armv7a + gold | ||
| 30 | LDFLAGS_append_arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | ||
| 31 | |||
| 32 | BINCONFIG = "${bindir}/directfb-config" | ||
| 33 | |||
| 34 | inherit autotools binconfig-disabled pkgconfig | ||
| 35 | |||
| 36 | PACKAGECONFIG ??= "" | ||
| 37 | PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" | ||
| 38 | PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" | ||
| 39 | PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" | ||
| 40 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" | ||
| 41 | |||
| 42 | EXTRA_OECONF = "\ | ||
| 43 | --with-gfxdrivers=none \ | ||
| 44 | --enable-freetype=yes \ | ||
| 45 | --enable-zlib \ | ||
| 46 | --disable-imlib2 \ | ||
| 47 | --disable-mesa \ | ||
| 48 | --disable-sdl \ | ||
| 49 | --disable-vnc \ | ||
| 50 | --disable-x11 \ | ||
| 51 | " | ||
| 52 | |||
| 53 | #Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default | ||
| 54 | #this will cause directfb build failure on x86 arch, so filter out it. | ||
| 55 | TARGET_CFLAGS_remove_x86 = "-fno-omit-frame-pointer" | ||
| 56 | |||
| 57 | #PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*" | ||
| 58 | # | ||
| 59 | #python populate_packages_prepend () { | ||
| 60 | # inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers') | ||
| 61 | # do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s') | ||
| 62 | #} | ||
| 63 | |||
| 64 | # NOTE: monolithic packaging for now, should improve that eventually | ||
| 65 | |||
| 66 | FILES_${PN}-dev += "\ | ||
| 67 | ${bindir}/directfb-config \ | ||
| 68 | ${libdir}/directfb-${RV}/systems/*.la \ | ||
| 69 | ${libdir}/directfb-${RV}/inputdrivers/*.la \ | ||
| 70 | ${libdir}/directfb-${RV}/interfaces/*/*.la \ | ||
| 71 | ${libdir}/directfb-${RV}/wm/*.la \ | ||
| 72 | " | ||
| 73 | |||
| 74 | FILES_${PN} += "\ | ||
| 75 | ${libdir}/directfb-${RV}/systems/*.so \ | ||
| 76 | ${libdir}/directfb-${RV}/inputdrivers/*.so \ | ||
| 77 | ${libdir}/directfb-${RV}/interfaces/*/*.so \ | ||
| 78 | ${libdir}/directfb-${RV}/wm/*.so \ | ||
| 79 | ${datadir}/directfb-${PV} \ | ||
| 80 | " | ||
diff --git a/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch b/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch deleted file mode 100644 index 76e0f75303..0000000000 --- a/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 1 | From f43ef44806ffb8e3b35d99070dde9b6cc1714d3d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 8 Sep 2015 21:32:20 +0000 | ||
| 4 | Subject: [PATCH] gfx,direct: Aboid usng VLAs and printf formats | ||
| 5 | |||
| 6 | VLAs are flagged by clang when using non-POD types, therefore replace | ||
| 7 | the usage with alloca which is exact same allocation on stack | ||
| 8 | |||
| 9 | __attribute__((__format__ (__printf__))) is not portable as used here | ||
| 10 | therefore disable the check for clang here, we lose no functionality | ||
| 11 | |||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | Upstream-Status: Pending | ||
| 15 | |||
| 16 | lib/direct/util.h | 2 +- | ||
| 17 | src/gfx/util.cpp | 8 ++++---- | ||
| 18 | 2 files changed, 5 insertions(+), 5 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/lib/direct/util.h b/lib/direct/util.h | ||
| 21 | index 72941e9..8e7fa4a 100644 | ||
| 22 | --- a/lib/direct/util.h | ||
| 23 | +++ b/lib/direct/util.h | ||
| 24 | @@ -98,7 +98,7 @@ | ||
| 25 | #define D_CONST_FUNC | ||
| 26 | #endif | ||
| 27 | |||
| 28 | -#if __GNUC__ >= 3 | ||
| 29 | +#if __GNUC__ >= 3 && !defined __clang__ | ||
| 30 | #define D_FORMAT_PRINTF(n) __attribute__((__format__ (__printf__, n, n+1))) | ||
| 31 | #define D_FORMAT_VPRINTF(n) __attribute__((__format__ (__printf__, n, 0))) | ||
| 32 | #else | ||
| 33 | diff --git a/src/gfx/util.cpp b/src/gfx/util.cpp | ||
| 34 | index 40032bc..d1015d4 100644 | ||
| 35 | --- a/src/gfx/util.cpp | ||
| 36 | +++ b/src/gfx/util.cpp | ||
| 37 | @@ -294,8 +294,8 @@ dfb_gfx_copy_regions_stereo( CoreSurface *source, | ||
| 38 | { | ||
| 39 | unsigned int i, n = 0; | ||
| 40 | DFBRectangle rect = { 0, 0, source->config.size.w, source->config.size.h }; | ||
| 41 | - DFBRectangle rects[num]; | ||
| 42 | - DFBPoint points[num]; | ||
| 43 | + DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num); | ||
| 44 | + DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num); | ||
| 45 | |||
| 46 | for (i=0; i<num; i++) { | ||
| 47 | DFB_REGION_ASSERT( ®ions[i] ); | ||
| 48 | @@ -351,8 +351,8 @@ dfb_gfx_copy_regions_client( CoreSurface *source, | ||
| 49 | { | ||
| 50 | unsigned int i, n = 0; | ||
| 51 | DFBRectangle rect = { 0, 0, source->config.size.w, source->config.size.h }; | ||
| 52 | - DFBRectangle rects[num]; | ||
| 53 | - DFBPoint points[num]; | ||
| 54 | + DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num); | ||
| 55 | + DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num); | ||
| 56 | CoreGraphicsStateClient *client = _client ? _client : &StateClient::Get()->client; | ||
| 57 | CardState *state = client->state; | ||
| 58 | CardState backup; | ||
| 59 | -- | ||
| 60 | 2.5.1 | ||
| 61 | |||
diff --git a/meta/recipes-graphics/directfb/directfb/bashism.patch b/meta/recipes-graphics/directfb/directfb/bashism.patch deleted file mode 100644 index 2ef4e93853..0000000000 --- a/meta/recipes-graphics/directfb/directfb/bashism.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | ${x//y/} is a bash syntax. Replace with something dash compatible | ||
| 2 | |||
| 3 | RP 2015/5/3 | ||
| 4 | Upstream-Status: Pending | ||
| 5 | |||
| 6 | Index: DirectFB-1.7.7/configure.in | ||
| 7 | =================================================================== | ||
| 8 | --- DirectFB-1.7.7.orig/configure.in | ||
| 9 | +++ DirectFB-1.7.7/configure.in | ||
| 10 | @@ -2696,7 +2696,7 @@ AM_CONDITIONAL(BUILD_TOOLS, test "$with_ | ||
| 11 | AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") | ||
| 12 | |||
| 13 | CFLAGS="$CFLAGS $DFB_INTERNAL_CFLAGS" | ||
| 14 | -CXXFLAGS="$CXXFLAGS ${CFLAGS//-Werror-implicit-function-declaration/}" | ||
| 15 | +CXXFLAGS="$CXXFLAGS $(printf '%s\n' "$CFLAGS" | sed 's/-Werror-implicit-function-declaration//g')" | ||
| 16 | DFB_LDFLAGS="$LDFLAGS $ZLIB_LIBS" | ||
| 17 | |||
| 18 | CFLAGS="$CFLAGS $CFLAGS_STD" | ||
diff --git a/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch b/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch deleted file mode 100644 index ee4d900ba8..0000000000 --- a/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | test for __compar_fn_t and if not defined by libc then define it | ||
| 2 | help make directfb compile with musl | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 6 | |||
| 7 | Index: DirectFB-1.7.7/configure.in | ||
| 8 | =================================================================== | ||
| 9 | --- DirectFB-1.7.7.orig/configure.in | ||
| 10 | +++ DirectFB-1.7.7/configure.in | ||
| 11 | @@ -112,6 +112,17 @@ AC_CHECK_SIZEOF(long) | ||
| 12 | AC_CHECK_SIZEOF(long long) | ||
| 13 | AC_CHECK_FUNCS(fork) | ||
| 14 | |||
| 15 | +AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ | ||
| 16 | + AC_TRY_COMPILE( | ||
| 17 | + [#include <stdlib.h>], | ||
| 18 | + [void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }], | ||
| 19 | + ccache_cv_COMPAR_FN_T=yes, | ||
| 20 | + ccache_cv_COMPAR_FN_T=no)]) | ||
| 21 | +if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then | ||
| 22 | + AC_DEFINE(HAVE_COMPAR_FN_T, 1, | ||
| 23 | + Define to 1 if you have the `__compar_fn_t' typedef.) | ||
| 24 | +fi | ||
| 25 | + | ||
| 26 | AC_PATH_PROGS(PERL, perl5 perl) | ||
| 27 | |||
| 28 | AC_PATH_PROG(MAN2HTML, man2html, no) | ||
| 29 | Index: DirectFB-1.7.7/inputdrivers/lirc/lirc.c | ||
| 30 | =================================================================== | ||
| 31 | --- DirectFB-1.7.7.orig/inputdrivers/lirc/lirc.c | ||
| 32 | +++ DirectFB-1.7.7/inputdrivers/lirc/lirc.c | ||
| 33 | @@ -59,6 +59,11 @@ | ||
| 34 | |||
| 35 | #include <core/input_driver.h> | ||
| 36 | |||
| 37 | +#if HAVE_COMPAR_FN_T | ||
| 38 | +#define COMPAR_FN_T __compar_fn_t | ||
| 39 | +#else | ||
| 40 | +typedef int (*COMPAR_FN_T)(const void *, const void *); | ||
| 41 | +#endif | ||
| 42 | |||
| 43 | DFB_INPUT_DRIVER( lirc ) | ||
| 44 | |||
| 45 | @@ -97,7 +102,7 @@ static DFBInputDeviceKeySymbol lirc_pars | ||
| 46 | qsort ( keynames, | ||
| 47 | D_ARRAY_SIZE( keynames ), | ||
| 48 | sizeof(keynames[0]), | ||
| 49 | - (__compar_fn_t) keynames_sort_compare ); | ||
| 50 | + (COMPAR_FN_T) keynames_sort_compare ); | ||
| 51 | keynames_sorted = true; | ||
| 52 | } | ||
| 53 | |||
| 54 | @@ -124,7 +129,7 @@ static DFBInputDeviceKeySymbol lirc_pars | ||
| 55 | symbol_name = bsearch( name, keynames, | ||
| 56 | D_ARRAY_SIZE( keynames ), | ||
| 57 | sizeof(keynames[0]), | ||
| 58 | - (__compar_fn_t) keynames_compare ); | ||
| 59 | + (COMPAR_FN_T) keynames_compare ); | ||
| 60 | if (symbol_name) | ||
| 61 | return symbol_name->symbol; | ||
| 62 | break; | ||
diff --git a/meta/recipes-graphics/directfb/directfb/configurefix.patch b/meta/recipes-graphics/directfb/directfb/configurefix.patch deleted file mode 100644 index dd8c01905f..0000000000 --- a/meta/recipes-graphics/directfb/directfb/configurefix.patch +++ /dev/null | |||
| @@ -1,60 +0,0 @@ | |||
| 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/fix-client-gfx_state-initialisation.patch b/meta/recipes-graphics/directfb/directfb/fix-client-gfx_state-initialisation.patch deleted file mode 100644 index 57a9b0dc7e..0000000000 --- a/meta/recipes-graphics/directfb/directfb/fix-client-gfx_state-initialisation.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From 8e53c0b9cedb62b82e2b7680d793d433b647ae20 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
| 3 | Date: Mon, 13 Jun 2016 13:32:44 -0700 | ||
| 4 | Subject: [PATCH] fix client->gfx_state initialisation | ||
| 5 | |||
| 6 | Shortly before the DirectFB 1.7.7 release, an optimisation was added | ||
| 7 | to CoreGraphicsStateClient_Init() to avoid creating an extended | ||
| 8 | Graphics State object if it will not later be required: | ||
| 9 | |||
| 10 | 4d422fb Client: Create extended Graphics State object when needed for later usage | ||
| 11 | |||
| 12 | Unfortunately the client->gfx_state variable used to track the | ||
| 13 | extended Graphics State object is not initialised, which can lead to | ||
| 14 | crashes etc due to creation of the Graphics State object erroneously | ||
| 15 | being skipped. | ||
| 16 | |||
| 17 | Upstream-Status: Pending | ||
| 18 | |||
| 19 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
| 20 | --- | ||
| 21 | src/core/CoreGraphicsStateClient.cpp | 1 + | ||
| 22 | 1 file changed, 1 insertion(+) | ||
| 23 | |||
| 24 | diff --git a/src/core/CoreGraphicsStateClient.cpp b/src/core/CoreGraphicsStateClient.cpp | ||
| 25 | index 5d46f0e..5007755 100644 | ||
| 26 | --- a/src/core/CoreGraphicsStateClient.cpp | ||
| 27 | +++ b/src/core/CoreGraphicsStateClient.cpp | ||
| 28 | @@ -364,6 +364,7 @@ CoreGraphicsStateClient_Init( CoreGraphicsStateClient *client, | ||
| 29 | client->renderer = NULL; | ||
| 30 | client->requestor = NULL; | ||
| 31 | client->throttle = NULL; | ||
| 32 | + client->gfx_state = NULL; | ||
| 33 | |||
| 34 | if (dfb_config->task_manager) { | ||
| 35 | if (dfb_config->call_nodirect) { | ||
| 36 | -- | ||
| 37 | 1.9.1 | ||
| 38 | |||
diff --git a/meta/recipes-graphics/directfb/directfb/fusion.patch b/meta/recipes-graphics/directfb/directfb/fusion.patch deleted file mode 100644 index 1f81a6796c..0000000000 --- a/meta/recipes-graphics/directfb/directfb/fusion.patch +++ /dev/null | |||
| @@ -1,36 +0,0 @@ | |||
| 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/union-sigval.patch b/meta/recipes-graphics/directfb/directfb/union-sigval.patch deleted file mode 100644 index 29f45c7977..0000000000 --- a/meta/recipes-graphics/directfb/directfb/union-sigval.patch +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | This patch is taken from gentoo musl overlay | ||
| 2 | sigval_t is glibc only construct, we use a union of sigval | ||
| 3 | which pretty much is same effect as sigval_t | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | |||
| 8 | diff -Naur DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c | ||
| 9 | --- DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c 2014-07-15 02:54:58.000000000 -0400 | ||
| 10 | +++ DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c 2015-07-18 16:55:35.077989166 -0400 | ||
| 11 | @@ -111,7 +111,7 @@ | ||
| 12 | void | ||
| 13 | direct_trap( const char *domain, int sig ) | ||
| 14 | { | ||
| 15 | - sigval_t val; | ||
| 16 | + union sigval val; | ||
| 17 | |||
| 18 | if (direct_config->delay_trap_ms) { | ||
| 19 | D_LOG( Direct_Trap, VERBOSE, "NOT RAISING signal %d from %s, waiting for %dms... attach gdb --pid=%d\n", sig, domain, direct_config->delay_trap_ms, getpid() ); | ||
diff --git a/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch b/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch deleted file mode 100644 index ac48f68db7..0000000000 --- a/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch +++ /dev/null | |||
| @@ -1,116 +0,0 @@ | |||
| 1 | Remove use of DIRECT_RECURSIVE_MUTEX_INITIALIZER its not portable | ||
| 2 | use portable way to initialize recursive mutex using pthread_once() and direct_recursive_mutex_init() | ||
| 3 | |||
| 4 | Upstream-Status: Pending | ||
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 6 | Index: DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h | ||
| 7 | =================================================================== | ||
| 8 | --- DirectFB-1.7.7.orig/lib/direct/os/linux/glibc/mutex.h | ||
| 9 | +++ DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h | ||
| 10 | @@ -46,7 +46,6 @@ struct __D_DirectMutex { | ||
| 11 | /**********************************************************************************************************************/ | ||
| 12 | |||
| 13 | #define DIRECT_MUTEX_INITIALIZER(name) { PTHREAD_MUTEX_INITIALIZER } | ||
| 14 | -#define DIRECT_RECURSIVE_MUTEX_INITIALIZER(name) { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP } | ||
| 15 | |||
| 16 | #endif | ||
| 17 | |||
| 18 | Index: DirectFB-1.7.7/lib/direct/trace.c | ||
| 19 | =================================================================== | ||
| 20 | --- DirectFB-1.7.7.orig/lib/direct/trace.c | ||
| 21 | +++ DirectFB-1.7.7/lib/direct/trace.c | ||
| 22 | @@ -89,8 +89,15 @@ struct __D_DirectTraceBuffer { | ||
| 23 | /**************************************************************************************************/ | ||
| 24 | |||
| 25 | static DirectLink *buffers; | ||
| 26 | -static DirectMutex buffers_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(buffers_lock); | ||
| 27 | |||
| 28 | +static pthread_once_t buffers_lock_init_once = PTHREAD_ONCE_INIT; | ||
| 29 | +static DirectMutex buffers_lock; | ||
| 30 | + | ||
| 31 | +static void | ||
| 32 | +buffers_lock_init( void ) | ||
| 33 | +{ | ||
| 34 | + direct_recursive_mutex_init(&buffers_lock); | ||
| 35 | +} | ||
| 36 | /**************************************************************************************************/ | ||
| 37 | |||
| 38 | __dfb_no_instrument_function__ | ||
| 39 | @@ -113,6 +120,7 @@ get_trace_buffer( void ) | ||
| 40 | |||
| 41 | D_MAGIC_SET( buffer, DirectTraceBuffer ); | ||
| 42 | |||
| 43 | + pthread_once(&buffers_lock_init_once, buffers_lock_init); | ||
| 44 | direct_mutex_lock( &buffers_lock ); | ||
| 45 | direct_list_append( &buffers, &buffer->link ); | ||
| 46 | direct_mutex_unlock( &buffers_lock ); | ||
| 47 | @@ -138,8 +146,14 @@ typedef struct { | ||
| 48 | } SymbolTable; | ||
| 49 | |||
| 50 | static DirectLink *tables = NULL; | ||
| 51 | -static DirectMutex tables_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(tables_lock); | ||
| 52 | +static pthread_once_t tables_lock_init_once = PTHREAD_ONCE_INIT; | ||
| 53 | +static DirectMutex tables_lock; | ||
| 54 | |||
| 55 | +static void | ||
| 56 | +tables_lock_init( void ) | ||
| 57 | +{ | ||
| 58 | + direct_recursive_mutex_init(&tabless_lock); | ||
| 59 | +} | ||
| 60 | |||
| 61 | __dfb_no_instrument_function__ | ||
| 62 | static void | ||
| 63 | @@ -370,6 +384,7 @@ direct_trace_lookup_symbol( const char * | ||
| 64 | Symbol *symbol; | ||
| 65 | SymbolTable *table; | ||
| 66 | |||
| 67 | + pthread_once(&tables_lock_init_once, tables_lock_init); | ||
| 68 | direct_mutex_lock( &tables_lock ); | ||
| 69 | |||
| 70 | table = find_table( filename ); | ||
| 71 | @@ -514,6 +529,7 @@ direct_trace_print_stacks() | ||
| 72 | DirectTraceBuffer *b; | ||
| 73 | DirectTraceBuffer *buffer = get_trace_buffer(); | ||
| 74 | |||
| 75 | + pthread_once(&buffers_lock_init_once, buffers_lock_init); | ||
| 76 | direct_mutex_lock( &buffers_lock ); | ||
| 77 | |||
| 78 | if (buffer && buffer->level) | ||
| 79 | @@ -611,6 +627,7 @@ direct_trace_free_buffer( DirectTraceBuf | ||
| 80 | D_MAGIC_ASSERT( buffer, DirectTraceBuffer ); | ||
| 81 | |||
| 82 | if (buffer->thread) { | ||
| 83 | + pthread_once(&buffers_lock_init_once, buffers_lock_init); | ||
| 84 | direct_mutex_lock( &buffers_lock ); | ||
| 85 | direct_list_remove( &buffers, &buffer->link ); | ||
| 86 | direct_mutex_unlock( &buffers_lock ); | ||
| 87 | Index: DirectFB-1.7.7/src/directfb.c | ||
| 88 | =================================================================== | ||
| 89 | --- DirectFB-1.7.7.orig/src/directfb.c | ||
| 90 | +++ DirectFB-1.7.7/src/directfb.c | ||
| 91 | @@ -99,6 +99,15 @@ const unsigned int directfb_micro_versio | ||
| 92 | const unsigned int directfb_binary_age = DIRECTFB_BINARY_AGE; | ||
| 93 | const unsigned int directfb_interface_age = DIRECTFB_INTERFACE_AGE; | ||
| 94 | |||
| 95 | +static pthread_once_t lock_init_once = PTHREAD_ONCE_INIT; | ||
| 96 | +static DirectMutex lock; | ||
| 97 | + | ||
| 98 | +static void | ||
| 99 | +lock_init( void ) | ||
| 100 | +{ | ||
| 101 | + direct_recursive_mutex_init(&lock); | ||
| 102 | +} | ||
| 103 | + | ||
| 104 | const char * | ||
| 105 | DirectFBCheckVersion( unsigned int required_major, | ||
| 106 | unsigned int required_minor, | ||
| 107 | @@ -215,8 +224,7 @@ DirectFBCreate( IDirectFB **interface_pt | ||
| 108 | if (dfb_config->remote.host) | ||
| 109 | return CreateRemote( dfb_config->remote.host, dfb_config->remote.port, interface_ptr ); | ||
| 110 | |||
| 111 | - static DirectMutex lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(lock); | ||
| 112 | - | ||
| 113 | + pthread_once(&lock_init_once, lock_init); | ||
| 114 | direct_mutex_lock( &lock ); | ||
| 115 | |||
| 116 | if (!dfb_config->no_singleton && idirectfb_singleton) { | ||
diff --git a/meta/recipes-graphics/directfb/directfb_1.7.7.bb b/meta/recipes-graphics/directfb/directfb_1.7.7.bb deleted file mode 100644 index c6c070eda6..0000000000 --- a/meta/recipes-graphics/directfb/directfb_1.7.7.bb +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | require directfb.inc | ||
| 2 | |||
| 3 | RV = "1.7-7" | ||
| 4 | |||
| 5 | LEAD_SONAME = "libdirectfb-1.7.so.0" | ||
| 6 | |||
| 7 | SRC_URI[md5sum] = "152cf1863b1a3a28aa1370e9053440bf" | ||
| 8 | SRC_URI[sha256sum] = "b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3" | ||
