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:34:25 +0100 |
commit | 4770cff7b90a50643973ec31ff536bc2950f77e4 (patch) | |
tree | 67a86dc7193a88714fa5f7b9ae7541f6884b79e0 /meta/recipes-qt/qt4/qt-mobility-1.2.0 | |
parent | f7d546102dcc65f725324e1f8b90a5e2d5024c91 (diff) | |
download | poky-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/qt-mobility-1.2.0')
-rw-r--r-- | meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch | 26 |
1 files changed, 26 insertions, 0 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 @@ | |||
1 | QMake pro files don't explicitly define QT_NO_XVIDEO if the | ||
2 | configuration lacks xvideo, but plugins code relies on this define. | ||
3 | |||
4 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | --- | ||
7 | plugins/multimedia/gstreamer/gstreamer.pro | 4 ++++ | ||
8 | 1 file changed, 4 insertions(+) | ||
9 | |||
10 | diff --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 | -- | ||
25 | 1.8.1.2 | ||
26 | |||