* [PATCH 0/1]qt-mobility: fix build in the absence of xvideo
@ 2013-07-02 2:16 Hongxu Jia
2013-07-02 2:16 ` [PATCH 1/1] qt-mobility: " Hongxu Jia
0 siblings, 1 reply; 3+ messages in thread
From: Hongxu Jia @ 2013-07-02 2:16 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 80b263430453896189b704d0997943642eec6fef:
classes/insane: remove la2 check which no longer exists from ERROR_QA (2013-06-28 16:33:08 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib hongxu/fix-qt4
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-adt
Hongxu Jia (1):
qt-mobility: fix build in the absence of xvideo
.../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
--
1.8.1.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] qt-mobility: fix build in the absence of xvideo
2013-07-02 2:16 [PATCH 0/1]qt-mobility: fix build in the absence of xvideo Hongxu Jia
@ 2013-07-02 2:16 ` Hongxu Jia
2013-07-09 14:28 ` Burton, Ross
0 siblings, 1 reply; 3+ messages in thread
From: Hongxu Jia @ 2013-07-02 2:16 UTC (permalink / raw)
To: openembedded-core
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
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"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] qt-mobility: fix build in the absence of xvideo
2013-07-02 2:16 ` [PATCH 1/1] qt-mobility: " Hongxu Jia
@ 2013-07-09 14:28 ` Burton, Ross
0 siblings, 0 replies; 3+ messages in thread
From: Burton, Ross @ 2013-07-09 14:28 UTC (permalink / raw)
To: Hongxu Jia; +Cc: openembedded-core
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-09 14:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-02 2:16 [PATCH 0/1]qt-mobility: fix build in the absence of xvideo Hongxu Jia
2013-07-02 2:16 ` [PATCH 1/1] qt-mobility: " Hongxu Jia
2013-07-09 14:28 ` Burton, Ross
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox