[oe-commits] org.oe.dev imagemagick/imagemagick_6.3.5-10.bb : new version of image magick.

[xora commit]

imagemagick/imagemagick_6.3.5-10.bb : new version of image magick.

fixed #1379 by disabling perl image magick as it is broken and looking
at previous recipe has always been broken.

fixed #2525 by pactching the -config files so binconfig can do its magic.
Have built kismet against it and kismet is happy

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 870a9f1c1fbda1d915e29fae9c1613f0ad5ce908
ViewMTN: http://monotone.openembedded.org/revision/info/870a9f1c1fbda1d915e29fae9c1613f0ad5ce908
Files:
1
packages/imagemagick/imagemagick_6.2.9.bb
packages/imagemagick/imagemagick_6.3.5-10.bb
Diffs:

#
# mt diff -r3b02f9b6930a29a8a5f4bc4f9bf91dc27d1380ac -r870a9f1c1fbda1d915e29fae9c1613f0ad5ce908
#
# 
# 
# rename "packages/imagemagick/imagemagick_6.2.9.bb"
#     to "packages/imagemagick/imagemagick_6.3.5-10.bb"
# 
# patch "packages/imagemagick/imagemagick_6.3.5-10.bb"
#  from [87dd6e551201320e8640f418eb13e43df104a02c]
#    to [3a59507dd9ac879052c82916586b76a91884091f]
# 
============================================================
--- packages/imagemagick/imagemagick_6.2.9.bb	87dd6e551201320e8640f418eb13e43df104a02c
+++ packages/imagemagick/imagemagick_6.3.5-10.bb	3a59507dd9ac879052c82916586b76a91884091f
@@ -1,33 +1,35 @@
-LICENSE = "GPL"
+DESCRIPTION = "ImageMagick is an image convertion tools"
 SECTION = "console/utils"
+LICENSE = "GPL"
 DEPENDS = "tiff"
-DESCRIPTION = "ImageMagick is an image convertion tools"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-2.tar.bz2 \
-	   file://PerlMagic_MakePatch;patch=1"
+SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \
+           file://PerlMagic_MakePatch;patch=1 \
+           file://makefile-am.patch;patch=1 \
+           file://binconfig-fixes.patch;patch=1 "
 
-S = "${WORKDIR}/ImageMagick-${PV}"
-PR="r1"
+IMVER = "6.3.5"
 
-inherit autotools binconfig
+S = "${WORKDIR}/ImageMagick-${IMVER}"
 
-EXTRA_OECONF="--without-x"
-EXTRA_OECONF_openprotium="--without-x --without-xml --without-perl"
+inherit autotools binconfig pkgconfig
 
-LEAD_SONAME="libMagick.so.*"
+EXTRA_OECONF = "--without-x --without-freetype --without-perl"
+EXTRA_OECONF_openprotium = "--without-x --without-freetype --without-xml --without-perl"
 
-FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
-        ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
-		${libdir}/ImageMagick-${PV}/config/ \
-		${datadir}/ImageMagick-${PV}"
+do_stage() {
+	autotools_stage_all
+}
 
-FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*"
+FILES_${PN} += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.so \
+                ${libdir}/ImageMagick-${IMVER}/config/ \
+                ${datadir}/ImageMagick-${IMVER}"
 
+FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \
+                    ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a"
+
+FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*"
+
+LEAD_SONAME = "libMagick.so.*"
+
-do_stage() {
-    oe_libinstall -so -a libMagick ${STAGING_LIBDIR}
-    oe_libinstall -so -a libWand ${STAGING_LIBDIR}
-    install -d ${STAGING_INCDIR}/wand/
-    install -d ${STAGING_INCDIR}/magick/
-    install -m 0644 wand/*.h ${STAGING_INCDIR}/wand/
-    install -m 0644 magick/*.h ${STAGING_INCDIR}/magick/
-}