From: "Eric Bénard" <eric@eukrea.com>
To: openembedded-devel@lists.openembedded.org
Cc: "Eric Bénard" <eric@eukrea.com>
Subject: [meta-oe 1/2] imagemagick: upgrade to latest stable version
Date: Mon, 20 Feb 2012 08:54:28 +0100 [thread overview]
Message-ID: <1329724469-2002-1-git-send-email-eric@eukrea.com> (raw)
- 6.4.4 doesn't compile following zlib upgrade to 1.26
- hack configure.ac to remove lzip requirement for autoconf (which
is not present in OE and not needed for compiling imagemagick)
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
.../imagemagick-6.4.4/PerlMagic_MakePatch.patch | 11 ------
.../imagemagick-6.7.5/PerlMagic_MakePatch.patch | 11 ++++++
.../imagemagick/imagemagick_6.4.4.bb | 38 --------------------
.../imagemagick/imagemagick_6.7.5.bb | 37 +++++++++++++++++++
4 files changed, 48 insertions(+), 49 deletions(-)
delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch
create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb
create mode 100644 meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch
deleted file mode 100644
index f8ad0af..0000000
--- a/meta-oe/recipes-support/imagemagick/imagemagick-6.4.4/PerlMagic_MakePatch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/Makefile.PL.in 2008-10-01 10:39:38.000000000 +0200
-+++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in 2008-10-01 10:40:25.000000000 +0200
-@@ -87,6 +87,8 @@
-
- # Use same compiler as ImageMagick
- 'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@',
-+ 'AR' => '@AR@',
-+ 'LD' => '@PERLMAINCC@',
-
- # Set Perl installation prefix to ImageMagick installation prefix
- # 'PREFIX' => '@prefix@',
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
new file mode 100644
index 0000000..f8ad0af
--- /dev/null
+++ b/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.PL.in 2008-10-01 10:39:38.000000000 +0200
++++ ImageMagick-6.4.4/PerlMagick/Makefile.PL.in 2008-10-01 10:40:25.000000000 +0200
+@@ -87,6 +87,8 @@
+
+ # Use same compiler as ImageMagick
+ 'PERLMAINCC' => '@PERLMAINCC@ @OPENMP_CFLAGS@',
++ 'AR' => '@AR@',
++ 'LD' => '@PERLMAINCC@',
+
+ # Set Perl installation prefix to ImageMagick installation prefix
+ # 'PREFIX' => '@prefix@',
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb
deleted file mode 100644
index d5f95c9..0000000
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.4.4.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "ImageMagick is an image convertion tools"
-SECTION = "console/utils"
-LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e1ebcc1358b9f81eba64255fc5da6892"
-# 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"
-SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
- file://PerlMagic_MakePatch.patch \
- "
-SRC_URI[md5sum] = "882ff241f6ad39655541d5055596f93b"
-SRC_URI[sha256sum] = "5a5b2779707bfd9816cf17d8f53d242c05005092da192a898ac10961b3b19dda"
-
-S = "${WORKDIR}/ImageMagick-${PV}"
-
-inherit autotools binconfig pkgconfig
-
-EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp"
-
-FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
- ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
- ${libdir}/ImageMagick-${PV}/config/ \
- ${datadir}/ImageMagick-${PV}"
-
-FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a"
-
-FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*"
-
-BBCLASSEXTEND = "native"
-
-LEAD_SONAME = "libMagickCore.so.*"
-
-do_configure_prepend() {
- export ac_cv_sys_file_offset_bits=yes
-}
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
new file mode 100644
index 0000000..9b8b799
--- /dev/null
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "ImageMagick is an image convertion tools"
+SECTION = "console/utils"
+LICENSE = "ImageMagick"
+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"
+
+PATCHSET = "6"
+SRC_URI = "ftp://ftp.nluug.nl/pub/ImageMagick/ImageMagick-${PV}-${PATCHSET}.tar.bz2 \
+ file://PerlMagic_MakePatch.patch \
+ "
+SRC_URI[md5sum] = "bcf07cf0822572fa2b47fa6d506f699a"
+SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80"
+
+S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
+
+inherit autotools binconfig pkgconfig
+
+EXTRA_OECONF = "--program-prefix= --without-x --without-freetype --without-perl --disable-openmp"
+
+FILES_${PN} += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.so \
+ ${libdir}/ImageMagick-${PV}/modules-Q16/*/*.la \
+ ${libdir}/ImageMagick-${PV}/config/ \
+ ${datadir}/ImageMagick-${PV}"
+
+FILES_${PN}-dev += "${libdir}/ImageMagick-${PV}/modules-Q16/*/*.a"
+
+FILES_${PN}-dbg += "${libdir}/ImageMagick-${PV}/modules-Q16/*/.debug/*"
+
+BBCLASSEXTEND = "native"
+
+LEAD_SONAME = "libMagickCore.so.*"
+
+do_configure_prepend() {
+ export ac_cv_sys_file_offset_bits=yes
+ sed -i -e s:dist-lzip::g ${S}/configure.ac
+}
--
1.7.7.6
next reply other threads:[~2012-02-20 8:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-20 7:54 Eric Bénard [this message]
2012-02-20 7:54 ` [meta-oe 2/2] lzip: add new recipe Eric Bénard
2012-02-20 8:08 ` [meta-oe 1/2] imagemagick: upgrade to latest stable version Martin Jansa
2012-02-20 8:43 ` Eric Bénard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329724469-2002-1-git-send-email-eric@eukrea.com \
--to=eric@eukrea.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.