From 62a1bad8b95c551ca7525faab3798753ad13f9d8 Mon Sep 17 00:00:00 2001
From: Scott Lamb <slamb@slamb.org>
Date: Tue, 7 Aug 2018 15:23:32 -0500
Subject: [PATCH] third attempt at travis config

* upgrade minimum required Rust from 1.17 to 1.20; reffers 0.4.2
  apparently uses std::mem::ManuallyDrop, introduced in 1.20

* install ffmpeg from source (requiring sudo access) rather than using
  the ancient one from Ubuntu Trusty to meet the minimum version
  requirements specified in ffmpeg/build.rs.
---
 .travis.yml                 | 9 +++++----
 guide/install-manual.md     | 4 ++--
 scripts/script-functions.sh | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4b5e6e..b841a64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,26 @@
+dist: trusty
+sudo: required
 language: rust
 rust:
   - stable
   - nightly
-  - 1.17.0
+  - 1.20.0
 addons:
   apt:
     packages:
       - build-essential
-      - libavcodec-dev
-      - libavformat-dev
-      - libavutil-dev
       - libncurses5-dev
       - libncursesw5-dev
       - libsqlite3-dev
       - libssl-dev
       - pkg-config
+      - yasm
 matrix:
   allow_failures:
     - rust: nightly
 cache: cargo
 script:
+  - (git clone --depth 1 -b "release/3.4" https://github.com/FFmpeg/FFmpeg.git && cd FFmpeg && ./configure --enable-shared && make && sudo make install && sudo ldconfig)
   - cargo build --verbose --all
   - cargo test --verbose --all
   - 'if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo bench --verbose --all; fi'
diff --git a/guide/install-manual.md b/guide/install-manual.md
index f85803e..a92634d 100644
--- a/guide/install-manual.md
+++ b/guide/install-manual.md
@@ -49,8 +49,8 @@ all non-Rust dependencies:
                    libssl-dev \
                    pkgconf
 
-Next, you need Rust 1.17+ and Cargo. The easiest way to install them is by following
-the instructions at [rustup.rs](https://www.rustup.rs/).
+Next, you need Rust 1.20+ and Cargo. The easiest way to install them is by
+following the instructions at [rustup.rs](https://www.rustup.rs/).
 
 Finally, building the UI requires [yarn](https://yarnpkg.com/en/).
 
diff --git a/scripts/script-functions.sh b/scripts/script-functions.sh
index f5bde2e..cd49067 100755
--- a/scripts/script-functions.sh
+++ b/scripts/script-functions.sh
@@ -40,7 +40,7 @@ fi
 NODE_MIN_VERSION="8"
 YARN_MIN_VERSION="1.0"
 CARGO_MIN_VERSION="0.2"
-RUSTC_MIN_VERSION="1.17"
+RUSTC_MIN_VERSION="1.20"
 FFMPEG_MIN_VERSION="55.1.101"
 FFMPEG_RELEASE_VERSION="3.4"