Skip to content

Commit 46db5a5

Browse files
committed
disable libvidstab
1 parent dd9dc06 commit 46db5a5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

travis_config.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ if [ -n "$IS_OSX" ]; then
6464
if (!$found_blank && /^$/) {$_.="conflicts_with \"ffmpeg\"\n\n"; $found_blank=1; next;}
6565
if (!$bottle_block && /^\s*bottle do$/) { $bottle_block=1; next; }
6666
if ($bottle_block) { if (/^\s*end\s*$/) { $bottle_block=0} elsif (/^\s*sha256\s/) {$_=""} next; }
67-
if (/^\s*depends_on "(x264|x265|xvid|frei0r|rubberband)"$/) {$_=""; next;}
68-
if (/^\s*--enable-(gpl|libx264|libx265|libxvid|frei0r|librubberband)$/) {$_=""; next;}
67+
if (/^\s*depends_on "(x264|x265|xvid|frei0r|rubberband|vidstab)"$/) {$_=""; next;}
68+
if (/^\s*--enable-(gpl|libx264|libx265|libxvid|frei0r|librubberband|libvidstab)$/) {$_=""; next;}
6969
' <"$FF_FORMULA" >"$LFF_FORMULA"
7070
diff -u "$FF_FORMULA" "$LFF_FORMULA" || test $? -le 1
7171

@@ -86,7 +86,7 @@ function pre_build {
8686

8787
if [ -n "$IS_OSX" ]; then
8888
echo "Running for OSX"
89-
89+
9090
local CACHE_STAGE; (echo "$TRAVIS_BUILD_STAGE_NAME" | grep -qiF "final") || CACHE_STAGE=1
9191

9292
#after the cache stage, all bottles and Homebrew metadata should be already cached locally
@@ -117,10 +117,10 @@ function pre_build {
117117
brew_go_bootstrap_mode 0
118118
return 0
119119
fi
120-
120+
121121
# Have to install macpython late to avoid conflict with Homebrew Python update
122122
before_install
123-
123+
124124
else
125125
echo "Running for linux"
126126
fi

0 commit comments

Comments
 (0)