From 8acb86dfdae782c7627e36e23e1bcb703f8c79db Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Fri, 1 Jun 2012 14:41:24 +0300 Subject: directfb: upgrade to 1.5.3 Also, backported a couple of patches from upstream that fix some compilations issues for ARM and PPC. Signed-off-by: Laurentiu Palcu --- meta/recipes-graphics/directfb/directfb.inc | 2 +- ...se-ARM-assembler-for-atomic-operations-on.patch | 27 ++++++++++++++++++++++ ...ibdirect-remove-include-of-linux-config.h.patch | 27 ++++++++++++++++++++++ meta/recipes-graphics/directfb/directfb_1.4.15.bb | 20 ---------------- meta/recipes-graphics/directfb/directfb_1.5.3.bb | 23 ++++++++++++++++++ 5 files changed, 78 insertions(+), 21 deletions(-) create mode 100644 meta/recipes-graphics/directfb/directfb/libdirect-Use-ARM-assembler-for-atomic-operations-on.patch create mode 100644 meta/recipes-graphics/directfb/directfb/libdirect-remove-include-of-linux-config.h.patch delete mode 100644 meta/recipes-graphics/directfb/directfb_1.4.15.bb create mode 100644 meta/recipes-graphics/directfb/directfb_1.5.3.bb (limited to 'meta/recipes-graphics/directfb') 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" HOMEPAGE = "http://directfb.org" DEPENDS = "jpeg libpng freetype zlib tslib" -SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \ +SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-${PV}.tar.gz \ file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ file://configurefix.patch" 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 @@ +From 54f775dfc516115c4d654d250189f431a82d1d42 Mon Sep 17 00:00:00 2001 +From: Denis Oliver Kropp +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 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 @@ +From cd575a84f10d90759e069f5f2e6092251a1b84bd Mon Sep 17 00:00:00 2001 +From: Sven Neumann +Date: Fri, 23 Sep 2011 10:00:02 +0200 +Subject: [PATCH] libdirect: remove include of + +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 +- + #if defined(CONFIG_8xx) || defined(CONFIG_403GCX) + #define L1_CACHE_LINE_SIZE 16 + #define LG_L1_CACHE_LINE_SIZE 4 +-- +1.7.9.5 + 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 @@ -require directfb.inc - -RV = "1.4-6" -PR = "r2" - -DEPENDS += "sysfsutils" - -EXTRA_OECONF = "\ - --enable-freetype=yes \ - --enable-zlib \ - --with-gfxdrivers=none \ - --disable-sdl \ - --disable-vnc \ - --disable-x11 \ -" - -LEAD_SONAME = "libdirectfb-1.4.so.6" - -SRC_URI[md5sum] = "9b2b90b81d7ded2a4a5caa22daeb81ef" -SRC_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 @@ +require directfb.inc + +RV = "1.5-0" +PR = "r0" + +DEPENDS += "sysfsutils" + +SRC_URI += "file://libdirect-Use-ARM-assembler-for-atomic-operations-on.patch \ + file://libdirect-remove-include-of-linux-config.h.patch" + +EXTRA_OECONF = "\ + --enable-freetype=yes \ + --enable-zlib \ + --with-gfxdrivers=none \ + --disable-sdl \ + --disable-vnc \ + --disable-x11 \ +" + +LEAD_SONAME = "libdirectfb-1.5.so.0" + +SRC_URI[md5sum] = "54a9ec931c8e3c82adb924194e65120e" +SRC_URI[sha256sum] = "e57575e8bb5f6452db6d5d54d78e3a460bc08bf50b1fa10d0250936dbe2251f0" -- cgit 1.2.3-korg