rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-26 15:54:15 +01:00
Code Issues Releases Activity

LP-109 use standard way to enable gstreamer support

Browse Source
This commit is contained in:
Philippe Renon 2017-08-29 21:24:06 +02:00
parent dffc4de6db
commit ddbabc4bf0
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -131,16 +131,22 @@ ifeq ($(UNAME), Linux)
GCS_WITH_OSG := 1 GCS_WITH_OSG := 1
GCS_WITH_OSGEARTH := 1 GCS_WITH_OSGEARTH := 1
GCS_COPY_OSG := 0 GCS_COPY_OSG := 0
GCS_WITH_GSTREAMER := 0
GCS_COPY_GSTREAMER := 0
else ifeq ($(UNAME), Darwin) else ifeq ($(UNAME), Darwin)
UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
GCS_WITH_OSG := 1 GCS_WITH_OSG := 1
GCS_WITH_OSGEARTH := 0 GCS_WITH_OSGEARTH := 0
GCS_COPY_OSG := 1 GCS_COPY_OSG := 1
GCS_WITH_GSTREAMER := 0
GCS_COPY_GSTREAMER := 0
else ifeq ($(UNAME), Windows) else ifeq ($(UNAME), Windows)
UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator.exe UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator.exe
GCS_WITH_OSG := 1 GCS_WITH_OSG := 1
GCS_WITH_OSGEARTH := 1 GCS_WITH_OSGEARTH := 1
GCS_COPY_OSG := 1 GCS_COPY_OSG := 1
GCS_WITH_GSTREAMER := 1
GCS_COPY_GSTREAMER := 1
endif endif
export UAVOBJGENERATOR export UAVOBJGENERATOR
@ -159,6 +165,13 @@ ifeq ($(GCS_WITH_OSG), 1)
endif endif
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 # All targets
@ -590,6 +603,10 @@ config_help:
@$(ECHO) " (Needed unless using system versions)" @$(ECHO) " (Needed unless using system versions)"
@$(ECHO) " Options: 0 or 1" @$(ECHO) " Options: 0 or 1"
@$(ECHO) @$(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) " CCACHE=$(CCACHE)"
@$(ECHO) " A prefix to compiler invocations, usually 'ccache' or 'path/to/ccache'" @$(ECHO) " A prefix to compiler invocations, usually 'ccache' or 'path/to/ccache'"
@$(ECHO) @$(ECHO)

2
ground/gcs/src/libs/gstreamer/gstreamer.pro
View File

@ -26,4 +26,4 @@ SOURCES += \
pipeline.cpp \ pipeline.cpp \
videowidget.cpp videowidget.cpp
equals(copydata, 1):include(copydata.pro) copy_gstreamer:include(copydata.pro)

4
ground/gcs/src/libs/gstreamer/readme.txt
View File

@ -3,9 +3,7 @@
############################################################################### ###############################################################################
Add the following line to your build config file: Add the following line to your build config file:
GCS_EXTRA_CONF += gstreamer make config_append GCS_WITH_GSTREAMER=1
or run this command
make config_append GCS_EXTRA_CONF+=gstreamer
The build config file is at the root of your source directory. The build config file is at the root of your source directory.