diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-02-15 13:00:39 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-02-15 13:56:11 +0100 |
| commit | aaef9aa923d6e55ae0463156999b2a0543cb1ef1 (patch) | |
| tree | 3bc282404870f8acfd5394c1340b99c07ff67a04 /meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch | |
| parent | fe6268a256b83d07e711e08db66b2610fd2b4f8e (diff) | |
| download | meta-openembedded-contrib-aaef9aa923d6e55ae0463156999b2a0543cb1ef1.tar.gz | |
imagemagick: upgrade to 6.7.5 because 6.4.4 is not compatible with zlib-1.2.6 we have now
* 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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch')
| -rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick-6.7.5/remove.dist-lzip.patch | 17 |
1 files changed, 17 insertions, 0 deletions
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 0000000000..559aa247d0 --- /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])]) |