Commit daff7498 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #4042 from dogmaphobic/videoUpdates

Video updates for Ubuntu.
parents 4b4ece63 5f3bb056
......@@ -53,6 +53,11 @@ contains (DEFINES, QGC_DISABLE_UVC) {
} else:exists(user_config.pri):infile(user_config.pri, DEFINES, QGC_DISABLE_UVC) {
message("Skipping support for UVC devices (manual override from user_config.pri)")
DEFINES += QGC_DISABLE_UVC
} else:LinuxBuild {
contains(QT_VERSION, 5.5.1) {
message("Skipping support for UVC devices (conflict with Qt 5.5.1 on Ubuntu)")
DEFINES += QGC_DISABLE_UVC
}
}
LinuxBuild {
......
......@@ -186,7 +186,7 @@ VideoEnabled {
}
LinuxBuild {
message(" You can install it using apt-get")
message(" sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-0:amd64 libgstreamer1.0-dev")
message(" sudo apt-get install gstreamer1.0*")
}
WindowsBuild {
message(" You can download it from http://gstreamer.freedesktop.org/data/pkg/windows/")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment