* [oe-core][PATCH] qt-mobility: fix build in the absence of opengl
@ 2012-03-12 22:40 Ciprian Ciubotariu
2012-03-13 17:04 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: Ciprian Ciubotariu @ 2012-03-12 22:40 UTC (permalink / raw)
To: openembedded-devel
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
+@@ -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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [oe-core][PATCH] qt-mobility: fix build in the absence of opengl
2012-03-12 22:40 [oe-core][PATCH] qt-mobility: fix build in the absence of opengl Ciprian Ciubotariu
@ 2012-03-13 17:04 ` Saul Wold
2012-03-16 15:56 ` [oe-core][PATCH v2] " Ciprian Ciubotariu
0 siblings, 1 reply; 4+ messages in thread
From: Saul Wold @ 2012-03-13 17:04 UTC (permalink / raw)
To: openembedded-devel
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!
^ permalink raw reply [flat|nested] 4+ messages in thread* [oe-core][PATCH v2] qt-mobility: fix build in the absence of opengl
2012-03-13 17:04 ` Saul Wold
@ 2012-03-16 15:56 ` Ciprian Ciubotariu
2012-03-20 22:47 ` Saul Wold
0 siblings, 1 reply; 4+ messages in thread
From: Ciprian Ciubotariu @ 2012-03-16 15:56 UTC (permalink / raw)
To: openembedded-devel
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}"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [oe-core][PATCH v2] qt-mobility: fix build in the absence of opengl
2012-03-16 15:56 ` [oe-core][PATCH v2] " Ciprian Ciubotariu
@ 2012-03-20 22:47 ` Saul Wold
0 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2012-03-20 22:47 UTC (permalink / raw)
To: openembedded-devel
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!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-20 22:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-12 22:40 [oe-core][PATCH] qt-mobility: fix build in the absence of opengl Ciprian Ciubotariu
2012-03-13 17:04 ` Saul Wold
2012-03-16 15:56 ` [oe-core][PATCH v2] " Ciprian Ciubotariu
2012-03-20 22:47 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.