diff options
| author | Misty De Meo | 2014-11-10 21:23:13 -0800 |
|---|---|---|
| committer | Misty De Meo | 2014-11-10 21:25:11 -0800 |
| commit | 642b700fcd78769f367db1035b7ec43f2d42b7db (patch) | |
| tree | d469d8818057431f81884954d77d989a856c1f0e /Library/Formula | |
| parent | 5d998dc69219a7ebe9c7cb7309dee4e73fc89301 (diff) | |
| download | homebrew-642b700fcd78769f367db1035b7ec43f2d42b7db.tar.bz2 | |
ffmpeg: disable VDA on 10.10 unless clang is used
Fixes #33741.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/ffmpeg.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb index f999145e2..376b6504d 100644 --- a/Library/Formula/ffmpeg.rb +++ b/Library/Formula/ffmpeg.rb @@ -72,7 +72,6 @@ class Ffmpeg < Formula "--enable-nonfree", "--enable-hardcoded-tables", "--enable-avresample", - "--enable-vda", "--cc=#{ENV.cc}", "--host-cflags=#{ENV.cflags}", "--host-ldflags=#{ENV.ldflags}" @@ -110,6 +109,16 @@ class Ffmpeg < Formula args << "--extra-cflags=" + %x[pkg-config --cflags libopenjpeg].chomp end + # A bug in a dispatch header on 10.10, included via CoreFoundation, + # prevents GCC from building VDA support. GCC has no probles on + # 10.9 and earlier. + # See: https://github.com/Homebrew/homebrew/issues/33741 + if MacOS.version < :yosemite || ENV.compiler == :clang + args << "--enable-vda" + else + args << "--disable-vda" + end + # 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 Hardware.is_32_bit? && Hardware::CPU.intel? && ENV.compiler == :clang |