[Buildroot] [PATCH 1/3] imagemagick: bump to version 7.0.2-0

[Buildroot] [PATCH 1/3] imagemagick: bump to version 7.0.2-0

[Gustavo Zacarias]

Add new disables for libraries that aren't supported in buildroot and
sort them for ease of maintenance.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/imagemagick/imagemagick.hash |  2 +-
 package/imagemagick/imagemagick.mk   | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash
index 8a51047..e34f15a 100644
--- a/package/imagemagick/imagemagick.hash
+++ b/package/imagemagick/imagemagick.hash
@@ -1,2 +1,2 @@
 # From http://www.imagemagick.org/download/releases/digest.rdf
-sha256 c028642af5f4cbae864b4afd6ea96878191be64103ca9c7cc67612ec3cbb9dec ImageMagick-6.9.4-6.tar.xz
+sha256	cd3076a573a815ff828c75d231eef8660f2f6c5eaf848c2f4e8c4dcc955671ea	ImageMagick-7.0.2-0.tar.xz
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 74ac5a4..065f33d 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMAGEMAGICK_VERSION = 6.9.4-6
+IMAGEMAGICK_VERSION = 7.0.2-0
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
 IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases
 IMAGEMAGICK_LICENSE = Apache-2.0
@@ -12,7 +12,7 @@ IMAGEMAGICK_LICENSE_FILES = LICENSE
 
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_CONFIG_SCRIPTS = \
-	$(addsuffix -config,Magick MagickCore MagickWand Wand)
+	$(addsuffix -config,MagickCore MagickWand)
 
 ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy)
 IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config
@@ -23,16 +23,19 @@ IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64
 IMAGEMAGICK_CONF_OPTS = \
 	--program-transform-name='s,,,' \
 	--disable-openmp \
-	--without-perl \
-	--without-wmf \
-	--without-openexr \
-	--without-jp2 \
-	--without-jbig \
-	--without-gvc \
 	--without-djvu \
 	--without-dps \
-	--without-gslib \
+	--without-flif \
 	--without-fpx \
+	--without-gslib \
+	--without-gvc \
+	--without-jbig \
+	--without-jp2 \
+	--without-lqr \
+	--without-openexr \
+	--without-perl \
+	--without-raqm \
+	--without-wmf \
 	--without-x
 
 IMAGEMAGICK_DEPENDENCIES = host-pkgconf
-- 
2.7.3

[Buildroot] [PATCH 2/3] imagemagick: add explicit pango support

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/imagemagick/imagemagick.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 065f33d..641eafb 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -92,6 +92,13 @@ else
 IMAGEMAGICK_CONF_OPTS += --without-xml
 endif
 
+ifeq ($(BR2_PACKAGE_PANGO),y)
+IMAGEMAGICK_CONF_OPTS += --with-pango
+IMAGEMAGICK_DEPENDENCIES += pango
+else
+IMAGEMAGICK_CONF_OPTS += --without-pango
+endif
+
 ifeq ($(BR2_PACKAGE_TIFF),y)
 IMAGEMAGICK_CONF_OPTS += --with-tiff
 IMAGEMAGICK_DEPENDENCIES += tiff
-- 
2.7.3

[Buildroot] [PATCH 3/3] imagemagick: add explicit lzma (xz) support

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/imagemagick/imagemagick.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 641eafb..5ec9174 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -106,6 +106,13 @@ else
 IMAGEMAGICK_CONF_OPTS += --without-tiff
 endif
 
+ifeq ($(BR2_PACKAGE_XZ),y)
+IMAGEMAGICK_CONF_OPTS += --with-lzma
+IMAGEMAGICK_DEPENDENCIES += xz
+else
+IMAGEMAGICK_CONF_OPTS += --without-lzma
+endif
+
 ifeq ($(BR2_PACKAGE_FFTW),y)
 # configure script misdetects these leading to build errors
 IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes
-- 
2.7.3

[Buildroot] [PATCH 1/3] imagemagick: bump to version 7.0.2-0

[Thomas Petazzoni]

Hello,

On Wed, 15 Jun 2016 09:34:21 -0300, Gustavo Zacarias wrote:
> Add new disables for libraries that aren't supported in buildroot and
> sort them for ease of maintenance.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/imagemagick/imagemagick.hash |  2 +-
>  package/imagemagick/imagemagick.mk   | 21 ++++++++++++---------
>  2 files changed, 13 insertions(+), 10 deletions(-)

Entire series applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/3] imagemagick: bump to version 7.0.2-0

[Yann E. MORIN]

Gustavo, All,

On 2016-06-15 09:34 -0300, Gustavo Zacarias spake thusly:
> Add new disables for libraries that aren't supported in buildroot and
> sort them for ease of maintenance.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
[--SNIP--]
> diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
> index 74ac5a4..065f33d 100644
> --- a/package/imagemagick/imagemagick.mk
> +++ b/package/imagemagick/imagemagick.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -IMAGEMAGICK_VERSION = 6.9.4-6
> +IMAGEMAGICK_VERSION = 7.0.2-0

Our oldest bug is about imagemagick not finding ghostscript fonts:
    https://patchwork.ozlabs.org/patch/484767/

Since you just bumped imagemagick, did you have a look if it still
applies?

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/3] imagemagick: bump to version 7.0.2-0

[Gustavo Zacarias]

On 16/06/16 17:22, Yann E. MORIN wrote:

> Our oldest bug is about imagemagick not finding ghostscript fonts:
>      https://patchwork.ozlabs.org/patch/484767/
>
> Since you just bumped imagemagick, did you have a look if it still
> applies?
>
> Regards,
> Yann E. MORIN.

Hi Yann.
The 'default' gs font logic in configure.ac probes for the existance of 
some random font in the standard directories, so i'd bet it's still 
required unless we're building with such fonts being present in the 
build machine.
Regards.

[Buildroot] [PATCH 1/3] imagemagick: bump to version 7.0.2-0

[Thomas Petazzoni]

Hello,

On Sun, 19 Jun 2016 00:31:29 -0300, Gustavo Zacarias wrote:

> The 'default' gs font logic in configure.ac probes for the existance of 
> some random font in the standard directories, so i'd bet it's still 
> required unless we're building with such fonts being present in the 
> build machine.

So can we have your Acked-by and/or Reviewed-by on this oldest patch?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/3] imagemagick: bump to version 7.0.2-0

[Gustavo Zacarias]

On 19/06/16 05:45, Thomas Petazzoni wrote:

> So can we have your Acked-by and/or Reviewed-by on this oldest patch?

Hi.
I'd ack it as is, however it needs a rebase, probably better to send a 
respin?

Rationale is simple: users might not necessarily install fonts via the 
ghostscript-fonts package (addressing Baruch's conditional concerns), 
but then my concern is how much of the functionality is really true 
without ghostscript itself (there are checks in configure):

-------------------------------------------------------------
checking for Ghostscript...
checking for Ghostscript version... 9.15
checking for gs color device... pnmraw
checking for gs alpha device... pngalpha
checking for gs CMYK device... pamcmyk32
checking for gs mono device... pbmraw
checking for gs PDF writing device... pdfwrite
checking for gs PS writing device... ps2write
checking for gs EPS writing device... eps2write
-------------------------------------------------------------

Which also leaks from the host/distro as we can see, and can't be easily 
turned off (lots of AC_CHECK_PROG plus other manual checks).
Which begs the question... how useful are the fonts without these? (i 
don't know the answer, i never used imagemagick that way).

But then the simple 'convert -list font' goes from empty to working with 
ghostscript-fonts installed, hence in the end it looks correct from a 
data file point of view, so i side with it being fine.

Regards.