diff --git a/.travis.yml b/.travis.yml index 357464c..43f9a30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,24 +29,35 @@ matrix: - /usr/local/Cellar/openblas - /usr/local/Cellar/gcc - /usr/local/Cellar/ffmpeg - - /usr/local/Cellar/libsoxr - - /usr/local/Cellar/ilmbase - - /usr/local/Cellar/snappy - - /usr/local/Cellar/opencore-amr - - /usr/local/Cellar/speex - - /usr/local/Cellar/theora - - /usr/local/Cellar/rtmpdump - - /usr/local/Cellar/libogg - - /usr/local/Cellar/libvorbis - - /usr/local/Cellar/opus - - /usr/local/Cellar/jpeg - - /usr/local/Cellar/lame - /usr/local/Cellar/libpng - /usr/local/Cellar/libtiff + - /usr/local/Cellar/ilmbase - /usr/local/Cellar/openexr - - /usr/local/Cellar/openssl + - /usr/local/Cellar/jpeg + - /usr/local/Cellar/opencore-amr + - /usr/local/Cellar/snappy + - /usr/local/Cellar/lame + - /usr/local/Cellar/openjpeg + - /usr/local/Cellar/opus + - /usr/local/Cellar/speex + - /usr/local/Cellar/theora + - /usr/local/Cellar/libogg + - /usr/local/Cellar/libvorbis - /usr/local/Cellar/x264 - /usr/local/Cellar/x265 + - /usr/local/Cellar/libsoxr + - /usr/local/Cellar/libbluray + - /usr/local/Cellar/gnutls + - /usr/local/Cellar/rtmpdump + - /usr/local/Cellar/openssl + - /usr/local/Cellar/fontconfig + - /usr/local/Cellar/freetype + - /usr/local/Cellar/p11-kit + - /usr/local/Cellar/libunistring + - /usr/local/Cellar/libtasn1 + - /usr/local/Cellar/nettle + - /usr/local/Cellar/gmp + - /usr/local/Cellar/libffi - stage: deploy name: Cartage build, archive, deploy on tag env: diff --git a/Example/OpenCV-OSX-Tests/install-opencv.sh b/Example/OpenCV-OSX-Tests/install-opencv.sh index 1ae8ef6..336a29d 100755 --- a/Example/OpenCV-OSX-Tests/install-opencv.sh +++ b/Example/OpenCV-OSX-Tests/install-opencv.sh @@ -2,7 +2,7 @@ # install-opencv.sh -libraries="tbb openblas gcc ffmpeg libpng libtiff ilmbase openexr jpeg opencore-amr snappy lame opus speex theora libogg libvorbis x264 x265 rtmpdump openssl libsoxr openjpeg libbluray gnutls p11-kit libunistring libffi gmp nettle libtasn1" + libraries="tbb openblas gcc ffmpeg libpng libtiff ilmbase openexr jpeg opencore-amr snappy lame openjpeg opus speex theora libogg libvorbis x264 x265 libsoxr libbluray gnutls rtmpdump openssl fontconfig freetype p11-kit libunistring libtasn1 nettle gmp libffi" for package in opencv $libraries; do brew link $package || brew install --ignore-dependencies --force-bottle $package; done