diff options
| author | Jack Nagel | 2012-09-04 23:04:01 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-09-10 16:16:54 -0500 |
| commit | 6b8d25f2d21a3c19ecb0809d619999137cb94565 (patch) | |
| tree | 402f61e324fc981a56a2064bb0d4f5680ca135ed /Library/Formula/ffmpeg.rb | |
| parent | db74b9b4776aced4f4ac59076eebe10a98768f09 (diff) | |
| download | homebrew-6b8d25f2d21a3c19ecb0809d619999137cb94565.tar.bz2 | |
Clean up MacOS version method usage
The MacOS.version? family of methods (other than "leopard?") are poorly
defined and lead to confusing code. Replace them in formulae with more
explicit comparisons.
"MacOS.version" is a special version object that can be compared to
numerics, symbols, and strings using the standard Ruby comparison
methods.
The old methods were moved to compat when the version comparison code
was merged, and they must remain there "forever", but they should not be
used in new code.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula/ffmpeg.rb')
| -rw-r--r-- | Library/Formula/ffmpeg.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb index 9470c7975..90bb53590 100644 --- a/Library/Formula/ffmpeg.rb +++ b/Library/Formula/ffmpeg.rb @@ -26,7 +26,7 @@ class Ffmpeg < Formula option 'with-tools', 'Enable additional FFmpeg tools' # manpages won't be built without texi2html - depends_on 'texi2html' => :build if MacOS.mountain_lion? + depends_on 'texi2html' => :build if MacOS.version >= :mountain_lion depends_on 'yasm' => :build depends_on 'x264' unless build.include? 'without-x264' @@ -79,7 +79,7 @@ class Ffmpeg < Formula # For 32-bit compilation under gcc 4.2, see: # http://trac.macports.org/ticket/20938#comment:22 - ENV.append_to_cflags "-mdynamic-no-pic" if MacOS.leopard? or Hardware.is_32_bit? + ENV.append_to_cflags "-mdynamic-no-pic" if MacOS.version == :leopard or Hardware.is_32_bit? system "./configure", *args |