summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--PHPINFO-im610
-rw-r--r--PHPINFO-im712
-rw-r--r--REFLECTION-im631
-rw-r--r--REFLECTION-im7108
-rw-r--r--php-pecl-imagick.spec294
6 files changed, 249 insertions, 208 deletions
diff --git a/Makefile b/Makefile
index 72a5957..460477d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,4 @@ include ../../../common/Makefile
refl: $(NAME).spec
php --re imagick >REFLECTION-im7
php --ri imagick >PHPINFO-im7
- php80 --re imagick >REFLECTION-im6
- php80 --ri imagick >PHPINFO-im6
diff --git a/PHPINFO-im6 b/PHPINFO-im6
index 41c5b24..03a9677 100644
--- a/PHPINFO-im6
+++ b/PHPINFO-im6
@@ -4,12 +4,12 @@ imagick
imagick module => enabled
imagick module version => 3.7.0
imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel
-Imagick compiled with ImageMagick version => ImageMagick 6.9.12-52 Q16 x86_64 17273 https://legacy.imagemagick.org
-Imagick using ImageMagick library version => ImageMagick 6.9.12-52 Q16 x86_64 17273 https://legacy.imagemagick.org
+Imagick compiled with ImageMagick version => ImageMagick 6.9.13-21 Q16 x86_64 18557 https://legacy.imagemagick.org
+Imagick using ImageMagick library version => ImageMagick 6.9.13-21 Q16 x86_64 18557 https://legacy.imagemagick.org
ImageMagick copyright => (C) 1999 ImageMagick Studio LLC
-ImageMagick release date => 2022-06-05
-ImageMagick number of supported formats: => 247
-ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, AVI, AVIF, AVS, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUR, CUT, DATA, DCM, DCR, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FAX, FILE, FITS, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, H, HALD, HDR, HEIC, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, LABEL, M2V, M4V, MAC, MAGICK, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPG, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PREVIEW, PS, PS2, PS3, PSB, PSD, PTIF, PWP, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGBA, RGBO, RGF, RLA, RLE, RMF, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIDEO, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YCbCr, YCbCrA, YUV
+ImageMagick release date => 2024-12-22
+ImageMagick number of supported formats: => 250
+ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, AVI, AVIF, AVS, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUR, CUT, DATA, DCM, DCR, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FAX, FILE, FITS, FLV, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, H, HALD, HDR, HEIC, HEIF, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, LABEL, M2V, M4V, MAC, MAGICK, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPEG, MPG, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PREVIEW, PS, PS2, PS3, PSB, PSD, PTIF, PWP, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGBA, RGBO, RGF, RLA, RLE, RMF, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIDEO, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YCbCr, YCbCrA, YUV
Directive => Local Value => Master Value
imagick.locale_fix => 0 => 0
diff --git a/PHPINFO-im7 b/PHPINFO-im7
index 80da643..1d1817c 100644
--- a/PHPINFO-im7
+++ b/PHPINFO-im7
@@ -2,14 +2,14 @@
imagick
imagick module => enabled
-imagick module version => 3.7.0
+imagick module version => 3.8.0
imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel
-Imagick compiled with ImageMagick version => ImageMagick 7.1.0-37 Q16-HDRI x86_64 20104 https://imagemagick.org
-Imagick using ImageMagick library version => ImageMagick 7.1.0-37 Q16-HDRI x86_64 20104 https://imagemagick.org
+Imagick compiled with ImageMagick version => ImageMagick 7.1.1-47 Q16-HDRI x86_64 22763 https://imagemagick.org
+Imagick using ImageMagick library version => ImageMagick 7.1.1-47 Q16-HDRI x86_64 22763 https://imagemagick.org
ImageMagick copyright => (C) 1999 ImageMagick Studio LLC
-ImageMagick release date => 2022-06-05
-ImageMagick number of supported formats: => 262
-ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, ASHLAR, AVI, AVIF, AVS, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUBE, CUR, CUT, DATA, DCM, DCR, DCRAW, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FARBFELD, FAX, FF, FILE, FITS, FL32, FLV, FRACTAL, FTP, FTS, FTXT, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, HALD, HDR, HEIC, HEIF, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, KERNEL, LABEL, M2V, M4V, MAC, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPEG, MPG, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORA, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PHM, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PS, PS2, PS3, PSB, PSD, PTIF, PWP, QOI, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGB565, RGBA, RGBO, RGF, RLA, RLE, RMF, RSVG, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, STRIMG, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TM2, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YAML, YCbCr, YCbCrA, YUV
+ImageMagick release date => 2025-03-29
+ImageMagick number of supported formats: => 273
+ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, ASHLAR, AVCI, AVI, AVIF, AVS, BAYER, BAYERA, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUBE, CUR, CUT, DATA, DCM, DCR, DCRAW, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FARBFELD, FAX, FF, FFF, FILE, FITS, FL32, FLV, FRACTAL, FTP, FTS, FTXT, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, HALD, HDR, HEIC, HEIF, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, JXL, K25, KDC, KERNEL, LABEL, M2V, M4V, MAC, MAP, MASK, MAT, MATTE, MDC, MEF, MIFF, MKV, MNG, MONO, MOS, MOV, MP4, MPC, MPEG, MPG, MPO, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORA, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PHM, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PS, PS2, PS3, PSB, PSD, PTIF, PWP, QOI, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGB565, RGBA, RGBO, RGF, RLA, RLE, RMF, RSVG, RW2, RWL, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, SRW, STEGANO, STI, STRIMG, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TM2, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YAML, YCBCR, YCBCRA, YUV
Directive => Local Value => Master Value
imagick.locale_fix => 0 => 0
diff --git a/REFLECTION-im6 b/REFLECTION-im6
index 547f09b..e8f99d1 100644
--- a/REFLECTION-im6
+++ b/REFLECTION-im6
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
+Extension [ <persistent> extension #18 imagick version 3.7.0 ] {
- Dependencies {
Dependency [ gmagick (Conflicts) ]
@@ -42,8 +42,8 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -60,6 +60,7 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -133,8 +134,8 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -151,6 +152,7 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -224,8 +226,8 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -242,6 +244,7 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -315,8 +318,8 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -333,6 +336,7 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -406,8 +410,8 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -424,6 +428,7 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -4045,12 +4050,14 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:imagick, prototype Iterator> public method rewind ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:imagick, prototype Iterator> public method valid ] {
@@ -5451,12 +5458,14 @@ Extension [ <persistent> extension #76 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:imagick, prototype Iterator> public method rewind ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:imagick, prototype Iterator> public method current ] {
diff --git a/REFLECTION-im7 b/REFLECTION-im7
index 86c7303..54385eb 100644
--- a/REFLECTION-im7
+++ b/REFLECTION-im7
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
+Extension [ <persistent> extension #86 imagick version 3.8.0 ] {
- Dependencies {
Dependency [ gmagick (Conflicts) ]
@@ -42,8 +42,8 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -60,6 +60,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -133,8 +134,8 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -151,6 +152,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -224,8 +226,8 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -242,6 +244,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -315,8 +318,8 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -333,6 +336,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -406,8 +410,8 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Properties [4] {
Property [ protected $message = '' ]
Property [ protected $code = 0 ]
- Property [ protected $file = NULL ]
- Property [ protected $line = NULL ]
+ Property [ protected string $file = '' ]
+ Property [ protected int $line = 0 ]
}
- Methods [10] {
@@ -424,6 +428,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Tentative return [ void ]
}
Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
@@ -485,7 +490,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Class [ <internal:imagick> <iterateable> class Imagick implements Stringable, Iterator, Traversable, Countable ] {
- - Constants [626] {
+ - Constants [628] {
Constant [ public int COLOR_BLACK ] { 11 }
Constant [ public int COLOR_BLUE ] { 12 }
Constant [ public int COLOR_CYAN ] { 13 }
@@ -495,8 +500,8 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Constant [ public int COLOR_MAGENTA ] { 17 }
Constant [ public int COLOR_ALPHA ] { 18 }
Constant [ public int COLOR_FUZZ ] { 19 }
- Constant [ public int IMAGICK_EXTNUM ] { 30700 }
- Constant [ public string IMAGICK_EXTVER ] { 3.7.0 }
+ Constant [ public int IMAGICK_EXTNUM ] { 30800 }
+ Constant [ public string IMAGICK_EXTVER ] { 3.8.0 }
Constant [ public int QUANTUM_RANGE ] { 65535 }
Constant [ public int USE_ZEND_MM ] { 0 }
Constant [ public int COMPOSITE_DEFAULT ] { 54 }
@@ -579,6 +584,8 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Constant [ public int COMPOSITE_SOFTDODGE ] { 77 }
Constant [ public int COMPOSITE_STAMP ] { 78 }
Constant [ public int COMPOSITE_RMSE ] { 79 }
+ Constant [ public int COMPOSITE_SALIENCY_BLEND ] { 80 }
+ Constant [ public int COMPOSITE_SEAMLESS_BLEND ] { 81 }
Constant [ public int MONTAGEMODE_FRAME ] { 1 }
Constant [ public int MONTAGEMODE_UNFRAME ] { 2 }
Constant [ public int MONTAGEMODE_CONCATENATE ] { 3 }
@@ -609,7 +616,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Constant [ public int FILTER_WELCH ] { 17 }
Constant [ public int FILTER_PARZEN ] { 18 }
Constant [ public int FILTER_LAGRANGE ] { 21 }
- Constant [ public int FILTER_SENTINEL ] { 32 }
+ Constant [ public int FILTER_SENTINEL ] { 34 }
Constant [ public int FILTER_BOHMAN ] { 19 }
Constant [ public int FILTER_BARTLETT ] { 20 }
Constant [ public int FILTER_JINC ] { 13 }
@@ -1230,7 +1237,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [1] {
Parameter #0 [ <required> int $type ]
}
- - Return [ int ]
+ - Return [ float ]
}
Method [ <internal:imagick> static public method getVersion ] {
@@ -1263,7 +1270,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [1] {
Parameter #0 [ <required> string $key ]
}
- - Return [ string ]
+ - Return [ string|false ]
}
Method [ <internal:imagick> static public method listRegistry ] {
@@ -1285,12 +1292,12 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Properties [0] {
}
- - Methods [376] {
+ - Methods [377] {
Method [ <internal:imagick> public method optimizeImageLayers ] {
- Parameters [0] {
}
- - Return [ bool ]
+ - Return [ Imagick ]
}
Method [ <internal:imagick> public method compareImageLayers ] {
@@ -1639,6 +1646,15 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Return [ bool ]
}
+ Method [ <internal:imagick> public method clutImageWithInterpolate ] {
+
+ - Parameters [2] {
+ Parameter #0 [ <required> Imagick $lookup_table ]
+ Parameter #1 [ <required> int $pixel_interpolate_method ]
+ }
+ - Return [ bool ]
+ }
+
Method [ <internal:imagick> public method getImageProperties ] {
- Parameters [2] {
@@ -2250,7 +2266,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
- - Return [ string ]
+ - Return [ ?string ]
}
Method [ <internal:imagick> public method getImagesBlob ] {
@@ -3062,7 +3078,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Method [ <internal:imagick> public method convolveImage ] {
- Parameters [2] {
- Parameter #0 [ <required> array $kernel ]
+ Parameter #0 [ <required> ImagickKernel $kernel ]
Parameter #1 [ <optional> int $channel = Imagick::CHANNEL_DEFAULT ]
}
- Return [ bool ]
@@ -3136,7 +3152,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [1] {
Parameter #0 [ <required> int $evaluate ]
}
- - Return [ bool ]
+ - Return [ Imagick ]
}
Method [ <internal:imagick> public method flattenImages ] {
@@ -3625,9 +3641,10 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Method [ <internal:imagick> public method setImageBluePrimary ] {
- - Parameters [2] {
+ - Parameters [3] {
Parameter #0 [ <required> float $x ]
Parameter #1 [ <required> float $y ]
+ Parameter #2 [ <required> float $z ]
}
- Return [ bool ]
}
@@ -3685,9 +3702,10 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Method [ <internal:imagick> public method setImageGreenPrimary ] {
- - Parameters [2] {
+ - Parameters [3] {
Parameter #0 [ <required> float $x ]
Parameter #1 [ <required> float $y ]
+ Parameter #2 [ <required> float $z ]
}
- Return [ bool ]
}
@@ -3711,9 +3729,10 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Method [ <internal:imagick> public method setImageRedPrimary ] {
- - Parameters [2] {
+ - Parameters [3] {
Parameter #0 [ <required> float $x ]
Parameter #1 [ <required> float $y ]
+ Parameter #2 [ <required> float $z ]
}
- Return [ bool ]
}
@@ -3736,9 +3755,10 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Method [ <internal:imagick> public method setImageWhitePoint ] {
- - Parameters [2] {
+ - Parameters [3] {
Parameter #0 [ <required> float $x ]
Parameter #1 [ <required> float $y ]
+ Parameter #2 [ <required> float $z ]
}
- Return [ bool ]
}
@@ -3821,7 +3841,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Parameter #0 [ <required> int $columns ]
Parameter #1 [ <required> int $rows ]
Parameter #2 [ <required> ImagickPixel|string $background_color ]
- Parameter #3 [ <optional> string $format = null ]
+ Parameter #3 [ <optional> ?string $format = null ]
}
- Return [ bool ]
}
@@ -4013,12 +4033,14 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Return [ void ]
}
Method [ <internal:imagick, prototype Iterator> public method rewind ] {
- Parameters [0] {
}
+ - Return [ void ]
}
Method [ <internal:imagick, prototype Iterator> public method valid ] {
@@ -4088,8 +4110,8 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [5] {
Parameter #0 [ <required> Imagick $image ]
- Parameter #1 [ <optional> ?array &$offset = null ]
- Parameter #2 [ <optional> ?float &$similarity = null ]
+ Parameter #1 [ <optional> &$offset = null ]
+ Parameter #2 [ <optional> &$similarity = null ]
Parameter #3 [ <optional> float $threshold = 0.0 ]
Parameter #4 [ <optional> int $metric = 0 ]
}
@@ -4100,8 +4122,8 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [5] {
Parameter #0 [ <required> Imagick $image ]
- Parameter #1 [ <optional> ?array &$offset = null ]
- Parameter #2 [ <optional> ?float &$similarity = null ]
+ Parameter #1 [ <optional> &$offset = null ]
+ Parameter #2 [ <optional> &$similarity = null ]
Parameter #3 [ <optional> float $threshold = 0.0 ]
Parameter #4 [ <optional> int $metric = 0 ]
}
@@ -4187,7 +4209,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Parameter #0 [ <required> float $radius ]
Parameter #1 [ <required> float $strength ]
}
- - Return [ void ]
+ - Return [ bool ]
}
Method [ <internal:imagick> public method identifyImageType ] {
@@ -4859,7 +4881,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
- - Return [ string ]
+ - Return [ string|false ]
}
Method [ <internal:imagick> public method getFontStretch ] {
@@ -4978,7 +5000,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
- - Return [ string ]
+ - Return [ string|false ]
}
Method [ <internal:imagick> public method getClipRule ] {
@@ -5528,7 +5550,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Method [ <internal:imagick> public method setStrokeDashArray ] {
- Parameters [1] {
- Parameter #0 [ <required> array $dashes ]
+ Parameter #0 [ <required> ?array $dashes ]
}
- Return [ bool ]
}
@@ -5670,7 +5692,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
- - Return [ array ]
+ - Return [ ?array ]
}
Method [ <internal:imagick> public method getIteratorRow ] {
@@ -5684,7 +5706,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
- - Return [ array ]
+ - Return [ ?array ]
}
Method [ <internal:imagick> public method getPreviousIteratorRow ] {
@@ -5705,19 +5727,21 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [0] {
}
+ - Return [ void ]
}
Method [ <internal:imagick, prototype Iterator> public method rewind ] {
- Parameters [0] {
}
+ - Return [ void ]
}
Method [ <internal:imagick, prototype Iterator> public method current ] {
- Parameters [0] {
}
- - Return [ array ]
+ - Return [ ?array ]
}
Method [ <internal:imagick> public method newPixelIterator ] {
@@ -5886,7 +5910,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Parameter #0 [ <required> ImagickPixel|string $color ]
Parameter #1 [ <required> float $fuzz ]
}
- - Return [ bool ]
+ - Return [ ?bool ]
}
Method [ <internal:imagick> public method isPixelSimilarQuantum ] {
@@ -5895,7 +5919,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Parameter #0 [ <required> ImagickPixel|string $color ]
Parameter #1 [ <required> float $fuzz_quantum_range_scaled_by_square_root_of_three ]
}
- - Return [ bool ]
+ - Return [ ?bool ]
}
Method [ <internal:imagick> public method isSimilar ] {
@@ -5904,7 +5928,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
Parameter #0 [ <required> ImagickPixel|string $color ]
Parameter #1 [ <required> float $fuzz_quantum_range_scaled_by_square_root_of_three ]
}
- - Return [ bool ]
+ - Return [ ?bool ]
}
Method [ <internal:imagick> public method setColor ] {
@@ -5991,7 +6015,7 @@ Extension [ <persistent> extension #77 imagick version 3.7.0 ] {
- Parameters [2] {
Parameter #0 [ <required> array $matrix ]
- Parameter #1 [ <required> ?array $origin ]
+ Parameter #1 [ <optional> ?array $origin = null ]
}
- Return [ ImagickKernel ]
}
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index b6bfefc..32467ee 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -1,147 +1,117 @@
# remirepo spec file for php-pecl-imagick
#
-# Copyright (c) 2008-2022 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2008-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
-%bcond_with im6
-%bcond_with im7
%bcond_without tests
+%bcond_with im6
-# 2 builds needed to get the full set
-# --with im6
-# --with im7
+# Distribution default IM version
+%if 0%{?fedora} >= 38 || 0%{?rhel} >= 10
+%global default 7
+%else
+%global default 6
+%endif
-# we don't want -z defs linker flag
-%undefine _strict_symbol_defs_build
+# NOTICE: 2 builds needed to get the full set
+# All distro
+# default (im7)
+# On EL 8 and 9
+# --with im6
%if 0%{?scl:1}
-%scl_package php-pecl-imagick
+%scl_package php-pecl-imagick
+%else
+%global _root_prefix %{_prefix}
%endif
%global gh_commit 623a3ac0386c93d62c60cbfe610505f2e35780f3
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner imagick
%global gh_project imagick
-#global gh_date 20151204
%global pecl_name imagick
+%global pie_vend imagick
+%global pie_proj imagick
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
-%if "%{php_version}" < "5.6"
-%global ini_name %{pecl_name}.ini
-%else
%global ini_name 40-%{pecl_name}.ini
-%endif
-%global upstream_version 3.7.0
-#global upstream_prever RC1
+%global upstream_version 3.8.0
+#global upstream_prever RC2
+%global sources %{pecl_name}-%{upstream_version}%{?upstream_prever}
+%global _configure ../%{sources}/configure
-%if %{with im7}
-Summary: Extension to create and modify images using ImageMagick 7
-Name: %{?scl_prefix}php-pecl-imagick-im7
-%else
+%if %{with im6}
Summary: Extension to create and modify images using ImageMagick 6
Name: %{?scl_prefix}php-pecl-imagick-im6
+%else
+Summary: Extension to create and modify images using ImageMagick 7
+Name: %{?scl_prefix}php-pecl-imagick-im7
%endif
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-%if 0%{?gh_date}
-Release: 0.10.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
-%else
-Release: 1.16%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
-%endif
-License: PHP
+License: PHP-3.01
URL: https://pecl.php.net/package/imagick
BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
-BuildRequires: pcre-devel
-%if %{with im7}
-BuildRequires: ImageMagick7-devel
-%else
%if %{with im6}
BuildRequires: ImageMagick6-devel
%else
-BuildRequires: ImageMagick-devel
-%endif
+BuildRequires: ImageMagick7-devel
%endif
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-Provides: %{?scl_prefix}php-%{pecl_name} = %{version}%{?prever}
-Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}%{?prever}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}%{?prever}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever}
+%if %{with im6}
+Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pecl-imagick = %{version}-%{release}
+Provides: %{?scl_prefix}php-pecl-imagick%{?_isa} = %{version}-%{release}
+%else
+Provides: %{?scl_prefix}php-%{pecl_name} = 1:%{version}
+Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = 1:%{version}
+Provides: %{?scl_prefix}php-pecl-imagick = 1:%{version}-%{release}
+Provides: %{?scl_prefix}php-pecl-imagick%{?_isa} = 1:%{version}-%{release}
+%endif
+Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
+Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version}
Conflicts: %{?scl_prefix}php-pecl-gmagick
-%if %{with im7}
-Conflicts: %{?scl_prefix}php-pecl-imagick-im6 <= %{version}-%{release}
-Conflicts: %{?scl_prefix}php-pecl-imagick <= %{version}-%{release}
-%else
+%if %{with im6}
Conflicts: %{?scl_prefix}php-pecl-imagick-im7 <= %{version}-%{release}
+%if %{default} == 6
Obsoletes: %{?scl_prefix}php-pecl-imagick <= %{version}-%{release}
+%else
+Conflicts: %{?scl_prefix}php-pecl-imagick <= %{version}-%{release}
%endif
-Provides: %{?scl_prefix}php-pecl-imagick = %{version}-%{release}
-Provides: %{?scl_prefix}php-pecl-imagick%{?_isa} = %{version}-%{release}
-
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes: php53-pecl-%{pecl_name} <= %{version}
-Obsoletes: php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php54-pecl-%{pecl_name} <= %{version}
-Obsoletes: php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes: php55u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php55w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
-Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.0"
-Obsoletes: php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.1"
-Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.2"
-Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.3"
-Obsoletes: php73-pecl-%{pecl_name} <= %{version}
-Obsoletes: php73w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes: php74-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.0"
-Obsoletes: php80-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.1"
-Obsoletes: php81-pecl-%{pecl_name} <= %{version}
+%else
+Conflicts: %{?scl_prefix}php-pecl-imagick-im6 <= %{version}-%{release}
+%if %{default} == 7
+Obsoletes: %{?scl_prefix}php-pecl-imagick <= %{version}-%{release}
+%else
+Conflicts: %{?scl_prefix}php-pecl-imagick <= %{version}-%{release}
%endif
%endif
-
%description
Imagick is a native php extension to create and modify images
using the ImageMagick API.
Documentation: https://www.php.net/imagick
-%if %{with im7}
-Package built using ImageMagick version 7
-%else
+%if %{with im6}
Package built using ImageMagick version 6
+%else
+Package built using ImageMagick version 7
%endif
Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
@@ -152,11 +122,20 @@ Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{?scl_prefix}php-devel%{?_isa}
-%if %{with im7}
-Conflicts: %{?scl_prefix}php-pecl-imagick-im6-devel
-%else
+%if %{with im6}
Conflicts: %{?scl_prefix}php-pecl-imagick-im7-devel
+%if %{default} == 6
+Obsoletes: %{?scl_prefix}php-pecl-imagick-devel < %{version}-%{release}
+%else
+Conflicts: %{?scl_prefix}php-pecl-imagick-devel < %{version}-%{release}
+%endif
+%else
+Conflicts: %{?scl_prefix}php-pecl-imagick-im6-devel
+%if %{default} == 7
Obsoletes: %{?scl_prefix}php-pecl-imagick-devel < %{version}-%{release}
+%else
+Conflicts: %{?scl_prefix}php-pecl-imagick-devel < %{version}-%{release}
+%endif
%endif
Provides: %{?scl_prefix}php-pecl-imagick-devel = %{version}-%{release}
Provides: %{?scl_prefix}php-pecl-imagick-devel%{?_isa} = %{version}-%{release}
@@ -167,21 +146,13 @@ These are the files needed to compile programs using %{pecl_name} extension.
%prep
%setup -q -c
-%if 0%{?gh_date}
-mv %{gh_project}-%{gh_commit} NTS
-mv NTS/package.xml .
-sed -e 's/@PACKAGE_VERSION@/%{version}dev/' -i NTS/php_imagick.h
-sed -e 's/3.3.0RC2/%{version}dev/' -i package.xml
-%else
-mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
-%endif
# don't install any font (and test using it)
# don't install empty file (d41d8cd98f00b204e9800998ecf8427e)
sed -e '/anonymous_pro_minus.ttf/d' \
-e '/015-imagickdrawsetresolution.phpt/d' \
-e '/OFL.txt/d' \
- %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+ -e '/LICENSE/s/role="doc"/role="src"/' \
-i package.xml
if grep '\.ttf' package.xml
@@ -189,7 +160,7 @@ then : "Font files detected!"
exit 1
fi
-cd NTS
+cd %{sources}
: Avoid arginfo to be regenerated
rm *.stub.php
@@ -226,38 +197,47 @@ imagick.skip_version_check=1
;imagick.allow_zero_dimension_images => 0 => 0
EOF
+mkdir NTS
%if %{with_zts}
-cp -r NTS ZTS
+mkdir ZTS
%endif
%build
%{?dtsenable}
+cd %{sources}
+%{__phpize}
+[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global
+sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL
+
: Standard NTS build
-cd NTS
-%{_bindir}/phpize
-%configure --with-imagick=%{prefix} --with-php-config=%{_bindir}/php-config
-make %{?_smp_mflags}
+cd ../NTS
+%configure --with-imagick=%{_root_prefix} --with-php-config=%{__phpconfig}
+%make_build
-: Dump REFLECTION
+: Dump REFLECTION and PHPINFO
+%{__php} --no-php-ini \
+ --define extension=modules/%{pecl_name}.so \
+ --define imagick.skip_version_check=1 \
+ --re imagick >../REFLECTION
%{__php} --no-php-ini \
--define extension=modules/%{pecl_name}.so \
- --re imagick >REFLECTION
+ --define imagick.skip_version_check=1 \
+ --ri imagick >../PHPINFO
%if %{with_zts}
-cd ../ZTS
: ZTS build
-%{_bindir}/zts-phpize
-%configure --with-imagick=%{prefix} --with-php-config=%{_bindir}/zts-php-config
-make %{?_smp_mflags}
+cd ../ZTS
+%configure --with-imagick=%{_root_prefix} --with-php-config=%{__ztsphpconfig}
+%make_build
%endif
%install
%{?dtsenable}
-make install INSTALL_ROOT=%{buildroot} -C NTS
+%make_install -C NTS
# Drop in the bit of configuration
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
@@ -266,12 +246,12 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
install -D -p -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
%if %{with_zts}
-make install INSTALL_ROOT=%{buildroot} -C ZTS
+%make_install -C ZTS
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
# Test & Documentation
-cd NTS
+cd %{sources}
for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
do [ -f $i ] && install -Dpm 644 $i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
[ -f tests/$i ] && install -Dpm 644 tests/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/$i
@@ -282,35 +262,20 @@ do [ -f $i ] && install -Dpm 644 $i %{buildroot}%{pecl_docdir
done
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
%check
+cd %{sources}
export REPORT_EXIT_STATUS=1
# very long, and erratic results, sometime timeout
-rm ?TS/tests/229_Tutorial_fxAnalyzeImage_case1.phpt
-rm ?TS/tests/244_Tutorial_psychedelicFontGif_basic.phpt
+rm tests/229_Tutorial_fxAnalyzeImage_case1.phpt
+rm tests/244_Tutorial_psychedelicFontGif_basic.phpt
+# very long, and erratic results, sometime segfault on shutdown (EL-7/8)
+# also see https://github.com/Imagick/imagick/issues/724
+rm tests/073_Imagick_forwardFourierTransformImage_basic.phpt
+rm tests/086_Imagick_forwardFourierTransformImage_basic.phpt
+rm tests/151_Imagick_subImageMatch_basic.phpt
: simple module load test for NTS extension
-cd NTS
%{__php} --no-php-ini \
--define extension_dir=%{buildroot}%{php_extdir} \
--define extension=%{pecl_name}.so \
@@ -325,11 +290,21 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
%else
%{__php} -n run-tests.php -q --show-diff
%endif
+
+if [ -f %{php_extdir}/%{pecl_name}.so ]; then
+ # Only if same version
+ if %{__php} -n -d extension=%{pecl_name} -r 'exit(phpversion("%{pecl_name}")==="%{upstream_version}%{?upstream_prever}" ? 0 : 1);'
+ then
+ : upstream test suite for extension built with previous version
+ %{__php} --ri imagick
+ TEST_PHP_ARGS="-n -d extension=%{pecl_name}" \
+ %{__php} -n run-tests.php -q --show-diff %{?_smp_mflags}
+ fi
+fi
%endif
%if %{with_zts}
: simple module load test for ZTS extension
-cd ../ZTS
%{__ztsphp} --no-php-ini \
--define extension_dir=%{buildroot}%{php_ztsextdir} \
--define extension=%{pecl_name}.so \
@@ -338,7 +313,7 @@ cd ../ZTS
%files
-%{?_licensedir:%license NTS/LICENSE}
+%license %{sources}/LICENSE
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -351,7 +326,8 @@ cd ../ZTS
%endif
%files devel
-%doc NTS/REFLECTION
+%doc REFLECTION
+%doc PHPINFO
%doc %{pecl_testdir}/%{pecl_name}
%{php_incldir}/ext/%{pecl_name}
@@ -361,6 +337,40 @@ cd ../ZTS
%changelog
+* Fri Apr 11 2025 Remi Collet <remi@remirepo.net> - 3.8.0-1
+- update to 3.8.0
+
+* Fri Mar 14 2025 Remi Collet <remi@remirepo.net> - 3.8.0~RC2-1
+- update to 3.8.0RC2
+- open https://github.com/Imagick/imagick/issues/723 test failure with PHP 5.x
+- open https://github.com/Imagick/imagick/issues/724 erratic segfault in subImageMatch
+
+* Mon Dec 23 2024 Remi Collet <remi@remirepo.net> - 3.7.0-13
+- re-license spec file to CECILL-2.1
+- im7 by default, change using --with im6 build option
+
+* Thu Nov 21 2024 Remi Collet <remi@remirepo.net> - 3.7.0-12
+- drop unneeded build dependency
+
+* Fri Sep 27 2024 Remi Collet <remi@remirepo.net> - 3.7.0-11
+- add patch for PHP 8.4 from
+ https://github.com/Imagick/imagick/pull/690
+
+* Mon Feb 12 2024 Remi Collet <remi@remirepo.net> - 3.7.0-10
+- add upstream patch for test suite with recent IM versions
+
+* Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 3.7.0-9
+- rebuild for PHP 8.3.0RC1
+
+* Wed Jul 12 2023 Remi Collet <remi@remirepo.net> - 3.7.0-8
+- build out of sources tree
+
+* Fri Mar 10 2023 Remi Collet <remi@remirepo.net> - 3.7.0-7
+- rebuild with latest ImageMagick 6/7
+
+* Thu Sep 1 2022 Remi Collet <remi@remirepo.net> - 3.7.0-2
+- rebuild for PHP 8.2.0RC1
+
* Wed Jan 12 2022 Remi Collet <remi@remirepo.net> - 3.7.0-1
- update to 3.7.0