pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/ImageMagick Changes 6.7.6.6:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/64c223cfc3b0
branches:  trunk
changeset: 602762:64c223cfc3b0
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Apr 20 15:22:37 2012 +0000

description:
Changes 6.7.6.6:
* Always unlock the semaphore before returning from the png codec, either
  by a "return" or png_error(); changed all Magick*Exception() calls
  after setjmp() to png_error() to ensure proper cleanup (reference
  http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16883).
* Fixed log known alpha*kernel normalization bug in morphology convolve.
* Pixel allocation for Pango is stride*rows not stride*columns.
* Set the image resolution for Postscript files with an embedded Photoshop
  profile.
More...

diffstat:

 graphics/ImageMagick/Makefile                        |     7 +-
 graphics/ImageMagick/Makefile.common                 |     7 +-
 graphics/ImageMagick/PLIST                           |  2002 +++++++++---------
 graphics/ImageMagick/distinfo                        |     8 +-
 graphics/ImageMagick/patches/patch-coders_jpeg.c     |    29 -
 graphics/ImageMagick/patches/patch-coders_tiff.c     |    15 -
 graphics/ImageMagick/patches/patch-magick_profile.c  |    18 -
 graphics/ImageMagick/patches/patch-magick_property.c |    25 -
 8 files changed, 1014 insertions(+), 1097 deletions(-)

diffs (truncated from 2185 to 300 lines):

diff -r 54293f3d079c -r 64c223cfc3b0 graphics/ImageMagick/Makefile
--- a/graphics/ImageMagick/Makefile     Fri Apr 20 15:00:20 2012 +0000
+++ b/graphics/ImageMagick/Makefile     Fri Apr 20 15:22:37 2012 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.179 2012/04/09 15:56:21 tez Exp $
+# $NetBSD: Makefile,v 1.180 2012/04/20 15:22:37 adam Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       ImageMagick-${DISTVERSION}
-PKGREVISION=   2
 
 MAINTAINER=    adam%NetBSD.org@localhost
 COMMENT=       Package for display and interactive manipulation of images
@@ -22,7 +21,11 @@
 CONFIGURE_ARGS+=       --with-xml=yes
 CONFIGURE_ARGS+=       --without-perl
 PKGCONFIG_OVERRIDE=    Magick++/lib/ImageMagick++.pc.in
+PKGCONFIG_OVERRIDE+=   Magick++/lib/Magick++.pc.in
 PKGCONFIG_OVERRIDE+=   magick/ImageMagick.pc.in
+PKGCONFIG_OVERRIDE+=   magick/MagickCore.pc.in
+PKGCONFIG_OVERRIDE+=   wand/MagickWand.pc.in
+PKGCONFIG_OVERRIDE+=   wand/Wand.pc.in
 
 GCC_REQD+=             2.95.3
 
