Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git

1 files changed, 35 insertions, 34 deletions

diff --git a/.travis.yml b/.travis.yml
index 79311b9586..49b9ea0daa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,13 +11,13 @@ 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"
+    # TODO: Set -DDEBUG_ASSERTIONS_FATAL=OFF before deploying CI builds as releases!!!
+    - CMAKEFLAGS="-DCMAKE_BUILD_TYPE=Release -DBATTERY=ON -DBROADCAST=ON -DBULK=ON -DDEBUG_ASSERTIONS_FATAL=ON -DHID=ON -DLILV=ON -DOPUS=ON -DQTKEYCHAIN=ON -DVINYLCONTROL=ON"
     - GTEST_COLOR=1
     - CTEST_OUTPUT_ON_FAILURE=1
 
@@ -59,9 +59,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 +73,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: Replace "-DFAAD=ON" with "-DFFMPEG=ON"
+      env: CMAKEFLAGS_EXTRA="-DFAAD=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON -DWARNINGS_FATAL=ON"
       before_install:
         - export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)"
         - export CTEST_PARALLEL_LEVEL="$(nproc)"
@@ -100,6 +102,29 @@ jobs:
         directories:
           - $HOME/Library/Caches/Homebrew
           - /usr/local/Homebrew
+      addons:
+        homebrew:
+          update: true
+          packages:
+            - chromaprint
+            - flac
+            - lame
+            - libsndfile
+            - libogg
+            - libvorbis
+            - libshout
+            - libid3tag
+            - libmad
+            - lilv
+            - opusfile
+            - portaudio
+            - portmidi
+            - protobuf
+            - qt5
+            - qtkeychain
+            - rubberband
+            - sound-touch
+            - taglib
       # Workaround for bug in libopus's opus.h including <opus_multistream.h>
       # instead of <opus/opus_multistream.h>.
       # Virtual X (Xvfb) is needed for analyzer waveform tests
@@ -115,7 +140,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 +173,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 -DHSS1394=ON"
         PATH="/usr/local/opt/ccache/bin:$PATH"
         DISPLAY=:99.0
         CMAKE_BUILD_PARALLEL_LEVEL=4
@@ -191,6 +216,7 @@ services:
   # Virtual X is needed for analyzer waveform tests
   - xvfb
 
+# Common Addons
 addons:
   apt:
     sources:
@@ -198,6 +224,7 @@ addons:
     packages:
       - libavformat-dev
       - libchromaprint-dev
+      - libebur128-dev
       - libfaad-dev
       - libflac-dev
       - libid3tag0-dev
@@ -229,32 +256,6 @@ addons:
       - qtdeclarative5-dev
       - qtscript5-dev
       - qt5keychain-dev
-  homebrew:
-    update: true
-    packages:
-      - chromaprint
-      - faad2
-      - ffmpeg
-      - flac
-      - lame
-      - libsndfile
-      - libogg
-      - libvorbis
-      - libshout
-      - libmodplug
-      - libid3tag
-      - libmad
-      - lilv
-      - mp4v2
-      - opusfile
-      - portaudio
-      - portmidi
-      - protobuf
-      - qt5
-      - rubberband
-      - sound-touch
-      - taglib
-      - wavpack
 
 
 notifications: