The binaries/docs that generated by imagemagick has suffix '.im6',
use update-alternatives to add alternatives for them.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The ImageMagick-6.9.1-9.tar.xz is gone again.
To avoid somebody doing the same mistake as I did - updating to an unfinished
series - a note was dropped. Hopefully we don't see too many further patchsets
within this version...
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The ImageMagick-6.9.1-4.tar.xz is gone on the download server, there is
ImageMagick-6.9.1-9.tar.xz now.
Signed-off-by: Kimmo Surakka <kimmo.surakka@vincit.fi>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The ImageMagick-6.9.1-3.tar.xz is gone on the download server, there is
ImageMagick-6.9.1-4.tar.xz now.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* openjpeg is new and auto detected by configure
* choose tar.xz for download as the size is ~1/5 less
* checked LICENSE: only one year was changed 2014->2015
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
The only version available at the original URI is patch 9. All releases
are available at the /releases sub-path.
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* now when sysroot conflicts are fatal we really don't want to build
multiple fftw providers in the same sysroot
ERROR: The recipe fftwl is trying to install files into a shared area
when those files already exist. Those files and their manifest
location are:
/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/fftw3.f
Matched in
manifest-qemuarm-fftw.populate_sysroot
manifest-qemuarm-fftwf.populate_sysroot
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Fix fetch failures
Remove automate patch we have 1.12+ automake in
OE-Core now
Change-Id: I2ba1f6fb173613774f29f87c621ad3ca10f4e872
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Both targets install-data-local & install-includeHEADERS will install
header file magick-baseconfig.h to the same location, and they might
be run in the same time while enabling parallel build:
* target dependencies:
+ install-data-am: ... install-data-local ... install-includeHEADERS
* make install error:
/usr/bin/install: cannot create regular file \
`.../usr/include/ImageMagick-6/magick/magick-baseconfig.h': \
File exists \
make[3]: *** [install-magickincarchHEADERS] Error 1
* reproduce the error:
$ /usr/bin/install test /tmp & /usr/bin/install test /tmp
[1] 4052
/usr/bin/install: cannot create regular file `/tmp/test': File exists
[1]+ Exit 1 /usr/bin/install test /tmp
Just disable the one from install-data-local to remove this race issue.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Add ImageMagick to known licenses
The license checksum is changed due to year change in license text
-Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.
+Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization dedicated to making software imaging solutions freely available.
Add suffix .im6 to binaries, this avoids conflicts with other packages
e.g. lmbench provides stream utility and imagemagick does too so when
both packages are being part of image we have conflicts. This resolves
it by renaming stream to stream.im6 to make it distinct
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Changes:
- rename SUMMARY with length > 80 to DESCRIPTION
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line
Note: don't bump PR
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
- License changed by additional copyright year only.
- Patch PerlMagic_MakePatch.patch part of upstream now
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* This change is only aesthetic (unlike indentation in Python
tasks).
* Some recipes were using tabs.
* Some were using 8 spaces.
* Some were using mix or different number of spaces.
* Make them consistently use 4 spaces everywhere.
* Yocto styleguide advises to use tabs (but the only reason to keep
tabs is the need to update a lot of recipes). Lately this advice
was also merged into the styleguide on the OE wiki.
* Using 4 spaces in both types of tasks is better because it's less
error prone when someone is not sure if e.g.
do_generate_toolchain_file() is Python or shell task and also allows
to highlight every tab used in .bb, .inc, .bbappend, .bbclass as
potentially bad (shouldn't be used for indenting of multiline
variable assignments and cannot be used for Python tasks).
* Don't indent closing quote on multiline variables
we're quite inconsistent wheater it's first character on line
under opening quote or under first non-whitespace character in
previous line.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@dominion.thruhere.net>
* it can try to use host paths like:
-lOpenCL -L/usr/lib/nvidia
-lCL -L/usr/lib/nvidia
-lclparser -L/usr/lib/nvidia
ERROR: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* it's autodetected and then later when it's not in sysroot it fails:
| /bin/grep: /OE/shr-core/tmp-eglibc/sysroots/tuna/usr/lib/libfftw3.la: No such file or directory
| /bin/sed: can't read /OE/shr-core/tmp-eglibc/sysroots/tuna/usr/lib/libfftw3.la: No such file or directory
| arm-oe-linux-gnueabi-libtool: link: `/OE/shr-core/tmp-eglibc/sysroots/tuna/usr/lib/libfftw3.la' is not a valid libtool archive
| make[1]: *** [wand/libMagickWand.la] Error 1
| make[1]: Leaving directory `/OE/shr-core/tmp-eglibc/work/armv7a-vfp-neon-oe-linux-gnueabi/imagemagick-6.7.5-r3/ImageMagick-6.7.5-6'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Commit e27af1f273e9a7348dd8f5542df9206acd9210f3 of OE-core
split bzip2 into binary and library packages.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
on build we receive tons of warnings like
WARNING: For recipe imagemagick, the following files were installed but not shipped in any package:
WARNING: /usr/lib/ImageMagick-6.4.4/config/type.xml
WARNING: /usr/lib/ImageMagick-6.4.4/config/type-solaris.xml
WARNING: /usr/lib/ImageMagick-6.4.4/config/locale.xml
WARNING: /usr/lib/ImageMagick-6.4.4/config/english.xml
WARNING: /usr/lib/ImageMagick-6.4.4/config/type-windows.xml
WARNING: /usr/lib/ImageMagick-6.4.4/config/type-ghostscript.xml
WARNING: /usr/lib/ImageMagick-6.4.4/config/delegates.xml
WARNING: /usr/lib/ImageMagick-6.4.4/config/configure.xml
WARNING: /usr/lib/ImageMagick-6.4.4/config/francais.xml
WARNING: /usr/lib/ImageMagick-6.4.4/modules-Q16/filters/analyze.a
WARNING: /usr/lib/ImageMagick-6.4.4/modules-Q16/filters/analyze.la
WARNING: /usr/lib/ImageMagick-6.4.4/modules-Q16/filters/analyze.so
WARNING: /usr/lib/ImageMagick-6.4.4/modules-Q16/filters/.debug/analyze.so
WARNING: /usr/lib/ImageMagick-6.4.4/modules-Q16/coders/histogram.la
WARNING: /usr/lib/ImageMagick-6.4.4/modules-Q16/coders/ycbcr.a
...
Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
imagemagick has configure time execution test for large file offset
they wont be able to run in cross compile. We cache it.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Catalin Enache
Wenzong Fan
Roy Li
Andreas Müller
Kimmo Surakka
Robert Yang
Khem Raj
Peter Bigot
Martin Jansa
Tim Orling
Matthieu CRAPET
Koen Kooi
Marko Lindqvist
Andreas Oberritter
Andreas Müller