travis: Prefer apt-get in install field than addons-apt-sources

.travis.yml

@@ -6,8 +6,7 @@ matrix:
     # OS X Mavericks
     - name: (macOS) General Test
       os: osx
-      install:
-        - export CC=clang
+      compiler: clang
       script:
         - make -C tests test-lz4 MOREFLAGS='-Werror -Wconversion -Wno-sign-conversion'
         - CFLAGS=-m32 make -C tests clean test-lz4-contentSize
@@ -50,19 +49,14 @@ matrix:
     # presume clang >= v3.9.0
     - name: (Trusty) USan test
       dist: trusty
-      addons:
-        apt:
-          packages:
-            - clang
+      compiler: clang
       script:
         - make usan MOREFLAGS=-Wcomma -Werror
 
     - name: (Trusty) valgrind test
       dist: trusty
-      addons:
-        apt:
-          packages:
-            - valgrind
+      install:
+        - sudo apt-get install -qq valgrind
       script:
         - make c_standards
         - make -C tests test-lz4 test-mem
@@ -74,24 +68,16 @@ matrix:
 
     - name: (Trusty) i386 benchmark + version test
       dist: trusty
-      addons:
-        apt:
-          packages:
-            - python3
-            - libc6-dev-i386
-            - gcc-multilib
+      install:
+        - sudo apt-get install -qq python3 libc6-dev-i386 gcc-multilib
       script:
         - make -C tests test-lz4c32 test-fullbench32 versionsTest
 
     - name: (Trusty) i386 frame + fuzzer test
       dist: trusty
-      addons:
-        apt:
-          packages:
-            - libc6-dev-i386
-            - gcc-multilib
       install:
-        - sudo sysctl -w vm.mmap_min_addr="4096"
+        - sudo apt-get install -qq libc6-dev-i386 gcc-multilib
+        - sudo sysctl -w vm.mmap_min_addr=4096
       script:
         - make -C tests test-frametest32 test-fuzzer32
 
@@ -103,23 +89,22 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - gcc-6
-      install:
-        - export CC=gcc-6
+      env:
+        - CC=gcc-6
       script:
         - make c_standards
         - make -C tests test-lz4 MOREFLAGS=-Werror
 
     - name: (Trusty) arm + aarch64 compilation
       dist: trusty
-      addons:
-        apt:
-          packages:
-            - qemu-system-arm
-            - qemu-user-static
-            - gcc-arm-linux-gnueabi
-            - libc6-dev-armel-cross
-            - gcc-aarch64-linux-gnu
-            - libc6-dev-arm64-cross
+      install:
+        - sudo apt-get install -qq
+            qemu-system-arm
+            qemu-user-static
+            gcc-arm-linux-gnueabi
+            libc6-dev-armel-cross
+            gcc-aarch64-linux-gnu
+            libc6-dev-arm64-cross
       script:
         - make platformTest CC=arm-linux-gnueabi-gcc QEMU_SYS=qemu-arm-static
         - make platformTest CC=aarch64-linux-gnu-gcc QEMU_SYS=qemu-aarch64-static
@@ -127,7 +112,7 @@ matrix:
     - name: (Xenial) gcc-5 compilation
       dist: xenial
       install:
-        - export CC=gcc-5
+        - sudo apt-get install -qq libc6-dev-i386 gcc-multilib
       script:
         - make -C tests test-lz4 clean test-lz4c32 MOREFLAGS=-Werror
 
@@ -145,23 +130,17 @@ matrix:
 
     - name: (Trusty) PowerPC + PPC64 compilation
       dist: trusty
-      addons:
-        apt:
-          packages:
-            - qemu-system-ppc
-            - qemu-user-static
-            - gcc-powerpc-linux-gnu
+      install:
+        - sudo apt-get install -qq qemu-system-ppc qemu-user-static gcc-powerpc-linux-gnu
       script:
         - make platformTest CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc-static
         - make platformTest CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc64-static MOREFLAGS=-m64
 
     - name: (Trusty) scan-build + cppcheck
       dist: trusty
-      addons:
-        apt:
-          packages:
-            - clang
-            - cppcheck
+      compiler: clang
+      install:
+        - sudo apt-get install -qq cppcheck
       script:
         - make staticAnalyze
         - make cppcheck
@@ -202,7 +181,7 @@ matrix:
             && python3 ~/get-pip.py --user
             && pip3 install --user meson
       script:
-        - meson
+        - meson setup
             --buildtype=debug
             -Db_lundef=false
             -Dauto_features=enabled