summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.patch36
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 4e8203b42..71c087687 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 @@
require directfb.inc
-RV = "1.4-5"
+RV = "1.4-6"
PR = "r0"
DEPENDS += "sysfsutils"
+SRC_URI = " \
+ http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${PV}.tar.gz \
+ file://directfb-1.2.x-fix-pkgconfig-cflags.patch \
+ "
+
EXTRA_OECONF = "\
--enable-freetype=yes \
--enable-zlib \
@@ -14,7 +19,7 @@ EXTRA_OECONF = "\
--disable-x11 \
"
-LEAD_SONAME = "libdirectfb-1.4.so.5"
+LEAD_SONAME = "libdirectfb-1.4.so.6"
SRC_URI[md5sum] = "2c779c9a8456790c6c29ad85459b2600"
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 274ad501c..ee60718f1 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 @@
+directfb: Get this patch from Openembedded
+
Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
-Index: DirectFB-1.4.11/directfb-internal.pc.in
-===================================================================
---- 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
+diff -Nur DirectFB-1.4.15/directfb-internal.pc.in DirectFB-1.4.15.new//directfb-internal.pc.in
+--- DirectFB-1.4.15/directfb-internal.pc.in 2011-09-29 17:51:21.000000000 +0800
++++ DirectFB-1.4.15.new//directfb-internal.pc.in 2011-11-03 15:14:37.000000000 +0800
@@ -2,10 +2,10 @@
exec_prefix=@exec_prefix@
moduledir=@MODULEDIR@
@@ -17,31 +19,27 @@ Index: DirectFB-1.4.11/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.4.11/directfb.pc.in
-===================================================================
---- 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 @@
+diff -Nur DirectFB-1.4.15/directfb.pc.in DirectFB-1.4.15.new//directfb.pc.in
+--- DirectFB-1.4.15/directfb.pc.in 2011-09-29 17:51:21.000000000 +0800
++++ DirectFB-1.4.15.new//directfb.pc.in 2011-11-03 15:15:55.000000000 +0800
+@@ -9,4 +9,4 @@
Requires: @DEP_VOODOO@ fusion direct
Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
- Libs.private: -L${libdir} @MEDIALIB@ @DYNLIB@ @ZLIB_LIBS@
+ Libs.private: -L${libdir} @LIBM@ @DYNLIB@ @ZLIB_LIBS@
-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
+Cflags: @THREADFLAGS@ -I${includedir}/directfb
-+
-Index: DirectFB-1.4.11/lib/fusion/fusion.pc.in
-===================================================================
---- 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
+diff -Nur DirectFB-1.4.15/lib/fusion/fusion.pc.in DirectFB-1.4.15.new//lib/fusion/fusion.pc.in
+--- DirectFB-1.4.15/lib/fusion/fusion.pc.in 2011-09-29 17:51:21.000000000 +0800
++++ DirectFB-1.4.15.new//lib/fusion/fusion.pc.in 2011-11-03 15:16:46.000000000 +0800
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: direct
Libs: -L${libdir} -lfusion
-Cflags: -I@INCLUDEDIR@
+Cflags: -I${includedir}/directfb -I${includedir}
-Index: DirectFB-1.4.11/lib/voodoo/voodoo.pc.in
-===================================================================
---- 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
+diff -Nur DirectFB-1.4.15/lib/voodoo/voodoo.pc.in DirectFB-1.4.15.new//lib/voodoo/voodoo.pc.in
+--- DirectFB-1.4.15/lib/voodoo/voodoo.pc.in 2011-09-29 17:51:21.000000000 +0800
++++ DirectFB-1.4.15.new//lib/voodoo/voodoo.pc.in 2011-11-03 15:17:34.000000000 +0800
@@ -8,4 +8,4 @@
Version: @VERSION@
Requires: direct