From ee14710dbf1c4383ca20851529684f164883cc80 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 26 Sep 2012 20:06:25 +0200 Subject: qt-mobility: move qt-mobility patches to separate dir (From OE-Core rev: 8dccc55a623f0c5f3469c7cdf63aa788683aa186) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- ...stvideoconnector-fixed-buffers-allocation.patch | 34 +++++++++++++++ ...nnecessary-rpaths-from-qml_device-example.patch | 28 +++++++++++++ .../qt4/qt-mobility-1.2.0/gcc-scope.patch | 48 ++++++++++++++++++++++ .../qt-mobility-1.2.0/qt-mobility-configure.patch | 17 ++++++++ .../qt-mobility-1.2.0/qt-mobility-no-opengl.patch | 38 +++++++++++++++++ 5 files changed, 165 insertions(+) create mode 100644 meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch create mode 100644 meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch create mode 100644 meta/recipes-qt/qt4/qt-mobility-1.2.0/gcc-scope.patch create mode 100644 meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-configure.patch create mode 100644 meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch (limited to 'meta/recipes-qt/qt4/qt-mobility-1.2.0') diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch new file mode 100644 index 0000000000..2df76fc778 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0001-gstvideoconnector-fixed-buffers-allocation.patch @@ -0,0 +1,34 @@ +Upstream-Status: Submitted [QTMOBILITY-1611] + +From b308508b49afa9a129b4e4589c57cd107d1320b8 Mon Sep 17 00:00:00 2001 +From: Dmytro Poplavskiy +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 + diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch new file mode 100644 index 0000000000..a411640b73 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch @@ -0,0 +1,28 @@ +From 92e0c611f4969c716616d64df64831387e5b1632 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +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 +--- + 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 + diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/gcc-scope.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/gcc-scope.patch new file mode 100644 index 0000000000..f01ee9f4df --- /dev/null +++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/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 + +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 + 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 + + 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 + + QT_BEGIN_NAMESPACE + diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-configure.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-configure.patch new file mode 100644 index 0000000000..d61ec03341 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-configure.patch @@ -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 + +--- 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 + printf " ." + "$MAKE" clean >> "$CONFIG_LOG" + printf "." diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch new file mode 100644 index 0000000000..1724995072 --- /dev/null +++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-opengl.patch @@ -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 -- cgit v1.2.3-54-g00ecf