summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/directfb
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-07-03 12:34:59 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:58:54 +0100
commit7f906a7ae5132dac9745e9f406938f83d2dcbd48 (patch)
treeacef35cc5aac5915278cbc10725b50789d8e8f3c /meta/recipes-graphics/directfb
parente2b9acb88897fc6758f9d185a3f838aa2bc010c5 (diff)
downloadpoky-7f906a7ae5132dac9745e9f406938f83d2dcbd48.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. (From OE-Core rev: 47800f9bff7a799489851156c341151ee9cf364f) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.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.inc4
-rw-r--r--meta/recipes-graphics/directfb/directfb/fix-compilation-with-zlib.patch29
-rw-r--r--meta/recipes-graphics/directfb/directfb/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch27
-rw-r--r--meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch29
-rw-r--r--meta/recipes-graphics/directfb/directfb_1.5.3.bb23
-rw-r--r--meta/recipes-graphics/directfb/directfb_1.6.1.bb23
6 files changed, 55 insertions, 80 deletions
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index 3fd6161e20..a164717427 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589"
11HOMEPAGE = "http://directfb.org" 11HOMEPAGE = "http://directfb.org"
12DEPENDS = "jpeg libpng freetype zlib tslib" 12DEPENDS = "jpeg libpng freetype zlib tslib"
13 13
14SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-${PV}.tar.gz \ 14INC_PR = "r0"
15
16SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
15 file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ 17 file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
16 file://configurefix.patch" 18 file://configurefix.patch"
17 19
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 @@
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/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 @@
1From 54f775dfc516115c4d654d250189f431a82d1d42 Mon Sep 17 00:00:00 2001
2From: Denis Oliver Kropp <dok@directfb.org>
3Date: Sun, 27 May 2012 11:40:31 +0200
4Subject: [PATCH] libdirect: Use ARM assembler for atomic operations only if
5 ARCH_ARMv7 is defined.
6
7Upstream-Status: backport from 1.6.0-pre1
8---
9 lib/direct/atomic.h | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/lib/direct/atomic.h b/lib/direct/atomic.h
13index fe7664f..74d8d18 100644
14--- a/lib/direct/atomic.h
15+++ b/lib/direct/atomic.h
16@@ -183,7 +183,7 @@
17 #endif
18
19
20-#if defined(ARCH_ARM) && !defined(ARCH_IWMMXT)
21+#if defined(ARCH_ARMv7) && !defined(ARCH_IWMMXT)
22
23 static inline int _D__atomic_cmpxchg(volatile int *ptr, int old, int _new)
24 {
25--
261.7.9.5
27
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 @@
1Upstream-Status: backport from 1.6.0-pre1
2
3From cd575a84f10d90759e069f5f2e6092251a1b84bd Mon Sep 17 00:00:00 2001
4From: Sven Neumann <s.neumann@raumfeld.com>
5Date: Fri, 23 Sep 2011 10:00:02 +0200
6Subject: [PATCH] libdirect: remove include of <linux/config.h>
7
8That header has been removed from the Linux kernel with 2.6.19
9and it should not have been needed anyway.
10---
11 lib/direct/ppcasm_memcpy_cachable.S | 2 --
12 1 file changed, 2 deletions(-)
13
14diff --git a/lib/direct/ppcasm_memcpy_cachable.S b/lib/direct/ppcasm_memcpy_cachable.S
15index 920dea2..c1ef4fa 100644
16--- a/lib/direct/ppcasm_memcpy_cachable.S
17+++ b/lib/direct/ppcasm_memcpy_cachable.S
18@@ -34,8 +34,6 @@
19
20 #define __ASSEMBLY__
21
22-#include <linux/config.h>
23-
24 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
25 #define L1_CACHE_LINE_SIZE 16
26 #define LG_L1_CACHE_LINE_SIZE 4
27--
281.7.9.5
29
diff --git a/meta/recipes-graphics/directfb/directfb_1.5.3.bb b/meta/recipes-graphics/directfb/directfb_1.5.3.bb
deleted file mode 100644
index 9f527e1c10..0000000000
--- a/meta/recipes-graphics/directfb/directfb_1.5.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1require directfb.inc
2
3RV = "1.5-0"
4PR = "r0"
5
6DEPENDS += "sysfsutils"
7
8SRC_URI += "file://libdirect-Use-ARM-assembler-for-atomic-operations-on.patch \
9 file://libdirect-remove-include-of-linux-config.h.patch"
10
11EXTRA_OECONF = "\
12 --enable-freetype=yes \
13 --enable-zlib \
14 --with-gfxdrivers=none \
15 --disable-sdl \
16 --disable-vnc \
17 --disable-x11 \
18"
19
20LEAD_SONAME = "libdirectfb-1.5.so.0"
21
22SRC_URI[md5sum] = "54a9ec931c8e3c82adb924194e65120e"
23SRC_URI[sha256sum] = "e57575e8bb5f6452db6d5d54d78e3a460bc08bf50b1fa10d0250936dbe2251f0"
diff --git a/meta/recipes-graphics/directfb/directfb_1.6.1.bb b/meta/recipes-graphics/directfb/directfb_1.6.1.bb
new file mode 100644
index 0000000000..cafc21fcf6
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb_1.6.1.bb
@@ -0,0 +1,23 @@
1require directfb.inc
2
3RV = "1.6-0"
4PR = "${INC_PR}.0"
5
6DEPENDS += "sysfsutils"
7
8SRC_URI += "file://fix-compilation-with-zlib.patch"
9
10EXTRA_OECONF = "\
11 --enable-freetype=yes \
12 --enable-zlib \
13 --with-gfxdrivers=none \
14 --disable-sdl \
15 --disable-vnc \
16 --disable-x11 \
17"
18
19LEAD_SONAME = "libdirectfb-1.6.so.0"
20
21SRC_URI[md5sum] = "76d3066e75664aa79204af545f2f3c65"
22SRC_URI[sha256sum] = "f47575ea35dd8a30e548c04bf52d8565756d0bed45d1cf9f8afac1cf9b521c45"
23