Update imagemagick packages (#3691)

Update imagemagick6 from 6.9.10-14 to 6.9.10-77 Update imagemagick7 from 7.0.8-14 to 7.0.9-7 Add flif and jbigkit dependencies Add decoder and viewflif to flif package Add libsdl2 dependency to flif package Add -fPIC switch option to jbigkit package Prevent simultaneous install of imagemagick6 and imagemagick7 Add pre-built binaries
2026-01-08 23:18:10 -05:00 · 2019-12-13 10:36:09 -06:00
parent 55b7dab0df
commit b834d4135a
5 changed files with 192 additions and 90 deletions
--- a/packages/flif.rb
+++ b/packages/flif.rb
@@ -0,0 +1,46 @@
+require 'package'
+
+class Flif < Package
+  description 'FLIF is a novel lossless image format which outperforms PNG, lossless WebP, lossless BPG, lossless JPEG2000, and lossless JPEG XR in terms of compression ratio.'
+  homepage 'https://flif.info/'
+  version '0.3'
+  source_url 'https://github.com/FLIF-hub/FLIF/archive/v0.3.tar.gz'
+  source_sha256 'aa02a62974d78f8109cff21ecb6d805f1d23b05b2db7189cfdf1f0d97ff89498'
+
+  binary_url ({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/flif-0.3-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/flif-0.3-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/flif-0.3-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/flif-0.3-chromeos-x86_64.tar.xz',
+  })
+  binary_sha256 ({
+    aarch64: '64f447f5fe90b8075259e6bf427387b7baa64a6d0dd7bbc49c05325bc20cf882',
+     armv7l: '64f447f5fe90b8075259e6bf427387b7baa64a6d0dd7bbc49c05325bc20cf882',
+       i686: '660419c699e79a045f92075c671a7a92c905d151cd82437c9b55bedddd4fba1a',
+     x86_64: 'd07dff394d43d90cb2e9270be4886f9d922020cb5c65e566785dce5422759b2f',
+  })
+
+  depends_on 'libsdl2'
+
+  def self.patch
+    system "sed -i 's,\$(PREFIX)/lib,#{CREW_DEST_LIB_PREFIX},g' src/Makefile"
+    system "sed -i 's,export LD_LIBRARY_PATH,#export LD_LIBRARY_PATH,' src/Makefile"
+  end
+
+  def self.build
+    system 'make', 'all'
+    Dir.chdir 'src' do
+      system 'make', 'decoder'
+      system 'make', 'viewflif'
+    end
+  end
+
+  def self.install
+    system 'make', "PREFIX=#{CREW_DEST_PREFIX}", 'install'
+    system 'make', "PREFIX=#{CREW_DEST_PREFIX}", 'install-dev'
+    Dir.chdir 'src' do
+      system 'make', "PREFIX=#{CREW_DEST_PREFIX}", 'install-decoder'
+      system 'make', "PREFIX=#{CREW_DEST_PREFIX}", 'install-viewflif'
+    end
+  end
+end
--- a/packages/imagemagick.rb
+++ b/packages/imagemagick.rb
@@ -3,79 +3,33 @@ 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.10-14-7.0.8-14'
+  version '6.9.10-77-7.0.9-7'
+
+  is_fake

  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.10-14"
-    puts "7 = ImageMagick 7.0.8-14"
-    puts "0 = Cancel"
+    puts "  Select the version to install:"
+    puts "  6 = ImageMagick 6.9.10-77"
+    puts "  7 = ImageMagick 7.0.9-7"
+    puts "  0 = Cancel"

    while version = STDIN.gets.chomp
      case version
      when '6'
-        source_url 'https://www.imagemagick.org/download/releases/ImageMagick-6.9.10-14.tar.xz'
-        source_sha256 'd123d4ad4e5bf72c51a6f528a2dbbbd4bf4249f25b36045017c9c634db968e6d'
-        binary_url ({
-          aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-14-chromeos-armv7l.tar.xz',
-           armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-14-chromeos-armv7l.tar.xz',
-             i686: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-14-chromeos-i686.tar.xz',
-           x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-14-chromeos-x86_64.tar.xz',
-        })
-        binary_sha256 ({
-          aarch64: '35aa98c93aedcf992741a8fc5043608618c3960ff4a7163e05dab46301cf0695',
-           armv7l: '35aa98c93aedcf992741a8fc5043608618c3960ff4a7163e05dab46301cf0695',
-             i686: '2d517abdea774d9a2425b8b13e5fc2c94a8596e2fa058ed8871aa6295d5edd40',
-           x86_64: '5a8b8ff05c66cf29715166b18c4100481577e2501332741f78eda177d19240d4',
-        })
+        depends_on 'imagemagick6'
        break
      when '7'
-        source_url 'https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-14.tar.xz'
-        source_sha256 '70c3d8c800cfd0282c0e0d9930b83f472f9593a882adc77532aa82c0d7ca0bb1'
-        binary_url ({
-          aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.8-14-chromeos-armv7l.tar.xz',
-           armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.8-14-chromeos-armv7l.tar.xz',
-             i686: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.8-14-chromeos-i686.tar.xz',
-           x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.8-14-chromeos-x86_64.tar.xz',
-        })
-        binary_sha256 ({
-          aarch64: '17f6dea62e438159afb39eb5f02c94669bc79034efad2e7c71c384fc20b768db',
-           armv7l: '17f6dea62e438159afb39eb5f02c94669bc79034efad2e7c71c384fc20b768db',
-             i686: '2b36de4345ad051651732c77b65ee9d8719e9c686e2616a0aa05f74d7f976a7e',
-           x86_64: 'db12c715992606dce557b5e3b81d82384e9751d9c59f3cffc9115727688cc304',
-        })
+        depends_on 'imagemagick7'
        break
      when '0'
        abort
        break
      else
-        puts "Please select from one of the options or enter 0 to cancel."
+        puts "  Please select from one of the options or enter 0 to cancel."
      end
    end
  end
-
-  depends_on 'freetype'
-  depends_on 'ghostscript'
-  depends_on 'lzma'
-  depends_on 'libwebp'
-  depends_on 'msttcorefonts'
-  depends_on 'openjpeg'
-  depends_on 'pango'
-  depends_on 'python27'
-
-  def self.build
-    system './configure',
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}",
-           '--disable-dependency-tracking',
-           '--without-x'
-    system 'make'
-  end
-
-  def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
-  end
 end
