# HG changeset patch
# User Vladimir Marek <Vladimir.Marek@oracle.com>
# Date 1484650398 -3600
# Node ID 83b4091f7969ff6d4ce9d72e0c299c14447c783e
# Parent  3f5b9ebe028b6fcfaccc513f734765cc173b2d80
25239410 Update ImageMagick to 6.9.7-4
25326326 problem in UTILITY/IMAGEMAGICK

diff -r 3f5b9ebe028b -r 83b4091f7969 components/imagemagick/Makefile
--- a/components/imagemagick/Makefile	Mon Jan 23 12:54:02 2017 -0700
+++ b/components/imagemagick/Makefile	Tue Jan 17 11:53:18 2017 +0100
@@ -20,25 +20,25 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64_and_32
 COMPILER=gcc
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=			ImageMagick
-COMPONENT_VERSION=		6.9.6
+COMPONENT_VERSION=		6.9.7
 COMPONENT_MAJOR_VERSION=	$(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\([0-9]\+\)\.[0-9]\+\.[0-9]\+/\1/')
-COMPONENT_SUBVERSION=		7
+COMPONENT_SUBVERSION=		4
 HUMAN_VERSION=			$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
 COMPONENT_PROJECT_URL=		http://www.imagemagick.org/
 COMPONENT_ARCHIVE=		$(COMPONENT_SRC)-$(COMPONENT_SUBVERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:6a677b917bab99e9ad6a370e75726525909167d646f7902bcaf546053ecd540f
+    sha256:867ab9e643d75f49995f9479964779f4aed9c0e4316edf89bd8ee034d837143c
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/imagemagick
 
-TPNO=			32077
+TPNO=			33094
 
 # Enable adiheap security extension.
 # adistack fails with libgcc exception unwinding code.
diff -r 3f5b9ebe028b -r 83b4091f7969 components/imagemagick/TESTING
--- a/components/imagemagick/TESTING	Mon Jan 23 12:54:02 2017 -0700
+++ b/components/imagemagick/TESTING	Tue Jan 17 11:53:18 2017 +0100
@@ -58,3 +58,50 @@
 
 # Now compare logo_3D_bg.jpg to the image at
 # http://www.imagemagick.org/Usage/advanced/#3d-logos
+
+
+cat > a.pl <<'EOT'
+#!/usr/bin/perl
+
+use Image::Magick;
+
+$image=Image::Magick->new;
+$image->Set(size=>'300x300');
+$image->Read('xc:white');
+
+$tile=Image::Magick->new;
+$tile->Read('tile.gif');
+$image->Draw(primitive=>'Polygon',tile=>$tile,fill=>'none',
+  points=>'30,30 100,10 190,290 30,290');
+$image->Draw(stroke=>'red',primitive=>'Ellipse',stroke=>'black',fill=>'red',
+  strokewidth=>5,points=>'100,100 50,75 0,360');
+$image->Draw(primitive=>'Polygon',fill=>'none',stroke=>'black',strokewidth=>5,
+  points=>'30,30 100,10 190,290 30,290');
+$image->FloodfillPaint(geometry=>'+132+62',fill=>'blue',bordercolor=>'black',
+  invert=>'true');
+
+$image->Annotate(fill=>'red',geometry=>'+280+120',font=>'Generic.ttf',
+  pointsize=>14,text=>''.localtime(),rotate=>90.0);
+
+$image->Write('shapes.gif');
+EOT
+
+chmod +x a.pl
+./a.pl
+
+# Now display 'shapes.gif' and make sure it contains current date
+
+
+# Emacs is using imagemagick - let's test it
+
+pkg install gnu-emacs-x11 gnu-emacs-gtk
+cd /usr/share/doc/ImageMagick-6/images
+
+# We need to convert to bmp, because other file types (like png) emacs opens
+# directly via libpng and not using ImageMagick's libWand
+convert wizard.png wizard.bmp
+
+# Now both emacs should be able to display image
+
+emacs-x wizard.bmp
+emacs-gtk wizard.bmp
diff -r 3f5b9ebe028b -r 83b4091f7969 components/imagemagick/imagemagick.p5m
--- a/components/imagemagick/imagemagick.p5m	Mon Jan 23 12:54:02 2017 -0700
+++ b/components/imagemagick/imagemagick.p5m	Tue Jan 17 11:53:18 2017 +0100
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -36,7 +36,7 @@
     value="org.opensolaris.category.2008:System/Multimedia Libraries"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=LSARC/2007/316
+set name=org.opensolaris.arc-caseid value=LSARC/2004/262 value=LSARC/2007/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/Magick++-config
 file path=usr/bin/Magick-config
@@ -72,7 +72,6 @@
 file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/Magick++/TypeMetric.h
 file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/magick/ImageMagick.h
 file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/magick/MagickCore.h
-file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/magick/accelerate.h
 file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/magick/animate.h
 file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/magick/annotate.h
 file path=usr/include/ImageMagick-$(COMPONENT_MAJOR_VERSION)/magick/api.h
@@ -341,20 +340,20 @@
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/yuv.so
 file path=usr/lib/$(MACH64)/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/filters/analyze.so
 link path=usr/lib/$(MACH64)/libMagick++-6.Q16.so \
-    target=libMagick++-6.Q16.so.6.0.0
-link path=usr/lib/$(MACH64)/libMagick++-6.Q16.so.6 \
-    target=libMagick++-6.Q16.so.6.0.0
-file path=usr/lib/$(MACH64)/libMagick++-6.Q16.so.6.0.0
+    target=libMagick++-6.Q16.so.7.0.0
+link path=usr/lib/$(MACH64)/libMagick++-6.Q16.so.7 \
+    target=libMagick++-6.Q16.so.7.0.0
+file path=usr/lib/$(MACH64)/libMagick++-6.Q16.so.7.0.0
 link path=usr/lib/$(MACH64)/libMagickCore-6.Q16.so \
-    target=libMagickCore-6.Q16.so.2.0.0
-link path=usr/lib/$(MACH64)/libMagickCore-6.Q16.so.2 \
-    target=libMagickCore-6.Q16.so.2.0.0
-file path=usr/lib/$(MACH64)/libMagickCore-6.Q16.so.2.0.0
+    target=libMagickCore-6.Q16.so.3.0.0
+link path=usr/lib/$(MACH64)/libMagickCore-6.Q16.so.3 \
+    target=libMagickCore-6.Q16.so.3.0.0
+file path=usr/lib/$(MACH64)/libMagickCore-6.Q16.so.3.0.0
 link path=usr/lib/$(MACH64)/libMagickWand-6.Q16.so \
-    target=libMagickWand-6.Q16.so.2.0.0
-link path=usr/lib/$(MACH64)/libMagickWand-6.Q16.so.2 \
-    target=libMagickWand-6.Q16.so.2.0.0
-file path=usr/lib/$(MACH64)/libMagickWand-6.Q16.so.2.0.0
+    target=libMagickWand-6.Q16.so.3.0.0
+link path=usr/lib/$(MACH64)/libMagickWand-6.Q16.so.3 \
+    target=libMagickWand-6.Q16.so.3.0.0
+file path=usr/lib/$(MACH64)/libMagickWand-6.Q16.so.3.0.0
 file path=usr/lib/$(MACH64)/pkgconfig/ImageMagick++-6.Q16.pc
 file path=usr/lib/$(MACH64)/pkgconfig/ImageMagick++.pc
 file path=usr/lib/$(MACH64)/pkgconfig/ImageMagick-6.Q16.pc
@@ -518,15 +517,15 @@
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/ycbcr.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/coders/yuv.so
 file path=usr/lib/ImageMagick-$(COMPONENT_VERSION)/modules-Q16/filters/analyze.so
-link path=usr/lib/libMagick++-6.Q16.so target=libMagick++-6.Q16.so.6.0.0
-link path=usr/lib/libMagick++-6.Q16.so.6 target=libMagick++-6.Q16.so.6.0.0
-file path=usr/lib/libMagick++-6.Q16.so.6.0.0
-link path=usr/lib/libMagickCore-6.Q16.so target=libMagickCore-6.Q16.so.2.0.0
-link path=usr/lib/libMagickCore-6.Q16.so.2 target=libMagickCore-6.Q16.so.2.0.0
-file path=usr/lib/libMagickCore-6.Q16.so.2.0.0
-link path=usr/lib/libMagickWand-6.Q16.so target=libMagickWand-6.Q16.so.2.0.0
-link path=usr/lib/libMagickWand-6.Q16.so.2 target=libMagickWand-6.Q16.so.2.0.0
-file path=usr/lib/libMagickWand-6.Q16.so.2.0.0
+link path=usr/lib/libMagick++-6.Q16.so target=libMagick++-6.Q16.so.7.0.0
+link path=usr/lib/libMagick++-6.Q16.so.7 target=libMagick++-6.Q16.so.7.0.0
+file path=usr/lib/libMagick++-6.Q16.so.7.0.0
+link path=usr/lib/libMagickCore-6.Q16.so target=libMagickCore-6.Q16.so.3.0.0
+link path=usr/lib/libMagickCore-6.Q16.so.3 target=libMagickCore-6.Q16.so.3.0.0
+file path=usr/lib/libMagickCore-6.Q16.so.3.0.0
+link path=usr/lib/libMagickWand-6.Q16.so target=libMagickWand-6.Q16.so.3.0.0
+link path=usr/lib/libMagickWand-6.Q16.so.3 target=libMagickWand-6.Q16.so.3.0.0
+file path=usr/lib/libMagickWand-6.Q16.so.3.0.0
 file path=usr/lib/pkgconfig/ImageMagick++-6.Q16.pc
 file path=usr/lib/pkgconfig/ImageMagick++.pc
 file path=usr/lib/pkgconfig/ImageMagick-6.Q16.pc
@@ -543,10 +542,8 @@
 file path=usr/perl5/$(PERL_VERSION)/man/man3/Image::Magick::Q16.3
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick.pm
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick/Q16.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Q16/Q16.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Q16/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/autosplit.ix
 
 # Compatibility links
 #