diff options
| author | Khem Raj <raj.khem@gmail.com> | 2012-03-31 10:34:48 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-04 16:56:37 +0100 |
| commit | da89bb83298eaf28faebcc8782f207927fbe190a (patch) | |
| tree | dc02dcf427ddb5f27d49f33332e170c7f2f716c0 /meta/recipes-qt | |
| parent | c870606c9da2fa90df2cd7c4a198e3bf5340304b (diff) | |
| download | openembedded-core-da89bb83298eaf28faebcc8782f207927fbe190a.tar.gz openembedded-core-da89bb83298eaf28faebcc8782f207927fbe190a.tar.bz2 openembedded-core-da89bb83298eaf28faebcc8782f207927fbe190a.zip | |
qt-mobility: Fix build with gcc 4.7
C getpid needs unistd.h for getting
its signature
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt4/files/gcc-scope.patch | 48 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 6 |
2 files changed, 52 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/files/gcc-scope.patch b/meta/recipes-qt/qt4/files/gcc-scope.patch new file mode 100644 index 0000000000..f01ee9f4df --- /dev/null +++ b/meta/recipes-qt/qt4/files/gcc-scope.patch @@ -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 + 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 3e50b2db2c..e612adbb3d 100644 --- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc +++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc @@ -9,12 +9,14 @@ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t 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://qt-mobility-no-opengl.patch \ + file://gcc-scope.patch \ + " SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" SRC_URI[sha256sum]="ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44" -PR = "r4" +PR = "r5" S = "${WORKDIR}/qt-mobility-opensource-src-${PV}" |