diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-07-03 12:34:59 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-09 16:51:19 +0100 |
commit | 47800f9bff7a799489851156c341151ee9cf364f (patch) | |
tree | bc1e0cedc9f9d6dd417c17e082b0bd5d12221e30 /meta/recipes-graphics/directfb/directfb | |
parent | d66d2bdf6214939e8b131f47db2f35d3c64e7dd2 (diff) | |
download | openembedded-core-contrib-47800f9bff7a799489851156c341151ee9cf364f.tar.gz |
directfb: upgrade to 1.6.1
Removed two backported patches that already exist in the current
version and fixed a compilation issue when zlib is used.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Diffstat (limited to 'meta/recipes-graphics/directfb/directfb')
3 files changed, 29 insertions, 56 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 new file mode 100644 index 0000000000..8b99b4ee72 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch @@ -0,0 +1,29 @@ +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/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch b/meta/recipes-graphics/directfb/directfb/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch deleted file mode 100644 index 277189bb84..0000000000 --- a/meta/recipes-graphics/directfb/directfb/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 54f775dfc516115c4d654d250189f431a82d1d42 Mon Sep 17 00:00:00 2001 -From: Denis Oliver Kropp <dok@directfb.org> -Date: Sun, 27 May 2012 11:40:31 +0200 -Subject: [PATCH] libdirect: Use ARM assembler for atomic operations only if - ARCH_ARMv7 is defined. - -Upstream-Status: backport from 1.6.0-pre1 ---- - lib/direct/atomic.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/direct/atomic.h b/lib/direct/atomic.h -index fe7664f..74d8d18 100644 ---- a/lib/direct/atomic.h -+++ b/lib/direct/atomic.h -@@ -183,7 +183,7 @@ - #endif - - --#if defined(ARCH_ARM) && !defined(ARCH_IWMMXT) -+#if defined(ARCH_ARMv7) && !defined(ARCH_IWMMXT) - - static inline int _D__atomic_cmpxchg(volatile int *ptr, int old, int _new) - { --- -1.7.9.5 - diff --git a/meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch b/meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch deleted file mode 100644 index 6c014cacad..0000000000 --- a/meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: backport from 1.6.0-pre1 - -From cd575a84f10d90759e069f5f2e6092251a1b84bd Mon Sep 17 00:00:00 2001 -From: Sven Neumann <s.neumann@raumfeld.com> -Date: Fri, 23 Sep 2011 10:00:02 +0200 -Subject: [PATCH] libdirect: remove include of <linux/config.h> - -That header has been removed from the Linux kernel with 2.6.19 -and it should not have been needed anyway. ---- - lib/direct/ppcasm_memcpy_cachable.S | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/lib/direct/ppcasm_memcpy_cachable.S b/lib/direct/ppcasm_memcpy_cachable.S -index 920dea2..c1ef4fa 100644 ---- a/lib/direct/ppcasm_memcpy_cachable.S -+++ b/lib/direct/ppcasm_memcpy_cachable.S -@@ -34,8 +34,6 @@ - - #define __ASSEMBLY__ - --#include <linux/config.h> -- - #if defined(CONFIG_8xx) || defined(CONFIG_403GCX) - #define L1_CACHE_LINE_SIZE 16 - #define LG_L1_CACHE_LINE_SIZE 4 --- -1.7.9.5 - |