update to 1.3.6

"looks fine" landry@
This commit is contained in:
okan 2009-09-01 14:22:27 +00:00
parent 496d698d5d
commit 33084f2d94
7 changed files with 47 additions and 49 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.11 2009/08/10 06:31:44 kili Exp $
# $OpenBSD: Makefile,v 1.12 2009/09/01 14:22:27 okan Exp $
COMMENT= image processing tools with stable ABI
DISTNAME= GraphicsMagick-1.3.3
PKGNAME= ${DISTNAME}p1
DISTNAME= GraphicsMagick-1.3.6
CATEGORIES= graphics devel
SHARED_LIBS += GraphicsMagick 1.0 # .3.3
SHARED_LIBS += GraphicsMagick++ 1.0 # .3.0
SHARED_LIBS += GraphicsMagickWand 1.0 # .2.1
SHARED_LIBS += GraphicsMagick 2.0 # .3.3
SHARED_LIBS += GraphicsMagick++ 2.0 # .3.0
SHARED_LIBS += GraphicsMagickWand 2.0 # .2.1
HOMEPAGE= http://www.graphicsmagick.org/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=graphicsmagick/}
@ -38,7 +37,7 @@ CONFIGURE_ARGS+= --with-quantum-depth=16 \
--without-modules \
--without-threads \
--without-gslib \
--with-perl=/usr/bin/perl \
--with-perl \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib \
--disable-ltdl-install
@ -71,14 +70,10 @@ CONFIGURE_ARGS+= --with-wmf
# with FLAVOR=no_x11, some regession tests do not pass
# due to the absence of freetype
REGRESS_DEPENDS= :${PKGNAME}:${BASE_PKGPATH}
post-build:
@cd ${WRKBUILD}/PerlMagick && perl Makefile.PL && ${MAKE} ${MAKE_FLAGS}
post-install:
@perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
${PREFIX}/bin/GraphicsMagick{,++}-config
.for f in GraphicsMagick++ GraphicsMagick GraphicsMagickWand
@perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
${PREFIX}/lib/lib${f}.la
.endfor
@cd ${WRKBUILD}/PerlMagick && ${MAKE} ${MAKE_FLAGS} ${FAKE_TARGET}
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (GraphicsMagick-1.3.3.tar.gz) = 4QSZZzT1bloB7B8u0ipgTg==
RMD160 (GraphicsMagick-1.3.3.tar.gz) = VbicfTnIUQmmrNWjJoFc3fOX+dA=
SHA1 (GraphicsMagick-1.3.3.tar.gz) = Did+Y61o+s0n7BnHZWi/gd0fKDc=
SHA256 (GraphicsMagick-1.3.3.tar.gz) = idWmitrKWHZp3SRCT8Qw6UMn7EjND9h9v3MRIme9VWU=
SIZE (GraphicsMagick-1.3.3.tar.gz) = 7366311
MD5 (GraphicsMagick-1.3.6.tar.gz) = e1Yf49EJ54lHD4ZbYOFV6A==
RMD160 (GraphicsMagick-1.3.6.tar.gz) = TXRft1KdQj40pyHUN8PMAt/foHQ=
SHA1 (GraphicsMagick-1.3.6.tar.gz) = +UFEgVilUYZbfPb1Iw08qgU87zY=
SHA256 (GraphicsMagick-1.3.6.tar.gz) = iSpMwsA60AcfbYaJVk7mMNm7dv9m+lbVXHUe4h+BxXc=
SIZE (GraphicsMagick-1.3.6.tar.gz) = 7804177

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-PerlMagick_Makefile_PL_in,v 1.1 2009/09/01 14:22:27 okan Exp $
--- PerlMagick/Makefile.PL.in.orig Sun Aug 23 23:36:36 2009
+++ PerlMagick/Makefile.PL.in Sun Aug 23 23:36:58 2009
@@ -67,7 +67,7 @@ WriteMakefile
'INSTALLBIN' => '@BIN_DIR@',
# Library specification
- 'LIBS' => ['-L@MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
+ 'LIBS' => ['-L@MAGICKLIBDIR@ @LDFLAGS@ -lGraphicsMagick @MAGICK_DEP_LIBS@'],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-coders_bmp_c,v 1.1 2009/04/22 13:19:12 jasper Exp $
Security fix for SA33697, which could cause a DoS.
Patch from upstream bugreport.
--- coders/bmp.c.orig Wed Apr 22 15:08:29 2009
+++ coders/bmp.c Wed Apr 22 15:09:20 2009
@@ -1226,6 +1226,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info
DestroyImageList(image);
return((Image *) NULL);
}
+ DestroyBlobInfo(flipped_image->blob);
+ flipped_image->blob=ReferenceBlob(image->blob);
DestroyImage(image);
image=flipped_image;
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-coders_png_c,v 1.3 2009/01/08 19:57:36 okan Exp $
--- coders/png.c.orig Fri Nov 7 12:36:01 2008
+++ coders/png.c Mon Dec 29 08:58:53 2008
@@ -1655,7 +1655,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
$OpenBSD: patch-coders_png_c,v 1.4 2009/09/01 14:22:27 okan Exp $
--- coders/png.c.orig Fri Jul 24 15:34:58 2009
+++ coders/png.c Sat Aug 15 23:52:40 2009
@@ -1667,7 +1667,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
#endif
#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2009/01/08 19:57:36 okan Exp $
--- configure.orig Sun Nov 23 20:24:14 2008
+++ configure Mon Dec 29 08:58:53 2008
@@ -19690,6 +19690,7 @@ with_ltdl='no'
$OpenBSD: patch-configure,v 1.2 2009/09/01 14:22:27 okan Exp $
--- configure.orig Fri Jul 24 15:47:36 2009
+++ configure Sat Aug 15 23:52:40 2009
@@ -19820,6 +19820,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.1 2009/01/08 19:57:36 okan Exp $
if test "$with_ltdl" != 'no'; then
WITH_LTDL_TRUE=
@@ -37761,7 +37762,7 @@ fi
@@ -38047,7 +38048,7 @@ fi
#
# Subdirectory under lib to place GraphicsMagick lib files
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.1 2009/01/08 19:57:36 okan Exp $
cat >>confdefs.h <<_ACEOF
#define MagickLibSubdir "$MagickLibSubdir"
@@ -37865,7 +37866,7 @@ _ACEOF
@@ -38151,7 +38152,7 @@ _ACEOF
#
# Path to GraphicsMagick share files

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2009/01/08 19:57:36 okan Exp $
@comment $OpenBSD: PLIST,v 1.5 2009/09/01 14:22:27 okan Exp $
%%SHARED%%
bin/GraphicsMagick++-config
bin/GraphicsMagick-config
@ -20,10 +20,10 @@ include/GraphicsMagick/Magick++/Pixels.h
include/GraphicsMagick/Magick++/STL.h
include/GraphicsMagick/Magick++/TypeMetric.h
include/GraphicsMagick/magick/
include/GraphicsMagick/magick/PreRvIcccm.h
include/GraphicsMagick/magick/api.h
include/GraphicsMagick/magick/attribute.h
include/GraphicsMagick/magick/blob.h
include/GraphicsMagick/magick/cdl.h
include/GraphicsMagick/magick/channel.h
include/GraphicsMagick/magick/color.h
include/GraphicsMagick/magick/colorspace.h
@ -31,6 +31,7 @@ include/GraphicsMagick/magick/command.h
include/GraphicsMagick/magick/compare.h
include/GraphicsMagick/magick/composite.h
include/GraphicsMagick/magick/compress.h
include/GraphicsMagick/magick/confirm_access.h
include/GraphicsMagick/magick/constitute.h
include/GraphicsMagick/magick/decorate.h
include/GraphicsMagick/magick/delegate.h
@ -42,6 +43,7 @@ include/GraphicsMagick/magick/error.h
include/GraphicsMagick/magick/forward.h
include/GraphicsMagick/magick/fx.h
include/GraphicsMagick/magick/gem.h
include/GraphicsMagick/magick/hclut.h
include/GraphicsMagick/magick/image.h
include/GraphicsMagick/magick/list.h
include/GraphicsMagick/magick/log.h
@ -59,6 +61,7 @@ include/GraphicsMagick/magick/pixel_cache.h
include/GraphicsMagick/magick/pixel_iterator.h
include/GraphicsMagick/magick/profile.h
include/GraphicsMagick/magick/quantize.h
include/GraphicsMagick/magick/random.h
include/GraphicsMagick/magick/registry.h
include/GraphicsMagick/magick/render.h
include/GraphicsMagick/magick/resize.h
@ -70,8 +73,6 @@ include/GraphicsMagick/magick/timer.h
include/GraphicsMagick/magick/transform.h
include/GraphicsMagick/magick/utility.h
include/GraphicsMagick/magick/version.h
include/GraphicsMagick/magick/widget.h
include/GraphicsMagick/magick/xwindow.h
include/GraphicsMagick/wand/
include/GraphicsMagick/wand/drawing_wand.h
include/GraphicsMagick/wand/magick_wand.h
@ -161,6 +162,7 @@ share/doc/GraphicsMagick/www/Magick++/Geometry.html
share/doc/GraphicsMagick/www/Magick++/Image.fig
share/doc/GraphicsMagick/www/Magick++/Image.html
share/doc/GraphicsMagick/www/Magick++/Image.png
share/doc/GraphicsMagick/www/Magick++/Image.rst
share/doc/GraphicsMagick/www/Magick++/ImageDesign.html
share/doc/GraphicsMagick/www/Magick++/ImageMagick.png
share/doc/GraphicsMagick/www/Magick++/Install.html
@ -198,10 +200,12 @@ share/doc/GraphicsMagick/www/api/api.rst
share/doc/GraphicsMagick/www/api/api_hyperlinks.rst
share/doc/GraphicsMagick/www/api/attribute.html
share/doc/GraphicsMagick/www/api/blob.html
share/doc/GraphicsMagick/www/api/cdl.html
share/doc/GraphicsMagick/www/api/channel.html
share/doc/GraphicsMagick/www/api/color.html
share/doc/GraphicsMagick/www/api/compare.html
share/doc/GraphicsMagick/www/api/composite.html
share/doc/GraphicsMagick/www/api/confirm_access.html
share/doc/GraphicsMagick/www/api/constitute.html
share/doc/GraphicsMagick/www/api/decorate.html
share/doc/GraphicsMagick/www/api/deprecate.html
@ -211,6 +215,7 @@ share/doc/GraphicsMagick/www/api/effect.html
share/doc/GraphicsMagick/www/api/enhance.html
share/doc/GraphicsMagick/www/api/error.html
share/doc/GraphicsMagick/www/api/fx.html
share/doc/GraphicsMagick/www/api/hclut.html
share/doc/GraphicsMagick/www/api/image.html
share/doc/GraphicsMagick/www/api/list.html
share/doc/GraphicsMagick/www/api/magick.html
@ -254,11 +259,13 @@ share/doc/GraphicsMagick/www/docutils-api.css
share/doc/GraphicsMagick/www/docutils-articles.css
share/doc/GraphicsMagick/www/download.html
share/doc/GraphicsMagick/www/download.rst
share/doc/GraphicsMagick/www/favicon.ico
share/doc/GraphicsMagick/www/formats.html
share/doc/GraphicsMagick/www/formats.rst
share/doc/GraphicsMagick/www/gm.html
share/doc/GraphicsMagick/www/identify.html
share/doc/GraphicsMagick/www/images/
share/doc/GraphicsMagick/www/images/ball.png
share/doc/GraphicsMagick/www/images/banner_bg.png
share/doc/GraphicsMagick/www/images/examples.jpg
share/doc/GraphicsMagick/www/images/gm-107x76.png