sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Hongxu Jia 2013-07-02 10:16:14 +08:00 committed by Richard Purdie
parent f7d546102d
commit 4770cff7b9
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch Normal file
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

3
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
View File

@ -12,7 +12,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-${PV}.t
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://gcc-scope.patch \
file://qt-mobility-no-xvideo.patch \
"
SRC_URI[md5sum]="ea5db5a8d3dd4709c2926dceda646bd8"