wine 1.4rc4

also added support for compiling wine with clang

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 36 insertions, 19 deletions

diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index ab898cb07..ee5cc8eda 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -17,8 +17,8 @@ class Wine < Formula
   head 'git://source.winehq.org/git/wine.git'
 
   devel do
-    url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.3.35.tar.bz2'
-    sha256 'e23e4da5efebc11206198e9cf2a2638851db4e00a1af0abccd8b6369e99c288b'
+    url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.4-rc4.tar.bz2'
+    sha256 '3105c4f7e0a3c326c3dc82257b6af96dd5db6cc2afbe4b8a936563d2da04d1ec'
   end
 
   depends_on 'jpeg'
@@ -27,7 +27,7 @@ class Wine < Formula
   # gnutls not needed since 1.3.16
   depends_on 'gnutls' unless ARGV.build_devel? or ARGV.build_head?
 
-  fails_with_llvm 'Wine dies with an "Unhandled exception code" when built with LLVM', :build => 2336
+  fails_with_llvm 'llvm-gcc does not respect force_align_arg_pointer', :build => 2336
 
   # the following libraries are currently not specified as dependencies, or not built as 32-bit:
   # configure: libsane, libv4l, libgphoto2, liblcms, gstreamer-0.10, libcapi20, libgsm, libtiff
@@ -51,6 +51,7 @@ EOS
 
     ENV["LIBS"] = "-lGL -lGLU"
     ENV.append "CFLAGS", build32
+    ENV.O1 if ENV.compiler == :clang
     ENV.append "CXXFLAGS", "-D_DARWIN_NO_64_BIT_INODE"
     ENV.append "LDFLAGS", "#{build32} -framework CoreServices -lz -lGL -lGLU"
 
@@ -60,7 +61,7 @@ EOS
             "--with-x",
             "--with-coreaudio",
             "--with-opengl"]
-    args << "--disable-win16" if MacOS.leopard?
+    args << "--disable-win16" if MacOS.leopard? or ENV.compiler == :clang
 
     # 64-bit builds of mpg123 are incompatible with 32-bit builds of Wine
     args << "--without-mpg123" if Hardware.is_64_bit?
@@ -72,7 +73,7 @@ EOS
     rm_rf share+'applications'
 
     # Download Gecko once so we don't need to redownload for each prefix
-    gecko = ARGV.build_devel? ? WineGecko.new : WineGeckoOld.new
+    gecko = (ARGV.build_devel? or ARGV.build_head?) ? WineGecko.new : WineGeckoOld.new
     gecko.brew { (share+'wine/gecko').install Dir["*"] }
 
     # Use a wrapper script, so rename wine to wine.bin
@@ -81,25 +82,41 @@ EOS
     (bin+'wine').write(wine_wrapper)
   end
 
-  # There is a bug in the Lion version of ld that prevents Wine from building
-  # correctly; see <http://bugs.winehq.org/show_bug.cgi?id=27929>
-  # We have backported Camillo Lugaresi's patch from upstream. The patch can
-  # be removed from this formula once it lands in both the devel and stable
-  # branches of Wine.
-  if MacOS.lion? and not (ARGV.build_devel? or ARGV.build_head?)
-    def patches; DATA; end
+  def patches
+    p = []
+    # There is a bug in the Lion version of ld that prevents Wine from building
+    # correctly; see <http://bugs.winehq.org/show_bug.cgi?id=27929>
+    # We have backported Camillo Lugaresi's patch from upstream. The patch can
+    # be removed from this formula once it lands in both the devel and stable
+    # branches of Wine.
+    p << DATA if MacOS.lion? and not (ARGV.build_devel? or ARGV.build_head?)
+
+    # Wine tests CFI support by calling clang, but then attempts to use as, which
+    # does not work. Use clang for assembling too.
+    p << 'https://raw.github.com/gist/1755988/266f883f568c223ab25da08581c1a08c47bb770f/winebuild.patch' if ENV.compiler == :clang
+    p
   end
 
-  def caveats; <<-EOS.undent
-    For a more full-featured install, try:
-      http://code.google.com/p/osxwinebuilder/
+  def caveats
+    s = <<-EOS.undent
+      For best results, you will want to install the latest version of XQuartz:
+        http://xquartz.macosforge.org/
 
-    You may also want to get winetricks:
-      brew install winetricks
+      You may also want to get winetricks:
+        brew install winetricks
 
-    To use 3D applications, like games, check "Emulate a virtual desktop" in
-    winecfg's "Graphics" tab.
+      Or check out:
+        http://code.google.com/p/osxwinebuilder/
     EOS
+    if not (ARGV.build_devel? or ARGV.build_head?)
+      s += <<-EOS.undent
+
+        The stable version of Wine is very old. You will get better results with
+        the development version. Use:
+          brew install wine --devel
+      EOS
+    end
+    return s
   end
 end