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

2 files changed, 35 insertions, 33 deletions

diff --git a/packages/imagemagick/imagemagick_6.2.9.bb b/packages/imagemagick/imagemagick_6.2.9.bb
deleted file mode 100644
index a403e1a629..0000000000
--- a/packages/imagemagick/imagemagick_6.2.9.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-LICENSE = "GPL"
-SECTION = "console/utils"
-DEPENDS = "tiff"
-DESCRIPTION = "ImageMagick is an image convertion tools"
-
-SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-2.tar.bz2 \
-	   file://PerlMagic_MakePatch;patch=1"
-
-S = "${WORKDIR}/ImageMagick-${PV}"
-PR="r1"
-
-inherit autotools binconfig
-
-EXTRA_OECONF="--without-x"
-EXTRA_OECONF_openprotium="--without-x --without-xml --without-perl"
-
-LEAD_SONAME="libMagick.so.*"
-
-FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
-        ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
-		${libdir}/ImageMagick-${PV}/config/ \
-		${datadir}/ImageMagick-${PV}"
-
-FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*"
-
-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/
-}
diff --git a/packages/imagemagick/imagemagick_6.3.5-10.bb b/packages/imagemagick/imagemagick_6.3.5-10.bb
new file mode 100644
index 0000000000..56229802ac
--- /dev/null
+++ b/packages/imagemagick/imagemagick_6.3.5-10.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "ImageMagick is an image convertion tools"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "tiff"
+PR = "r1"
+
+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 "
+
+IMVER = "6.3.5"
+
+S = "${WORKDIR}/ImageMagick-${IMVER}"
+
+inherit autotools binconfig pkgconfig
+
+EXTRA_OECONF = "--without-x --without-freetype --without-perl"
+EXTRA_OECONF_openprotium = "--without-x --without-freetype --without-xml --without-perl"
+
+do_stage() {
+	autotools_stage_all
+}
+
+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.*"
+