libmikmod 3.2.0b4

Upgrade libmikmod to 3.2.0b4 and remove the 4 inreplaces that were
merged upstream for us.  This builds well using both compilers
from XCode-4.3.2.

Closes #12258.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 2 insertions, 17 deletions

diff --git a/Library/Formula/libmikmod.rb b/Library/Formula/libmikmod.rb
index 6e358a287..a17aade68 100644
--- a/Library/Formula/libmikmod.rb
+++ b/Library/Formula/libmikmod.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class Libmikmod < Formula
   homepage 'http://mikmod.shlomifish.org'
-  url 'http://mikmod.shlomifish.org/files/libmikmod-3.2.0b3.tar.gz'
-  sha256 '3e2e04caff8726d5ceca0d8a5a1a43528cc627f935e92291aded1d87603ade4f'
+  url 'http://mikmod.shlomifish.org/files/libmikmod-3.2.0b4.tar.gz'
+  sha256 'da0c4fcfc5ca15c653baeb62b8cf91b35cfa11c1081a1aacc1e443a7d35db870'
 
   def options
     [[ '--with-debug', 'Enable debugging symbols']]
@@ -15,21 +15,6 @@ class Libmikmod < Formula
       (ENV.compiler == :clang) ? ENV.Og : ENV.O2
     end
 
-    # The following four patches have been merged upstream by Shlomi.
-    # Remove them at 3.2.0b4 or 3.2.0 stable.  The explanation for these is
-    # recorded here:  https://gist.github.com/2355354
-    inreplace 'playercode/virtch_common.c', '(handle<MAXSAMPLEHANDLES)',
-                                            '(Samples && handle<MAXSAMPLEHANDLES)'
-
-    inreplace 'playercode/mdriver.c', 'extern MikMod_callback_t vc_callback',
-                                      'MikMod_callback_t vc_callback'
-    inreplace 'playercode/virtch_common.c', 'MikMod_callback_t vc_callback',
-                                            'extern MikMod_callback_t vc_callback'
-
-    inreplace 'playercode/virtch2.c', 'vc_callback((char*)vc_tickbuf, portion)',
-                                      'vc_callback((unsigned char*)vc_tickbuf, portion)'
-
-
     # OSX has CoreAudio, but ALSA is not for this OS nor is SAM9407 nor ULTRA.
     args = %W[
       --prefix=#{prefix}