@@ -45,7 +45,7 @@ if [ -n "$IS_OSX" ]; then
45
45
source travis_osx_brew_cache.sh
46
46
47
47
BREW_SLOW_BUILIDING_PACKAGES=$( printf ' %s\n' \
48
- " ffmpeg_opencv 18 " \
48
+ " ffmpeg_opencv 2 " \
49
49
)
50
50
51
51
function generate_ffmpeg_formula {
@@ -112,7 +112,7 @@ function pre_build {
112
112
pkg=libass; brew list $pkg > /dev/null && brew rm $pkg
113
113
114
114
brew update
115
- generate_ffmpeg_formula
115
+ # generate_ffmpeg_formula
116
116
brew_add_local_bottles
117
117
ELAPSED_TIME=$(( $(date +% s) - $TRAVIS_TIMER_START_TIME / 10 ** 9 ))
118
118
echo " Elapsed time: " $(( $ELAPSED_TIME / 60 )) " m (${ELAPSED_TIME} s)"
@@ -121,21 +121,15 @@ function pre_build {
121
121
echo ' Installing FFmpeg'
122
122
123
123
if [ -n " $CACHE_STAGE " ]; then
124
- brew_install_and_cache_within_time_limit ffmpeg_opencv || { [ $? -gt 1 ] && return 2 || return 0; }
124
+ brew_install_and_cache_within_time_limit ffmpeg || { [ $? -gt 1 ] && return 2 || return 0; }
125
125
else
126
126
brew unlink python@2
127
- brew install ffmpeg_opencv
128
- ELAPSED_TIME= $(( $(date +% s) - $TRAVIS_TIMER_START_TIME / 10 ** 9 ))
129
- echo " Elapsed time: " $(( $ELAPSED_TIME / 60 )) " m ( ${ELAPSED_TIME} s) "
127
+ set +e
128
+ brew install ffmpeg
129
+ set -e
130
130
fi
131
131
132
- echo ' Installing qt5'
133
-
134
- if [ -n " $CACHE_STAGE " ]; then
135
- echo " Qt5 has bottle, no caching needed"
136
- else
137
-
138
- brew pin qt
132
+ if [ -z " $CACHE_STAGE " ]; then
139
133
export PATH=" /usr/local/opt/qt/bin:$PATH "
140
134
ELAPSED_TIME=$(( $(date +% s) - $TRAVIS_TIMER_START_TIME / 10 ** 9 ))
141
135
echo " Elapsed time: " $(( $ELAPSED_TIME / 60 )) " m (${ELAPSED_TIME} s)"
0 commit comments