Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

Commit

Permalink
ffmpeg: use linked_keg when checking optional deps
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
nibbles 2bits authored and Sharpie committed May 3, 2012
1 parent b48bb58 commit 9e24c7a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Library/Formula/ffmpeg.rb
Expand Up @@ -48,7 +48,7 @@ def install
"--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?
Expand Down

0 comments on commit 9e24c7a

Please sign in to comment.