Patchwork [1/1] qt-mobility: fix build in the absence of xvideo

login
register
mail settings
Submitter Hongxu Jia
Date July 2, 2013, 2:16 a.m.
Message ID <4fe4ce970df0fa607fb3325b88b247be1ebbb93a.1372483117.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/52773/
State Accepted
Commit 4770cff7b90a50643973ec31ff536bc2950f77e4
Headers show

Comments

Hongxu Jia - July 2, 2013, 2:16 a.m.
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>
---
 .../qt-mobility-1.2.0/qt-mobility-no-xvideo.patch  | 26 ++++++++++++++++++++++
 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc          |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-qt/qt4/qt-mobility-1.2.0/qt-mobility-no-xvideo.patch
Ross Burton - July 9, 2013, 2:28 p.m.
On 2 July 2013 03:16, Hongxu Jia <hongxu.jia@windriver.com> wrote:
> QMake pro files don't explicitly define QT_NO_XVIDEO if the
> configuration lacks xvideo, but plugins code relies on this define.

You just described a clear and obvious bug in the build system...

> +Upstream-Status: Inappropriate [configuration]

...so why is this inappropriate to send upstream?

Ross

Patch

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 0000000..6046752
--- /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 aba84ab..2ce9ca2 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"