* [PATCH] qt4: Added support for QtMobility 1.2
[not found] <f63c9c5991312f05bffee750086a0c7398770f8a>
@ 2011-09-21 12:19 ` Dmitry Cherukhin
2011-09-21 12:28 ` Koen Kooi
2011-09-22 13:04 ` Dmitry Cherukhin
2011-09-23 14:13 ` Dmitry Cherukhin
2 siblings, 1 reply; 18+ messages in thread
From: Dmitry Cherukhin @ 2011-09-21 12:19 UTC (permalink / raw)
To: openembedded-core
Added two recipes:
1) qt-mobility-x11 builds the QtMobility 1.2 package
on the basis of qt4-x11-free;
2) qt-mobility-embedded builds the QtMobility 1.2 package
on the basis of qt4-embedded.
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 19 ++++++++
.../qt4/files/qtme_connectivity_pro.patch | 12 +++++
meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 11 +++++
.../qt4/files/qtme_staticconfig_pri.patch | 18 ++++++++
.../qt4/files/qtmx_staticconfig_pri.patch | 10 ++++
meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 12 +++++
meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 10 ++++
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 44 ++++++++++++++++++++
8 files changed, 136 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
create mode 100644 meta/recipes-qt/qt4/files/qtme_connectivity_pro.patch
create mode 100644 meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
create mode 100644 meta/recipes-qt/qt4/files/qtme_staticconfig_pri.patch
create mode 100644 meta/recipes-qt/qt4/files/qtmx_staticconfig_pri.patch
create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
diff --git a/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
new file mode 100644
index 0000000..740e9cb
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
@@ -0,0 +1,19 @@
+--- qt-mobility-opensource-src-1.0.0/qtmobility.pro.orig 2010-05-21 14:20:19.547363661 +0200
++++ qt-mobility-opensource-src-1.0.0/qtmobility.pro 2010-05-21 14:22:01.967353682 +0200
+@@ -53,15 +53,6 @@ win32:!contains(CONFIG_WIN32,build_all)
+ }
+ }
+
+-lessThan(QT_MAJOR_VERSION, 4) {
+- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
+-}
+-
+-contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 6) {
+- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
+-}
+-
+-
+ # MCL builds for Symbian do not run configure and require some manual setup steps.
+ # This test permits SD builds to skip installation of mobility.prf from within qmake.
+ # It is installed in a separate step. MCL builds for SD must set the
+
diff --git a/meta/recipes-qt/qt4/files/qtme_connectivity_pro.patch b/meta/recipes-qt/qt4/files/qtme_connectivity_pro.patch
new file mode 100644
index 0000000..d4c8938
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtme_connectivity_pro.patch
@@ -0,0 +1,12 @@
+--- qt-mobility-opensource-src-1.2.0/src/connectivity/connectivity.pro.old 2011-05-10 10:06:11.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/src/connectivity/connectivity.pro 2011-09-17 12:11:17.000000000 +0200
+@@ -3,7 +3,8 @@
+ TARGET = QtConnectivity
+
+ include(../../common.pri)
+-DEFINES += QT_BUILD_CONNECTIVITY_LIB QT_MAKEDLL
++DEFINES += QT_BUILD_CONNECTIVITY_LIB QT_MAKEDLL QT_NO_DBUS
++QT_CONFIG -= dbus
+
+ QT = core
+
diff --git a/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
new file mode 100644
index 0000000..5d436d6
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
@@ -0,0 +1,11 @@
+--- qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro.orig 2011-09-13 09:19:05.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2011-09-13 09:37:58.609252481 +0200
+@@ -81,7 +81,7 @@
+ qgstutils.cpp
+
+
+-!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
++!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa):!contains(qt_embedded,yes) {
+ LIBS += -lXv -lX11 -lXext
+
+ HEADERS += \
diff --git a/meta/recipes-qt/qt4/files/qtme_staticconfig_pri.patch b/meta/recipes-qt/qt4/files/qtme_staticconfig_pri.patch
new file mode 100644
index 0000000..dc9af16
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtme_staticconfig_pri.patch
@@ -0,0 +1,18 @@
+--- qt-mobility-opensource-src-1.2.0/staticconfig.pri.orig 2011-05-10 10:06:13.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/staticconfig.pri 2011-09-13 09:06:06.365700519 +0200
+@@ -7,9 +7,15 @@
+ # This has the disadvantage that shadow builds are not supported for symbian
+ # but they are on other platforms.
+
++QT_CONFIG += dbus
++QT_LIBINFIX = E
++qt_embedded = yes
+
+ isEmpty(QT_MOBILITY_SOURCE_TREE):QT_MOBILITY_SOURCE_TREE = $$PWD
+ isEmpty(QT_MOBILITY_BUILD_TREE):QT_MOBILITY_BUILD_TREE = $$PWD
+
+ #now include the dynamic config
+ include($$QT_MOBILITY_BUILD_TREE/config.pri)
++
++gstreamer-photography_enabled = no
++
diff --git a/meta/recipes-qt/qt4/files/qtmx_staticconfig_pri.patch b/meta/recipes-qt/qt4/files/qtmx_staticconfig_pri.patch
new file mode 100644
index 0000000..f130125
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtmx_staticconfig_pri.patch
@@ -0,0 +1,10 @@
+--- qt-mobility-opensource-src-1.2.0/staticconfig.pri.orig 2011-05-10 10:06:13.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/staticconfig.pri 2011-09-09 17:18:09.438411521 +0200
+@@ -7,6 +7,7 @@
+ # This has the disadvantage that shadow builds are not supported for symbian
+ # but they are on other platforms.
+
++QT_CONFIG += dbus
+
+ isEmpty(QT_MOBILITY_SOURCE_TREE):QT_MOBILITY_SOURCE_TREE = $$PWD
+ isEmpty(QT_MOBILITY_BUILD_TREE):QT_MOBILITY_BUILD_TREE = $$PWD
diff --git a/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
new file mode 100644
index 0000000..03c1c67
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/Embedded"
+DEPENDS = "qt4-embedded"
+SECTION = "libs"
+qtm_dir = "qtopia"
+qtm_glflags := "-=opengl"
+
+inherit qt4e
+require qt-mobility_${PV}.inc
+
+SRC_URI += "file://qtme_staticconfig_pri.patch;patch=1 \
+ file://qtme_gstreamer_pro.patch;patch=1 \
+ file://qtme_connectivity_pro.patch;patch=1 "
diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
new file mode 100644
index 0000000..b790508
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/X11"
+DEPENDS = "qt4-x11-free"
+SECTION = "x11/libs"
+qtm_dir = "qt4"
+qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
+
+inherit qt4x11
+require qt-mobility_${PV}.inc
+
+SRC_URI += "file://qtmx_staticconfig_pri.patch;patch=1"
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
new file mode 100644
index 0000000..04cab20
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -0,0 +1,44 @@
+HOMEPAGE = "http://qt.nokia.com"
+DEPENDS += "pulseaudio"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+
+SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
+ file://qtm_qtmobility_pro.patch;patch=1 "
+
+SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
+SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
+
+S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
+
+qtm_bin := "/usr/bin"
+qtm_lib := "/usr/lib"
+qtm_examples := "/usr/bin/${qtm_dir}/examples/qtmobility"
+qtm_demos := "/usr/bin/${qtm_dir}/demos/qtmobility"
+qtm_plugins := "/usr/lib/${qtm_dir}/plugins/qtmobility"
+
+do_configure_prepend() {
+ ./configure -qmake-exec qmake2 -prefix /usr -examples -demos
+ echo QT_MOBILITY_BIN = ${qtm_bin} >>./config.pri
+ echo QT_MOBILITY_LIB = ${qtm_lib} >>./config.pri
+ echo QT_MOBILITY_PLUGINS = ${qtm_plugins} >>./config.pri
+ echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri
+ echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri
+ echo QT_CONFIG ${qtm_glflags} >>./config.pri
+}
+
+do_install() {
+ oe_runmake install INSTALL_ROOT=${D}
+ for NAME in */*.prf
+ do
+ install -m 644 -D -T $NAME ${D}/usr/share/${qtm_dir}/mkspecs/features/`basename $NAME`
+ done
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
+
+FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug ${qtm_lib}/.debug ${qtm_plugins}/*/.debug /usr/src/debug"
+FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins}"
+FILES_${PN}-dev = "/usr"
--
1.7.6
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-09-21 12:19 ` [PATCH] qt4: Added support for QtMobility 1.2 Dmitry Cherukhin
@ 2011-09-21 12:28 ` Koen Kooi
2011-10-14 15:14 ` Dmitry Cherukhin
0 siblings, 1 reply; 18+ messages in thread
From: Koen Kooi @ 2011-09-21 12:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 21 sep. 2011, om 14:19 heeft Dmitry Cherukhin het volgende geschreven:
> Added two recipes:
> 1) qt-mobility-x11 builds the QtMobility 1.2 package
> on the basis of qt4-x11-free;
> 2) qt-mobility-embedded builds the QtMobility 1.2 package
> on the basis of qt4-embedded.
>
> Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
> ---
> meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 19 ++++++++
> .../qt4/files/qtme_connectivity_pro.patch | 12 +++++
> meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 11 +++++
> .../qt4/files/qtme_staticconfig_pri.patch | 18 ++++++++
> .../qt4/files/qtmx_staticconfig_pri.patch | 10 ++++
Could you please add patch headers to those patches describing what they intend to fix and what their upstream status is?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-09-21 12:28 ` Koen Kooi
@ 2011-10-14 15:14 ` Dmitry Cherukhin
0 siblings, 0 replies; 18+ messages in thread
From: Dmitry Cherukhin @ 2011-10-14 15:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-09-21 at 14:28 +0200, Koen Kooi wrote:
> Op 21 sep. 2011, om 14:19 heeft Dmitry Cherukhin het volgende geschreven:
>
> > Added two recipes:
> > 1) qt-mobility-x11 builds the QtMobility 1.2 package
> > on the basis of qt4-x11-free;
> > 2) qt-mobility-embedded builds the QtMobility 1.2 package
> > on the basis of qt4-embedded.
> >
> > Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
> > ---
> > meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 19 ++++++++
> > .../qt4/files/qtme_connectivity_pro.patch | 12 +++++
> > meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 11 +++++
> > .../qt4/files/qtme_staticconfig_pri.patch | 18 ++++++++
> > .../qt4/files/qtmx_staticconfig_pri.patch | 10 ++++
>
> Could you please add patch headers to those patches describing what they intend to fix and what their upstream status is?
I removed all .patch files, new version of the patch is here:
http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/8708
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] qt4: Added support for QtMobility 1.2
[not found] <f63c9c5991312f05bffee750086a0c7398770f8a>
2011-09-21 12:19 ` [PATCH] qt4: Added support for QtMobility 1.2 Dmitry Cherukhin
@ 2011-09-22 13:04 ` Dmitry Cherukhin
2011-09-22 13:24 ` Otavio Salvador
2011-09-23 14:13 ` Dmitry Cherukhin
2 siblings, 1 reply; 18+ messages in thread
From: Dmitry Cherukhin @ 2011-09-22 13:04 UTC (permalink / raw)
To: openembedded-core
This patch is indented to add new functionality,
specifically, the patch adds support for
the QtMobility 1.2 package.
Added two recipes:
1) qt-mobility-x11 builds the QtMobility 1.2 package
on the basis of qt4-x11-free;
2) qt-mobility-embedded builds the QtMobility 1.2 package
on the basis of qt4-embedded.
Upstream-Status: not-appropriate
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 19 ++++++++
.../qt4/files/qtme_connectivity_pro.patch | 12 +++++
meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 11 +++++
.../qt4/files/qtme_staticconfig_pri.patch | 18 ++++++++
.../qt4/files/qtmx_staticconfig_pri.patch | 10 ++++
meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 12 +++++
meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 10 ++++
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 44 ++++++++++++++++++++
8 files changed, 136 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
create mode 100644 meta/recipes-qt/qt4/files/qtme_connectivity_pro.patch
create mode 100644 meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
create mode 100644 meta/recipes-qt/qt4/files/qtme_staticconfig_pri.patch
create mode 100644 meta/recipes-qt/qt4/files/qtmx_staticconfig_pri.patch
create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
diff --git a/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
new file mode 100644
index 0000000..740e9cb
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
@@ -0,0 +1,19 @@
+--- qt-mobility-opensource-src-1.0.0/qtmobility.pro.orig 2010-05-21 14:20:19.547363661 +0200
++++ qt-mobility-opensource-src-1.0.0/qtmobility.pro 2010-05-21 14:22:01.967353682 +0200
+@@ -53,15 +53,6 @@ win32:!contains(CONFIG_WIN32,build_all)
+ }
+ }
+
+-lessThan(QT_MAJOR_VERSION, 4) {
+- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
+-}
+-
+-contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 6) {
+- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
+-}
+-
+-
+ # MCL builds for Symbian do not run configure and require some manual setup steps.
+ # This test permits SD builds to skip installation of mobility.prf from within qmake.
+ # It is installed in a separate step. MCL builds for SD must set the
+
diff --git a/meta/recipes-qt/qt4/files/qtme_connectivity_pro.patch b/meta/recipes-qt/qt4/files/qtme_connectivity_pro.patch
new file mode 100644
index 0000000..d4c8938
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtme_connectivity_pro.patch
@@ -0,0 +1,12 @@
+--- qt-mobility-opensource-src-1.2.0/src/connectivity/connectivity.pro.old 2011-05-10 10:06:11.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/src/connectivity/connectivity.pro 2011-09-17 12:11:17.000000000 +0200
+@@ -3,7 +3,8 @@
+ TARGET = QtConnectivity
+
+ include(../../common.pri)
+-DEFINES += QT_BUILD_CONNECTIVITY_LIB QT_MAKEDLL
++DEFINES += QT_BUILD_CONNECTIVITY_LIB QT_MAKEDLL QT_NO_DBUS
++QT_CONFIG -= dbus
+
+ QT = core
+
diff --git a/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
new file mode 100644
index 0000000..5d436d6
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
@@ -0,0 +1,11 @@
+--- qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro.orig 2011-09-13 09:19:05.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2011-09-13 09:37:58.609252481 +0200
+@@ -81,7 +81,7 @@
+ qgstutils.cpp
+
+
+-!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
++!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa):!contains(qt_embedded,yes) {
+ LIBS += -lXv -lX11 -lXext
+
+ HEADERS += \
diff --git a/meta/recipes-qt/qt4/files/qtme_staticconfig_pri.patch b/meta/recipes-qt/qt4/files/qtme_staticconfig_pri.patch
new file mode 100644
index 0000000..dc9af16
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtme_staticconfig_pri.patch
@@ -0,0 +1,18 @@
+--- qt-mobility-opensource-src-1.2.0/staticconfig.pri.orig 2011-05-10 10:06:13.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/staticconfig.pri 2011-09-13 09:06:06.365700519 +0200
+@@ -7,9 +7,15 @@
+ # This has the disadvantage that shadow builds are not supported for symbian
+ # but they are on other platforms.
+
++QT_CONFIG += dbus
++QT_LIBINFIX = E
++qt_embedded = yes
+
+ isEmpty(QT_MOBILITY_SOURCE_TREE):QT_MOBILITY_SOURCE_TREE = $$PWD
+ isEmpty(QT_MOBILITY_BUILD_TREE):QT_MOBILITY_BUILD_TREE = $$PWD
+
+ #now include the dynamic config
+ include($$QT_MOBILITY_BUILD_TREE/config.pri)
++
++gstreamer-photography_enabled = no
++
diff --git a/meta/recipes-qt/qt4/files/qtmx_staticconfig_pri.patch b/meta/recipes-qt/qt4/files/qtmx_staticconfig_pri.patch
new file mode 100644
index 0000000..f130125
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtmx_staticconfig_pri.patch
@@ -0,0 +1,10 @@
+--- qt-mobility-opensource-src-1.2.0/staticconfig.pri.orig 2011-05-10 10:06:13.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/staticconfig.pri 2011-09-09 17:18:09.438411521 +0200
+@@ -7,6 +7,7 @@
+ # This has the disadvantage that shadow builds are not supported for symbian
+ # but they are on other platforms.
+
++QT_CONFIG += dbus
+
+ isEmpty(QT_MOBILITY_SOURCE_TREE):QT_MOBILITY_SOURCE_TREE = $$PWD
+ isEmpty(QT_MOBILITY_BUILD_TREE):QT_MOBILITY_BUILD_TREE = $$PWD
diff --git a/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
new file mode 100644
index 0000000..03c1c67
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/Embedded"
+DEPENDS = "qt4-embedded"
+SECTION = "libs"
+qtm_dir = "qtopia"
+qtm_glflags := "-=opengl"
+
+inherit qt4e
+require qt-mobility_${PV}.inc
+
+SRC_URI += "file://qtme_staticconfig_pri.patch;patch=1 \
+ file://qtme_gstreamer_pro.patch;patch=1 \
+ file://qtme_connectivity_pro.patch;patch=1 "
diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
new file mode 100644
index 0000000..b790508
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/X11"
+DEPENDS = "qt4-x11-free"
+SECTION = "x11/libs"
+qtm_dir = "qt4"
+qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
+
+inherit qt4x11
+require qt-mobility_${PV}.inc
+
+SRC_URI += "file://qtmx_staticconfig_pri.patch;patch=1"
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
new file mode 100644
index 0000000..04cab20
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -0,0 +1,46 @@
+HOMEPAGE = "http://qt.nokia.com"
+DEPENDS += "pulseaudio"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+
+SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
+ file://qtm_qtmobility_pro.patch;patch=1 "
+
+SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
+SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
+
+S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
+
+qtm_bin := "/usr/bin"
+qtm_lib := "/usr/lib"
+qtm_include := "/usr/include/${qtm_dir}"
+qtm_examples := "/usr/bin/${qtm_dir}/examples/qtmobility"
+qtm_demos := "/usr/bin/${qtm_dir}/demos/qtmobility"
+qtm_plugins := "/usr/lib/${qtm_dir}/plugins/qtmobility"
+
+do_configure_prepend() {
+ ./configure -qmake-exec qmake2 -prefix /usr -examples -demos
+ echo QT_MOBILITY_BIN = ${qtm_bin} >>./config.pri
+ echo QT_MOBILITY_LIB = ${qtm_lib} >>./config.pri
+ echo QT_MOBILITY_INCLUDE = ${qtm_include} >>./config.pri
+ echo QT_MOBILITY_PLUGINS = ${qtm_plugins} >>./config.pri
+ echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri
+ echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri
+ echo QT_CONFIG ${qtm_glflags} >>./config.pri
+}
+
+do_install() {
+ oe_runmake install INSTALL_ROOT=${D}
+ for NAME in */*.prf
+ do
+ install -m 644 -D -T $NAME ${D}/usr/share/${qtm_dir}/mkspecs/features/`basename $NAME`
+ done
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
+
+FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug ${qtm_lib}/.debug ${qtm_plugins}/*/.debug /usr/src/debug"
+FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins}"
+FILES_${PN}-dev = "/usr"
--
1.7.6
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-09-22 13:04 ` Dmitry Cherukhin
@ 2011-09-22 13:24 ` Otavio Salvador
2011-10-14 15:14 ` Dmitry Cherukhin
0 siblings, 1 reply; 18+ messages in thread
From: Otavio Salvador @ 2011-09-22 13:24 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, Sep 22, 2011 at 10:04, Dmitry Cherukhin <dima_ch@emcraft.com> wrote:
...
> Upstream-Status: not-appropriate
...
This and an explanation of the reasoning of each patch ought to be
included into each .patch file that your commit is going to add.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-09-22 13:24 ` Otavio Salvador
@ 2011-10-14 15:14 ` Dmitry Cherukhin
2011-10-14 17:26 ` Otavio Salvador
0 siblings, 1 reply; 18+ messages in thread
From: Dmitry Cherukhin @ 2011-10-14 15:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2011-09-22 at 10:24 -0300, Otavio Salvador wrote:
> On Thu, Sep 22, 2011 at 10:04, Dmitry Cherukhin <dima_ch@emcraft.com> wrote:
> ...
> > Upstream-Status: not-appropriate
> ...
>
> This and an explanation of the reasoning of each patch ought to be
> included into each .patch file that your commit is going to add.
>
I removed all .patch files, new version of the patch is here:
http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/8708
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-10-14 15:14 ` Dmitry Cherukhin
@ 2011-10-14 17:26 ` Otavio Salvador
0 siblings, 0 replies; 18+ messages in thread
From: Otavio Salvador @ 2011-10-14 17:26 UTC (permalink / raw)
To: dima_ch, Patches and discussions about the oe-core layer
On Fri, Oct 14, 2011 at 12:14, Dmitry Cherukhin <dima_ch@emcraft.com> wrote:
> On Thu, 2011-09-22 at 10:24 -0300, Otavio Salvador wrote:
>> On Thu, Sep 22, 2011 at 10:04, Dmitry Cherukhin <dima_ch@emcraft.com> wrote:
>> ...
>> > Upstream-Status: not-appropriate
>> ...
>>
>> This and an explanation of the reasoning of each patch ought to be
>> included into each .patch file that your commit is going to add.
>>
>
> I removed all .patch files, new version of the patch is here:
> http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/8708
From my side, this seems fine.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] qt4: Added support for QtMobility 1.2
[not found] <f63c9c5991312f05bffee750086a0c7398770f8a>
2011-09-21 12:19 ` [PATCH] qt4: Added support for QtMobility 1.2 Dmitry Cherukhin
2011-09-22 13:04 ` Dmitry Cherukhin
@ 2011-09-23 14:13 ` Dmitry Cherukhin
2011-09-26 23:32 ` Saul Wold
2 siblings, 1 reply; 18+ messages in thread
From: Dmitry Cherukhin @ 2011-09-23 14:13 UTC (permalink / raw)
To: openembedded-core
This patch is indented to add new functionality,
specifically, the patch adds support for
the QtMobility 1.2 package.
Added two recipes:
1) qt-mobility-x11 builds the QtMobility 1.2 package
on the basis of qt4-x11-free;
2) qt-mobility-embedded builds the QtMobility 1.2 package
on the basis of qt4-embedded.
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 28 +++++++++++
meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 16 ++++++
meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 13 +++++
meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 11 ++++
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 51 ++++++++++++++++++++
5 files changed, 119 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
create mode 100644 meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
diff --git a/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
new file mode 100644
index 0000000..689c224
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
@@ -0,0 +1,28 @@
+This patch fixes the following issue at the configure stage:
+ Project ERROR: Qt Mobility requires Qt 4.6 or higher. Qt was found.
+The version of Qt is already 4.7.3, so this is misconfiguration problem.
+
+The origin of this patch is:
+ http://neophysis.git.sourceforge.net/git/gitweb.cgi?p=neophysis/openembedded;
+ a=blob;f=recipes/neophysis/qt-mobility-1.0.0/qtmobility_pro.patch;
+ h=fc5e1691aed47bc50d87e5c33497354182cacda4;hb=refs/heads/neophysis-testing-0.3
+Upstream-Status: not-appropriate
+--- qt-mobility-opensource-src-1.0.0/qtmobility.pro.orig 2010-05-21 14:20:19.547363661 +0200
++++ qt-mobility-opensource-src-1.0.0/qtmobility.pro 2010-05-21 14:22:01.967353682 +0200
+@@ -53,15 +53,6 @@ win32:!contains(CONFIG_WIN32,build_all)
+ }
+ }
+
+-lessThan(QT_MAJOR_VERSION, 4) {
+- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
+-}
+-
+-contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 6) {
+- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
+-}
+-
+-
+ # MCL builds for Symbian do not run configure and require some manual setup steps.
+ # This test permits SD builds to skip installation of mobility.prf from within qmake.
+ # It is installed in a separate step. MCL builds for SD must set the
+
diff --git a/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
new file mode 100644
index 0000000..0cba1d6
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
@@ -0,0 +1,16 @@
+This patch disables the section of the Qt project file which depends on X11.
+The patch is applied for the qt-mobility-embedded package only.
+This section is already disabled for the embedded platform so we do what should be done.
+
+Upstream-Status: not-appropriate
+--- qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro.orig 2011-09-13 09:19:05.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2011-09-13 09:37:58.609252481 +0200
+@@ -81,7 +81,7 @@
+ qgstutils.cpp
+
+
+-!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
++!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa):!contains(qt_embedded,yes) {
+ LIBS += -lXv -lX11 -lXext
+
+ HEADERS += \
diff --git a/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
new file mode 100644
index 0000000..c31b1d2
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/Embedded"
+DEPENDS = "qt4-embedded"
+SECTION = "libs"
+qtm_embedded := "yes"
+qtm_libinfix := "E"
+qtm_dir = "qtopia"
+qtm_glflags := "-=opengl"
+qtm_extra_config := "gstreamer-photography_enabled = no"
+
+inherit qt4e
+require qt-mobility_${PV}.inc
+
+SRC_URI += "file://qtme_gstreamer_pro.patch;patch=1"
diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
new file mode 100644
index 0000000..3020953
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/X11"
+DEPENDS = "qt4-x11-free"
+SECTION = "x11/libs"
+qtm_embedded := "no"
+qtm_libinfix := ""
+qtm_dir = "qt4"
+qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
+qtm_extra_config := ""
+
+inherit qt4x11
+require qt-mobility_${PV}.inc
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
new file mode 100644
index 0000000..5a423d7
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -0,0 +1,51 @@
+HOMEPAGE = "http://qt.nokia.com"
+DEPENDS += "pulseaudio bluez4"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+
+SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
+ file://qtm_qtmobility_pro.patch;patch=1 "
+
+SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
+SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
+
+S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
+
+qtm_bin := "/usr/bin/${qtm_dir}"
+qtm_lib := "/usr/lib"
+qtm_include := "/usr/include/${qtm_dir}"
+qtm_examples := "/usr/bin/${qtm_dir}/examples/qtmobility"
+qtm_demos := "/usr/bin/${qtm_dir}/demos/qtmobility"
+qtm_plugins := "/usr/lib/${qtm_dir}/plugins/qtmobility"
+
+do_configure_prepend() {
+ ./configure -qmake-exec qmake2 -prefix /usr -examples -demos
+ echo QT_MOBILITY_BIN = ${qtm_bin} >>./config.pri
+ echo QT_MOBILITY_LIB = ${qtm_lib} >>./config.pri
+ echo QT_MOBILITY_INCLUDE = ${qtm_include} >>./config.pri
+ echo QT_MOBILITY_PLUGINS = ${qtm_plugins} >>./config.pri
+ echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri
+ echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri
+ echo QT_CONFIG += dbus >>./config.pri
+ echo QT_CONFIG ${qtm_glflags} >>./config.pri
+ echo QT_LIBINFIX = ${qtm_libinfix} >>./config.pri
+ echo qt_embedded = ${qtm_embedded} >>./config.pri
+ echo bluez_enabled = yes >>./config.pri
+ echo ${qtm_extra_config} >>./config.pri
+}
+
+do_install() {
+ oe_runmake install INSTALL_ROOT=${D}
+ for NAME in */*.prf
+ do
+ install -m 644 -D -T $NAME ${D}/usr/share/${qtm_dir}/mkspecs/features/`basename $NAME`
+ done
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
+
+FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug ${qtm_lib}/.debug ${qtm_plugins}/*/.debug /usr/src/debug"
+FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins}"
+FILES_${PN}-dev = "/usr"
--
1.7.6
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-09-23 14:13 ` Dmitry Cherukhin
@ 2011-09-26 23:32 ` Saul Wold
2011-10-14 15:18 ` Dmitry Cherukhin
0 siblings, 1 reply; 18+ messages in thread
From: Saul Wold @ 2011-09-26 23:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 09/23/2011 07:13 AM, Dmitry Cherukhin wrote:
> This patch is indented to add new functionality,
> specifically, the patch adds support for
> the QtMobility 1.2 package.
>
> Added two recipes:
> 1) qt-mobility-x11 builds the QtMobility 1.2 package
> on the basis of qt4-x11-free;
> 2) qt-mobility-embedded builds the QtMobility 1.2 package
> on the basis of qt4-embedded.
>
> Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> ---
> meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 28 +++++++++++
> meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 16 ++++++
> meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 13 +++++
> meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 11 ++++
> meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 51 ++++++++++++++++++++
> 5 files changed, 119 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
> create mode 100644 meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
> create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
> create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
> create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
>
> diff --git a/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
> new file mode 100644
> index 0000000..689c224
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
> @@ -0,0 +1,28 @@
> +This patch fixes the following issue at the configure stage:
> + Project ERROR: Qt Mobility requires Qt 4.6 or higher. Qt was found.
> +The version of Qt is already 4.7.3, so this is misconfiguration problem.
> +
> +The origin of this patch is:
> + http://neophysis.git.sourceforge.net/git/gitweb.cgi?p=neophysis/openembedded;
> + a=blob;f=recipes/neophysis/qt-mobility-1.0.0/qtmobility_pro.patch;
> + h=fc5e1691aed47bc50d87e5c33497354182cacda4;hb=refs/heads/neophysis-testing-0.3
> +Upstream-Status: not-appropriate
Please refer to wiki page on www.openembedded.org for the corrcet
formating of the Upstream-Status field. You are also missing a
Signed-off-by: line for each patch file.
(I would give the exact page, but the site appears to be having problems)
Thanks
Sau!
> +--- qt-mobility-opensource-src-1.0.0/qtmobility.pro.orig 2010-05-21 14:20:19.547363661 +0200
> ++++ qt-mobility-opensource-src-1.0.0/qtmobility.pro 2010-05-21 14:22:01.967353682 +0200
> +@@ -53,15 +53,6 @@ win32:!contains(CONFIG_WIN32,build_all)
> + }
> + }
> +
> +-lessThan(QT_MAJOR_VERSION, 4) {
> +- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
> +-}
> +-
> +-contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 6) {
> +- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
> +-}
> +-
> +-
> + # MCL builds for Symbian do not run configure and require some manual setup steps.
> + # This test permits SD builds to skip installation of mobility.prf from within qmake.
> + # It is installed in a separate step. MCL builds for SD must set the
> +
> diff --git a/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
> new file mode 100644
> index 0000000..0cba1d6
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
> @@ -0,0 +1,16 @@
> +This patch disables the section of the Qt project file which depends on X11.
> +The patch is applied for the qt-mobility-embedded package only.
> +This section is already disabled for the embedded platform so we do what should be done.
> +
> +Upstream-Status: not-appropriate
> +--- qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro.orig 2011-09-13 09:19:05.000000000 +0200
> ++++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2011-09-13 09:37:58.609252481 +0200
> +@@ -81,7 +81,7 @@
> + qgstutils.cpp
> +
> +
> +-!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
> ++!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa):!contains(qt_embedded,yes) {
> + LIBS += -lXv -lX11 -lXext
> +
> + HEADERS += \
> diff --git a/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
> new file mode 100644
> index 0000000..c31b1d2
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
> @@ -0,0 +1,13 @@
> +DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/Embedded"
> +DEPENDS = "qt4-embedded"
> +SECTION = "libs"
> +qtm_embedded := "yes"
> +qtm_libinfix := "E"
> +qtm_dir = "qtopia"
> +qtm_glflags := "-=opengl"
> +qtm_extra_config := "gstreamer-photography_enabled = no"
> +
> +inherit qt4e
> +require qt-mobility_${PV}.inc
> +
> +SRC_URI += "file://qtme_gstreamer_pro.patch;patch=1"
> diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
> new file mode 100644
> index 0000000..3020953
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
> @@ -0,0 +1,11 @@
> +DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/X11"
> +DEPENDS = "qt4-x11-free"
> +SECTION = "x11/libs"
> +qtm_embedded := "no"
> +qtm_libinfix := ""
> +qtm_dir = "qt4"
> +qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
> +qtm_extra_config := ""
> +
> +inherit qt4x11
> +require qt-mobility_${PV}.inc
> diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> new file mode 100644
> index 0000000..5a423d7
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> @@ -0,0 +1,51 @@
> +HOMEPAGE = "http://qt.nokia.com"
> +DEPENDS += "pulseaudio bluez4"
> +
> +LICENSE = "LGPLv2.1"
> +LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
> + file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
> +
> +SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
> + file://qtm_qtmobility_pro.patch;patch=1 "
> +
> +SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
> +SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
> +
> +S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
> +
> +qtm_bin := "/usr/bin/${qtm_dir}"
> +qtm_lib := "/usr/lib"
> +qtm_include := "/usr/include/${qtm_dir}"
> +qtm_examples := "/usr/bin/${qtm_dir}/examples/qtmobility"
> +qtm_demos := "/usr/bin/${qtm_dir}/demos/qtmobility"
> +qtm_plugins := "/usr/lib/${qtm_dir}/plugins/qtmobility"
> +
> +do_configure_prepend() {
> + ./configure -qmake-exec qmake2 -prefix /usr -examples -demos
> + echo QT_MOBILITY_BIN = ${qtm_bin}>>./config.pri
> + echo QT_MOBILITY_LIB = ${qtm_lib}>>./config.pri
> + echo QT_MOBILITY_INCLUDE = ${qtm_include}>>./config.pri
> + echo QT_MOBILITY_PLUGINS = ${qtm_plugins}>>./config.pri
> + echo QT_MOBILITY_EXAMPLES = ${qtm_examples}>>./config.pri
> + echo QT_MOBILITY_DEMOS = ${qtm_demos}>>./config.pri
> + echo QT_CONFIG += dbus>>./config.pri
> + echo QT_CONFIG ${qtm_glflags}>>./config.pri
> + echo QT_LIBINFIX = ${qtm_libinfix}>>./config.pri
> + echo qt_embedded = ${qtm_embedded}>>./config.pri
> + echo bluez_enabled = yes>>./config.pri
> + echo ${qtm_extra_config}>>./config.pri
> +}
> +
> +do_install() {
> + oe_runmake install INSTALL_ROOT=${D}
> + for NAME in */*.prf
> + do
> + install -m 644 -D -T $NAME ${D}/usr/share/${qtm_dir}/mkspecs/features/`basename $NAME`
> + done
> +}
> +
> +PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
> +
> +FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug ${qtm_lib}/.debug ${qtm_plugins}/*/.debug /usr/src/debug"
> +FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins}"
> +FILES_${PN}-dev = "/usr"
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-09-26 23:32 ` Saul Wold
@ 2011-10-14 15:18 ` Dmitry Cherukhin
2011-10-14 16:24 ` Saul Wold
0 siblings, 1 reply; 18+ messages in thread
From: Dmitry Cherukhin @ 2011-10-14 15:18 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On Mon, 2011-09-26 at 16:32 -0700, Saul Wold wrote:
> On 09/23/2011 07:13 AM, Dmitry Cherukhin wrote:
> > This patch is indented to add new functionality,
> > specifically, the patch adds support for
> > the QtMobility 1.2 package.
> >
> > Added two recipes:
> > 1) qt-mobility-x11 builds the QtMobility 1.2 package
> > on the basis of qt4-x11-free;
> > 2) qt-mobility-embedded builds the QtMobility 1.2 package
> > on the basis of qt4-embedded.
> >
> > Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
> > ---
> > meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 28 +++++++++++
> > meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 16 ++++++
> > meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 13 +++++
> > meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 11 ++++
> > meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 51 ++++++++++++++++++++
> > 5 files changed, 119 insertions(+), 0 deletions(-)
> > create mode 100644 meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
> > create mode 100644 meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
> > create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
> > create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
> > create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
> >
> > diff --git a/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
> > new file mode 100644
> > index 0000000..689c224
> > --- /dev/null
> > +++ b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
> > @@ -0,0 +1,28 @@
> > +This patch fixes the following issue at the configure stage:
> > + Project ERROR: Qt Mobility requires Qt 4.6 or higher. Qt was found.
> > +The version of Qt is already 4.7.3, so this is misconfiguration problem.
> > +
> > +The origin of this patch is:
> > + http://neophysis.git.sourceforge.net/git/gitweb.cgi?p=neophysis/openembedded;
> > + a=blob;f=recipes/neophysis/qt-mobility-1.0.0/qtmobility_pro.patch;
> > + h=fc5e1691aed47bc50d87e5c33497354182cacda4;hb=refs/heads/neophysis-testing-0.3
> > +Upstream-Status: not-appropriate
>
> Please refer to wiki page on www.openembedded.org for the corrcet
> formating of the Upstream-Status field. You are also missing a
> Signed-off-by: line for each patch file.
>
> (I would give the exact page, but the site appears to be having problems)
>
Thanks!
I removed all .patch files, new version of the patch is here:
http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/8708
Dima
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-10-14 15:18 ` Dmitry Cherukhin
@ 2011-10-14 16:24 ` Saul Wold
2011-10-14 16:28 ` Koen Kooi
0 siblings, 1 reply; 18+ messages in thread
From: Saul Wold @ 2011-10-14 16:24 UTC (permalink / raw)
To: dima_ch; +Cc: Patches and discussions about the oe-core layer
On 10/14/2011 08:18 AM, Dmitry Cherukhin wrote:
> On Mon, 2011-09-26 at 16:32 -0700, Saul Wold wrote:
>> On 09/23/2011 07:13 AM, Dmitry Cherukhin wrote:
>>> This patch is indented to add new functionality,
>>> specifically, the patch adds support for
>>> the QtMobility 1.2 package.
>>>
>>> Added two recipes:
>>> 1) qt-mobility-x11 builds the QtMobility 1.2 package
>>> on the basis of qt4-x11-free;
>>> 2) qt-mobility-embedded builds the QtMobility 1.2 package
>>> on the basis of qt4-embedded.
>>>
>>> Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
>>> ---
>>> meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 28 +++++++++++
>>> meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 16 ++++++
>>> meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 13 +++++
>>> meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 11 ++++
>>> meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 51 ++++++++++++++++++++
>>> 5 files changed, 119 insertions(+), 0 deletions(-)
>>> create mode 100644 meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
>>> create mode 100644 meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
>>> create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
>>> create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
>>> create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
>>>
>>> diff --git a/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
>>> new file mode 100644
>>> index 0000000..689c224
>>> --- /dev/null
>>> +++ b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
>>> @@ -0,0 +1,28 @@
>>> +This patch fixes the following issue at the configure stage:
>>> + Project ERROR: Qt Mobility requires Qt 4.6 or higher. Qt was found.
>>> +The version of Qt is already 4.7.3, so this is misconfiguration problem.
>>> +
>>> +The origin of this patch is:
>>> + http://neophysis.git.sourceforge.net/git/gitweb.cgi?p=neophysis/openembedded;
>>> + a=blob;f=recipes/neophysis/qt-mobility-1.0.0/qtmobility_pro.patch;
>>> + h=fc5e1691aed47bc50d87e5c33497354182cacda4;hb=refs/heads/neophysis-testing-0.3
>>> +Upstream-Status: not-appropriate
>>
>> Please refer to wiki page on www.openembedded.org for the corrcet
>> formating of the Upstream-Status field. You are also missing a
>> Signed-off-by: line for each patch file.
>>
>> (I would give the exact page, but the site appears to be having problems)
>>
>
> Thanks!
> I removed all .patch files, new version of the patch is here:
> http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/8708
>
That's great, but that reader seems to mangle emails in a way that I
can't use them for patching, it would be great if you could just send
the v2 to this mailing list.
Thanks
Sau!
> Dima
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-10-14 16:24 ` Saul Wold
@ 2011-10-14 16:28 ` Koen Kooi
2011-10-14 17:31 ` Saul Wold
0 siblings, 1 reply; 18+ messages in thread
From: Koen Kooi @ 2011-10-14 16:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Op 14 okt. 2011, om 18:24 heeft Saul Wold het volgende geschreven:
> On 10/14/2011 08:18 AM, Dmitry Cherukhin wrote:
>> On Mon, 2011-09-26 at 16:32 -0700, Saul Wold wrote:
>>> On 09/23/2011 07:13 AM, Dmitry Cherukhin wrote:
>>>> This patch is indented to add new functionality,
>>>> specifically, the patch adds support for
>>>> the QtMobility 1.2 package.
>>>>
>>>> Added two recipes:
>>>> 1) qt-mobility-x11 builds the QtMobility 1.2 package
>>>> on the basis of qt4-x11-free;
>>>> 2) qt-mobility-embedded builds the QtMobility 1.2 package
>>>> on the basis of qt4-embedded.
>>>>
>>>> Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
>>>> ---
>>>> meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 28 +++++++++++
>>>> meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 16 ++++++
>>>> meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 13 +++++
>>>> meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 11 ++++
>>>> meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 51 ++++++++++++++++++++
>>>> 5 files changed, 119 insertions(+), 0 deletions(-)
>>>> create mode 100644 meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
>>>> create mode 100644 meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
>>>> create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
>>>> create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
>>>> create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
>>>>
>>>> diff --git a/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
>>>> new file mode 100644
>>>> index 0000000..689c224
>>>> --- /dev/null
>>>> +++ b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
>>>> @@ -0,0 +1,28 @@
>>>> +This patch fixes the following issue at the configure stage:
>>>> + Project ERROR: Qt Mobility requires Qt 4.6 or higher. Qt was found.
>>>> +The version of Qt is already 4.7.3, so this is misconfiguration problem.
>>>> +
>>>> +The origin of this patch is:
>>>> + http://neophysis.git.sourceforge.net/git/gitweb.cgi?p=neophysis/openembedded;
>>>> + a=blob;f=recipes/neophysis/qt-mobility-1.0.0/qtmobility_pro.patch;
>>>> + h=fc5e1691aed47bc50d87e5c33497354182cacda4;hb=refs/heads/neophysis-testing-0.3
>>>> +Upstream-Status: not-appropriate
>>>
>>> Please refer to wiki page on www.openembedded.org for the corrcet
>>> formating of the Upstream-Status field. You are also missing a
>>> Signed-off-by: line for each patch file.
>>>
>>> (I would give the exact page, but the site appears to be having problems)
>>>
>>
>> Thanks!
>> I removed all .patch files, new version of the patch is here:
>> http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/8708
>>
> That's great, but that reader seems to mangle emails in a way that I can't use them for patching, it would be great if you could just send the v2 to this mailing list.
The reader is just a view into the mail archive, so if you scroll back 8 days in your oe-core folder, you should see the patch :)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-10-14 16:28 ` Koen Kooi
@ 2011-10-14 17:31 ` Saul Wold
0 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2011-10-14 17:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
On 10/14/2011 09:28 AM, Koen Kooi wrote:
>
> Op 14 okt. 2011, om 18:24 heeft Saul Wold het volgende geschreven:
>
>> On 10/14/2011 08:18 AM, Dmitry Cherukhin wrote:
>>> On Mon, 2011-09-26 at 16:32 -0700, Saul Wold wrote:
>>>> On 09/23/2011 07:13 AM, Dmitry Cherukhin wrote:
>>>>> This patch is indented to add new functionality,
>>>>> specifically, the patch adds support for
>>>>> the QtMobility 1.2 package.
>>>>>
>>>>> Added two recipes:
>>>>> 1) qt-mobility-x11 builds the QtMobility 1.2 package
>>>>> on the basis of qt4-x11-free;
>>>>> 2) qt-mobility-embedded builds the QtMobility 1.2 package
>>>>> on the basis of qt4-embedded.
>>>>>
>>>>> Signed-off-by: Dmitry Cherukhin<dima_ch@emcraft.com>
>>>>> ---
>>>>> meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 28 +++++++++++
>>>>> meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 16 ++++++
>>>>> meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 13 +++++
>>>>> meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 11 ++++
>>>>> meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 51 ++++++++++++++++++++
>>>>> 5 files changed, 119 insertions(+), 0 deletions(-)
>>>>> create mode 100644 meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
>>>>> create mode 100644 meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
>>>>> create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
>>>>> create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
>>>>> create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
>>>>>
>>>>> diff --git a/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
>>>>> new file mode 100644
>>>>> index 0000000..689c224
>>>>> --- /dev/null
>>>>> +++ b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
>>>>> @@ -0,0 +1,28 @@
>>>>> +This patch fixes the following issue at the configure stage:
>>>>> + Project ERROR: Qt Mobility requires Qt 4.6 or higher. Qt was found.
>>>>> +The version of Qt is already 4.7.3, so this is misconfiguration problem.
>>>>> +
>>>>> +The origin of this patch is:
>>>>> + http://neophysis.git.sourceforge.net/git/gitweb.cgi?p=neophysis/openembedded;
>>>>> + a=blob;f=recipes/neophysis/qt-mobility-1.0.0/qtmobility_pro.patch;
>>>>> + h=fc5e1691aed47bc50d87e5c33497354182cacda4;hb=refs/heads/neophysis-testing-0.3
>>>>> +Upstream-Status: not-appropriate
>>>>
>>>> Please refer to wiki page on www.openembedded.org for the corrcet
>>>> formating of the Upstream-Status field. You are also missing a
>>>> Signed-off-by: line for each patch file.
>>>>
>>>> (I would give the exact page, but the site appears to be having problems)
>>>>
>>>
>>> Thanks!
>>> I removed all .patch files, new version of the patch is here:
>>> http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/8708
>>>
>> That's great, but that reader seems to mangle emails in a way that I can't use them for patching, it would be great if you could just send the v2 to this mailing list.
>
> The reader is just a view into the mail archive, so if you scroll back 8 days in your oe-core folder, you should see the patch :)
>
My bad, I was not seeing it because it had been tagged incorrectly in my
folder, found it now!
Sau!
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH] qt4: Added support for QtMobility 1.2
[not found] <c477d260c34472a416ccb6eec9af0300a40d576f>
@ 2011-09-28 9:35 ` Dmitry Cherukhin
2011-09-28 14:21 ` Paul Eggleton
0 siblings, 1 reply; 18+ messages in thread
From: Dmitry Cherukhin @ 2011-09-28 9:35 UTC (permalink / raw)
To: openembedded-core
The QtMobility is a Qt add-on which allows to include standard mobile
functionality to Qt applications. For details, see
http://qt.nokia.com/products/qt-addons/mobility/
The patch is intended to add support for the QtMobility 1.2 package to OE.
Added two recipes:
1) qt-mobility-x11 builds the QtMobility 1.2 package
on the basis of Qt/X11 using the qt4-x11-free package;
2) qt-mobility-embedded builds the QtMobility 1.2 package
on the basis of Qt/Embedded using the qt4-embedded package.
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
---
meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch | 36 +++++++++++
meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch | 23 ++++++
meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 13 +++++
meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 11 ++++
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 51 ++++++++++++++++++++
5 files changed, 119 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
create mode 100644 meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
diff --git a/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
new file mode 100644
index 0000000..689c224
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtm_qtmobility_pro.patch
@@ -0,0 +1,36 @@
+qt-mobility: skip checking of the Qt version in the configure script
+
+The configure script fails with the following message:
+ Project ERROR: Qt Mobility requires Qt 4.6 or higher. Qt was found.
+The version of Qt is already 4.7.3, so there are some configuration problems
+in the Qt4 subsystem of OE. This patch is a workaround for this issue,
+it simply removes checking of Qt presence from the configure script.
+
+The origin of this patch is:
+ http://neophysis.git.sourceforge.net/git/gitweb.cgi?p=neophysis/openembedded;
+ a=blob;f=recipes/neophysis/qt-mobility-1.0.0/qtmobility_pro.patch;
+ h=fc5e1691aed47bc50d87e5c33497354182cacda4;hb=refs/heads/neophysis-testing-0.3
+
+Upstream-Status: Inappropriate configuration
+
+Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
+
+--- qt-mobility-opensource-src-1.0.0/qtmobility.pro.orig 2010-05-21 14:20:19.547363661 +0200
++++ qt-mobility-opensource-src-1.0.0/qtmobility.pro 2010-05-21 14:22:01.967353682 +0200
+@@ -53,15 +53,6 @@ win32:!contains(CONFIG_WIN32,build_all)
+ }
+ }
+
+-lessThan(QT_MAJOR_VERSION, 4) {
+- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
+-}
+-
+-contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 6) {
+- error(Qt Mobility requires Qt 4.6 or higher. Qt $${QT_VERSION} was found.);
+-}
+-
+-
+ # MCL builds for Symbian do not run configure and require some manual setup steps.
+ # This test permits SD builds to skip installation of mobility.prf from within qmake.
+ # It is installed in a separate step. MCL builds for SD must set the
+
diff --git a/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
new file mode 100644
index 0000000..0cba1d6
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/qtme_gstreamer_pro.patch
@@ -0,0 +1,23 @@
+qt-mobility-embedded: disable the code which depends on X11
+
+There is no support for X11 when using Qt/Embedded.
+The patch disables the section of the Qt project file `gstreamer.pro` which depends on X11.
+This section is already conditional on `!embedded`, so it should be disabled for an embedded platform.
+However, we can't force the symbol `embedded` be true, so we insroduce another configuration variable
+`qt_embedded` and disable this section manually then compiling the qt-mobility-embedded recipe.
+
+Upstream-Status: Inappropriate configuration
+
+Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
+
+--- qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro.orig 2011-09-13 09:19:05.000000000 +0200
++++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2011-09-13 09:37:58.609252481 +0200
+@@ -81,7 +81,7 @@
+ qgstutils.cpp
+
+
+-!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
++!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa):!contains(qt_embedded,yes) {
+ LIBS += -lXv -lX11 -lXext
+
+ HEADERS += \
diff --git a/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
new file mode 100644
index 0000000..c31b1d2
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/Embedded"
+DEPENDS = "qt4-embedded"
+SECTION = "libs"
+qtm_embedded := "yes"
+qtm_libinfix := "E"
+qtm_dir = "qtopia"
+qtm_glflags := "-=opengl"
+qtm_extra_config := "gstreamer-photography_enabled = no"
+
+inherit qt4e
+require qt-mobility_${PV}.inc
+
+SRC_URI += "file://qtme_gstreamer_pro.patch;patch=1"
diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
new file mode 100644
index 0000000..3020953
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/X11"
+DEPENDS = "qt4-x11-free"
+SECTION = "x11/libs"
+qtm_embedded := "no"
+qtm_libinfix := ""
+qtm_dir = "qt4"
+qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
+qtm_extra_config := ""
+
+inherit qt4x11
+require qt-mobility_${PV}.inc
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
new file mode 100644
index 0000000..5a423d7
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -0,0 +1,51 @@
+HOMEPAGE = "http://qt.nokia.com"
+DEPENDS += "pulseaudio bluez4"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
+ file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+
+SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.tar.gz \
+ file://qtm_qtmobility_pro.patch;patch=1 "
+
+SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
+SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
+
+S = "${WORKDIR}/qt-mobility-opensource-src-${PV}"
+
+qtm_bin := "/usr/bin/${qtm_dir}"
+qtm_lib := "/usr/lib"
+qtm_include := "/usr/include/${qtm_dir}"
+qtm_examples := "/usr/bin/${qtm_dir}/examples/qtmobility"
+qtm_demos := "/usr/bin/${qtm_dir}/demos/qtmobility"
+qtm_plugins := "/usr/lib/${qtm_dir}/plugins/qtmobility"
+
+do_configure_prepend() {
+ ./configure -qmake-exec qmake2 -prefix /usr -examples -demos
+ echo QT_MOBILITY_BIN = ${qtm_bin} >>./config.pri
+ echo QT_MOBILITY_LIB = ${qtm_lib} >>./config.pri
+ echo QT_MOBILITY_INCLUDE = ${qtm_include} >>./config.pri
+ echo QT_MOBILITY_PLUGINS = ${qtm_plugins} >>./config.pri
+ echo QT_MOBILITY_EXAMPLES = ${qtm_examples} >>./config.pri
+ echo QT_MOBILITY_DEMOS = ${qtm_demos} >>./config.pri
+ echo QT_CONFIG += dbus >>./config.pri
+ echo QT_CONFIG ${qtm_glflags} >>./config.pri
+ echo QT_LIBINFIX = ${qtm_libinfix} >>./config.pri
+ echo qt_embedded = ${qtm_embedded} >>./config.pri
+ echo bluez_enabled = yes >>./config.pri
+ echo ${qtm_extra_config} >>./config.pri
+}
+
+do_install() {
+ oe_runmake install INSTALL_ROOT=${D}
+ for NAME in */*.prf
+ do
+ install -m 644 -D -T $NAME ${D}/usr/share/${qtm_dir}/mkspecs/features/`basename $NAME`
+ done
+}
+
+PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
+
+FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug ${qtm_lib}/.debug ${qtm_plugins}/*/.debug /usr/src/debug"
+FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins}"
+FILES_${PN}-dev = "/usr"
--
1.7.6
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-09-28 9:35 ` Dmitry Cherukhin
@ 2011-09-28 14:21 ` Paul Eggleton
2011-10-14 15:24 ` Dmitry Cherukhin
0 siblings, 1 reply; 18+ messages in thread
From: Paul Eggleton @ 2011-09-28 14:21 UTC (permalink / raw)
To: Dmitry Cherukhin; +Cc: openembedded-core
On Wednesday 28 September 2011 10:35:59 Dmitry Cherukhin wrote:
> The QtMobility is a Qt add-on which allows to include standard mobile
> functionality to Qt applications. For details, see
> http://qt.nokia.com/products/qt-addons/mobility/
> The patch is intended to add support for the QtMobility 1.2 package to OE.
So apart from adding Qt Mobility this attempts to work around two issues by
removing the checks rather than fixing the underlying cause of the checks
failing. These checks look fine to me, so why are they not working?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] qt4: Added support for QtMobility 1.2
2011-09-28 14:21 ` Paul Eggleton
@ 2011-10-14 15:24 ` Dmitry Cherukhin
0 siblings, 0 replies; 18+ messages in thread
From: Dmitry Cherukhin @ 2011-10-14 15:24 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
On Wed, 2011-09-28 at 15:21 +0100, Paul Eggleton wrote:
> On Wednesday 28 September 2011 10:35:59 Dmitry Cherukhin wrote:
> > The QtMobility is a Qt add-on which allows to include standard mobile
> > functionality to Qt applications. For details, see
> > http://qt.nokia.com/products/qt-addons/mobility/
> > The patch is intended to add support for the QtMobility 1.2 package to OE.
>
> So apart from adding Qt Mobility this attempts to work around two issues by
> removing the checks rather than fixing the underlying cause of the checks
> failing. These checks look fine to me, so why are they not working?
>
These checks was not working because the file .../mkspecs/qconfig.pri
was not included to the main QtMobility project file. I include it
manually. Also I removed all .patch files because they deal with the
configuration, not with the code. You can find new version of the patch
here:
http://thread.gmane.org/gmane.comp.handhelds.openembedded.core/8708
Thanks,
Dima
^ permalink raw reply [flat|nested] 18+ messages in thread