From: Paul Brossier <piem@piem.org>
Date: Thu, 2 Jul 2020 17:03:56 +0000 (+0200)
Subject: Merge branch 'feature/timestretch'
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=05ed7f562616cee876d2e4cd397cdb88f600942f;p=aubio.git

Merge branch 'feature/timestretch'
---

05ed7f562616cee876d2e4cd397cdb88f600942f
diff --cc .circleci/config.yml
index 8df0d15b,6493e26b..6db2ef8c
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -2,7 -2,7 +2,7 @@@ apt-run: &apt-instal
    name: Install apt packages
    command: |
      sudo apt-get update
-     sudo apt-get -y install make sox pkg-config libavcodec-dev libavformat-dev libavresample-dev libavutil-dev libsndfile1-dev libsamplerate-dev libvorbis-dev libflac-dev
 -    sudo apt-get -y install make sox pkg-config libavcodec-dev libavformat-dev libavresample-dev libavutil-dev libsndfile1-dev libsamplerate-dev librubberband-dev
++    sudo apt-get -y install make sox pkg-config libavcodec-dev libavformat-dev libavresample-dev libavutil-dev libsndfile1-dev libsamplerate-dev librubberband-dev libvorbis-dev libflac-dev
  
  pip-install: &pip-install
    name: Install pip dependencies
diff --cc .travis.yml
index 73b097f0,971c0ee9..c27f2759
--- a/.travis.yml
+++ b/.travis.yml
@@@ -82,8 -81,8 +83,10 @@@ addons
      - sox
      - ffmpeg
      - libsndfile
 +    - libvorbis
 +    - flac
+     - libsamplerate
+     - rubberband
      - lcov
      update: true