From patchwork Thu Sep 19 07:01:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?RmF0aWggQcWfxLFjxLE=?= X-Patchwork-Id: 275885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id B15442C010A for ; Thu, 19 Sep 2013 17:02:02 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E09B28BFA1; Thu, 19 Sep 2013 07:02:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RpiBh28MeDln; Thu, 19 Sep 2013 07:01:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8B77A8BE85; Thu, 19 Sep 2013 07:01:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 924651BF9BC for ; Thu, 19 Sep 2013 07:01:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7FADA8CDDE for ; Thu, 19 Sep 2013 07:01:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K-L8LS7tJSR5 for ; Thu, 19 Sep 2013 07:01:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id C83FB8CF7D for ; Thu, 19 Sep 2013 07:01:56 +0000 (UTC) Received: by mail-wg0-f42.google.com with SMTP id m15so6646181wgh.1 for ; Thu, 19 Sep 2013 00:01:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=G4PLGg69xif+dPyF1c6HzzYqL3FCiLwhPbh5nDomrqQ=; b=pxnYVwtMbFMYRHR6dSwPp9dZjTa+Gc57hfYOLwB0blHH+ujrPcEMV46961tl0kpbcP 87BqjIorKBUVEPbCpbFVx45D8LDYt9fnJlpTBTjTPnUGDzVIw1HHtt9LWsScTJa+IpBo f0SjhWgWBCI25CZFreAn1eJv6nda1TRr4kM0zqfKtUP7b6wO6S82SYS6ROLkvLpSIJVv bhi/z4Q/cXacAuu2qoPao//Q1m3+zG0Wvy+hjCM0BV2d8AfD41MEz+w8Y/BdIrYyjVFy mtw5T0jiur3khxJM8eWmg+cR/GyjHzJ5yYhqOD7Dk+WYtAJpPvpfr2UoGUCFmeLazDt6 SiRQ== X-Received: by 10.180.37.164 with SMTP id z4mr10427952wij.30.1379574115450; Thu, 19 Sep 2013 00:01:55 -0700 (PDT) Received: from viko.viko.com.tr ([195.33.218.166]) by mx.google.com with ESMTPSA id e1sm16444382wij.6.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Sep 2013 00:01:54 -0700 (PDT) From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= To: buildroot@busybox.net Date: Thu, 19 Sep 2013 10:01:43 +0300 Message-Id: <1379574103-9992-1-git-send-email-fatih.asici@gmail.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3] qt5base: fix build when egl headers need a definition X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The build with gpu-viv-bin-mx6q libraries was broken since it wasn't using "-DEGL_API_FB=1" flag which is found in egl.pc. Signed-off-by: Fatih Aşıcı --- Changes v2 -> v3: - Give a number to the patch file (suggested by Arnout Vandecappelle and Thomas Petazzoni) Changes v1 -> v2: - Add description and Signed-off-by line to the patch (suggested by Thomas Petazzoni) package/qt5/qt5base/qt5base-0004-egl-cflags.patch | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/qt5/qt5base/qt5base-0004-egl-cflags.patch diff --git a/package/qt5/qt5base/qt5base-0004-egl-cflags.patch b/package/qt5/qt5base/qt5base-0004-egl-cflags.patch new file mode 100644 index 0000000..bff82a8 --- /dev/null +++ b/package/qt5/qt5base/qt5base-0004-egl-cflags.patch @@ -0,0 +1,28 @@ +egl.prf: Append egl CFLAGS to QMAKE_C[XX]FLAGS + +Projects including egl in their config (e.g. with CONFIG += egl) cannot get +egl CFLAGS without this. + +Signed-off-by: Fatih Aşıcı + +--- a/configure ++++ b/configure +@@ -4934,6 +4934,7 @@ + QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null` + QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL" + QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL" ++ QMakeVar set QMAKE_CFLAGS_EGL "$QMAKE_CFLAGS_EGL" + fi # detect EGL support + if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then + CFG_EGL=yes +--- a/mkspecs/features/egl.prf ++++ b/mkspecs/features/egl.prf +@@ -14,6 +14,8 @@ + } else { + INCLUDEPATH += $$QMAKE_INCDIR_EGL + LIBS_PRIVATE += $$QMAKE_LIBS_EGL ++ QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL ++ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL + LIBS += $$QMAKE_LFLAGS_EGL + for(p, QMAKE_LIBDIR_EGL) { + exists($$p):LIBS_PRIVATE += -L$$p