From c77552d6fc9db8356116cf23a7e0cadf44a7fd92 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 11 Nov 2019 17:58:11 +0100
Subject: Travis: Add ARM64 build

---
 .travis.yml | 96 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 52 insertions(+), 44 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 966fd32..55516ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,53 +1,61 @@
 language: c++
-sudo: required
-dist: xenial
 
-addons: &addons
-  apt:
-    sources: &sources
-      - ubuntu-toolchain-r-test
-    packages: &packages
-      - libzmq3-dev
-      - libzmq5
-      - automake
-      - libtool
-      - libboost1.58-all-dev
-      - vlc-nox
-      - libvlc-dev
-      - libasound2
-      - libasound2-dev
-      - libjack-jackd2-dev
-      - jackd2
-      - libmagickwand-dev
-      - g++-9
+matrix:
+  include:
+    - env: CONF=""
+      os: linux
+      arch: amd64
+      dist: bionic
+      compiler: gcc
+      addons: &linuxaddons
+        apt:
+          sources: &sources
+            - ubuntu-toolchain-r-test
+          packages: &packages
+            - libzmq3-dev
+            - libzmq5
+            - automake
+            - libtool
+            - vlc-data
+            - libvlc-dev
+            - libasound2
+            - libasound2-dev
+            - libjack-jackd2-dev
+            - jackd2
+            - libmagickwand-dev
+            - g++-9
 
-compiler:
-  - gcc
+    - env: CONF="--enable-alsa"
+      os: linux
+      arch: amd64
+      dist: bionic
+      compiler: gcc
+      addons: *linuxaddons
+
+    - env: CONF="--enable-jack"
+      os: linux
+      arch: amd64
+      dist: bionic
+      compiler: gcc
+      addons: *linuxaddons
+
+    - env: CONF="--enable-vlc"
+      os: linux
+      arch: amd64
+      dist: bionic
+      compiler: gcc
+      addons: *linuxaddons
+
+    - env: CONF="--enable-alsa --enable-jack --enable-vlc"
+      os: linux
+      arch: arm64
+      dist: bionic
+      compiler: gcc
+      addons: *linuxaddons
 
 script:
   - |
-    pushd /tmp
-    git clone https://github.com/Opendigitalradio/fdk-aac.git
-    cd fdk-aac
     ./bootstrap
-    CC=gcc-9 CXX=g++-9 ./configure
-    make
-    sudo make install
-    popd
-  - |
-    ./bootstrap
-    CC=gcc-9 CXX=g++-9 ./configure
-    make
-  - |
-    CC=gcc-9 CXX=g++-9 ./configure --enable-vlc
-    make
-  - |
-    CC=gcc-9 CXX=g++-9 ./configure --enable-alsa
-    make
-  - |
-    CC=gcc-9 CXX=g++-9 ./configure --enable-jack
-    make
-  - |
-    CC=gcc-9 CXX=g++-9 ./configure --enable-alsa --enable-jack --enable-vlc
+    CC=gcc-9 CXX=g++-9 ./configure $CONF
     make
 
-- 
cgit v1.2.3


From 75e920ab67205e89eac2a2b22bcf9a7423a16388 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 11 Nov 2019 18:01:48 +0100
Subject: Travis: Add missing amd64 build and require sudo

---
 .travis.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 55516ab..de7a99d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ matrix:
       os: linux
       arch: amd64
       dist: bionic
+      sudo: required
       compiler: gcc
       addons: &linuxaddons
         apt:
@@ -29,6 +30,7 @@ matrix:
       os: linux
       arch: amd64
       dist: bionic
+      sudo: required
       compiler: gcc
       addons: *linuxaddons
 
@@ -36,6 +38,7 @@ matrix:
       os: linux
       arch: amd64
       dist: bionic
+      sudo: required
       compiler: gcc
       addons: *linuxaddons
 
@@ -43,6 +46,15 @@ matrix:
       os: linux
       arch: amd64
       dist: bionic
+      sudo: required
+      compiler: gcc
+      addons: *linuxaddons
+
+    - env: CONF="--enable-alsa --enable-jack --enable-vlc"
+      os: linux
+      arch: amd64
+      dist: bionic
+      sudo: required
       compiler: gcc
       addons: *linuxaddons
 
@@ -50,6 +62,7 @@ matrix:
       os: linux
       arch: arm64
       dist: bionic
+      sudo: required
       compiler: gcc
       addons: *linuxaddons
 
-- 
cgit v1.2.3


From 72bf4150a32dbc778d2d0844ccc16bcbf2f7cc4f Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 11 Nov 2019 18:17:03 +0100
Subject: Travis: try to get toolchain PPA to work

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index de7a99d..9f016f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
       addons: &linuxaddons
         apt:
           sources: &sources
-            - ubuntu-toolchain-r-test
+            - sourceline: 'ppa:ubuntu-toolchain-r-test'
           packages: &packages
             - libzmq3-dev
             - libzmq5
@@ -19,6 +19,7 @@ matrix:
             - libtool
             - vlc-data
             - libvlc-dev
+            - vlc-plugin-base
             - libasound2
             - libasound2-dev
             - libjack-jackd2-dev
-- 
cgit v1.2.3


From a8a4726c1a9ed7dbc7d17b01f92eb12b0405ad7b Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Mon, 11 Nov 2019 18:22:26 +0100
Subject: Travis: Fix typo in ubuntu-toolchain-r PPA

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 9f016f8..7ad56bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ matrix:
       addons: &linuxaddons
         apt:
           sources: &sources
-            - sourceline: 'ppa:ubuntu-toolchain-r-test'
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
           packages: &packages
             - libzmq3-dev
             - libzmq5
-- 
cgit v1.2.3