From patchwork Fri Jul 19 14:46:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Dechesne X-Patchwork-Id: 18458 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4FE692391D for ; Fri, 19 Jul 2013 14:47:20 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id hv16sf821971qab.2 for ; Fri, 19 Jul 2013 07:47:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to :mime-version:in-reply-to:references:from:date:message-id:subject:to :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=SGWtlIeFigGB1ur8jYQsFhZWeJkkBTBLXwTazACFenY=; b=o7WZylyGWTEKr4gkIbv1BDW12DKRYSCeAtuKH4xb4Js4k0JsYhSohoGllhRjuttVuM 035/11+7BgiyIYKfK8TC3JVqsVwBy6kQC43kh3TMGbWFKljKcq2BBeBDuGCzVpbvuqD8 FnW6cppNp0jam9kY6OkRI2gBMambUgnNnBr+mD5N8TI7smVLKVXQVeE7uNpTvfNWbRhM A0vwTYKAW6dQXpzntiYaz5us3ymHOteHPllSbTNr4v+V3lFA/S4sPkZ2Epp1eK1McFw9 w8TUTSLEXtOeYBni5ZL5f8Dc1JWDrZ8yKhFPbEicc6NdnPG+nIrwSZToHr08gcqD5YfH ADzg== X-Received: by 10.236.91.4 with SMTP id g4mr9008786yhf.30.1374245239774; Fri, 19 Jul 2013 07:47:19 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.128.137 with SMTP id no9ls1861989qeb.82.gmail; Fri, 19 Jul 2013 07:47:19 -0700 (PDT) X-Received: by 10.220.122.138 with SMTP id l10mr5992792vcr.45.1374245239602; Fri, 19 Jul 2013 07:47:19 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id ex7si4101511vdb.83.2013.07.19.07.47.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Jul 2013 07:47:19 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ht10so3238117vcb.32 for ; Fri, 19 Jul 2013 07:47:19 -0700 (PDT) X-Received: by 10.58.2.137 with SMTP id 9mr5941961veu.50.1374245239375; Fri, 19 Jul 2013 07:47:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp28995veb; Fri, 19 Jul 2013 07:47:17 -0700 (PDT) X-Received: by 10.60.43.226 with SMTP id z2mr18415106oel.76.1374245237440; Fri, 19 Jul 2013 07:47:17 -0700 (PDT) Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) by mx.google.com with ESMTPS id fg9si10005128obc.107.2013.07.19.07.47.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Jul 2013 07:47:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.181 is neither permitted nor denied by best guess record for domain of nicolas.dechesne@linaro.org) client-ip=209.85.214.181; Received: by mail-ob0-f181.google.com with SMTP id 16so5389028obc.40 for ; Fri, 19 Jul 2013 07:47:17 -0700 (PDT) X-Received: by 10.182.242.103 with SMTP id wp7mr12471530obc.67.1374245236864; Fri, 19 Jul 2013 07:47:16 -0700 (PDT) MIME-Version: 1.0 Received: by 10.76.126.144 with HTTP; Fri, 19 Jul 2013 07:46:56 -0700 (PDT) In-Reply-To: <1374223150-16033-1-git-send-email-andre.draszik@linaro.org> References: <1374223150-16033-1-git-send-email-andre.draszik@linaro.org> From: Nicolas Dechesne Date: Fri, 19 Jul 2013 16:46:56 +0200 Message-ID: Subject: Fwd: [OE-core] [PATCH] directfb: don't patch pkg-config files To: Patch Tracking X-Gm-Message-State: ALoCoQkJVlXRnmDunx62NumT67yrfO991MUOtOpDFtaW4wWwsrIQYa4uxADhlT1LzxCI0XUmYQ5e X-Original-Sender: nicolas.dechesne@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ---------- Forwarded message ---------- From: André Draszik Date: Fri, Jul 19, 2013 at 10:39 AM Subject: [OE-core] [PATCH] directfb: don't patch pkg-config files To: openembedded-core@lists.openembedded.org 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. Signed-off-by: André Draszik --- 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 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 ee60718..0000000 --- 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.inDirectFB-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.inDirectFB-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} -- 1.8.2 diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index cff8a7f..97a4c55 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"