* [meta-oe 1/2] imagemagick: upgrade to latest stable version
@ 2012-02-20 7:54 Eric Bénard
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
0 siblings, 2 replies; 4+ messages in thread
From: Eric Bénard @ 2012-02-20 7:54 UTC (permalink / raw)
To: openembedded-devel; +Cc: Eric Bénard
- 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-oe 2/2] lzip: add new recipe
2012-02-20 7:54 [meta-oe 1/2] imagemagick: upgrade to latest stable version Eric Bénard
@ 2012-02-20 7:54 ` Eric Bénard
2012-02-20 8:08 ` [meta-oe 1/2] imagemagick: upgrade to latest stable version Martin Jansa
1 sibling, 0 replies; 4+ messages in thread
From: Eric Bénard @ 2012-02-20 7:54 UTC (permalink / raw)
To: openembedded-devel; +Cc: Eric Bénard
- this recipe is imported from oe-classic and upgrade to latest
stable version
- it was only compile tested
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
meta-oe/recipes-support/lzip/lzip_1.12.bb | 36 +++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-support/lzip/lzip_1.12.bb
diff --git a/meta-oe/recipes-support/lzip/lzip_1.12.bb b/meta-oe/recipes-support/lzip/lzip_1.12.bb
new file mode 100644
index 0000000..68f9d0d
--- /dev/null
+++ b/meta-oe/recipes-support/lzip/lzip_1.12.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Lzip is a lossless data compressor based on the LZMA algorithm"
+HOMEPAGE = "http://lzip.nongnu.org/lzip.html"
+SECTION = "console/utils"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
+
+SRC_URI = "http://download.savannah.gnu.org/releases/lzip/lzip-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "69a40172db5ce896b58d862c50fcd517"
+SRC_URI[sha256sum] = "eabc590d02d404dc1a1cc8e2777ed398370174b68edb22043c8ca0b209dfcd27"
+
+CONFIGUREOPTS = "\
+ '--srcdir=${S}' \
+ '--prefix=${prefix}' \
+ '--exec-prefix=${exec_prefix}' \
+ '--bindir=${bindir}' \
+ '--datadir=${datadir}' \
+ '--infodir=${infodir}' \
+ '--sysconfdir=${sysconfdir}' \
+ 'CXX=${CXX}' \
+ 'CPPFLAGS=${CPPFLAGS}' \
+ 'CXXFLAGS=${CXXFLAGS}' \
+ 'LDFLAGS=${LDFLAGS}' \
+"
+EXTRA_OEMAKE = ""
+
+B = "${S}/obj"
+do_configure () {
+ ${S}/configure ${CONFIGUREOPTS}
+}
+
+do_install () {
+ oe_runmake 'DESTDIR=${D}' install
+}
+
+BBCLASSEXTEND += "native nativesdk"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-oe 1/2] imagemagick: upgrade to latest stable version
2012-02-20 7:54 [meta-oe 1/2] imagemagick: upgrade to latest stable version Eric Bénard
2012-02-20 7:54 ` [meta-oe 2/2] lzip: add new recipe Eric Bénard
@ 2012-02-20 8:08 ` Martin Jansa
2012-02-20 8:43 ` Eric Bénard
1 sibling, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2012-02-20 8:08 UTC (permalink / raw)
To: openembedded-devel; +Cc: Eric Bénard
[-- Attachment #1: Type: text/plain, Size: 6633 bytes --]
On Mon, Feb 20, 2012 at 08:54:28AM +0100, Eric Bénard wrote:
> - 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)
can you compare with
http://patchwork.openembedded.org/patch/21285/
?
Cheers,
>
> 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
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-oe 1/2] imagemagick: upgrade to latest stable version
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
0 siblings, 0 replies; 4+ messages in thread
From: Eric Bénard @ 2012-02-20 8:43 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-devel
Hi Martin,
Le Mon, 20 Feb 2012 09:08:09 +0100,
Martin Jansa <martin.jansa@gmail.com> a écrit :
> On Mon, Feb 20, 2012 at 08:54:28AM +0100, Eric Bénard wrote:
> > - 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)
>
> can you compare with
> http://patchwork.openembedded.org/patch/21285/
> ?
>
as very often your patch is better;-) I still have to catchup with a
few hundreds of mail on the ML (and I should have started by that ;-)
Thanks !
Eric
--
http://eukrea.com/en/news/104-2012
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-02-20 8:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-20 7:54 [meta-oe 1/2] imagemagick: upgrade to latest stable version Eric Bénard
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
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.