--- a/packages/imagemagick6.rb
+++ b/packages/imagemagick6.rb
@@ -3,42 +3,66 @@ 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.10-14'
-  source_url 'https://www.imagemagick.org/download/releases/ImageMagick-6.9.10-14.tar.xz'
-  source_sha256 'd123d4ad4e5bf72c51a6f528a2dbbbd4bf4249f25b36045017c9c634db968e6d'
+  version '6.9.10-77'
+  source_url 'https://www.imagemagick.org/download/releases/ImageMagick-6.9.10-77.tar.xz'
+  source_sha256 '55b3ef6281056c728a25e178434f1e7a2e491cbd99e44dc090a82967a2df6e11'

  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-14-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-14-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-14-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-14-chromeos-x86_64.tar.xz',
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-77-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-77-chromeos-armv7l.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick6-6.9.10-77-chromeos-x86_64.tar.xz',
  })
  binary_sha256 ({
-    aarch64: '35aa98c93aedcf992741a8fc5043608618c3960ff4a7163e05dab46301cf0695',
-     armv7l: '35aa98c93aedcf992741a8fc5043608618c3960ff4a7163e05dab46301cf0695',
-       i686: '2d517abdea774d9a2425b8b13e5fc2c94a8596e2fa058ed8871aa6295d5edd40',
-     x86_64: '5a8b8ff05c66cf29715166b18c4100481577e2501332741f78eda177d19240d4',
+    aarch64: 'e0eb87d09523ea2bfc111c1b8651958702ae7c6dd876f76d81dac71584e8203e',
+     armv7l: 'e0eb87d09523ea2bfc111c1b8651958702ae7c6dd876f76d81dac71584e8203e',
+     x86_64: '631ae6d92e7171e9ad1dc88cd81cd542764e4ef8363bdfa69d7e72f0d2ad3da0',
  })

+  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}" == ""
+  end
+
+  depends_on 'flif'
  depends_on 'freetype'
  depends_on 'ghostscript'
+  depends_on 'graphviz'
+  depends_on 'jbigkit'
+  depends_on 'jemalloc'
  depends_on 'lzma'
+  depends_on 'libheif'
+  depends_on 'librsvg'
  depends_on 'libwebp'
+  depends_on 'libwmf'
  depends_on 'msttcorefonts'
