11 Commits

Author SHA1 Message Date
Martin Jansa
a45830a39b recipes: Unify indentation
* 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>
2013-04-15 16:23:17 +02:00
Martin Jansa
1de21e56ee imagemagick: disable opencl
* 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>
2012-12-27 16:14:23 +01:00
Martin Jansa
72405b62f2 imagemagick: add fftw to DEPENDS
* 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>
2012-10-05 12:17:41 +02:00
Martin Jansa
6d93a88d6d recipes: few more PR bumps to rebuild after libffi5 -> libffi6
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2012-09-20 10:02:51 +02:00
Andreas Oberritter
629d9fa067 bzip2: bump PR of all recipes depending on bzip2
* 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>
2012-03-09 07:50:38 +01:00
Martin Jansa
b23ab4ccc9 imagemagick: bump PR to rebuild after libtiff3->libtiff5 change
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-02-28 15:49:58 +01:00
Martin Jansa
aaef9aa923 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>
2012-02-15 13:56:11 +01:00
Martin Jansa
d0028e40a3 recipes: bump PR to rebuild .la files without libz.la
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2012-02-13 16:59:29 +01:00
Andreas Müller
17f049b000 imagemagick: fix QA warnings for unshipped files
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>
2011-11-02 17:25:41 +01:00
Khem Raj
6cbe04603a imagemagick: Fix configure on x86_64
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>
2011-09-19 08:24:55 +02:00
Martin Jansa
9c2e44f885 imagemagick: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2011-05-29 21:37:56 +02:00