From: Paul Brossier <piem@piem.org>
Date: Sat, 29 Jun 2019 11:35:40 +0000 (+0200)
Subject: Merge branch 'master' into feature/autosink
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=refs%2Fheads%2Ffeature%2Fautosink;p=aubio.git

Merge branch 'master' into feature/autosink
---

1ec59e4cfdfcbe36295620926a7095e71b7d8066
diff --cc .travis.yml
index c19fc2ce,788e2064..4f4208ad
--- a/.travis.yml
+++ b/.travis.yml
@@@ -38,15 -38,15 +38,15 @@@ matrix
      - language: C
        os: osx
        compiler: clang
-       env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-vorbis --disable-flac"
 -      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate"
++      env: WAFOPTS="--enable-fat --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac"
      - language: C
        os: osx
        compiler: clang
-       env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
 -      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate" AUBIO_NOTESTS=1
++      env: WAFOPTS="--with-target-platform=ios --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
      - language: C
        os: osx
        compiler: clang
-       env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
 -      env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate" AUBIO_NOTESTS=1
++      env: WAFOPTS="--with-target-platform=iosimulator --disable-avcodec --disable-sndfile --disable-samplerate --disable-vorbis --disable-flac" AUBIO_NOTESTS=1
  
  # use trusty
  dist: trusty
@@@ -74,10 -72,8 +74,10 @@@ addons
      - sox
      - ffmpeg
      - libsndfile
 +    - libvorbis
 +    - flac
      - lcov
-     #update: true
+     update: true
  
  before_install:
     - |