From 6888e1c3b1c6f41c230afdbd1d7ded9035d7c0d0 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Tue, 09 Apr 2024 22:50:30 +0200
Subject: [PATCH] imagemagick: update to 7.1.1-30
---
components/image/imagemagick/manifests/sample-manifest.p5m | 20 ++++++++++++--------
components/image/imagemagick/Makefile | 5 +++--
components/image/imagemagick/pkg5 | 1 +
components/image/imagemagick/imagemagick.p5m | 22 +++++++++++++---------
4 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/components/image/imagemagick/Makefile b/components/image/imagemagick/Makefile
index 26cd071..0e66097 100644
--- a/components/image/imagemagick/Makefile
+++ b/components/image/imagemagick/Makefile
@@ -31,14 +31,14 @@
COMPONENT_NAME= ImageMagick
COMPONENT_VERSION= 7.1.1
-COMPONENT_SUBVERSION= 29
+COMPONENT_SUBVERSION= 30
HUMAN_VERSION= $(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
IPS_COMPONENT_VERSION= $(COMPONENT_VERSION).$(COMPONENT_SUBVERSION)
COMPONENT_SUMMARY= ImageMagick - Image Manipulation Utilities and Libraries
COMPONENT_PROJECT_URL= https://imagemagick.org
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
COMPONENT_ARCHIVE= $(COMPONENT_NAME)-$(HUMAN_VERSION).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:27bd25f945efdd7e38f6f9845a7c0a391fdb732f652dda140b743769c5f106e8
+COMPONENT_ARCHIVE_HASH= sha256:1f719ceb809e9b9b5f485af121be3df328c0acec6f714f5875a9bfb1512de074
COMPONENT_ARCHIVE_URL= https://github.com/ImageMagick/ImageMagick/archive/$(HUMAN_VERSION).tar.gz
COMPONENT_FMRI= image/imagemagick
COMPONENT_CLASSIFICATION= System/Multimedia Libraries
@@ -105,6 +105,7 @@
REQUIRED_PACKAGES += compress/xz
REQUIRED_PACKAGES += image/djvulibre
REQUIRED_PACKAGES += image/graphviz
+REQUIRED_PACKAGES += image/library/libjpeg-turbo
REQUIRED_PACKAGES += image/library/libpng16
REQUIRED_PACKAGES += image/library/libraw
REQUIRED_PACKAGES += image/library/libtiff
diff --git a/components/image/imagemagick/imagemagick.p5m b/components/image/imagemagick/imagemagick.p5m
index a4c7de8..14a72ee 100644
--- a/components/image/imagemagick/imagemagick.p5m
+++ b/components/image/imagemagick/imagemagick.p5m
@@ -12,7 +12,7 @@
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright 2015-2017 Aurelien Larcher
-# Copyright (c) 2023, Andreas Wacknitz
+# Copyright (c) 2023, 2024 Andreas Wacknitz
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -373,14 +373,16 @@
file path=usr/lib/$(MACH64)/pkgconfig/MagickCore.pc
file path=usr/lib/$(MACH64)/pkgconfig/MagickWand-7.Q16HDRI.pc
file path=usr/lib/$(MACH64)/pkgconfig/MagickWand.pc
-file path=usr/perl5/$(PERLVER)/man/man3perl/Image::Magick.3perl
-file path=usr/perl5/$(PERLVER)/man/man3perl/Image::Magick::Q16HDRI.3perl
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Image/Magick.pm
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Image/Magick/Q16HDRI.pm
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Image/Magick/Q16HDRI/Q16HDRI.so
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Image/Magick/Q16HDRI/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Image/Magick/autosplit.ix
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/Image/Magick.pm
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/Image/Magick/Q16HDRI.pm
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/.packlist
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/Magick.so
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/Q16HDRI/Q16HDRI.so
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/Q16HDRI/autosplit.ix
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/autosplit.ix
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/perllocal.pod
+file path=usr/man/man3/Image::Magick.3perl
+file path=usr/man/man3/Image::Magick::Q16HDRI.3perl
file path=usr/share/ImageMagick-7/english.xml
file path=usr/share/ImageMagick-7/francais.xml
file path=usr/share/ImageMagick-7/locale.xml
@@ -620,6 +622,7 @@
file path=usr/share/doc/ImageMagick-7/www/api/vision.html
file path=usr/share/doc/ImageMagick-7/www/api/wand-view.html
file path=usr/share/doc/ImageMagick-7/www/architecture.html
+file path=usr/share/doc/ImageMagick-7/www/assets/color-modes.js
file path=usr/share/doc/ImageMagick-7/www/assets/magick.css
file path=usr/share/doc/ImageMagick-7/www/assets/magick.js
file path=usr/share/doc/ImageMagick-7/www/changelog.html
@@ -680,6 +683,7 @@
file path=usr/share/doc/ImageMagick-7/www/openmp.html
file path=usr/share/doc/ImageMagick-7/www/perl-magick.html
file path=usr/share/doc/ImageMagick-7/www/porting.html
+file path=usr/share/doc/ImageMagick-7/www/privacy-policy.html
file path=usr/share/doc/ImageMagick-7/www/quantize.html
file path=usr/share/doc/ImageMagick-7/www/resources.html
file path=usr/share/doc/ImageMagick-7/www/search.html
diff --git a/components/image/imagemagick/manifests/sample-manifest.p5m b/components/image/imagemagick/manifests/sample-manifest.p5m
index 94851a1..c6381cd 100644
--- a/components/image/imagemagick/manifests/sample-manifest.p5m
+++ b/components/image/imagemagick/manifests/sample-manifest.p5m
@@ -344,14 +344,16 @@
file path=usr/lib/$(MACH64)/pkgconfig/MagickCore.pc
file path=usr/lib/$(MACH64)/pkgconfig/MagickWand-7.Q16HDRI.pc
file path=usr/lib/$(MACH64)/pkgconfig/MagickWand.pc
-file path=usr/perl5/$(PERLVER)/man/man3perl/Image::Magick.3perl
-file path=usr/perl5/$(PERLVER)/man/man3perl/Image::Magick::Q16HDRI.3perl
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Image/Magick.pm
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/Image/Magick/Q16HDRI.pm
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Image/Magick/Q16HDRI/Q16HDRI.so
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Image/Magick/Q16HDRI/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/auto/Image/Magick/autosplit.ix
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/Image/Magick.pm
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/Image/Magick/Q16HDRI.pm
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/.packlist
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/Magick.so
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/Q16HDRI/Q16HDRI.so
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/Q16HDRI/autosplit.ix
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/auto/Image/Magick/autosplit.ix
+file path=usr/lib/perl5/i86pc-solaris-thread-multi-64/perllocal.pod
+file path=usr/man/man3/Image::Magick.3perl
+file path=usr/man/man3/Image::Magick::Q16HDRI.3perl
file path=usr/share/ImageMagick-7/english.xml
file path=usr/share/ImageMagick-7/francais.xml
file path=usr/share/ImageMagick-7/locale.xml
@@ -591,6 +593,7 @@
file path=usr/share/doc/ImageMagick-7/www/api/vision.html
file path=usr/share/doc/ImageMagick-7/www/api/wand-view.html
file path=usr/share/doc/ImageMagick-7/www/architecture.html
+file path=usr/share/doc/ImageMagick-7/www/assets/color-modes.js
file path=usr/share/doc/ImageMagick-7/www/assets/magick.css
file path=usr/share/doc/ImageMagick-7/www/assets/magick.js
file path=usr/share/doc/ImageMagick-7/www/changelog.html
@@ -651,6 +654,7 @@
file path=usr/share/doc/ImageMagick-7/www/openmp.html
file path=usr/share/doc/ImageMagick-7/www/perl-magick.html
file path=usr/share/doc/ImageMagick-7/www/porting.html
+file path=usr/share/doc/ImageMagick-7/www/privacy-policy.html
file path=usr/share/doc/ImageMagick-7/www/quantize.html
file path=usr/share/doc/ImageMagick-7/www/resources.html
file path=usr/share/doc/ImageMagick-7/www/search.html
diff --git a/components/image/imagemagick/pkg5 b/components/image/imagemagick/pkg5
index aab0068..0249698 100644
--- a/components/image/imagemagick/pkg5
+++ b/components/image/imagemagick/pkg5
@@ -4,6 +4,7 @@
"compress/xz",
"image/djvulibre",
"image/graphviz",
+ "image/library/libjpeg-turbo",
"image/library/libjpeg8-turbo",
"image/library/libpng16",
"image/library/libraw",
--
Gitblit v1.9.3