ImageMagick updated to 6.5.3.2, some regression tests (which uses
ffmpeg) fails and ffmpeg segfaults in put_pixels_clamped_mmx
(libavcodec.so.13.0) @amd64.
Does anybody knows if is a known ffmpeg bug ?
Cheers & Thanks
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.104
diff -u -p -r1.104 Makefile
--- Makefile 17 May 2009 09:04:38 -0000 1.104
+++ Makefile 8 Jun 2009 17:11:01 -0000
@@ -2,14 +2,14 @@
COMMENT= image processing tools
-VER= 6.4.5
-DASHVER= 6
+VER= 6.5.3
+DASHVER= 2
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
-SHARED_LIBS += Magick++ 13.0 # .1.0
-SHARED_LIBS += MagickCore 1.0 # .1.0
-SHARED_LIBS += MagickWand 1.0 # .1.0
+SHARED_LIBS += Magick++ 14.0 # .1.0
+SHARED_LIBS += MagickCore 2.0 # .1.0
+SHARED_LIBS += MagickWand 2.0 # .1.0
CATEGORIES= graphics
@@ -28,7 +28,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c jpeg m z
+WANTLIB= c jpeg m perl z
LIB_DEPENDS= bz2.>=10::archivers/bzip2 \
jbig.>=1.2::graphics/jbigkit \
@@ -39,6 +39,7 @@ LIB_DEPENDS= bz2.>=10::archivers/bzip2
RUN_DEPENDS= :netpbm-*:graphics/netpbm
BUILD_DEPENDS= :netpbm-*:graphics/netpbm
+REGRESS_DEPENDS= ::graphics/ffmpeg
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
@@ -83,8 +84,6 @@ BUILD_DEPENDS+= :ghostscript-*:print/gh
BUILD_DEPENDS+= :transfig-*:print/transfig
CONFIGURE_ARGS+= --with-wmf
.endif
-
-WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
post-install:
@perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 29 Nov 2008 05:00:20 -0000 1.17
+++ distinfo 8 Jun 2009 17:11:01 -0000
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.4.5-6.tar.gz) = RApCQC4VxGO6URaMiN34gw==
-RMD160 (ImageMagick-6.4.5-6.tar.gz) = uhaPWCKtB52ZdpB9BsBgtYOpxWc=
-SHA1 (ImageMagick-6.4.5-6.tar.gz) = XyDCpSK8by/3RQtruOpnvyw+7KE=
-SHA256 (ImageMagick-6.4.5-6.tar.gz) =
9J21ag6nK490FQ+G9F9WWM0C23UwcEdIGXl/Eef3GiQ=
-SIZE (ImageMagick-6.4.5-6.tar.gz) = 11194464
+MD5 (ImageMagick-6.5.3-2.tar.gz) = UVR9Ter9uh106kIlgF5j6Q==
+RMD160 (ImageMagick-6.5.3-2.tar.gz) = jxbG18Qo4Vyv0lBKk1cMA7yKg10=
+SHA1 (ImageMagick-6.5.3-2.tar.gz) = 8+JowNzCBAsa6/p2gr438YHAcS0=
+SHA256 (ImageMagick-6.5.3-2.tar.gz) =
kcm58TQKoawxWNzj1XyV4Y9NQPpgTzPA3mJ/PXJtZwo=
+SIZE (ImageMagick-6.5.3-2.tar.gz) = 11126089
Index: patches/patch-PerlMagick_Makefile_PL_in
===================================================================
RCS file:
/cvs/ports/graphics/ImageMagick/patches/patch-PerlMagick_Makefile_PL_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-PerlMagick_Makefile_PL_in
--- patches/patch-PerlMagick_Makefile_PL_in 20 Nov 2008 13:29:56 -0000
1.1
+++ patches/patch-PerlMagick_Makefile_PL_in 8 Jun 2009 17:11:01 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-PerlMagick_Makefile_PL_in,v 1.1 2008/11/20 13:29:56 okan Exp $
---- PerlMagick/Makefile.PL.in.orig Sat Aug 16 21:01:11 2008
-+++ PerlMagick/Makefile.PL.in Mon Nov 3 12:26:52 2008
-@@ -77,7 +77,7 @@ WriteMakefile
+--- PerlMagick/Makefile.PL.in.orig Sat May 30 18:04:14 2009
++++ PerlMagick/Makefile.PL.in Thu Jun 4 12:20:41 2009
+@@ -83,7 +83,7 @@ WriteMakefile
'INSTALLBIN' => '@BIN_DIR@',
# Library specification
-- 'LIBS' => [ '-...@magickcore_path@ -L../magick/.libs -lMagickCore
-L../wand/.libs -lMagickWand' ],
-+ 'LIBS' => [ '-...@magickcore_path@ -lMagickCore -lMagickWand' ],
+- 'LIBS' => [ '-L../magick/.libs -lMagickCore -L../wand/.libs -lMagickWand
-lperl @MATH_LIBS@' ],
++ 'LIBS' => [ '-lMagickCore -lMagickWand -lperl @MATH_LIBS@' ],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',
Index: patches/patch-coders_png_c
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-coders_png_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-coders_png_c
--- patches/patch-coders_png_c 29 Nov 2008 05:00:20 -0000 1.7
+++ patches/patch-coders_png_c 8 Jun 2009 17:11:01 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-coders_png_c,v 1.7 2008/11/29 05:00:20 okan Exp $
---- coders/png.c.orig Tue Nov 11 20:58:15 2008
-+++ coders/png.c Thu Nov 20 14:38:55 2008
-@@ -1783,7 +1783,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
- png_set_read_user_chunk_fn(ping, image, read_vpag_chunk_callback);
+--- coders/png.c.orig Thu May 21 04:28:52 2009
++++ coders/png.c Thu Jun 4 12:21:38 2009
+@@ -1795,7 +1795,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
#endif
--#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) &&
(PNG_LIBPNG_VER >= 10200) && defined(__i386__)
-+#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) &&
(PNG_LIBPNG_VER >= 10200) && defined(PNG_MMX_CODE_SUPPORTED)
+ #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
+- (PNG_LIBPNG_VER >= 10200) && (PNG_LIBPNG_VER < 10220) && defined(__i386__)
++ (PNG_LIBPNG_VER >= 10200) && (PNG_LIBPNG_VER < 10220) &&
defined(PNG_MMX_CODE_SUPPORTED)
/* Disable thread-unsafe features of pnggccrd */
if (png_access_version_number() >= 10200)
{
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure 29 Nov 2008 05:00:20 -0000 1.4
+++ patches/patch-configure 8 Jun 2009 17:11:01 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2008/11/29 05:00:20 okan Exp $
---- configure.orig Fri Nov 14 12:33:21 2008
-+++ configure Wed Nov 26 18:33:17 2008
-@@ -20808,6 +20808,7 @@ with_ltdl='no'
+--- configure.orig Wed Jun 3 05:01:34 2009
++++ configure Thu Jun 4 12:18:47 2009
+@@ -20859,6 +20859,7 @@ with_ltdl='no'
if test "$libtool_build_shared_libs" != 'no'; then
with_ltdl='yes'
fi
@@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.4 2008/11/
if test "$with_ltdl" != 'no'; then
WITH_LTDL_TRUE=
-@@ -42154,7 +42155,7 @@ fi
+@@ -42226,7 +42227,7 @@ fi
#
# Subdirectory under lib to place ImageMagick lib files
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.4 2008/11/
cat >>confdefs.h <<_ACEOF
#define LIBRARY_RELATIVE_PATH "$LIBRARY_RELATIVE_PATH"
-@@ -42258,7 +42259,7 @@ _ACEOF
+@@ -42330,7 +42331,7 @@ _ACEOF
#
# Path to ImageMagick documentation files
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.4 2008/11/
DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
-@@ -42275,7 +42276,7 @@ _ACEOF
+@@ -42347,7 +42348,7 @@ _ACEOF
#
# Path to ImageMagick share files
Index: patches/patch-magick_Magick-config_in
===================================================================
RCS file: patches/patch-magick_Magick-config_in
diff -N patches/patch-magick_Magick-config_in
--- patches/patch-magick_Magick-config_in 20 Nov 2008 13:29:56 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-magick_Magick-config_in,v 1.1 2008/11/20 13:29:56 okan Exp $
---- magick/Magick-config.in.orig Wed Nov 5 11:50:55 2008
-+++ magick/Magick-config.in Wed Nov 5 11:51:15 2008
-@@ -52,7 +52,7 @@ while test $# -gt 0; do
- echo '@MAGICK_LDFLAGS@'
- ;;
- --libs)
-- echo "-L${libdir} -lMagickCore"
-+ echo "-L${libdir} -lMagickCore -lMagickWand"
- ;;
- *)
- echo "${usage}" 1>&2
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.39
diff -u -p -r1.39 PLIST
--- pkg/PLIST 20 Nov 2008 13:29:56 -0000 1.39
+++ pkg/PLIST 8 Jun 2009 17:11:03 -0000
@@ -84,6 +84,7 @@ include/ImageMagick/magick/montage.h
include/ImageMagick/magick/option.h
include/ImageMagick/magick/paint.h
include/ImageMagick/magick/pixel.h
+include/ImageMagick/magick/policy.h
include/ImageMagick/magick/prepress.h
include/ImageMagick/magick/profile.h
include/ImageMagick/magick/property.h
@@ -141,8 +142,8 @@ lib/ImageMagick/config/delegates.xml
lib/ImageMagick/config/english.xml
lib/ImageMagick/config/francais.xml
lib/ImageMagick/config/locale.xml
+lib/ImageMagick/config/policy.xml
lib/ImageMagick/config/type-ghostscript.xml
-lib/ImageMagick/config/type-solaris.xml
lib/ImageMagick/config/type-windows.xml
lib/ImageMagick/config/type.xml
@comment lib/ImageMagick/modules-Q16/
@@ -198,6 +199,7 @@ share/ImageMagick/config/sRGB.icm
share/ImageMagick/config/thresholds.xml
share/doc/ImageMagick/
share/doc/ImageMagick/images/
+share/doc/ImageMagick/images/affine.png
share/doc/ImageMagick/images/arc.png
share/doc/ImageMagick/images/background.jpg
share/doc/ImageMagick/images/black.png
@@ -205,20 +207,16 @@ share/doc/ImageMagick/images/bluebells_c
share/doc/ImageMagick/images/bluebells_darker.jpg
share/doc/ImageMagick/images/bluebells_lin.jpg
share/doc/ImageMagick/images/bluebells_log.jpg
-share/doc/ImageMagick/images/business+directory.gif
share/doc/ImageMagick/images/button.gif
-share/doc/ImageMagick/images/button_kmvu.jpg
share/doc/ImageMagick/images/configure.jpg
share/doc/ImageMagick/images/definitive-guide.png
share/doc/ImageMagick/images/difference.png
-share/doc/ImageMagick/images/dogwaffle.jpg
share/doc/ImageMagick/images/examples.jpg
share/doc/ImageMagick/images/frame.jpg
share/doc/ImageMagick/images/fuzzy-magick.png
share/doc/ImageMagick/images/gaussian-blur.png
share/doc/ImageMagick/images/granite.png
share/doc/ImageMagick/images/imade_art2.jpg
-share/doc/ImageMagick/images/ivedc.png
share/doc/ImageMagick/images/label.gif
share/doc/ImageMagick/images/logo.eps
share/doc/ImageMagick/images/logo.jpg
@@ -241,7 +239,6 @@ share/doc/ImageMagick/images/smile.gif
share/doc/ImageMagick/images/sponsor.jpg
share/doc/ImageMagick/images/sprite.jpg
share/doc/ImageMagick/images/t-shirt.png
-share/doc/ImageMagick/images/travelsur.gif
share/doc/ImageMagick/images/tricks.png
share/doc/ImageMagick/images/wand.ico
share/doc/ImageMagick/images/white-highlight.png
@@ -279,6 +276,7 @@ share/doc/ImageMagick/www/Magick++/READM
share/doc/ImageMagick/www/Magick++/STL.html
share/doc/ImageMagick/www/Magick++/TypeMetric.html
share/doc/ImageMagick/www/Magick++/index.html
+share/doc/ImageMagick/www/Magick++/magick.css
share/doc/ImageMagick/www/Magick++/montage-sample-framed.jpg
share/doc/ImageMagick/www/Magick++/right_triangle.png
share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-framed.fig
