qt-mobility: move qt-mobility patches to separate dir

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

5 files changed, 0 insertions, 165 deletions

diff --git a/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch b/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch
deleted file mode 100644
index 2df76fc778..0000000000
--- a/meta/recipes-qt/qt4/files/0001-gstvideoconnector-fixed-buffers-allocation.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-
diff --git a/meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch b/meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
deleted file mode 100644
index a411640b73..0000000000
--- a/meta/recipes-qt/qt4/files/0002-Remove-unnecessary-rpaths-from-qml_device-example.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-
diff --git a/meta/recipes-qt/qt4/files/gcc-scope.patch b/meta/recipes-qt/qt4/files/gcc-scope.patch
deleted file mode 100644
index f01ee9f4df..0000000000
--- a/meta/recipes-qt/qt4/files/gcc-scope.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-
-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/files/qt-mobility-configure.patch b/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
deleted file mode 100644
index d61ec03341..0000000000
--- a/meta/recipes-qt/qt4/files/qt-mobility-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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 "."
diff --git a/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch b/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
deleted file mode 100644
index 1724995072..0000000000
--- a/meta/recipes-qt/qt4/files/qt-mobility-no-opengl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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