directfb: fix-compilation-with-zlib.patch merged upstream

Compilation with zlib is fixed in DirectFB 1.7.1.

Upstream commit:

  commit 40779160de4d57bad973af9674df51ad281fdb8f
  Author: Denis Oliver Kropp <dok@directfb.org>
  Date:   Tue Sep 18 21:10:25 2012 +0200

    Core: Include zlib.h where it was missing.

(From OE-Core rev: 33638a9d8e74a31baf6528c0603b4b68fb5db7ec)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy 2014-06-14 03:32:04 -07:00 committed by Richard Purdie
parent c7bfbabab7
commit 4dae6c1f04
2 changed files with 1 additions and 31 deletions

View File

@ -1,29 +0,0 @@
Upstream-Status: Pending
From 1d6d597050fc24769e9df2693f754bdc824a8b78 Mon Sep 17 00:00:00 2001
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Date: Tue, 3 Jul 2012 16:06:10 +0300
Subject: [PATCH] fix compilation with zlib
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
src/core/surface.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/core/surface.c b/src/core/surface.c
index 50434a2..52f50ab 100644
--- a/src/core/surface.c
+++ b/src/core/surface.c
@@ -49,6 +49,9 @@
#include <gfx/convert.h>
#include <gfx/util.h>
+#ifdef USE_ZLIB
+#include <zlib.h>
+#endif
D_DEBUG_DOMAIN( Core_Surface, "Core/Surface", "DirectFB Core Surface" );
--
1.7.9.5

View File

@ -4,8 +4,7 @@ RV = "1.7-1"
DEPENDS += "sysfsutils"
SRC_URI += "file://fix-compilation-with-zlib.patch \
file://fixsepbuild.patch"
SRC_URI += "file://fixsepbuild.patch"
EXTRA_OECONF = "\
--enable-freetype=yes \