swftools 0.9.2 + add deps on ungif, fftw

* Upgrade swftools to version 0.9.2.
* Add a dep on ungif.
* Add a dep on fftw that is new to this version and used to speed up
resizing 2D images and increase their quality.
* Remove the optional qualifier on lame which had no effect.
* Remove the ENV.minimal_optimization, same reason, and it works.
* Remove the caveat about swfc segfaults on Snow Lep.  It works.
* Add a patch for configure to fix a syntax error in a conftest for
fftw that was causing it to be considered not found.  It now builds
and links all the binaries against libfftwf.dylib.
* The patch is merged in HEAD.  Remove at 0.9.3.  Noted in formula.

Tested on Lion and 64bit Snow Leopard with all five compilers from
XCode-4.3.2 and 4.0.2.

This would fix #11520

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

1 files changed, 32 insertions, 12 deletions

diff --git a/Library/Formula/swftools.rb b/Library/Formula/swftools.rb
index 942bfad31..530557a78 100644
--- a/Library/Formula/swftools.rb
+++ b/Library/Formula/swftools.rb
@@ -1,26 +1,46 @@
 require 'formula'
 
+class Xpdf < Formula
+  url 'ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz', :using  => :nounzip
+  sha1 '499423e8a795e0efd76ca798239eb4d0d52fe248'
+end
+
 class Swftools < Formula
-  url 'http://www.swftools.org/swftools-0.9.1.tar.gz'
   homepage 'http://www.swftools.org'
-  md5 '72dc4a7bf5cdf98c28f9cf9b1d8f5d7a'
+  url 'http://www.swftools.org/swftools-0.9.2.tar.gz'
+  sha1 'd7cf8874c4187d2edd3e40d20ba325ca17b91973'
 
   depends_on 'jpeg'
-  depends_on 'lame' => :optional
+  depends_on 'lame'
+  depends_on 'ungif'
+  depends_on 'fftw'
+
+  def patches
+    # Fixes a conftest for libfftwf.dylib that mistakenly calls fftw_malloc()
+    # rather than fftwf_malloc().  Reported upstream to their mailing list:
+    # http://lists.nongnu.org/archive/html/swftools-common/2012-04/msg00014.html
+    # Patch is merged upstream.  Remove at swftools-0.9.3.
+    DATA
+  end
 
   def install
     ENV.x11 # Add to PATH for freetype-config on Snow Leopard
-    ENV.minimal_optimization
-
+    Xpdf.new.brew { (buildpath+'lib/pdf').install Dir['*'] }
     system "./configure", "--prefix=#{prefix}"
     system "make"
     system "make install"
   end
-
-  def caveats; <<-EOS.undent
-    `swfc` segfaults under Snow Leopard.
-    Please persue this issue with the softare vendor:
-      http://lists.nongnu.org/mailman/listinfo/swftools-common
-    EOS
-  end
 end
+
+__END__
+--- a/configure	2012-04-08 10:25:35.000000000 -0700
++++ b/configure	2012-04-09 17:42:10.000000000 -0700
+@@ -6243,7 +6243,7 @@
+ 
+     int main()
+     {
+-	char*data = fftw_malloc(sizeof(fftwf_complex)*600*800);
++	char*data = fftwf_malloc(sizeof(fftwf_complex)*600*800);
+     	fftwf_plan plan = fftwf_plan_dft_2d(600, 800, (fftwf_complex*)data, (fftwf_complex*)data, FFTW_FORWARD, FFTW_ESTIMATE);
+ 	plan = fftwf_plan_dft_r2c_2d(600, 800, (float*)data, (fftwf_complex*)data, FFTW_ESTIMATE);
+ 	plan = fftwf_plan_dft_c2r_2d(600, 800, (fftwf_complex*)data, (float*)data, FFTW_ESTIMATE);