From patchwork Mon Apr 21 14:10:32 2014 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: 340911 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 2347E1400D9 for ; Tue, 22 Apr 2014 11:46:08 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7F93487E83; Mon, 21 Apr 2014 14:11:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id plIgZugK9LB3; Mon, 21 Apr 2014 14:11:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 304F087A3D; Mon, 21 Apr 2014 14:11:09 +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 813DD1BFA59 for ; Mon, 21 Apr 2014 14:11:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7C1AE8C5F5 for ; Mon, 21 Apr 2014 14:11:07 +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 Uhlx6M85Bwpe for ; Mon, 21 Apr 2014 14:11:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by whitealder.osuosl.org (Postfix) with ESMTPS id 242688C5BE for ; Mon, 21 Apr 2014 14:11:05 +0000 (UTC) Received: by mail-ee0-f52.google.com with SMTP id e49so3654184eek.39 for ; Mon, 21 Apr 2014 07:11:04 -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=4YmgFHFwBBJOgj32db4CBQeNuCJKKU4pSY4UyGLZF5Y=; b=rowZwx10tmzm+rM9tokdSM9iAXURnwVEBPMoDOC2gpH24jJv9VcuaNp0kB24MzdLU6 syLKaLvDHFF3npFxJ616A6iqFCN/sXi0B7ijgK2ifoOEtkoFccmLgzNfC8E2rvPkFUi7 54W+B/9Ey4DmK4QW9rO4ryYLsFcUNEkS1JlxhiDQvZHD2fIAs6WwKL16QCMWZh/NQ/Rn IbD39Uq8p8ZscpyLaDQJv+p7BpGu8KoG66WNBbRSu+CUjnyl5emMdpFwpyr9tB25x10l om/AWlvJRuQNWWsTKf/X8aN9IIKWXjOTrL2ppXGwxMvBxHvVQaz+j7Vy9wvtrNvRc0+X FyhQ== X-Received: by 10.14.183.7 with SMTP id p7mr1195876eem.107.1398089464238; Mon, 21 Apr 2014 07:11:04 -0700 (PDT) Received: from viko.viko.com.tr ([195.33.218.166]) by mx.google.com with ESMTPSA id o4sm103933801eef.20.2014.04.21.07.11.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Apr 2014 07:11:03 -0700 (PDT) From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= To: buildroot@uclibc.org Date: Mon, 21 Apr 2014 17:10:32 +0300 Message-Id: <1398089432-820-1-git-send-email-fatih.asici@gmail.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH] qt5base: fix no-opengl build with egl 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 Fixes: http://autobuild.buildroot.net/results/8ed/8eddd934bd80fdbcdf7a9dbf5d9f8b7ba69634d4/ Signed-off-by: Fatih Aşıcı --- ...qt5base-0007-Fix-no-opengl-build-with-egl.patch | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 package/qt5/qt5base/qt5base-0007-Fix-no-opengl-build-with-egl.patch diff --git a/package/qt5/qt5base/qt5base-0007-Fix-no-opengl-build-with-egl.patch b/package/qt5/qt5base/qt5base-0007-Fix-no-opengl-build-with-egl.patch new file mode 100644 index 0000000..c0f03d5 --- /dev/null +++ b/package/qt5/qt5base/qt5base-0007-Fix-no-opengl-build-with-egl.patch @@ -0,0 +1,65 @@ +From cd14b80dd87ff9ae632bf0479a1d824c72316362 Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs +Date: Wed, 12 Mar 2014 16:56:19 +0100 +Subject: [PATCH] Fix no-opengl build with egl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Disable eglfs and similar plugins when opengl is not enabled. +(but egl is present) + +GL-dependent parts of eglconvenience need to be skipped too. + +Task-number: QTBUG-37457 +Change-Id: I44d49495241551bc7b1f565aa0b5ace9f310628e +Reviewed-by: Thiago Macieira +Reviewed-by: Jørgen Lind +Signed-off-by: Fatih Aşıcı + +Conflicts: + src/platformsupport/eglconvenience/eglconvenience.pri +--- + configure | 2 +- + src/platformsupport/eglconvenience/eglconvenience.pri | 7 +++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index aaa59bd..0c310ff 100755 +--- a/configure ++++ b/configure +@@ -5337,7 +5337,7 @@ if [ "$CFG_EGL" != "no" ]; then + fi + + if [ "$CFG_EGLFS" != "no" ]; then +- if [ "$XPLATFORM_QNX" = "no" ]; then ++ if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then + CFG_EGLFS="$CFG_EGL" + else + CFG_EGLFS="no" +diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri +index 506f4ab..462c60c 100644 +--- a/src/platformsupport/eglconvenience/eglconvenience.pri ++++ b/src/platformsupport/eglconvenience/eglconvenience.pri +@@ -1,13 +1,16 @@ + contains(QT_CONFIG,egl) { + HEADERS += \ + $$PWD/qeglconvenience_p.h \ +- $$PWD/qeglplatformcontext_p.h \ + $$PWD/qeglpbuffer_p.h + SOURCES += \ + $$PWD/qeglconvenience.cpp \ +- $$PWD/qeglplatformcontext.cpp \ + $$PWD/qeglpbuffer.cpp + ++ contains(QT_CONFIG,opengl) { ++ HEADERS += $$PWD/qeglplatformcontext_p.h ++ SOURCES += $$PWD/qeglplatformcontext.cpp ++ } ++ + contains(QT_CONFIG,xlib) { + HEADERS += \ + $$PWD/qxlibeglintegration_p.h +-- +1.9.1 +