Patchwork [oe-core,v2] qt-mobility: fix build in the absence of opengl

login
register
mail settings
Submitter Ciprian Ciubotariu
Date March 16, 2012, 3:56 p.m.
Message ID <1331913369-31149-1-git-send-email-cheepeero@gmx.net>
Download mbox | patch
Permalink /patch/23705/
State Not Applicable
Headers show

Comments

Ciprian Ciubotariu - March 16, 2012, 3:56 p.m.
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          |    5 ++-
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
Saul Wold - March 20, 2012, 10:47 p.m.
On 03/16/2012 08:56 AM, 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          |    5 ++-
>   2 files changed, 39 insertions(+), 2 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
> +@@ -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..2ac2253 100644
> --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> @@ -7,12 +7,13 @@ 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"
>
> -PR = "r2"
> +PR = "r3"
>
>   S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
>

Merged into OE-Core

Thanks
	Sau!

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
+@@ -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..2ac2253 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -7,12 +7,13 @@  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"
 
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"