[meta-oe][PATCH v2] imagemagick: add some PACKAGECONFIG, fix unrecognized --without-jp2 option

[meta-oe][PATCH v2] imagemagick: add some PACKAGECONFIG, fix unrecognized --without-jp2 option

[Tim Orling]

* Add PACKAGECONFIG for lzma, pango, webp, wmf

Change in v2:
* libwmf is currently blacklisted, so #comment it out

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
index e261eb8..4b52568 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
@@ -2,7 +2,7 @@ SUMMARY = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
 LICENSE = "ImageMagick"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e"
-# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results.
+# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
 DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype"
 
 PATCHSET = "10"
@@ -21,7 +21,12 @@ inherit autotools binconfig pkgconfig
 EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-x --without-perl --disable-openmp --without-xml --disable-opencl"
 
 PACKAGECONFIG ??= ""
-PACKAGECONFIG[jp2] = "--with-jp2,--without-jp2,jasper"
+PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
+PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
+PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
+PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
+# libwmf is currently blacklisted
+#PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
 
 FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
                 ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
-- 
1.9.3

Re: [meta-oe][PATCH v2] imagemagick: add some PACKAGECONFIG, fix unrecognized --without-jp2 option

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2354 bytes --]

On Sun, Jul 20, 2014 at 12:16:26PM -0700, Tim Orling wrote:
> * Add PACKAGECONFIG for lzma, pango, webp, wmf
> 
> Change in v2:
> * libwmf is currently blacklisted, so #comment it out

I like v1 more, because explicitly disable libwmf is better than
floating.

> Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> ---
>  meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
> index e261eb8..4b52568 100644
> --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
> +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
> @@ -2,7 +2,7 @@ SUMMARY = "ImageMagick is an image convertion tools"
>  SECTION = "console/utils"
>  LICENSE = "ImageMagick"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e"
> -# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results.
> +# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
>  DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype"
>  
>  PATCHSET = "10"
> @@ -21,7 +21,12 @@ inherit autotools binconfig pkgconfig
>  EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-x --without-perl --disable-openmp --without-xml --disable-opencl"
>  
>  PACKAGECONFIG ??= ""
> -PACKAGECONFIG[jp2] = "--with-jp2,--without-jp2,jasper"
> +PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
> +PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
> +PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
> +PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
> +# libwmf is currently blacklisted
> +#PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
>  
>  FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
>                  ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
> -- 
> 1.9.3
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-oe][PATCH v2] imagemagick: add some PACKAGECONFIG, fix unrecognized --without-jp2 option

[Tim Orling]

On Sun, Jul 20, 2014 at 12:53 PM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> On Sun, Jul 20, 2014 at 12:16:26PM -0700, Tim Orling wrote:
> > * Add PACKAGECONFIG for lzma, pango, webp, wmf
> >
> > Change in v2:
> > * libwmf is currently blacklisted, so #comment it out
>
> I like v1 more, because explicitly disable libwmf is better than
> floating.
>
> Fine with me. I commented out the line during testing because it failed
due to blacklist.
v1 it is :)


> > Signed-off-by: Tim Orling <TicoTimo@gmail.com>
> > ---
> >  meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb | 9 +++++++--
> >  1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
> b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
> > index e261eb8..4b52568 100644
> > --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
> > +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.8.bb
> > @@ -2,7 +2,7 @@ SUMMARY = "ImageMagick is an image convertion tools"
> >  SECTION = "console/utils"
> >  LICENSE = "ImageMagick"
> >  LIC_FILES_CHKSUM = "file://LICENSE;md5=5d84c6ddd4028aa53d028b4c50f9361e"
> > -# FIXME: There is much more checked libraries. All should be added or
> explicitly disabled to get consistent results.
> > +# FIXME: There are many more checked libraries. All should be added or
> explicitly disabled to get consistent results.
> >  DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw freetype"
> >
> >  PATCHSET = "10"
> > @@ -21,7 +21,12 @@ inherit autotools binconfig pkgconfig
> >  EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-x
> --without-perl --disable-openmp --without-xml --disable-opencl"
> >
> >  PACKAGECONFIG ??= ""
> > -PACKAGECONFIG[jp2] = "--with-jp2,--without-jp2,jasper"
> > +PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
> > +PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
> > +PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
> > +PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
> > +# libwmf is currently blacklisted
> > +#PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
> >
> >  FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
> >                  ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
> > --
> > 1.9.3
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>