From 5f3bb056c6e4f927c4b26dba70f750c82c4bb274 Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Fri, 16 Sep 2016 06:04:48 -0400
Subject: [PATCH] Video updates for Ubuntu.

---
 qgroundcontrol.pro                    | 5 +++++
 src/VideoStreaming/VideoStreaming.pri | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index b88bdbd01..7842c0bce 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -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 {
diff --git a/src/VideoStreaming/VideoStreaming.pri b/src/VideoStreaming/VideoStreaming.pri
index cd78836ff..762a608f5 100644
--- a/src/VideoStreaming/VideoStreaming.pri
+++ b/src/VideoStreaming/VideoStreaming.pri
@@ -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/")
-- 
2.22.0