Commit Graph

68 Commits

Author SHA1 Message Date
Jerzy Grzegorek c7f4b96471 package: remove the trailing slash sign from <PKG>_SITE variable
Since the trailing slash is stripped from $($(PKG)_SITE) by pkg-generic.mk:

$(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE))

so it is redundant.
This patch removes it from $(PKG)_SITE variable for BR consistency.

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-31 23:17:46 +02:00
Jerzy Grzegorek 7946bebfc3 imagemagick: bump to version 6.8.9-6
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-07-31 20:18:22 +02:00
Gustavo Zacarias 6c526bbd4f imagemagick: bump to version 6.8.9-5
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-07-01 12:55:20 +02:00
Jerzy Grzegorek 8d24201f4b imagemagick: bump to version 6.8.9-3
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-06-21 19:38:07 +02:00
Jerzy Grzegorek d8bc4ac22f imagemagick: bump to version 6.8.9-2
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-06-03 22:14:14 +02:00
Jerzy Grzegorek 1e44d90c7d imagemagick: bump to version 6.8.9-0
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-17 21:47:46 +02:00
Jerzy Grzegorek cab21e34db imagemagick: bump to version 6.8.8-10
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-04-04 23:38:43 +02:00
Jerzy Grzegorek 07af58cd54 imagemagick: bump to version 6.8.8-9
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-26 11:00:11 +01:00
Jerzy Grzegorek b46cc58be7 imagemagick: bump to version 6.8.8-8
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-17 23:08:51 +01:00
Jerzy Grzegorek ef008ebe06 imagemagick: bump to version 6.8.8-7
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-03-05 19:42:39 +01:00
Romain Naour 6e048ce0c7 imagemagick: use --without-bzlib when bzip2 is not selected
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-02-26 09:47:21 +01:00
Jerzy Grzegorek ef6a285812 imagemagick: bump to version 6.8.8-4
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-30 09:57:53 +01:00
Jerzy Grzegorek 52420e359e imagemagick: bump to version 6.8.8-2
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-14 11:51:31 +01:00
Jerzy Grzegorek 6c6dcf473c imagemagick: bump to version 6.8.8-1
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-04 10:39:23 +01:00
Simon Dawson ab836f14e6 package: standardise Apache licenses
Apache licenses are referred to in a variety of ways; standardise these,
choosing a form which does not contain whitespace.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-01-02 15:12:02 +01:00
Jerzy Grzegorek 517b6d7185 imagemagick: bump to version 6.8.8-0
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-12-27 09:41:28 +01:00
Jerzy Grzegorek dffcc7034e imagemagick: bump to version 6.8.7-10
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-19 21:36:17 +01:00
Peter Korsgaard dd6a8c728e imagemagick: drop IMAGEMAGICK_MAJOR variable
It is only expanded once just below, so we might as well drop it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-10 10:08:26 +01:00
Jerzy Grzegorek 75f81eefef imagemagick: bump to version 6.8.7-9
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-10 10:05:35 +01:00
Jerzy Grzegorek 971795f55a imagemagick: bump to version 6.8.7-8
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-01 23:29:41 +01:00
Peter Korsgaard c344ec0205 imagemagick: bump version
The -3 version is no longer available at the upstream URL.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-11 10:36:23 +01:00
Jerzy Grzegorek 42cd7395b0 imagemagick: bump to version 6.8.7-3
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-11 00:51:22 +01:00
Jerzy Grzegorek 40316ab81f imagemagick: bump to version 6.8.7-1
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-22 23:16:11 +02:00
Jerzy Grzegorek 044e39dd3e imagemagick: bump to version 6.8.7 0
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-08 22:20:41 +02:00
Gustavo Zacarias b339bb5641 imagemagick: fix magick++-config fixup error
Magic++ bindings are built only with C++ and WCHAR toolchains.
Add a WCHAR toolchain check for the magick++ config fixup.
Looking into the future the fixup shouldn't bail on a missing file so we
can avoid awkward kludges for packages that have many options and config
files.
Fixes:
http://autobuild.buildroot.net/results/33a/33ac4b17866a64379b7bab3c0549f6e075c98dde/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2013-08-13 10:16:11 +02:00
Gustavo Zacarias a8db50a7ab imagemagick: bump to version 6.8.6-2
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-29 21:05:15 +02:00
Alexandre Belloni 8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Peter Korsgaard 47b3a845cf imagemagick: fix CONFIG_SCRIPTS handling when C++ isn't available
Fixes http://autobuild.buildroot.org/results/0b35567af8a41a14c9c33f3be5299978c5847e03

