From 10af2cb5a5a7fc2fadcf09364e75684d1b6ed6f2d33f4df4bc4f09fe1959ed9d Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Mon, 21 Jun 2021 05:29:58 +0000 Subject: [PATCH] Accepting request 901056 from home:munix9:branches:server:php:extensions - Upgrade to version 3.5.0 - Fixed multiple parameter information issues found in 3.5.0RC1. - ImageMagick 7 is still not widely available on systems. So contrary to previous plans, ImageMagick 6 support will continue for now. But users are recommeded to use ImageMagick 7 if possible. - Method names have been changed to not be all lower case. Both method names and parameter information is built from the Imagick*.stub.php files. - Prevent accidental creation of zero dimension images. ImageMagick doesn't prevent creation of zero dimension images, but will give an error when that image is used. I don't think this will affect any correctly program, but if it does, and you need to re-enable zero dimension images, please open an issue at https://phpimagick.com/issues - Various pieces of work have been done to make GOMP not segfault including: * Call omp_pause_resource_all when available during shutdown. * Added the 'imagick.shutdown_sleep_count' (default 10) and 'imagick.set_single_thread' (default On). Both of these exist to mitigate the segaults on shutdown. - Fixes: * Correct version check to make RemoveAlphaChannel and FlattenAlphaChannel be available when using Imagick with ImageMagick version 6.7.8-x * Imagick::morphology now no longer ignores channel parameter - Added: * PHP 8.0 support. * Location check for ImageMagick 7 for NixOS and Brew. * Imagick::houghLineImage(int $width, int $height, float $threshold): bool {} * Imagick::setImagePixelColor(int $x, int $y, ImagickPixel|string $color) * Imagick::setImageMask(Imagick $clip_mask, int $pixelmask_type) * Imagick::getImageMask(int $pixelmask_type) * Imagick::VIRTUALPIXELMETHOD_DITHER * Imagick::VIRTUALPIXELMETHOD_RANDOM * Imagick::COMPOSITE_FREEZE * Imagick::COMPOSITE_INTERPOLATE * Imagick::COMPOSITE_NEGATE * Imagick::COMPOSITE_REFLECT * Imagick::COMPOSITE_SOFTBURN * Imagick::COMPOSITE_SOFTDODGE * Imagick::COMPOSITE_STAMP * Imagick::COMPOSITE_RMSE * Imagick::COMPRESSION_DWAA * Imagick::COMPRESSION_DWAB * Imagick::EVALUATE_INVERSE_LOG * Imagick::COLORSPACE_DISPLAYP3 * Imagick::COLORSPACE_ADOBE98 * Imagick::COLORSPACE_PROPHOTO * Imagick::COLORSPACE_JZAZBZ * Imagick::DISTORTION_RIGID_AFFINE * Imagick::DISTORTION_BARRELINVERSE * Imagick::STATISTIC_ROOT_MEAN_SQUARE OBS-URL: https://build.opensuse.org/request/show/901056 OBS-URL: https://build.opensuse.org/package/show/server:php:extensions/php-imagick?expand=0&rev=6 --- _multibuild | 2 +- imagick-3.4.4.tgz | 3 -- imagick-3.5.0.tgz | 3 ++ imagick-reproducible.patch | 4 +-- imagick.ini | 2 -- php-imagick.changes | 59 ++++++++++++++++++++++++++++++++++++++ php-imagick.spec | 34 +++++++++++----------- 7 files changed, 81 insertions(+), 26 deletions(-) delete mode 100644 imagick-3.4.4.tgz create mode 100644 imagick-3.5.0.tgz delete mode 100644 imagick.ini diff --git a/_multibuild b/_multibuild index c0d5a64..e9f3445 100644 --- a/_multibuild +++ b/_multibuild @@ -1,4 +1,4 @@ php7 - + php8 diff --git a/imagick-3.4.4.tgz b/imagick-3.4.4.tgz deleted file mode 100644 index 133b367..0000000 --- a/imagick-3.4.4.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8dd5aa16465c218651fc8993e1faecd982e6a597870fd4b937e9ece02d567077 -size 253434 diff --git a/imagick-3.5.0.tgz b/imagick-3.5.0.tgz new file mode 100644 index 0000000..e663937 --- /dev/null +++ b/imagick-3.5.0.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:795db7c36fbacd3d33a4f53ff2d38584c846e80a04dcd04c55e9e46c28f5d229 +size 300657 diff --git a/imagick-reproducible.patch b/imagick-reproducible.patch index eea134d..348a618 100644 --- a/imagick-reproducible.patch +++ b/imagick-reproducible.patch @@ -2,7 +2,7 @@ Index: imagick-3.4.3/imagick.c =================================================================== --- imagick-3.4.3.orig/imagick.c +++ imagick-3.4.3/imagick.c -@@ -3698,10 +3698,11 @@ PHP_MINIT_FUNCTION(imagick) +@@ -3897,10 +3897,11 @@ PHP_MINIT_FUNCTION(imagick) #endif REGISTER_INI_ENTRIES(); @@ -15,7 +15,7 @@ Index: imagick-3.4.3/imagick.c return SUCCESS; } -@@ -3734,7 +3735,7 @@ PHP_MINFO_FUNCTION(imagick) +@@ -3933,7 +3934,7 @@ PHP_MINFO_FUNCTION(imagick) #else php_info_print_table_row(2, "imagick classes", "Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator"); #endif diff --git a/imagick.ini b/imagick.ini deleted file mode 100644 index 3052d4f..0000000 --- a/imagick.ini +++ /dev/null @@ -1,2 +0,0 @@ -; comment out next line to disable imagick extension in php -extension=imagick.so diff --git a/php-imagick.changes b/php-imagick.changes index 2cb60dd..6ccac6c 100644 --- a/php-imagick.changes +++ b/php-imagick.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Sun Jun 20 11:27:28 UTC 2021 - munix9@googlemail.com + +- Upgrade to version 3.5.0 + - Fixed multiple parameter information issues found in 3.5.0RC1. + - ImageMagick 7 is still not widely available on systems. + So contrary to previous plans, ImageMagick 6 support will + continue for now. + But users are recommeded to use ImageMagick 7 if possible. + - Method names have been changed to not be all lower case. Both + method names and parameter information is built from the + Imagick*.stub.php files. + - Prevent accidental creation of zero dimension images. + ImageMagick doesn't prevent creation of zero dimension images, + but will give an error when that image is used. I don't think + this will affect any correctly program, but if it does, and + you need to re-enable zero dimension images, please open an + issue at https://phpimagick.com/issues + - Various pieces of work have been done to make GOMP not + segfault including: + * Call omp_pause_resource_all when available during shutdown. + * Added the 'imagick.shutdown_sleep_count' (default 10) and + 'imagick.set_single_thread' (default On). Both of these + exist to mitigate the segaults on shutdown. + + - Fixes: + * Correct version check to make RemoveAlphaChannel and + FlattenAlphaChannel be available when using Imagick with + ImageMagick version 6.7.8-x + * Imagick::morphology now no longer ignores channel parameter + + - Added: + * PHP 8.0 support. + * Location check for ImageMagick 7 for NixOS and Brew. + * Imagick::houghLineImage(int $width, int $height, float $threshold): bool {} + * Imagick::setImagePixelColor(int $x, int $y, ImagickPixel|string $color) + * Imagick::setImageMask(Imagick $clip_mask, int $pixelmask_type) + * Imagick::getImageMask(int $pixelmask_type) + * Imagick::VIRTUALPIXELMETHOD_DITHER + * Imagick::VIRTUALPIXELMETHOD_RANDOM + * Imagick::COMPOSITE_FREEZE + * Imagick::COMPOSITE_INTERPOLATE + * Imagick::COMPOSITE_NEGATE + * Imagick::COMPOSITE_REFLECT + * Imagick::COMPOSITE_SOFTBURN + * Imagick::COMPOSITE_SOFTDODGE + * Imagick::COMPOSITE_STAMP + * Imagick::COMPOSITE_RMSE + * Imagick::COMPRESSION_DWAA + * Imagick::COMPRESSION_DWAB + * Imagick::EVALUATE_INVERSE_LOG + * Imagick::COLORSPACE_DISPLAYP3 + * Imagick::COLORSPACE_ADOBE98 + * Imagick::COLORSPACE_PROPHOTO + * Imagick::COLORSPACE_JZAZBZ + * Imagick::DISTORTION_RIGID_AFFINE + * Imagick::DISTORTION_BARRELINVERSE + * Imagick::STATISTIC_ROOT_MEAN_SQUARE + ------------------------------------------------------------------- Thu Feb 18 23:10:08 UTC 2021 - Arjen de Korte diff --git a/php-imagick.spec b/php-imagick.spec index b19cd4a..9a8c900 100644 --- a/php-imagick.spec +++ b/php-imagick.spec @@ -31,57 +31,55 @@ ExclusiveArch: do-not-build %endif Name: %{php_name}-%{pkg_name} -Version: 3.4.4 +Version: 3.5.0 Release: 0 Summary: Wrapper to the ImageMagick library License: PHP-3.01 Group: Productivity/Networking/Web/Servers URL: https://pecl.php.net/package/imagick Source0: https://pecl.php.net/get/%{pkg_name}-%{version}.tgz -Source1: %{pkg_name}.ini -Source2: php-%{pkg_name}-rpmlintrc +Source1: php-%{pkg_name}-rpmlintrc Patch0: imagick-reproducible.patch BuildRequires: ImageMagick-devel >= 6.5.3.10 BuildRequires: ghostscript-fonts-std BuildRequires: %{php_name}-devel >= 7.0.1 BuildRequires: re2c -Conflicts: php7-gmagick -Provides: php-%{pkg_name} = %{version} -Obsoletes: php-%{pkg_name} < %{version} Requires: php(api) = %{php_core_api} Requires: php(zend-abi) = %{php_zend_api} +Conflicts: %{php_name}-gmagick +Provides: php-%{pkg_name} = %{version} +Obsoletes: php-%{pkg_name} < %{version} %description PHP extension to create, modify and obtain meta information of images using -the ImageMagick API +the ImageMagick API. %prep %autosetup -n %{pkg_name}-%{version} -p1 -# Ignore know failed test on OBS with timeout -rm tests/229_Tutorial_fxAnalyzeImage_case1.phpt + +# fix script-without-shebang/spurious-executable-perm +chmod 0644 ChangeLog LICENSE %build export CFLAGS="%{optflags} -fvisibility=hidden" %{__phpize} -%configure --with-%{pkg_name}=%{_usr} +%configure %make_build %check -%if 0%{?qemu_user_space_build} -export TEST_TIMEOUT=600 -%endif -%make_build PHP_EXECUTABLE=%{__php} NO_INTERACTION=1 test \ - || { for f in tests/*.out; do cat $f; echo '------'; done; exit 1; } +%make_build PHP_EXECUTABLE=%{__php} NO_INTERACTION=1 test %install make install-modules INSTALL_ROOT=%{buildroot} mkdir -p %{buildroot}%{php_cfgdir} -install --mode=0644 %{SOURCE1} %{buildroot}%{php_cfgdir}/%{pkg_name}.ini +cat > %{buildroot}%{php_cfgdir}/%{pkg_name}.ini <