From 0045ccfd1e17246600f7153ffc4a7633eaacd5e1 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 18 Sep 2015 16:21:54 -0300
Subject: [PATCH] directfb: Include a custom directfb.inc

The OE-Core commit:

commit 8a577fa7cf54db646f4e61f383390054e5f04ca3
Author: Khem Raj <raj.khem@gmail.com>
Date:   Tue Sep 8 22:12:46 2015 +0000

    directfb: Avoid using VLAs and printf formats

    These are not portable features and are flagged by clang

    Signed-off-by: Khem Raj <raj.khem@gmail.com>
	Signed-off-by: Ross Burton <ross.burton@intel.com>

Broke the directfb build as the new patch has been applied in the .inc
file and was unconditionally being included. The patch was include for
new versions of DirectFB and we ought to avoid including changes from
OE-Core, for this recipe, without notice.

It is likely the patch needs to be ported later for the forked
DirectFB recipe but this is should be done afterwards.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/directfb/directfb.inc      | 79 +++++++++++++++++++++
 recipes-graphics/directfb/directfb_1.7.4.bb |  2 +-
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 recipes-graphics/directfb/directfb.inc

diff --git a/recipes-graphics/directfb/directfb.inc b/recipes-graphics/directfb/directfb.inc
new file mode 100644
index 00000000..9e909422
--- /dev/null
+++ b/recipes-graphics/directfb/directfb.inc
@@ -0,0 +1,79 @@
+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_1.7.4.bb b/recipes-graphics/directfb/directfb_1.7.4.bb
index 561b1247..8586f0c3 100644
--- a/recipes-graphics/directfb/directfb_1.7.4.bb
+++ b/recipes-graphics/directfb/directfb_1.7.4.bb
@@ -1,4 +1,4 @@
-require recipes-graphics/directfb/directfb.inc
+require directfb.inc
 
 RV = "1.7-4"
 
-- 
2.40.1