Magick++-config only gets installed when C++ support is detected.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-09 12:13:59 +01:00
Thomas Petazzoni a5ce857674 package: use <pkg>_CONFIG_SCRIPTS wherever possible
Use the <pkg>_CONFIG_SCRIPTS mechanism in all packages for which it
does all what the package was doing. A few packages, like libxslt, are
for now left out, since they need some additional fixup (for example a
fixup of includedir).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-08 22:34:26 +01:00
Samuel Martin 5e6d537eb7 imagemagick: add license info
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-11-30 07:34:39 -08:00
Gustavo Zacarias 019a581f89 packages: switch to host-pkgconf
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-29 22:02:55 +01:00
Gustavo Zacarias e21517689d imagemagick: security bump to version 6.7.8-8
Fixes CVE-2012-3437, CVE-2012-3437 and CVE-2012-3438.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-15 12:04:22 +02:00
Arnout Vandecappelle (Essensium/Mind) e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Peter Korsgaard c8490742fb imagemagick: ensure cross freetype-config is used
Fixes http://autobuild.buildroot.net/results/fd6fd5b55b1e2fc5a70537f548bbcafab9773e4c/

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-25 23:25:44 +02:00
Thomas Petazzoni d044199e74 imagemagick: use alternate download location
The official ImageMagick site only keeps the latest versions. Even in
the legacy/ directory, they only keep the last version of each
'branch'. Therefore, to avoid problems, we use an alternate download
site.

Fixes
http://autobuild.buildroot.org/results/2269aa42a0a21730ff0ec28af89cd4973ec28751/build-end.log.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-25 00:13:29 +02:00
Gustavo Zacarias f701305b48 imagemagick: security bump to version 6.7.6-9
Fixes CVE-2012-1610, CVE-2012-17987, CVE-2012-0260, CVE-2012-0259,
CVE-2012-0247 and CVE-2012-0248.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-24 19:49:07 +02:00
Peter Korsgaard eb54983fdf imagemagick: bump version, fix build with zlib
The recent zlib bump broke imagemagick. This has been fixed upstream
in 6.7.5, but the xml2-config fix is still not upstream and 6.7.5
needs autoconf 2.67 to autoreconf (and we have 2.65), so we cannot
easily use that.

Instead move to the most recent version using autoconf 2.64 and
backport the fix from imagemagick svn. At the same time also
ensure zlib+bzip2 support is picked up if enabled.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-03-03 22:56:23 +01:00
Peter Korsgaard d1c54ade86 imagemagick: add optional fftw support
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-10-05 00:15:47 +02:00
Thomas Petazzoni 300f9c9c9d package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:12:27 +02:00
Thomas Petazzoni 50e73c6f78 imagemagick: remove *-config scripts from TARGET_DIR
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2011-03-07 22:22:30 +01:00
Peter Korsgaard e9a7bf38b3 imagemagick: bump version
The 6.6.7-4 version is no longer available upstream.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-11 09:21:07 +01:00
Gustavo Zacarias 7b9defe7f0 imagemagick: bump to version 6.6.7-4
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-02 22:23:25 +01:00
Thomas Petazzoni c5a195e403 imagemagick: add patch to fix libxml2 issue and remove useless patch
The patch imagemagick-6.6.4-add-errno-h-if-argz-h-does-not-exist.patch
was not applied anymore due to a difference in the version number, and
it didn't prevent imagemagick to be built. It was introduced several
years ago together with the ImageMagick package itself, so presumably
it is no longer needed.

The new patch allows ImageMagick to use the correct xml2-config script
to get the proper location for XML2 headers and libraries. Otherwise,
-I/usr/include/libxml2 is found in the compile flags.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-22 22:14:36 +01:00
Peter Korsgaard 259a129e81 imagemagick: fix s/IMAGEMAGISK/IMAGEMAGICK/ typo
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-10-06 11:46:14 +02:00
Peter Korsgaard 246c1f4dea imagemagick: remove fixed jpeg+tiff dependencies, add optional deps
For fontconfig/freetype/jpeg/libpng/librsvg/libxml2/tiff.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-10-05 09:15:06 +02:00
Martin Banky 85c45df2fa imagemagick: convert to autotargets and bump to 6.6.4
program-transform-name='s,,,' is needed, otherwise configure defines it
as $(platform)-$(cpu)-. During install, all executables are prepended
with this variable.

[Peter: disable libtool patch, remove unneeded/wrong staging install cmd]
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-10-05 09:14:19 +02:00
Thomas Petazzoni 30887f616a imagemagick: don't create useless debugging file
For some reason, the imagemagick Buildroot .mk file creates a
"datefile" file in the Buildroot source directory, probably an ancient
debugging thing that has been left here for no reason. Let's get rid
of it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-08-12 15:57:02 +02:00
Thomas Petazzoni b7ea597dd2 imagemagick: use internal libtool
For some reason, our imagemagick.mk file calls libtool, but assumes
that libtool is available on the host, which may not be
true. Therefore, we use ImageMagick's internal libtool, which has been
used for compiling/linking all the rest of ImageMagic anyway.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-02-23 20:34:34 +01:00
Thomas Petazzoni cf04b9e0c5 imagemagick: help configure to detect file_offset_bits
imagemagick configure script wants to run programs to detect the
file_offset_bits, but fails since it is running cross-compile
mode. Therefore, we help the configure script by passing the
appropriate ac_cv variable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-02-23 20:34:34 +01:00
Simon Pasch f72f3fd30e imagemagick: fix -clean target
Closes #657

imagemagick-clean target currently tries to remove $(TARGET_DIR) as
there is no IMAGEMAGICK_BINARY anymore.

Signed-off-by: Simon Pasch <fpasch@googlemail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-13 14:23:08 +02:00