Browse Source

travis-ci install gstreamer for linux (#3540)

* travis-ci install gstreamer

* update linux gstreamer dependencies

* fixes #2540

* travis-ci doxygen to trusty
QGC4.4
Daniel Agar 9 years ago committed by GitHub
parent
commit
815b465d5b
  1. 6
      .travis.yml
  2. 3
      src/VideoStreaming/README.md
  3. 3
      src/VideoStreaming/VideoStreaming.pri

6
.travis.yml

@ -37,7 +37,8 @@ matrix: @@ -37,7 +37,8 @@ matrix:
sudo: false
- os: linux
env: CONFIG=doxygen
sudo: false
sudo: required
dist: trusty
android:
components:
@ -61,6 +62,9 @@ addons: @@ -61,6 +62,9 @@ addons:
- graphviz
- libc6-i386
- libespeak-dev
- libgstreamer-plugins-base1.0-dev
- libgstreamer1.0-0:amd64
- libgstreamer1.0-dev
- libopenscenegraph-dev
- libsdl1.2-dev
- libudev-dev

3
src/VideoStreaming/README.md

@ -31,8 +31,7 @@ gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, media=(string)video, cl @@ -31,8 +31,7 @@ gst-launch-1.0 udpsrc port=5600 caps='application/x-rtp, media=(string)video, cl
Use apt-get to install GStreamer 1.0
```
sudo apt-get install gstreamer1.0*
sudo apt-get install libgstreamer1.0*
sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-0:amd64 libgstreamer1.0-dev
```
The build system is setup to use pkgconfig and it will find the necessary headers and libraries automatically.

3
src/VideoStreaming/VideoStreaming.pri

@ -184,8 +184,7 @@ VideoEnabled { @@ -184,8 +184,7 @@ VideoEnabled {
}
LinuxBuild {
message(" You can install it using apt-get")
message(" sudo apt-get install gstreamer1.0*")
message(" sudo apt-get install libgstreamer1.0*")
message(" sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-0:amd64 libgstreamer1.0-dev")
}
WindowsBuild {
message(" You can download it from http://gstreamer.freedesktop.org/data/pkg/windows/")

Loading…
Cancel
Save