diff options
| author | Thomas Zimmermann <ml@vdm-design.de> | 2010-03-24 22:54:32 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-03-26 11:13:46 +0100 |
| commit | a123e2d2ad31f85363dd63f2cb8f3bd684f5b61a (patch) | |
| tree | 972baf9c70bbd0b8382dca6df43a504f11a34ad8 | |
| parent | d775a0d83ea4b322fcc606d6ccde67825869ce3d (diff) | |
imagemagick: convert to BBCLASSEXTEND and new staging
* now imagemagick is buildable again with autoconf > 2.63
* tiff-native now exists, so no need to override DEPENDS of -native anymore
Signed-off-by: Thomas Zimmermann <ml@vdm-design.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes/imagemagick/imagemagick-native_6.3.5-10.bb | 6 | ||||
| -rw-r--r-- | recipes/imagemagick/imagemagick_6.3.5-10.bb | 10 | ||||
| -rw-r--r-- | recipes/imagemagick/imagemagick_6.4.4-1.bb | 10 |
3 files changed, 8 insertions, 18 deletions
diff --git a/recipes/imagemagick/imagemagick-native_6.3.5-10.bb b/recipes/imagemagick/imagemagick-native_6.3.5-10.bb deleted file mode 100644 index d2efd36cc1..0000000000 --- a/recipes/imagemagick/imagemagick-native_6.3.5-10.bb +++ /dev/null @@ -1,6 +0,0 @@ -require imagemagick_${PV}.bb -DEPENDS ="libtool-native" -# FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. -# tiff-native does not exist -DEPENDS += "bzip2-native jpeg-native libpng-native librsvg-native zlib-native" -inherit native diff --git a/recipes/imagemagick/imagemagick_6.3.5-10.bb b/recipes/imagemagick/imagemagick_6.3.5-10.bb index b399741352..58f3b2327f 100644 --- a/recipes/imagemagick/imagemagick_6.3.5-10.bb +++ b/recipes/imagemagick/imagemagick_6.3.5-10.bb @@ -2,7 +2,7 @@ DESCRIPTION = "ImageMagick is an image convertion tools" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "tiff jpeg libpng librsvg tiff zlib" -PR = "r7" +PR = "r8" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ file://PerlMagic_MakePatch;patch=1 \ @@ -14,16 +14,12 @@ IMVER = "6.3.5" S = "${WORKDIR}/ImageMagick-${IMVER}" -inherit autotools binconfig pkgconfig +inherit autotools_stage binconfig pkgconfig EXTRA_AUTORECONF += "--exclude=libtoolize" 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}/modules-Q16/*/*.la \ ${libdir}/ImageMagick-${IMVER}/config/ \ @@ -33,5 +29,7 @@ FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a" FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*" +BBCLASSEXTEND = "native" + LEAD_SONAME = "libMagick.so.*" diff --git a/recipes/imagemagick/imagemagick_6.4.4-1.bb b/recipes/imagemagick/imagemagick_6.4.4-1.bb index bc16b0c0b9..1b17664917 100644 --- a/recipes/imagemagick/imagemagick_6.4.4-1.bb +++ b/recipes/imagemagick/imagemagick_6.4.4-1.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" # FIXME: There is much more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "bzip2 jpeg libpng librsvg tiff zlib" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}.tar.bz2 \ file://PerlMagic_MakePatch;patch=1 \ @@ -14,15 +14,11 @@ IMVER = "6.4.4" S = "${WORKDIR}/ImageMagick-${IMVER}" -inherit autotools binconfig pkgconfig +inherit autotools_stage binconfig pkgconfig EXTRA_AUTORECONF += "--exclude=libtoolize" EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp" -do_stage() { - autotools_stage_all -} - FILES_${PN} += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.so \ ${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.la \ ${libdir}/ImageMagick-${IMVER}/config/ \ @@ -32,5 +28,7 @@ FILES_${PN}-dev += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/*.a" FILES_${PN}-dbg += "${libdir}/ImageMagick-${IMVER}/modules-Q16/*/.debug/*" +BBCLASSEXTEND = "native" + LEAD_SONAME = "libMagickCore.so.*" |