On 2015/11/28 21:59, Manolis Tzanidakis wrote: > On Sat (28/11/15), Stuart Henderson wrote: > > On 2015/11/28 03:34, Manolis Tzanidakis wrote: > > > Hello list, > > > I've upgraded a couple of my servers to the latest snapshot and noticed > > > that pecl-imagick got broken. > > > > > > Anyway the error message is: > > > > > > PHP Fatal error: Uncaught exception 'ImagickException' with message \ > > > 'NoDecodeDelegateForThisImageFormat `JPEG' @ \ > > > error/constitute.c/ReadImage/501 > > > > Oh, I know what this will be. We're building the modular version (to work > > around a problem where having WMF support enabled causes functions from > > MagickWand to be used from MagickCore causing link failures). But the > > modular version is going to be a pain in chroot. > > > > I'll see if I can figure out another way to do this. > > I see. If you need any help with testing, please send the diffs; since > I've got the bug-triggering setup in place already.. >
Thanks - can you try this please? It disables the WMF delegate and switches back to the non-modular build. (For some reason that I don't fully understand, even with this disabled I can still use convert(1) to convert to and from WMF..) After updating ImageMagick, you'll need to remove ltdl from WANTLIB in pecl-imagick's Makefile and rebuild/reinstall that ("make update" should be good enough I think). I'll need to regen WANTLIB for ports depending on ImageMagick before I can actually commit this though, it may take me a day or two to find time for this. Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v retrieving revision 1.139 diff -u -p -r1.139 Makefile --- Makefile 6 Nov 2015 20:37:21 -0000 1.139 +++ Makefile 28 Nov 2015 22:15:11 -0000 @@ -5,14 +5,14 @@ SHARED_ONLY= Yes COMMENT= image processing tools VER= 6.9.2 -DASHVER= 5 +DASHVER= 7 DISTNAME= ImageMagick-${VER}-${DASHVER} PKGNAME= ImageMagick-${VER}.${DASHVER} EXTRACT_SUFX= .tar.xz -SHARED_LIBS += MagickCore-6.Q16 0.0 # 2.0 -SHARED_LIBS += MagickWand-6.Q16 0.0 # 2.0 -SHARED_LIBS += Magick++-6.Q16 0.0 # 6.0 +SHARED_LIBS += MagickCore-6.Q16 1.0 # 2.0 +SHARED_LIBS += MagickWand-6.Q16 1.0 # 2.0 +SHARED_LIBS += Magick++-6.Q16 1.0 # 6.0 CATEGORIES= graphics @@ -25,27 +25,23 @@ MASTER_SITES= http://www.imagemagick.or PERMIT_PACKAGE_CDROM= Yes WANTLIB += ICE SM X11 Xau Xdmcp Xext Xt bz2 c djvulibre expat -WANTLIB += fftw3 fontconfig freetype jbig jpeg lcms2 ltdl lzma -WANTLIB += m openjp2 perl png pthread pthread-stubs stdc++ tiff -WANTLIB += webp wmflite-0.2 xcb xml2 z +WANTLIB += fftw3 fontconfig freetype jbig jpeg lcms2 lzma m +WANTLIB += openjp2 perl png pthread pthread-stubs stdc++ tiff +WANTLIB += webp xcb xml2 z MODULES = converters/libiconv LIB_DEPENDS = archivers/bzip2 \ archivers/xz \ - devel/libtool,-ltdl \ graphics/djvulibre \ graphics/jbigkit \ graphics/png \ graphics/tiff \ graphics/lcms2 \ graphics/libwebp \ - graphics/libwmf \ graphics/openjp2 \ math/fftw3 \ textproc/libxml -# XXX graphics/libwmf -# ^^ doesn't detect properly in configure RUN_DEPENDS = graphics/netpbm \ print/ghostscript/gnu \ @@ -58,14 +54,12 @@ CONFIGURE_STYLE= autoconf LIBTOOL_FLAGS= --tag=disable-static AUTOCONF_VERSION= 2.69 USE_GMAKE= Yes -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --without-gcc-arch \ +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --without-gcc-arch \ --with-gs-font-dir=${LOCALBASE}/share/fonts/ghostscript \ - --with-modules \ --with-perl \ --with-perl-options='MAKE=${MAKE_PROGRAM}' \ --with-quantum-depth=16 \ - --with-wmf \ --without-dps \ --without-fpx \ --without-gvc \ @@ -73,6 +67,7 @@ CONFIGURE_ARGS+= --without-gcc-arch \ --without-openexr \ --without-pango \ --without-rsvg \ + --without-wmf \ --disable-openmp CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \ Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/ImageMagick/distinfo,v retrieving revision 1.21 diff -u -p -r1.21 distinfo --- distinfo 6 Nov 2015 20:37:21 -0000 1.21 +++ distinfo 28 Nov 2015 22:15:11 -0000 @@ -1,2 +1,2 @@ -SHA256 (ImageMagick-6.9.2-5.tar.xz) = Gfs0FyWhPAFFjPziPQomD9AyQypdruvdTwbJLXFt7UA= -SIZE (ImageMagick-6.9.2-5.tar.xz) = 8771052 +SHA256 (ImageMagick-6.9.2-7.tar.xz) = 7vgL8lmCNSPa+82uFeI2tEPs9tSuQVEG16hh0fqNnRM= +SIZE (ImageMagick-6.9.2-7.tar.xz) = 8780716 Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/graphics/ImageMagick/pkg/DESCR,v retrieving revision 1.5 diff -u -p -r1.5 DESCR --- pkg/DESCR 31 Mar 2005 04:23:42 -0000 1.5 +++ pkg/DESCR 28 Nov 2015 22:15:11 -0000 @@ -1,70 +1,7 @@ -ImageMagick is an X11 package for display and interactive manipulation -of images. The package includes tools for image conversion, annotation, -compositing, animation, and creating montages. ImageMagick can read and -write many of the more popular image formats (e.g. JPEG, TIFF, PNM, XPM, -Photo CD, etc.). - -With ImageMagick you can: - - o load an image from a file - o display the next image - o display the former image - o display a sequence of images as a slide show - o write the image to a file - o print the image to a Postscript printer - o delete the image file - o create a Visual Image Directory - o select the image to display by its thumbnail rather than name - o undo last image transformation - o copy a region of the image - o paste a region to the image - o restore the image to its original size - o refresh the image - o half the image size - o double the image size - o resize the image - o crop the image - o cut the image - o flop image in the horizontal direction - o flip image in the vertical direction - o rotate the image 90 degrees clockwise - o rotate the image 90 degrees counter-clockwise - o rotate the image - o shear the image - o trim the image edges - o invert the colors of the image - o vary the color brightness - o vary the color saturation - o vary the image hue - o gamma correct the image - o sharpen the image contrast - o dull the image contrast - o perform histogram equalization on the image - o perform histogram normalization on the image - o negate the image colors - o toggle the colormap type: : Shared or Private - o reduce the speckles within an image - o eliminate peak noise from an image - o detect edges within the image - o emboss an image - o oil paint an image - o convert the image to grayscale - o set the maximum number of unique colors in the image - o segment the image by color - o apply image processing techniques to a region of interest - o annotate the image with text - o draw on the image - o edit an image pixel color - o edit the image matte information - o composite an image with another - o add a border to the image - o surround image with an ornamental border - o add an image comment - o display image centered on a backdrop - o display image to background of a window - o display information about the image - o display information about this program - o discard all images and exit program - o change the level of magnification - o display images specified by a World Wide Web (WWW) uniform resource - locator (URL) +ImageMagick is a software suite (library and primarily command-line +tools) to create, edit, compose, or convert bitmap images. It can read +and write images in a variety of formats including PNG, JPEG, JPEG-2000, +GIF, TIFF, DPX, EXR, WebP, Postscript, PDF, and SVG. Use ImageMagick +to resize, flip, mirror, rotate, distort, shear and transform images, +adjust image colors, apply various special effects, or draw text, lines, +polygons, ellipses and Bezier curves. Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/ImageMagick/pkg/PLIST,v retrieving revision 1.46 diff -u -p -r1.46 PLIST --- pkg/PLIST 6 Nov 2015 20:37:21 -0000 1.46 +++ pkg/PLIST 28 Nov 2015 22:15:11 -0000 @@ -159,253 +159,6 @@ include/ImageMagick/wand/wand-view.h lib/ImageMagick/ lib/ImageMagick/config-Q16/ lib/ImageMagick/config-Q16/configure.xml -lib/ImageMagick/modules-Q16/ -lib/ImageMagick/modules-Q16/coders/ -lib/ImageMagick/modules-Q16/coders/aai.la -lib/ImageMagick/modules-Q16/coders/aai.so -lib/ImageMagick/modules-Q16/coders/art.la -lib/ImageMagick/modules-Q16/coders/art.so -lib/ImageMagick/modules-Q16/coders/avs.la -lib/ImageMagick/modules-Q16/coders/avs.so -lib/ImageMagick/modules-Q16/coders/bgr.la -lib/ImageMagick/modules-Q16/coders/bgr.so -lib/ImageMagick/modules-Q16/coders/bmp.la -lib/ImageMagick/modules-Q16/coders/bmp.so -lib/ImageMagick/modules-Q16/coders/braille.la -lib/ImageMagick/modules-Q16/coders/braille.so -lib/ImageMagick/modules-Q16/coders/cals.la -lib/ImageMagick/modules-Q16/coders/cals.so -lib/ImageMagick/modules-Q16/coders/caption.la -lib/ImageMagick/modules-Q16/coders/caption.so -lib/ImageMagick/modules-Q16/coders/cin.la -lib/ImageMagick/modules-Q16/coders/cin.so -lib/ImageMagick/modules-Q16/coders/cip.la -lib/ImageMagick/modules-Q16/coders/cip.so -lib/ImageMagick/modules-Q16/coders/clip.la -lib/ImageMagick/modules-Q16/coders/clip.so -lib/ImageMagick/modules-Q16/coders/cmyk.la -lib/ImageMagick/modules-Q16/coders/cmyk.so -lib/ImageMagick/modules-Q16/coders/cut.la -lib/ImageMagick/modules-Q16/coders/cut.so -lib/ImageMagick/modules-Q16/coders/dcm.la -lib/ImageMagick/modules-Q16/coders/dcm.so -lib/ImageMagick/modules-Q16/coders/dds.la -lib/ImageMagick/modules-Q16/coders/dds.so -lib/ImageMagick/modules-Q16/coders/debug.la -lib/ImageMagick/modules-Q16/coders/debug.so -lib/ImageMagick/modules-Q16/coders/dib.la -lib/ImageMagick/modules-Q16/coders/dib.so -lib/ImageMagick/modules-Q16/coders/djvu.la -lib/ImageMagick/modules-Q16/coders/djvu.so -lib/ImageMagick/modules-Q16/coders/dng.la -lib/ImageMagick/modules-Q16/coders/dng.so -lib/ImageMagick/modules-Q16/coders/dot.la -lib/ImageMagick/modules-Q16/coders/dot.so -lib/ImageMagick/modules-Q16/coders/dpx.la -lib/ImageMagick/modules-Q16/coders/dpx.so -lib/ImageMagick/modules-Q16/coders/ept.la -lib/ImageMagick/modules-Q16/coders/ept.so -lib/ImageMagick/modules-Q16/coders/fax.la -lib/ImageMagick/modules-Q16/coders/fax.so -lib/ImageMagick/modules-Q16/coders/fd.la -lib/ImageMagick/modules-Q16/coders/fd.so -lib/ImageMagick/modules-Q16/coders/fits.la -lib/ImageMagick/modules-Q16/coders/fits.so -lib/ImageMagick/modules-Q16/coders/gif.la -lib/ImageMagick/modules-Q16/coders/gif.so -lib/ImageMagick/modules-Q16/coders/gradient.la -lib/ImageMagick/modules-Q16/coders/gradient.so -lib/ImageMagick/modules-Q16/coders/gray.la -lib/ImageMagick/modules-Q16/coders/gray.so -lib/ImageMagick/modules-Q16/coders/hald.la -lib/ImageMagick/modules-Q16/coders/hald.so -lib/ImageMagick/modules-Q16/coders/hdr.la -lib/ImageMagick/modules-Q16/coders/hdr.so -lib/ImageMagick/modules-Q16/coders/histogram.la -lib/ImageMagick/modules-Q16/coders/histogram.so -lib/ImageMagick/modules-Q16/coders/hrz.la -lib/ImageMagick/modules-Q16/coders/hrz.so -lib/ImageMagick/modules-Q16/coders/html.la -lib/ImageMagick/modules-Q16/coders/html.so -lib/ImageMagick/modules-Q16/coders/icon.la -lib/ImageMagick/modules-Q16/coders/icon.so -lib/ImageMagick/modules-Q16/coders/info.la -lib/ImageMagick/modules-Q16/coders/info.so -lib/ImageMagick/modules-Q16/coders/inline.la -lib/ImageMagick/modules-Q16/coders/inline.so -lib/ImageMagick/modules-Q16/coders/ipl.la -lib/ImageMagick/modules-Q16/coders/ipl.so -lib/ImageMagick/modules-Q16/coders/jbig.la -lib/ImageMagick/modules-Q16/coders/jbig.so -lib/ImageMagick/modules-Q16/coders/jnx.la -lib/ImageMagick/modules-Q16/coders/jnx.so -lib/ImageMagick/modules-Q16/coders/jp2.la -lib/ImageMagick/modules-Q16/coders/jp2.so -lib/ImageMagick/modules-Q16/coders/jpeg.la -lib/ImageMagick/modules-Q16/coders/jpeg.so -lib/ImageMagick/modules-Q16/coders/json.la -lib/ImageMagick/modules-Q16/coders/json.so -lib/ImageMagick/modules-Q16/coders/label.la -lib/ImageMagick/modules-Q16/coders/label.so -lib/ImageMagick/modules-Q16/coders/mac.la -lib/ImageMagick/modules-Q16/coders/mac.so -lib/ImageMagick/modules-Q16/coders/magick.la -lib/ImageMagick/modules-Q16/coders/magick.so -lib/ImageMagick/modules-Q16/coders/map.la -lib/ImageMagick/modules-Q16/coders/map.so -lib/ImageMagick/modules-Q16/coders/mask.la -lib/ImageMagick/modules-Q16/coders/mask.so -lib/ImageMagick/modules-Q16/coders/mat.la -lib/ImageMagick/modules-Q16/coders/mat.so -lib/ImageMagick/modules-Q16/coders/matte.la -lib/ImageMagick/modules-Q16/coders/matte.so -lib/ImageMagick/modules-Q16/coders/meta.la -lib/ImageMagick/modules-Q16/coders/meta.so -lib/ImageMagick/modules-Q16/coders/miff.la -lib/ImageMagick/modules-Q16/coders/miff.so -lib/ImageMagick/modules-Q16/coders/mono.la -lib/ImageMagick/modules-Q16/coders/mono.so -lib/ImageMagick/modules-Q16/coders/mpc.la -lib/ImageMagick/modules-Q16/coders/mpc.so -lib/ImageMagick/modules-Q16/coders/mpeg.la -lib/ImageMagick/modules-Q16/coders/mpeg.so -lib/ImageMagick/modules-Q16/coders/mpr.la -lib/ImageMagick/modules-Q16/coders/mpr.so -lib/ImageMagick/modules-Q16/coders/msl.la -lib/ImageMagick/modules-Q16/coders/msl.so -lib/ImageMagick/modules-Q16/coders/mtv.la -lib/ImageMagick/modules-Q16/coders/mtv.so -lib/ImageMagick/modules-Q16/coders/mvg.la -lib/ImageMagick/modules-Q16/coders/mvg.so -lib/ImageMagick/modules-Q16/coders/null.la -lib/ImageMagick/modules-Q16/coders/null.so -lib/ImageMagick/modules-Q16/coders/otb.la -lib/ImageMagick/modules-Q16/coders/otb.so -lib/ImageMagick/modules-Q16/coders/palm.la -lib/ImageMagick/modules-Q16/coders/palm.so -lib/ImageMagick/modules-Q16/coders/pango.la -lib/ImageMagick/modules-Q16/coders/pango.so -lib/ImageMagick/modules-Q16/coders/pattern.la -lib/ImageMagick/modules-Q16/coders/pattern.so -lib/ImageMagick/modules-Q16/coders/pcd.la -lib/ImageMagick/modules-Q16/coders/pcd.so -lib/ImageMagick/modules-Q16/coders/pcl.la -lib/ImageMagick/modules-Q16/coders/pcl.so -lib/ImageMagick/modules-Q16/coders/pcx.la -lib/ImageMagick/modules-Q16/coders/pcx.so -lib/ImageMagick/modules-Q16/coders/pdb.la -lib/ImageMagick/modules-Q16/coders/pdb.so -lib/ImageMagick/modules-Q16/coders/pdf.la -lib/ImageMagick/modules-Q16/coders/pdf.so -lib/ImageMagick/modules-Q16/coders/pes.la -lib/ImageMagick/modules-Q16/coders/pes.so -lib/ImageMagick/modules-Q16/coders/pict.la -lib/ImageMagick/modules-Q16/coders/pict.so -lib/ImageMagick/modules-Q16/coders/pix.la -lib/ImageMagick/modules-Q16/coders/pix.so -lib/ImageMagick/modules-Q16/coders/plasma.la -lib/ImageMagick/modules-Q16/coders/plasma.so -lib/ImageMagick/modules-Q16/coders/png.la -lib/ImageMagick/modules-Q16/coders/png.so -lib/ImageMagick/modules-Q16/coders/pnm.la -lib/ImageMagick/modules-Q16/coders/pnm.so -lib/ImageMagick/modules-Q16/coders/preview.la -lib/ImageMagick/modules-Q16/coders/preview.so -lib/ImageMagick/modules-Q16/coders/ps.la -lib/ImageMagick/modules-Q16/coders/ps.so -lib/ImageMagick/modules-Q16/coders/ps2.la -lib/ImageMagick/modules-Q16/coders/ps2.so -lib/ImageMagick/modules-Q16/coders/ps3.la -lib/ImageMagick/modules-Q16/coders/ps3.so -lib/ImageMagick/modules-Q16/coders/psd.la -lib/ImageMagick/modules-Q16/coders/psd.so -lib/ImageMagick/modules-Q16/coders/pwp.la -lib/ImageMagick/modules-Q16/coders/pwp.so -lib/ImageMagick/modules-Q16/coders/raw.la -lib/ImageMagick/modules-Q16/coders/raw.so -lib/ImageMagick/modules-Q16/coders/rgb.la -lib/ImageMagick/modules-Q16/coders/rgb.so -lib/ImageMagick/modules-Q16/coders/rgf.la -lib/ImageMagick/modules-Q16/coders/rgf.so -lib/ImageMagick/modules-Q16/coders/rla.la -lib/ImageMagick/modules-Q16/coders/rla.so -lib/ImageMagick/modules-Q16/coders/rle.la -lib/ImageMagick/modules-Q16/coders/rle.so -lib/ImageMagick/modules-Q16/coders/scr.la -lib/ImageMagick/modules-Q16/coders/scr.so -lib/ImageMagick/modules-Q16/coders/sct.la -lib/ImageMagick/modules-Q16/coders/sct.so -lib/ImageMagick/modules-Q16/coders/sfw.la -lib/ImageMagick/modules-Q16/coders/sfw.so -lib/ImageMagick/modules-Q16/coders/sgi.la -lib/ImageMagick/modules-Q16/coders/sgi.so -lib/ImageMagick/modules-Q16/coders/sixel.la -lib/ImageMagick/modules-Q16/coders/sixel.so -lib/ImageMagick/modules-Q16/coders/stegano.la -lib/ImageMagick/modules-Q16/coders/stegano.so -lib/ImageMagick/modules-Q16/coders/sun.la -lib/ImageMagick/modules-Q16/coders/sun.so -lib/ImageMagick/modules-Q16/coders/svg.la -lib/ImageMagick/modules-Q16/coders/svg.so -lib/ImageMagick/modules-Q16/coders/tga.la -lib/ImageMagick/modules-Q16/coders/tga.so -lib/ImageMagick/modules-Q16/coders/thumbnail.la -lib/ImageMagick/modules-Q16/coders/thumbnail.so -lib/ImageMagick/modules-Q16/coders/tiff.la -lib/ImageMagick/modules-Q16/coders/tiff.so -lib/ImageMagick/modules-Q16/coders/tile.la -lib/ImageMagick/modules-Q16/coders/tile.so -lib/ImageMagick/modules-Q16/coders/tim.la -lib/ImageMagick/modules-Q16/coders/tim.so -lib/ImageMagick/modules-Q16/coders/ttf.la -lib/ImageMagick/modules-Q16/coders/ttf.so -lib/ImageMagick/modules-Q16/coders/txt.la -lib/ImageMagick/modules-Q16/coders/txt.so -lib/ImageMagick/modules-Q16/coders/uil.la -lib/ImageMagick/modules-Q16/coders/uil.so -lib/ImageMagick/modules-Q16/coders/url.la -lib/ImageMagick/modules-Q16/coders/url.so -lib/ImageMagick/modules-Q16/coders/uyvy.la -lib/ImageMagick/modules-Q16/coders/uyvy.so -lib/ImageMagick/modules-Q16/coders/vicar.la -lib/ImageMagick/modules-Q16/coders/vicar.so -lib/ImageMagick/modules-Q16/coders/vid.la -lib/ImageMagick/modules-Q16/coders/vid.so -lib/ImageMagick/modules-Q16/coders/viff.la -lib/ImageMagick/modules-Q16/coders/viff.so -lib/ImageMagick/modules-Q16/coders/vips.la -lib/ImageMagick/modules-Q16/coders/vips.so -lib/ImageMagick/modules-Q16/coders/wbmp.la -lib/ImageMagick/modules-Q16/coders/wbmp.so -lib/ImageMagick/modules-Q16/coders/webp.la -lib/ImageMagick/modules-Q16/coders/webp.so -lib/ImageMagick/modules-Q16/coders/wmf.la -lib/ImageMagick/modules-Q16/coders/wmf.so -lib/ImageMagick/modules-Q16/coders/wpg.la -lib/ImageMagick/modules-Q16/coders/wpg.so -lib/ImageMagick/modules-Q16/coders/x.la -lib/ImageMagick/modules-Q16/coders/x.so -lib/ImageMagick/modules-Q16/coders/xbm.la -lib/ImageMagick/modules-Q16/coders/xbm.so -lib/ImageMagick/modules-Q16/coders/xc.la -lib/ImageMagick/modules-Q16/coders/xc.so -lib/ImageMagick/modules-Q16/coders/xcf.la -lib/ImageMagick/modules-Q16/coders/xcf.so -lib/ImageMagick/modules-Q16/coders/xpm.la -lib/ImageMagick/modules-Q16/coders/xpm.so -lib/ImageMagick/modules-Q16/coders/xps.la -lib/ImageMagick/modules-Q16/coders/xps.so -lib/ImageMagick/modules-Q16/coders/xtrn.la -lib/ImageMagick/modules-Q16/coders/xtrn.so -lib/ImageMagick/modules-Q16/coders/xwd.la -lib/ImageMagick/modules-Q16/coders/xwd.so -lib/ImageMagick/modules-Q16/coders/ycbcr.la -lib/ImageMagick/modules-Q16/coders/ycbcr.so -lib/ImageMagick/modules-Q16/coders/yuv.la -lib/ImageMagick/modules-Q16/coders/yuv.so -lib/ImageMagick/modules-Q16/filters/ -lib/ImageMagick/modules-Q16/filters/analyze.la -lib/ImageMagick/modules-Q16/filters/analyze.so lib/libMagick++-6.Q16.la @lib lib/libMagick++-6.Q16.so.${LIBMagick++-6.Q16_VERSION} lib/libMagickCore-6.Q16.la @@ -1483,7 +1236,6 @@ share/doc/ImageMagick/www/source/type.xm share/doc/ImageMagick/www/source/wand.c share/doc/ImageMagick/www/sponsors.html share/doc/ImageMagick/www/stream.html -share/doc/ImageMagick/www/subversion.html share/doc/ImageMagick/www/support.html share/doc/ImageMagick/www/wand.png share/doc/ImageMagick/www/webp.html