+  depends_on 'openexr'
  depends_on 'openjpeg'
  depends_on 'pango'
  depends_on 'python27'
+  depends_on 'zstd'
+  depends_on 'sommelier'
+
+  def self.patch
+    system 'filefix'
+  end

  def self.build
-    system './configure',
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}",
-           '--disable-dependency-tracking',
-           '--without-x'
+    system "CFLAGS=' -I#{CREW_PREFIX}/include/gdk-pixbuf-2.0 -I#{CREW_PREFIX}/include/c++/v1/support/xlocale' \
+           ./configure \
+           --prefix=#{CREW_PREFIX} \
+           --libdir=#{CREW_LIB_PREFIX} \
+           --disable-dependency-tracking \
+           --with-windows-font-dir=#{CREW_PREFIX}/share/fonts/truetype/msttcorefonts \
+           --with-jemalloc \
+           --with-modules \
+           --enable-hdri \
+           --with-perl \
+           --with-rsvg \
+           --with-x"
    system 'make'
  end

  def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
  end
 end
--- a/packages/imagemagick7.rb
+++ b/packages/imagemagick7.rb
@@ -3,42 +3,66 @@ 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.8-14'
-  source_url 'https://www.imagemagick.org/download/releases/ImageMagick-7.0.8-14.tar.xz'
-  source_sha256 '70c3d8c800cfd0282c0e0d9930b83f472f9593a882adc77532aa82c0d7ca0bb1'
+  version '7.0.9-7'
+  source_url 'https://www.imagemagick.org/download/releases/ImageMagick-7.0.9-7.tar.xz'
+  source_sha256 '73398cc626ebbb060d0df552b0db75de0c334f9626286284b627a6eb2a66ed19'

  binary_url ({
-    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.8-14-chromeos-armv7l.tar.xz',
-     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.8-14-chromeos-armv7l.tar.xz',
-       i686: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.8-14-chromeos-i686.tar.xz',
-     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.8-14-chromeos-x86_64.tar.xz',
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.9-7-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.9-7-chromeos-armv7l.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/imagemagick7-7.0.9-7-chromeos-x86_64.tar.xz',
  })
  binary_sha256 ({
-    aarch64: '17f6dea62e438159afb39eb5f02c94669bc79034efad2e7c71c384fc20b768db',
-     armv7l: '17f6dea62e438159afb39eb5f02c94669bc79034efad2e7c71c384fc20b768db',
-       i686: '2b36de4345ad051651732c77b65ee9d8719e9c686e2616a0aa05f74d7f976a7e',
-     x86_64: 'db12c715992606dce557b5e3b81d82384e9751d9c59f3cffc9115727688cc304',
+    aarch64: '234aa27aeb1f8bb7cdcfb9d9d84d4d249aa2346d00206d79df708de784115f17',
+     armv7l: '234aa27aeb1f8bb7cdcfb9d9d84d4d249aa2346d00206d79df708de784115f17',
+     x86_64: '515e0c51741e5ffe791f456ae0a5fcc090d0dce6799d2d4f96d858ddc612da83',
  })

+  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}" == ""
+  end
+
+  depends_on 'flif'
  depends_on 'freetype'
  depends_on 'ghostscript'
+  depends_on 'graphviz'
+  depends_on 'jbigkit'
+  depends_on 'jemalloc'
  depends_on 'lzma'
+  depends_on 'libheif'
+  depends_on 'librsvg'
  depends_on 'libwebp'
+  depends_on 'libwmf'
  depends_on 'msttcorefonts'
+  depends_on 'openexr'
  depends_on 'openjpeg'
  depends_on 'pango'
  depends_on 'python27'
+  depends_on 'zstd'
+  depends_on 'sommelier'
+
+  def self.patch
+    system 'filefix'
+  end

  def self.build
-    system './configure',
-           "--prefix=#{CREW_PREFIX}",
-           "--libdir=#{CREW_LIB_PREFIX}",
-           '--disable-dependency-tracking',
-           '--without-x'
+    system "CFLAGS=' -I#{CREW_PREFIX}/include/gdk-pixbuf-2.0 -I#{CREW_PREFIX}/include/c++/v1/support/xlocale' \
+           ./configure \
+           --prefix=#{CREW_PREFIX} \
+           --libdir=#{CREW_LIB_PREFIX} \
+           --disable-dependency-tracking \
+           --with-windows-font-dir=#{CREW_PREFIX}/share/fonts/truetype/msttcorefonts \
+           --with-jemalloc \
+           --with-modules \
+           --enable-hdri \
+           --with-perl \
+           --with-rsvg \
+           --with-x"
    system 'make'
  end

  def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
