From da15fb57ed5cc99b6f6d0cb5f0e5951cd76e96e8 Mon Sep 17 00:00:00 2001 From: Mohammed Hassan Date: Tue, 26 Jul 2016 21:50:15 +0300 Subject: [PATCH] [qtmultimedia] disable v4l test to prevent enabling v4l. Fixes JB#34605 On some Android adaptation based devices (Like Jolla1) accessing v4l2 devices can cause crashes. Since we don't use V4L for anything and our media pipelines depend on GStreamer, it should be safe to disable V4L. --- qtmultimedia.pro | 4 +++- rpm/qtmultimedia.spec | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qtmultimedia.pro b/qtmultimedia.pro index a49700d1..6f6d933d 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -29,7 +29,9 @@ win32 { qtCompileTest(gstreamer_photography) qtCompileTest(gstreamer_encodingprofiles) qtCompileTest(gstreamer_appsrc) - qtCompileTest(linux_v4l) + !contains(DEFINES, DISABLE_V4L) { + qtCompileTest(linux_v4l) + } } qtCompileTest(resourcepolicy) diff --git a/rpm/qtmultimedia.spec b/rpm/qtmultimedia.spec index cc03e665..ab53beb9 100644 --- a/rpm/qtmultimedia.spec +++ b/rpm/qtmultimedia.spec @@ -148,7 +148,7 @@ This package contains the egl video node plugin. export QTDIR=/usr/share/qt5 touch .git -%qmake5 GST_VERSION=1.0 QT.widgets.name= DEFINES+=QT_NO_WIDGETS -r "DEFINES+=NEMO_AUDIO" CONFIG+=config_pulseaudio +%qmake5 GST_VERSION=1.0 QT.widgets.name= DEFINES+=QT_NO_WIDGETS -r "DEFINES+=NEMO_AUDIO" "DEFINES+=DISABLE_V4L" CONFIG+=config_pulseaudio make %{?_smp_mflags} %install