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 Homebrew/homebrew#12307. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
parent
030f42729b
commit
7d0c7402f0
1 changed files with 2 additions and 38 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue