From: Neena Busireddy <neena.busireddy@freescale.com>
Date: Thu, 4 Dec 2014 19:49:44 +0000 (-0600)
Subject: directfb: Use include file from poky
X-Git-Tag: 2.1~751
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e44ea12246f7148b1b52fc45485b5dec85f7bfbe;p=meta-freescale.git

directfb: Use include file from poky

Use directfb include file from poky as it has fixes
for floating dependencies.
Directfb 1.7.1 fails to build without this change.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

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 f2518e93..00000000
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb.inc
+++ /dev/null
@@ -1,71 +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"
-
-SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \
-           file://configurefix.patch \
-           file://fusion.patch"
-
-S = "${WORKDIR}/DirectFB-${PV}"
-
-LDFLAGS_append =" -lts -lm"
-
-inherit autotools binconfig pkgconfig
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper"
-
-EXTRA_OECONF = "\
-  --with-gfxdrivers=none \
-  --enable-libmpeg3=no \
-  --enable-freetype=yes \
-  --enable-sdl=no \
-  --enable-vnc=no \
-  --disable-x11 \
-  --disable-mesa \
-"
-
-#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_x86 := "${@oe_filter_out('-fno-omit-frame-pointer', '${TARGET_CFLAGS}', d)}"
-
-#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/meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.1.bb b/meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.1.bb
index 15f38ac8..242af619 100644
--- a/meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.1.bb
+++ b/meta-fsl-arm/recipes-graphics/directfb/directfb_1.7.1.bb
@@ -1,4 +1,4 @@
-require directfb.inc
+require recipes-graphics/directfb/directfb.inc
 
 RV = "1.7-1"