From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1S7VIk-0007Ja-8a for openembedded-devel@lists.openembedded.org; Tue, 13 Mar 2012 18:14:22 +0100 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 13 Mar 2012 10:04:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="138157013" Received: from unknown (HELO [10.255.15.137]) ([10.255.15.137]) by fmsmga002.fm.intel.com with ESMTP; 13 Mar 2012 10:04:31 -0700 Message-ID: <4F5F7E1F.4000901@linux.intel.com> Date: Tue, 13 Mar 2012 10:04:31 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.1) Gecko/20120216 Thunderbird/10.0.1 MIME-Version: 1.0 To: openembedded-devel@lists.openembedded.org References: <1331592056-13949-1-git-send-email-cheepeero@gmx.net> In-Reply-To: <1331592056-13949-1-git-send-email-cheepeero@gmx.net> Subject: Re: [oe-core][PATCH] qt-mobility: fix build in the absence of opengl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2012 17:14:22 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 03/12/2012 03:40 PM, Ciprian Ciubotariu wrote: > QMake pro files don't explicitly define QT_NO_OPENGL if the > configuration lacks opengl, but example code relies on this define. > --- > .../qt4/files/qt-mobility-no-opengl.patch | 36 ++++++++++++++++++++ > meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 +- > 2 files changed, 38 insertions(+), 1 deletions(-) > create mode 100644 meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch > > diff --git a/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch b/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch > new file mode 100644 > index 0000000..aa15683 > --- /dev/null > +++ b/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch > @@ -0,0 +1,36 @@ > +diff --git a/examples/declarative-camera/declarative-camera.pro b/examples/declarative-camera/declarative-camera.pro > +index 8164fbc..54fd8ad 100644 > +--- a/examples/declarative-camera/declarative-camera.pro > ++++ b/examples/declarative-camera/declarative-camera.pro This patch needs an Upstream-Status Tag and a Signed-off-by. Might also help to have an explaintion here. > +@@ -5,10 +5,10 @@ TEMPLATE=app > + > + QT += declarative network > + > +-!maemo5 { > +- contains(QT_CONFIG, opengl) { > +- QT += opengl > +- } > ++contains(QT_CONFIG, opengl): !maemo5 { > ++ QT += opengl > ++} else { > ++ DEFINES += QT_NO_OPENGL > + } > + > + win32 { > +diff --git a/examples/videographicsitem/videographicsitem.pro b/examples/videographicsitem/videographicsitem.pro > +index 8461beb..eedee2f 100644 > +--- a/examples/videographicsitem/videographicsitem.pro > ++++ b/examples/videographicsitem/videographicsitem.pro > +@@ -9,7 +9,11 @@ MOBILITY = multimedia > + > + QMAKE_RPATHDIR += $$DESTDIR > + > +-!symbian:contains(QT_CONFIG, opengl): QT += opengl > ++contains(QT_CONFIG, opengl): !symbian { > ++ QT += opengl > ++} else { > ++ DEFINES += QT_NO_OPENGL > ++} > + > + HEADERS += videoplayer.h \ > + videoitem.h > diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc > index 593cbd6..fe9c812 100644 > --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc > +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc > @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ > > SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \ > file://qt-mobility-configure.patch \ > - file://0001-gstvideoconnector-fixed-buffers-allocation.patch" > + file://0001-gstvideoconnector-fixed-buffers-allocation.patch \ > + file://qt-mobility-no-opengl.patch" > > SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" > SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" You need a PR bump for this please Thanks Sau!