Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/imagemagick/imagemagick.p5m
branchs11u3-sru
changeset 7644 b5a859411118
parent 7538 1668450ff96c 
--- a/components/imagemagick/imagemagick.p5m	Fri Feb 03 13:18:56 2017 -0700
+++ b/components/imagemagick/imagemagick.p5m	Wed Jan 18 16:42:33 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 usr/bin/$(MACH64)/Magick++-config path=usr/bin/Magick++-config
 file usr/bin/$(MACH64)/Magick-config 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
@@ -339,20 +338,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
@@ -514,15 +513,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
@@ -539,10 +538,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
 #
upstream/oracle/userland-gate