* [meta-oe][PATCH] ImageMagick: update to upstream version 6.8.6-8
@ 2013-08-16 10:10 Marko Lindqvist
2013-08-19 10:26 ` Martin Jansa
2013-08-23 7:26 ` Martin Jansa
0 siblings, 2 replies; 6+ messages in thread
From: Marko Lindqvist @ 2013-08-16 10:10 UTC (permalink / raw)
To: openembedded-devel
- License changed by additional copyright year only.
- Patch PerlMagic_MakePatch.patch part of upstream now
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
.../imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch | 11 -----------
.../remove.dist-lzip.patch | 0
.../{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb} | 11 ++++-------
3 files changed, 4 insertions(+), 18 deletions(-)
delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
rename meta-oe/recipes-support/imagemagick/{imagemagick-6.7.5 => imagemagick-6.8.6}/remove.dist-lzip.patch (100%)
rename meta-oe/recipes-support/imagemagick/{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb} (83%)
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
deleted file mode 100644
index f8ad0af..0000000
--- a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/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/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
similarity index 100%
rename from meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch
rename to meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
similarity index 83%
rename from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
rename to meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
index 2f0fad5..4b55ae8 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
@@ -1,19 +1,16 @@
DESCRIPTION = "ImageMagick is an image convertion tools"
SECTION = "console/utils"
LICENSE = "ImageMagick"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b1bf06a8d02cb00b02dea7d03ef9525f"
# 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 fftw"
-PR = "r5"
-
-PATCHSET = "6"
+PATCHSET = "8"
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] = "bcf07cf0822572fa2b47fa6d506f699a"
-SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80"
+SRC_URI[md5sum] = "ea66fbb6fc1354312bc4971c0a0cfb3c"
+SRC_URI[sha256sum] = "eb33e0ba6aeb542b7127ee1c2f62961236428b233e9911aa86e1b66b3342ea1d"
S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] ImageMagick: update to upstream version 6.8.6-8
2013-08-16 10:10 [meta-oe][PATCH] ImageMagick: update to upstream version 6.8.6-8 Marko Lindqvist
@ 2013-08-19 10:26 ` Martin Jansa
2013-08-19 10:38 ` Marko Lindqvist
2013-08-23 7:26 ` Martin Jansa
1 sibling, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-08-19 10:26 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4058 bytes --]
On Fri, Aug 16, 2013 at 01:10:01PM +0300, Marko Lindqvist wrote:
> - License changed by additional copyright year only.
> - Patch PerlMagic_MakePatch.patch part of upstream now
Looks good now, do you still need freetype support?
http://patchwork.openembedded.org/patch/51217/
It would be better implemented as PACKAGECONFIG but I'm OK with it.
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> ---
> .../imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch | 11 -----------
> .../remove.dist-lzip.patch | 0
> .../{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb} | 11 ++++-------
> 3 files changed, 4 insertions(+), 18 deletions(-)
> delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
> rename meta-oe/recipes-support/imagemagick/{imagemagick-6.7.5 => imagemagick-6.8.6}/remove.dist-lzip.patch (100%)
> rename meta-oe/recipes-support/imagemagick/{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb} (83%)
>
> 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
> deleted file mode 100644
> index f8ad0af..0000000
> --- a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/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/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
> similarity index 100%
> rename from meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch
> rename to meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
> diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
> similarity index 83%
> rename from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
> rename to meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
> index 2f0fad5..4b55ae8 100644
> --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
> +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
> @@ -1,19 +1,16 @@
> DESCRIPTION = "ImageMagick is an image convertion tools"
> SECTION = "console/utils"
> LICENSE = "ImageMagick"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1bf06a8d02cb00b02dea7d03ef9525f"
> # 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 fftw"
>
> -PR = "r5"
> -
> -PATCHSET = "6"
> +PATCHSET = "8"
> 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] = "bcf07cf0822572fa2b47fa6d506f699a"
> -SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80"
> +SRC_URI[md5sum] = "ea66fbb6fc1354312bc4971c0a0cfb3c"
> +SRC_URI[sha256sum] = "eb33e0ba6aeb542b7127ee1c2f62961236428b233e9911aa86e1b66b3342ea1d"
>
> S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
>
> --
> 1.7.10.4
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/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] 6+ messages in thread
* Re: [meta-oe][PATCH] ImageMagick: update to upstream version 6.8.6-8
2013-08-19 10:26 ` Martin Jansa
@ 2013-08-19 10:38 ` Marko Lindqvist
0 siblings, 0 replies; 6+ messages in thread
From: Marko Lindqvist @ 2013-08-19 10:38 UTC (permalink / raw)
To: openembedded-devel
On 19 August 2013 13:26, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, Aug 16, 2013 at 01:10:01PM +0300, Marko Lindqvist wrote:
>> - License changed by additional copyright year only.
>> - Patch PerlMagic_MakePatch.patch part of upstream now
>
> Looks good now, do you still need freetype support?
> http://patchwork.openembedded.org/patch/51217/
Oh, I had completely forgotten I had submitted similar patch already!
Yes, I'm going to need freetype delegate in ImageMagick assuming I get
the freeciv mapimg feature otherwise to work.
- ML
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] ImageMagick: update to upstream version 6.8.6-8
2013-08-16 10:10 [meta-oe][PATCH] ImageMagick: update to upstream version 6.8.6-8 Marko Lindqvist
2013-08-19 10:26 ` Martin Jansa
@ 2013-08-23 7:26 ` Martin Jansa
2013-08-23 7:53 ` Marko Lindqvist
1 sibling, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-08-23 7:26 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4357 bytes --]
On Fri, Aug 16, 2013 at 01:10:01PM +0300, Marko Lindqvist wrote:
> - License changed by additional copyright year only.
> - Patch PerlMagic_MakePatch.patch part of upstream now
Same issue as with 6.8.5
http://lists.openembedded.org/pipermail/openembedded-devel/2013-June/091027.html
imagemagick-6.8.6: imagemagick: Files/directories were installed but not
shipped
/usr/lib/ImageMagick-6.8.6
/usr/lib/ImageMagick-6.8.6/config-Q16
/usr/lib/ImageMagick-6.8.6/config-Q16/configure.xml
/usr/share/ImageMagick-6
/usr/share/ImageMagick-6/english.xml
/usr/share/ImageMagick-6/francais.xml
/usr/share/ImageMagick-6/locale.xml
>
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> ---
> .../imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch | 11 -----------
> .../remove.dist-lzip.patch | 0
> .../{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb} | 11 ++++-------
> 3 files changed, 4 insertions(+), 18 deletions(-)
> delete mode 100644 meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/PerlMagic_MakePatch.patch
> rename meta-oe/recipes-support/imagemagick/{imagemagick-6.7.5 => imagemagick-6.8.6}/remove.dist-lzip.patch (100%)
> rename meta-oe/recipes-support/imagemagick/{imagemagick_6.7.5.bb => imagemagick_6.8.6.bb} (83%)
>
> 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
> deleted file mode 100644
> index f8ad0af..0000000
> --- a/meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/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/remove.dist-lzip.patch b/meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
> similarity index 100%
> rename from meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch
> rename to meta-oe/recipes-support/imagemagick/imagemagick-6.8.6/remove.dist-lzip.patch
> diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
> similarity index 83%
> rename from meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
> rename to meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
> index 2f0fad5..4b55ae8 100644
> --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.7.5.bb
> +++ b/meta-oe/recipes-support/imagemagick/imagemagick_6.8.6.bb
> @@ -1,19 +1,16 @@
> DESCRIPTION = "ImageMagick is an image convertion tools"
> SECTION = "console/utils"
> LICENSE = "ImageMagick"
> -LIC_FILES_CHKSUM = "file://LICENSE;md5=944f66dcedc98d5a4e5d964bd3b32e7b"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=b1bf06a8d02cb00b02dea7d03ef9525f"
> # 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 fftw"
>
> -PR = "r5"
> -
> -PATCHSET = "6"
> +PATCHSET = "8"
> 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] = "bcf07cf0822572fa2b47fa6d506f699a"
> -SRC_URI[sha256sum] = "d9347f31d3d35b40009e1bbcf713c5ad252411e05ee621d5a7dae01e47bdbd80"
> +SRC_URI[md5sum] = "ea66fbb6fc1354312bc4971c0a0cfb3c"
> +SRC_URI[sha256sum] = "eb33e0ba6aeb542b7127ee1c2f62961236428b233e9911aa86e1b66b3342ea1d"
>
> S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}"
>
> --
> 1.7.10.4
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/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] 6+ messages in thread
* Re: [meta-oe][PATCH] ImageMagick: update to upstream version 6.8.6-8
2013-08-23 7:26 ` Martin Jansa
@ 2013-08-23 7:53 ` Marko Lindqvist
2013-08-23 9:20 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Marko Lindqvist @ 2013-08-23 7:53 UTC (permalink / raw)
To: openembedded-devel
On 23 August 2013 10:26, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Fri, Aug 16, 2013 at 01:10:01PM +0300, Marko Lindqvist wrote:
>> - License changed by additional copyright year only.
>> - Patch PerlMagic_MakePatch.patch part of upstream now
>
> Same issue as with 6.8.5
> http://lists.openembedded.org/pipermail/openembedded-devel/2013-June/091027.html
>
> imagemagick-6.8.6: imagemagick: Files/directories were installed but not
> shipped
> /usr/lib/ImageMagick-6.8.6
> /usr/lib/ImageMagick-6.8.6/config-Q16
> /usr/lib/ImageMagick-6.8.6/config-Q16/configure.xml
> /usr/share/ImageMagick-6
> /usr/share/ImageMagick-6/english.xml
> /usr/share/ImageMagick-6/francais.xml
> /usr/share/ImageMagick-6/locale.xml
I'll add note to myself to check that when I next time work with that
recipe (updating it to then latest imageMagick). I'm currently giving
that general line of development a break and ended explicitly
disabling freeciv mapimg feature instead (of making it to work).
- ML
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] ImageMagick: update to upstream version 6.8.6-8
2013-08-23 7:53 ` Marko Lindqvist
@ 2013-08-23 9:20 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2013-08-23 9:20 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]
On Fri, Aug 23, 2013 at 10:53:01AM +0300, Marko Lindqvist wrote:
> On 23 August 2013 10:26, Martin Jansa <martin.jansa@gmail.com> wrote:
> > On Fri, Aug 16, 2013 at 01:10:01PM +0300, Marko Lindqvist wrote:
> >> - License changed by additional copyright year only.
> >> - Patch PerlMagic_MakePatch.patch part of upstream now
> >
> > Same issue as with 6.8.5
> > http://lists.openembedded.org/pipermail/openembedded-devel/2013-June/091027.html
> >
> > imagemagick-6.8.6: imagemagick: Files/directories were installed but not
> > shipped
> > /usr/lib/ImageMagick-6.8.6
> > /usr/lib/ImageMagick-6.8.6/config-Q16
> > /usr/lib/ImageMagick-6.8.6/config-Q16/configure.xml
> > /usr/share/ImageMagick-6
> > /usr/share/ImageMagick-6/english.xml
> > /usr/share/ImageMagick-6/francais.xml
> > /usr/share/ImageMagick-6/locale.xml
>
> I'll add note to myself to check that when I next time work with that
> recipe (updating it to then latest imageMagick). I'm currently giving
> that general line of development a break and ended explicitly
> disabling freeciv mapimg feature instead (of making it to work).
If you just update FILES_* variables to package it somewhere I'll take
this imagemagick upgrade and the freetype delegate one.
Thanks
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-08-23 9:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-16 10:10 [meta-oe][PATCH] ImageMagick: update to upstream version 6.8.6-8 Marko Lindqvist
2013-08-19 10:26 ` Martin Jansa
2013-08-19 10:38 ` Marko Lindqvist
2013-08-23 7:26 ` Martin Jansa
2013-08-23 7:53 ` Marko Lindqvist
2013-08-23 9:20 ` Martin Jansa
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.