graphicsmagick: sync with imagemagick formula.

Fixes #22676.

1 files changed, 42 insertions, 31 deletions

diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb
index 78ed4507e..c985cfd9f 100644
--- a/Library/Formula/graphicsmagick.rb
+++ b/Library/Formula/graphicsmagick.rb
@@ -4,32 +4,37 @@ class Graphicsmagick < Formula
   homepage 'http://www.graphicsmagick.org/'
   url 'http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.18/GraphicsMagick-1.3.18.tar.bz2'
   sha256 '768b89a685d29b0e463ade21bc0649f2727800ebc5a8e13fa6fc17ccb9da769b'
-
   head 'hg://http://graphicsmagick.hg.sourceforge.net:8000/hgroot/graphicsmagick/graphicsmagick'
 
-  option 'use-tiff', 'Compile with libtiff support.'
-  option 'use-cms', 'Compile with little-cms support.'
-  option 'use-jpeg2000', 'Compile with jasper support.'
-  option 'use-wmf', 'Compile with libwmf support.'
-  option 'use-xz', 'Compile with xz support.'
   option 'with-quantum-depth-8', 'Compile with a quantum depth of 8 bit'
   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 'with-x', 'Compile with X11 support.'
-  option 'without-magick-plus-plus', "Don't build C++ library."
+  option 'without-magick-plus-plus', 'disable build/install of Magick++'
+
+  depends_on :libltdl
+
+  depends_on 'pkg-config' => :build
 
-  depends_on 'libtool' => :build
   depends_on 'jpeg' => :recommended
-  depends_on :libpng
-  depends_on :x11 if build.include? 'with-x'
+  depends_on :libpng => :recommended
+  depends_on :freetype => :recommended
 
+  depends_on :x11 => :optional
+  depends_on 'libtiff' => :optional
+  depends_on 'little-cms' => :optional
+  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 'libtiff' if build.include? 'use-tiff'
-  depends_on 'little-cms2' if build.include? 'use-cms'
-  depends_on 'jasper' if build.include? 'use-jpeg2000'
-  depends_on 'libwmf' if build.include? 'use-wmf'
-  depends_on 'xz' if build.include? 'use-xz'
+  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'
+  end
 
   fails_with :llvm do
     build 2335
@@ -42,34 +47,40 @@ class Graphicsmagick < Formula
   end
 
   def install
-    # versioned stuff in main tree is pointless for us
-    inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'
+    args = [ "--prefix=#{prefix}",
+             "--disable-dependency-tracking",
+             "--enable-shared",
+             "--disable-static",
+             "--with-modules"]
 
-    args = ["--disable-dependency-tracking",
-            "--prefix=#{prefix}",
-            "--enable-shared", "--disable-static"]
-    args << "--without-magick-plus-plus" if build.include? 'without-magick-plus-plus'
-    args << "--disable-openmp" if MacOS.version <= :leopard or not ENV.compiler == :gcc # libgomp unavailable
-    args << "--with-gslib" if build.with? 'ghostscript'
-    args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" \
-              unless ghostscript_fonts?
+    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.include? 'with-quantum-depth-32'
+    if build.with? 'quantum-depth-32'
       quantum_depth = 32
-    elsif build.include? 'with-quantum-depth-16'
+    elsif build.with? 'quantum-depth-16'
       quantum_depth = 16
-    elsif build.include? 'with-quantum-depth-8'
+    elsif build.with? 'quantum-depth-8'
       quantum_depth = 8
     end
 
     args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth
-    args << "--without-x" unless build.include? 'with-x'
+    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'
 
+    # versioned stuff in main tree is pointless for us
+    inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'
     system "./configure", *args
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/gm", "identify", "/usr/share/doc/cups/images/cups.png"
   end
 end