diff options
6 files changed, 55 insertions, 73 deletions
diff --git a/meta/recipes-graphics/directfb/directfb-1.4.6/mkdfiff.patch b/meta/recipes-graphics/directfb/directfb-1.4.6/mkdfiff.patch deleted file mode 100644 index 28bd534f37..0000000000 --- a/meta/recipes-graphics/directfb/directfb-1.4.6/mkdfiff.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | diff -uNr DirectFB-1.4.6.orig/tools/mkdfiff.c DirectFB-1.4.6/tools/mkdfiff.c | ||
| 2 | --- DirectFB-1.4.6.orig/tools/mkdfiff.c 2010-10-15 10:54:57.000000000 +0200 | ||
| 3 | +++ DirectFB-1.4.6/tools/mkdfiff.c 2010-10-15 10:54:15.000000000 +0200 | ||
| 4 | @@ -50,6 +50,8 @@ | ||
| 5 | |||
| 6 | #include <dfiff.h> | ||
| 7 | |||
| 8 | +#include <unistd.h> | ||
| 9 | + | ||
| 10 | static DirectFBPixelFormatNames( format_names ); | ||
| 11 | |||
| 12 | static const char *filename; | ||
| 13 | diff -uNr DirectFB-1.4.6.orig/tools/mkdgifft.cpp DirectFB-1.4.6/tools/mkdgifft.cpp | ||
| 14 | --- DirectFB-1.4.6.orig/tools/mkdgifft.cpp 2010-10-08 14:02:57.000000000 +0200 | ||
| 15 | +++ DirectFB-1.4.6/tools/mkdgifft.cpp 2010-10-15 10:56:06.000000000 +0200 | ||
| 16 | @@ -40,6 +40,8 @@ | ||
| 17 | #include <errno.h> | ||
| 18 | #include <stdio.h> | ||
| 19 | #include <stdlib.h> | ||
| 20 | +#include <sys/stat.h> | ||
| 21 | +#include <sys/types.h> | ||
| 22 | #include <unistd.h> | ||
| 23 | #include <fcntl.h> | ||
| 24 | #include <sys/mman.h> | ||
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index e4cd00626a..d45159f046 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc | |||
| @@ -12,14 +12,11 @@ HOMEPAGE = "http://directfb.org" | |||
| 12 | DEPENDS = "jpeg libpng freetype zlib tslib" | 12 | DEPENDS = "jpeg libpng freetype zlib tslib" |
| 13 | 13 | ||
| 14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
| 15 | http://www.directfb.org/downloads/Old/DirectFB-${PV}.tar.gz \ | 15 | http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \ |
| 16 | file://fix-pkgconfig-cflags.patch \ | 16 | file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ |
| 17 | file://fix-font-missing-char.patch \ | ||
| 18 | file://getpagesize.patch \ | ||
| 19 | file://mkdfiff.patch \ | ||
| 20 | file://dont-use-linux-config.patch \ | 17 | file://dont-use-linux-config.patch \ |
| 21 | file://ts_lib_autotools.patch \ | 18 | " |
| 22 | " | 19 | |
| 23 | S = "${WORKDIR}/DirectFB-${PV}" | 20 | S = "${WORKDIR}/DirectFB-${PV}" |
| 24 | 21 | ||
| 25 | LDFLAGS_append =" -lts -lm" | 22 | LDFLAGS_append =" -lts -lm" |
diff --git a/meta/recipes-graphics/directfb/directfb_1.4.12.bb b/meta/recipes-graphics/directfb/directfb_1.4.12.bb new file mode 100644 index 0000000000..4e8203b42f --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb_1.4.12.bb | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | require directfb.inc | ||
| 2 | |||
| 3 | RV = "1.4-5" | ||
| 4 | PR = "r0" | ||
| 5 | |||
| 6 | DEPENDS += "sysfsutils" | ||
| 7 | |||
| 8 | EXTRA_OECONF = "\ | ||
| 9 | --enable-freetype=yes \ | ||
| 10 | --enable-zlib \ | ||
| 11 | --with-gfxdrivers=none \ | ||
| 12 | --disable-sdl \ | ||
| 13 | --disable-vnc \ | ||
| 14 | --disable-x11 \ | ||
| 15 | " | ||
| 16 | |||
| 17 | LEAD_SONAME = "libdirectfb-1.4.so.5" | ||
| 18 | |||
| 19 | SRC_URI[md5sum] = "2c779c9a8456790c6c29ad85459b2600" | ||
| 20 | SRC_URI[sha256sum] = "b119ab9c5c0c505c23e32d41ae54bd04cb474c5e58900ec0f1cf9482f892f9b2" | ||
| 21 | |||
| 22 | |||
diff --git a/meta/recipes-graphics/directfb/directfb_1.4.6.bb b/meta/recipes-graphics/directfb/directfb_1.4.6.bb deleted file mode 100644 index 70c0225bf7..0000000000 --- a/meta/recipes-graphics/directfb/directfb_1.4.6.bb +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | require directfb.inc | ||
| 2 | |||
| 3 | RV = "1.4-5" | ||
| 4 | PR = "r2" | ||
| 5 | |||
| 6 | DEPENDS += "sysfsutils" | ||
| 7 | |||
| 8 | SRC_URI = " \ | ||
| 9 | http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \ | ||
| 10 | file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ | ||
| 11 | file://mkdfiff.patch \ | ||
| 12 | file://dont-use-linux-config.patch \ | ||
| 13 | " | ||
| 14 | |||
| 15 | EXTRA_OECONF = "\ | ||
| 16 | --enable-freetype=yes \ | ||
| 17 | --enable-zlib \ | ||
| 18 | --with-gfxdrivers=none \ | ||
| 19 | --disable-sdl \ | ||
| 20 | --disable-vnc \ | ||
| 21 | --disable-x11 \ | ||
| 22 | " | ||
| 23 | |||
| 24 | LEAD_SONAME = "libdirectfb-1.4.so.5" | ||
| 25 | |||
| 26 | SRC_URI[md5sum] = "dbe1957932f81790742b58b94c1c7b84" | ||
| 27 | SRC_URI[sha256sum] = "b18121e60e9a084ee347037a53a46cfaea1c09505bd99d673c2e65eca285e69b" | ||
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 @@ | |||
| 1 | Index: DirectFB-1.1.1/directfb-internal.pc.in | 1 | Upstream-Status: Inappropriate [configuration] |
| 2 | |||
| 3 | Index: DirectFB-1.4.11/directfb-internal.pc.in | ||
| 2 | =================================================================== | 4 | =================================================================== |
| 3 | --- DirectFB-1.1.1.orig/directfb-internal.pc.in 2007-08-07 21:43:00.000000000 +0200 | 5 | --- DirectFB-1.4.11.orig/directfb-internal.pc.in 2010-10-08 05:43:46.000000000 -0700 |
| 4 | +++ DirectFB-1.1.1/directfb-internal.pc.in 2008-07-17 21:00:47.424654304 +0200 | 6 | +++ DirectFB-1.4.11/directfb-internal.pc.in 2011-04-06 13:48:23.120923997 -0700 |
| 5 | @@ -2,10 +2,10 @@ | 7 | @@ -2,10 +2,10 @@ |
| 6 | exec_prefix=@exec_prefix@ | 8 | exec_prefix=@exec_prefix@ |
| 7 | moduledir=@MODULEDIR@ | 9 | moduledir=@MODULEDIR@ |
| @@ -15,30 +17,31 @@ Index: DirectFB-1.1.1/directfb-internal.pc.in | |||
| 15 | Requires: directfb = @VERSION@ | 17 | Requires: directfb = @VERSION@ |
| 16 | -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ | 18 | -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ |
| 17 | +Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir} | 19 | +Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir} |
| 18 | Index: DirectFB-1.1.1/directfb.pc.in | 20 | Index: DirectFB-1.4.11/directfb.pc.in |
| 19 | =================================================================== | 21 | =================================================================== |
| 20 | --- DirectFB-1.1.1.orig/directfb.pc.in 2007-12-15 16:23:16.000000000 +0100 | 22 | --- DirectFB-1.4.11.orig/directfb.pc.in 2010-11-15 13:13:59.000000000 -0800 |
| 21 | +++ DirectFB-1.1.1/directfb.pc.in 2008-07-17 20:59:58.044985193 +0200 | 23 | +++ DirectFB-1.4.11/directfb.pc.in 2011-04-06 14:09:33.528923998 -0700 |
| 22 | @@ -9,4 +9,4 @@ | 24 | @@ -9,4 +9,5 @@ |
| 23 | Requires: fusion direct | 25 | Requires: @DEP_VOODOO@ fusion direct |
| 24 | Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@ | 26 | Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@ |
| 25 | Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@ | 27 | Libs.private: -L${libdir} @MEDIALIB@ @DYNLIB@ @ZLIB_LIBS@ |
| 26 | -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ | 28 | -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ |
| 27 | +Cflags: @THREADFLAGS@ -I${includedir}/directfb | 29 | +Cflags: @THREADFLAGS@ -I${includedir}/directfb |
| 28 | Index: DirectFB-1.1.1/lib/fusion/fusion.pc.in | 30 | + |
| 31 | Index: DirectFB-1.4.11/lib/fusion/fusion.pc.in | ||
| 29 | =================================================================== | 32 | =================================================================== |
| 30 | --- DirectFB-1.1.1.orig/lib/fusion/fusion.pc.in 2007-08-07 21:43:00.000000000 +0200 | 33 | --- DirectFB-1.4.11.orig/lib/fusion/fusion.pc.in 2010-10-08 05:43:46.000000000 -0700 |
| 31 | +++ DirectFB-1.1.1/lib/fusion/fusion.pc.in 2008-07-17 20:58:07.051338866 +0200 | 34 | +++ DirectFB-1.4.11/lib/fusion/fusion.pc.in 2011-04-06 13:48:23.120923997 -0700 |
| 32 | @@ -8,4 +8,4 @@ | 35 | @@ -8,4 +8,4 @@ |
| 33 | Version: @VERSION@ | 36 | Version: @VERSION@ |
| 34 | Requires: direct | 37 | Requires: direct |
| 35 | Libs: -L${libdir} -lfusion | 38 | Libs: -L${libdir} -lfusion |
| 36 | -Cflags: -I@INCLUDEDIR@ | 39 | -Cflags: -I@INCLUDEDIR@ |
| 37 | +Cflags: -I${includedir}/directfb -I${includedir} | 40 | +Cflags: -I${includedir}/directfb -I${includedir} |
| 38 | Index: DirectFB-1.1.1/lib/voodoo/voodoo.pc.in | 41 | Index: DirectFB-1.4.11/lib/voodoo/voodoo.pc.in |
| 39 | =================================================================== | 42 | =================================================================== |
| 40 | --- DirectFB-1.1.1.orig/lib/voodoo/voodoo.pc.in 2007-08-07 21:43:00.000000000 +0200 | 43 | --- DirectFB-1.4.11.orig/lib/voodoo/voodoo.pc.in 2010-10-08 05:43:46.000000000 -0700 |
| 41 | +++ DirectFB-1.1.1/lib/voodoo/voodoo.pc.in 2008-07-17 20:58:07.054671842 +0200 | 44 | +++ DirectFB-1.4.11/lib/voodoo/voodoo.pc.in 2011-04-06 13:48:23.120923997 -0700 |
| 42 | @@ -8,4 +8,4 @@ | 45 | @@ -8,4 +8,4 @@ |
| 43 | Version: @VERSION@ | 46 | Version: @VERSION@ |
| 44 | Requires: direct | 47 | 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 @@ | |||
| 1 | |||
| 2 | directfb: don't use linux/config.h in powerpc assembly | ||
| 3 | |||
| 4 | Author: jeremy_laine at openembedded.org | ||
| 5 | Branch: org.openembedded.dev | ||
| 6 | Revision: 73964f8e6912f066c224fed54daeeb44836d9cdf | ||
| 7 | ViewMTN: http://monotone.openembedded.org/revision/info/73964f8e6912f066c224fed54daeeb44836d9cdf | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [configuration] | ||
| 10 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 11 | |||
| 1 | diff -urN DirectFB-1.1.0.orig/lib/direct/ppcasm_memcpy_cachable.S DirectFB-1.1.0/lib/direct/ppcasm_memcpy_cachable.S | 12 | diff -urN DirectFB-1.1.0.orig/lib/direct/ppcasm_memcpy_cachable.S DirectFB-1.1.0/lib/direct/ppcasm_memcpy_cachable.S |
| 2 | --- DirectFB-1.1.0.orig/lib/direct/ppcasm_memcpy_cachable.S 2007-08-07 21:43:00.000000000 +0200 | 13 | --- DirectFB-1.1.0.orig/lib/direct/ppcasm_memcpy_cachable.S 2007-08-07 21:43:00.000000000 +0200 |
| 3 | +++ DirectFB-1.1.0/lib/direct/ppcasm_memcpy_cachable.S 2008-06-07 04:14:26.000000000 +0200 | 14 | +++ DirectFB-1.1.0/lib/direct/ppcasm_memcpy_cachable.S 2008-06-07 04:14:26.000000000 +0200 |
