diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-27 13:37:25 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-03-24 11:13:28 +0100 |
| commit | 40f1b73c92731f4e18751d3a499f269c65c21a96 (patch) | |
| tree | 734faeca0e9ccade77c66f04320bf50071ecbf6b /meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch | |
| parent | e45f3d305e25ff2aef9e42697e583e6f69a9b6e6 (diff) | |
| download | openembedded-core-contrib-jansa/pseudo.tar.gz | |
qt5: downgrade to 5.6jansa/pseudo
* webosose isn't compatible with newer Qt
export COMP=qml-webos-framework; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c compile ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra tmp-glibc/work/qemux86-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done
in local.conf I have only this to reproduce the failures:
PRSERV_HOST = "localhost:0"
BB_NUMBER_THREADS = "8"
PARALLEL_MAKE = "-j 32"
DISTRO_FEATURES_append = " wayland opengl"
ERROR_QA_append = " host-user-contaminated"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch')
| -rw-r--r-- | meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch new file mode 100644 index 0000000000..1a629652b4 --- /dev/null +++ b/meta/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch @@ -0,0 +1,56 @@ +From d8911e0db56151d39f7c8c6d9f32349ca54e8c48 Mon Sep 17 00:00:00 2001 +From: Yoann Lopes <yoann.lopes@digia.com> +Date: Thu, 31 Oct 2013 15:06:30 +0100 +Subject: [PATCH] Initial porting effort to GStreamer 1.0. + +* It's already included in 5.5 with this commit: + commit 108dda7a90bd0f0337358b0db47ae55acd16dea6 + Author: Yoann Lopes <yoann.lopes@theqtcompany.com> + Date: Thu Nov 20 17:54:18 2014 +0100 + GStreamer: port to 1.0. +* here we restore only the done_config_gstreamer variable + to explicitly disable it from OE build + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + qtmultimedia.pro | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +diff --git a/qtmultimedia.pro b/qtmultimedia.pro +index e58ae1d..81e6ce8 100644 +--- a/qtmultimedia.pro ++++ b/qtmultimedia.pro +@@ -17,19 +17,21 @@ win32 { + contains(QT_CONFIG, alsa):qtCompileTest(alsa) + contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio) + +- isEmpty(GST_VERSION) { +- contains(QT_CONFIG, gstreamer-0.10) { +- GST_VERSION = 0.10 +- } else: contains(QT_CONFIG, gstreamer-1.0) { +- GST_VERSION = 1.0 ++ !done_config_gstreamer { ++ isEmpty(GST_VERSION) { ++ contains(QT_CONFIG, gstreamer-0.10) { ++ GST_VERSION = 0.10 ++ } else: contains(QT_CONFIG, gstreamer-1.0) { ++ GST_VERSION = 1.0 ++ } ++ } ++ cache(GST_VERSION, set) ++ !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { ++ qtCompileTest(gstreamer_photography) ++ qtCompileTest(gstreamer_encodingprofiles) ++ qtCompileTest(gstreamer_appsrc) ++ qtCompileTest(linux_v4l) + } +- } +- cache(GST_VERSION, set) +- !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { +- qtCompileTest(gstreamer_photography) +- qtCompileTest(gstreamer_encodingprofiles) +- qtCompileTest(gstreamer_appsrc) +- qtCompileTest(linux_v4l) + } + + qtCompileTest(resourcepolicy) |