imagemagick: add PACKAGECONFIG for x11
PATCH 1/1 imagemagick: add PACKAGECONFIG for x11
ImageMagick should X11 delegate libraries if they are available
Signed-off-by Catalin Enache <[email protected]>
--- meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb +2 -1
@@ -23,13 +23,14 @@ inherit autotools pkgconfig update-alternatives EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-x --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 \
Signature · 1 line
2.7.4
meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb inherit autotools pkgconfig update-alternatives · line 23
Quoted 13 lines · Catalin Enache
ImageMagick should X11 delegate libraries if they are available
Signed-off-by Catalin Enache <[email protected]>--- meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb +0
-0@@ -23,13 +23,14 @@ inherit autotools pkgconfig update-alternatives EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-x --without-perl --disable-openmp --without-xml --disable-opencl"
You should remove --without-x from EXTRA_OECONF when adding the PACKAGECONFIG for it.
Quoted 22 lines
meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb +2
-1CACHED_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 \Signature · 7 lines
2.7.4 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]