haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

imagemagick: bump to 6.9.7.7.

Browse Source
This commit is contained in:
fbrosson
2017-02-05 23:14:25 +00:00
parent ca8195d586
commit bb2ca66ef5
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
media-gfx/imagemagick/imagemagick-6.9.6.6.recipe → media-gfx/imagemagick/imagemagick-6.9.7.7.recipe
View File

@@ -6,14 +6,13 @@ SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear \
and transform images, adjust image colors, apply various special effects, or \
draw text, lines, polygons, ellipses and Bézier curves."
HOMEPAGE="https://www.imagemagick.org/"
COPYRIGHT="1999-2016 ImageMagick Studio LLC"
COPYRIGHT="1999-2017 ImageMagick Studio LLC"
LICENSE="IMAGEMAGICK"
REVISION="1"
SOURCE_URI="http://www.imagemagick.org/download/releases/ImageMagick-6.9.6-6.tar.xz
https://sourceforge.net/projects/imagemagick/files/old-sources/6.x/6.9/ImageMagick-6.9.6-6.tar.xz
http://gentoo.mirrors.ovh.net/gentoo-distfiles/distfiles/ImageMagick-6.9.6-6.tar.xz"
CHECKSUM_SHA256="9cd1fe001d3ecb68b7d053ede40950d411956d47afc5267acc3ca57a77070d0a"
SOURCE_DIR="ImageMagick-6.9.6-6"
SOURCE_URI="https://www.imagemagick.org/download/releases/ImageMagick-6.9.7-7.tar.xz
https://mirror.sobukus.de/files/src/imagemagick/ImageMagick-6.9.7-7.tar.xz"
CHECKSUM_SHA256="c23420e208d8c90bd7c05d7a3f14e976b479a93ceb3354dd4d84c830fe30a40b"
SOURCE_DIR="ImageMagick-6.9.7-7"
PATCHES="imagemagick-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -32,9 +31,9 @@ PROVIDES="
cmd:mogrify$secondaryArchSuffix
cmd:montage$secondaryArchSuffix
cmd:stream$secondaryArchSuffix
lib:libMagick++_6.Q16$secondaryArchSuffix = 6.0.0 compat >= 6
lib:libMagickCore_6.Q16$secondaryArchSuffix = 2.0.0 compat >= 2
lib:libMagickWand_6.Q16$secondaryArchSuffix = 2.0.0 compat >= 2
lib:libMagick++_6.Q16$secondaryArchSuffix = 7.0.0 compat >= 7
lib:libMagickCore_6.Q16$secondaryArchSuffix = 4.0.0 compat >= 4
lib:libMagickWand_6.Q16$secondaryArchSuffix = 4.0.0 compat >= 4
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -61,9 +60,9 @@ PROVIDES_devel="
cmd:MagickCore_config$secondaryArchSuffix
cmd:MagickWand_config$secondaryArchSuffix
cmd:Wand_config$secondaryArchSuffix
devel:libMagick++_6.Q16$secondaryArchSuffix = 6.0.0 compat >= 6
devel:libMagickCore_6.Q16$secondaryArchSuffix = 2.0.0 compat >= 2
devel:libMagickWand_6.Q16$secondaryArchSuffix = 2.0.0 compat >= 2
devel:libMagick++_6.Q16$secondaryArchSuffix = 7.0.0 compat >= 7
devel:libMagickCore_6.Q16$secondaryArchSuffix = 4.0.0 compat >= 4
devel:libMagickWand_6.Q16$secondaryArchSuffix = 4.0.0 compat >= 4
"
REQUIRES_devel="
imagemagick$secondaryArchSuffix == $portVersion base
@@ -81,8 +80,6 @@ BUILD_REQUIRES="
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
# devel:libopenexr
# devel:libcms
BUILD_PREREQUIRES="
cmd:aclocal
@@ -137,7 +134,6 @@ INSTALL()
$developDir \
$binDir/*-config \
$manDir/man1/*-config.1 \
$dataDir/doc/ImageMagick-6/www/api.html \
$dataDir/doc/ImageMagick-6/www/api
}

22
media-gfx/imagemagick/patches/imagemagick-6.9.6.6.patchset → media-gfx/imagemagick/patches/imagemagick-6.9.7.7.patchset
View File

@@ -40,7 +40,7 @@ index 5289c62..b4029d5 100644
Magick::ImageMoments::ImageMoments(const Image &image_)
diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 97f621d..08c0316 100644
index cd8b74b..00d8f25 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -509,9 +509,9 @@ Magick::Image Magick::Image::clipMask(void) const
@@ -792,7 +792,7 @@ index 97f621d..08c0316 100644
}
Magick::PixelPacket *Magick::Image::getPixels(const ssize_t x_,
@@ -3840,7 +3840,7 @@ Magick::Color Magick::Image::pixelColor(const ssize_t x_,
@@ -3843,7 +3843,7 @@ Magick::Color Magick::Image::pixelColor(const ssize_t x_,
pixel=getConstPixels(x_,y_,1,1);
if (pixel)
@@ -801,7 +801,7 @@ index 97f621d..08c0316 100644
}
else if (storage_class == PseudoClass)
{
@@ -3849,10 +3849,10 @@ Magick::Color Magick::Image::pixelColor(const ssize_t x_,
@@ -3852,10 +3852,10 @@ Magick::Color Magick::Image::pixelColor(const ssize_t x_,
indexes=getConstIndexes();
if(indexes)
@@ -814,7 +814,7 @@ index 97f621d..08c0316 100644
}
void Magick::Image::polaroid(const std::string &caption_,const double angle_)
@@ -3921,9 +3921,9 @@ Magick::Blob Magick::Image::profile(const std::string name_) const
@@ -3924,9 +3924,9 @@ Magick::Blob Magick::Image::profile(const std::string name_) const
profile=GetImageProfile(constImage(),name_.c_str());
if (profile == (StringInfo *) NULL)
@@ -827,7 +827,7 @@ index 97f621d..08c0316 100644
}
void Magick::Image::quantize(const bool measureError_)
@@ -4329,9 +4329,9 @@ Magick::Image Magick::Image::separate(const ChannelType channel_) const
@@ -4332,9 +4332,9 @@ Magick::Image Magick::Image::separate(const ChannelType channel_) const
image=SeparateImage(constImage(),channel_,exceptionInfo);
ThrowImageException;
if (image == (MagickCore::Image *) NULL)
@@ -839,7 +839,7 @@ index 97f621d..08c0316 100644
}
void Magick::Image::sepiaTone(const double threshold_)
@@ -4455,7 +4455,7 @@ std::string Magick::Image::signature(const bool force_) const
@@ -4458,7 +4458,7 @@ std::string Magick::Image::signature(const bool force_) const
property=GetImageProperty(constImage(),"Signature");
@@ -848,7 +848,7 @@ index 97f621d..08c0316 100644
}
void Magick::Image::sketch(const double radius_,const double sigma_,
@@ -4628,9 +4628,9 @@ Magick::Image Magick::Image::subImageSearch(const Image &reference_,
@@ -4631,9 +4631,9 @@ Magick::Image Magick::Image::subImageSearch(const Image &reference_,
if (offset_ != (Geometry *) NULL)
*offset_=offset;
if (newImage == (MagickCore::Image *) NULL)
@@ -860,7 +860,7 @@ index 97f621d..08c0316 100644
}
void Magick::Image::swirl(const double degrees_)
@@ -4820,9 +4820,9 @@ Magick::Image Magick::Image::uniqueColors(void) const
@@ -4823,9 +4823,9 @@ Magick::Image Magick::Image::uniqueColors(void) const
image=UniqueImageColors(constImage(),exceptionInfo);
ThrowImageException;
if (image == (MagickCore::Image *) NULL)
@@ -872,7 +872,7 @@ index 97f621d..08c0316 100644
}
void Magick::Image::unsharpmask(const double radius_,const double sigma_,
@@ -5022,42 +5022,42 @@ Magick::Image::Image(MagickCore::Image *image_)
@@ -5025,42 +5025,42 @@ Magick::Image::Image(MagickCore::Image *image_)
MagickCore::Image *&Magick::Image::image(void)
{
@@ -923,7 +923,7 @@ index 97f621d..08c0316 100644
}
void Magick::Image::modifyImage(void)
@@ -5100,7 +5100,7 @@ MagickCore::Image *Magick::Image::replaceImage(MagickCore::Image *replacement_)
@@ -5103,7 +5103,7 @@ MagickCore::Image *Magick::Image::replaceImage(MagickCore::Image *replacement_)
}
}
@@ -1091,7 +1091,7 @@ Using a variable named LIBRARY_PATH is not a good idea on Haiku. Just
rename it.
diff --git a/configure.ac b/configure.ac
index 8ce84b4..946d206 100644
index 8e347e6..8780efd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2885,15 +2885,15 @@ AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where ex