From 2e25ca9c7a9c6d0471c013f777ae0df260a8f482 Mon Sep 17 00:00:00 2001
From: Gus Grubba <mavlink@grubba.com>
Date: Mon, 6 Jul 2015 01:47:46 -0400
Subject: [PATCH] Linux Build

---
 src/QGCApplication.cc                                     | 4 ++--
 src/VideoStreaming/VideoItem.cc                           | 4 ++--
 src/VideoStreaming/VideoItem.h                            | 2 +-
 src/VideoStreaming/VideoStreaming.pri                     | 2 +-
 src/VideoStreaming/VideoSurface.cc                        | 2 +-
 src/VideoStreaming/{videosurface_p.h => VideoSurface_p.h} | 4 ++--
 src/ui/flightdisplay/FlightDisplay.cc                     | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename src/VideoStreaming/{videosurface_p.h => VideoSurface_p.h} (96%)

diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index ac9bcf16a..00cbf094a 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -41,8 +41,8 @@
 #include <QDebug>
 
 #if defined(QGC_GST_STREAMING)
-#include <videoitem.h>
-#include <videosurface.h>
+#include <VideoItem.h>
+#include <VideoSurface.h>
 G_BEGIN_DECLS
 GST_PLUGIN_STATIC_DECLARE(QTVIDEOSINK_NAME);
 G_END_DECLS
diff --git a/src/VideoStreaming/VideoItem.cc b/src/VideoStreaming/VideoItem.cc
index c0ae7c0ed..b02ff504f 100644
--- a/src/VideoStreaming/VideoItem.cc
+++ b/src/VideoStreaming/VideoItem.cc
@@ -31,8 +31,8 @@ This file is part of the QGROUNDCONTROL project
 #include <QtQuick/QSGNode>
 #include <QtQuick/QSGFlatColorMaterial>
 
-#include "videoitem.h"
-#include "videosurface_p.h"
+#include "VideoItem.h"
+#include "VideoSurface_p.h"
 
 struct VideoItem::Private
 {
diff --git a/src/VideoStreaming/VideoItem.h b/src/VideoStreaming/VideoItem.h
index 16a7a51ee..65c38c83a 100644
--- a/src/VideoStreaming/VideoItem.h
+++ b/src/VideoStreaming/VideoItem.h
@@ -31,7 +31,7 @@ This file is part of the QGROUNDCONTROL project
 #define VIDEO_ITEM_H
 
 #include <QtQuick/QQuickItem>
-#include "videosurface.h"
+#include "VideoSurface.h"
 
 class VideoItem : public QQuickItem
 {
diff --git a/src/VideoStreaming/VideoStreaming.pri b/src/VideoStreaming/VideoStreaming.pri
index cb1e3498d..4d4f2a541 100644
--- a/src/VideoStreaming/VideoStreaming.pri
+++ b/src/VideoStreaming/VideoStreaming.pri
@@ -29,7 +29,7 @@ LinuxBuild {
     packagesExist(gstreamer-1.0) {
         message("Including support for video streaming")
         DEFINES     += QGC_GST_STREAMING
-        PKGCONFIG   += gstreamer-1.0
+        PKGCONFIG   += gstreamer-1.0  gstreamer-video-1.0
         CONFIG      += VideoEnabled
     }
 } else:MacBuild {
diff --git a/src/VideoStreaming/VideoSurface.cc b/src/VideoStreaming/VideoSurface.cc
index c37a994d8..cb067527a 100644
--- a/src/VideoStreaming/VideoSurface.cc
+++ b/src/VideoStreaming/VideoSurface.cc
@@ -27,7 +27,7 @@ This file is part of the QGROUNDCONTROL project
  *   @author Gus Grubba <mavlink@grubba.com>
  */
 
-#include "videosurface_p.h"
+#include "VideoSurface_p.h"
 
 #include <QtCore/QDebug>
 #include <QtQuick/QQuickItem>
diff --git a/src/VideoStreaming/videosurface_p.h b/src/VideoStreaming/VideoSurface_p.h
similarity index 96%
rename from src/VideoStreaming/videosurface_p.h
rename to src/VideoStreaming/VideoSurface_p.h
index 6a86b6453..b4dc49632 100644
--- a/src/VideoStreaming/videosurface_p.h
+++ b/src/VideoStreaming/VideoSurface_p.h
@@ -30,8 +30,8 @@ This file is part of the QGROUNDCONTROL project
 #ifndef VIDEO_SURFACE_P_H
 #define VIDEO_SURFACE_P_H
 
-#include "videosurface.h"
-#include "videoitem.h"
+#include "VideoSurface.h"
+#include "VideoItem.h"
 
 class VideoSurfacePrivate
 {
diff --git a/src/ui/flightdisplay/FlightDisplay.cc b/src/ui/flightdisplay/FlightDisplay.cc
index 8f53f1375..f3b8938d6 100644
--- a/src/ui/flightdisplay/FlightDisplay.cc
+++ b/src/ui/flightdisplay/FlightDisplay.cc
@@ -32,8 +32,8 @@ This file is part of the QGROUNDCONTROL project
 #include <QSettings>
 
 #if defined(QGC_GST_STREAMING)
-#include <videoitem.h>
-#include <videosurface.h>
+#include <VideoItem.h>
+#include <VideoSurface.h>
 #include "VideoReceiver.h"
 #endif
 
-- 
2.22.0