On Thu, Oct 29, 2015 at 10:21 AM, Otavio Salvador <[email protected]> wrote: > The DirectFB project is dead upstream for a while and the backend is > deprecated so it is better to drop it and avoid new users to depend on > it and instead to focus in the current technologies for new projects. > > This commit removes everything related to the DirectFB support so if > someone wish to revert it locally it can be easily done. > > Signed-off-by: Otavio Salvador <[email protected]>
Acked-by: Daiane Angolini <[email protected]> > --- > > conf/machine/include/imx-base.inc | 5 -- > recipes-graphics/cairo/cairo_%.bbappend | 5 +- > recipes-graphics/directfb/directfb.inc | 79 > ---------------------- > .../directfb/Check-input-NULL-pointer.patch | 42 ------------ > recipes-graphics/directfb/directfb/bashism.patch | 18 ----- > .../directfb/directfb/configurefix.patch | 60 ---------------- > .../directfb/directfb/fixsepbuild.patch | 19 ------ > recipes-graphics/directfb/directfb/fusion.patch | 36 ---------- > recipes-graphics/directfb/directfb_%.bbappend | 3 - > recipes-graphics/directfb/directfb_1.7.4.bb | 24 ------- > recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 28 ++------ > .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 4 +- > 12 files changed, 8 insertions(+), 315 deletions(-) > delete mode 100644 recipes-graphics/directfb/directfb.inc > delete mode 100644 > recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch > delete mode 100644 recipes-graphics/directfb/directfb/bashism.patch > delete mode 100644 recipes-graphics/directfb/directfb/configurefix.patch > delete mode 100644 recipes-graphics/directfb/directfb/fixsepbuild.patch > delete mode 100644 recipes-graphics/directfb/directfb/fusion.patch > delete mode 100644 recipes-graphics/directfb/directfb_%.bbappend > delete mode 100644 recipes-graphics/directfb/directfb_1.7.4.bb > > diff --git a/conf/machine/include/imx-base.inc > b/conf/machine/include/imx-base.inc > index dd673f1..6af61a3 100644 > --- a/conf/machine/include/imx-base.inc > +++ b/conf/machine/include/imx-base.inc > @@ -34,11 +34,6 @@ XSERVER = "xserver-xorg \ > xf86-input-evdev \ > ${XSERVER_DRIVER}" > > -PREFERRED_VERSION_directfb_mx6q = "1.7.4" > -PREFERRED_VERSION_directfb_mx6dl = "1.7.4" > -PREFERRED_VERSION_directfb_mx6sx = "1.7.4" > -PREFERRED_VERSION_directfb_mx6sl = "1.7.4" > - > # Ship kernel modules > MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" > > diff --git a/recipes-graphics/cairo/cairo_%.bbappend > b/recipes-graphics/cairo/cairo_%.bbappend > index ab1c37a..0467dc4 100644 > --- a/recipes-graphics/cairo/cairo_%.bbappend > +++ b/recipes-graphics/cairo/cairo_%.bbappend > @@ -1,10 +1,7 @@ > CFLAGS_append_mx6 = " -DLINUX \ > ${@base_contains('DISTRO_FEATURES', 'x11', '', \ > base_contains('DISTRO_FEATURES', > 'wayland', \ > - '-DEGL_API_FB > -DEGL_API_WL', \ > - base_contains('DISTRO_FEATURES', > 'directfb', \ > - '-DEGL_API_DFB', > '-DEGL_API_FB', d),d),d)}" > - > + '-DEGL_API_FB > -DEGL_API_WL', '', d), d)}" > > PACKAGECONFIG_append_mx6q = " egl glesv2" > PACKAGECONFIG_append_mx6dl = " egl glesv2" > diff --git a/recipes-graphics/directfb/directfb.inc > b/recipes-graphics/directfb/directfb.inc > deleted file mode 100644 > index 9e90942..0000000 > --- a/recipes-graphics/directfb/directfb.inc > +++ /dev/null > @@ -1,79 +0,0 @@ > -SUMMARY = "Graphics abstraction library for the Linux Framebuffer Device" > -DESCRIPTION = "DirectFB is a thin library that provides developers \ > -with hardware graphics acceleration, input device handling and \ > -abstraction, an integrated windowing system with support for \ > -translucent windows and multiple display layers on top of the \ > -Linux framebuffer device." > -SECTION = "libs" > -LICENSE = "LGPLv2.1" > -LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" > - > -HOMEPAGE = "http://directfb.org"; > -DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils" > - > -SRC_URI = > "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \ > - file://configurefix.patch \ > - file://fusion.patch \ > - file://bashism.patch \ > - " > - > -S = "${WORKDIR}/DirectFB-${PV}" > - > -LDFLAGS_append =" -lts -lm" > - > -BINCONFIG = "${bindir}/directfb-config" > - > -inherit autotools binconfig-disabled pkgconfig > - > -PACKAGECONFIG ??= "" > -PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" > -PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" > -PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" > -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" > - > -EXTRA_OECONF = "\ > - --with-gfxdrivers=none \ > - --enable-freetype=yes \ > - --enable-zlib \ > - --disable-imlib2 \ > - --disable-mesa \ > - --disable-sdl \ > - --disable-vnc \ > - --disable-x11 \ > -" > - > -#Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as > default > -#this will cause directfb build failure on x86 arch, so filter out it. > -TARGET_CFLAGS_remove_x86 = "-fno-omit-frame-pointer" > - > -#PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*" > -# > -#python populate_packages_prepend () { > -# inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers') > -# do_split_packages(d, inputdrivers_libdir, '*.so$', > 'directfb-inputdrivers-%s', 'Directfb plugin for %s') > -#} > - > -# NOTE: monolithic packaging for now, should improve that eventually > - > - > - > -FILES_${PN}-dbg += "\ > - ${libdir}/directfb-${RV}/*/*/.debug/*.so \ > - ${libdir}/directfb-${RV}/*/.debug/*.so \ > -" > - > -FILES_${PN}-dev += "\ > - ${bindir}/directfb-config \ > - ${libdir}/directfb-${RV}/systems/*.la \ > - ${libdir}/directfb-${RV}/inputdrivers/*.la \ > - ${libdir}/directfb-${RV}/interfaces/*/*.la \ > - ${libdir}/directfb-${RV}/wm/*.la \ > -" > - > -FILES_${PN} += "\ > - ${libdir}/directfb-${RV}/systems/*.so \ > - ${libdir}/directfb-${RV}/inputdrivers/*.so \ > - ${libdir}/directfb-${RV}/interfaces/*/*.so \ > - ${libdir}/directfb-${RV}/wm/*.so \ > - ${datadir}/directfb-${PV} \ > -" > diff --git > a/recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch > b/recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch > deleted file mode 100644 > index 1d54172..0000000 > --- a/recipes-graphics/directfb/directfb/Check-input-NULL-pointer.patch > +++ /dev/null > @@ -1,42 +0,0 @@ > -From 0c1e3d1d54b7f2e637b0984ea10aef1de278ff87 Mon Sep 17 00:00:00 2001 > -From: "yong.gan" <[email protected]> > -Date: Fri, 23 May 2014 14:15:09 +0800 > -Subject: [PATCH] Check input NULL pointer > - > -Fix the segmentation fault in multi-instance test. > - > -Upstream Status: Pending > ---- > - inputdrivers/linux_input/linux_input.c | 2 +- > - src/core/input.c | 2 ++ > - 2 files changed, 3 insertions(+), 1 deletion(-) > - > -diff --git a/inputdrivers/linux_input/linux_input.c > b/inputdrivers/linux_input/linux_input.c > -index e275762..35cfbdd 100644 > ---- a/inputdrivers/linux_input/linux_input.c > -+++ b/inputdrivers/linux_input/linux_input.c > -@@ -1979,7 +1979,7 @@ driver_get_keymap_entry( CoreInputDevice > *device, > - unsigned short value; > - DFBInputDeviceKeyIdentifier identifier; > - > -- if (data->vt_fd < 0) > -+ if (data == NULL || data->vt_fd < 0) > - return DFB_UNSUPPORTED; > - > - /* fetch the base level */ > -diff --git a/src/core/input.c b/src/core/input.c > -index d77bc9f..ee23909 100644 > ---- a/src/core/input.c > -+++ b/src/core/input.c > -@@ -723,6 +723,8 @@ dfb_input_core_suspend( DFBInputCore *data ) > - driver->info.name ); > - } > - } > -+ if(data == NULL) > -+ return DFB_FAILURE; > - > - direct_list_foreach (device, data->devices) { > - InputDeviceShared *devshared; > --- > -1.9.1 > - > diff --git a/recipes-graphics/directfb/directfb/bashism.patch > b/recipes-graphics/directfb/directfb/bashism.patch > deleted file mode 100644 > index 2ef4e93..0000000 > --- a/recipes-graphics/directfb/directfb/bashism.patch > +++ /dev/null > @@ -1,18 +0,0 @@ > -${x//y/} is a bash syntax. Replace with something dash compatible > - > -RP 2015/5/3 > -Upstream-Status: Pending > - > -Index: DirectFB-1.7.7/configure.in > -=================================================================== > ---- DirectFB-1.7.7.orig/configure.in > -+++ DirectFB-1.7.7/configure.in > -@@ -2696,7 +2696,7 @@ AM_CONDITIONAL(BUILD_TOOLS, test "$with_ > - AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") > - > - CFLAGS="$CFLAGS $DFB_INTERNAL_CFLAGS" > --CXXFLAGS="$CXXFLAGS ${CFLAGS//-Werror-implicit-function-declaration/}" > -+CXXFLAGS="$CXXFLAGS $(printf '%s\n' "$CFLAGS" | sed > 's/-Werror-implicit-function-declaration//g')" > - DFB_LDFLAGS="$LDFLAGS $ZLIB_LIBS" > - > - CFLAGS="$CFLAGS $CFLAGS_STD" > diff --git a/recipes-graphics/directfb/directfb/configurefix.patch > b/recipes-graphics/directfb/directfb/configurefix.patch > deleted file mode 100644 > index dd8c019..0000000 > --- a/recipes-graphics/directfb/directfb/configurefix.patch > +++ /dev/null > @@ -1,60 +0,0 @@ > -Libtool needs these set correctly else we end up with pointless rpaths > -such as the QA warnings: > - > -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/pa ck > ages-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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > -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 > - > -Upstream-Status: Pending > - > -RP 2012/03/16 > - > -Index: DirectFB-1.4.15/configure.in > -=================================================================== > ---- DirectFB-1.4.15.orig/configure.in 2012-03-16 13:32:23.692402879 +0000 > -+++ DirectFB-1.4.15/configure.in 2012-03-16 13:33:22.312400960 +0000 > -@@ -97,13 +97,6 @@ > - AC_CHECK_SIZEOF(long long) > - AC_CHECK_FUNCS(fork) > - > -- > --## Work around libstuhl during cross build... > --if test "$host" != "$build"; then > -- sys_lib_dlsearch_path_spec="" > -- sys_lib_search_path_spec="" > --fi > -- > - AC_PATH_PROGS(PERL, perl5 perl) > - > - AC_PATH_PROG(MAN2HTML, man2html, no) > diff --git a/recipes-graphics/directfb/directfb/fixsepbuild.patch > b/recipes-graphics/directfb/directfb/fixsepbuild.patch > deleted file mode 100644 > index 94a9ba5..0000000 > --- a/recipes-graphics/directfb/directfb/fixsepbuild.patch > +++ /dev/null > @@ -1,19 +0,0 @@ > -Fix out of tree builds > - > -Upstream-Status: Pending > - > -RP 2013/03/21 > - > -Index: DirectFB-1.6.1/configure.in > -=================================================================== > ---- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000 > -+++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000 > -@@ -111,7 +111,7 @@ > - AC_PATH_TOOL(FLUXCOMP, fluxcomp) > - AC_SUBST(FLUXCOMP) > - if test -z "$FLUXCOMP"; then > -- if ! test -e src/core/CoreDFB.cpp; then > -+ if ! test -e $srcdir/src/core/CoreDFB.cpp; then > - AC_MSG_ERROR([ > - *** DirectFB compilation requires fluxcomp *** > - > diff --git a/recipes-graphics/directfb/directfb/fusion.patch > b/recipes-graphics/directfb/directfb/fusion.patch > deleted file mode 100644 > index 1f81a67..0000000 > --- a/recipes-graphics/directfb/directfb/fusion.patch > +++ /dev/null > @@ -1,36 +0,0 @@ > -directfb: Fix for hangs in direct_test, fusion_skirmish on exit > - > -Upstream-Status: Pending > -Signed-off-by: Lauren Post <[email protected]> > - > ---- a/lib/fusion/fusion.c 2013-01-18 22:57:11.000000000 +0800 > -+++ b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800 > -@@ -2853,9 +2853,14 @@ > - direct_mutex_lock( &world->event_dispatcher_mutex ); > - > - while (1) { > -- if (!world->event_dispatcher_buffers) > -+ if (!world->event_dispatcher_buffers){ > - direct_waitqueue_wait( &world->event_dispatcher_cond, > &world->event_dispatcher_mutex ); > -- > -+ if (world->dispatch_stop) { > -+ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING > (dispatch_stop!)\n" ); > -+ direct_mutex_unlock( > &world->event_dispatcher_mutex ); > -+ return NULL; > -+ } > -+ } > - buf = (FusionEventDispatcherBuffer > *)world->event_dispatcher_buffers; > - D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer ); > - > -@@ -2872,6 +2877,11 @@ > - //D_INFO("waiting...\n"); > - D_ASSERT( buf->read_pos == buf->write_pos ); > - direct_waitqueue_wait( &world->event_dispatcher_cond, > &world->event_dispatcher_mutex ); > -+ if (world->dispatch_stop) { > -+ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING > (dispatch_stop!)\n" ); > -+ direct_mutex_unlock( > &world->event_dispatcher_mutex ); > -+ return NULL; > -+ } > - } > - > - buf = (FusionEventDispatcherBuffer > *)world->event_dispatcher_buffers; > diff --git a/recipes-graphics/directfb/directfb_%.bbappend > b/recipes-graphics/directfb/directfb_%.bbappend > deleted file mode 100644 > index a95af53..0000000 > --- a/recipes-graphics/directfb/directfb_%.bbappend > +++ /dev/null > @@ -1,3 +0,0 @@ > -# i.MX6 has DirectFB acceleration support, so add it > -RDEPENDS_${PN}_append_mx6 = " libvivante-dfb-mx6" > -PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" > diff --git a/recipes-graphics/directfb/directfb_1.7.4.bb > b/recipes-graphics/directfb/directfb_1.7.4.bb > deleted file mode 100644 > index 8586f0c..0000000 > --- a/recipes-graphics/directfb/directfb_1.7.4.bb > +++ /dev/null > @@ -1,24 +0,0 @@ > -require directfb.inc > - > -RV = "1.7-4" > - > -DEPENDS += "sysfsutils" > - > -SRC_URI += "file://fixsepbuild.patch \ > - file://Check-input-NULL-pointer.patch" > - > -EXTRA_OECONF = "\ > - --enable-freetype=yes \ > - --enable-zlib \ > - --with-gfxdrivers=none \ > - --disable-sdl \ > - --disable-vnc \ > - --disable-x11 \ > - --disable-imlib2 \ > - --disable-mesa \ > - --with-tests \ > -" > -LEAD_SONAME = "libdirectfb-1.7.so.0" > - > -SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" > -SRC_URI[sha256sum] = > "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" > diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc > b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc > index 78e1e32..76f24f6 100644 > --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc > +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc > @@ -64,7 +64,6 @@ python __anonymous () { > } > > USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" > -USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}" > USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" > > # Inhibit warnings about files being stripped. > @@ -122,7 +121,7 @@ do_install () { > > install -d ${D}${libdir}/pkgconfig > > - # The preference order, based in DISTRO_FEATURES, is x11, wayland, > directfb and fb > + # The preference order, based in DISTRO_FEATURES, is x11, wayland and fb > if [ "${USE_X11}" = "yes" ]; then > cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} > cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir} > @@ -154,26 +153,15 @@ do_install () { > install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-egl.pc > ${D}${libdir}/pkgconfig/wayland-egl.pc > install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc > ${D}${libdir}/pkgconfig/wayland-viv.pc > else > + # Regular framebuffer > install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc > ${D}${libdir}/pkgconfig/glesv1_cm.pc > install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc > ${D}${libdir}/pkgconfig/glesv2.pc > install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc > ${D}${libdir}/pkgconfig/vg.pc > > - if [ "${USE_DFB}" = "yes" ]; then > - install -d ${D}/${sysconfdir} > - install -m 644 ${S}/gpu-core/etc/directfbrc > ${D}/${sysconfdir}/directfbrc > - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_directfb.pc > ${D}${libdir}/pkgconfig/egl.pc > - > - cp -r ${S}/gpu-core/usr/lib/directfb-* ${D}${libdir} > - cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} > - cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} > - backend=dfb > - else > - # Regular framebuffer > - install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc > ${D}${libdir}/pkgconfig/egl.pc > - cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} > - cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} > - backend=fb > - fi > + install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc > ${D}${libdir}/pkgconfig/egl.pc > + cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} > + cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} > + backend=fb > fi > > # Install Vendor ICDs for OpenCL's installable client driver loader > (ICDs Loader) > @@ -304,8 +292,6 @@ FILES_libvivante-mx6-dbg = > "${libdir}/.debug/libVIVANTE${SOLIBS}" > FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so" > RDEPENDS_libvivante-dri-mx6 = "libdrm" > > -FILES_libvivante-dfb-mx6 = > "${libdir}/directfb-*/gfxdrivers/libdirectfb_gal.so" > - > INSANE_SKIP_libwayland-viv-mx6 += "dev-so" > FILES_libwayland-viv-mx6 = "${libdir}/libwayland-viv${REALSOLIBS} > ${libdir}/libwayland-viv${SOLIBS}" > FILES_libwayland-viv-mx6-dev = "${includedir}/wayland-viv > ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc" > @@ -318,8 +304,6 @@ FILES_libgc-wayland-protocol-mx6-dbg = > "${libdir}/libgc_wayland_protocol${SOLIBS > > FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc" > > -FILES_libvivante-dfb-mx6 += "${sysconfdir}/directfbrc" > - > INSANE_SKIP_imx-gpu-viv-g2d += "dev-so" > FILES_imx-gpu-viv-g2d = "${libdir}/libg2d* " > FILES_imx-gpu-viv-g2d-dev = "${includedir}/g2d.h" > diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend > b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend > index 2c78cd2..7e6f3ff 100644 > --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend > +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend > @@ -4,9 +4,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > CFLAGS_append_mx6 = " -DLINUX \ > ${@base_contains('DISTRO_FEATURES', 'x11', '', \ > - base_contains('DISTRO_FEATURES', 'wayland', > '-DEGL_API_FB -DWL_EGL_PLATFORM', \ > - base_contains('DISTRO_FEATURES', 'directfb', > '-DEGL_API_DFB -I${STAGING_INCDIR}/directfb', \ > - '-DEGL_API_FB', d),d),d)}" > + base_contains('DISTRO_FEATURES', 'wayland', > '-DEGL_API_FB -DWL_EGL_PLATFORM', '-DEGL_API_FB', d), d)}" > > PACKAGECONFIG_GL_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \ > base_contains('DISTRO_FEATURES', 'x11', \ > -- > 2.6.2 > > -- > _______________________________________________ > meta-freescale mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-freescale -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