diff -r 54293f3d079c -r 64c223cfc3b0 graphics/ImageMagick/Makefile.common
--- a/graphics/ImageMagick/Makefile.common      Fri Apr 20 15:00:20 2012 +0000
+++ b/graphics/ImageMagick/Makefile.common      Fri Apr 20 15:22:37 2012 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.94 2012/03/21 18:12:42 drochner Exp $
+# $NetBSD: Makefile.common,v 1.95 2012/04/20 15:22:37 adam Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
-IM_MAJOR_VER=          6.7.5
-IM_MINOR_VER=          10
+IM_MAJOR_VER=          6.7.6
+IM_MINOR_VER=          6
 IM_MAJOR_LIB_VER=      ${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
@@ -26,6 +26,7 @@
 EXTRACT_SUFX=  .tar.bz2
 
 HOMEPAGE=      http://www.imagemagick.org/
+LICENSE=       gnu-gpl-v3
 
 WRKSRC=                ${WRKDIR}/ImageMagick-${DISTSUFFIX}
 
diff -r 54293f3d079c -r 64c223cfc3b0 graphics/ImageMagick/PLIST
--- a/graphics/ImageMagick/PLIST        Fri Apr 20 15:00:20 2012 +0000
+++ b/graphics/ImageMagick/PLIST        Fri Apr 20 15:22:37 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.72 2012/03/21 18:12:42 drochner Exp $
+@comment $NetBSD: PLIST,v 1.73 2012/04/20 15:22:37 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -171,1006 +171,1006 @@
 share/ImageMagick-${IM_MAJOR_VER}/english.xml
 share/ImageMagick-${IM_MAJOR_VER}/francais.xml
 share/ImageMagick-${IM_MAJOR_VER}/locale.xml
-share/doc/ImageMagick/ChangeLog
-share/doc/ImageMagick/LICENSE
-share/doc/ImageMagick/NEWS.txt
-share/doc/ImageMagick/images/affine.png
-share/doc/ImageMagick/images/arc.png
-share/doc/ImageMagick/images/background.jpg
-share/doc/ImageMagick/images/black.png
-share/doc/ImageMagick/images/bluebells_clipped.jpg
-share/doc/ImageMagick/images/bluebells_darker.jpg
-share/doc/ImageMagick/images/bluebells_lin.jpg
-share/doc/ImageMagick/images/bluebells_log.jpg
-share/doc/ImageMagick/images/button.gif
-share/doc/ImageMagick/images/configure.jpg
-share/doc/ImageMagick/images/cylinder_shaded.png
-share/doc/ImageMagick/images/definitive-guide.png
-share/doc/ImageMagick/images/difference.png
-share/doc/ImageMagick/images/donate.png
-share/doc/ImageMagick/images/examples.jpg
-share/doc/ImageMagick/images/frame.jpg
-share/doc/ImageMagick/images/fuzzy-magick.png
-share/doc/ImageMagick/images/gaussian-blur.png
-share/doc/ImageMagick/images/granite.png
-share/doc/ImageMagick/images/imade_art2.jpg
-share/doc/ImageMagick/images/label.gif
-share/doc/ImageMagick/images/logo-sm-flop.png
-share/doc/ImageMagick/images/logo-sm-fx.png
-share/doc/ImageMagick/images/logo-sm.png
-share/doc/ImageMagick/images/logo.jpg
-share/doc/ImageMagick/images/logo.png
-share/doc/ImageMagick/images/montage.jpg
-share/doc/ImageMagick/images/navy.png
-share/doc/ImageMagick/images/networkredux.png
-share/doc/ImageMagick/images/patterns/bricks.png
-share/doc/ImageMagick/images/patterns/checkerboard.png
-share/doc/ImageMagick/images/patterns/circles.png
-share/doc/ImageMagick/images/patterns/crosshatch.png
-share/doc/ImageMagick/images/patterns/crosshatch30.png
-share/doc/ImageMagick/images/patterns/crosshatch45.png
-share/doc/ImageMagick/images/patterns/fishscales.png
-share/doc/ImageMagick/images/patterns/gray0.png
-share/doc/ImageMagick/images/patterns/gray10.png
-share/doc/ImageMagick/images/patterns/gray100.png
-share/doc/ImageMagick/images/patterns/gray15.png
-share/doc/ImageMagick/images/patterns/gray20.png
-share/doc/ImageMagick/images/patterns/gray25.png
-share/doc/ImageMagick/images/patterns/gray30.png
-share/doc/ImageMagick/images/patterns/gray35.png
-share/doc/ImageMagick/images/patterns/gray40.png
-share/doc/ImageMagick/images/patterns/gray45.png
-share/doc/ImageMagick/images/patterns/gray5.png
-share/doc/ImageMagick/images/patterns/gray50.png
-share/doc/ImageMagick/images/patterns/gray55.png
-share/doc/ImageMagick/images/patterns/gray60.png
-share/doc/ImageMagick/images/patterns/gray65.png
-share/doc/ImageMagick/images/patterns/gray70.png
-share/doc/ImageMagick/images/patterns/gray75.png
-share/doc/ImageMagick/images/patterns/gray80.png
-share/doc/ImageMagick/images/patterns/gray85.png
-share/doc/ImageMagick/images/patterns/gray90.png
-share/doc/ImageMagick/images/patterns/gray95.png
-share/doc/ImageMagick/images/patterns/hexagons.png
-share/doc/ImageMagick/images/patterns/horizontal.png
-share/doc/ImageMagick/images/patterns/horizontal2.png
-share/doc/ImageMagick/images/patterns/horizontal3.png
-share/doc/ImageMagick/images/patterns/horizontalsaw.png
-share/doc/ImageMagick/images/patterns/hs_bdiagonal.png
-share/doc/ImageMagick/images/patterns/hs_cross.png
-share/doc/ImageMagick/images/patterns/hs_diagcross.png
-share/doc/ImageMagick/images/patterns/hs_fdiagonal.png
-share/doc/ImageMagick/images/patterns/hs_horizontal.png
-share/doc/ImageMagick/images/patterns/hs_vertical.png
-share/doc/ImageMagick/images/patterns/left30.png
-share/doc/ImageMagick/images/patterns/left45.png
-share/doc/ImageMagick/images/patterns/leftshingle.png
-share/doc/ImageMagick/images/patterns/octagons.png
-share/doc/ImageMagick/images/patterns/right30.png
-share/doc/ImageMagick/images/patterns/right45.png
-share/doc/ImageMagick/images/patterns/rightshingle.png
-share/doc/ImageMagick/images/patterns/smallfishscales.png
-share/doc/ImageMagick/images/patterns/vertical.png
-share/doc/ImageMagick/images/patterns/vertical2.png
-share/doc/ImageMagick/images/patterns/vertical3.png
-share/doc/ImageMagick/images/patterns/verticalbricks.png
-share/doc/ImageMagick/images/patterns/verticalleftshingle.png
-share/doc/ImageMagick/images/patterns/verticalrightshingle.png
-share/doc/ImageMagick/images/patterns/verticalsaw.png
-share/doc/ImageMagick/images/piechart.png
-share/doc/ImageMagick/images/project-support.jpg
-share/doc/ImageMagick/images/radial-gradient.png
-share/doc/ImageMagick/images/reconstruct.jpg
-share/doc/ImageMagick/images/red-ball.png
-share/doc/ImageMagick/images/red-circle.png
-share/doc/ImageMagick/images/right.gif
-share/doc/ImageMagick/images/rose-over.png
-share/doc/ImageMagick/images/rose-sigmoidal.png
-share/doc/ImageMagick/images/rose.jpg
-share/doc/ImageMagick/images/rose.png
-share/doc/ImageMagick/images/rose.pnm
-share/doc/ImageMagick/images/script.png
-share/doc/ImageMagick/images/smile.gif
-share/doc/ImageMagick/images/sponsor.jpg
-share/doc/ImageMagick/images/sprite.jpg
-share/doc/ImageMagick/images/t-shirt.png
-share/doc/ImageMagick/images/tricks.png
-share/doc/ImageMagick/images/wand.ico
-share/doc/ImageMagick/images/wand.png
-share/doc/ImageMagick/images/white-highlight.png
-share/doc/ImageMagick/images/wizard.jpg
-share/doc/ImageMagick/images/wizard.png
-share/doc/ImageMagick/index.html
-share/doc/ImageMagick/www/ImageMagickObject.html
-share/doc/ImageMagick/www/Magick++/Blob.html
-share/doc/ImageMagick/www/Magick++/Cache.fig
-share/doc/ImageMagick/www/Magick++/Cache.png
-share/doc/ImageMagick/www/Magick++/Cache.svg
-share/doc/ImageMagick/www/Magick++/ChangeLog.html
-share/doc/ImageMagick/www/Magick++/CoderInfo.html
-share/doc/ImageMagick/www/Magick++/Color.html
-share/doc/ImageMagick/www/Magick++/Documentation.html
-share/doc/ImageMagick/www/Magick++/Drawable.html
-share/doc/ImageMagick/www/Magick++/Drawable_example_1.png
-share/doc/ImageMagick/www/Magick++/Enumerations.html
-share/doc/ImageMagick/www/Magick++/Exception.html
-share/doc/ImageMagick/www/Magick++/FormatCharacters.html
-share/doc/ImageMagick/www/Magick++/Future.html
-share/doc/ImageMagick/www/Magick++/Geometry.html
-share/doc/ImageMagick/www/Magick++/Image.fig
-share/doc/ImageMagick/www/Magick++/Image.html
-share/doc/ImageMagick/www/Magick++/Image.png
-share/doc/ImageMagick/www/Magick++/ImageDesign.html
-share/doc/ImageMagick/www/Magick++/ImageMagick.png
-share/doc/ImageMagick/www/Magick++/Install.html
-share/doc/ImageMagick/www/Magick++/Magick++.png
-share/doc/ImageMagick/www/Magick++/Montage.html
-share/doc/ImageMagick/www/Magick++/NEWS.html
-share/doc/ImageMagick/www/Magick++/PixelPacket.html
-share/doc/ImageMagick/www/Magick++/Pixels.html
-share/doc/ImageMagick/www/Magick++/README.txt
-share/doc/ImageMagick/www/Magick++/STL.html
-share/doc/ImageMagick/www/Magick++/TypeMetric.html
-share/doc/ImageMagick/www/Magick++/index.html
-share/doc/ImageMagick/www/Magick++/magick.css
-share/doc/ImageMagick/www/Magick++/montage-sample-framed.jpg
-share/doc/ImageMagick/www/Magick++/right_triangle.png
-share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-framed.fig
-share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-framed.jpg
-share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-plain.fig
-share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-plain.jpg
-share/doc/ImageMagick/www/Magick++/thumbnail-sample-framed.jpg
-share/doc/ImageMagick/www/Magick++/thumbnail-sample-plain.jpg
-share/doc/ImageMagick/www/advanced-unix-installation.html
-share/doc/ImageMagick/www/advanced-windows-installation.html
-share/doc/ImageMagick/www/animate.html
-share/doc/ImageMagick/www/api.html
-share/doc/ImageMagick/www/api/MagickCore/ImageMagick_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/ImageMagick_8h.html
-share/doc/ImageMagick/www/api/MagickCore/MagickCore_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/MagickCore_8h.html
-share/doc/ImageMagick/www/api/MagickCore/PreRvIcccm_8c.html
-share/doc/ImageMagick/www/api/MagickCore/PreRvIcccm_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/PreRvIcccm_8h.html
-share/doc/ImageMagick/www/api/MagickCore/animate-private_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/animate-private_8h.html
-share/doc/ImageMagick/www/api/MagickCore/animate_8c.html
-share/doc/ImageMagick/www/api/MagickCore/animate_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/animate_8h.html
-share/doc/ImageMagick/www/api/MagickCore/annotate_8c.html
-share/doc/ImageMagick/www/api/MagickCore/annotate_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/annotate_8h.html
-share/doc/ImageMagick/www/api/MagickCore/annotated.html
-share/doc/ImageMagick/www/api/MagickCore/api_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/api_8h.html
-share/doc/ImageMagick/www/api/MagickCore/artifact_8c.html
-share/doc/ImageMagick/www/api/MagickCore/artifact_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/artifact_8h.html
-share/doc/ImageMagick/www/api/MagickCore/blob-private_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/blob-private_8h.html
-share/doc/ImageMagick/www/api/MagickCore/blob_8c.html
-share/doc/ImageMagick/www/api/MagickCore/blob_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/blob_8h.html
-share/doc/ImageMagick/www/api/MagickCore/cache-private_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/cache-private_8h.html
-share/doc/ImageMagick/www/api/MagickCore/cache-view_8c.html
-share/doc/ImageMagick/www/api/MagickCore/cache-view_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/cache-view_8h.html
-share/doc/ImageMagick/www/api/MagickCore/cache_8c.html
-share/doc/ImageMagick/www/api/MagickCore/cache_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/cache_8h.html
-share/doc/ImageMagick/www/api/MagickCore/classes.html
-share/doc/ImageMagick/www/api/MagickCore/client_8c.html
-share/doc/ImageMagick/www/api/MagickCore/client_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/client_8h.html
-share/doc/ImageMagick/www/api/MagickCore/coder_8c.html
-share/doc/ImageMagick/www/api/MagickCore/coder_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/coder_8h.html
-share/doc/ImageMagick/www/api/MagickCore/color-private_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/color-private_8h.html
-share/doc/ImageMagick/www/api/MagickCore/color_8c.html
-share/doc/ImageMagick/www/api/MagickCore/color_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/color_8h.html
-share/doc/ImageMagick/www/api/MagickCore/colorspace-private_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/colorspace-private_8h.html
-share/doc/ImageMagick/www/api/MagickCore/colorspace_8c.html
-share/doc/ImageMagick/www/api/MagickCore/colorspace_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/colorspace_8h.html
-share/doc/ImageMagick/www/api/MagickCore/compare_8c.html
-share/doc/ImageMagick/www/api/MagickCore/compare_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/compare_8h.html
-share/doc/ImageMagick/www/api/MagickCore/composite-private_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/composite-private_8h.html
-share/doc/ImageMagick/www/api/MagickCore/composite_8c.html
-share/doc/ImageMagick/www/api/MagickCore/composite_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/composite_8h.html
-share/doc/ImageMagick/www/api/MagickCore/compress_8c.html
-share/doc/ImageMagick/www/api/MagickCore/compress_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/compress_8h.html
-share/doc/ImageMagick/www/api/MagickCore/configure_8c.html
-share/doc/ImageMagick/www/api/MagickCore/configure_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/configure_8h.html
-share/doc/ImageMagick/www/api/MagickCore/constitute_8c.html
-share/doc/ImageMagick/www/api/MagickCore/constitute_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/constitute_8h.html
-share/doc/ImageMagick/www/api/MagickCore/decorate_8c.html
-share/doc/ImageMagick/www/api/MagickCore/decorate_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/decorate_8h.html
-share/doc/ImageMagick/www/api/MagickCore/delegate_8c.html
-share/doc/ImageMagick/www/api/MagickCore/delegate_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/delegate_8h.html
-share/doc/ImageMagick/www/api/MagickCore/deprecate_8c.html
-share/doc/ImageMagick/www/api/MagickCore/deprecate_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/deprecate_8h.html
-share/doc/ImageMagick/www/api/MagickCore/dir_b44b349db36f8365f5234e57d3038770.html
-share/doc/ImageMagick/www/api/MagickCore/dirs.html
-share/doc/ImageMagick/www/api/MagickCore/display-private_8h-source.html
-share/doc/ImageMagick/www/api/MagickCore/display-private_8h.html
-share/doc/ImageMagick/www/api/MagickCore/display_8c.html
-share/doc/ImageMagick/www/api/MagickCore/display_8h-source.html



Home | Main Index | Thread Index | Old Index