summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-07-02 10:16:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 15:34:25 +0100
commit4770cff7b90a50643973ec31ff536bc2950f77e4 (patch)
tree67a86dc7193a88714fa5f7b9ae7541f6884b79e0 /meta/recipes-qt/qt4
parentf7d546102dcc65f725324e1f8b90a5e2d5024c91 (diff)
downloadpoky-4770cff7b90a50643973ec31ff536bc2950f77e4.tar.gz
qt-mobility: fix build in the absence of xvideo
QMake pro files don't explicitly define QT_NO_XVIDEO if the configuration lacks xvideo, but plugins code relies on this define. [YOCTO #4775] (From OE-Core rev: 0d7b208d09e6511dbedfde60abd4bef9a0c596ee) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch26
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc3
2 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch
new file mode 100644
index 0000000000..6046752aa7
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch
@@ -0,0 +1,26 @@
1QMake pro files don't explicitly define QT_NO_XVIDEO if the
2configuration lacks xvideo, but plugins code relies on this define.
3
4Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
5Upstream-Status: Inappropriate [configuration]
6---
7 plugins/multimedia/gstreamer/gstreamer.pro | 4 ++++
8 1 file changed, 4 insertions(+)
9
10diff --git a/plugins/multimedia/gstreamer/gstreamer.pro b/plugins/multimedia/gstreamer/gstreamer.pro
11--- a/plugins/multimedia/gstreamer/gstreamer.pro
12+++ b/plugins/multimedia/gstreamer/gstreamer.pro
13@@ -19,6 +19,10 @@ LIBS += \
14 -lasound
15 }
16
17+unix:!contains(QT_CONFIG, xvideo) {
18+ DEFINES += QT_NO_XVIDEO
19+}
20+
21 CONFIG += link_pkgconfig
22
23 PKGCONFIG += \
24--
251.8.1.2
26
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 aba84ab3b9..2ce9ca2ac0 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -12,7 +12,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t
12 file://0001-gstvideoconnector-fixed-buffers-allocation.patch \ 12 file://0001-gstvideoconnector-fixed-buffers-allocation.patch \
13 file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch \ 13 file://0002-Remove-unnecessary-rpaths-from-qml_device-example.patch \
14 file://qt-mobility-no-opengl.patch \ 14 file://qt-mobility-no-opengl.patch \
15 file://gcc-scope.patch \ 15 file://gcc-scope.patch \
16 file://qt-mobility-no-xvideo.patch \
16 " 17 "
17 18
18SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8" 19SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"