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
--- Makefile6 Nov 2015 20:37:21 - 1.139
+++ Makefile28 Nov 2015 22:15:11 -
@@ -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:
