From 815b465d5bc3a3d971c5069a16427f649998e9d9 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 12 Jun 2016 23:17:31 -0400 Subject: [PATCH] travis-ci install gstreamer for linux (#3540) * travis-ci install gstreamer * update linux gstreamer dependencies * fixes #2540 * travis-ci doxygen to trusty --- .travis.yml | 6 +++++- src/VideoStreaming/README.md | 3 +-- src/VideoStreaming/VideoStreaming.pri | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index df8ad066e..b78bbae95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: - graphviz - libc6-i386 - libespeak-dev + - libgstreamer-plugins-base1.0-dev + - libgstreamer1.0-0:amd64 + - libgstreamer1.0-dev - libopenscenegraph-dev - libsdl1.2-dev - libudev-dev diff --git a/src/VideoStreaming/README.md b/src/VideoStreaming/README.md index 2c4d57cbd..d35ad7cfa 100644 --- a/src/VideoStreaming/README.md +++ b/src/VideoStreaming/README.md @@ -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. diff --git a/src/VideoStreaming/VideoStreaming.pri b/src/VideoStreaming/VideoStreaming.pri index 3858d1b4c..b13bc9dc0 100644 --- a/src/VideoStreaming/VideoStreaming.pri +++ b/src/VideoStreaming/VideoStreaming.pri @@ -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/") -- 2.22.0