diff options
| author | Adam Vandenberg | 2010-06-21 09:56:22 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2010-06-21 09:56:22 -0700 |
| commit | 0eb317e307f6a120853fa0382bd1ec986886fb28 (patch) | |
| tree | ed74922c902dc2e3c4911f0d3e7f146b230861ef /Library/Formula | |
| parent | c4554bbdca313e76bf2df0366d04e5db752e9907 (diff) | |
| download | homebrew-0eb317e307f6a120853fa0382bd1ec986886fb28.tar.bz2 | |
Update to Wine 1.1.44
* Don't use mpg123 on 10.6/64-bit
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/wine.rb | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb index 9c6aec0fc..91e073981 100644 --- a/Library/Formula/wine.rb +++ b/Library/Formula/wine.rb @@ -1,8 +1,8 @@ require 'formula' class Wine <Formula - url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.1.42.tar.bz2' - sha1 'ea932f19528a22eacc49f16100dbf2251cb4ad5c' + url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.1.44.tar.bz2' + sha1 '60f11693161b28ff9814949f2b6bbccee1d07a2c' homepage 'http://www.winehq.org/' head 'git://source.winehq.org/git/wine.git' @@ -20,20 +20,26 @@ EOS fails_with_llvm ENV.x11 - # Make sure we build 32bit version, because Wine64 is not fully functional yet + # Build 32-bit; Wine doesn't support 64-bit host builds on OS X. build32 = "-arch i386 -m32" ENV["LIBS"] = "-lGL -lGLU" ENV.append "CFLAGS", build32 ENV.append "CXXFLAGS", "-D_DARWIN_NO_64_BIT_INODE" - ENV.append "LDFLAGS", [build32, "-framework CoreServices", "-lz", "-lGL -lGLU"].join(' ') + ENV.append "LDFLAGS", "#{build32} -framework CoreServices -lz -lGL -lGLU" ENV.append "DYLD_FALLBACK_LIBRARY_PATH", "/usr/X11/lib" - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}", - "--disable-win16" + args = [ "--prefix=#{prefix}", "--disable-win16" ] + + # Building a universal mpg123 is non-trivial, so skip for now. + args << "--without-mpg123" if Hardware.is_64_bit? and MACOS_VERSION >= 10.6 + + system "./configure", *args system "make install" + # Don't need Gnome desktop support + rm_rf share+'applications' + # Use a wrapper script, so rename wine to wine.bin # and name our startup script wine mv (bin+'wine'), (bin+'wine.bin') |