*FIXME* Skip building custom ffmpeg for now

GArik · GArik · commit c5ba285bb444 · 2021-01-14T23:34:23.000+03:00
Also don't install Qt which should be already installed
diff --git a/travis_config.sh b/travis_config.sh
@@ -45,7 +45,7 @@ if [ -n "$IS_OSX" ]; then
     source travis_osx_brew_cache.sh
 
     BREW_SLOW_BUILIDING_PACKAGES=$(printf '%s\n' \
-        "ffmpeg_opencv 18" \
+        "ffmpeg_opencv 2" \
     )
 
     function generate_ffmpeg_formula {
@@ -112,7 +112,7 @@ function pre_build {
         pkg=libass;  brew list $pkg > /dev/null && brew rm $pkg
 
         brew update
-        generate_ffmpeg_formula
+        #generate_ffmpeg_formula
         brew_add_local_bottles
         ELAPSED_TIME=$(($(date +%s) - $TRAVIS_TIMER_START_TIME/10**9))
         echo "Elapsed time: "$(($ELAPSED_TIME/60))"m (${ELAPSED_TIME}s)"
@@ -121,21 +121,15 @@ function pre_build {
     echo 'Installing FFmpeg'
 
     if [ -n "$CACHE_STAGE" ]; then
-        brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
+        brew_install_and_cache_within_time_limit ffmpeg || { [ $? -gt 1 ] && return 2 || return 0; }
     else
         brew unlink python@2
-        brew install ffmpeg_opencv
-        ELAPSED_TIME=$(($(date +%s) - $TRAVIS_TIMER_START_TIME/10**9))
-        echo "Elapsed time: "$(($ELAPSED_TIME/60))"m (${ELAPSED_TIME}s)"
+        set +e
+        brew install ffmpeg
+        set -e
     fi
 
-    echo 'Installing qt5'
-    
-    if [ -n "$CACHE_STAGE" ]; then
-        echo "Qt5 has bottle, no caching needed"
-    else
-        brew link qt@5.15.2
-        brew pin qt
+    if [ -z "$CACHE_STAGE" ]; then
         export PATH="/usr/local/opt/qt/bin:$PATH"
         ELAPSED_TIME=$(($(date +%s) - $TRAVIS_TIMER_START_TIME/10**9))
         echo "Elapsed time: "$(($ELAPSED_TIME/60))"m (${ELAPSED_TIME}s)"
