aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/imagemagick
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-12-27 12:15:21 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-27 16:14:23 +0100
commit1de21e56eeefdcfe4972900cf9f651ba1d8c9f0b (patch)
tree9db9613afbdade4be1fafbe3f4b657018efda3e0 /meta-oe/recipes-support/imagemagick
parent0129f398825fb5de9ae5dd09fd163bee64126fbc (diff)
downloadmeta-openembedded-contrib-1de21e56eeefdcfe4972900cf9f651ba1d8c9f0b.tar.gz
imagemagick: disable opencl
* it can try to use host paths like: -lOpenCL -L/usr/lib/nvidia -lCL -L/usr/lib/nvidia -lclparser -L/usr/lib/nvidia ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. 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.7.5.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
index 5e8bc858fe..9f3d4eac4e 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b"
# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results.
DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib fftw"
-PR = "r4"
+PR = "r5"
PATCHSET = "6"
SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
@@ -21,7 +21,7 @@ inherit autotools binconfig pkgconfig
# 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= --without-x --without-freetype --without-perl --disable-openmp --without-xml"
+EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp --without-xml --disable-opencl"
FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \