diff options
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb | 5 |
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 |
23 | EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-x --without-perl --disable-openmp --without-xml --disable-opencl" | 23 | EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-perl --disable-openmp --without-xml --disable-opencl" |
24 | 24 | ||
25 | CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" | 25 | CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" |
26 | PACKAGECONFIG ??= "" | 26 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
27 | PACKAGECONFIG[jp2] = "--with-jp2,,jasper" | 27 | PACKAGECONFIG[jp2] = "--with-jp2,,jasper" |
28 | PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" | 28 | PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz" |
29 | PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg" | 29 | PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg" |
30 | PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo" | 30 | PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo" |
31 | PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" | 31 | PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" |
32 | PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" | 32 | PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf" |
33 | PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt" | ||
33 | 34 | ||
34 | FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ | 35 | FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ |
35 | ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ | 36 | ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ |