Update imagemagick packages

Add libwebp and openjpeg dependencies per issue #1887

packages/imagemagick.rb

@@ -3,30 +3,30 @@ require 'package'
 class Imagemagick < Package
   description 'Use ImageMagick to create, edit, compose, or convert bitmap images.'
   homepage 'http://www.imagemagick.org/script/index.php'
-  version '6.9.9-33-7.0.7-21'
+  version '6.9.9-34-7.0.7-22'
 
   if ARGV[0] == 'install'
     imver = `stream -version 2> /dev/null | head -1 | cut -d' ' -f3`.chomp
     abort "ImageMagick version #{imver} already installed.".lightgreen unless "#{imver}" == ""
     puts
     puts "Enter the ImageMagick version to install:"
-    puts "6 = ImageMagick 6.9.9-33"
-    puts "7 = ImageMagick 7.0.7-21"
+    puts "6 = ImageMagick 6.9.9-34"
+    puts "7 = ImageMagick 7.0.7-22"
     puts "0 = Cancel"
 
     while version = STDIN.gets.chomp
       case version
       when '6'
-        source_url 'https://www.imagemagick.org/download/releases/ImageMagick-6.9.9-33.tar.xz'
-        source_sha256 '996adc81c91ebb589c0483b88ce4ddd76e91e0acee4858f71c9d024bda717869'
+        source_url 'https://www.imagemagick.org/download/releases/ImageMagick-6.9.9-34.tar.xz'
+        source_sha256 'b37d8ea71a367f0d2267e8441b470cc6f2eaac0ce94837dcc87b011c55bf212c'
         binary_url ({
         })
         binary_sha256 ({
         })
         break
       when '7'
-        source_url 'https://www.imagemagick.org/download/releases/ImageMagick-7.0.7-21.tar.xz'
-        source_sha256 '3b2783a845279f76a4250f2c3caf04af22766e2d5f084bde589ebd73de6a0019'
+        source_url 'https://www.imagemagick.org/download/releases/ImageMagick-7.0.7-22.tar.xz'
+        source_sha256 '49de9e08ea255a1f939158d85d50dfa29285bccbdcb7fee0fe4309061d438489'
         binary_url ({
         })
         binary_sha256 ({
@@ -46,8 +46,11 @@ class Imagemagick < Package
   depends_on 'libjpeg'
   depends_on 'libpng'
   depends_on 'libtiff'
+  depends_on 'libwebp'
   depends_on 'freetype'
+  depends_on 'openjpeg'
   depends_on 'pango'
+  depends_on 'python27'
   depends_on 'zlibpkg'
 
   def self.build
@@ -55,6 +58,7 @@ class Imagemagick < Package
            "--prefix=#{CREW_PREFIX}",
            "--libdir=#{CREW_LIB_PREFIX}",
            '--disable-dependency-tracking',
+           '--with-python',
            '--without-x'
     system 'make'
   end

packages/imagemagick6.rb

@@ -3,36 +3,34 @@ require 'package'
 class Imagemagick6 < Package
   description 'Use ImageMagick to create, edit, compose, or convert bitmap images.'
   homepage 'http://www.imagemagick.org/script/index.php'
-  version '6.9.9-27'
-  source_url 'https://www.imagemagick.org/download/releases/ImageMagick-6.9.9-27.tar.xz'
-  source_sha256 '27d0090b6a019eb038d254a9eb8d8939ac0d225b5dc651abc9212bb7c257e17c'
+  version '6.9.9-34'
+  source_url 'https://www.imagemagick.org/download/releases/ImageMagick-6.9.9-34.tar.xz'
+  source_sha256 'b37d8ea71a367f0d2267e8441b470cc6f2eaac0ce94837dcc87b011c55bf212c'
 
   binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.9-27-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.9-27-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.9-27-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.9-27-chromeos-x86_64.tar.xz',
   })
   binary_sha256 ({
-    aarch64: 'fd9316207ade7c8ef35bcc47475c16b7e4b348f7f811bb4cb7c8070c24cd2b2e',
-     armv7l: 'fd9316207ade7c8ef35bcc47475c16b7e4b348f7f811bb4cb7c8070c24cd2b2e',
-       i686: '0cf502b48da21570e9952a98fb9b52e6b761ddb1564c6dcde210984bf80250b0',
-     x86_64: '9c23d6415bb4c7fe77a4fdf6ebf7a17437916e326e849af42afe07efad8a5979',
   })
 
-  depends_on 'pkgconfig' => :build
-  depends_on "libjpeg"
-  depends_on "libpng"
-  depends_on "libtiff"
-  depends_on "freetype"
-  depends_on "zlibpkg"
+  depends_on 'lcms'
+  depends_on 'lzma'
+  depends_on 'libjpeg'
+  depends_on 'libpng'
+  depends_on 'libtiff'
+  depends_on 'libwebp'
+  depends_on 'freetype'
+  depends_on 'openjpeg'
+  depends_on 'pango'
+  depends_on 'python27'
+  depends_on 'zlibpkg'
 
   def self.build
     system './configure',
            "--prefix=#{CREW_PREFIX}",
            "--libdir=#{CREW_LIB_PREFIX}",
            '--disable-dependency-tracking',
-           '--without-python'
+           '--with-python',
+           '--without-x'
     system 'make'
   end
 

packages/imagemagick7.rb

+require 'package'
+
+class Imagemagick7 < Package
+  description 'Use ImageMagick to create, edit, compose, or convert bitmap images.'
+  homepage 'http://www.imagemagick.org/script/index.php'
+  version '7.0.7-22'
+  source_url 'https://www.imagemagick.org/download/releases/ImageMagick-7.0.7-22.tar.xz'
+  source_sha256 '49de9e08ea255a1f939158d85d50dfa29285bccbdcb7fee0fe4309061d438489'
+
+  binary_url ({
+  })
+  binary_sha256 ({
+  })
+
+  depends_on 'lcms'
+  depends_on 'lzma'
+  depends_on 'libjpeg'
+  depends_on 'libpng'
+  depends_on 'libtiff'
+  depends_on 'libwebp'
+  depends_on 'freetype'
+  depends_on 'openjpeg'
+  depends_on 'pango'
+  depends_on 'python27'
+  depends_on 'zlibpkg'
+
+  def self.build
+    system './configure',
+           "--prefix=#{CREW_PREFIX}",
+           "--libdir=#{CREW_LIB_PREFIX}",
+           '--disable-dependency-tracking',
+           '--with-python',
+           '--without-x'
+    system 'make'
+  end
+
+  def self.install
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+  end
+end