summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/imagemagick
diff options
context:
space:
mode:
authorCatalin Enache <catalin.enache@windriver.com>2016-03-30 12:08:07 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2016-04-12 11:07:33 +0200
commitd3e1334ce915cfa8516c26e78c6925c9a5b4f45b (patch)
treea02d5d08e8af561af47bf80d5e29709c23f05bb2 /meta-oe/recipes-support/imagemagick
parent83c0fd36761e1224f08d5f6a42c4a0dba33e3bb1 (diff)
downloadmeta-openembedded-d3e1334ce915cfa8516c26e78c6925c9a5b4f45b.tar.gz
imagemagick: add PACKAGECONFIG for x11
ImageMagick should X11 delegate libraries if they are available Signed-off-by: Catalin Enache <catalin.enache@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/imagemagick')
-rw-r--r--meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
index 12604c057..a9f01344a 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb
@@ -20,16 +20,17 @@ inherit autotools pkgconfig update-alternatives
20 20
21# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 21# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2
22# if someone needs xml support then fix it first 22# if someone needs xml support then fix it first
23EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-x --without-perl --disable-openmp --without-xml --disable-opencl" 23EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-perl --disable-openmp --without-xml --disable-opencl"
24 24
25CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" 25CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes"
26PACKAGECONFIG ??= "" 26PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
27PACKAGECONFIG[jp2] = "--with-jp2,,jasper" 27PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
28PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" 28PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
29PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg" 29PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
30PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo" 30PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
31PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" 31PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
32PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" 32PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
33PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
33 34
34FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ 35FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
35 ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ 36 ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \