From 9aa544f74202cbe6b50a5668f91c73a1d7ac99bc Mon Sep 17 00:00:00 2001 From: André Draszik Date: Fri, 19 Jul 2013 09:39:10 +0100 Subject: directfb: don't patch pkg-config files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We are currently getting build failures of projects that rely on being able to access DirectFB's internal include directories, as returned via pkg-config, since the include paths returned by pkg-config are incomplete. The reason for that is the patch that is being removed with this change. It modified the cflags returned by pkg-config in an incorrect way, causing us to miss important include paths: For reference, pkg-config output with incorrect patch applied: ad@bril0118 #513 ~> pkg-config --cflags directfb-internal -D_GNU_SOURCE -D_REENTRANT -I/tmp/sysroots//usr/include/directfb -I/tmp/sysroots//usr/include Now, with the incorrect patch removed, the output is as expected: ad@bril0118 #514 ~> pkg-config --cflags directfb-internal -D_GNU_SOURCE -D_REENTRANT -I/tmp/sysroots//usr/include/directfb-internal -I/tmp/sysroots//usr/include/directfb Overall, the removed patch is not needed - pkg-config does the right thing these days and we can simply use the correctly working upstream versions of all DirectFB .pc files. (From OE-Core master rev: 795db65706d28bc194244a2ebbe6624ded584a33) (From OE-Core rev: 6d66de326bc355ff7bbb3923e0f3d59625f2ead9) Signed-off-by: André Draszik Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/directfb/directfb.inc | 1 - .../directfb-1.2.x-fix-pkgconfig-cflags.patch | 48 ---------------------- 2 files changed, 49 deletions(-) delete mode 100644 meta/recipes-graphics/directfb/directfb/directfb-1.2.x-fix-pkgconfig-cflags.patch (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index cff8a7f312..97a4c550df 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -14,7 +14,6 @@ DEPENDS = "jpeg libpng freetype zlib tslib" INC_PR = "r0" SRC_URI = "http://directfb.org/downloads/Core/DirectFB-1.6/DirectFB-${PV}.tar.gz \ - file://directfb-1.2.x-fix-pkgconfig-cflags.patch \ file://configurefix.patch \ file://mesa9.patch" diff --git a/meta/recipes-graphics/directfb/directfb/directfb-1.2.x-fix-pkgconfig-cflags.patch b/meta/recipes-graphics/directfb/directfb/directfb-1.2.x-fix-pkgconfig-cflags.patch deleted file mode 100644 index ee60718f1c..0000000000 --- a/meta/recipes-graphics/directfb/directfb/directfb-1.2.x-fix-pkgconfig-cflags.patch +++ /dev/null @@ -1,48 +0,0 @@ -directfb: Get this patch from Openembedded - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Xiaofeng Yan - -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@ - moduledirname=@MODULEDIRNAME@ --includedir=@INTERNALINCLUDEDIR@ -+includedir=@includedir@ - - Name: DirectFB-Internal - Description: Third party module support package for DirectFB. - Version: @VERSION@ - Requires: directfb = @VERSION@ --Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ -+Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir} -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} @LIBM@ @DYNLIB@ @ZLIB_LIBS@ --Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ -+Cflags: @THREADFLAGS@ -I${includedir}/directfb -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} -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 - Libs: -L${libdir} -lvoodoo --Cflags: -I@INCLUDEDIR@ -+Cflags: -I${includedir}/directfb -I${includedir} -- cgit v1.2.3-54-g00ecf