LP-109 use standard way to enable gstreamer support

librepilot · Sep 12, 2017 · ddbabc4 · ddbabc4
1 parent dffc4de
commit ddbabc4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -131,16 +131,22 @@ ifeq ($(UNAME), Linux)
     GCS_WITH_OSG      := 1
     GCS_WITH_OSGEARTH := 1
     GCS_COPY_OSG      := 0
+    GCS_WITH_GSTREAMER := 0
+    GCS_COPY_GSTREAMER := 0
 else ifeq ($(UNAME), Darwin)
     UAVOBJGENERATOR   := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
     GCS_WITH_OSG      := 1
     GCS_WITH_OSGEARTH := 0
     GCS_COPY_OSG      := 1
+    GCS_WITH_GSTREAMER := 0
+    GCS_COPY_GSTREAMER := 0
 else ifeq ($(UNAME), Windows)
     UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator.exe
     GCS_WITH_OSG      := 1
     GCS_WITH_OSGEARTH := 1
     GCS_COPY_OSG      := 1
+    GCS_WITH_GSTREAMER := 1
+    GCS_COPY_GSTREAMER := 1
 endif
 
 export UAVOBJGENERATOR
@@ -159,6 +165,13 @@ ifeq ($(GCS_WITH_OSG), 1)
     endif
 endif
 
+ifeq ($(GCS_WITH_GSTREAMER), 1)
+    GCS_EXTRA_CONF += gstreamer
+    ifeq ($(GCS_COPY_GSTREAMER), 1)
+        GCS_EXTRA_CONF += copy_gstreamer
+    endif
+endif
+
 ##############################
 #
 # All targets
@@ -590,6 +603,10 @@ config_help:
 	@$(ECHO) "       (Needed unless using system versions)"
 	@$(ECHO) "       Options: 0 or 1"
 	@$(ECHO)
+	@$(ECHO) "   GCS_WITH_GSTREAMER=$(GCS_WITH_GSTREAMER)"
+	@$(ECHO) "       Build the GCS with GStreamer support, this enables the video gadget and extra PFD video views"
+	@$(ECHO) "       Options: 0 or 1"
+	@$(ECHO)
 	@$(ECHO) "   CCACHE=$(CCACHE)"
 	@$(ECHO) "       A prefix to compiler invocations, usually 'ccache' or 'path/to/ccache'"
 	@$(ECHO)

diff --git a/ground/gcs/src/libs/gstreamer/gstreamer.pro b/ground/gcs/src/libs/gstreamer/gstreamer.pro
@@ -26,4 +26,4 @@ SOURCES += \
     pipeline.cpp \
     videowidget.cpp
 
-equals(copydata, 1):include(copydata.pro)
+copy_gstreamer:include(copydata.pro)
diff --git a/ground/gcs/src/libs/gstreamer/readme.txt b/ground/gcs/src/libs/gstreamer/readme.txt
@@ -3,9 +3,7 @@
 ###############################################################################
 
 Add the following line to your build config file:
-    GCS_EXTRA_CONF += gstreamer
- or run this command
-    make config_append GCS_EXTRA_CONF+=gstreamer
+    make config_append GCS_WITH_GSTREAMER=1
 
 The build config file is at the root of your source directory.