mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-10 04:30:00 +00:00
Code Issues Projects Releases Wiki Activity

recipes-qt: move qt-mobility from oe-core to meta-oe

Browse Source 
This will allow removal of gstreamer 0.10 from oe-core

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Alexander Kanavin
2015-05-18 17:12:46 +03:00
committed by Martin Jansa
parent ab1b1f4d50
commit be37c8f3bd
12 changed files with 5442 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch
+73
View File
@@ -0,0 +1,73 @@
From de2b568a4f14f38ae26960f543277bd2ac57c9d6 Mon Sep 17 00:00:00 2001
From: Alex <qt-info@nokia.com>
Date: Tue, 10 May 2011 14:54:49 +1000
Subject: [PATCH] fix !embedded usage (doesn't work outside of Qt)
embedded is part of QT_CONFIG and not CONFIG
Task-number: QTMOBILITY-1586
---
Upstream-Status: Backport
https://qt.gitorious.org/qt-mobility/qt-mobility/commit/de2b568a4f14f38ae26960f543277bd2ac57c9d6
EB: refreshed the patch for it to apply properly
plugins/multimedia/gstreamer/gstreamer.pro | 2 +-
src/systeminfo/systeminfo.pro | 6 +++---
tests/auto/auto.pro | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:34:40.880862884 +0200
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/gstreamer/gstreamer.pro 2013-09-19 10:35:22.844862550 +0200
@@ -85,7 +85,7 @@
qgstutils.cpp
-!win32:!embedded:!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
+!win32:!contains(QT_CONFIG,embedded):!mac:!symbian:!simulator:!contains(QT_CONFIG, qpa) {
LIBS += -lXv -lX11 -lXext
HEADERS += \
Index: qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/src/systeminfo/systeminfo.pro 2013-09-19 10:34:40.884862884 +0200
+++ qt-mobility-opensource-src-1.2.0/src/systeminfo/systeminfo.pro 2013-09-19 10:36:05.480862210 +0200
@@ -101,7 +101,7 @@
LIBS += -lblkid
}
- !embedded:!contains(QT_CONFIG,qpa): {
+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): {
LIBS += -lX11 -lXrandr
}
@@ -154,7 +154,7 @@
#for now... udisks
} else {
DEFINES += QT_NO_UDISKS
- !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
}
contains(connman_enabled, yes): {
@@ -165,7 +165,7 @@
}
} else {
DEFINES += QT_NO_NETWORKMANAGER QT_NO_UDISKS QT_NO_CONNMAN
- !embedded:!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
+ !contains(QT_CONFIG,embedded):!contains(QT_CONFIG,qpa): LIBS += -lX11 -lXrandr
}
}
Index: qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/tests/auto/auto.pro 2013-09-19 10:34:40.884862884 +0200
+++ qt-mobility-opensource-src-1.2.0/tests/auto/auto.pro 2013-09-19 10:35:22.844862550 +0200
@@ -21,5 +21,5 @@
# which require that the autotest is run on the same machine
# doing the build - i.e. cross-compilation is not allowed.
win32|mac|linux-g++* {
- !embedded:!maemo5:!maemo6:SUBDIRS+=host.pro
+ !contains(QT_CONFIG,embedded):!maemo5:!maemo6:SUBDIRS+=host.pro
}
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch
+34
View File
@@ -0,0 +1,34 @@
Upstream-Status: Submitted [QTMOBILITY-1611]
From b308508b49afa9a129b4e4589c57cd107d1320b8 Mon Sep 17 00:00:00 2001
From: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Date: Fri, 6 May 2011 10:35:11 +1000
Subject: [PATCH] gstvideoconnector: fixed buffers allocation
It should not be necessary, but at least theora video decoder doesn't
iniatilize *buf, while gst_pad_alloc_buffer relies on buf being NULL.
Task-number: QTMOBILITY-1611
Reviewed-by: Michael Goddard
---
plugins/multimedia/gstreamer/gstvideoconnector.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/plugins/multimedia/gstreamer/gstvideoconnector.c b/plugins/multimedia/gstreamer/gstvideoconnector.c
index ddf68e0..9f8ceae 100644
--- a/plugins/multimedia/gstreamer/gstvideoconnector.c
+++ b/plugins/multimedia/gstreamer/gstvideoconnector.c
@@ -186,6 +186,10 @@ gst_video_connector_buffer_alloc (GstPad * pad, guint64 offset, guint size,
GstFlowReturn res = GST_FLOW_OK;
element = GST_VIDEO_CONNECTOR (GST_PAD_PARENT (pad));
+ if (!buf)
+ return GST_FLOW_ERROR;
+ *buf = NULL;
+
GST_OBJECT_LOCK (element);
gst_object_ref(element->srcpad);
GST_OBJECT_UNLOCK (element);
--
1.7.4.1
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
+28
View File
@@ -0,0 +1,28 @@
From 92e0c611f4969c716616d64df64831387e5b1632 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Fri, 16 Mar 2012 10:24:00 +0000
Subject: [PATCH] Remove unnecessary rpaths from qml_device example
These can't be valid in any case.
Upstream-Status: Pending
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
examples/declarative-systeminfo/device/device.pro | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/examples/declarative-systeminfo/device/device.pro b/examples/declarative-systeminfo/device/device.pro
index 698e5fb..05be9b7 100644
--- a/examples/declarative-systeminfo/device/device.pro
+++ b/examples/declarative-systeminfo/device/device.pro
@@ -17,6 +17,3 @@ symbian {
}
RESOURCES += device.qrc
-QMAKE_LFLAGS_DEBUG += "-Wl,-rpath,/home/user/qt/lib"
-QMAKE_LFLAGS_RPATH += "-Wl,-rpath,/home/user/qt/lib"
-QMAKE_LFLAGS_RELEASE += "-Wl,-rpath,/home/user/qt/lib"
--
1.7.5.4
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/fix-compile-error-no-bluez.patch
+338
View File
@@ -0,0 +1,338 @@
From bb05733bd5a685b00f80ddc73a1b7a9a2ba0eb11 Mon Sep 17 00:00:00 2001
From: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
Date: Thu, 12 May 2011 13:07:13 +1000
Subject: [PATCH] Fix compile error if bluez is not installed
Upstream-Status: Backport
Task-number: QTMOBILITY-1576
---
src/connectivity/bluetooth/bluetooth.pri | 1 +
.../bluetooth/qbluetoothdevicediscoveryagent.h | 2 +-
.../bluetooth/qbluetoothdevicediscoveryagent_p.cpp | 2 +-
.../bluetooth/qbluetoothdevicediscoveryagent_p.h | 6 +++---
.../bluetooth/qbluetoothlocaldevice_p.h | 4 ++--
.../bluetooth/qbluetoothservicediscoveryagent.h | 2 +-
.../bluetooth/qbluetoothservicediscoveryagent_p.h | 8 ++++----
.../bluetooth/qbluetoothserviceinfo_p.cpp | 2 +-
.../bluetooth/qbluetoothserviceinfo_p.h | 4 ++--
src/connectivity/bluetooth/ql2capserver.h | 2 +-
src/connectivity/bluetooth/ql2capserver_p.cpp | 2 +-
src/connectivity/bluetooth/ql2capserver_p.h | 6 +++---
src/connectivity/bluetooth/qrfcommserver.h | 2 +-
src/connectivity/bluetooth/qrfcommserver_p.cpp | 2 +-
src/connectivity/bluetooth/qrfcommserver_p.h | 6 +++---
tests/tests.pro | 4 +++-
16 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/connectivity/bluetooth/bluetooth.pri b/src/connectivity/bluetooth/bluetooth.pri
index 717a1ad..4fa2c15 100644
--- a/src/connectivity/bluetooth/bluetooth.pri
+++ b/src/connectivity/bluetooth/bluetooth.pri
@@ -103,6 +103,7 @@ symbian {
}
} else:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
QT *= dbus
+ DEFINES += QTM_BLUEZ_BLUETOOTH
include(bluez/bluez.pri)
diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
index a95c467..00cfd14 100644
--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent.h
@@ -101,7 +101,7 @@ private:
Q_DECLARE_PRIVATE(QBluetoothDeviceDiscoveryAgent)
QBluetoothDeviceDiscoveryAgentPrivate *d_ptr;
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_deviceFound(const QString &address, const QVariantMap &dict));
Q_PRIVATE_SLOT(d_func(), void _q_propertyChanged(const QString &name, const QDBusVariant &value));
#endif
diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
index 6edbd16..512002d 100644
--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
@@ -69,7 +69,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start()
void QBluetoothDeviceDiscoveryAgentPrivate::stop()
{
}
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void QBluetoothDeviceDiscoveryAgentPrivate::_q_deviceFound(const QString &address,
const QVariantMap &dict)
{
diff --git a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
index 0e34e05..700e78d 100644
--- a/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
+++ b/src/connectivity/bluetooth/qbluetoothdevicediscoveryagent_p.h
@@ -46,7 +46,7 @@
#include <QVariantMap>
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
class OrgBluezManagerInterface;
class OrgBluezAdapterInterface;
class QDBusVariant;
@@ -80,7 +80,7 @@ public:
QString errorDescription);
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void _q_deviceFound(const QString &address, const QVariantMap &dict);
void _q_propertyChanged(const QString &name, const QDBusVariant &value);
#endif
@@ -100,7 +100,7 @@ private:
bool pendingCancel;
bool pendingStart;
-#if !defined(QT_NO_DBUS)
+#ifdef QTM_BLUEZ_BLUETOOTH
OrgBluezManagerInterface *manager;
OrgBluezAdapterInterface *adapter;
#endif
diff --git a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
index 750c286..381d6b5 100644
--- a/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/connectivity/bluetooth/qbluetoothlocaldevice_p.h
@@ -51,7 +51,7 @@
#include <btengsettings.h>
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
#include <QObject>
#include <QDBusContext>
#include <QDBusObjectPath>
@@ -68,7 +68,7 @@ QTM_BEGIN_NAMESPACE
class QBluetoothAddress;
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
class QBluetoothLocalDevicePrivate : public QObject,
protected QDBusContext
{
diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
index 6279432..7eeccfc 100644
--- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
+++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent.h
@@ -105,7 +105,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscovered(const QBluetoothDeviceInfo &info))
Q_PRIVATE_SLOT(d_func(), void _q_deviceDiscoveryFinished())
Q_PRIVATE_SLOT(d_func(), void _q_serviceDiscoveryFinished())
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*))
Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*))
#endif
diff --git a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
index 5e7da43..f25c293 100644
--- a/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
+++ b/src/connectivity/bluetooth/qbluetoothservicediscoveryagent_p.h
@@ -53,7 +53,7 @@
#include <btsdp.h>
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
class OrgBluezManagerInterface;
class OrgBluezAdapterInterface;
class OrgBluezDeviceInterface;
@@ -99,7 +99,7 @@ public:
void _q_deviceDiscoveryFinished();
void _q_deviceDiscovered(const QBluetoothDeviceInfo &info);
void _q_serviceDiscoveryFinished();
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void _q_discoveredServices(QDBusPendingCallWatcher *watcher);
void _q_createdDevice(QDBusPendingCallWatcher *watcher);
#endif
@@ -123,7 +123,7 @@ private:
#ifdef QTM_SYMBIAN_BLUETOOTH
void startL(const QBluetoothAddress &address);
void initL(const QBluetoothAddress &address);
-#elif !defined(QT_NO_DBUS)
+#elif defined(QTM_BLUEZ_BLUETOOTH)
QVariant readAttributeValue(QXmlStreamReader &xml);
#endif
@@ -153,7 +153,7 @@ private:
TSdpAttributeID m_currentAttributeId;
QStack<QVariant> m_stack;
-#elif !defined(QT_NO_DBUS)
+#elif defined(QTM_BLUEZ_BLUETOOTH)
OrgBluezManagerInterface *manager;
OrgBluezAdapterInterface *adapter;
OrgBluezDeviceInterface *device;
diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
index 814458c..dd96dcc 100644
--- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
+++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.cpp
@@ -79,7 +79,7 @@ void QBluetoothServiceInfoPrivate::removeRegisteredAttribute(quint16 attributeId
Q_UNUSED(attributeId);
}
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
bool QBluetoothServiceInfoPrivate::registerService() const
{
return false;
diff --git a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
index 5be7341..8e4254c 100644
--- a/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
+++ b/src/connectivity/bluetooth/qbluetoothserviceinfo_p.h
@@ -72,7 +72,7 @@ public:
bool ensureSdpConnection() const;
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
bool registerService() const;
#endif
@@ -89,7 +89,7 @@ public:
mutable TSdpServRecordHandle serviceRecord;
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
mutable OrgBluezServiceInterface *service;
mutable quint32 serviceRecord;
mutable bool registered;
diff --git a/src/connectivity/bluetooth/ql2capserver.h b/src/connectivity/bluetooth/ql2capserver.h
index 99c20a5..bed65a3 100644
--- a/src/connectivity/bluetooth/ql2capserver.h
+++ b/src/connectivity/bluetooth/ql2capserver.h
@@ -97,7 +97,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_disconnected())
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_newConnection())
#endif
diff --git a/src/connectivity/bluetooth/ql2capserver_p.cpp b/src/connectivity/bluetooth/ql2capserver_p.cpp
index 3a2199f..f19977e 100644
--- a/src/connectivity/bluetooth/ql2capserver_p.cpp
+++ b/src/connectivity/bluetooth/ql2capserver_p.cpp
@@ -101,7 +101,7 @@ QBluetooth::SecurityFlags QL2capServer::securityFlags() const
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void QL2capServerPrivate::_q_newConnection()
{
}
diff --git a/src/connectivity/bluetooth/ql2capserver_p.h b/src/connectivity/bluetooth/ql2capserver_p.h
index b5e76d9..2823106 100644
--- a/src/connectivity/bluetooth/ql2capserver_p.h
+++ b/src/connectivity/bluetooth/ql2capserver_p.h
@@ -50,7 +50,7 @@
#include <bt_sock.h>
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
#endif
@@ -82,7 +82,7 @@ public:
void _q_disconnected();
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void _q_newConnection();
#endif
@@ -103,7 +103,7 @@ protected:
QL2capServer *q_ptr;
private:
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
QSocketNotifier *socketNotifier;
#endif
};
diff --git a/src/connectivity/bluetooth/qrfcommserver.h b/src/connectivity/bluetooth/qrfcommserver.h
index 3f348dd..7974ba6 100644
--- a/src/connectivity/bluetooth/qrfcommserver.h
+++ b/src/connectivity/bluetooth/qrfcommserver.h
@@ -97,7 +97,7 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_disconnected())
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
Q_PRIVATE_SLOT(d_func(), void _q_newConnection())
#endif
};
diff --git a/src/connectivity/bluetooth/qrfcommserver_p.cpp b/src/connectivity/bluetooth/qrfcommserver_p.cpp
index f8145d9..eb14d64 100644
--- a/src/connectivity/bluetooth/qrfcommserver_p.cpp
+++ b/src/connectivity/bluetooth/qrfcommserver_p.cpp
@@ -90,7 +90,7 @@ quint16 QRfcommServer::serverPort() const
}
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void QRfcommServerPrivate::_q_newConnection()
{
}
diff --git a/src/connectivity/bluetooth/qrfcommserver_p.h b/src/connectivity/bluetooth/qrfcommserver_p.h
index da6e28b..af40df7 100644
--- a/src/connectivity/bluetooth/qrfcommserver_p.h
+++ b/src/connectivity/bluetooth/qrfcommserver_p.h
@@ -51,7 +51,7 @@
#include <bt_sock.h>
#endif
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
#endif
@@ -83,7 +83,7 @@ public:
void _q_disconnected();
#endif //QTM_SYMBIAN_BLUETOOTH
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
void _q_newConnection();
#endif
@@ -102,7 +102,7 @@ protected:
QRfcommServer *q_ptr;
private:
-#ifndef QT_NO_DBUS
+#ifdef QTM_BLUEZ_BLUETOOTH
QSocketNotifier *socketNotifier;
#endif
};
diff --git a/tests/tests.pro b/tests/tests.pro
index 2f2c355..4800e5e 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -16,7 +16,9 @@ contains(mobility_modules,systeminfo): SUBDIRS += sysinfo-tester
contains(mobility_modules,connectivity) {
SUBDIRS += nfctestserver
- linux*:!linux-armcc: SUBDIRS += btclient
+ linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) {
+ SUBDIRS += btclient
+ }
}
symbian {
--
1.7.1
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/fix_metaobjectbuilder_build_err.patch
+4707
View File
File diff suppressed because it is too large Load Diff
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/gcc-scope.patch
+48
View File
@@ -0,0 +1,48 @@
Fixes issues like below
| qaudiooutput_pulse.cpp: In member function 'bool QPulseAudioOutput::open()':
| qaudiooutput_pulse.cpp:255:75: error: '::getpid' has not been declared
| make[3]: *** [../../../build/Debug/qtmedia_pulse/qaudiooutput_pulse.o] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp 2012-03-31 07:26:24.457018348 -0700
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudiooutput_pulse.cpp 2012-03-31 07:27:53.309022654 -0700
@@ -46,7 +46,7 @@
#include "qaudiodeviceinfo_pulse.h"
#include "qpulseaudioengine.h"
#include "qpulsehelpers.h"
-
+#include <unistd.h>
QT_BEGIN_NAMESPACE
const int PeriodTimeMs = 20;
Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp 2012-03-31 07:29:19.997026831 -0700
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qaudioinput_pulse.cpp 2012-03-31 07:29:39.541027625 -0700
@@ -46,6 +46,7 @@
#include "qaudiodeviceinfo_pulse.h"
#include "qpulseaudioengine.h"
#include "qpulsehelpers.h"
+#include <unistd.h>
QT_BEGIN_NAMESPACE
Index: qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp
===================================================================
--- qt-mobility-opensource-src-1.2.0.orig/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp 2012-03-31 07:33:24.805038719 -0700
+++ qt-mobility-opensource-src-1.2.0/plugins/multimedia/pulseaudio/qpulseaudioengine.cpp 2012-03-31 07:33:46.889039783 -0700
@@ -46,6 +46,7 @@
#include "qaudiodeviceinfo_pulse.h"
#include "qaudiooutput_pulse.h"
#include "qpulsehelpers.h"
+#include <unistd.h>
QT_BEGIN_NAMESPACE
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-configure.patch
+17
View File
@@ -0,0 +1,17 @@
When building qt-mobility, the qa_configure stage failed because the catalogue /usr/lib
is used in some Makefiles within configure tests. We manually removed this catalogue.
Upstream-Status: Inappropriate [embedded]
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
--- qt-mobility-opensource-src-1.2.0/configure.orig 2011-05-10 10:06:01.000000000 +0200
+++ qt-mobility-opensource-src-1.2.0/configure 2011-11-08 12:34:56.347645968 +0100
@@ -583,6 +583,8 @@
fi
$QMAKE_EXEC $QMKSPEC "$relpath/config.tests/$2/$2.pro" 2>> "$CONFIG_LOG" >> "$CONFIG_LOG"
+ cp Makefile Makefile.old
+ sed -e 's@-L/usr/lib@@' <Makefile.old >Makefile
printf " ."
"$MAKE" clean >> "$CONFIG_LOG"
printf "."
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-no-opengl.patch
+38
View File
@@ -0,0 +1,38 @@
Upstream-Status: Inappropriate [configuration]
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
meta-oe/recipes-qt/qt-mobility/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch
+26
View File
@@ -0,0 +1,26 @@
QMake pro files don't explicitly define QT_NO_XVIDEO if the
configuration lacks xvideo, but plugins code relies on this define.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Upstream-Status: Inappropriate [configuration]
---
plugins/multimedia/gstreamer/gstreamer.pro | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/plugins/multimedia/gstreamer/gstreamer.pro b/plugins/multimedia/gstreamer/gstreamer.pro
--- a/plugins/multimedia/gstreamer/gstreamer.pro
+++ b/plugins/multimedia/gstreamer/gstreamer.pro
@@ -19,6 +19,10 @@ LIBS += \
-lasound
}
+unix:!contains(QT_CONFIG, xvideo) {
+ DEFINES += QT_NO_XVIDEO
+}
+
CONFIG += link_pkgconfig
PKGCONFIG += \
--
1.8.1.2
meta-oe/recipes-qt/qt-mobility/qt-mobility-embedded_1.2.0.bb
+11
View File
@@ -0,0 +1,11 @@
SUMMARY = "Mobile device API extensions for Qt/Embedded 4.x"
DEPENDS = "qt4-embedded"
SECTION = "libs"
qtm_embedded := "embedded"
qtm_dir = "qtopia"
qtm_glflags := "-=opengl"
qtm_extra_config := "gstreamer-photography_enabled = no"
inherit qt4e
require qt-mobility_${PV}.inc
meta-oe/recipes-qt/qt-mobility/qt-mobility-x11_1.2.0.bb
+10
View File
@@ -0,0 +1,10 @@
SUMMARY = "Mobile device API extensions for Qt/X11 4.x"
DEPENDS = "qt4-x11-free"
SECTION = "x11/libs"
qtm_embedded := ""
qtm_dir = "qt4"
qtm_glflags := "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
qtm_extra_config := ""
inherit qt4x11
require qt-mobility_${PV}.inc
meta-oe/recipes-qt/qt-mobility/qt-mobility_1.2.0.inc
+112
View File
@@ -0,0 +1,112 @@
HOMEPAGE = "http://qt-project.org/"
DEPENDS = "gstreamer util-linux"
inherit bluetooth
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
PACKAGECONFIG[bluez4] = ",,bluez4"
PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-mobility-${PV}:"
SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/qt-mobility/qt-mobility-opensource-src-${PV}.tar.gz/ea5db5a8d3dd4709c2926dceda646bd8/qt-mobility-opensource-src-${PV}.tar.gz \
file://qt-mobility-configure.patch \
file://0001-gstvideoconnector-fixed-buffers-allocation.patch \
file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch \
file://qt-mobility-no-opengl.patch \
file://gcc-scope.patch \
file://qt-mobility-no-xvideo.patch \
file://fix_metaobjectbuilder_build_err.patch \
file://0001-fix-embedded-usage-doesn-t-work-outside-of-Qt.patch \
file://fix-compile-error-no-bluez.patch \
"
SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"
SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"
PR = "r8"
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"
qtm_data := "/usr/share/${qtm_dir}"
qtm_imports := "/usr/lib/${qtm_dir}/imports"
QTM_MODULES_LIST ?= "bearer contacts gallery location publishsubscribe messaging multimedia \
systeminfo serviceframework sensors versit organizer feedback connectivity"
do_configure_prepend() {
cp qtmobility.pro qtmobility.pro.old
sed -e 's@...QT_INSTALL_DATA.@${qtm_data}@' <qtmobility.pro.old >qtmobility.pro
for NAME in plugins/declarative/*/*.pro
do
cp $NAME $NAME.old
sed -e 's@...QT_INSTALL_IMPORTS.@${qtm_imports}@' <$NAME.old >$NAME
done
cp staticconfig.pri staticconfig.pri.old
echo "include(${STAGING_DATADIR}/${qtm_dir}/mkspecs/qconfig.pri)" >staticconfig.pri
cat staticconfig.pri.old >>staticconfig.pri
cat > features/platformconfig/oe.pri <<EOF
qmf_enabled = no
networkmanager_enabled = no
corewlan_enabled = no
immersion_enabled = no
meegotouchfeedback_enabled = no
maemo-icd_enabled = no
maemo-icd-network-wlan_enabled = no
maemo5-contacts_enabled = no
maemo5-calendar_enabled = no
maemo6-landmarks_enabled = no
bme_enabled = no
bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluez4', 'yes', 'no', d)}
proj_enabled = no
gstreamer-photography_enabled = no
gstreamer-appsrc_enabled = yes
blkid_enabled = yes
pulseaudio_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}
udev_enabled = yes
iphb_enabled = no
nfc_symbian_enabled = no
sensord_enabled = no
geoclue-master_enabled = no
gypsy_enabled = no
${qtm_extra_config}
EOF
./configure -qmake-exec qmake2 -prefix /usr -staticconfig oe -examples -demos -modules "${QTM_MODULES_LIST}"
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
echo CONFIG += ${qtm_embedded} >>./config.pri
}
do_install() {
for NAME in */*.prf
do
cp $NAME $NAME.old
sed -e 's@/usr@${STAGING_BINDIR}/..@' <$NAME.old >$NAME
done
oe_runmake install INSTALL_ROOT=${D}
}
PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
FILES_${PN}-dbg = "${qtm_bin}/.debug ${qtm_examples}/.debug ${qtm_demos}/.debug \
${qtm_lib}/.debug ${qtm_plugins}/*/.debug ${qtm_imports}/*/.debug \
${qtm_imports}/*/*/.debug ${bindir}/.debug /usr/src/debug"
FILES_${PN} = "${qtm_bin} ${qtm_examples} ${qtm_demos} ${qtm_lib}/*.so.1* ${qtm_plugins} ${qtm_imports}"
FILES_${PN}-dev = "${exec_prefix}"