From f175834e45a1a190171dff4597165b27d6b0157b Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Sun, 1 Jul 2018 10:07:39 -0400
Subject: [PATCH] Update travis

---
 .travis.yml    | 17 ++++++-----------
 travis_deps.sh | 26 --------------------------
 2 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100755 travis_deps.sh

diff --git a/.travis.yml b/.travis.yml
index df48152..d81eecc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,22 @@
 language: cpp
 
+dist: trusty
 sudo: false
 
-cache:
-  directories:
-    - $HOME/itpp
-
 compiler:
   - gcc
 
 addons:
   apt:
+    sources:
+      - sourceline: 'ppa:szechyjs/dsd'
     packages:
+      - libmbe-dev
       - libsndfile1-dev
-      - libfftw3-dev
-      - liblapack3gf
-      - libblas3gf
-
-install:
-  - bash travis_deps.sh
+      - libitpp-dev
+      - portaudio19-dev
 
 before_script:
-  - export CMAKE_PREFIX_PATH=$HOME/mbelib:$HOME/itpp
   - mkdir build
   - cd build
   - cmake ..
diff --git a/travis_deps.sh b/travis_deps.sh
deleted file mode 100755
index 571abb2..0000000
--- a/travis_deps.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-set -ex
-
-# Install mbelib
-wget https://github.com/szechyjs/mbelib/archive/master.tar.gz -O mbelib.tar.gz
-tar -xzf mbelib.tar.gz
-cd mbelib-master
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=$HOME/mbelib ..
-make
-make install
-
-# Install IT++ from SF
-if [ ! -d "$HOME/itpp/lib" ]; then
-  wget http://sourceforge.net/projects/itpp/files/itpp/4.3.1/itpp-4.3.1.tar.gz/download -O itpp-4.3.1.tar.gz
-  tar -xzf itpp-4.3.1.tar.gz
-  cd itpp-4.3.1
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=$HOME/itpp ..
-  make
-  make install
-else
-  echo 'Using cached itpp.';
-fi