diff --git a/.appveyor.yml b/.appveyor.yml index 58c14c04c..5e29d6440 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -87,7 +87,7 @@ for: libqt5charts5-dev libqt5texttospeech5-dev libfaad-dev zlib1g-dev \ libusb-1.0-0-dev libhidapi-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \ libxml2-dev bison flex ffmpeg libpostproc-dev libavcodec-dev libavformat-dev \ - libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \ + libopus-dev libairspy-dev libhackrf-dev \ libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev \ python3-mako python3-cheetah python3-numpy \ autoconf automake libtool ninja-build libclang1-11 diff --git a/.travis.yml b/.travis.yml index 2b1625359..c98e0ebf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,8 +70,6 @@ install: # macOS 10.11 doesn't support newest Qt - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OSX_IMAGE" == "xcode7.3" ]]; then sudo port -N -k install qt59-qtmultimedia qt59-qttools; else sudo port -N -k install qt5-qtmultimedia qt5-qttools; fi; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source macports-ci ccache --save; fi - # use codec2 from repository - #- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_codec2.sh; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_cm256cc.sh; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_mbelib.sh; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_serialdv.sh; fi diff --git a/cmake/ci/build_codec2.sh b/cmake/ci/build_codec2.sh deleted file mode 100644 index dc5b6e364..000000000 --- a/cmake/ci/build_codec2.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -sudo apt-get -y install libsamplerate0-dev libspeex-dev libspeexdsp-dev - -cd $HOME -mkdir -p external && cd external -mkdir -p drowe67 && cd drowe67 - -git clone https://github.com/drowe67/codec2.git - -cd codec2 -git reset --hard "v1.0.3" -mkdir -p build && cd build -cmake .. -sudo make install -sudo ldconfig