diff options
| author | nibbles 2bits | 2012-05-02 16:42:59 -0700 |
|---|---|---|
| committer | Charlie Sharpsteen | 2012-05-03 11:23:28 -0700 |
| commit | 9e24c7a9d491b690861ae213cdd93d80b022004a (patch) | |
| tree | 8d0cdc506c3d1229a5c3b5d794503b67ab4ccfce | |
| parent | b48bb58df7ba6dbe35a1d6d6c1d165ed957e97dc (diff) | |
| download | homebrew-9e24c7a9d491b690861ae213cdd93d80b022004a.tar.bz2 | |
ffmpeg: use linked_keg when checking optional deps
ffmpeg when built as head checks if x264 is installed using
`Formula.factory.installed?` that won't find x264 stable as it looks for a HEAD
build. Switch from `.installed?` to `linked_keg.exist?` for all dependencies
as this will find them whether they are installed as head or stable.
Fixes #11996.
Closes #12020.
Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
| -rw-r--r-- | Library/Formula/ffmpeg.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb index 1cdb2f591..346c152e0 100644 --- a/Library/Formula/ffmpeg.rb +++ b/Library/Formula/ffmpeg.rb @@ -48,7 +48,7 @@ class Ffmpeg < Formula "--enable-libfreetype", "--cc=#{ENV.cc}"] - args << "--enable-libx264" if Formula.factory('x264').installed? + args << "--enable-libx264" if Formula.factory('x264').linked_keg.exist? args << "--enable-libfaac" if Formula.factory('faac').installed? args << "--enable-libmp3lame" if Formula.factory('lame').installed? args << "--enable-librtmp" if Formula.factory('rtmpdump').installed? |