aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authornibbles 2bits2012-05-18 03:21:26 -0700
committerJack Nagel2012-05-18 21:54:15 -0500
commita3a18a77634fbbdeba285fc56c2d87954fd75210 (patch)
tree099748af2267f5997f17ebf4632847d3728e8ad2 /Library/Formula
parent7ac1cbc996e0f18aaabad5ef327ff57161e0ae2e (diff)
downloadhomebrew-a3a18a77634fbbdeba285fc56c2d87954fd75210.tar.bz2
libvpx 1.1.0
Upgrade libvpx to version 1.1.0. Remove the patches and inreplace. Both are fixed in this version. It correctly checks before trying to add `-isysroot`, and it uses the correct target for your OS. Closes #12307. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/libvpx.rb40
1 files changed, 2 insertions, 38 deletions
diff --git a/Library/Formula/libvpx.rb b/Library/Formula/libvpx.rb
index 8f81d5430..6ce62855f 100644
--- a/Library/Formula/libvpx.rb
+++ b/Library/Formula/libvpx.rb
@@ -2,8 +2,8 @@ require 'formula'
class Libvpx < Formula
homepage 'http://www.webmproject.org/code/'
- url 'http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2'
- sha256 '07cedb0a19a44e6d81d75f52eea864f59ef10c6c725cb860431bec6641eafe21'
+ url 'http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2'
+ sha1 '356af5f770c50cd021c60863203d8f30164f6021'
depends_on 'yasm' => :build
@@ -15,18 +15,6 @@ class Libvpx < Formula
]
end
- def patches
- # see http://code.google.com/p/webm/issues/detail?id=396
- # Remove attempts by configure to specify a -isysroot path on Lion.
- # It's never needed on Lion because the correct default is set within
- # the compiler and because a CLT only user will never have an SDK path.
- # This stops a compile error for CLT-4.3 where configure malforms the
- # conftest command by using -isysroot without a path argument. This
- # is what the command looks like when it's missing the arg:
- # -isysroot -mmacosx-version-min=10.7
- DATA if MacOS.lion?
- end
-
def install
args = ["--prefix=#{prefix}",
"--enable-pic",
@@ -38,33 +26,9 @@ class Libvpx < Formula
args << "--enable-mem-tracker" if ARGV.include? "--mem-tracker"
args << "--enable-postproc-visualizer" if ARGV.include? "--visualizer"
- # see http://code.google.com/p/webm/issues/detail?id=401
- # Determine if the computer runs Darwin 9, 10, or 11 using uname -r.
- osver = %x[uname -r | cut -d. -f1].chomp
- if MacOS.prefer_64_bit? then
- args << "--target=x86_64-darwin#{osver}-gcc"
- else
- args << "--target=x86-darwin#{osver}-gcc"
- end
-
mkdir 'macbuild' do
system "../configure", *args
system "make install"
end
end
end
-
-__END__
---- a/build/make/configure.sh 2012-01-27 10:36:39.000000000 -0800
-+++ b/build/make/configure.sh 2012-02-20 20:14:04.000000000 -0800
-@@ -649,10 +649,6 @@
- add_ldflags "-mmacosx-version-min=10.6"
- ;;
- *-darwin11-*)
-- add_cflags "-isysroot ${osx_sdk_dir}"
-- add_cflags "-mmacosx-version-min=10.7"
-- add_ldflags "-isysroot ${osx_sdk_dir}"
-- add_ldflags "-mmacosx-version-min=10.7"
- ;;
- esac
-