From a693a9ed366910b691097d850d1675ce56573716 Mon Sep 17 00:00:00 2001 From: chdiza Date: Sun, 29 Sep 2013 16:00:25 -0400 Subject: [PATCH 1/4] graphicsmagick: Fix some options --- Library/Formula/graphicsmagick.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index c985cfd9f96f..1f5516199dc1 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -10,6 +10,7 @@ class Graphicsmagick < Formula option 'with-quantum-depth-16', 'Compile with a quantum depth of 16 bit' option 'with-quantum-depth-32', 'Compile with a quantum depth of 32 bit' option 'without-magick-plus-plus', 'disable build/install of Magick++' + option 'with-svg', 'Compile with libxml2 for svg support' depends_on :libltdl @@ -25,11 +26,9 @@ class Graphicsmagick < Formula depends_on 'little-cms2' => :optional depends_on 'jasper' => :optional depends_on 'libwmf' => :optional - depends_on 'librsvg' => :optional - depends_on 'liblqr' => :optional - depends_on 'openexr' => :optional depends_on 'ghostscript' => :optional - depends_on 'webp' => :optional + + depends_on 'libxml2' => :optional opoo '--with-ghostscript is not recommended' if build.with? 'ghostscript' if build.with? 'openmp' and (MacOS.version == 10.5 or ENV.compiler == :clang) @@ -54,11 +53,9 @@ def install "--with-modules"] args << "--disable-openmp" unless build.include? 'enable-openmp' - args << "--disable-opencl" if build.include? 'disable-opencl' args << "--without-gslib" unless build.with? 'ghostscript' args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" unless build.with? 'ghostscript' args << "--without-magick-plus-plus" if build.without? 'magick-plus-plus' - args << "--enable-hdri=yes" if build.include? 'enable-hdri' if build.with? 'quantum-depth-32' quantum_depth = 32 @@ -69,10 +66,9 @@ def install end args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth - args << "--with-rsvg" if build.with? 'librsvg' args << "--without-x" unless build.with? 'x11' - args << "--with-freetype=yes" if build.with? 'freetype' - args << "--with-webp=yes" if build.include? 'webp' + args << "--without-ttf" if build.without? 'freetype' + args << "--with-xml" if build.with? 'svg' # versioned stuff in main tree is pointless for us inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}' From 17d4818e024fdacf1f5f5520737e753435ad7259 Mon Sep 17 00:00:00 2001 From: chdiza Date: Sun, 29 Sep 2013 16:15:15 -0400 Subject: [PATCH 2/4] graphicsmagick: Fix the svg-related option code --- Library/Formula/graphicsmagick.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index 1f5516199dc1..954d9295654a 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -68,7 +68,7 @@ def install args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth args << "--without-x" unless build.with? 'x11' args << "--without-ttf" if build.without? 'freetype' - args << "--with-xml" if build.with? 'svg' + args << "--without-xml" unless build.with? 'svg' # versioned stuff in main tree is pointless for us inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}' From b36d16212c92a8dfcbc56461aba6694381e39dfb Mon Sep 17 00:00:00 2001 From: chdiza Date: Sun, 29 Sep 2013 16:37:29 -0400 Subject: [PATCH 3/4] graphicsmagick: Drop libxml2 dependency --- Library/Formula/graphicsmagick.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index 954d9295654a..895ff09ceaed 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -10,7 +10,7 @@ class Graphicsmagick < Formula option 'with-quantum-depth-16', 'Compile with a quantum depth of 16 bit' option 'with-quantum-depth-32', 'Compile with a quantum depth of 32 bit' option 'without-magick-plus-plus', 'disable build/install of Magick++' - option 'with-svg', 'Compile with libxml2 for svg support' + option 'with-svg', 'Compile with svg support' depends_on :libltdl @@ -28,8 +28,6 @@ class Graphicsmagick < Formula depends_on 'libwmf' => :optional depends_on 'ghostscript' => :optional - depends_on 'libxml2' => :optional - opoo '--with-ghostscript is not recommended' if build.with? 'ghostscript' if build.with? 'openmp' and (MacOS.version == 10.5 or ENV.compiler == :clang) opoo '--with-openmp is not supported on Leopard or with Clang' From 3843d5d01d4f2a1540d7a1d4b6b65875ea46dabc Mon Sep 17 00:00:00 2001 From: chdiza Date: Sun, 29 Sep 2013 17:31:11 -0400 Subject: [PATCH 4/4] graphicsmagick: Allow really disabling little-cms{2} --- Library/Formula/graphicsmagick.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb index 895ff09ceaed..422711d7e34d 100644 --- a/Library/Formula/graphicsmagick.rb +++ b/Library/Formula/graphicsmagick.rb @@ -67,6 +67,8 @@ def install args << "--without-x" unless build.with? 'x11' args << "--without-ttf" if build.without? 'freetype' args << "--without-xml" unless build.with? 'svg' + args << "--without-lcms" unless build.with? 'little-cms' + args << "--without-lcms2" unless build.with? 'little-cms2' # versioned stuff in main tree is pointless for us inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'