Skip to content

Commit ddbabc4

Browse files
committed
LP-109 use standard way to enable gstreamer support
1 parent dffc4de commit ddbabc4

3 files changed

Lines changed: 19 additions & 4 deletions

File tree

Makefile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,22 @@ ifeq ($(UNAME), Linux)
131131
GCS_WITH_OSG := 1
132132
GCS_WITH_OSGEARTH := 1
133133
GCS_COPY_OSG := 0
134+
GCS_WITH_GSTREAMER := 0
135+
GCS_COPY_GSTREAMER := 0
134136
else ifeq ($(UNAME), Darwin)
135137
UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
136138
GCS_WITH_OSG := 1
137139
GCS_WITH_OSGEARTH := 0
138140
GCS_COPY_OSG := 1
141+
GCS_WITH_GSTREAMER := 0
142+
GCS_COPY_GSTREAMER := 0
139143
else ifeq ($(UNAME), Windows)
140144
UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator.exe
141145
GCS_WITH_OSG := 1
142146
GCS_WITH_OSGEARTH := 1
143147
GCS_COPY_OSG := 1
148+
GCS_WITH_GSTREAMER := 1
149+
GCS_COPY_GSTREAMER := 1
144150
endif
145151

146152
export UAVOBJGENERATOR
@@ -159,6 +165,13 @@ ifeq ($(GCS_WITH_OSG), 1)
159165
endif
160166
endif
161167

168+
ifeq ($(GCS_WITH_GSTREAMER), 1)
169+
GCS_EXTRA_CONF += gstreamer
170+
ifeq ($(GCS_COPY_GSTREAMER), 1)
171+
GCS_EXTRA_CONF += copy_gstreamer
172+
endif
173+
endif
174+
162175
##############################
163176
#
164177
# All targets
@@ -590,6 +603,10 @@ config_help:
590603
@$(ECHO) " (Needed unless using system versions)"
591604
@$(ECHO) " Options: 0 or 1"
592605
@$(ECHO)
606+
@$(ECHO) " GCS_WITH_GSTREAMER=$(GCS_WITH_GSTREAMER)"
607+
@$(ECHO) " Build the GCS with GStreamer support, this enables the video gadget and extra PFD video views"
608+
@$(ECHO) " Options: 0 or 1"
609+
@$(ECHO)
593610
@$(ECHO) " CCACHE=$(CCACHE)"
594611
@$(ECHO) " A prefix to compiler invocations, usually 'ccache' or 'path/to/ccache'"
595612
@$(ECHO)

ground/gcs/src/libs/gstreamer/gstreamer.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ SOURCES += \
2626
pipeline.cpp \
2727
videowidget.cpp
2828

29-
equals(copydata, 1):include(copydata.pro)
29+
copy_gstreamer:include(copydata.pro)

ground/gcs/src/libs/gstreamer/readme.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
###############################################################################
44

55
Add the following line to your build config file:
6-
GCS_EXTRA_CONF += gstreamer
7-
or run this command
8-
make config_append GCS_EXTRA_CONF+=gstreamer
6+
make config_append GCS_WITH_GSTREAMER=1
97

108
The build config file is at the root of your source directory.
119

0 commit comments

Comments
 (0)