diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-07-02 10:16:14 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:26:21 +0100 |
| commit | 0d7b208d09e6511dbedfde60abd4bef9a0c596ee (patch) | |
| tree | a84095202e85d191627e16818758d29c6aaf4457 /meta/recipes-qt/qt4 | |
| parent | 973447e171086c3935e704ae41845697107d5cf3 (diff) | |
| download | openembedded-core-0d7b208d09e6511dbedfde60abd4bef9a0c596ee.tar.gz openembedded-core-0d7b208d09e6511dbedfde60abd4bef9a0c596ee.tar.bz2 openembedded-core-0d7b208d09e6511dbedfde60abd4bef9a0c596ee.zip | |
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]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4')
| -rw-r--r-- | meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch | 26 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 3 |
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 @@ +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 + 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 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" |