From e196361b708b9a3f159dee25643fc95c230938de Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Tue, 21 May 2019 16:01:27 +0100 Subject: ImageMagick is now included into the project With this commit, ImageMagick software has been added into the project. This software is useful to deal and treat images from the command line. Since it is widely used and a lot of other programs rely on it, it is worth to have it into the project. --- .file-metadata | Bin 5898 -> 6919 bytes reproduce/analysis/make/top.mk | 0 reproduce/software/config/installation/versions.mk | 1 + reproduce/software/make/high-level.mk | 12 ++++++++++++ 4 files changed, 13 insertions(+) mode change 100644 => 100755 reproduce/analysis/make/top.mk diff --git a/.file-metadata b/.file-metadata index 065d3df..01feaea 100644 Binary files a/.file-metadata and b/.file-metadata differ diff --git a/reproduce/analysis/make/top.mk b/reproduce/analysis/make/top.mk old mode 100644 new mode 100755 diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index caeae5a..510e50d 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -81,6 +81,7 @@ ghostscript-version = 9.26 gnuastro-version = 0.9 gsl-version = 2.5 hdf5-version = 1.10.5 +imagemagick-version = 7.0.8-46 libffi-version = 3.2.1 libjpeg-version = v9b libpng-version = 1.6.37 diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 6054a48..b2d9d7e 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -118,6 +118,7 @@ tarballs = $(foreach t, astrometry.net-$(astrometrynet-version).tar.gz \ gnuastro-$(gnuastro-version).tar.lz \ gsl-$(gsl-version).tar.gz \ hdf5-$(hdf5-version).tar.gz \ + imagemagick-$(imagemagick-version).tar.xz \ install-tl-unx.tar.gz \ jpegsrc.$(libjpeg-version).tar.gz \ lapack-$(lapack-version).tar.gz \ @@ -176,6 +177,9 @@ $(tarballs): $(tdir)/%: | $(lockdir) elif [ $$n = ghostscript ]; then w=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926 elif [ $$n = gnuastro ]; then w=http://ftp.gnu.org/gnu/gnuastro elif [ $$n = gsl ]; then w=http://ftp.gnu.org/gnu/gsl + elif [ $$n = imagemagick ]; then + mergenames=0 + w=https://www.imagemagick.org/download/releases/ImageMagick-$(imagemagick-version).tar.xz elif [ $$n = install ]; then w=http://mirror.ctan.org/systems/texlive/tlnet elif [ $$n = jpegsrc ]; then w=http://ijg.org/files elif [ $$n = lapack ]; then w=http://www.netlib.org/lapack @@ -590,6 +594,14 @@ endif && cp $(dtexdir)/gnuastro.tex $(ictdir)/ \ && echo "GNU Astronomy Utilities $(gnuastro-version) \citep{gnuastro}" > $@ +$(ibidir)/imagemagick: $(tdir)/imagemagick-$(imagemagick-version).tar.xz \ + $(ibidir)/libjpeg \ + $(ibidir)/libtiff \ + $(ibidir)/zlib + $(call gbuild, $<, ImageMagick-$(imagemagick-version), static, \ + --without-x --disable-openmp, V=1) \ + && echo "ImageMagick $(imagemagick-version)" > $@ + # Netpbm is a prerequisite of Astrometry-net, it contains a lot of programs. # This program has a crazy dialogue installation which is override using the # printf statment. Each `\n' is a new question that the installation process -- cgit v1.2.1 From e80bb66527089db74c04481fe6e3646e8a0910f4 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Tue, 21 May 2019 16:15:52 +0100 Subject: ImageMagick put as prerequisite of Matplotlib With this commit, ImageMagick program has been set as prerequisite of Matplotlib Python package. Since some submodules of Matplotlib rely on ImageMagick programs (for example, those to make image animations), and now we have ImageMagick into the project, it is good to install ImageMagick when Matplotlib is requested to be installed. --- .file-metadata | Bin 6919 -> 6829 bytes reproduce/software/make/python.mk | 1 + 2 files changed, 1 insertion(+) diff --git a/.file-metadata b/.file-metadata index 01feaea..6230664 100644 Binary files a/.file-metadata and b/.file-metadata differ diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index 1a7be56..ef42c87 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -389,6 +389,7 @@ $(ipydir)/kiwisolver: $(tdir)/kiwisolver-$(kiwisolver-version).tar.gz \ $(ipydir)/matplotlib: $(tdir)/matplotlib-$(matplotlib-version).tar.gz \ $(ipydir)/python-dateutil \ + $(ibidir)/imagemagick \ $(ipydir)/kiwisolver \ $(ipydir)/pyparsing \ $(ibidir)/freetype \ -- cgit v1.2.1