mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
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>
This commit is contained in:
Laurentiu Palcu
committed by
Richard Purdie
Richard Purdie
parent
e2b9acb888
commit
7f906a7ae5
@@ -11,7 +11,9 @@ 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.5/DirectFB-${PV}.tar.gz \
|
||||
INC_PR = "r0"
|
||||
|
||||
SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \
|
||||
file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
|
||||
file://configurefix.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
|
||||
|
||||
-27
@@ -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
|
||||
|
||||
-29
@@ -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
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
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"
|
||||
@@ -0,0 +1,23 @@
|
||||
require directfb.inc
|
||||
|
||||
RV = "1.6-0"
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
DEPENDS += "sysfsutils"
|
||||
|
||||
SRC_URI += "file://fix-compilation-with-zlib.patch"
|
||||
|
||||
EXTRA_OECONF = "\
|
||||
--enable-freetype=yes \
|
||||
--enable-zlib \
|
||||
--with-gfxdrivers=none \
|
||||
--disable-sdl \
|
||||
--disable-vnc \
|
||||
--disable-x11 \
|
||||
"
|
||||
|
||||
LEAD_SONAME = "libdirectfb-1.6.so.0"
|
||||
|
||||
SRC_URI[md5sum] = "76d3066e75664aa79204af545f2f3c65"
|
||||
SRC_URI[sha256sum] = "f47575ea35dd8a30e548c04bf52d8565756d0bed45d1cf9f8afac1cf9b521c45"
|
||||
|
||||
Reference in New Issue
Block a user