+    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
  end
 end
--- a/packages/jbigkit.rb
+++ b/packages/jbigkit.rb
@@ -0,0 +1,54 @@
+require 'package'
+
+class Jbigkit < Package
+  description 'JBIG-KIT is a software implementation of the JBIG1 data compression standard'
+  homepage 'https://www.cl.cam.ac.uk/~mgk25/jbigkit/'
+  version '2.1'
+  source_url 'https://www.cl.cam.ac.uk/~mgk25/jbigkit/download/jbigkit-2.1.tar.gz'
+  source_sha256 'de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932'
+
+  binary_url ({
+    aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/jbigkit-2.1-chromeos-armv7l.tar.xz',
+     armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/jbigkit-2.1-chromeos-armv7l.tar.xz',
+       i686: 'https://dl.bintray.com/chromebrew/chromebrew/jbigkit-2.1-chromeos-i686.tar.xz',
+     x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/jbigkit-2.1-chromeos-x86_64.tar.xz',
+  })
+  binary_sha256 ({
+    aarch64: '04f05a1e9d64fd440828b26dbab92e332e14cf8877f89dd3a3184ccb394f28ae',
+     armv7l: '04f05a1e9d64fd440828b26dbab92e332e14cf8877f89dd3a3184ccb394f28ae',
+       i686: '4f5af8e7dcf0d1bb3901be4454bf6fcd1808ce1aac9eeeed339664836328d48a',
+     x86_64: 'e9c62cc25c29df8254d6e48e1ac31d4ae801e55f0f7edef4753daa80fbfdeee8',
+  })
+
+  def self.patch
+    system "sed -i 's,-Wno-unused-result,-Wno-unused-result -fPIC,' Makefile"
+  end
+
+  def self.build
+    system 'make all'
+    system "sed -i 's,/usr/bin/perl,#{CREW_PREFIX}/bin/perl,' pbmtools/jbgfuzz.pl"
+  end
+
+  def self.check
+    system 'make', 'test'
+  end
+
+  def self.install
+    system "install -Dm644 pbmtools/jbgtopbm.1 #{CREW_DEST_PREFIX}/share/man/man1/jbgtopbm.1"
+    system "install -Dm644 pbmtools/pbmtojbg.1 #{CREW_DEST_PREFIX}/share/man/man1/pbmtojbg.1"
+    system "install -Dm644 pbmtools/pbm.5 #{CREW_DEST_PREFIX}/share/man/man5/pbm.5"
+    system "install -Dm644 pbmtools/pgm.5 #{CREW_DEST_PREFIX}/share/man/man5/pgm.5"
+    system "install -Dm644 libjbig/jbig.h #{CREW_DEST_PREFIX}/include/jbig.h"
+    system "install -Dm644 libjbig/jbig85.h #{CREW_DEST_PREFIX}/include/jbig85.h"
+    system "install -Dm644 libjbig/jbig_ar.h #{CREW_DEST_PREFIX}/include/jbig_ar.h"
+    system "install -Dm755 pbmtools/jbgfuzz.pl #{CREW_DEST_PREFIX}/bin/jbgfuzz.pl"
+    system "install -Dm755 pbmtools/jbgtopbm #{CREW_DEST_PREFIX}/bin/jbgtopbm"
+    system "install -Dm755 pbmtools/jbgtopbm85 #{CREW_DEST_PREFIX}/bin/jbgtopbm85"
+    system "install -Dm755 pbmtools/pbmtojbg #{CREW_DEST_PREFIX}/bin/pbmtojbg"
+    system "install -Dm755 pbmtools/pbmtojbg85 #{CREW_DEST_PREFIX}/bin/pbmtojbg85"
+    system "install -Dm755 libjbig/tstcodec #{CREW_DEST_PREFIX}/bin/tstcodec"
+    system "install -Dm755 libjbig/tstcodec85 #{CREW_DEST_PREFIX}/bin/tstcodec85"
+    system "install -Dm644 libjbig/libjbig.a #{CREW_DEST_LIB_PREFIX}/libjbig.a"
+    system "install -Dm644 libjbig/libjbig85.a #{CREW_DEST_LIB_PREFIX}/libjbig85.a"
+  end
+end