From 7b20bcd588ab493277fd49788045cb972bd28e56 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 2 Sep 2012 00:58:21 -0700 Subject: [PATCH] gd: fix SHA1, test and X11 dependency. --- Formula/gd.rb | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Formula/gd.rb b/Formula/gd.rb index f69c919aff3..e24962d2a9e 100644 --- a/Formula/gd.rb +++ b/Formula/gd.rb @@ -8,8 +8,13 @@ class Gd < Formula head 'http://bitbucket.org/pierrejoye/gd-libgd', :using => :hg - depends_on :x11 - depends_on 'jpeg' => :recommended + option 'without-libpng', 'Build without PNG support' + option 'without-jpeg', 'Build without JPEG support' + option 'with-freetype', 'Build with FreeType support' + + depends_on :libpng unless build.include? "without-libpng" + depends_on 'jpeg' => :recommended unless build.include? "without-jpeg" + depends_on :freetype => :optional if build.include? "with-freetype" fails_with :llvm do build 2326 @@ -17,7 +22,9 @@ class Gd < Formula end def install - system "./configure", "--prefix=#{prefix}", "--with-freetype=#{MacOS::X11.prefix}" + args = ["--prefix=#{prefix}"] + args << "--with-freetype" if build.include? 'with-freetype' + system "./configure", *args system "make install" (lib+'pkgconfig/gdlib.pc').write pkg_file end @@ -39,4 +46,13 @@ Libs.private: -lXpm -lX11 -ljpeg -lfontconfig -lfreetype -lpng12 -lz -lm Cflags: -I${includedir} EOF end + + def test + mktemp do + system "#{bin}/pngtogd", \ + "/System/Library/Frameworks/SecurityInterface.framework/Versions/A/Resources/Key_Large.png", \ + "gd_test.gd" + system "#{bin}/gdtopng", "gd_test.gd", "gd_test.png" + end + end end