summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/directfb/directfb.inc2
-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.patch27
-rw-r--r--meta/recipes-graphics/directfb/directfb_1.4.15.bb20
-rw-r--r--meta/recipes-graphics/directfb/directfb_1.5.3.bb23
5 files changed, 78 insertions, 21 deletions
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index 515d19f4b5..3fd6161e20 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -11,7 +11,7 @@ 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.4/DirectFB-${PV}.tar.gz \ 14SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-${PV}.tar.gz \
15 file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ 15 file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
16 file://configurefix.patch" 16 file://configurefix.patch"
17 17
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
new file mode 100644
index 0000000000..277189bb84
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch
@@ -0,0 +1,27 @@
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
new file mode 100644
index 0000000000..eeb77385ca
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch
@@ -0,0 +1,27 @@
1From cd575a84f10d90759e069f5f2e6092251a1b84bd Mon Sep 17 00:00:00 2001
2From: Sven Neumann <s.neumann@raumfeld.com>
3Date: Fri, 23 Sep 2011 10:00:02 +0200
4Subject: [PATCH] libdirect: remove include of <linux/config.h>
5
6That header has been removed from the Linux kernel with 2.6.19
7and it should not have been needed anyway.
8---
9 lib/direct/ppcasm_memcpy_cachable.S | 2 --
10 1 file changed, 2 deletions(-)
11
12diff --git a/lib/direct/ppcasm_memcpy_cachable.S b/lib/direct/ppcasm_memcpy_cachable.S
13index 920dea2..c1ef4fa 100644
14--- a/lib/direct/ppcasm_memcpy_cachable.S
15+++ b/lib/direct/ppcasm_memcpy_cachable.S
16@@ -34,8 +34,6 @@
17
18 #define __ASSEMBLY__
19
20-#include <linux/config.h>
21-
22 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
23 #define L1_CACHE_LINE_SIZE 16
24 #define LG_L1_CACHE_LINE_SIZE 4
25--
261.7.9.5
27
diff --git a/meta/recipes-graphics/directfb/directfb_1.4.15.bb b/meta/recipes-graphics/directfb/directfb_1.4.15.bb
deleted file mode 100644
index 98d6b82a52..0000000000
--- a/meta/recipes-graphics/directfb/directfb_1.4.15.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1require directfb.inc
2
3RV = "1.4-6"
4PR = "r2"
5
6DEPENDS += "sysfsutils"
7
8EXTRA_OECONF = "\
9 --enable-freetype=yes \
10 --enable-zlib \
11 --with-gfxdrivers=none \
12 --disable-sdl \
13 --disable-vnc \
14 --disable-x11 \
15"
16
17LEAD_SONAME = "libdirectfb-1.4.so.6"
18
19SRC_URI[md5sum] = "9b2b90b81d7ded2a4a5caa22daeb81ef"
20SRC_URI[sha256sum] = "a40e640b53da9b2b155d98bf8cb1d173b01418c04b176768307adebefa0b78a8"
diff --git a/meta/recipes-graphics/directfb/directfb_1.5.3.bb b/meta/recipes-graphics/directfb/directfb_1.5.3.bb
new file mode 100644
index 0000000000..9f527e1c10
--- /dev/null
+++ b/meta/recipes-graphics/directfb/directfb_1.5.3.bb
@@ -0,0 +1,23 @@
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"