summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/directfb
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2014-06-14 03:32:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 08:59:04 +0100
commit4dae6c1f045c5b2951ce17d4851f672305003958 (patch)
treec9788f2bb433d586e48d6d46fcaf610ad77a6dba /meta/recipes-graphics/directfb
parentc7bfbabab7274f31be9e484bbe277cf9d011072c (diff)
downloadpoky-4dae6c1f045c5b2951ce17d4851f672305003958.tar.gz
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>
Diffstat (limited to 'meta/recipes-graphics/directfb')
-rw-r--r--meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch29
-rw-r--r--meta/recipes-graphics/directfb/directfb_1.7.1.bb3
2 files changed, 1 insertions, 31 deletions
diff --git a/meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch b/meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch
deleted file mode 100644
index 8b99b4ee72..0000000000
--- a/meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Pending
2
3From 1d6d597050fc24769e9df2693f754bdc824a8b78 Mon Sep 17 00:00:00 2001
4From: Laurentiu Palcu <laurentiu.palcu@intel.com>
5Date: Tue, 3 Jul 2012 16:06:10 +0300
6Subject: [PATCH] fix compilation with zlib
7
8Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
9---
10 src/core/surface.c | 3 +++
11 1 file changed, 3 insertions(+)
12
13diff --git a/src/core/surface.c b/src/core/surface.c
14index 50434a2..52f50ab 100644
15--- a/src/core/surface.c
16+++ b/src/core/surface.c
17@@ -49,6 +49,9 @@
18 #include <gfx/convert.h>
19 #include <gfx/util.h>
20
21+#ifdef USE_ZLIB
22+#include <zlib.h>
23+#endif
24
25 D_DEBUG_DOMAIN( Core_Surface, "Core/Surface", "DirectFB Core Surface" );
26
27--
281.7.9.5
29
diff --git a/meta/recipes-graphics/directfb/directfb_1.7.1.bb b/meta/recipes-graphics/directfb/directfb_1.7.1.bb
index 15f38ac854..aff9633921 100644
--- a/meta/recipes-graphics/directfb/directfb_1.7.1.bb
+++ b/meta/recipes-graphics/directfb/directfb_1.7.1.bb
@@ -4,8 +4,7 @@ RV = "1.7-1"
4 4
5DEPENDS += "sysfsutils" 5DEPENDS += "sysfsutils"
6 6
7SRC_URI += "file://fix-compilation-with-zlib.patch \ 7SRC_URI += "file://fixsepbuild.patch"
8 file://fixsepbuild.patch"
9 8
10EXTRA_OECONF = "\ 9EXTRA_OECONF = "\
11 --enable-freetype=yes \ 10 --enable-freetype=yes \