.travis.yml: remove unused ARCH, add ffmpeg on osx

diff --git a/.travis.yml b/.travis.yml
index 2dca23c..c507fb2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,59 +5,44 @@ matrix:
     - python: 2.7
       os: linux
       compiler: gcc
-      env: ARCH=x86_64
-    - python: 2.7
-      os: linux
-      compiler: gcc
-      env: ARCH=i386
     - python: 3.4
       os: linux
       compiler: gcc
-      env: ARCH=x86_64
     - python: 3.4
       os: linux
       compiler: gcc
-      env: ARCH=i386 WAFOPTS=--enable-fftw3f
-    - language: C
-      os: osx
-      compiler: clang
-      env: ARCH=x86_64
-    - language: C
-      os: osx
-      compiler: clang
-      env: ARCH=i386
+      env: WAFOPTS=--enable-fftw3f
     - python: 2.7
       os: linux
       compiler: gcc
-      env: ARCH=x86_64 HAVE_AUBIO_DOUBLE=1 WAFOPTS=--enable-fftw3
+      env: HAVE_AUBIO_DOUBLE=1 WAFOPTS=--enable-fftw3
     - python: 2.7
       os: linux
       compiler: gcc
-      env: ARCH=i386 HAVE_AUBIO_DOUBLE=1
+      env: HAVE_AUBIO_DOUBLE=1
     - python: 3.4
       os: linux
       compiler: gcc
-      env: ARCH=x86_64 HAVE_AUBIO_DOUBLE=1
+      env: HAVE_AUBIO_DOUBLE=1
     - python: 3.4
       os: linux
       compiler: gcc
-      env: ARCH=i386 HAVE_AUBIO_DOUBLE=1
+      env: HAVE_AUBIO_DOUBLE=1
     - language: C
       os: osx
       compiler: clang
-      env: ARCH=x86_64 HAVE_DOUBLE=1
     - language: C
       os: osx
       compiler: clang
-      env: ARCH=i386 HAVE_DOUBLE=1
+      env: WAFOPTS=--disable-avcodec
     - language: C
       os: osx
       compiler: clang
-      env: ARCH=x86_64 WAFOPTS=--enable-fat
+      env: WAFOPTS="--enable-fat --disable-avcodec"
     - language: C
       os: osx
       compiler: clang
-      env: ARCH=i386 WAFOPTS=--enable-fat
+      env: WAFOPTS=--enable-fat --disable-avcodec" HAVE_DOUBLE=1
 
 addons:
   apt:
@@ -75,6 +60,7 @@ before_install:
      if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
        brew update
        brew install sox
+       brew install ffmpeg
        export PATH="$HOME/Library/Python/2.7/bin/:$PATH"
      fi;