directfb: Update to 1.4.12

(From OE-Core rev: 64fb071f561e8dbe273036f59d0491650023aafc)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 29 insertions, 15 deletions

diff --git a/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch b/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
index 745c561cc0..274ad501c0 100644
--- a/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
+++ b/meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch
@@ -1,7 +1,9 @@
-Index: DirectFB-1.1.1/directfb-internal.pc.in
+Upstream-Status: Inappropriate [configuration]
+
+Index: DirectFB-1.4.11/directfb-internal.pc.in
 ===================================================================
---- DirectFB-1.1.1.orig/directfb-internal.pc.in 2007-08-07 21:43:00.000000000 +0200
-+++ DirectFB-1.1.1/directfb-internal.pc.in      2008-07-17 21:00:47.424654304 +0200
+--- DirectFB-1.4.11.orig/directfb-internal.pc.in        2010-10-08 05:43:46.000000000 -0700
++++ DirectFB-1.4.11/directfb-internal.pc.in     2011-04-06 13:48:23.120923997 -0700
 @@ -2,10 +2,10 @@
  exec_prefix=@exec_prefix@
  moduledir=@MODULEDIR@
@@ -15,30 +17,31 @@ Index: DirectFB-1.1.1/directfb-internal.pc.in
  Requires: directfb = @VERSION@
 -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@
 +Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}
-Index: DirectFB-1.1.1/directfb.pc.in
+Index: DirectFB-1.4.11/directfb.pc.in
 ===================================================================
---- DirectFB-1.1.1.orig/directfb.pc.in  2007-12-15 16:23:16.000000000 +0100
-+++ DirectFB-1.1.1/directfb.pc.in       2008-07-17 20:59:58.044985193 +0200
-@@ -9,4 +9,4 @@
- Requires: fusion direct
+--- DirectFB-1.4.11.orig/directfb.pc.in 2010-11-15 13:13:59.000000000 -0800
++++ DirectFB-1.4.11/directfb.pc.in      2011-04-06 14:09:33.528923998 -0700
+@@ -9,4 +9,5 @@
+ Requires: @DEP_VOODOO@ fusion direct
  Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
- Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@
+ Libs.private: -L${libdir} @MEDIALIB@ @DYNLIB@ @ZLIB_LIBS@
 -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
 +Cflags: @THREADFLAGS@ -I${includedir}/directfb
-Index: DirectFB-1.1.1/lib/fusion/fusion.pc.in
++
+Index: DirectFB-1.4.11/lib/fusion/fusion.pc.in
 ===================================================================
---- DirectFB-1.1.1.orig/lib/fusion/fusion.pc.in 2007-08-07 21:43:00.000000000 +0200
-+++ DirectFB-1.1.1/lib/fusion/fusion.pc.in      2008-07-17 20:58:07.051338866 +0200
+--- DirectFB-1.4.11.orig/lib/fusion/fusion.pc.in        2010-10-08 05:43:46.000000000 -0700
++++ DirectFB-1.4.11/lib/fusion/fusion.pc.in     2011-04-06 13:48:23.120923997 -0700
 @@ -8,4 +8,4 @@
  Version: @VERSION@
  Requires: direct
  Libs: -L${libdir} -lfusion
 -Cflags: -I@INCLUDEDIR@
 +Cflags: -I${includedir}/directfb -I${includedir}
-Index: DirectFB-1.1.1/lib/voodoo/voodoo.pc.in
+Index: DirectFB-1.4.11/lib/voodoo/voodoo.pc.in
 ===================================================================
---- DirectFB-1.1.1.orig/lib/voodoo/voodoo.pc.in 2007-08-07 21:43:00.000000000 +0200
-+++ DirectFB-1.1.1/lib/voodoo/voodoo.pc.in      2008-07-17 20:58:07.054671842 +0200
+--- DirectFB-1.4.11.orig/lib/voodoo/voodoo.pc.in        2010-10-08 05:43:46.000000000 -0700
++++ DirectFB-1.4.11/lib/voodoo/voodoo.pc.in     2011-04-06 13:48:23.120923997 -0700
 @@ -8,4 +8,4 @@
  Version: @VERSION@
  Requires: direct
diff --git a/meta/recipes-graphics/directfb/files/dont-use-linux-config.patch b/meta/recipes-graphics/directfb/files/dont-use-linux-config.patch
index f971660954..ba8ead83e6 100644
--- a/meta/recipes-graphics/directfb/files/dont-use-linux-config.patch
+++ b/meta/recipes-graphics/directfb/files/dont-use-linux-config.patch
@@ -1,3 +1,14 @@
+
+directfb: don't use linux/config.h in powerpc assembly
+
+Author: jeremy_laine at openembedded.org
+Branch: org.openembedded.dev
+Revision: 73964f8e6912f066c224fed54daeeb44836d9cdf
+ViewMTN: http://monotone.openembedded.org/revision/info/73964f8e6912f066c224fed54daeeb44836d9cdf
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
 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