slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[qtmultimedia] disable v4l test to prevent enabling v4l. Fixes JB#34605

Browse Source 
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.
This commit is contained in:
Mohammed Hassan
2016-07-26 21:50:15 +03:00
committed by Martin Jones
parent 1f90ee5518
commit da15fb57ed
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qtmultimedia.pro
View File

@@ -29,7 +29,9 @@ win32 {
qtCompileTest(gstreamer_photography) qtCompileTest(gstreamer_photography)
qtCompileTest(gstreamer_encodingprofiles) qtCompileTest(gstreamer_encodingprofiles)
qtCompileTest(gstreamer_appsrc) qtCompileTest(gstreamer_appsrc)
qtCompileTest(linux_v4l) !contains(DEFINES, DISABLE_V4L) {
qtCompileTest(linux_v4l)
}
} }
qtCompileTest(resourcepolicy) qtCompileTest(resourcepolicy)

2
rpm/qtmultimedia.spec
View File

@@ -148,7 +148,7 @@ This package contains the egl video node plugin.
export QTDIR=/usr/share/qt5 export QTDIR=/usr/share/qt5
touch .git 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} make %{?_smp_mflags}
%install %install