x264: Update to r2066

Also fix some patching.

Closes Homebrew#7596.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>

Library/Formula/x264.rb

@@ -1,10 +1,10 @@
 require 'formula'
 
 class X264 < Formula
-  url 'http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20110606-2245-stable.tar.bz2'
+  url 'http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20110912-2245-stable.tar.bz2'
   homepage 'http://www.videolan.org/developers/x264.html'
-  md5 '1e460dea9cc1c64ed48afe1b59d83228'
-  version 'r1995'
+  md5 '08b1658cf9964b73a53f445e4d21e161'
+  version 'r2066'
 
   head 'git://git.videolan.org/x264.git'
 
@@ -13,17 +13,13 @@ class X264 < Formula
   def install
     # Having this set can fail the endian test!
     ENV['GREP_OPTIONS'] = ''
-    system "./version.sh"
     system "./configure", "--prefix=#{prefix}",
                           "--enable-shared"
 
-    inreplace 'config.mak' do |s|
-      ldflags = s.get_make_var 'LDFLAGS'
-      s.change_make_var! 'LDFLAGS', ldflags.gsub!(' -s', '')
-
-      if MacOS.prefer_64_bit?
+    if MacOS.prefer_64_bit?
+      inreplace 'config.mak' do |s|
         soflags = s.get_make_var 'SOFLAGS'
-        s.change_make_var! 'SOFLAGS', soflags.gsub!(' -Wl,-read_only_relocs,suppress', '')
+        s.change_make_var! 'SOFLAGS', soflags.gsub(' -Wl,-read_only_relocs,suppress', '')
       end
     end