Browse Source

Merge pull request #4042 from dogmaphobic/videoUpdates

Video updates for Ubuntu.
QGC4.4
Gus Grubba 9 years ago committed by GitHub
parent
commit
daff7498cd
  1. 5
      qgroundcontrol.pro
  2. 2
      src/VideoStreaming/VideoStreaming.pri

5
qgroundcontrol.pro

@ -53,6 +53,11 @@ contains (DEFINES, QGC_DISABLE_UVC) { @@ -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 {

2
src/VideoStreaming/VideoStreaming.pri

@ -186,7 +186,7 @@ VideoEnabled { @@ -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/")

Loading…
Cancel
Save