From 1123adec5dec459880d02a3e5cb94e752febc011 Mon Sep 17 00:00:00 2001
From: Scott Lamb <slamb@slamb.org>
Date: Sat, 29 Dec 2018 12:21:57 -0600
Subject: [PATCH] try upgrading travis-ci setup to xenial

This no longer requires installing ffmpeg manually, so there should be
significantly less data to cache (faster runs). The build step itself
should also be faster when the cache is unavailable/stale.

Also sneak in a change from "pkg-config" to "pkgconf" package in the
scripts and travis CI. They didn't match the manual instructions; make
them all consistent. They both seem to work fine, but I gather pkgconf
is the newer thing. Its roadmap is here and notes that distros are
moving toward it.

https://github.com/pkgconf/pkgconf/wiki/Roadmap
---
 .travis.yml             | 19 +++++--------------
 ci/install-ffmpeg.sh    | 13 -------------
 scripts/setup-ubuntu.sh | 13 ++++++++-----
 3 files changed, 13 insertions(+), 32 deletions(-)
 delete mode 100755 ci/install-ffmpeg.sh

diff --git a/.travis.yml b/.travis.yml
index d262951..c917d4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,36 +1,29 @@
-dist: trusty
-sudo: required
+dist: xenial
 addons:
   apt:
     packages:
       - build-essential
+      - libavcodec-dev
+      - libavformat-dev
+      - libavutil-dev
       - libncurses5-dev
       - libncursesw5-dev
       - libsqlite3-dev
       - libssl-dev
-      - pkg-config
+      - pkgconf
       - yasm
 matrix:
   include:
     - language: rust
       rust: stable
-      env: FFMPEG_VERSION=3.4.4
-      install:
-        - ci/install-ffmpeg.sh
       script:
         - ci/script-rust.sh
     - language: rust
       rust: nightly
-      env: FFMPEG_VERSION=3.4.4
-      install:
-        - ci/install-ffmpeg.sh
       script:
         - ci/script-rust.sh
     - language: rust
       rust: 1.31.0
-      env: FFMPEG_VERSION=3.4.4
-      install:
-        - ci/install-ffmpeg.sh
       script:
         - ci/script-rust.sh
     - language: node_js
@@ -50,6 +43,4 @@ matrix:
 cache:
   cargo: true
   yarn: true
-  directories:
-    - ffmpeg-3.4.4
   timeout: 600
diff --git a/ci/install-ffmpeg.sh b/ci/install-ffmpeg.sh
deleted file mode 100755
index 591438a..0000000
--- a/ci/install-ffmpeg.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash -e
-if [ ! -f ffmpeg-${FFMPEG_VERSION}/configure ]; then
-  wget https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.xz
-  tar xf ffmpeg-${FFMPEG_VERSION}.tar.xz
-fi
-cd ffmpeg-${FFMPEG_VERSION}
-./configure --enable-shared
-make --jobs=2
-sudo make install --jobs=2
-sudo ldconfig
-
-# The build log varies with each invocation; remove it to improve cachability.
-rm -f ffbuild/config.log
diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index 158f9f6..6f05fe8 100755
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -58,10 +58,13 @@ sudo_warn
 # Setup all apt packages we need
 #
 echo_info -x 'Preparing and downloading packages we need...'
-PKGS="build-essential pkg-config sqlite3 tzdata"
-#PKGS="$PKGS libavcodec-dev libavformat-dev libavutil-dev"
-PKGS="$PKGS libncurses5-dev libncursesw5-dev"
-PKGS="$PKGS libsqlite3-dev libssl-dev"
+PKGS="build-essential \
+      libncurses5-dev \
+      libncursesw5-dev \
+      libsqlite3-dev \
+      libssl-dev \
+      pkgconf \
+      tzdata"
 
 # Add yarn before NodeSource so it can all go in one update
 #
@@ -93,7 +96,7 @@ fi
 #
 if [ ${DO_UPDATE:-1} ]; then sudo apt-get update -y; fi
 
-# Install necessary pakackes
+# Install necessary packages
 #
 sudo apt-get install -y $PKGS
 sudo apt-get autoremove -y