[oe-commits] Andre McCurdy : directfb: fix-compilation-with-zlib.patch merged upstream

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 888d97a274d7c44d60f2811c345661b4e7db9899
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=888d97a274d7c44d60f2811c345661b4e7db9899

Author: Andre McCurdy <armccurdy at gmail.com>
Date:   Sat Jun 14 03:32:04 2014 -0700

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 at 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 at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../directfb/fix-compilation-with-zlib.patch       | 29 ----------------------
 meta/recipes-graphics/directfb/directfb_1.7.1.bb   |  3 +--
 2 files changed, 1 insertion(+), 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 8b99b4e..0000000
--- 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 at intel.com>
-Date: Tue, 3 Jul 2012 16:06:10 +0300
-Subject: [PATCH] fix compilation with zlib
-
-Signed-off-by: Laurentiu Palcu <laurentiu.palcu at 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 15f38ac..aff9633 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 \