diff options
| -rw-r--r-- | meta/recipes-graphics/directfb/directfb_1.4.15.bb (renamed from meta/recipes-graphics/directfb/directfb_1.4.12.bb) | 9 | ||||
| -rw-r--r-- | meta/recipes-graphics/directfb/files/directfb-1.2.x-fix-pkgconfig-cflags.patch | 36 |
2 files changed, 24 insertions, 21 deletions
diff --git a/meta/recipes-graphics/directfb/directfb_1.4.12.bb b/meta/recipes-graphics/directfb/directfb_1.4.15.bb index 4e8203b42f..71c0876877 100644 --- a/meta/recipes-graphics/directfb/directfb_1.4.12.bb +++ b/meta/recipes-graphics/directfb/directfb_1.4.15.bb | |||
| @@ -1,10 +1,15 @@ | |||
| 1 | require directfb.inc | 1 | require directfb.inc |
| 2 | 2 | ||
| 3 | RV = "1.4-5" | 3 | RV = "1.4-6" |
| 4 | PR = "r0" | 4 | PR = "r0" |
| 5 | 5 | ||
| 6 | DEPENDS += "sysfsutils" | 6 | DEPENDS += "sysfsutils" |
| 7 | 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 | " | ||
| 12 | |||
| 8 | EXTRA_OECONF = "\ | 13 | EXTRA_OECONF = "\ |
| 9 | --enable-freetype=yes \ | 14 | --enable-freetype=yes \ |
| 10 | --enable-zlib \ | 15 | --enable-zlib \ |
| @@ -14,7 +19,7 @@ EXTRA_OECONF = "\ | |||
| 14 | --disable-x11 \ | 19 | --disable-x11 \ |
| 15 | " | 20 | " |
| 16 | 21 | ||
| 17 | LEAD_SONAME = "libdirectfb-1.4.so.5" | 22 | LEAD_SONAME = "libdirectfb-1.4.so.6" |
| 18 | 23 | ||
| 19 | SRC_URI[md5sum] = "2c779c9a8456790c6c29ad85459b2600" | 24 | SRC_URI[md5sum] = "2c779c9a8456790c6c29ad85459b2600" |
| 20 | SRC_URI[sha256sum] = "b119ab9c5c0c505c23e32d41ae54bd04cb474c5e58900ec0f1cf9482f892f9b2" | 25 | SRC_URI[sha256sum] = "b119ab9c5c0c505c23e32d41ae54bd04cb474c5e58900ec0f1cf9482f892f9b2" |
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 274ad501c0..ee60718f1c 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,9 +1,11 @@ | |||
| 1 | directfb: Get this patch from Openembedded | ||
| 2 | |||
| 1 | Upstream-Status: Inappropriate [configuration] | 3 | Upstream-Status: Inappropriate [configuration] |
| 4 | Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> | ||
| 2 | 5 | ||
| 3 | Index: DirectFB-1.4.11/directfb-internal.pc.in | 6 | diff -Nur DirectFB-1.4.15/directfb-internal.pc.in DirectFB-1.4.15.new//directfb-internal.pc.in |
| 4 | =================================================================== | 7 | --- DirectFB-1.4.15/directfb-internal.pc.in 2011-09-29 17:51:21.000000000 +0800 |
| 5 | --- DirectFB-1.4.11.orig/directfb-internal.pc.in 2010-10-08 05:43:46.000000000 -0700 | 8 | +++ DirectFB-1.4.15.new//directfb-internal.pc.in 2011-11-03 15:14:37.000000000 +0800 |
| 6 | +++ DirectFB-1.4.11/directfb-internal.pc.in 2011-04-06 13:48:23.120923997 -0700 | ||
| 7 | @@ -2,10 +2,10 @@ | 9 | @@ -2,10 +2,10 @@ |
| 8 | exec_prefix=@exec_prefix@ | 10 | exec_prefix=@exec_prefix@ |
| 9 | moduledir=@MODULEDIR@ | 11 | moduledir=@MODULEDIR@ |
| @@ -17,31 +19,27 @@ Index: DirectFB-1.4.11/directfb-internal.pc.in | |||
| 17 | Requires: directfb = @VERSION@ | 19 | Requires: directfb = @VERSION@ |
| 18 | -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ | 20 | -Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ |
| 19 | +Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir} | 21 | +Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir} |
| 20 | Index: DirectFB-1.4.11/directfb.pc.in | 22 | diff -Nur DirectFB-1.4.15/directfb.pc.in DirectFB-1.4.15.new//directfb.pc.in |
| 21 | =================================================================== | 23 | --- DirectFB-1.4.15/directfb.pc.in 2011-09-29 17:51:21.000000000 +0800 |
| 22 | --- DirectFB-1.4.11.orig/directfb.pc.in 2010-11-15 13:13:59.000000000 -0800 | 24 | +++ DirectFB-1.4.15.new//directfb.pc.in 2011-11-03 15:15:55.000000000 +0800 |
| 23 | +++ DirectFB-1.4.11/directfb.pc.in 2011-04-06 14:09:33.528923998 -0700 | 25 | @@ -9,4 +9,4 @@ |
| 24 | @@ -9,4 +9,5 @@ | ||
| 25 | Requires: @DEP_VOODOO@ fusion direct | 26 | Requires: @DEP_VOODOO@ fusion direct |
| 26 | Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@ | 27 | Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@ |
| 27 | Libs.private: -L${libdir} @MEDIALIB@ @DYNLIB@ @ZLIB_LIBS@ | 28 | Libs.private: -L${libdir} @LIBM@ @DYNLIB@ @ZLIB_LIBS@ |
| 28 | -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ | 29 | -Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ |
| 29 | +Cflags: @THREADFLAGS@ -I${includedir}/directfb | 30 | +Cflags: @THREADFLAGS@ -I${includedir}/directfb |
| 30 | + | 31 | diff -Nur DirectFB-1.4.15/lib/fusion/fusion.pc.in DirectFB-1.4.15.new//lib/fusion/fusion.pc.in |
| 31 | Index: DirectFB-1.4.11/lib/fusion/fusion.pc.in | 32 | --- DirectFB-1.4.15/lib/fusion/fusion.pc.in 2011-09-29 17:51:21.000000000 +0800 |
| 32 | =================================================================== | 33 | +++ DirectFB-1.4.15.new//lib/fusion/fusion.pc.in 2011-11-03 15:16:46.000000000 +0800 |
| 33 | --- DirectFB-1.4.11.orig/lib/fusion/fusion.pc.in 2010-10-08 05:43:46.000000000 -0700 | ||
| 34 | +++ DirectFB-1.4.11/lib/fusion/fusion.pc.in 2011-04-06 13:48:23.120923997 -0700 | ||
| 35 | @@ -8,4 +8,4 @@ | 34 | @@ -8,4 +8,4 @@ |
| 36 | Version: @VERSION@ | 35 | Version: @VERSION@ |
| 37 | Requires: direct | 36 | Requires: direct |
| 38 | Libs: -L${libdir} -lfusion | 37 | Libs: -L${libdir} -lfusion |
| 39 | -Cflags: -I@INCLUDEDIR@ | 38 | -Cflags: -I@INCLUDEDIR@ |
| 40 | +Cflags: -I${includedir}/directfb -I${includedir} | 39 | +Cflags: -I${includedir}/directfb -I${includedir} |
| 41 | Index: DirectFB-1.4.11/lib/voodoo/voodoo.pc.in | 40 | diff -Nur DirectFB-1.4.15/lib/voodoo/voodoo.pc.in DirectFB-1.4.15.new//lib/voodoo/voodoo.pc.in |
| 42 | =================================================================== | 41 | --- DirectFB-1.4.15/lib/voodoo/voodoo.pc.in 2011-09-29 17:51:21.000000000 +0800 |
| 43 | --- DirectFB-1.4.11.orig/lib/voodoo/voodoo.pc.in 2010-10-08 05:43:46.000000000 -0700 | 42 | +++ DirectFB-1.4.15.new//lib/voodoo/voodoo.pc.in 2011-11-03 15:17:34.000000000 +0800 |
| 44 | +++ DirectFB-1.4.11/lib/voodoo/voodoo.pc.in 2011-04-06 13:48:23.120923997 -0700 | ||
| 45 | @@ -8,4 +8,4 @@ | 43 | @@ -8,4 +8,4 @@ |
| 46 | Version: @VERSION@ | 44 | Version: @VERSION@ |
| 47 | Requires: direct | 45 | Requires: direct |
