* for zlib-1.2.6 issue see: http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=20267 * dist-lzip removed because it's not supported in our automake yet * xml is explicity disabled, wasn't enabled before and if autodetected then fails (see comment above EXTRA_OECONF). * LIC_FILES_CHKSUM updated, only formal changes AFAIK see: http://trac.imagemagick.org/log/ImageMagick/trunk/LICENSE for details * empty dirs coders and filters added to PN to fix QA warning
Signed-off-by: Martin Jansa <[email protected]> --- .../PerlMagic_MakePatch.patch | 0 .../imagemagick-6.7.5/remove.dist-lzip.patch | 17 +++++++++++++++++ .../{imagemagick_6.4.4.bb => imagemagick_6.7.5.bb} | 19 +++++++++++-------- 3 files changed, 28 insertions(+), 8 deletions(-) rename meta-oe/recipes-support/imagemagick/{imagemagick-6.4.4 => imagemagick-6.7.5}/PerlMagic_MakePatch.patch (100%) create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch rename meta-oe/recipes-support/imagemagick/{imagemagick_6.4.4.bb => imagemagick_6.7.5.bb} (61%) diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch similarity index 100% rename from meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch rename to meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch new file mode 100644 index 0000000..559aa24 --- /dev/null +++ b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch @@ -0,0 +1,17 @@ +Our automake-1.11.2 doesn't support it yet, see: +http://lists.gnu.org/archive/html/automake/2011-12/msg00081.html + +Upstream-Status: Inappropriate [fix or upgrade oe-core automake] + +diff -uNr ImageMagick-6.7.5-6.orig/configure.ac ImageMagick-6.7.5-6/configure.ac +--- ImageMagick-6.7.5-6.orig/configure.ac 2012-02-12 18:07:28.000000000 +0100 ++++ ImageMagick-6.7.5-6/configure.ac 2012-02-15 12:55:47.668813474 +0100 +@@ -128,7 +128,7 @@ + # Ensure that make can run correctly + AM_SANITY_CHECK + +-AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) ++AM_INIT_AUTOMAKE([1.11 color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip]) + + # Enable support for silent build rules + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb similarity index 61% rename from meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb rename to meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb index d5f95c9..4cecff0 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb @@ -1,27 +1,30 @@ DESCRIPTION = "ImageMagick is an image convertion tools" SECTION = "console/utils" LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e1ebcc1358b9f81eba64255fc5da6892" +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" -PR = "r10" - -PATCHSET = "1" +PATCHSET = "6" SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \ file://PerlMagic_MakePatch.patch \ + file://remove.dist-lzip.patch \ " -SRC_URI[md5sum] = "882ff241f6ad39655541d5055596f93b" -SRC_URI[sha256sum] = "5a5b2779707bfd9816cf17d8f53d242c05005092da192a898ac10961b3b19dda" +SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a" +SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80" -S = "${WORKDIR}/ImageMagick-${PV}" +S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}" inherit autotools binconfig pkgconfig -EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp" +# 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" FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \ ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \ + ${libdir}/ImageMagick-${PV}/modules-Q16/filters \ + ${libdir}/ImageMagick-${PV}/modules-Q16/coders \ ${libdir}/ImageMagick-${PV}/config/ \ ${datadir}/ImageMagick-${PV}" -- 1.7.8.4 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
