Re: [WIP] graphics/ImageMagick
On Mon 2012.05.21 at 17:45 -0400, Okan Demirmen wrote:
Here's a work-in-progress long overdue update to ImageMagick.
Looking for comments/tests and ok's now.
Cheers,
Okan
Index: Makefile
===
RCS file: /home/open/anoncvs/cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile21 May 2012 13:29:31 - 1.121
+++ Makefile21 May 2012 20:42:49 -
@@ -4,15 +4,14 @@ SHARED_ONLY= Yes
COMMENT= image processing tools
-VER= 6.6.6
-DASHVER= 10
+VER= 6.7.7
+DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
-REVISION= 8
-SHARED_LIBS += Magick++14.0# .1.0
-SHARED_LIBS += MagickCore 2.0 # .1.0
-SHARED_LIBS += MagickWand 2.0 # .1.0
+SHARED_LIBS += Magick++15.0# .1.0
+SHARED_LIBS += MagickCore 3.0 # .1.0
+SHARED_LIBS += MagickWand 3.0 # .1.0
CATEGORIES=graphics
@@ -34,7 +33,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB = c bz2=10 djvulibre fftw3 jasper=1 jbig=1.2 jpeg \
lcms2 lzma ltdl m perl png=4 pthread stdc++ \
tiff=36 z ICE SM X11 Xext Xt expat fontconfig \
- freetype wmf-0.2 wmflite-0.2=7 xcb xml2=9
+ freetype wmflite-0.2=7 xcb xml2=9
MODULES = converters/libiconv
@@ -70,7 +69,7 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
--without-lqr \
--without-modules \
--without-openexr \
- --with-perl=/usr/bin/perl \
+ --with-perl \
--without-rsvg \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib \
@@ -82,11 +81,12 @@ CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE
ac_cv_path_LaunchDelegate=no
post-install:
- @perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
- ${PREFIX}/bin/Magick-config
-.for f in Magick++ MagickCore MagickWand
- @perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
- ${PREFIX}/lib/lib${f}.la
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ImageMagick
+.for i in coder.xml colors.xml delegates.xml log.xml magic.xml \
+ mime.xml policy.xml quantization-table.xml sRGB.icc \
+ thresholds.xml type-dejavu.xml type-ghostscript.xml \
+ type-windows.xml type.xml
+ ${INSTALL_DATA} ${WRKSRC}/config/$i ${PREFIX}/share/examples/ImageMagick
.endfor
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/open/anoncvs/cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo6 Jul 2011 22:43:00 - 1.18
+++ distinfo21 May 2012 02:17:35 -
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.6.6-10.tar.gz) = HurWRTdiEM/kc+vonEobiQ==
-RMD160 (ImageMagick-6.6.6-10.tar.gz) = MZUQ7mjjQuWFvZUh9eUWTdh4uZ8=
-SHA1 (ImageMagick-6.6.6-10.tar.gz) = w+IAi9OonR3xxau315sUC6M/chY=
-SHA256 (ImageMagick-6.6.6-10.tar.gz) =
bvxjtvJ/WBp5pBNVv+OaFeJAODPrg7YNmV6Z6B9rAE0=
-SIZE (ImageMagick-6.6.6-10.tar.gz) = 11319956
+MD5 (ImageMagick-6.7.7-0.tar.gz) = WKfJxpwQeXyYJUizO6KQlA==
+RMD160 (ImageMagick-6.7.7-0.tar.gz) = Amu13BaokBBGysR0ti1MtaQnLzc=
+SHA1 (ImageMagick-6.7.7-0.tar.gz) = os9CcZlw3uH/sYmcgnxGudGl7Oc=
+SHA256 (ImageMagick-6.7.7-0.tar.gz) =
Z/w+0yMv0dWwCliBTx8tC3RqOtWqj2+mPv/bM1cVZgs=
+SIZE (ImageMagick-6.7.7-0.tar.gz) = 12970380
Index: patches/patch-coders_jpeg_c
===
RCS file: patches/patch-coders_jpeg_c
diff -N patches/patch-coders_jpeg_c
--- patches/patch-coders_jpeg_c 27 Apr 2012 08:09:56 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-coders_jpeg_c,v 1.1 2012/04/27 08:09:56 jasper Exp $
-
-Security fix for CVE-2012-0260, Excessive memory use with JPEG restart markers.
-
coders/jpeg.c.orig Fri Apr 27 09:40:28 2012
-+++ coders/jpeg.c Fri Apr 27 09:57:14 2012
-@@ -210,6 +210,8 @@ static MagickBooleanType IsJPEG(const unsigned char *m
-
- static MagickBooleanType EmitMessage(j_common_ptr jpeg_info,int level)
- {
-+#define JPEGExcessiveWarnings 1000
-+
- char
- message[JMSG_LENGTH_MAX];
-
-@@ -224,11 +226,11 @@ static MagickBooleanType EmitMessage(j_common_ptr jpeg
- image=error_manager-image;
- if (level 0)
- {
-- if ((jpeg_info-err-num_warnings == 0) ||
-+ if ((jpeg_info-err-num_warnings++ JPEGExcessiveWarnings) ||
-+(jpeg_info-err-num_warnings == 0) ||
- (jpeg_info-err-trace_level = 3))
-
[WIP] graphics/ImageMagick
Here's a work-in-progress long overdue update to ImageMagick.
Comments while testing dependant ports is in-progress.
Cheers,
Okan
Index: Makefile
===
RCS file: /home/open/anoncvs/cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile21 May 2012 13:29:31 - 1.121
+++ Makefile21 May 2012 20:42:49 -
@@ -4,15 +4,14 @@ SHARED_ONLY= Yes
COMMENT= image processing tools
-VER= 6.6.6
-DASHVER= 10
+VER= 6.7.7
+DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
-REVISION= 8
-SHARED_LIBS += Magick++14.0# .1.0
-SHARED_LIBS += MagickCore 2.0 # .1.0
-SHARED_LIBS += MagickWand 2.0 # .1.0
+SHARED_LIBS += Magick++15.0# .1.0
+SHARED_LIBS += MagickCore 3.0 # .1.0
+SHARED_LIBS += MagickWand 3.0 # .1.0
CATEGORIES=graphics
@@ -34,7 +33,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB = c bz2=10 djvulibre fftw3 jasper=1 jbig=1.2 jpeg \
lcms2 lzma ltdl m perl png=4 pthread stdc++ \
tiff=36 z ICE SM X11 Xext Xt expat fontconfig \
- freetype wmf-0.2 wmflite-0.2=7 xcb xml2=9
+ freetype wmflite-0.2=7 xcb xml2=9
MODULES = converters/libiconv
@@ -70,7 +69,7 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
--without-lqr \
--without-modules \
--without-openexr \
- --with-perl=/usr/bin/perl \
+ --with-perl \
--without-rsvg \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib \
@@ -82,11 +81,12 @@ CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE
ac_cv_path_LaunchDelegate=no
post-install:
- @perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
- ${PREFIX}/bin/Magick-config
-.for f in Magick++ MagickCore MagickWand
- @perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
- ${PREFIX}/lib/lib${f}.la
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ImageMagick
+.for i in coder.xml colors.xml delegates.xml log.xml magic.xml \
+ mime.xml policy.xml quantization-table.xml sRGB.icc \
+ thresholds.xml type-dejavu.xml type-ghostscript.xml \
+ type-windows.xml type.xml
+ ${INSTALL_DATA} ${WRKSRC}/config/$i ${PREFIX}/share/examples/ImageMagick
.endfor
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/open/anoncvs/cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo6 Jul 2011 22:43:00 - 1.18
+++ distinfo21 May 2012 02:17:35 -
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.6.6-10.tar.gz) = HurWRTdiEM/kc+vonEobiQ==
-RMD160 (ImageMagick-6.6.6-10.tar.gz) = MZUQ7mjjQuWFvZUh9eUWTdh4uZ8=
-SHA1 (ImageMagick-6.6.6-10.tar.gz) = w+IAi9OonR3xxau315sUC6M/chY=
-SHA256 (ImageMagick-6.6.6-10.tar.gz) =
bvxjtvJ/WBp5pBNVv+OaFeJAODPrg7YNmV6Z6B9rAE0=
-SIZE (ImageMagick-6.6.6-10.tar.gz) = 11319956
+MD5 (ImageMagick-6.7.7-0.tar.gz) = WKfJxpwQeXyYJUizO6KQlA==
+RMD160 (ImageMagick-6.7.7-0.tar.gz) = Amu13BaokBBGysR0ti1MtaQnLzc=
+SHA1 (ImageMagick-6.7.7-0.tar.gz) = os9CcZlw3uH/sYmcgnxGudGl7Oc=
+SHA256 (ImageMagick-6.7.7-0.tar.gz) =
Z/w+0yMv0dWwCliBTx8tC3RqOtWqj2+mPv/bM1cVZgs=
+SIZE (ImageMagick-6.7.7-0.tar.gz) = 12970380
Index: patches/patch-coders_jpeg_c
===
RCS file: patches/patch-coders_jpeg_c
diff -N patches/patch-coders_jpeg_c
--- patches/patch-coders_jpeg_c 27 Apr 2012 08:09:56 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-coders_jpeg_c,v 1.1 2012/04/27 08:09:56 jasper Exp $
-
-Security fix for CVE-2012-0260, Excessive memory use with JPEG restart markers.
-
coders/jpeg.c.orig Fri Apr 27 09:40:28 2012
-+++ coders/jpeg.c Fri Apr 27 09:57:14 2012
-@@ -210,6 +210,8 @@ static MagickBooleanType IsJPEG(const unsigned char *m
-
- static MagickBooleanType EmitMessage(j_common_ptr jpeg_info,int level)
- {
-+#define JPEGExcessiveWarnings 1000
-+
- char
- message[JMSG_LENGTH_MAX];
-
-@@ -224,11 +226,11 @@ static MagickBooleanType EmitMessage(j_common_ptr jpeg
- image=error_manager-image;
- if (level 0)
- {
-- if ((jpeg_info-err-num_warnings == 0) ||
-+ if ((jpeg_info-err-num_warnings++ JPEGExcessiveWarnings) ||
-+(jpeg_info-err-num_warnings == 0) ||
- (jpeg_info-err-trace_level = 3))
-
