[oe-commits] [meta-openembedded] 06/28: imagemagick: add PACKAGECONFIG for x11
git at git.openembedded.org
git at git.openembedded.org
Sun Apr 3 11:42:07 UTC 2016
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 7bfcacc10f0a709b17878c9364e3a2b582b86eb0
Author: Catalin Enache <catalin.enache at windriver.com>
AuthorDate: Wed Mar 30 12:08:07 2016 +0300
imagemagick: add PACKAGECONFIG for x11
ImageMagick should X11 delegate libraries if they are available
Signed-off-by: Catalin Enache <catalin.enache at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb | 5 +++--
1 file 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 12604c0..a9f0134 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
# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2
# if someone needs xml support then fix it first
-EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-x --without-perl --disable-openmp --without-xml --disable-opencl"
+EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-perl --disable-openmp --without-xml --disable-opencl"
CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes"
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
+PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list