Travis: Explicitly specify all build options

1 files changed, 11 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 2529b3af50..501dd940d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,13 +11,12 @@ language: cpp
 # Build flags common to OS X and Linux.
 # Parallel builds are important for avoiding OSX build timeouts.
 # We turn off verbose output to avoid going over the 4MB output limit.
-# TODO(2019-07-21): Add "ffmpeg=1" if FFmpeg 4.x becomes available in Ubuntu
 env:
   global:
     # For SCons builds
-    - SCONSFLAGS="test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0"
+    - SCONSFLAGS="battery=1 bulk=1 debug_assertions_fatal=1 hid=1 hss1394=0 lilv=1 opus=1 qtkeychain=1 shoutcast=1 test=1 verbose=0 vinylcontrol=1 virtualize=0"
     # For CMake builds
-    - CMAKEFLAGS="-DOPUS=ON -DHSS1394=OFF"
+    - CMAKEFLAGS="-DBATTERY=ON -DBROADCAST=ON -DBULK=ON -DENABLE_TESTS=ON -DHID=ON -DLILV=ON -DOPUS=ON -DQTKEYCHAIN=ON -DVERBOSE=0 -DVINYLCONTROL=ON"
     - GTEST_COLOR=1
     - CTEST_OUTPUT_ON_FAILURE=1
 
@@ -59,9 +58,10 @@ jobs:
       compiler: gcc
       # Ubuntu Bionic build prerequisites
       before_install:
-        - sudo apt-get install -y scons
+        - sudo apt install -y scons
       install:
-        - scons -j "$(nproc)" localecompare=1
+        # TODO for Ubuntu Focal: faad=0 ffmpeg=1
+        - scons -j "$(nproc)" faad=1 ffmpeg=0 localecompare=1 mad=1 modplug=1 wv=1
       script:
         # NOTE(sblaisot): 2018-01-02 removing gdb wrapper on linux due to a bug in
         # return code in order to avoid having a successful build when a test fail.
@@ -72,7 +72,8 @@ jobs:
       compiler: gcc
       cache: ccache
       # Ubuntu Bionic build prerequisites
-      env: CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=ON -DFAAD=ON -DWAVPACK=ON -DMAD=ON -DMODPLUG=ON -DWARNINGS_FATAL=ON"
+      # TODO for Ubuntu Focal: "-DFAAD=OFF -DFFMPEG=ON"
+      env: CMAKEFLAGS_EXTRA="-DFAAD=ON -DFFMPEG=OFF -DHSS1394=OFF -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON -DWARNINGS_FATAL=ON"
       before_install:
         - export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)"
         - export CTEST_PARALLEL_LEVEL="$(nproc)"
@@ -115,7 +116,7 @@ jobs:
         # We are hardcoding 4 threads here since "$(sysctl -n hw.ncpu)" only
         # returns 2 and makes the travis job run into a timeout:
         # https://docs.travis-ci.com/user/reference/overview/#virtualization-environments
-        - scons -j4
+        - scons -j4 coreaudio=1
       script:
         # lldb doesn't provide an easy way to exit 1 on error:
         # https://bugs.llvm.org/show_bug.cgi?id=27326
@@ -148,7 +149,7 @@ jobs:
             - ccache
       env: >-
         MIXXX_ENVPATH="${HOME}/buildenv"
-        CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=OFF -DFAAD=OFF -DWAVPACK=OFF -DWAVPACK=OFF -DMAD=OFF -DMODPLUG=OFF"
+        CMAKEFLAGS_EXTRA="-DCOREAUDIO=ON -DFAAD=OFF -DFFMPEG=OFF -DHSS1394=ON -DLOCALECOMPARE=OFF -DMAD=OFF -DMODPLUG=OFF -DWAVPACK=OFF"
         PATH="/usr/local/opt/ccache/bin:$PATH"
         DISPLAY=:99.0
         CMAKE_BUILD_PARALLEL_LEVEL=4
@@ -191,6 +192,7 @@ services:
   # Virtual X is needed for analyzer waveform tests
   - xvfb
 
+# Common Addons
 addons:
   apt:
     sources:
@@ -250,6 +252,7 @@ addons:
       - portmidi
       - protobuf
       - qt5
+      - qtkeychain
       - rubberband
       - sound-touch
       - taglib