diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2014-06-14 03:32:04 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-17 08:56:11 +0100 |
| commit | 33638a9d8e74a31baf6528c0603b4b68fb5db7ec (patch) | |
| tree | 57f9d5c79531db6893434004c53aee53c8351207 | |
| parent | 8c7a883964e45e7b48b943731bd3b3da0cc289d9 (diff) | |
| download | openembedded-core-contrib-33638a9d8e74a31baf6528c0603b4b68fb5db7ec.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.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb_1.7.1.bb | 3 |
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 @@ -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 - 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" DEPENDS += "sysfsutils" -SRC_URI += "file://fix-compilation-with-zlib.patch \ - file://fixsepbuild.patch" +SRC_URI += "file://fixsepbuild.patch" EXTRA_OECONF = "\ --enable-freetype=yes \ |