From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Sat, 7 Jun 2008 02:29:57 +0000 (+0000)
Subject: directfb: don't use linux/config.h in powerpc assembly
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c15990416997cc5b32ddfb66642ebf393697ab;p=openembedded.git

directfb: don't use linux/config.h in powerpc assembly
---

diff --git a/packages/directfb/directfb.inc b/packages/directfb/directfb.inc
index 0843f36198..150cbe66b3 100644
--- a/packages/directfb/directfb.inc
+++ b/packages/directfb/directfb.inc
@@ -8,7 +8,7 @@ LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
 RV = "1.0-0"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = " \
     http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
@@ -17,6 +17,7 @@ SRC_URI = " \
     file://getpagesize.patch;patch=1 \
     file://fix-includes.patch;patch=1 \
     file://mkdfiff.patch;patch=1 \
+    file://dont-use-linux-config.patch;patch=1 \
 "
 S = "${WORKDIR}/DirectFB-${PV}"
 
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index 5b4690fe93..fccb8dbfdd 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -1,4 +1,3 @@
 require directfb.inc
 
 RV = "1.0-0"
-PR = "r4"
diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb
index 39002fdb5d..8aa8f43c08 100644
--- a/packages/directfb/directfb_1.1.0.bb
+++ b/packages/directfb/directfb_1.1.0.bb
@@ -1,4 +1,3 @@
 require directfb.inc
 
 RV = "1.1-0"
-PR = "r3"
diff --git a/packages/directfb/files/dont-use-linux-config.patch b/packages/directfb/files/dont-use-linux-config.patch
new file mode 100644
index 0000000000..f971660954
--- /dev/null
+++ b/packages/directfb/files/dont-use-linux-config.patch
@@ -0,0 +1,12 @@
+diff -urN DirectFB-1.1.0.orig/lib/direct/ppcasm_memcpy_cachable.S DirectFB-1.1.0/lib/direct/ppcasm_memcpy_cachable.S
+--- DirectFB-1.1.0.orig/lib/direct/ppcasm_memcpy_cachable.S	2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.0/lib/direct/ppcasm_memcpy_cachable.S	2008-06-07 04:14:26.000000000 +0200
+@@ -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